releases 4.10.0

x-extends · Dec 31, 2024 · 96cb907 · 96cb907
1 parent 3f93aa3
commit 96cb907
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.gitee/ISSUE_TEMPLATE/bug_report.yml b/.gitee/ISSUE_TEMPLATE/bug_report.yml
@@ -15,7 +15,7 @@ body:
     label: "是否已准备好复现链接与示例代码？"
     description: "按要求准备好复现 Demo，复现 Demo 操作步骤：https://vxetable.cn/issues.html"
     options:
-    - label: "我已准备好复现链接"
+    - label: "我确定已准备好以上复现链接"
       required: true
 - type: textarea
   id: issue_describe
@@ -69,7 +69,7 @@ body:
   id: issue_confirm_latest_version
   attributes:
     label: "是否使用当前最新版本？"
-    description: "我已确认是最新版本，仅支持提交最新版本的问题反馈，非最新版本不予处理，一律关闭"
+    description: "仅支持提交最新版本的问题反馈，非最新版本不予处理，一律自动关闭"
     options:
-    - label: "我已确认是使用最新版本"
+    - label: "我确定已经更新到最新版本后依然存在该问题"
       required: true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -15,7 +15,7 @@ body:
     label: "是否已准备好复现链接与示例代码？"
     description: "按要求准备好复现 Demo，复现 Demo 操作步骤：https://vxetable.cn/issues.html"
     options:
-    - label: "我已准备好复现链接"
+    - label: "我确定已准备好以上复现链接"
       required: true
 - type: textarea
   id: issue_describe
@@ -69,7 +69,7 @@ body:
   id: issue_confirm_latest_version
   attributes:
     label: "是否使用当前最新版本？"
-    description: "我已确认是最新版本，仅支持提交最新版本的问题反馈，非最新版本不予处理，一律关闭"
+    description: "仅支持提交最新版本的问题反馈，非最新版本不予处理，一律自动关闭"
     options:
-    - label: "我已确认是使用最新版本"
+    - label: "我确定已经更新到最新版本后依然存在该问题"
       required: true
diff --git a/packages/table/module/export/hook.ts b/packages/table/module/export/hook.ts
@@ -946,15 +946,15 @@ hooks.add('tableExportModule', {
 
     const handleExportAndPrint = (options: VxeTablePropTypes.ExportOpts | VxeTablePropTypes.ExportConfig, isPrint?: boolean) => {
       const { treeConfig, showHeader, showFooter } = props
-      const { initStore, mergeList, isGroup, footerTableData, exportStore, exportParams } = reactData
+      const { initStore, mergeList, mergeFooterList, isGroup, footerTableData, exportStore, exportParams } = reactData
       const { collectColumn } = internalData
       const exportOpts = computeExportOpts.value
       const hasTree = treeConfig
       const customOpts = computeCustomOpts.value
       const selectRecords = $xeTable.getCheckboxRecords()
       const proxyOpts = $xeGrid ? $xeGrid.getComputeMaps().computeProxyOpts.value : {} as VxeGridPropTypes.ProxyOpts
       const hasFooter = !!footerTableData.length
-      const hasMerge = !hasTree && mergeList.length
+      const hasMerge = !!(mergeList.length || mergeFooterList.length)
       const defOpts = Object.assign({
         message: true,
         isHeader: showHeader,