cloud-web-corejs 1.0.54-dev.326 → 1.0.54-dev.328

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -5,16 +5,16 @@ import containerItemMixin from "./containerItemMixin";
 
 import * as formatUtil from "../../../../components/xform/utils/format.js";
 import tableConfig from "../../../../components/table/config.js";
-import {extendDeeply} from "../../../../utils/index.js";
+import { extendDeeply } from "../../../../utils/index.js";
 import {
   assembleAxiosConfig,
   getReportGlobalMap,
   generateId,
   deepClone,
   loopHandleWidget,
-  columnFormatMap
+  columnFormatMap,
 } from "../../../../components/xform/utils/util";
-import {tableTreeMixins} from "../../../../mixins/tableTree/index.js";
+import { tableTreeMixins } from "../../../../mixins/tableTree/index.js";
 
 let modules = {};
 const baseRefUtil = {
@@ -152,7 +152,7 @@ modules = {
       return void 0 === this.widget.options.buttonsColumnFixed
         ? "right"
         : !!this.widget.options.buttonsColumnFixed &&
-        this.widget.options.buttonsColumnFixed;
+            this.widget.options.buttonsColumnFixed;
     },
     formModel: {
       cache: !1,
@@ -169,7 +169,7 @@ modules = {
     if (!this.formModel[this.fieldKeyName])
       this.formModel[this.fieldKeyName] = [];
     this.initRefList();
-    this.initConfig();
+    // this.initConfig();
     this.initEventHandler();
     this.registerTableRefList();
     this.handleOnCreated();
@@ -184,7 +184,7 @@ modules = {
   methods: {
     initConfig() {
       let formRef = this.getFormRef();
-      this.widget.options.tableColumns.forEach(row => {
+      this.widget.options.tableColumns.forEach((row) => {
         let type = columnFormatMap[row.formatS];
         if (type && row.columnOption && !row.widget) {
           let fieldWidget = formRef.copyNewFieldWidget(
@@ -201,10 +201,10 @@ modules = {
           fieldWidget.options = row.editColumnOption;
           row.editWidget = fieldWidget;
         }
-      })
+      });
     },
     registerTableRefList() {
-      this.sfRefList[this.widget.options.name] = this
+      this.sfRefList[this.widget.options.name] = this;
     },
     getRowRefKey(row, name) {
       let keyVal = row._X_ROW_KEY;
@@ -217,8 +217,8 @@ modules = {
       // let row = this.getGridTable().getTableData().fullData[index];
       let formRows = this.formModel[this.fieldKeyName];
       let row = formRows[index];
-      let widget = this.getWidgetByTableRowData(row, name)
-      return widget
+      let widget = this.getWidgetByTableRowData(row, name);
+      return widget;
     },
     getWidgetRefByTableRow(index, name) {
       // let row = this.getGridTable().getTableData().fullData[index];
@@ -229,7 +229,7 @@ modules = {
     getWidgetByTableRowData(row, name) {
       let target = this.getWidgetRefByTableRowData(row, name);
       let widget = target.field || target.widget;
-      return widget
+      return widget;
     },
     getWidgetRefByTableRowData(row, name) {
       let key = this.getRowRefKey(row, name);
@@ -240,37 +240,37 @@ modules = {
       // let params = tableParam.column.params;
       // let name = params.widget.options.name;
       // let key = this.getRowRefKey(tableParam.row, name);
-      return this.getWidgetRefByTableRowData(tableParam.row, name)
+      return this.getWidgetRefByTableRowData(tableParam.row, name);
       // return this.getWidgetRef(key);
     },
     getRowWidget(rowParam, fieldWidget) {
       let row = rowParam.row;
       let params = rowParam.column.params;
       let widgetId = fieldWidget ? fieldWidget.id : params.widget.id;
-      let widget = this.fieldSchemaMap[row._X_ROW_KEY][widgetId]
+      let widget = this.fieldSchemaMap[row._X_ROW_KEY][widgetId];
       return widget;
     },
     loopHandleWidgetByName(name, callback) {
       let rows = this.getValue();
       rows.forEach((row, index) => {
-        let target = this.getWidgetRefByTableRow(index, name)
+        let target = this.getWidgetRefByTableRow(index, name);
         if (target) {
           let widget = target.field || target.widget;
-          callback(row, widget, target)
+          callback(row, widget, target);
         }
-      })
+      });
     },
     getRowWidgetOption(rowParam, fieldWidget) {
       let widget = this.getRowWidget(rowParam, fieldWidget);
-      let field = widget.category == 'container' ? 'widget' : 'field'
+      let field = widget.category == "container" ? "widget" : "field";
       let option = {
-        [field]: widget
-      }
-      return option
+        [field]: widget,
+      };
+      return option;
     },
     getRowWidgetKey(rowParam, fieldWidget) {
       let widget = this.getRowWidget(rowParam, fieldWidget);
-      let key = widget.id
+      let key = widget.id;
       return key;
     },
     getGridTableName() {
@@ -292,36 +292,35 @@ modules = {
       let rows = val || [];
       this.formModel[this.fieldKeyName] = rows;
       this.fieldModel = rows;
-      this.initRowIdData(true)
-      this.initFieldSchemaData()
+      this.initRowIdData(true);
+      this.initFieldSchemaData();
     },
     initValue(val) {
       // this.clearRowWidgets()
       let rows = val || [];
       rows.forEach((row, index) => {
-        row._X_ROW_KEY = "row_" + generateId()
-      })
+        row._X_ROW_KEY = "row_" + generateId();
+      });
       this.formModel[this.fieldKeyName] = rows;
       this.fieldModel = rows;
-      this.initRowIdData(true)
-      this.initFieldSchemaData(true)
-
+      this.initRowIdData(true);
+      this.initFieldSchemaData(true);
     },
     setValue(val) {
       // console.log("rows:",val);
-      this.clearRowWidgets()
+      this.clearRowWidgets();
       let rows = val || [];
       rows.forEach((row, index) => {
         if (!row._X_ROW_KEY) {
-          row._X_ROW_KEY = "row_" + generateId()
+          row._X_ROW_KEY = "row_" + generateId();
         }
-      })
+      });
       this.formModel[this.fieldKeyName] = rows;
       let $grid = this.getGridTable();
       this.fieldModel = rows;
 
-      this.initRowIdData()
-      this.initFieldSchemaData()
+      this.initRowIdData();
+      this.initFieldSchemaData();
       // $grid.loadData(rows);
     },
     getValue() {
@@ -334,7 +333,7 @@ modules = {
     selectWidget: function (e) {
       this.designer.setSelected(e);
     },
-    formatterValue: function ({cellValue, row, column}) {
+    formatterValue: function ({ cellValue, row, column }) {
       if (cellValue === null || cellValue === undefined) return cellValue;
 
       if (column.params && column.params.formatS)
@@ -420,11 +419,10 @@ modules = {
       let formRef = this.getFormRef();
       let parentTarget = formRef.$attrs["parent-target"];
       parentTarget &&
-      parentTarget.$attrs.openEditDialog &&
-      parentTarget.$attrs.openEditDialog(row, param);
-    },
-    importExcel() {
+        parentTarget.$attrs.openEditDialog &&
+        parentTarget.$attrs.openEditDialog(row, param);
     },
+    importExcel() {},
     getGrid(that, tableRef) {
       var $grid;
       if (Array.isArray(that.$refs[tableRef])) {
@@ -471,7 +469,6 @@ modules = {
 
       let tableWidgetName = this.widget.options.name;
       const createColumn = (t, isChild) => {
-
         let col = {
           fixed: !!t.fixed && t.fixed,
           field: t.prop,
@@ -488,16 +485,16 @@ modules = {
             footerDataType: t.footerDataType,
             footerMethodConfg: t.footerMethodConfg,
             widgetList: t.widgetList,
-            tableWidgetName
+            tableWidgetName,
           },
           visible: t.show,
           slots: {},
         };
-        if(t.required){
+        if (t.required) {
           /*col.titlePrefix = {
             icon:"el-icon-star-on"
           }*/
-          col.title = "* "+col.title
+          col.title = "* " + col.title;
         }
         if (t.treeNode) {
           col.treeNode = true;
@@ -530,16 +527,15 @@ modules = {
         col = addColumProperty(col, t);
 
         if (col.params.widget) {
-          rowWidgetList.push(col.params.widget)
+          rowWidgetList.push(col.params.widget);
         }
         if (col.params.editWidget) {
-          rowWidgetList.push(col.params.editWidget)
+          rowWidgetList.push(col.params.editWidget);
         }
         if (col.params.widgetList && col.params.widgetList.length) {
           col.params.widgetList.forEach((item) => {
-            rowWidgetList.push(item)
-          })
-
+            rowWidgetList.push(item);
+          });
         }
         return col;
       };
@@ -561,7 +557,6 @@ modules = {
           true
         );*/
 
-
         let widget = t.widget ?? null;
         let editWidget = t.editWidget ?? null;
         let columnOption = {};
@@ -593,7 +588,7 @@ modules = {
           }
 
           if (editWidget) {
-            col.editRender = {name: "input"};
+            col.editRender = { name: "input" };
             // col.slots.edit = editWidget.id;
             col.slots.edit = "editWidget";
           }
@@ -688,9 +683,9 @@ modules = {
             valueFormat: options.valueFormat ?? null,
           };
           let typeMap = {
-            input: {type: "input"},
-            number: {type: "number"},
-            inputBatch: {type: "inputBatch"},
+            input: { type: "input" },
+            number: { type: "number" },
+            inputBatch: { type: "inputBatch" },
             date: {
               type: "date",
               widgetType: options.type,
@@ -706,7 +701,7 @@ modules = {
             "date-range": {
               type: "date",
               widgetType: "daterange",
-              widgetConfig: {...dateConfig, isRange: true},
+              widgetConfig: { ...dateConfig, isRange: true },
             },
             "time-range": {
               type: "time",
@@ -803,7 +798,7 @@ modules = {
           parentField: "f_parent",
           transform: true,
           expandAll: true,
-          loadMethod({$table, row}) {
+          loadMethod({ $table, row }) {
             // 模拟后台接口
             let $grid = that.getGridTable();
             let parentField = $grid.treeConfig.parentField;
@@ -879,26 +874,34 @@ modules = {
       }
 
       //标题颜色
-      let headerCellStyle = null
+      let headerCellStyle = null;
       let tableColumns = this.widget.options.tableColumns;
-      let colorMap = {}
-      let flag = 0
-      tableColumns.forEach(item=>{
+      let colorMap = {};
+      let flag = 0;
+      /* tableColumns.forEach(item=>{
         if(item.labelColor){
           flag = 1;
           colorMap[item.columnId] = item.labelColor
         }
-      })
-      if(flag){
-        headerCellStyle = (rowParam)=>{
+      }) */
+
+      this.loodHandleColumns(tableColumns, (item) => {
+        if (item.labelColor) {
+          flag = 1;
+          colorMap[item.columnId] = item.labelColor;
+        }
+      });
+
+      if (flag) {
+        headerCellStyle = (rowParam) => {
           let columnId = rowParam.column?.params?.columnId;
-          if(columnId){
-            let color = colorMap[rowParam.column.params.columnId]
-            if(color){
-              return `color:${color};`
+          if (columnId) {
+            let color = colorMap[rowParam.column.params.columnId];
+            if (color) {
+              return `color:${color};`;
             }
           }
-        }
+        };
       }
 
       let tableOption = {
@@ -936,23 +939,23 @@ modules = {
           let $grid = this.getGridTable();
           let pageSize = param.size;
           let currentPage = param.current;
-          let page = {pageSize, currentPage};
+          let page = { pageSize, currentPage };
           let customParam = {
             config: {
               modal: false,
             },
-            export: true
+            export: true,
           };
           return $grid.$options.propsData.proxyConfig.ajax.query.call(this, {
             page,
             param,
-            customParam
+            customParam,
           });
         },
         // treeNodeUrl,
         editDefaultRow,
         treeNodeParam,
-        ...otherConfig
+        ...otherConfig,
       };
 
       if (isQueryTable) {
@@ -967,7 +970,7 @@ modules = {
           },
           ajax: {
             // 接收 Promise 对象
-            query: ({page, sorts, filters, form, param, customParam}) => {
+            query: ({ page, sorts, filters, form, param, customParam }) => {
               let formData = tableOption.param ? tableOption.param() || {} : {};
               const queryParams = Object.assign({}, formData);
 
@@ -982,7 +985,7 @@ modules = {
 
               // 处理筛选条件
               if (filters) {
-                filters.forEach(({property, values}) => {
+                filters.forEach(({ property, values }) => {
                   queryParams[property] = values.join(",");
                 });
               }
@@ -1026,12 +1029,11 @@ modules = {
                         //导出
                         this.initExportFieldSchemaData(rows);
                       } else {
-                        this.initValue(rows)
+                        this.initValue(rows);
                       }
 
                       resolve(res);
                       if (res.type == "success") {
-
                         if (that.widget.options.isTreeTable) {
                           if (rows.length > 0) {
                             let fullAllDataRowMap =
@@ -1044,8 +1046,8 @@ modules = {
                               .map((item) => item[parentField]);
                             let expandRows = expandIds.length
                               ? rows.filter((item) =>
-                                expandIds.includes(item.id)
-                              )
+                                  expandIds.includes(item.id)
+                                )
                               : [];
                             if (expandAll && expandRows.length) {
                               that.$nextTick(() => {
@@ -1137,12 +1139,19 @@ modules = {
       }
 
       if (tableOption.config.showFooter && !tableOption.config.footerMethod) {
-        let footerColumnIds = columns
+        let footerColumnIds = [];
+        this.loodHandleColumns(columns, (item) => {
+          if (!item.children?.length && !!item.params?.footerDataType) {
+            footerColumnIds.push(item.params.columnId);
+          }
+        });
+
+        /* let footerColumnIds = columns
           .filter((item) => !!item.params?.footerDataType)
-          .map((item) => item.params.columnId);
+          .map((item) => item.params.columnId); */
         if (footerColumnIds.length) {
           tableOption.config.footerMethod = (param) => {
-            let {columns: column1s, data} = param;
+            let { columns: column1s, data } = param;
             return [
               column1s.map((column, columnIndex) => {
                 let columnId = column.params?.columnId;
@@ -1190,6 +1199,20 @@ modules = {
         }
       });
     },
+    loodHandleColumns(columns, callback) {
+      let columnLoopDo = (t, e) => {
+        callback && callback(t);
+        if (t.children && t.children.length) {
+          for (let item of t.children) {
+            columnLoopDo(item);
+          }
+        }
+      };
+      for (let item of columns) {
+        columnLoopDo(item);
+      }
+    },
+
     meanNum(list, field) {
       let count = this.sumNum(list, field);
       return this.$baseDiv(count, list.length);
@@ -1202,7 +1225,7 @@ modules = {
       return count;
     },
     getSearchFormData() {
-      let map = {condition: []};
+      let map = { condition: [] };
       let formData = this.globalModel.formModel;
       let widgetList = this.widget.widgetList;
       if (!!widgetList && widgetList.length > 0) {
@@ -1251,18 +1274,27 @@ modules = {
       return accessUrl || USER_PREFIX + `/form_ins/getFormInsData`;
     },
     getAttachmentType() {
-      let vailColumns = this.widget.options.tableColumns.filter(
+      /* let vailColumns = this.widget.options.tableColumns.filter(
         (item) => item.prop && item.label
       );
       let result = vailColumns
         .filter((item) => {
           return item.formatS == "editAttachment";
         })
-        .map((item) => item.prop);
+        .map((item) => item.prop); */
+
+      let result = [];
+      this.loodHandleColumns(this.widget.options.tableColumns, (item) => {
+        if (!item.children?.length && item.prop && item.label) {
+          if (item.formatS == "editAttachment") {
+            result.push(item.prop);
+          }
+        }
+      });
       return result;
     },
     getThirdtabm() {
-      let vailColumns = this.widget.options.tableColumns.filter(
+      /* let vailColumns = this.widget.options.tableColumns.filter(
         (item) => item.prop && item.label
       );
       let result = vailColumns
@@ -1271,7 +1303,18 @@ modules = {
             item.formatS == "editSearch" && item.columnOption.multipleChoices
           );
         })
-        .map((item) => item.prop);
+        .map((item) => item.prop); */
+      let result = [];
+      this.loodHandleColumns(this.widget.options.tableColumns, (item) => {
+        if (!item.children?.length && item.prop && item.label) {
+          if (
+            item.formatS == "editSearch" &&
+            item.widget?.options?.multipleChoices
+          ) {
+            result.push(item.prop);
+          }
+        }
+      });
       return result;
     },
 
@@ -1367,7 +1410,7 @@ modules = {
 
       let requestData = {
         ...reqData,
-        ...otherParam
+        ...otherParam,
       };
       requestData = extendDeeply(requestData, accessParam);
 
@@ -1389,7 +1432,10 @@ modules = {
       });
     },
     loadAccessData(flag) {
-      if(this.formModel[this.fieldKeyName] && this.formModel[this.fieldKeyName].length){
+      if (
+        this.formModel[this.fieldKeyName] &&
+        this.formModel[this.fieldKeyName].length
+      ) {
         this.initValue(this.formModel[this.fieldKeyName]);
       }
       if (flag === 1) {
@@ -1418,7 +1464,7 @@ modules = {
           param = item.accessParam;
         }
       } else {
-        param = {id: dataId};
+        param = { id: dataId };
       }
       return param;
     },
@@ -1432,14 +1478,14 @@ modules = {
       option.prefix = option.prefix || "/" + serviceName;
       let exportTableTarget = this.$refs.exportTable;
       let getExportTableRef = () => {
-        return exportTableTarget
-      }
-      this.$excelExport({targetRef: tableRef, ...option});
+        return exportTableTarget;
+      };
+      this.$excelExport({ targetRef: tableRef, ...option });
     },
     async deleteRow(row, rowIndex) {
       let isTreeTable = this.widget.options.isTreeTable;
       if (isTreeTable) {
-        this.removeTreeRow({row});
+        this.removeTreeRow({ row });
         return;
       }
       let $grid = this.getGridTable();
@@ -1447,20 +1493,46 @@ modules = {
       let tableData = $grid.getTableData();
       let isEditTable = this.widget.options.isEditTable;
       let fullData = !isEditTable ? tableData.fullData : tableData.tableData;
-      await this.$nextTick(() => {
-        this.formModel[this.fieldKeyName] = fullData;
-        this.fieldModel = fullData;
-      });
+      this.formModel[this.fieldKeyName] = fullData;
+      this.fieldModel = fullData;
       this.$nextTick(() => {
         this.handleWbs();
       });
-      this.deleteRowWidgets(row)
+      
+      // this.deleteRowWidgets(row);
     },
     createNewTableData(isEdit) {
-      let vailColumns = this.widget.options.tableColumns.filter(
+      let newData = {};
+      this.loodHandleColumns(this.widget.options.tableColumns, (item) => {
+        if (!item.children?.length && item.prop && item.label) {
+          let formatS = !isEdit ? item.formatS : item.editFormatS;
+          let columnOption = !isEdit
+            ? item.columnOption
+            : item.editColumnOption;
+          if (formatS == "editSearch") {
+            newData[item.prop] = null;
+            let vabSearchName = item?.columnOption?.vabSearchName;
+            if (vabSearchName) newData[vabSearchName] = null;
+          }
+          if (formatS == "editAttachment") {
+            newData[item.prop] = [];
+          } else {
+            newData[item.prop] = null;
+            if (
+              columnOption &&
+              columnOption.defaultValue !== undefined &&
+              columnOption.defaultValue !== null &&
+              columnOption.defaultValue !== ""
+            ) {
+              newData[item.prop] = columnOption.defaultValue;
+            }
+          }
+        }
+      });
+
+      /* let vailColumns = this.widget.options.tableColumns.filter(
         (item) => item.prop && item.label
       );
-      let newData = {};
       vailColumns.forEach((item) => {
         let formatS = !isEdit ? item.formatS : item.editFormatS;
         let columnOption = !isEdit ? item.columnOption : item.editColumnOption;
@@ -1482,7 +1554,7 @@ modules = {
             newData[item.prop] = columnOption.defaultValue;
           }
         }
-      });
+      }); */
       return newData;
     },
     addTableData(rows, field) {
@@ -1626,7 +1698,21 @@ modules = {
           columnSelectedWidget.options.labelHidden = true;
         }
       }
-      return {columnSelectedWidget, columnEditFields};
+      return { columnSelectedWidget, columnEditFields };
+    },
+    getColumnProp2(fieldWidget, obj) {
+      let fieldKeyName = this.getFieldKeyName(this.widget);
+      let property = this.getFieldKeyName(fieldWidget);
+      if (this.isVabsearchFlagWidget(fieldWidget)) {
+        property = fieldWidget.options.vabSearchName || property;
+      }
+      let rowIndex = Math.max(obj.rowIndex, 0);
+      
+      let propName = fieldKeyName + "." + rowIndex + "." + property;
+      if(rowIndex){
+        debugger
+      }
+      return propName
     },
     getColumnProp(widget, obj, isEdit) {
       if (!widget) {
@@ -1636,24 +1722,37 @@ modules = {
         return "false"
       }*/
 
-      let fieldKeyName = this.getFieldKeyName(widget);
-      let rowIndex = Math.max(obj.rowIndex, 0);
+     
+
       let isQueryTable = this.widget.options.isQueryTable || false;
       if (isEdit || !isQueryTable) {
-        let propName =
-          fieldKeyName + "." + rowIndex + "." + obj.column.property;
-        let lineWidget = !isEdit
+        let sourceWidgetId = isEdit?obj.column.params.editWidget.id:obj.column.params.widget.id;
+        if(!this.fieldSchemaMap[obj.row._X_ROW_KEY])return "false"
+        let fieldWidget = this.fieldSchemaMap[obj.row._X_ROW_KEY][sourceWidgetId]
+        if (!fieldWidget) {
+          return "false";
+        }
+
+        let fieldKeyName = this.getFieldKeyName(widget);
+        let rowIndex = Math.max(obj.rowIndex, 0);
+
+        let property = this.getFieldKeyName(fieldWidget);
+        if (this.isVabsearchFlagWidget(fieldWidget)) {
+          property = fieldWidget.options.vabSearchName || property;
+        }
+        let propName = fieldKeyName + "." + rowIndex + "." + property;
+        /* let lineWidget = !isEdit
           ? obj.column.params.widget
           : obj.column.params.editWidget;
         if (!lineWidget) {
           return "false";
-        }
-        if (this.isVabsearchFlagWidget(lineWidget)) {
+        } */
+        /* if (this.isVabsearchFlagWidget(lineWidget)) {
           let fieldName =
             lineWidget.options.vabSearchName ||
             this.getFieldKeyName(lineWidget);
           propName = fieldKeyName + "." + rowIndex + "." + fieldName;
-        }
+        } */
 
         return propName;
       } else {
@@ -1662,7 +1761,9 @@ modules = {
     },
     isVabsearchFlagWidget(widget) {
       let type = widget?.type;
-      return type == "vabsearch" || type == "singerSearch" || type == "multiSearch";
+      return (
+        type == "vabsearch" || type == "singerSearch" || type == "multiSearch"
+      );
     },
     getColumnWidgetName(e) {
       if (e && e.type) {
@@ -1703,7 +1804,7 @@ modules = {
       let formRef = this.getFormRef();
       let dataTableConfig = formRef.$attrs.dataTableOption || {};
       dataTableConfig.onCheckboxChange &&
-      dataTableConfig.onCheckboxChange(param);
+        dataTableConfig.onCheckboxChange(param);
     },
     handleCheckboxAll(param) {
       if (this.widget.options.onCheckboxAll) {
@@ -1931,9 +2032,9 @@ modules = {
         let loopDo = (item) => {
           if (item.id) delIds.push(item.id);
           item[childrenField] &&
-          item[childrenField].forEach((subItem) => {
-            loopDo(subItem);
-          });
+            item[childrenField].forEach((subItem) => {
+              loopDo(subItem);
+            });
         };
         loopDo(row);
       }
@@ -1941,8 +2042,7 @@ modules = {
         let index = tableRows.findIndex((item) => item.id === id);
         let delRow = tableRows[index];
         tableRows.splice(index, 1);
-        this.deleteRowWidgets(delRow)
-
+        this.deleteRowWidgets(delRow);
       });
       this.$nextTick(() => {
         this.handleWbs();
@@ -2055,10 +2155,10 @@ modules = {
         item.f_wbs = wbs;
         map[item._X_ROW_KEY] = wbs;
         item[childrenField] &&
-        item[childrenField].forEach((subitem, subindex) => {
-          let sub_wbs = wbs + "." + (subindex + 1) + "";
-          loopDo(subitem, sub_wbs);
-        });
+          item[childrenField].forEach((subitem, subindex) => {
+            let sub_wbs = wbs + "." + (subindex + 1) + "";
+            loopDo(subitem, sub_wbs);
+          });
       };
       fullData.forEach((item, index) => {
         let wbs = index + 1 + "";
@@ -2213,7 +2313,7 @@ modules = {
     },
     // 通用行合并函数（将相同多列数据合并为一行）
     mergeRowMethod(tableParam) {
-      let {row, _rowIndex, column, visibleData} = tableParam;
+      let { row, _rowIndex, column, visibleData } = tableParam;
       let mergeRowEnabled = this.widget.options.mergeRowEnabled || false;
       let unikey = this.widget.options.mergeRowKey;
       const cellValue = row[unikey];
@@ -2222,35 +2322,35 @@ modules = {
         const prevRow = visibleData[_rowIndex - 1];
         let nextRow = visibleData[_rowIndex + 1];
         if (prevRow && prevRow[unikey] === cellValue) {
-          return {rowspan: 0, colspan: 0};
+          return { rowspan: 0, colspan: 0 };
         } else {
           let countRowspan = 1;
           while (nextRow && nextRow[unikey] === cellValue) {
             nextRow = visibleData[++countRowspan + _rowIndex];
           }
           if (countRowspan > 1) {
-            return {rowspan: countRowspan, colspan: 1};
+            return { rowspan: countRowspan, colspan: 1 };
           }
         }
       } else {
         // return { rowspan: 1, colspan: 1 }
       }
     },
-    mergeRowMethod2({row, _rowIndex, column, visibleData}) {
+    mergeRowMethod2({ row, _rowIndex, column, visibleData }) {
       const fields = ["key"];
       const cellValue = row[column.field];
       if (cellValue && fields.includes(column.field)) {
         const prevRow = visibleData[_rowIndex - 1];
         let nextRow = visibleData[_rowIndex + 1];
         if (prevRow && prevRow[column.field] === cellValue) {
-          return {rowspan: 0, colspan: 0};
+          return { rowspan: 0, colspan: 0 };
         } else {
           let countRowspan = 1;
           while (nextRow && nextRow[column.field] === cellValue) {
             nextRow = visibleData[++countRowspan + _rowIndex];
           }
           if (countRowspan > 1) {
-            return {rowspan: countRowspan, colspan: 1};
+            return { rowspan: countRowspan, colspan: 1 };
           }
         }
       }
@@ -2300,10 +2400,10 @@ modules = {
       // this.widgetMap = {};
     },
     deleteRowWidgets(row) {
-      this.rowWidgetList.forEach(widget => {
+      this.rowWidgetList.forEach((widget) => {
         let key = this.getRowRefKey(row, widget.options.name);
         delete this.widgetMap[key];
-      })
+      });
     },
     /**end*/
 
@@ -2313,13 +2413,13 @@ modules = {
       this.initFieldSchemaData();
     },
     initRowIdData(initFlag) {
-      this.rowIdData.splice(0, this.rowIdData.length)  //清除数组必须用splice，length=0不会响应式更新！！
-      let subFormModel = this.formModel[this.fieldKeyName]
-      if (!!subFormModel && (subFormModel.length > 0)) {
+      this.rowIdData.splice(0, this.rowIdData.length); //清除数组必须用splice，length=0不会响应式更新！！
+      let subFormModel = this.formModel[this.fieldKeyName];
+      if (!!subFormModel && subFormModel.length > 0) {
         subFormModel.forEach((row) => {
           if (!row._X_ROW_KEY) row._X_ROW_KEY = "row_" + generateId();
-          this.rowIdData.push(row._X_ROW_KEY)
-        })
+          this.rowIdData.push(row._X_ROW_KEY);
+        });
 
         /*if (!!initFlag) {
           //注意：事件触发需延期执行，SumFormDataChange事件处理代码中可能存在尚未创建完成的组件！！
@@ -2329,31 +2429,34 @@ modules = {
         }*/
       }
     },
-    initFieldSchemaData(initFlag) {  //初始化fieldSchemaData！！！
+    initFieldSchemaData(initFlag) {
+      //初始化fieldSchemaData！！！
       /*if (this.widget.type !== 'sub-form') {
         return
       }*/
 
       let rows = this.formModel[this.fieldKeyName];
       let rowIdData = this.rowIdData;
-      let rowLength = this.rowIdData.length
+      let rowLength = this.rowIdData.length;
       // this.fieldSchemaData.splice(0, this.fieldSchemaData.length)  //清除数组必须用splice，length=0不会响应式更新！！
       // if(initFlag)this.fieldSchemaMap = {};
       if (rowLength > 0) {
         let target = this.getGridTable();
-        let {fullColumn} = target.getTableColumn();
+        let { fullColumn } = target.getTableColumn();
         let allWidgets = [];
-        let fieldSchemaMap = {}
+        let fieldSchemaMap = {};
         let fieldSchemaMap0 = this.fieldSchemaMap;
         for (let i = 0; i < rowLength; i++) {
           let rowId = rowIdData[i];
-          let fieldSchemas = []
+          let fieldSchemas = [];
           let fieldSchemaMap2 = null;
           if (initFlag) {
             fieldSchemaMap2 = this.createRowFieldSchemaMap();
           } else {
-            let fieldSchemaMap01 = fieldSchemaMap0[rowId]
-            fieldSchemaMap2 = fieldSchemaMap01 ? this.$baseLodash.cloneDeep(fieldSchemaMap01) : this.createRowFieldSchemaMap();
+            let fieldSchemaMap01 = fieldSchemaMap0[rowId];
+            fieldSchemaMap2 = fieldSchemaMap01
+              ? this.$baseLodash.cloneDeep(fieldSchemaMap01)
+              : this.createRowFieldSchemaMap();
           }
           fieldSchemaMap[rowId] = fieldSchemaMap2;
         }
@@ -2362,74 +2465,74 @@ modules = {
     },
     createRowFieldSchemaMap() {
       let target = this.getGridTable();
-      let {fullColumn} = target.getTableColumn();
+      let { fullColumn } = target.getTableColumn();
 
       let fieldSchemaMap2 = {};
       fullColumn.forEach((column) => {
         let params = column.params;
         if (params) {
           if (params.widget) {
-            let item1 = this.cloneFieldSchema(params.widget)
+            let item1 = this.cloneFieldSchema(params.widget);
             fieldSchemaMap2[params.widget.id] = item1;
           }
           if (params.editWidget) {
-            let item1 = this.cloneFieldSchema(params.editWidget)
+            let item1 = this.cloneFieldSchema(params.editWidget);
             fieldSchemaMap2[params.editWidget.id] = item1;
           }
           if (params.widgetList) {
-            let widgetList = this.$baseLodash.cloneDeep(params.widgetList)
+            let widgetList = this.$baseLodash.cloneDeep(params.widgetList);
             loopHandleWidget(widgetList, (w, p) => {
               // let item1 = this.cloneFieldSchema(w)
-              let id = w.id
-              w.id = w.type + generateId()
+              let id = w.id;
+              w.id = w.type + generateId();
               fieldSchemaMap2[id] = w;
-            })
+            });
           }
         }
-      })
+      });
       return fieldSchemaMap2;
     },
     addToFieldSchemaData(rowIndex) {
-      let fieldSchemas = []
-      this.widget.widgetList.forEach(swItem => {
-        fieldSchemas.push(this.cloneFieldSchema(swItem))
-      })
+      let fieldSchemas = [];
+      this.widget.widgetList.forEach((swItem) => {
+        fieldSchemas.push(this.cloneFieldSchema(swItem));
+      });
 
       if (rowIndex === undefined) {
-        this.fieldSchemaData.push(fieldSchemas)
+        this.fieldSchemaData.push(fieldSchemas);
       } else {
-        this.fieldSchemaData.splice(rowIndex, 0, fieldSchemas)
+        this.fieldSchemaData.splice(rowIndex, 0, fieldSchemas);
       }
     },
 
     deleteFromFieldSchemaData(rowIndex) {
-      this.fieldSchemaData.splice(rowIndex, 1)
+      this.fieldSchemaData.splice(rowIndex, 1);
     },
 
     cloneFieldSchema(fieldWidget) {
-      let newFieldSchema = deepClone(fieldWidget)
-      newFieldSchema.id = fieldWidget.type + generateId()
-      return newFieldSchema
+      let newFieldSchema = deepClone(fieldWidget);
+      newFieldSchema.id = fieldWidget.type + generateId();
+      return newFieldSchema;
     },
     //end1
     initExportFieldSchemaData(rows) {
-      if (!rows) return
+      if (!rows) return;
       //初始化fieldSchemaData！！！
-      let fieldSchemaMap = this.fieldSchemaMap
+      let fieldSchemaMap = this.fieldSchemaMap;
       for (let row of rows) {
         if (!row._X_ROW_KEY) row._X_ROW_KEY = "row_" + generateId();
-        this.rowIdData.push(row._X_ROW_KEY)
+        this.rowIdData.push(row._X_ROW_KEY);
         let fieldSchemaMap2 = this.createRowFieldSchemaMap();
         fieldSchemaMap[row._X_ROW_KEY] = fieldSchemaMap2;
       }
     },
     initEventHandler() {
-      if(this.designState)return
+      if (this.designState) return;
       this.$on("setFormData", (o) => {
         let rows = this.formModel[this.fieldKeyName] || [];
         this.setValue(rows);
-      })
-    }
+      });
+    },
   },
 };