diff --git a/src/components/Table/src/components/TableFooter.vue b/src/components/Table/src/components/TableFooter.vue index 5d23ef9..c2b08c9 100644 --- a/src/components/Table/src/components/TableFooter.vue +++ b/src/components/Table/src/components/TableFooter.vue @@ -67,7 +67,10 @@ const getColumns = computed(() => { const dataSource = unref(getDataSource); - const columns: BasicColumn[] = cloneDeep(table.getColumns()); + let columns: BasicColumn[] = cloneDeep(table.getColumns()); + // update-begin--author:liaozhiyang---date:220230804---for:【issues/638】表格合计,列自定义隐藏或展示时,合计栏会错位 + columns = columns.filter((item) => !item.defaultHidden); + // update-begin--author:liaozhiyang---date:220230804---for:【issues/638】表格合计,列自定义隐藏或展示时,合计栏会错位 const index = columns.findIndex((item) => item.flag === INDEX_COLUMN_FLAG); const hasRowSummary = dataSource.some((item) => Reflect.has(item, SUMMARY_ROW_KEY)); const hasIndexSummary = dataSource.some((item) => Reflect.has(item, SUMMARY_INDEX_KEY)); diff --git a/src/components/Table/src/hooks/useColumns.ts b/src/components/Table/src/hooks/useColumns.ts index 5fb856e..5ca08e6 100644 --- a/src/components/Table/src/hooks/useColumns.ts +++ b/src/components/Table/src/hooks/useColumns.ts @@ -277,9 +277,6 @@ export function useColumns( columns = columns.filter((item) => item.key !== CUS_SEL_COLUMN_KEY); // update-enb--author:sunjianlei---date:220230630---for:【QQYUN-5571】自封装选择列,解决数据行选择卡顿问题 - // update-begin--author:liaozhiyang---date:220230804---for:【issues/638】表格合计,列自定义隐藏或展示时,合计栏会错位 - columns = columns.filter((item) => !item.defaultHidden); - // update-begin--author:liaozhiyang---date:220230804---for:【issues/638】表格合计,列自定义隐藏或展示时,合计栏会错位 if (sort) { columns = sortFixedColumn(columns); }