github
/
jeecg-boot-vue3
mirror of https://github.com/jeecgboot/jeecgboot-vue3
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【issues/638】表格合计，列自定义隐藏或展示时，合计栏会错位

pull/859/head
zhangdaiscott 2023-11-04 17:39:04 +08:00
parent 0b1c464e2c
commit df17b4b6f1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/Table/src/components/TableFooter.vue
View File

@ -67,7 +67,10 @@
const getColumns = computed(() => { const getColumns = computed(() => {
const dataSource = unref(getDataSource); 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 index = columns.findIndex((item) => item.flag === INDEX_COLUMN_FLAG);
const hasRowSummary = dataSource.some((item) => Reflect.has(item, SUMMARY_ROW_KEY)); const hasRowSummary = dataSource.some((item) => Reflect.has(item, SUMMARY_ROW_KEY));
const hasIndexSummary = dataSource.some((item) => Reflect.has(item, SUMMARY_INDEX_KEY)); const hasIndexSummary = dataSource.some((item) => Reflect.has(item, SUMMARY_INDEX_KEY));

3
src/components/Table/src/hooks/useColumns.ts
View File

@ -277,9 +277,6 @@ export function useColumns(
columns = columns.filter((item) => item.key !== CUS_SEL_COLUMN_KEY); columns = columns.filter((item) => item.key !== CUS_SEL_COLUMN_KEY);
// update-enb--author:sunjianlei---date:220230630---for：【QQYUN-5571】自封装选择列，解决数据行选择卡顿问题 // 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) { if (sort) {
columns = sortFixedColumn(columns); columns = sortFixedColumn(columns);
} }