From d7dc1b8dc732008ee8dbb3df470a2f367a0b2a69 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Thu, 20 Mar 2025 10:06:57 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/7956=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?showSummary:=20false=E6=97=B6=E4=B8=94=E6=9C=89=E5=86=85?= =?UTF-8?q?=E5=B5=8C=E5=AD=90=E8=A1=A8=E6=97=B6=E5=90=88=E8=AE=A1=E6=A0=8F?= =?UTF-8?q?=E9=94=99=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecgboot-vue3/src/components/Table/src/BasicTable.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jeecgboot-vue3/src/components/Table/src/BasicTable.vue b/jeecgboot-vue3/src/components/Table/src/BasicTable.vue index 12380db4..d640b42c 100644 --- a/jeecgboot-vue3/src/components/Table/src/BasicTable.vue +++ b/jeecgboot-vue3/src/components/Table/src/BasicTable.vue @@ -247,7 +247,11 @@ const { getHeaderProps } = useTableHeader(getProps, slots, handlers); // update-begin--author:liaozhiyang---date:20240425---for:【pull/1201】添加antd的TableSummary功能兼容老的summary(表尾合计) const getSummaryProps = computed(() => { - return pick(unref(getProps), ['summaryFunc', 'summaryData', 'hasExpandedRow', 'rowKey']); + // update-begin--author:liaozhiyang---date:20250318---for:【issues/7956】修复showSummary: false时且有内嵌子表时合计栏错位 + const result = pick(unref(getProps), ['summaryFunc', 'summaryData', 'hasExpandedRow', 'rowKey']); + result['hasExpandedRow'] = Object.keys(slots).includes('expandedRowRender'); + // update-end--author:liaozhiyang---date:20250318---for:【issues/7956】修复showSummary: false时且有内嵌子表时合计栏错位 + return result; }); const getIsEmptyData = computed(() => { return (unref(getDataSourceRef) || []).length === 0;