cloud-web-corejs 1.0.54-dev.533 → 1.0.54-dev.536

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.533",
+  "version": "1.0.54-dev.536",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",
@@ -16,6 +16,12 @@
     "publishDev": "npm publish --tag dev"
   },
   "dependencies": {
+    "@univerjs/preset-sheets-core": "^0.15.0",
+    "@univerjs/preset-sheets-drawing": "^0.15.0",
+    "@univerjs/presets": "^0.15.0",
+    "@univerjs/sheets-crosshair-highlight": "^0.15.0",
+    "@univerjs/sheets-zen-editor": "^0.15.0",
+    "@univerjs/watermark": "^0.15.0",
     "@codemirror/lang-javascript": "^6.1.9",
     "@formulajs/formulajs": "^4.3.1",
     "@vue/preload-webpack-plugin": "^2.0.0",
@@ -152,6 +158,7 @@
     "src/components/table",
     "src/components/tempStorage",
     "src/components/Tinymce",
+    "src/components/univer",
     "src/components/obsUpload",
     "src/components/VabUpload",
     "src/components/vb-tabs",

package/src/components/excelExport/exportFieldDialog.vue

@@ -42,6 +42,7 @@
   </el-dialog>
 </template>
 <script>
+import xeUtils from "xe-utils";
 export default {
   name: "exportFieldDialog",
   props: ["param"],
@@ -75,14 +76,76 @@ export default {
         Math.random() * 100000 + Math.random() * 20000 + Math.random() * 5000
       );
     },
+    filterExportVisible(items) {
+      if (!Array.isArray(items)) return [];
+
+      return items
+        .filter((item) => item.exportItemVisible === true) // 只保留 exportItemVisible 严格等于 true 的项
+        .map((item) => {
+          // 如果有 children，递归过滤
+          if (Array.isArray(item.children)) {
+            return {
+              ...item,
+              children: this.filterExportVisible(item.children),
+            };
+          }
+          return item;
+        });
+    },
     init() {
       let target = this.getGrid();
-      let { fullColumn, collectColumn: columns } = target.getTableColumn();
+      let { fullColumn, collectColumn: column1s } = target.getTableColumn();
+
+      let checkMethod = target.$refs.xTable.customOpts?.checkMethod;
+      // var checkMethod = $xetable ? $xetable.customOpts.checkMethod : null;
       // let columns = target.getTableColumn().collectColumn;
+      let columns = [];
+      let allFields = [];
+      if (checkMethod) {
+        const handleColumnVisible = (column) => {
+          if (!column.title) return false;
+          let visible = true;
+
+          let isColGroup = column.children && column.children.length;
+
+          if (isColGroup) {
+            // 如果是分组字段，则根据子字段的显示状态来处理
+            let parentVisible = false;
+            column.children.forEach((item) => {
+              let itemVisible = handleColumnVisible(item);
+              if (itemVisible) {
+                parentVisible = true;
+              }
+            });
+            visible = parentVisible;
+            /* visible = column.children.some((item) => {
+              return handleColumnVisible(item);
+            }); */
+          } else {
+            let isDisabled = !checkMethod({
+              column: column,
+            });
+            if (isDisabled) {
+              // 如果字段被禁用勾选，根据显示状态来处理
+              visible = column.visible;
+            }
+            if (column.field && visible) {
+              allFields.push(column.field);
+            }
+          }
+          column.exportItemVisible = visible;
+          return visible;
+        };
+        column1s.forEach((column) => {
+          return handleColumnVisible(column);
+        });
+        columns = this.filterExportVisible(column1s);
+      } else {
+        columns = column1s;
+      }
 
       let exportItem = this.param.type === "exportItem";
 
-      let allFields = [];
       let defaultCheckedKeys = [];
       let cols = [];
 
@@ -113,7 +176,6 @@ export default {
             } else if (!noFields.includes(column.field) && column.visible) {
               defaultCheckedKeys.push(column.id);
             }
-            allFields.push(column.field);
           }
         });
         columns.forEach((column) => {
@@ -129,13 +191,13 @@ export default {
 
         this.loopColumnHandle(oriExportItemColumns, (item) => {
           item.id = this.generateId();
-          if (item.field) {
+          if (item.field && allFields.includes(item.field)) {
             if (yesFields.includes(item.field)) {
               defaultCheckedKeys.push(item.id);
             } else if (!noFields.includes(item.field)) {
               defaultCheckedKeys.push(item.id);
             }
-            allFields.push(item.field);
+            // allFields.push(item.field);
           }
         });
         oriExportItemColumns.forEach((column) => {
@@ -197,9 +259,8 @@ export default {
           });
           $grid.exportItemColumns = exportItemColumns;
         }
-
-        this.$vxeTableUtil.addTableJson(originOption.vue, $grid, originOption.tableName);
       }
+      this.$vxeTableUtil.addTableJson(originOption.vue, $grid, originOption.tableName);
     },
     handleBeforeClose(hide) {
       // this.$emit('cancel');