cloud-web-corejs 1.0.54-dev.530 → 1.0.54-dev.532

package/package.json

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

package/src/components/excelExport/exportFieldDialog.vue

@@ -13,7 +13,9 @@
     :before-close="handleBeforeClose"
   >
     <div class="cont" style="max-height: 500px">
-      <div class="tit" style="margin-bottom: 5px;"><b>{{ $t1('导出字段') }}</b></div>
+      <div class="tit" style="margin-bottom: 5px">
+        <b>{{ $t1("导出字段") }}</b>
+      </div>
       <el-tree
         :props="defaultProps"
         :data="data"
@@ -30,11 +32,11 @@
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" plain class="button-sty" @click="handleDialogClose">
         <i class="el-icon-close el-icon"></i>
-        {{ $t1('取 消') }}
+        {{ $t1("取 消") }}
       </el-button>
       <el-button type="primary" @click="dialogConfirm" class="button-sty">
         <i class="el-icon-check el-icon"></i>
-        {{ $t1('确 定') }}
+        {{ $t1("确 定") }}
       </el-button>
     </span>
   </el-dialog>
@@ -42,89 +44,162 @@
 <script>
 export default {
   name: "exportFieldDialog",
-  props: ['param'],
+  props: ["param"],
   data() {
     return {
       showDialog: true,
       data: [],
       defaultProps: {
-        label: 'title', //这里是树结构中需显示的数据（即接口返回的需展示在页面上的参数）
-        children: 'children'
+        label: "title", //这里是树结构中需显示的数据（即接口返回的需展示在页面上的参数）
+        children: "children",
       },
       defaultCheckedKeys: [],
       columns: [],
-      allFields: []
-    }
+      allFields: [],
+    };
   },
   created() {
     this.init();
   },
   methods: {
+    loopColumnHandle(items, handler) {
+      items.forEach((item) => {
+        handler(item);
+        if (item.children && item.children.length) {
+          this.loopColumnHandle(item.children, handler);
+        }
+      });
+    },
+    generateId() {
+      return Math.floor(
+        Math.random() * 100000 + Math.random() * 20000 + Math.random() * 5000
+      );
+    },
     init() {
       let target = this.getGrid();
-      let {fullColumn, collectColumn: columns} = target.getTableColumn();
+      let { fullColumn, collectColumn: columns } = target.getTableColumn();
       // let columns = target.getTableColumn().collectColumn;
-      let exportColumns = target.exportColumns || [];
-      let yesFields = [];
-      let noFields = []
+
+      let exportItem = this.param.type === "exportItem";
+
       let allFields = [];
-      exportColumns.forEach(item => {
+      let defaultCheckedKeys = [];
+      let cols = [];
+
+      let yesFields = [];
+      let noFields = [];
+
+      let exportColumns = !exportItem
+        ? target.exportColumns || []
+        : target.exportItemColumns || [];
+
+      this.loopColumnHandle(exportColumns, (item) => {
         if (item.field) {
           if (item.export) {
-            yesFields.push(item.field)
+            yesFields.push(item.field);
           } else {
-            noFields.push(item.field)
+            noFields.push(item.field);
           }
         }
-      })
+      });
 
-      let defaultCheckedKeys = []
-      let cols = [];
-      fullColumn.forEach(column => {
-        if (column.field) {
-          if (yesFields.includes(column.field)) {
-            defaultCheckedKeys.push(column.id)
-          } else if (!noFields.includes(column.field) && column.visible) {
-            defaultCheckedKeys.push(column.id)
+      if (!exportItem) {
+        //导出主表数据
+
+        fullColumn.forEach((column) => {
+          if (column.field) {
+            if (yesFields.includes(column.field)) {
+              defaultCheckedKeys.push(column.id);
+            } else if (!noFields.includes(column.field) && column.visible) {
+              defaultCheckedKeys.push(column.id);
+            }
+            allFields.push(column.field);
           }
-          allFields.push(column.field);
-        }
-      })
-      columns.forEach(column => {
-        if (column.title) {
-          cols.push(column);
-        }
-      });
+        });
+        columns.forEach((column) => {
+          if (column.title) {
+            cols.push(column);
+          }
+        });
+      } else {
+        //导出子表数据
+        let exportItemColumns = target.exportItemColumns || [];
+        let originOption = target.originOption;
+        let oriExportItemColumns = originOption.exportItemConfig?.columns || [];
+
+        this.loopColumnHandle(oriExportItemColumns, (item) => {
+          item.id = this.generateId();
+          if (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);
+          }
+        });
+        oriExportItemColumns.forEach((column) => {
+          if (column.title) {
+            cols.push(column);
+          }
+        });
+      }
+
       this.allFields = allFields;
       this.defaultCheckedKeys = defaultCheckedKeys;
-      let data = [
+      /* let data = [
         {
-          label: this.$t1('全部字段'),
+          label: this.$t1("全部字段"),
           id: -1,
           leaf: true,
-          children: this.$baseLodash.cloneDeep(cols)
-        }
-      ]
+          children: this.$baseLodash.cloneDeep(cols),
+        },
+      ]; */
       this.data = this.$baseLodash.cloneDeep(cols);
     },
     addTableExportColumns() {
+      let exportItem = this.param.type === "exportItem";
+
       let $grid = this.getGrid();
-      let leafColumns = this.$refs.tree.getCheckedNodes(true)
-      let checkLeafIds = leafColumns.map(item => item.id)
-      let {fullColumn} = $grid.getTableColumn();
-      let exportColumns = []
-      fullColumn.map(column => {
-        if (column.field && column.title) {
-          let item = {
-            field: column.field,
-            export: checkLeafIds.includes(column.id)
+      let originOption = $grid.originOption;
+      let leafColumns = this.$refs.tree.getCheckedNodes(true);
+      let checkLeafIds = leafColumns.map((item) => item.id);
+
+      // let syncEportItemColumns = $grid.exportItemColumns || [];
+      // let syncExportColumns = $grid.exportColumns || [];
+
+      if (!exportItem) {
+        //导出主表数据
+        let exportColumns = [];
+        let { fullColumn } = $grid.getTableColumn();
+        fullColumn.map((column) => {
+          if (column.field && column.title) {
+            let item = {
+              field: column.field,
+              export: checkLeafIds.includes(column.id),
+            };
+            exportColumns.push(item);
           }
-          exportColumns.push(item)
+        });
+        $grid.exportColumns = exportColumns;
+      } else {
+        //导出子表数据
+        let exportItemColumns = [];
+        if (originOption.exportItemConfig?.columns?.length) {
+          this.loopColumnHandle(originOption.exportItemConfig?.columns, (column) => {
+            if (column.field && column.title) {
+              let item = {
+                field: column.field,
+                export: checkLeafIds.includes(column.id),
+              };
+              exportItemColumns.push(item);
+            }
+          });
+          $grid.exportItemColumns = exportItemColumns;
         }
-      })
-      let originOption = $grid.originOption
-      $grid.exportColumns = exportColumns;
-      this.$vxeTableUtil.addTableJson(originOption.vue, $grid, originOption.tableName)
+
+        this.$vxeTableUtil.addTableJson(originOption.vue, $grid, originOption.tableName);
+      }
     },
     handleBeforeClose(hide) {
       // this.$emit('cancel');
@@ -132,61 +207,64 @@ export default {
       hide();
     },
     handleDialogClose() {
-      this.$emit('close');
-      this.dialogClose()
+      this.$emit("close");
+      this.dialogClose();
     },
     dialogClose() {
       this.showDialog = false;
-      this.$emit('update:visiable', false);
+      this.$emit("update:visiable", false);
     },
     dialogConfirm() {
       let target = this.getGrid();
-      let leafColumns = this.$refs.tree.getCheckedNodes(true)
-      let checkIds = this.$refs.tree.getCheckedNodes(false, true).map(item => item.id)
-      let collectColumn = target.getTableColumn().collectColumn;
+      let originOption = target.originOption;
+      let leafColumns = this.$refs.tree.getCheckedNodes(true);
+      let checkIds = this.$refs.tree.getCheckedNodes(false, true).map((item) => item.id);
+      let exportItem = this.param.type == "exportItem";
+      let collectColumn = !exportItem
+        ? target.getTableColumn().collectColumn
+        : originOption.exportItemConfig?.columns;
       let maxRowspan = 1;
-      leafColumns.forEach(item => {
+      leafColumns.forEach((item) => {
         maxRowspan = Math.max(maxRowspan, item.level);
-      })
+      });
 
       let loopDo = (items, parent) => {
-        let datas = []
-        items.forEach(item => {
+        let datas = [];
+        items.forEach((item) => {
           if (checkIds.includes(item.id)) {
             let column = this.$baseLodash.cloneDeep(item);
             if (item.children && item.children.length > 0) {
               let children = this.$baseLodash.cloneDeep(loopDo(item.children));
               column.children = children;
               if (children.length) {
-                column.colSpan = children.length
+                column.colSpan = children.length;
               } else {
-                column.colSpan = 1
+                column.colSpan = 1;
               }
             } else if (!column.parentId) {
-              column.rowSpan = maxRowspan
+              column.rowSpan = maxRowspan;
             }
-            ;
             datas.push(column);
           }
-        })
+        });
         return datas;
-      }
-      let columns = loopDo(collectColumn, null)
-      this.$emit('confirm', {columns, leafColumns});
+      };
+      let columns = loopDo(collectColumn, null);
+      this.$emit("confirm", { columns, leafColumns });
       this.addTableExportColumns();
       this.dialogClose();
     },
-    getExportTitleJson() {
+    /* getExportTitleJson() {
       let target = this.getGrid();
       let columns = target.getColumns();
       let cols = [];
-      columns.forEach(column => {
+      columns.forEach((column) => {
         if (column.title && column.visible) {
           cols.push(column);
         }
       });
       return cols;
-    },
+    }, */
     getGrid() {
       let that = this.param.vue;
       let tableRef = this.param.targetRef;
@@ -198,14 +276,9 @@ export default {
       }
       return $grid;
     },
-    revert() {
-
-    }
-  }
-}
+    revert() {},
+  },
+};
 </script>
 
-
-<style scoped>
-
-</style>
+<style scoped></style>