cloud-web-corejs 1.0.54-dev.495 → 1.0.54-dev.496

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.495",
+  "version": "1.0.54-dev.496",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/excelExport/mixins.js

@@ -593,12 +593,39 @@ function getGrid(that, tableRef) {
         });
         return [titles];
       },*/
+      computeRealColSpan(columns) {
+        // 深拷贝避免修改原数据（可选）
+        // const result = JSON.parse(JSON.stringify(columns));
+
+        function traverse(node) {
+          if (!node.children || node.children.length === 0) {
+            // 叶子节点：realColSpan = 原始 colSpan
+            node.realColSpan = node.colSpan || 1;
+          } else {
+            // 非叶子节点：递归处理子节点，然后求和
+            let sum = 0;
+            for (const child of node.children) {
+              traverse(child);
+              sum += child.realColSpan;
+            }
+            node.realColSpan = sum;
+          }
+        }
+
+        for (const col of columns) {
+          traverse(col);
+        }
+
+        return columns;
+      },
       getHeadTitleJson() {
         let that = this;
         let target = this.tableTarget;
         // let columns = target.getTableColumn().collectColumn;
         let columns = this.columns
 
+        this.computeRealColSpan(columns);
+
         let maxRowNum = 0;
         let loop = function (column, n) {
           if (column.children && column.children.length > 0) {
@@ -634,7 +661,7 @@ function getGrid(that, tableRef) {
               }
 
               contents.push({
-                colspan: column.colSpan,
+                colspan: column.realColSpan,
                 rowspan: column.rowSpan,
                 title: column.title != null ? column.title : ''
               });