releases 4.10.0

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

Hide file tree

Showing 8 changed files with 133 additions and 134 deletions.
diff --git a/.gitee/ISSUE_TEMPLATE/bug_report.yml b/.gitee/ISSUE_TEMPLATE/bug_report.yml
@@ -12,10 +12,10 @@ body:
 - type: checkboxes
   id: issue_confirm_read_agreement
   attributes:
-    label: "是否已准备好复现 demo？"
+    label: "是否已准备好复现链接与示例代码？"
     description: "按要求准备好复现 Demo，复现 Demo 操作步骤：https://vxetable.cn/issues.html"
     options:
-    - label: "我已确认要求提供复现链接与示例代码"
+    - label: "我已准备好复现链接"
       required: true
 - type: textarea
   id: issue_describe
@@ -71,5 +71,5 @@ body:
     label: "是否使用当前最新版本？"
     description: "我已确认是最新版本，仅支持提交最新版本的问题反馈，非最新版本不予处理，一律关闭"
     options:
-    - label: "我已确认是使用最新版本并已按要求提供复现链接与示例代码"
+    - label: "我已确认是使用最新版本"
       required: true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -12,10 +12,10 @@ body:
 - type: checkboxes
   id: issue_confirm_read_agreement
   attributes:
-    label: "是否已准备好复现 demo？"
+    label: "是否已准备好复现链接与示例代码？"
     description: "按要求准备好复现 Demo，复现 Demo 操作步骤：https://vxetable.cn/issues.html"
     options:
-    - label: "我已确认要求提供复现链接与示例代码"
+    - label: "我已准备好复现链接"
       required: true
 - type: textarea
   id: issue_describe
@@ -71,5 +71,5 @@ body:
     label: "是否使用当前最新版本？"
     description: "我已确认是最新版本，仅支持提交最新版本的问题反馈，非最新版本不予处理，一律关闭"
     options:
-    - label: "我已确认是使用最新版本并已按要求提供复现链接与示例代码"
+    - label: "我已确认是使用最新版本"
       required: true
diff --git a/package.json b/package.json
@@ -63,9 +63,9 @@
     "postcss": "^8.4.38",
     "sass": "^1.80.4",
     "sass-loader": "^14.2.0",
-    "typescript": "~4.5.5",
-    "vue": "3.5.5",
-    "vue-router": "^4.3.2"
+    "typescript": "~4.7.4",
+    "vue": "3.4.27",
+    "vue-router": "~4.3.2"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

diff --git a/packages/table/module/export/hook.ts b/packages/table/module/export/hook.ts
@@ -6,7 +6,7 @@ import { parseFile, formatText, eqEmptyValue } from '../../../ui/src/utils'
 import { createHtmlPage, getExportBlobByContent } from './util'
 import { warnLog, errLog } from '../../../ui/src/log'
 
-import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTablePropTypes, TableExportMethods, VxeGridPropTypes, VxeTableDefines } from '../../../../types'
+import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTablePropTypes, VxeColumnPropTypes, TableExportMethods, VxeGridPropTypes, VxeTableDefines } from '../../../../types'
 
 const { getI18n, hooks, renderer } = VxeUI
 
@@ -324,7 +324,7 @@ hooks.add('tableExportModule', {
       return eqEmptyValue(cellValue) ? '' : `${cellValue}`
     }
 
-    const getBodyLabelData = (opts: any, columns: any[], datas: any[]) => {
+    const getBodyLabelData = (opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) => {
       const { isAllExpand, mode } = opts
       const { treeConfig } = props
       const radioOpts = computeRadioOpts.value
@@ -353,7 +353,7 @@ hooks.add('tableExportModule', {
             columns.forEach((column, $columnIndex) => {
               let cellValue: string | number | boolean | null = ''
               const renderOpts = column.editRender || column.cellRender
-              let bodyExportMethod = column.exportMethod || columnOpts.exportMethod
+              let bodyExportMethod: VxeColumnPropTypes.ExportMethod | undefined = column.exportMethod || columnOpts.exportMethod
               if (!bodyExportMethod && renderOpts && renderOpts.name) {
                 const compConf = renderer.get(renderOpts.name)
                 if (compConf) {
@@ -414,7 +414,7 @@ hooks.add('tableExportModule', {
         columns.forEach((column, $columnIndex) => {
           let cellValue: string | number | boolean | null = ''
           const renderOpts = column.editRender || column.cellRender
-          let bodyExportMethod = column.exportMethod || columnOpts.exportMethod
+          let bodyExportMethod: VxeColumnPropTypes.ExportMethod | undefined = column.exportMethod || columnOpts.exportMethod
           if (!bodyExportMethod && renderOpts && renderOpts.name) {
             const compConf = renderer.get(renderOpts.name)
             if (compConf) {
@@ -959,6 +959,9 @@ hooks.add('tableExportModule', {
         message: true,
         isHeader: showHeader,
         isFooter: showFooter,
+        isColgroup: isGroup,
+        isMerge: hasMerge,
+        useStyle: true,
         current: 'current',
         modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : [])
       }, options)