cloud-web-corejs 1.0.218 → 1.0.220

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

@@ -243,7 +243,7 @@ modules = {
       let formScriptEnabledTypes = ["select", "checkbox", "radio"];
       if (formScriptEnabledTypes.includes(widgetType)) {
         widget.options.optionItems = rows || [];
-      } else if (widgetType == "status") {
+      } else if (widgetType === "status") {
         widget.options.statusParam = rows || [];
       }
       widget._syncInited = true;
@@ -359,8 +359,8 @@ modules = {
     },
 
     getWidgetRefByTableParam(tableParam) {
-      // let params = tableParam.column.params;
-      // let name = params.widget.options.name;
+      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.getWidgetRef(key);
@@ -384,7 +384,7 @@ modules = {
     },
     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,
       };
@@ -412,6 +412,7 @@ modules = {
     },
     initFieldSchema(val) {
       let rows = val || [];
+      // 处理树结构数据排序
       this.formModel[this.fieldKeyName] = rows;
       this.fieldModel = rows;
       this.initRowIdData(true);
@@ -420,6 +421,7 @@ modules = {
     initValue(val) {
       // this.clearRowWidgets()
       let rows = val || [];
+      // this.handleNullValue(rows);
       rows.forEach((row, index) => {
         row._X_ROW_KEY = "row_" + generateId();
       });
@@ -428,6 +430,65 @@ modules = {
       this.initRowIdData(true);
       this.initFieldSchemaData(true);
     },
+    handleTreeData(rows) {
+      let isTreeTable = this.widget.options.isTreeTable;
+      if (isTreeTable) {
+        let $grid = this.getGridTable();
+        if(!$grid)return
+        let parentField = $grid.treeConfig.parentField;
+        if(parentField) {
+          // 构建树结构并排序
+          let sortedRows = [];
+          let nodeMap = new Map();
+
+          // 第一步：构建节点映射
+          rows.forEach(row => {
+            if (row.id !== undefined && row.id !== null) {
+              nodeMap.set(row.id, row);
+            }
+          });
+
+          // 第二步：按层次排序，先根节点，然后子节点
+          rows.forEach(row => {
+            let parentValue = row[parentField];
+            // 根节点（parentField为null、undefined、空字符串或0）
+            if (parentValue === null || parentValue === undefined || parentValue === '' || parentValue === 0) {
+              sortedRows.push(row);
+              // 递归添加子节点
+              this.addChildNodes(row.id, nodeMap, parentField, sortedRows);
+            }
+          });
+
+          // 如果没有找到根节点，返回原始数组
+          if (sortedRows.length === 0) {
+            return rows;
+          }
+
+          return sortedRows;
+        }
+      }
+      return rows;
+    },
+    addChildNodes(parentId, nodeMap, parentField, sortedRows) {
+      // 遍历所有节点，找出当前父节点的子节点
+      for (let [id, node] of nodeMap.entries()) {
+        // 处理parentField值的类型转换，确保比较正确
+        let nodeParentValue = node[parentField];
+        let targetParentId = parentId;
+
+        // 转换为相同类型进行比较
+        if (typeof nodeParentValue !== typeof targetParentId) {
+          nodeParentValue = String(nodeParentValue);
+          targetParentId = String(targetParentId);
+        }
+
+        if (nodeParentValue === targetParentId) {
+          sortedRows.push(node);
+          // 递归添加子节点的子节点
+          this.addChildNodes(id, nodeMap, parentField, sortedRows);
+        }
+      }
+    },
     setValue(val) {
       // console.log("rows:",val);
       this.clearRowWidgets();
@@ -496,7 +557,7 @@ modules = {
       return this.widget.options.tableData.lastIndexOf(e);
     },
     setTableColumns: function (e) {
-      var t = this;
+      let t = this;
       (this.widget.options.tableColumns = e),
         this.$nextTick(function () {
           t.$refs.dataTable.doLayout();
@@ -563,7 +624,7 @@ modules = {
     },
     importExcel() {},
     getGrid(that, tableRef) {
-      var $grid;
+      let $grid;
       if (Array.isArray(that.$refs[tableRef])) {
         $grid = that.$refs[tableRef][0];
       } else {
@@ -573,7 +634,7 @@ modules = {
     },
     getTableCondition: function () {
       if (this.widget.options.tableCondition) {
-        var e = new Function(this.widget.options.tableCondition);
+        let e = new Function(this.widget.options.tableCondition);
         return e.call(this);
       }
     },
@@ -607,6 +668,7 @@ modules = {
       }
 
       let tableWidgetName = this.widget.options.name;
+      let isEditTable = this.widget.options.isEditTable || false;
       const createColumn = (t, isChild) => {
         let filterable = t.filterable ?? true;
         let filterType = filterable ? null : false;
@@ -634,6 +696,11 @@ modules = {
         };
         if (t.required) {
           col.title = col.title;
+          /* if(!isEditTable){
+            col.titlePrefix = {
+              icon: "vxe-cell--required-icon"
+            }
+          } */
           col.titlePrefix = {
             icon: "vxe-cell--required-icon"
           }
@@ -715,9 +782,75 @@ modules = {
           columnConfig: t,
           editWidget,
         };
+
         Object.assign(col.params, params);
+        let types = ['input','number', 'text','select','checkbox','radio','status','vabsearch','date']
+        if(widget && types.includes(widget.type)){
+          const func = (obj)=>{
+            let value = obj.row[obj.column.field]
+            let fieldWidget = null;
+            if(!!obj.column?.params?.widget){
+              fieldWidget = this.getRowWidget(obj)
+            }
+            if(fieldWidget && !fieldWidget.options.hidden){
+              let widgetType = fieldWidget.type;
+              if(['input','number'].includes(widgetType)){
+                return value;
+              }
+              let widgetRef = this.getWidgetRefByTableParam(obj)
+              if('text' === widgetType){
+                return widgetRef ? widgetRef.showVaule : value;
+              }else if('select' === widgetType){
+                return this.getOptionLabel(fieldWidget, value);
+              }else if('checkbox' === widgetType){
+                return this.getOptionLabel(fieldWidget, value);
+              }else if('radio' === widgetType){
+                return this.getOptionLabel(fieldWidget, value);
+              }else if('status' === widgetType){
+                let statusParam = fieldWidget.options.statusParam || [];
+                let statusItem = statusParam.find(item => item.value === value)
+                return statusItem ? this.$t1(statusItem.label): null;
+              }else if('vabsearch' === widgetType){
+                let result = null;
+                let currentData = obj.row;
+                let fieldKeyName = this.getFieldKeyName(fieldWidget);
+                let vabSearchName = fieldWidget.options.vabSearchName;
+                let multipleChoices = fieldWidget.options.multipleChoices || false;
+                let labelField = vabSearchName || fieldKeyName;
+                if (!multipleChoices) {
+                  result = currentData[labelField] ?? null;
+                } else {
+                  if (value) {
+                    result = value.map(item => item[labelField]).join(",");
+                  }
+                }
+                return result;
+              }else if('date' === widgetType){
+                let dateType = fieldWidget.options.type;
+                if(['date','week'].includes(dateType)){
+                  return value?value.substring(0,10):null;
+                }else if(dateType === 'dates'){
+                  if(value){
+                    if(Array.isArray(value)){
+                      return value.map(item => item.substring(0,10)).join(",");
+                    }else{
+                      return value;
+                    }
+                  }
+                  return null;
+                }else{
+                  return value
+                }
+              }
+            }else{
+              return null
+            }
+
+          };
+          col.slots.filterVal = func;
+        }
         if (!col.children || !col.children.length) {
-          if (t.formatS == "render") {
+          if (t.formatS === "render") {
             let r = t.render ? new Function("params", "h", t.render) : null;
             col.slots.default = (params, h) => {
               return r ? r.call(this, params, h) : "";
@@ -725,9 +858,9 @@ modules = {
           } else if (widget) {
             // col.slots.default = columnSelectedWidget.id;
             col.slots.default = "widget";
-          } else if (t.formatS == "editTreeButtonGroup") {
+          } else if (t.formatS === "editTreeButtonGroup") {
             col.slots.default = "editTreeButtonGroup";
-          } else if (t.formatS == "widgetRender") {
+          } else if (t.formatS === "widgetRender") {
             col.slots.default = "widgetList";
           }
 
@@ -755,12 +888,12 @@ modules = {
       let flag = tableConfig?.config?.toolbarConfig?.custom !== false;
       if (
         baseRefUtil.tableConfig &&
-        baseRefUtil.tableConfig.className == "list-table" &&
+        baseRefUtil.tableConfig.className === "list-table" &&
         flag
       ) {
         if (tableColumns.length) {
           let tableColumn = tableColumns[tableColumns.length - 1];
-          if (tableColumn.fixed != "right") {
+          if (tableColumn.fixed !== "right") {
             newColumns.push({
               width: 47,
               title: "",
@@ -773,8 +906,38 @@ modules = {
       this.rowWidgetList = rowWidgetList;
       return this.$baseLodash.cloneDeep(newColumns);
     },
+    //begin
+     getOptionLabel(fieldWidget, fieldModel){
+      if (fieldModel === null) {
+        return null
+      } else {
+        let resultList = []
+        let labelField = fieldWidget.options.labelKey || "label";
+        let valueField = fieldWidget.options.valueKey || "value";
+        fieldWidget.options.optionItems.forEach(oItem => {
+          if ((oItem[valueField] === fieldModel) || (this.findInArray(fieldModel, oItem[valueField])) !== -1) {
+            resultList.push(this.$t1(oItem[labelField]))
+          }
+        })
+        return resultList.join(",")
+      }
+    },
+    findInArray: function (e, t) {
+      if (!Array.isArray(e)) return -1;
+      var i = -1;
+      return (
+        e.forEach(function (e, n) {
+          e === t && (i = n);
+        }),
+          i
+      );
+    },
+    //end
+
+
     async initTableList() {
       let that = this;
+      let tableOption = null;
       let path = null;
       let paramFun = null;
       // let mainDataSetDTO = null;
@@ -782,7 +945,7 @@ modules = {
       let tableRef = this.getTableRef();
       let formDataModel = this.getFormRef().formDataModel;
       let isQueryTable = this.widget.options.isQueryTable || false;
-      let isDataPage = this.widget.options.accessReturnType == "2";
+      let isDataPage = this.widget.options.accessReturnType === "2";
       let reportTemplate = this.getFormRef().reportTemplate;
       let formCode = reportTemplate.formCode;
       let dataId = this.formDataId;
@@ -953,7 +1116,7 @@ modules = {
           parentField: "f_parent",
           transform: true,
           expandAll: true,
-          loadMethod({ $table, row }) {
+          loadMethod:({ $table, row })=> {
             // 模拟后台接口
             let $grid = that.getGridTable();
             let parentField = $grid.treeConfig.parentField;
@@ -981,10 +1144,20 @@ modules = {
                   },
                 },
                 callback: (res) => {
-                  if (res.type == "success") {
+                  if (res.type === "success") {
+                    let items = this.handleTreeData((res.objx?.records || res.objx || []));
+                    if(res.objx?.records !== undefined){
+                      res.objx.records = items;
+                    }else{
+                      res.objx = items;
+                    }
                     let rows = res.objx
-                      ? res.objx.records || res.objx || []
-                      : [];
+                    ? res.objx.records || res.objx || []
+                    : [];
+                    // let rows = res.objx
+                    //   ? res.objx.records || res.objx || []
+                    //   : [];
+                    // that.handleNullValue(rows);
                     that.initExportFieldSchemaData(rows);
                     /* rows.forEach((row, index) => {
                       if (!row._X_ROW_KEY) {
@@ -998,14 +1171,21 @@ modules = {
                     }
 
                     resolve(rows);
-                    let treeCallback = tableConfig?.treeCallback;
+                    /* let treeCallback = tableConfig?.treeCallback;
                     if (treeCallback) {
                       that.$nextTick(() => {
                         setTimeout(function () {
                           treeCallback(rows);
                         }, 0);
                       });
-                    }
+                    } */
+                    that.$nextTick(() => {
+                      setTimeout(function () {
+                        dataTableConfig.callback && dataTableConfig.callback(rows);
+                        tableOption.callback && tableOption.callback(rows);
+                        tableConfig.treeCallback && tableConfig.treeCallback(rows);
+                      }, 0);
+                    });
                   } else {
                     reject(res);
                   }
@@ -1017,6 +1197,18 @@ modules = {
       }
       let editOpts = {};
       if (this.widget.options.isEditTable) {
+        // let editRules = {};
+        this.loodHandleColumns(this.widget.options.tableColumns, (item) => {
+          if (!item.children?.length) {
+            let editWidget = item.editWidget;
+            if(editWidget && editWidget.options.required){
+              let formField = this.getFieldKeyName(editWidget);
+              /* editRules[formField] = [
+                { required: true, message: `[${editWidget.options.label}]不能为空` }
+              ]; */
+            }
+          }
+        });
         editOpts = {
           keepSource: true,
           editConfig: {
@@ -1025,6 +1217,7 @@ modules = {
             showStatus: true,
             autoClear: false,
           },
+          // editRules
         };
       }
       let showFooter = this.widget.options.showGridFooter || false;
@@ -1104,7 +1297,7 @@ modules = {
           (item) => {
             let columnSlots = null;
             let columnParams = {};
-            if (item.formatS == "render") {
+            if (item.formatS === "render") {
               let r = item.render
                 ? new Function("params", "h", item.render)
                 : null;
@@ -1150,7 +1343,7 @@ modules = {
         rowConfig.height = this.widget.options.tableRowHeight
       }
 
-      let tableOption = {
+      tableOption = {
         // vue: this,
         tableRef: tableRef,
         tableName: this.getGridTableName(),
@@ -1226,7 +1419,7 @@ modules = {
             query: ({ page, sorts, filters, form, param, customParam }) => {
               let scriptCode = this.getScriptCode();
               let $grid = this.getGridTable();
-              let originOption = $grid.originOption;
+              let originOption = $grid.params.originOption;
               let formData = {};
 
               if (customParam?.exportParam?.type !== "exportItem") {
@@ -1271,8 +1464,8 @@ modules = {
                 Object.assign(queryParams, that.dataTableConfig.queryParam);
               }
 
-              var reqPath = typeof path == "function" ? path() : path;
-              let accessReturnType = this.widget.options.accessReturnType || 2;
+              let reqPath = typeof path === "function" ? path() : path;
+              let accessReturnType = this.widget.options.accessReturnType || "2";
 
               return new Promise((resolve, reject) => {
                 let reqData = {
@@ -1284,9 +1477,17 @@ modules = {
                     // let f = new Function("dataId", "formCode", "param", "done", accessScript);
                     let done = (res) => {
                       // this.clearRowWidgets();
-                      let rows = res.objx
+
+                        let items = this.handleTreeData((res.objx?.records || res.objx || []));
+                        if(res.objx?.records !== undefined){
+                          res.objx.records = items;
+                        }else{
+                          res.objx = items;
+                        }
+                        let rows = res.objx
                         ? res.objx.records || res.objx || []
                         : [];
+                      // that.handleNullValue(rows);
                       if (customParam?.export) {
                         //导出
                         this.initExportFieldSchemaData(rows);
@@ -1295,7 +1496,7 @@ modules = {
                       }
 
                       resolve(res);
-                      if (res.type == "success") {
+                      if (res.type === "success") {
                         if (that.widget.options.isTreeTable) {
                           if (rows.length > 0) {
                             let fullAllDataRowMap
@@ -1351,6 +1552,7 @@ modules = {
                         }
                         that.$nextTick(() => {
                           setTimeout(function () {
+                            dataTableConfig.callback && dataTableConfig.callback(rows);
                             tableOption.callback && tableOption.callback(rows);
                             that.handleCustomEvent(
                               that.widget.options.formScriptCallback,
@@ -1419,13 +1621,13 @@ modules = {
                 let columnId = column.params?.columnId;
                 if (columnId && footerColumnIds.includes(columnId)) {
                   let footerDataType = column.params.footerDataType;
-                  if (footerDataType == "1") {
+                  if (footerDataType === "1") {
                     //求和
                     return this.sumNum(data, column.field);
-                  } else if (footerDataType == "2") {
+                  } else if (footerDataType === "2") {
                     //求平均值
                     return this.meanNum(data, column.field);
-                  } else if (footerDataType == "3") {
+                  } else if (footerDataType === "3") {
                     if (column.params.footerMethodConfg) {
                       let n = new Function(
                         "dataId",
@@ -1451,7 +1653,6 @@ modules = {
       if (mergeRowEnabled && unikey) {
         tableOption.config.spanMethod = this.mergeRowMethod;
       }
-
       this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.vxeOption = opts;
         if (!isQueryTable) {
@@ -1510,12 +1711,12 @@ modules = {
                   item.filter = "between";
                 } else if (
                   ["input-batch", "checkbox"].includes(wType)
-                  || (wType == "select" && wItem.options.multiple)
+                  || (wType === "select" && wItem.options.multiple)
                 ) {
                   item.filter = "in";
                 } else if (
                   ["radio", "time", "date"].includes(wType)
-                  || (wType == "select" && !wItem.options.multiple)
+                  || (wType === "select" && !wItem.options.multiple)
                 ) {
                   item.filter = "eq";
                 } else {
@@ -1542,14 +1743,14 @@ modules = {
       );
       let result = vailColumns
         .filter((item) => {
-          return item.formatS == "editAttachment";
+          return item.formatS === "editAttachment";
         })
         .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") {
+          if (item.formatS === "editAttachment") {
             result.push(item.prop);
           }
         }
@@ -1563,7 +1764,7 @@ modules = {
       let result = vailColumns
         .filter((item) => {
           return (
-            item.formatS == "editSearch" && item.columnOption.multipleChoices
+            item.formatS === "editSearch" && item.columnOption.multipleChoices
           );
         })
         .map((item) => item.prop); */
@@ -1571,7 +1772,7 @@ modules = {
       this.loodHandleColumns(this.widget.options.tableColumns, (item) => {
         if (!item.children?.length && item.prop && item.label) {
           if (
-            item.formatS == "editSearch"
+            item.formatS === "editSearch"
             && item.widget?.options?.multipleChoices
           ) {
             result.push(item.prop);
@@ -1611,7 +1812,20 @@ modules = {
         },
         callback: (res) => {
           let $grid = this.getGridTable();
-          let rows = res.objx ? res.objx.records || res.objx || [] : [];
+          // let rows = res.objx ? res.objx.records || res.objx || [] : [];
+
+          let items = this.handleTreeData((res.objx?.records || res.objx || []));
+          if(res.objx?.records !== undefined){
+            res.objx.records = items;
+          }else{
+            res.objx = items;
+          }
+          let rows = res.objx
+          ? res.objx.records || res.objx || []
+          : [];
+
+
+          // that.handleNullValue(rows);
           let defaultRow = this.createNewTableData();
           rows = rows.map((row) => {
             return {
@@ -1644,9 +1858,9 @@ modules = {
     getScriptCode() {
       let accessReturnType = this.widget.options.accessReturnType;
       let defaultScriptCode = "getList";
-      if (accessReturnType == 1) {
+      if (accessReturnType === "1") {
         defaultScriptCode = "getList";
-      } else if (accessReturnType == 2) {
+      } else if (accessReturnType === "2") {
         defaultScriptCode = "getPage";
       }
       let scriptCode = this.widget.options.formScriptCode || defaultScriptCode;
@@ -1661,9 +1875,9 @@ modules = {
       let scriptCode = this.getScriptCode();
       let accessParam = {};
       let otherParam = {};
-      if (customParam?.exportParam?.type == "exportItem") {
+      if (customParam?.exportParam?.type === "exportItem") {
         let $grid = this.getGridTable();
-        let originOption = $grid.originOption;
+        let originOption = $grid.params.originOption;
         let exportItemConfig = originOption.exportItemConfig || {};
         if (exportItemConfig.scriptCode) {
           scriptCode = exportItemConfig.scriptCode;
@@ -1801,7 +2015,7 @@ modules = {
         || (widgetType === "vabsearch" && !widget.options.multipleChoices);
       return result;
     },
-    getColumnNullValue(widget) {
+    getColumnNullValue(widget, defaultValueEnabled) {
       if (!widget) return null;
       let nullValue = null;
       let widgetType = widget.type;
@@ -1818,11 +2032,12 @@ modules = {
         defaultValue !== undefined
         && defaultValue !== null
         && defaultValue !== ""
+        && defaultValueEnabled !== false
       ) {
         nullValue = defaultValue;
       } else if (widgetType === "select" && widget.options.multiple) {
         nullValue = [];
-      } else if (widgetType === "date" && widget.options.type == "dates") {
+      } else if (widgetType === "date" && widget.options.type === "dates") {
         nullValue = [];
       } else if (widgetType === "vabsearch" && widget.options.multipleChoices) {
         nullValue = [];
@@ -1853,7 +2068,7 @@ modules = {
         }
       }
     },
-    createNewTableData(isEdit) {
+    createNewTableData(isEdit, defaultValueEnabled=true) {
       let newData = {};
       this.loodHandleColumns(this.widget.options.tableColumns, (item) => {
         if (!item.children?.length && item.prop && item.label) {
@@ -1864,46 +2079,21 @@ modules = {
           } else {
             widget = item.widget;
           }
-          if (formatS == "widgetRender") {
+          if (formatS === "widgetRender") {
             if (item.widgetList) {
               loopHandleWidget(item.widgetList, (w, p) => {
-                this.handleWidgetNullValue(w, newData);
+                this.handleWidgetNullValue(w, newData, defaultValueEnabled);
               });
             }
           } else {
             if (widget) {
-              this.handleWidgetNullValue(widget, newData);
+              this.handleWidgetNullValue(widget, newData, defaultValueEnabled);
             } else {
               newData[item.prop] = null;
             }
           }
         }
       });
-      /* let vailColumns = this.widget.options.tableColumns.filter(
-        (item) => item.prop && item.label
-      );
-      vailColumns.forEach((item) => {
-        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;
-          }
-        }
-      }); */
       return newData;
     },
     addTableData(rows, field) {
@@ -1979,55 +2169,55 @@ modules = {
         if (columnOption && Object.keys(columnOption).length) {
           columnOption.required = row.required || false;
           columnSelectedWidget.options = columnOption;
-          if ("editDelete" == formatS) {
+          if ("editDelete" === formatS) {
             columnSelectedWidget.options.hiddenByWf
               = columnSelectedWidget.options.hiddenByWf ?? true;
             columnSelectedWidget.options.prefixIcon
               = columnSelectedWidget.options.prefixIcon || "el-icon-delete";
-          } else if ("editButton" == formatS) {
+          } else if ("editButton" === formatS) {
             columnSelectedWidget.options.prefixIcon
               = columnSelectedWidget.options.prefixIcon || "el-icon-edit";
           }
         } else {
           columnSelectedWidget.options.required = row.required || false;
-          if ("editDelete" == formatS) {
+          if ("editDelete" === formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-delete";
             columnSelectedWidget.options.label = "删除";
             columnSelectedWidget.options.labelHidden = true;
             columnSelectedWidget.options.hiddenByWf = true;
             columnSelectedWidget.options.onClick
               = "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.deleteRow(tableParam.row,tableParam.rowIndex);";
-          } else if ("editButton" == formatS) {
+          } else if ("editButton" === formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-edit";
             columnSelectedWidget.options.label = "查看";
             columnSelectedWidget.options.labelHidden = true;
             columnSelectedWidget.options.onClick
               = "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.openEditDialog(tableParam.row)";
-          } else if ("addSiblingEditRow" == formatS) {
+          } else if ("addSiblingEditRow" === formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-plus";
             columnSelectedWidget.options.label = "新增兄弟节点";
             columnSelectedWidget.options.labelHidden = false;
             columnSelectedWidget.options.onClick
               = "let tableParam = this.tableParam;\nthis.getParentTarget().addSiblingTreeRow(null,tableParam);";
-          } else if ("addChildTreeRow" == formatS) {
+          } else if ("addChildTreeRow" === formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-plus";
             columnSelectedWidget.options.label = "新增子节点";
             columnSelectedWidget.options.labelHidden = false;
             columnSelectedWidget.options.onClick
               = "let tableParam = this.tableParam;\nthis.getParentTarget().addChildTreeRow(null,tableParam);";
-          } else if ("moveUpRow" == formatS) {
+          } else if ("moveUpRow" === formatS) {
             // columnSelectedWidget.options.prefixIcon = "el-icon-plus";
             columnSelectedWidget.options.label = "↑上移";
             columnSelectedWidget.options.labelHidden = false;
             columnSelectedWidget.options.onClick
               = "let tableParam = this.tableParam;\nthis.getParentTarget().moveUpRow(tableParam);";
-          } else if ("moveDownRow" == formatS) {
+          } else if ("moveDownRow" === formatS) {
             // columnSelectedWidget.options.prefixIcon = "el-icon-plus";
             columnSelectedWidget.options.label = "↓下移";
             columnSelectedWidget.options.labelHidden = false;
             columnSelectedWidget.options.onClick
               = "let tableParam = this.tableParam;\nthis.getParentTarget().moveDownRow(tableParam);";
-          } else if ("removeTreeRow" == formatS) {
+          } else if ("removeTreeRow" === formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-delete";
             columnSelectedWidget.options.label = "删除";
             columnSelectedWidget.options.labelHidden = true;
@@ -2042,7 +2232,7 @@ modules = {
         } else {
           columnSelectedWidget.options.name = row.prop;
         }
-        if (type != "button" && type != "a-link") {
+        if (type !== "button" && type !== "a-link") {
           columnSelectedWidget.options.label = row.label;
           columnSelectedWidget.options.labelHidden = true;
         }
@@ -2070,7 +2260,7 @@ modules = {
     validateCheckRow() {
       let $grid = this.getGridTable();
       let checkRows = $grid.getCheckboxRecords(true);
-      if (checkRows.length == 0) {
+      if (checkRows.length === 0) {
         this.$message({
           message: "请选择要操作的行",
           type: "warning",
@@ -2142,6 +2332,14 @@ modules = {
         let fieldKeyName = this.getFieldKeyName(this.widget);
         let rowIndex = Math.max(obj.rowIndex, 0);
 
+        let isTreeTable = this.widget.options.isTreeTable || false;
+        if(isTreeTable){
+          rowIndex = this.getValue().findIndex((item) => item._X_ROW_KEY === obj.row._X_ROW_KEY);
+          if(rowIndex<0){
+            return "false";
+          }
+        }
+
         let property = this.getFieldKeyName(fieldWidget);
         if (obj.row[property] && Array.isArray(obj.row[property])) {
           return "false";
@@ -2159,12 +2357,12 @@ modules = {
     isVabsearchFlagWidget(widget) {
       let type = widget?.type;
       return (
-        type == "vabsearch" || type == "singerSearch" || type == "multiSearch"
+        type === "vabsearch" || type === "singerSearch" || type === "multiSearch"
       );
     },
     getColumnWidgetName(e) {
       if (e && e.type) {
-        if (e.category == "container") {
+        if (e.category === "container") {
           return this.getContainerWidgetName(e);
         } else {
           return e.type + "-widget";
@@ -2223,7 +2421,7 @@ modules = {
     },
     advancedClear() {
       let formModel = this.formModel;
-      let searchColumns = this.getGridTable().searchColumns;
+      let searchColumns = this.getGridTable().params.searchColumns;
       searchColumns.forEach((form1Field) => {
         if (!form1Field.common) {
           let field = form1Field.field;
@@ -2241,7 +2439,7 @@ modules = {
     },
 
     //editTable begin
-    saveEditRow(obj) {
+    async saveEditRow(obj) {
       let formRef = this.getFormRef();
       let formConfig = this.formConfig;
       let entity = formConfig.entity;
@@ -2253,11 +2451,18 @@ modules = {
 
       let that = this;
       let $grid = obj.$table.$xegrid;
-      let originOption = $grid.originOption;
+      let originOption = $grid.params.originOption;
 
       let formModel = this.formModel;
       let dataMap = this.getGridTable().getTableData();
 
+       /* const errMap = await $grid.validate(obj.row).catch(errMap => errMap)
+      if (errMap) {
+        let title = errMap[Object.keys(errMap)[0]][0].column.title
+        this.$message.error(`[${title}]不能为空`)
+        return
+      } */
+
       formRef.validate((valid) => {
         if (valid) {
           $grid.clearActived().then(() => {
@@ -2296,7 +2501,7 @@ modules = {
               confirmText: "您确定要保存吗？",
               success: (res0) => {
                 this.getRowData(res0.objx, (res) => {
-                  if (obj.row.id == res.objx.id) {
+                  if (obj.row.id === res.objx.id) {
                     $grid.clearActived().then(() => {
                       Object.assign(obj.row, res.objx);
                     });
@@ -2360,10 +2565,10 @@ modules = {
       }
       let parentField = $grid.treeConfig.parentField;
       let newRow = {};
-      let originOption = $grid.originOption;
+      let originOption = $grid.params.originOption;
       let editDefaultRow;
       if (originOption.editDefaultRow) {
-        if (typeof originOption.editDefaultRow == "function") {
+        if (typeof originOption.editDefaultRow === "function") {
           editDefaultRow = originOption.editDefaultRow() || {};
         } else {
           editDefaultRow = originOption.editDefaultRow || {};
@@ -2389,7 +2594,7 @@ modules = {
         } else if (toSibling === true) {
           let addIndex
             = tableRows.findIndex(
-              (item) => item._X_ROW_KEY == obj.row._X_ROW_KEY
+              (item) => item._X_ROW_KEY === obj.row._X_ROW_KEY
             ) + 1;
           tableRows.splice(addIndex, 0, newRow);
         } else {
@@ -2411,7 +2616,7 @@ modules = {
           } else if (toSibling === true) {
             let addIndex
               = tableRows.findIndex(
-                (item) => item._X_ROW_KEY == obj.row._X_ROW_KEY
+                (item) => item._X_ROW_KEY === obj.row._X_ROW_KEY
               ) + 1;
             tableRows.splice(addIndex, 0, newRow);
           } else {
@@ -2483,10 +2688,10 @@ modules = {
       }
 
       let newRow = {};
-      let originOption = $grid.originOption;
+      let originOption = $grid.params.originOption;
       let editDefaultRow;
       if (originOption.editDefaultRow) {
-        if (typeof originOption.editDefaultRow == "function") {
+        if (typeof originOption.editDefaultRow === "function") {
           editDefaultRow = originOption.editDefaultRow() || {};
         } else {
           editDefaultRow = originOption.editDefaultRow || {};
@@ -2515,7 +2720,7 @@ modules = {
         } else if (toSibling === true) {
           let addIndex
             = tableRows.findIndex(
-              (item) => item._X_ROW_KEY == obj.row._X_ROW_KEY
+              (item) => item._X_ROW_KEY === obj.row._X_ROW_KEY
             ) + 1;
           tableRows.splice(addIndex, 0, newRow);
         } else {
@@ -2537,7 +2742,7 @@ modules = {
           } else if (toSibling === true) {
             let addIndex
               = tableRows.findIndex(
-                (item) => item._X_ROW_KEY == obj.row._X_ROW_KEY
+                (item) => item._X_ROW_KEY === obj.row._X_ROW_KEY
               ) + 1;
             tableRows.splice(addIndex, 0, newRow);
           } else {
@@ -2607,15 +2812,15 @@ modules = {
         );
         if (siblingRows.length > 1) {
           let currentIndex = tableRows.findIndex(
-            (item) => item[rowField] == row[rowField]
+            (item) => item[rowField] === row[rowField]
           );
           let index1 = siblingRows.findIndex(
-            (item) => item[rowField] == row[rowField]
+            (item) => item[rowField] === row[rowField]
           );
           if (index1 > 0) {
             let prevRow = siblingRows[index1 - 1];
             let prevIndex = tableRows.findIndex(
-              (item) => item[rowField] == prevRow[rowField]
+              (item) => item[rowField] === prevRow[rowField]
             );
             tableRows.splice(currentIndex, 1);
             tableRows.splice(prevIndex, 0, row);
@@ -2651,15 +2856,15 @@ modules = {
         );
         if (siblingRows.length > 1) {
           let currentIndex = tableRows.findIndex(
-            (item) => item[rowField] == row[rowField]
+            (item) => item[rowField] === row[rowField]
           );
           let index1 = siblingRows.findIndex(
-            (item) => item[rowField] == row[rowField]
+            (item) => item[rowField] === row[rowField]
           );
           if (index1 < siblingRows.length - 1) {
             let nextRow = siblingRows[index1 + 1];
             let nextIndex = tableRows.findIndex(
-              (item) => item[rowField] == nextRow[rowField]
+              (item) => item[rowField] === nextRow[rowField]
             );
             tableRows.splice(currentIndex, 1);
             tableRows.splice(nextIndex, 0, row);
@@ -3068,6 +3273,19 @@ modules = {
       this.setGridDisabled(false);
     },
     //xk end
+    handleNullValue(rows) {
+      let newData = this.createNewTableData(true, false);
+      let keys = Object.keys(newData);
+      if(keys.length){
+        rows.forEach((row) => {
+          keys.forEach((key) => {
+            if (row[key] === undefined) {
+              row[key] = newData[key];
+            }
+          });
+        });
+      }
+    },
   },
 };