diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 4eec3fcdc..6c1c85a8b 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -275,6 +275,10 @@ export default defineComponent({ setProps({ size }) } + const confirmSetColumn = (columns: TableColumn[]) => { + setProps({ columns }) + } + expose({ setProps, setColumn, @@ -434,6 +438,7 @@ export default defineComponent({ align={v.align || align} headerAlign={v.headerAlign || headerAlign} label={v.label} + fixed={v.fixed} width="65px" > ) @@ -543,11 +548,12 @@ export default defineComponent({ ) : ( <> - {unref(getProps).showAction ? ( + {unref(getProps).showAction && !unref(getProps).customContent ? ( ) : null} diff --git a/src/components/Table/src/components/ColumnSetting.vue b/src/components/Table/src/components/ColumnSetting.vue index 41cdd68b7..8f8f0471e 100644 --- a/src/components/Table/src/components/ColumnSetting.vue +++ b/src/components/Table/src/components/ColumnSetting.vue @@ -1,15 +1,19 @@ diff --git a/src/components/Table/src/components/TableActions.vue b/src/components/Table/src/components/TableActions.vue index 3d96423a1..2eaab32bc 100644 --- a/src/components/Table/src/components/TableActions.vue +++ b/src/components/Table/src/components/TableActions.vue @@ -23,7 +23,7 @@ export default defineComponent({ default: () => [] } }, - emits: ['refresh', 'changSize'], + emits: ['refresh', 'changSize', 'confirm'], setup(props, { emit }) { const showSetting = ref(false) @@ -35,6 +35,10 @@ export default defineComponent({ emit('changSize', size) } + const confirm = (columns: TableColumn[]) => { + emit('confirm', columns) + } + const showColumnSetting = () => { showSetting.value = true } @@ -95,7 +99,7 @@ export default defineComponent({ /> - + ) } diff --git a/src/constants/index.ts b/src/constants/index.ts index 6f676aa8e..4dc2db213 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -22,3 +22,8 @@ export const NO_REDIRECT_WHITE_LIST = ['/login'] * 不重置路由白名单 */ export const NO_RESET_WHITE_LIST = ['Redirect', 'Login', 'NoFind', 'Root'] + +/** + * 表格默认过滤列设置字段 + */ +export const DEFAULT_FILTER_COLUMN = ['expand', 'selection'] diff --git a/src/views/Components/Table/UseTableDemo.vue b/src/views/Components/Table/UseTableDemo.vue index da1a754fa..7bcfb169c 100644 --- a/src/views/Components/Table/UseTableDemo.vue +++ b/src/views/Components/Table/UseTableDemo.vue @@ -56,7 +56,8 @@ const columns = reactive([ { field: 'index', label: t('tableDemo.index'), - type: 'index' + type: 'index', + hidden: true }, { field: 'title',