agilebuilder-ui 1.1.65-tmp23 → 1.1.65-tmp24

package/lib/super-grid/src/apis.cjs

@@ -2,10 +2,10 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const e = require("../../utils/gogocodeTransfer.cjs"), t = require("./store.cjs"), i = require("./utils.cjs"), a = require("./formValidatorUtil.cjs");
 require("vue");
-const o = require("../../src/utils/util.cjs"), n = require("./eventBus.cjs"), s = require("../../src/utils/common-util.cjs"), l = require("../../src/utils/jump-page-utils.cjs"), r = require("../../src/utils/guid.cjs"), d = require("element-plus"), g = { toolbarRefresh(e2, t2, i2, a2) {
+const o = require("../../src/utils/util.cjs"), s = require("./eventBus.cjs"), n = require("../../src/utils/common-util.cjs"), l = require("../../src/utils/jump-page-utils.cjs"), r = require("../../src/utils/guid.cjs"), d = require("element-plus"), u = { toolbarRefresh(e2, t2, i2, a2) {
   return this.toolbarFieldParam = i2, this.refresh(e2, t2, i2, a2);
 }, refresh(e2, i2, a2, o2) {
-  return new Promise((i3, n2) => {
+  return new Promise((i3, s2) => {
     if (o2) {
       t.get(this.code).options.subTableData = null;
     }
@@ -13,14 +13,14 @@ const o = require("../../src/utils/util.cjs"), n = require("./eventBus.cjs"), s
       if (null != e2 && e2 instanceof Array && e2.length > 0)
         if (this.$refs.sf) {
           let t2 = this.$refs.sf.packageSearchParam();
-          t2 && t2.length > 0 ? a2 && a2.length > 0 && (1 === t2.length && (t2[0].leftBracket = "(", t2[0].rightBracket = ")"), "or" === t2[t2.length - 1].joinSign && (t2[t2.length - 1].joinSign = "and"), Array.prototype.push.apply(t2, a2)) : a2 && (t2 = [], t2 = a2), this.search(t2, false, e2).then(() => i3()).catch((e3) => n2(e3));
+          t2 && t2.length > 0 ? a2 && a2.length > 0 && (1 === t2.length && (t2[0].leftBracket = "(", t2[0].rightBracket = ")"), "or" === t2[t2.length - 1].joinSign && (t2[t2.length - 1].joinSign = "and"), Array.prototype.push.apply(t2, a2)) : a2 && (t2 = [], t2 = a2), this.search(t2, false, e2).then(() => i3()).catch((e3) => s2(e3));
         } else
-          this.search(a2, false, e2).then(() => i3()).catch((e3) => n2(e3));
+          this.search(a2, false, e2).then(() => i3()).catch((e3) => s2(e3));
       else if (this.$refs.sf) {
         let e3 = this.$refs.sf.packageSearchParam();
-        e3 && e3.length > 0 ? a2 && a2.length > 0 && (1 === e3.length && (e3[0].leftBracket = "(", e3[0].rightBracket = ")"), "or" === e3[e3.length - 1].joinSign && (e3[e3.length - 1].joinSign = "and"), Array.prototype.push.apply(e3, a2)) : a2 && (e3 = [], e3 = a2), this.search(e3, false).then(() => i3()).catch((e4) => n2(e4));
+        e3 && e3.length > 0 ? a2 && a2.length > 0 && (1 === e3.length && (e3[0].leftBracket = "(", e3[0].rightBracket = ")"), "or" === e3[e3.length - 1].joinSign && (e3[e3.length - 1].joinSign = "and"), Array.prototype.push.apply(e3, a2)) : a2 && (e3 = [], e3 = a2), this.search(e3, false).then(() => i3()).catch((e4) => s2(e4));
       } else
-        this.search(a2, false).then(() => i3()).catch((e3) => n2(e3));
+        this.search(a2, false).then(() => i3()).catch((e3) => s2(e3));
     else
       i3();
   });
@@ -31,116 +31,127 @@ const o = require("../../src/utils/util.cjs"), n = require("./eventBus.cjs"), s
 }, getSearchForm() {
   const e2 = t.get(this.code);
   return e2.searchForm ? e2.searchForm : [];
-}, createRow(a2, s2, l2, r2) {
+}, createRow(a2, n2, l2, r2) {
   let d2 = -1;
-  return r2 && r2.rowIndex > -1 && (d2 = r2.rowIndex + 1), new Promise((r3, g2) => {
+  return r2 && r2.rowIndex > -1 && (d2 = r2.rowIndex + 1), new Promise((r3, u2) => {
     var _a, _b, _c;
     a2 || (a2 = t.get("_list_code"));
-    const u2 = t.get(a2), p = u2.gridData;
-    if ((_b = (_a = u2.superGrid) == null ? void 0 : _a.clearSort) == null ? void 0 : _b.call(_a), u2.lineEdit && u2.lineEdit.editable && void 0 !== u2.loaded && true === u2.loaded) {
+    const g2 = t.get(a2), p = g2.gridData;
+    if ((_b = (_a = g2.superGrid) == null ? void 0 : _a.clearSort) == null ? void 0 : _b.call(_a), g2.lineEdit && g2.lineEdit.editable && void 0 !== g2.loaded && true === g2.loaded) {
       let t2 = true;
       if (i.isEditOptionFunction("beforeInsertRow", a2)) {
-        const e2 = u2.isSubTableShowPage, i2 = u2.pagination && u2.pagination.pageSize, a3 = this.isMobile;
-        t2 = u2.pageContext ? u2.options.lineEditOptions.beforeInsertRow.call(this, { gridData: e2 ? u2.subTableData : u2.gridData, rowIndex: u2.$rowIndex, isMobile: a3, baseURL: this.baseURL, totalData: e2 ? u2.gridData : null, pageSize: i2, additionalParamMap: u2.additionalParamMap, row: s2, pageContext: u2.pageContext, configureObj: u2.configureObj }) : u2.options.lineEditOptions.beforeInsertRow.call(this, e2 ? u2.subTableData : u2.gridData, u2.$rowIndex, a3, this.baseURL, e2 ? u2.gridData : null, i2, u2.additionalParamMap, s2);
+        const e2 = g2.isSubTableShowPage, i2 = g2.pagination && g2.pagination.pageSize, a3 = this.isMobile;
+        t2 = g2.pageContext ? g2.options.lineEditOptions.beforeInsertRow.call(this, { gridData: e2 ? g2.subTableData : g2.gridData, rowIndex: g2.$rowIndex, isMobile: a3, baseURL: this.baseURL, totalData: e2 ? g2.gridData : null, pageSize: i2, additionalParamMap: g2.additionalParamMap, row: n2, pageContext: g2.pageContext, configureObj: g2.configureObj }) : g2.options.lineEditOptions.beforeInsertRow.call(this, e2 ? g2.subTableData : g2.gridData, g2.$rowIndex, a3, this.baseURL, e2 ? g2.gridData : null, i2, g2.additionalParamMap, n2);
       }
       if (void 0 === t2 || true === t2) {
-        if (u2.options && u2.options.isFormSubTable) {
-          let t4 = u2.gridData;
-          void 0 !== u2.isSubTableShowPage && true === u2.isSubTableShowPage && (t4 = u2.subTableData);
+        if (g2.options && g2.options.isFormSubTable) {
+          let t4 = g2.gridData;
+          void 0 !== g2.isSubTableShowPage && true === g2.isSubTableShowPage && (t4 = g2.subTableData);
           const i2 = t4.filter((e2) => void 0 !== e2.$editing && true === e2.$editing);
           i2 && i2.length > 0 && i2.forEach((t5) => {
-            o.setEntityFieldValue(t5, "$editing", false), e.$emit(n, "un-edit", { row: t5 });
-          }), u2.isEditRow = false;
+            o.setEntityFieldValue(t5, "$editing", false), e.$emit(s, "un-edit", { row: t5 });
+          }), g2.isEditRow = false;
         } else {
-          if (!i.isLastEditRowSave(a2) || void 0 !== u2.isCreateRow && true === u2.isCreateRow)
-            return window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.pleaseSaveLine", { row: u2.$rowIndex + 1 }), type: "warning" }), void g2(new Error("please save line"));
-          if (void 0 !== u2.$rowIndex && null !== u2.$rowIndex && u2.$rowIndex < u2.gridData.length) {
-            const e2 = u2.gridData[u2.$rowIndex];
-            o.setEntityFieldValue(e2, "$editing", false), u2.isEditRow = false;
+          if (!i.isLastEditRowSave(a2) || void 0 !== g2.isCreateRow && true === g2.isCreateRow)
+            return window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.pleaseSaveLine", { row: g2.$rowIndex + 1 }), type: "warning" }), void u2(new Error("please save line"));
+          if (void 0 !== g2.$rowIndex && null !== g2.$rowIndex && g2.$rowIndex < g2.gridData.length) {
+            const e2 = g2.gridData[g2.$rowIndex];
+            o.setEntityFieldValue(e2, "$editing", false), g2.isEditRow = false;
           }
         }
-        if (false === i.parseSubTableActionCondition(u2, this.parentFormData, {}, (_c = u2.options.actionPermission) == null ? void 0 : _c.addCondition))
-          return window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.canntAddTip"), type: "warning" }), void g2(new Error("can not create"));
-        if (s2 = this.getNewRow(u2.defaultValueColumns, u2.additionalParamMap, u2.contextParameter, s2, a2, l2 ? l2.getDefaultValueFunc : null), o.setEntityFieldValue(s2, "$editing", true), u2.isEditRow = true, u2.options && u2.options.isFormSubTable) {
-          if (void 0 !== u2.isSubTableShowPage && true === u2.isSubTableShowPage)
-            if (u2.isChangePage = true, d2 >= 0) {
-              const e2 = (this.currentPage - 1) * this.pageSize + d2;
-              u2.addRowIndex = e2 + 1, u2.subTableData.splice(e2, 0, s2);
+        if (false === i.parseSubTableActionCondition(g2, this.parentFormData, {}, (_c = g2.options.actionPermission) == null ? void 0 : _c.addCondition))
+          return window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.canntAddTip"), type: "warning" }), void u2(new Error("can not create"));
+        if (n2 = this.getNewRow(g2.defaultValueColumns, g2.additionalParamMap, g2.contextParameter, n2, a2, l2 ? l2.getDefaultValueFunc : null), o.setEntityFieldValue(n2, "$editing", true), g2.isEditRow = true, g2.options && g2.options.isFormSubTable) {
+          if (void 0 !== g2.isSubTableShowPage && true === g2.isSubTableShowPage ? g2.isChangePage = true : g2.isAddRow = true, d2 >= 0) {
+            const e2 = (this.currentPage - 1) * this.pageSize + d2;
+            g2.addRowIndex = e2 + 1, g2.isSubSearch && g2.subTableDataSearch ? (g2.subTableDataSearch.splice(e2, 0, n2), g2.subTableData.splice(e2, 0, n2)) : g2.subTableData.splice(e2, 0, n2);
+          } else {
+            if (g2.isSubSearch && g2.subTableDataSearch) {
+              let e2 = g2.subTableDataSearch.length;
+              e2 <= 0 && (e2 = -1), g2.subTableDataSearch.splice(e2, 0, n2), g2.subTableData.splice(e2, 0, n2);
             } else {
-              let e2 = u2.subTableData.length;
-              e2 <= 0 && (e2 = -1), u2.subTableData.splice(e2, 0, s2), u2.addRowIndex = u2.subTableData.length;
+              let e2 = g2.subTableData.length;
+              e2 <= 0 && (e2 = -1), g2.subTableData.splice(e2, 0, n2);
             }
-          else
-            d2 >= 0 ? p.splice(d2, 0, s2) : p.splice(p.length, 0, s2), u2.lineEdit.editingCell && (u2.lineEdit.editingCell.row = p.length);
-          u2.$rowIndex = p.length, this.$nextTick(() => {
+            g2.addRowIndex = g2.subTableData.length;
+          }
+          g2.$rowIndex = p.length, this.isMobile || this.$nextTick(() => {
             i.scrollYToBottom(a2);
           });
         } else
-          p.splice(0, 0, s2), u2.lineEdit.editingCell && (u2.lineEdit.editingCell.row = 0), u2.$rowIndex = 0;
-        const t3 = Object.assign({}, s2);
-        if (d2 >= 0 ? u2.orgGridData.splice(d2, 0, t3) : u2.orgGridData.splice(0, 0, t3), u2.lineEdit.editingCell || (u2.lineEdit.editingCell = {}, u2.lineEdit.validateErrorField = ""), i.isEditOptionFunction("afterInsertRow", a2)) {
-          const e2 = u2.isSubTableShowPage, t4 = u2.pagination && u2.pagination.pageSize, i2 = this.isMobile;
-          u2.pageContext ? u2.options.lineEditOptions.afterInsertRow.call(this, { gridData: e2 ? u2.subTableData : u2.gridData, rowIndex: u2.$rowIndex, isMobile: i2, baseURL: this.baseURL, totalData: e2 ? u2.gridData : null, pageSize: t4, additionalParamMap: u2.additionalParamMap, pageContext: u2.pageContext, configureObj: u2.configureObj }) : u2.options.lineEditOptions.afterInsertRow.call(this, e2 ? u2.subTableData : u2.gridData, u2.$rowIndex, i2, this.baseURL, e2 ? u2.gridData : null, t4, u2.additionalParamMap);
+          p.splice(0, 0, n2), g2.lineEdit.editingCell && (g2.lineEdit.editingCell.row = 0), g2.$rowIndex = 0;
+        const t3 = Object.assign({}, n2);
+        if (d2 >= 0 ? g2.orgGridData.splice(d2, 0, t3) : g2.orgGridData.splice(0, 0, t3), g2.lineEdit.editingCell || (g2.lineEdit.editingCell = {}, g2.lineEdit.validateErrorField = ""), i.isEditOptionFunction("afterInsertRow", a2)) {
+          const e2 = g2.isSubTableShowPage, t4 = g2.pagination && g2.pagination.pageSize, i2 = this.isMobile;
+          g2.pageContext ? g2.options.lineEditOptions.afterInsertRow.call(this, { gridData: e2 ? g2.subTableData : g2.gridData, rowIndex: g2.$rowIndex, isMobile: i2, baseURL: this.baseURL, totalData: e2 ? g2.gridData : null, pageSize: t4, additionalParamMap: g2.additionalParamMap, pageContext: g2.pageContext, configureObj: g2.configureObj }) : g2.options.lineEditOptions.afterInsertRow.call(this, e2 ? g2.subTableData : g2.gridData, g2.$rowIndex, i2, this.baseURL, e2 ? g2.gridData : null, t4, g2.additionalParamMap);
         }
-        u2.isCreateRow = true, r3(s2);
+        g2.isCreateRow = true, r3(n2);
       } else
-        g2(new Error("can not create"));
+        u2(new Error("can not create"));
     } else
-      g2(new Error("list not editable or data not loaded completely"));
+      u2(new Error("list not editable or data not loaded completely"));
   });
-}, getNewRow(e2, i2, a2, n2, s2, l2) {
-  n2 || (n2 = {}), s2 || (s2 = t.get("_list_code"));
-  const d2 = t.get(s2);
-  if (d2 && d2.allColumns && this.setColumnsDefaultValue(d2.allColumns, n2, d2, l2), e2 && e2.length > 0)
-    for (var g2 = 0; g2 < e2.length; g2++) {
-      const t2 = e2[g2];
+}, getNewRow(e2, i2, a2, s2, n2, l2) {
+  s2 || (s2 = {}), n2 || (n2 = t.get("_list_code"));
+  const d2 = t.get(n2);
+  if (d2 && d2.allColumns && this.setColumnsDefaultValue(d2.allColumns, s2, d2, l2), e2 && e2.length > 0)
+    for (var u2 = 0; u2 < e2.length; u2++) {
+      const t2 = e2[u2];
       if (t2 && t2.prop) {
-        const e3 = o.getEntityFieldValue(n2, t2.prop);
+        const e3 = o.getEntityFieldValue(s2, t2.prop);
         if ("$selection" !== t2.prop && "$index" !== t2.prop && t2.defaultValue && "" !== t2.defaultValue && (void 0 === e3 || "" === e3 || null === e3)) {
           let e4;
-          e4 = d2.pageContext ? o.getPropValueNew(t2.defaultValue, d2.pageContext) : o.getPropValue(t2.defaultValue, n2, i2, a2), o.setEntityFieldValue(n2, t2.prop, e4);
+          e4 = d2.pageContext ? o.getPropValueNew(t2.defaultValue, d2.pageContext) : o.getPropValue(t2.defaultValue, s2, i2, a2), o.setEntityFieldValue(s2, t2.prop, e4);
         }
       }
     }
-  return { $rowDataGuId: r.getGuId(), ...n2 };
+  return { $rowDataGuId: r.getGuId(), ...s2 };
 }, setColumnsDefaultValue(e2, t2, i2, a2) {
-  for (let n2 = 0; n2 < e2.length; n2++) {
-    const s2 = e2[n2], l2 = s2.prop;
+  for (let s2 = 0; s2 < e2.length; s2++) {
+    const n2 = e2[s2], l2 = n2.prop;
     if ("$index" !== l2 && "$selection" !== l2 && "operation" !== l2) {
-      if (s2.hasOwnProperty("children"))
-        this.setChildrenColumnsDefaultValue(s2.children, t2);
+      if (n2.hasOwnProperty("children"))
+        this.setChildrenColumnsDefaultValue(n2.children, t2, i2, a2);
       else if (void 0 === t2[l2]) {
-        const e3 = s2.defaultValue;
-        let n3 = null;
-        a2 && (n3 = a2(i2.pageContext, e3, null, null), void 0 === n3 && (n3 = null)), o.setEntityFieldValue(t2, l2, n3);
+        let e3 = this.getColumnDefaultValue(n2, i2, a2);
+        o.setEntityFieldValue(t2, l2, e3);
       }
     }
   }
   o.setEntityFieldValue(t2, "$editing", false);
-}, setChildrenColumnsDefaultValue(e2, t2) {
-  for (let i2 = 0; i2 < e2.length; i2++) {
-    const a2 = e2[i2], n2 = a2.prop;
-    a2.hasOwnProperty("children") ? this.setChildrenColumnsDefaultValue(a2.children, t2) : void 0 === t2[n2] && "operation" !== n2 && o.setEntityFieldValue(t2, n2, null);
+}, setChildrenColumnsDefaultValue(e2, t2, i2, a2) {
+  for (let s2 = 0; s2 < e2.length; s2++) {
+    const n2 = e2[s2], l2 = n2.prop;
+    if (n2.hasOwnProperty("children"))
+      this.setChildrenColumnsDefaultValue(n2.children, t2, i2, a2);
+    else if (void 0 === t2[l2] && "operation" !== l2) {
+      let e3 = this.getColumnDefaultValue(n2, i2, a2);
+      o.setEntityFieldValue(t2, l2, e3);
+    }
   }
+}, getColumnDefaultValue(e2, t2, i2) {
+  const a2 = e2.defaultValue;
+  let o2 = null;
+  return i2 && (o2 = i2(t2.pageContext, a2, null, null), void 0 === o2 && (o2 = null)), o2;
 }, isLastEditRowSaveMessage(e2) {
   e2 || (e2 = t.get("_list_code"));
   const a2 = t.get(e2);
   return !!i.isLastEditRowSave(e2) || (window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.pleaseSaveLine", { row: a2.$rowIndex + 1 }), type: "warning" }), false);
 }, confirmBeforeSwitchingRow(e2, a2) {
   e2 || (e2 = t.get("_list_code"));
-  const { t: n2 } = o.getI18n(), s2 = t.get(e2).$rowIndex;
-  i.isLastEditRowSave(e2) || d.ElMessageBox.confirm(n2("superGrid.rowEditMessageBox.content"), n2("superGrid.rowEditMessageBox.title"), { distinguishCancelAndClose: true, confirmButtonText: n2("superGrid.rowEditMessageBox.confirmButton"), cancelButtonText: n2("superGrid.rowEditMessageBox.cancelButton"), showClose: true, beforeClose: (t2, i2, o2) => {
-    "confirm" === t2 ? this.saveRow(s2, e2).then((e3) => {
+  const { t: s2 } = o.getI18n(), n2 = t.get(e2).$rowIndex;
+  i.isLastEditRowSave(e2) || d.ElMessageBox.confirm(s2("superGrid.rowEditMessageBox.content"), s2("superGrid.rowEditMessageBox.title"), { distinguishCancelAndClose: true, confirmButtonText: s2("superGrid.rowEditMessageBox.confirmButton"), cancelButtonText: s2("superGrid.rowEditMessageBox.cancelButton"), showClose: true, beforeClose: (t2, i2, o2) => {
+    "confirm" === t2 ? this.saveRow(n2, e2).then((e3) => {
       a2 == null ? void 0 : a2("confirm"), o2();
-    }) : "cancel" === t2 ? (this.restoreCurrentRow(s2, e2), a2 == null ? void 0 : a2("cancel"), o2()) : "close" === t2 && o2();
+    }) : "cancel" === t2 ? (this.restoreCurrentRow(n2, e2), a2 == null ? void 0 : a2("cancel"), o2()) : "close" === t2 && o2();
   } });
-}, editRow(e2, a2, n2, l2) {
+}, editRow(e2, a2, s2, l2) {
   a2 || (a2 = t.get("_list_code"));
   const r2 = t.get(a2);
   if (r2 && r2.lineEdit && r2.lineEdit.editable) {
     if (void 0 !== r2.$rowIndex && null !== r2.$rowIndex && r2.$rowIndex !== e2) {
       if (void 0 === r2.options.lineEditOptions.autoSave || i.isHasEditOption("autoSave", a2) && true === r2.options.lineEditOptions.autoSave) {
-        if (!n2)
+        if (!s2)
           return void this.saveRow(r2.$rowIndex, a2).then((t3) => {
             this.editRow(e2, a2, true);
           });
@@ -149,10 +160,10 @@ const o = require("../../src/utils/util.cjs"), n = require("./eventBus.cjs"), s
     }
     let t2 = true;
     if (!l2 && i.isEditOptionFunction("beforeEdit", a2)) {
-      const o2 = r2.isSubTableShowPage, n3 = r2.pagination && r2.pagination.pageSize;
-      t2 = r2.options.lineEditOptions.beforeEdit.call(this, { gridData: o2 ? r2.subTableData : r2.gridData, listCode: a2, entity: r2.gridData[e2], row: r2.gridData[e2], rowIndex: e2, columns: r2.columns, isMobile: false, pageGridData: o2 ? r2.gridData : null, pageSize: n3, additionalParamMap: i.getAdditionalParamMap(r2), pageContext: r2.pageContext, configureObj: r2.configureObj });
+      const o2 = r2.isSubTableShowPage, s3 = r2.pagination && r2.pagination.pageSize;
+      t2 = r2.options.lineEditOptions.beforeEdit.call(this, { gridData: o2 ? r2.subTableData : r2.gridData, listCode: a2, entity: r2.gridData[e2], row: r2.gridData[e2], rowIndex: e2, columns: r2.columns, isMobile: false, pageGridData: o2 ? r2.gridData : null, pageSize: s3, additionalParamMap: i.getAdditionalParamMap(r2), pageContext: r2.pageContext, configureObj: r2.configureObj });
     }
-    s.isPromise(t2) ? t2.then((t3) => {
+    n.isPromise(t2) ? t2.then((t3) => {
       void 0 !== t3 && true !== t3 || this.doEditRow(r2, e2);
     }) : void 0 !== t2 && true !== t2 || this.doEditRow(r2, e2);
   }
@@ -172,56 +183,56 @@ const o = require("../../src/utils/util.cjs"), n = require("./eventBus.cjs"), s
       });
     }, 100);
   });
-}, saveCurrentRow(s2, l2) {
+}, saveCurrentRow(n2, l2) {
   return new Promise((r2, d2) => {
     l2 || (l2 = t.get("_list_code"));
-    const g2 = t.get(l2);
-    if (g2.lineEdit && g2.lineEdit.editable) {
-      if (void 0 === g2.gridData[s2].$editing || false === g2.gridData[s2].$editing)
-        return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.noNeedToSaveRow", { row: s2 + 1 }), type: "warning" });
-      if (g2.$rowIndex !== s2 && !i.isLastEditRowSave(l2))
-        return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.pleaseSaveLine", { row: g2.$rowIndex + 1 }), type: "warning" });
-      if (g2.$lastSaveRowIndex = null, void 0 !== g2.isHasDynamic && false === g2.isHasDynamic && !g2.lineEdit.urlToSaveRow && !i.isHasEditOption("urlToSaveRow", l2) && !i.isEditOptionFunction("saveRow", l2))
+    const u2 = t.get(l2);
+    if (u2.lineEdit && u2.lineEdit.editable) {
+      if (void 0 === u2.gridData[n2].$editing || false === u2.gridData[n2].$editing)
+        return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.noNeedToSaveRow", { row: n2 + 1 }), type: "warning" });
+      if (u2.$rowIndex !== n2 && !i.isLastEditRowSave(l2))
+        return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.pleaseSaveLine", { row: u2.$rowIndex + 1 }), type: "warning" });
+      if (u2.$lastSaveRowIndex = null, void 0 !== u2.isHasDynamic && false === u2.isHasDynamic && !u2.lineEdit.urlToSaveRow && !i.isHasEditOption("urlToSaveRow", l2) && !i.isEditOptionFunction("saveRow", l2))
         return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.pleaseSetURLToSaveRowInformation"), type: "warning" });
-      if (!g2.canSaveRow)
+      if (!u2.canSaveRow)
         return;
-      g2.canSaveRow = false;
-      const t2 = g2.gridData[s2];
-      let u2 = true;
-      i.isHasEditOption("isEnableValidate", l2) && (u2 = g2.options.lineEditOptions.isEnableValidate);
+      u2.canSaveRow = false;
+      const t2 = u2.gridData[n2];
+      let g2 = true;
+      i.isHasEditOption("isEnableValidate", l2) && (g2 = u2.options.lineEditOptions.isEnableValidate);
       let p = true;
-      if (true === u2 && (p = a.validator(t2, l2, s2)), true === p) {
+      if (true === g2 && (p = a.validator(t2, l2, n2)), true === p) {
         let a2 = true;
-        if (i.isEditOptionFunction("beforeSave", l2) && (a2 = g2.pageContext ? g2.options.lineEditOptions.beforeSave.call(this, { row: t2, columns: g2.columns, additionalParamMap: g2.additionalParamMap, pageContext: g2.pageContext, configureObj: g2.configureObj }) : g2.options.lineEditOptions.beforeSave.call(this, t2, g2.columns, g2.additionalParamMap)), void 0 === a2 || true === a2) {
-          e.$emit(n, "un-edit", { row: t2 });
-          const a3 = i.getAdditionalParamMap(g2);
-          let u3;
-          if (i.isEditOptionFunction("saveRow", l2) && (u3 = g2.pageContext ? g2.options.lineEditOptions.saveRow.call(this, { row: t2, columns: g2.columns, dataTypeMap: g2.$dataTypeMap, dynamicColumnInfo: g2.dynamicColumnInfo, additionalParamMap: a3, mainDefaultValueColumns: g2.mainDefaultValueColumns, pageContext: g2.pageContext, configureObj: g2.configureObj }) : g2.options.lineEditOptions.saveRow.call(this, t2, g2.columns, g2.$dataTypeMap, g2.dynamicColumnInfo, a3, g2.mainDefaultValueColumns)), !u3 && g2.lineEdit && g2.lineEdit.urlToSaveRow) {
-            let e2 = g2.lineEdit.urlToSaveRow;
-            i.isHasEditOption("urlToSaveRow", l2) && (e2 = g2.options.lineEditOptions.urlToSaveRow), u3 = window.$vueApp.config.globalProperties.$http.post(window.$vueApp.config.globalProperties.baseURL + e2, t2);
+        if (i.isEditOptionFunction("beforeSave", l2) && (a2 = u2.pageContext ? u2.options.lineEditOptions.beforeSave.call(this, { row: t2, columns: u2.columns, additionalParamMap: u2.additionalParamMap, pageContext: u2.pageContext, configureObj: u2.configureObj }) : u2.options.lineEditOptions.beforeSave.call(this, t2, u2.columns, u2.additionalParamMap)), void 0 === a2 || true === a2) {
+          e.$emit(s, "un-edit", { row: t2 });
+          const a3 = i.getAdditionalParamMap(u2);
+          let g3;
+          if (i.isEditOptionFunction("saveRow", l2) && (g3 = u2.pageContext ? u2.options.lineEditOptions.saveRow.call(this, { row: t2, columns: u2.columns, dataTypeMap: u2.$dataTypeMap, dynamicColumnInfo: u2.dynamicColumnInfo, additionalParamMap: a3, mainDefaultValueColumns: u2.mainDefaultValueColumns, pageContext: u2.pageContext, configureObj: u2.configureObj }) : u2.options.lineEditOptions.saveRow.call(this, t2, u2.columns, u2.$dataTypeMap, u2.dynamicColumnInfo, a3, u2.mainDefaultValueColumns)), !g3 && u2.lineEdit && u2.lineEdit.urlToSaveRow) {
+            let e2 = u2.lineEdit.urlToSaveRow;
+            i.isHasEditOption("urlToSaveRow", l2) && (e2 = u2.options.lineEditOptions.urlToSaveRow), g3 = window.$vueApp.config.globalProperties.$http.post(window.$vueApp.config.globalProperties.baseURL + e2, t2);
           }
-          if (void 0 !== g2.isHasDynamic && true === g2.isHasDynamic && !u3) {
-            const e2 = "/common/dynamic-values", i2 = { mainTableName: g2.basicInfo && g2.basicInfo.tableName ? g2.basicInfo.tableName : "", row: t2, dynamicColumnInfo: g2.dynamicColumnInfo, additionalParamMap: a3, dataTypeMap: g2.$dataTypeMap, dynamicServiceName: g2.dynamicServiceName, mainDefaultValueColumns: g2.mainDefaultValueColumns };
-            u3 = window.$vueApp.config.globalProperties.$http.post(window.$vueApp.config.globalProperties.baseURL + e2, i2);
+          if (void 0 !== u2.isHasDynamic && true === u2.isHasDynamic && !g3) {
+            const e2 = "/common/dynamic-values", i2 = { mainTableName: u2.basicInfo && u2.basicInfo.tableName ? u2.basicInfo.tableName : "", row: t2, dynamicColumnInfo: u2.dynamicColumnInfo, additionalParamMap: a3, dataTypeMap: u2.$dataTypeMap, dynamicServiceName: u2.dynamicServiceName, mainDefaultValueColumns: u2.mainDefaultValueColumns };
+            g3 = window.$vueApp.config.globalProperties.$http.post(window.$vueApp.config.globalProperties.baseURL + e2, i2);
           }
-          u3 ? u3.then((e2) => {
-            this.afterSave(g2, s2, l2, e2, t2).then((e3) => {
+          g3 ? g3.then((e2) => {
+            this.afterSave(u2, n2, l2, e2, t2).then((e3) => {
               r2(e3);
             }).catch((e3) => {
               d2(e3);
             });
           }).catch((e2) => {
-            g2.canSaveRow = true, i.isEditOptionFunction("saveError", l2) && g2.options.lineEditOptions.saveError.call(this, t2, g2.columns, s2, e2), d2(e2);
-          }) : (g2.canSaveRow = true, d2(o.getI18n().t("saveRowRequest is undefined")));
+            u2.canSaveRow = true, i.isEditOptionFunction("saveError", l2) && u2.options.lineEditOptions.saveError.call(this, t2, u2.columns, n2, e2), d2(e2);
+          }) : (u2.canSaveRow = true, d2(o.getI18n().t("saveRowRequest is undefined")));
         } else
-          g2.canSaveRow = true, d2(o.getI18n().t("superGrid.theReturnValueOfTheBeforesaveCallbackMethodIsFalse"));
+          u2.canSaveRow = true, d2(o.getI18n().t("superGrid.theReturnValueOfTheBeforesaveCallbackMethodIsFalse"));
       } else
-        g2.canSaveRow = true, d2(o.getI18n().t("imatrixUIMessage.validationFailed"));
+        u2.canSaveRow = true, d2(o.getI18n().t("imatrixUIMessage.validationFailed"));
     }
   });
-}, afterSave(e2, t2, a2, n2, s2) {
+}, afterSave(e2, t2, a2, s2, n2) {
   return new Promise((l2, r2) => {
-    e2.isCreateRow = false, e2.canSaveRow = true, e2.$rowIndex = null, e2.isEditRow = false, e2.$lastSaveRowIndex = t2, window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.lineSavedSuccessfully", { row: t2 + 1 }), type: "success" }), (void 0 === e2.options.lineEditOptions.aftersaveIsCancelEditState || i.isHasEditOption("aftersaveIsCancelEditState", a2) && true === e2.options.lineEditOptions.aftersaveIsCancelEditState) && (o.setEntityFieldValue(s2, "$editing", false), e2.isEditRow = false), i.isEditOptionFunction("saveSuccess", a2) && (e2.pageContext ? e2.options.lineEditOptions.saveSuccess.call(this, { data: n2, columns: e2.columns, rowIndex: t2, row: s2, additionalParamMap: e2.additionalParamMap, pageContext: e2.pageContext, configureObj: e2.configureObj }) : e2.options.lineEditOptions.saveSuccess.call(this, n2, e2.columns, t2, s2, e2.additionalParamMap), e2.options.lineEditOptions.saveSuccess.call(this, n2, e2.columns, t2, s2, e2.additionalParamMap)), Object.assign(e2.orgGridData[t2], n2), Object.assign(e2.gridData[t2], n2), this.refresh(false, true).then(() => {
+    e2.isCreateRow = false, e2.canSaveRow = true, e2.$rowIndex = null, e2.isEditRow = false, e2.$lastSaveRowIndex = t2, window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.lineSavedSuccessfully", { row: t2 + 1 }), type: "success" }), (void 0 === e2.options.lineEditOptions.aftersaveIsCancelEditState || i.isHasEditOption("aftersaveIsCancelEditState", a2) && true === e2.options.lineEditOptions.aftersaveIsCancelEditState) && (o.setEntityFieldValue(n2, "$editing", false), e2.isEditRow = false), i.isEditOptionFunction("saveSuccess", a2) && (e2.pageContext ? e2.options.lineEditOptions.saveSuccess.call(this, { data: s2, columns: e2.columns, rowIndex: t2, row: n2, additionalParamMap: e2.additionalParamMap, pageContext: e2.pageContext, configureObj: e2.configureObj }) : e2.options.lineEditOptions.saveSuccess.call(this, s2, e2.columns, t2, n2, e2.additionalParamMap), e2.options.lineEditOptions.saveSuccess.call(this, s2, e2.columns, t2, n2, e2.additionalParamMap)), Object.assign(e2.orgGridData[t2], s2), Object.assign(e2.gridData[t2], s2), this.refresh(false, true).then(() => {
       (void 0 === e2.options.lineEditOptions.aftersaveIsCreateRow || e2.options.lineEditOptions.aftersaveIsCreateRow) && this.createRow(a2), l2({ rowIndex: t2, listCode: a2 });
     }).catch((e3) => r2(e3));
   });
@@ -231,42 +242,42 @@ const o = require("../../src/utils/util.cjs"), n = require("./eventBus.cjs"), s
   });
 }, restoreCurrentRow(e2, a2) {
   a2 || (a2 = t.get("_list_code"));
-  const n2 = t.get(a2);
-  if (n2.lineEdit && n2.lineEdit.editable) {
-    if (null !== n2.$rowIndex && n2.$rowIndex !== e2 && !i.isLastEditRowSave(a2))
-      return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.pleaseSaveLine", { row: n2.$rowIndex + 1 }), type: "warning" });
-    const t2 = null !== n2.$lastSaveRowIndex && n2.$lastSaveRowIndex === e2 && void 0 !== n2.gridData[e2].id;
-    let s2 = true;
+  const s2 = t.get(a2);
+  if (s2.lineEdit && s2.lineEdit.editable) {
+    if (null !== s2.$rowIndex && s2.$rowIndex !== e2 && !i.isLastEditRowSave(a2))
+      return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.pleaseSaveLine", { row: s2.$rowIndex + 1 }), type: "warning" });
+    const t2 = null !== s2.$lastSaveRowIndex && s2.$lastSaveRowIndex === e2 && void 0 !== s2.gridData[e2].id;
+    let n2 = true;
     if (i.isEditOptionFunction("beforeRestoreValidate", a2)) {
-      const i2 = n2.isSubTableShowPage, a3 = n2.pagination && n2.pagination.pageSize, o2 = this.isMobile;
-      s2 = n2.options.lineEditOptions.beforeRestoreValidate.call(this, { rowIndex: e2, gridData: i2 ? n2.subTableData : n2.gridData, entity: n2.gridData[e2], isMobile: o2, baseURL: this.baseURL, isEditing: !t2, pageGridData: i2 ? n2.gridData : null, pageSize: a3, additionalParamMap: n2.additionalParamMap, pageContext: n2.pageContext, configureObj: n2.configureObj });
+      const i2 = s2.isSubTableShowPage, a3 = s2.pagination && s2.pagination.pageSize, o2 = this.isMobile;
+      n2 = s2.options.lineEditOptions.beforeRestoreValidate.call(this, { rowIndex: e2, gridData: i2 ? s2.subTableData : s2.gridData, entity: s2.gridData[e2], isMobile: o2, baseURL: this.baseURL, isEditing: !t2, pageGridData: i2 ? s2.gridData : null, pageSize: a3, additionalParamMap: s2.additionalParamMap, pageContext: s2.pageContext, configureObj: s2.configureObj });
     }
-    if (void 0 !== s2 && true !== s2)
+    if (void 0 !== n2 && true !== n2)
       return;
     if (true === t2)
       return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.lineNoNeedToUndoEdit", { row: e2 + 1 }), type: "warning" });
     let l2 = true;
     if (i.isEditOptionFunction("beforeRestore", a2)) {
-      const i2 = n2.isSubTableShowPage, a3 = n2.pagination && n2.pagination.pageSize, o2 = this.isMobile;
-      l2 = n2.options.lineEditOptions.beforeRestore.call(this, { rowIndex: e2, gridData: i2 ? n2.subTableData : n2.gridData, entity: n2.gridData[e2], isMobile: o2, baseURL: window.$vueApp.config.globalProperties.baseURL, isEditing: !t2, pageGridData: i2 ? n2.gridData : null, pageSize: a3, additionalParamMap: n2.additionalParamMap, pageContext: n2.pageContext, configureObj: n2.configureObj });
+      const i2 = s2.isSubTableShowPage, a3 = s2.pagination && s2.pagination.pageSize, o2 = this.isMobile;
+      l2 = s2.options.lineEditOptions.beforeRestore.call(this, { rowIndex: e2, gridData: i2 ? s2.subTableData : s2.gridData, entity: s2.gridData[e2], isMobile: o2, baseURL: window.$vueApp.config.globalProperties.baseURL, isEditing: !t2, pageGridData: i2 ? s2.gridData : null, pageSize: a3, additionalParamMap: s2.additionalParamMap, pageContext: s2.pageContext, configureObj: s2.configureObj });
     }
     if (void 0 === l2 || true === l2) {
-      if (n2.orgGridData[e2].id || n2.orgGridData[e2].ID) {
-        const t3 = JSON.parse(JSON.stringify(n2.orgGridData[e2]));
-        if (void 0 !== n2.isSubTableShowPage && true === n2.isSubTableShowPage) {
+      if (s2.orgGridData[e2].id || s2.orgGridData[e2].ID) {
+        const t3 = JSON.parse(JSON.stringify(s2.orgGridData[e2]));
+        if (void 0 !== s2.isSubTableShowPage && true === s2.isSubTableShowPage) {
           const t4 = (this.currentPage - 1) * this.pageSize + e2;
-          n2.subTableData[t4] = n2.gridData[e2];
+          s2.subTableData[t4] = s2.gridData[e2];
         }
-        window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.lineCancelledSuccessfully", { row: e2 + 1 }), type: "success" }), (void 0 === n2.options.lineEditOptions.afterRestoreIsCancelEditState || i.isHasEditOption("afterRestoreIsCancelEditState", a2) && true === n2.options.lineEditOptions.afterRestoreIsCancelEditState) && (t3.$editing = false, n2.isEditRow = false), this.restoreCurrentRowTimer = setTimeout(() => {
-          n2.gridData[e2] = t3;
+        window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.lineCancelledSuccessfully", { row: e2 + 1 }), type: "success" }), (void 0 === s2.options.lineEditOptions.afterRestoreIsCancelEditState || i.isHasEditOption("afterRestoreIsCancelEditState", a2) && true === s2.options.lineEditOptions.afterRestoreIsCancelEditState) && (t3.$editing = false, s2.isEditRow = false), this.restoreCurrentRowTimer = setTimeout(() => {
+          s2.gridData[e2] = t3;
         }, 100);
       } else
         this.deleteRow(e2, a2, true);
-      n2.$rowIndex = null, n2.isCreateRow = false, i.isEditOptionFunction("afterRestore", a2) && (n2.pageContext ? n2.options.lineEditOptions.afterRestore.call(this, { rowIndex: e2, row: n2.orgGridData[e2], additionalParamMap: n2.additionalParamMap, pageContext: n2.pageContext, configureObj: n2.configureObj }) : n2.options.lineEditOptions.afterRestore.call(this, e2, n2.orgGridData[e2], n2.additionalParamMap));
+      s2.$rowIndex = null, s2.isCreateRow = false, i.isEditOptionFunction("afterRestore", a2) && (s2.pageContext ? s2.options.lineEditOptions.afterRestore.call(this, { rowIndex: e2, row: s2.orgGridData[e2], additionalParamMap: s2.additionalParamMap, pageContext: s2.pageContext, configureObj: s2.configureObj }) : s2.options.lineEditOptions.afterRestore.call(this, e2, s2.orgGridData[e2], s2.additionalParamMap));
     }
   }
-}, deleteRow(e2, a2, n2) {
-  return new Promise((s2, l2) => {
+}, deleteRow(e2, a2, s2) {
+  return new Promise((n2, l2) => {
     var _a, _b;
     a2 || (a2 = t.get("_list_code"));
     const r2 = t.get(a2);
@@ -278,35 +289,41 @@ const o = require("../../src/utils/util.cjs"), n = require("./eventBus.cjs"), s
     if (void 0 === d2 || true === d2) {
       if (!this.wfSubTableDeleteRowConditionParse(r2, this.parentFormData, r2.gridData[e2]))
         return;
-      if (void 0 !== r2.isSubTableShowPage && true === r2.isSubTableShowPage) {
+      if (r2.options && r2.options.isFormSubTable) {
         r2.isDelete = true;
-        const t2 = (this.currentPage - 1) * this.pageSize + e2;
-        r2.subTableData.splice(t2, 1);
+        let t2 = e2;
+        if (this.isMobile || (t2 = (this.currentPage - 1) * this.pageSize + e2), r2.isSubSearch && r2.subTableDataSearch) {
+          const e3 = r2.subTableDataSearch[t2];
+          r2.subTableDataSearch.splice(t2, 1);
+          const i2 = r2.subTableData.findIndex((t3) => e3.$rowDataGuId && t3.$rowDataGuId && e3.$rowDataGuId === t3.$rowDataGuId);
+          -1 !== i2 && r2.subTableData.splice(i2, 1);
+        } else
+          r2.subTableData.splice(t2, 1);
       } else
         r2.gridData.splice(e2, 1), r2.orgGridData.splice(e2, 1);
-      if (r2.$lastSaveRowIndex = null, r2.$rowIndex = null, r2.isEditRow = false, window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.deleteSuccessful"), type: "success" }), 0 === r2.gridData.length && r2.options && null !== r2.options.isDefaultShowEdit && void 0 !== r2.options.isDefaultShowEdit && true === r2.options.isDefaultShowEdit && this.createRow(a2), r2.isMulitiSelect && ((_b = (_a = r2.superGrid) == null ? void 0 : _a.clearSelection) == null ? void 0 : _b.call(_a)), r2.isCreateRow = false, (void 0 === n2 || !n2) && i.isEditOptionFunction("afterDelete", a2)) {
+      if (r2.$lastSaveRowIndex = null, r2.$rowIndex = null, r2.isEditRow = false, window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.deleteSuccessful"), type: "success" }), 0 === r2.gridData.length && r2.options && null !== r2.options.isDefaultShowEdit && void 0 !== r2.options.isDefaultShowEdit && true === r2.options.isDefaultShowEdit && this.createRow(a2), r2.isMulitiSelect && ((_b = (_a = r2.superGrid) == null ? void 0 : _a.clearSelection) == null ? void 0 : _b.call(_a)), r2.isCreateRow = false, (void 0 === s2 || !s2) && i.isEditOptionFunction("afterDelete", a2)) {
         const t2 = r2.isSubTableShowPage, i2 = r2.pagination && r2.pagination.pageSize, a3 = this.isMobile;
         r2.pageContext ? r2.options.lineEditOptions.afterDelete.call(this, { rowIndex: e2, row: r2.orgGridData[e2], gridData: t2 ? r2.subTableData : r2.gridData, isMobile: a3, baseURL: this.baseURL, totalData: t2 ? r2.gridData : null, pageSize: i2, additionalParamMap: r2.additionalParamMap, pageContext: r2.pageContext, configureObj: r2.configureObj }) : r2.options.lineEditOptions.afterDelete.call(this, e2, r2.orgGridData[e2], t2 ? r2.subTableData : r2.gridData, a3, this.baseURL, t2 ? r2.gridData : null, i2, r2.additionalParamMap);
       }
     }
-    s2();
+    n2();
   });
 }, getDeleteIndexes(e2, t2, i2) {
   const a2 = [];
   return e2.forEach((e3, o2) => {
     if (a2.length !== t2.length) {
-      for (const n2 of t2)
-        if (e3[i2] === n2[i2]) {
+      for (const s2 of t2)
+        if (e3[i2] === s2[i2]) {
           a2.push(o2);
           break;
         }
     }
   }), a2.sort((e3, t3) => t3 - e3);
-}, batchDeleteSubTableRowApi(e2, a2, n2) {
-  return new Promise((s2, l2) => {
+}, batchDeleteSubTableRowApi(e2, a2, s2) {
+  return new Promise((n2, l2) => {
     var _a, _b;
     if (!(a2 = a2 || []).length)
-      return window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("imatrixUIMessage.pleaseSelectDeleteData"), type: "warning" }), void s2();
+      return window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("imatrixUIMessage.pleaseSelectDeleteData"), type: "warning" }), void n2();
     e2 = e2 || t.get("_list_code");
     const r2 = t.get(e2);
     let d2 = true;
@@ -317,14 +334,14 @@ const o = require("../../src/utils/util.cjs"), n = require("./eventBus.cjs"), s
     if (void 0 === d2 || true === d2) {
       let t2 = [];
       if (void 0 !== r2.isSubTableShowPage && true === r2.isSubTableShowPage) {
-        r2.isDelete = true, t2 = this.getDeleteIndexes(r2.subTableData, a2, n2);
+        r2.isDelete = true, t2 = this.getDeleteIndexes(r2.subTableData, a2, s2);
         for (const e3 of t2) {
           if (!this.wfSubTableDeleteRowConditionParse(r2, this.parentFormData, r2.subTableData[e3]))
             return;
           r2.subTableData.splice(e3, 1);
         }
       } else {
-        t2 = this.getDeleteIndexes(r2.gridData, a2, n2);
+        t2 = this.getDeleteIndexes(r2.gridData, a2, s2);
         for (const e3 of t2) {
           if (!this.wfSubTableDeleteRowConditionParse(r2, this.parentFormData, r2.gridData[e3]))
             return;
@@ -336,14 +353,14 @@ const o = require("../../src/utils/util.cjs"), n = require("./eventBus.cjs"), s
         r2.pageContext ? r2.options.lineEditOptions.afterDelete.call(this, { deleteRows: a2, gridData: e3 ? r2.subTableData : r2.gridData, isMobile: i2, baseURL: this.baseURL, totalData: e3 ? r2.gridData : null, pageSize: t3, additionalParamMap: r2.additionalParamMap, pageContext: r2.pageContext, configureObj: r2.configureObj }) : r2.options.lineEditOptions.afterDelete.call(this, a2, e3 ? r2.subTableData : r2.gridData, i2, this.baseURL, e3 ? r2.gridData : null, t3, r2.additionalParamMap);
       }
     }
-    s2();
+    n2();
   });
 }, focus(e2, t2) {
   i.setCurrentRow(e2, t2);
 }, getGridData(e2) {
   e2 || (e2 = t.get("_list_code"));
   const i2 = t.get(e2);
-  return i2.isSubTableShowPage ? i2.subTableData : i2.gridData;
+  return i2.options && i2.options.isFormSubTable ? i2.subTableData : i2.gridData;
 }, getColumns(e2) {
   e2 || (e2 = t.get("_list_code"));
   return t.get(e2).columns;
@@ -373,7 +390,7 @@ const o = require("../../src/utils/util.cjs"), n = require("./eventBus.cjs"), s
       for (let i3 = 0; i3 < t2.length; i3++) {
         const a3 = t2[i3];
         if (void 0 !== a3.$editing && true === a3.$editing) {
-          o.setEntityFieldValue(a3, "$editing", false), e.$emit(n, "un-edit", { row: a3 });
+          o.setEntityFieldValue(a3, "$editing", false), e.$emit(s, "un-edit", { row: a3 });
           break;
         }
       }
@@ -381,30 +398,29 @@ const o = require("../../src/utils/util.cjs"), n = require("./eventBus.cjs"), s
 }, closePageDialog(e2) {
   if (this.jumpPageSetting, this.jumpPageSetting) {
     const i2 = t.get(this.code), a2 = this.jumpPageSetting.closeEvent, o2 = this.jumpPageSetting.row;
-    let n2;
-    if (i2.options.eventCallBack && a2 && null !== a2 && i2.options.eventCallBack[a2] && (n2 = i2.options.eventCallBack[a2]), n2) {
+    let s2;
+    if (i2.options.eventCallBack && a2 && null !== a2 && i2.options.eventCallBack[a2] && (s2 = i2.options.eventCallBack[a2]), s2) {
       const t2 = { params: i2.additionalParamMap, additionalParamMap: i2.additionalParamMap, entity: o2 };
-      e2 && (t2.eventParams = { popEntity: e2.entity, popPageCode: e2.pageCode, pageCode: this.pageCode }), n2.call(this, t2), e2.jumpInfo && "closeWindowAndRefresh" === e2.jumpInfo.successOperation && this.refresh();
+      e2 && (t2.eventParams = { popEntity: e2.entity, popPageCode: e2.pageCode, pageCode: this.pageCode }), s2.call(this, t2), e2.jumpInfo && "closeWindowAndRefresh" === e2.jumpInfo.successOperation && this.refresh();
     }
-    const s2 = this.jumpPageSetting.isRefreshWhenClosePopup;
-    if (void 0 !== s2 && true === s2) {
+    const n2 = this.jumpPageSetting.isRefreshWhenClosePopup;
+    if (void 0 !== n2 && true === n2) {
       const e3 = t.get(this.code);
       this.search(e3.searchForm);
     }
   }
   this.isShowPageDialog = false, this.jumpPageSetting = null;
 }, updateValues(e2, i2, a2) {
-  const o2 = t.get(this.code), n2 = a2;
-  if (null != n2 && n2 < this.gridData.length) {
+  const o2 = t.get(this.code), s2 = a2;
+  if (null != s2 && s2 < this.gridData.length) {
     const t2 = false === this.isSql || o2.options && (void 0 !== o2.options.isAdministerListView && true === o2.options.isAdministerListView || void 0 !== o2.options.isFormSubTable && true === o2.options.isFormSubTable), a3 = this.tableName;
-    l.updateWithPageValue(e2, i2, this.jumpPageSetting, this.gridData[n2], a3, !t2);
-    const s2 = this.jumpPageSetting && this.jumpPageSetting.updateValueEvent ? this.jumpPageSetting.updateValueEvent : null;
+    l.updateWithPageValue(e2, i2, this.jumpPageSetting, this.gridData[s2], a3, !t2);
+    const n2 = this.jumpPageSetting && this.jumpPageSetting.updateValueEvent ? this.jumpPageSetting.updateValueEvent : null;
     let r2;
-    o2.options.eventCallBack && s2 && null !== s2 && o2.options.eventCallBack[s2] && (r2 = o2.options.eventCallBack[s2]), r2 && r2.call(this, { sourceModel: e2, sourceTableName: i2, jumpPageSetting: this.jumpPageSetting, entity: this.gridData[n2], targetTableName: a3, isNeedReplaceFieldName: !t2, additionalParamMap: o2.additionalParamMap });
+    o2.options.eventCallBack && n2 && null !== n2 && o2.options.eventCallBack[n2] && (r2 = o2.options.eventCallBack[n2]), r2 && r2.call(this, { sourceModel: e2, sourceTableName: i2, jumpPageSetting: this.jumpPageSetting, entity: this.gridData[s2], targetTableName: a3, isNeedReplaceFieldName: !t2, additionalParamMap: o2.additionalParamMap });
   }
 }, refreshChildData(e2, i2, a2) {
-  const o2 = t.get(e2);
-  null == a2 || false === a2 ? (o2.gridData = i2, this.gridData = i2) : (o2.subTableData = i2, this.subTableData = i2);
+  t.get(e2).subTableData = i2, this.subTableData = i2;
 }, getDefaultValueColumns(e2) {
   const i2 = {}, a2 = t.get(e2).defaultValueColumns;
   return a2 && a2.length > 0 && a2.forEach((e3) => {
@@ -416,33 +432,43 @@ const o = require("../../src/utils/util.cjs"), n = require("./eventBus.cjs"), s
   const o2 = t.get(a2);
   if (!i2)
     return;
-  let n2 = {};
-  o2.options.customRules && (n2 = JSON.parse(JSON.stringify(o2.options.customRules))), i2.forEach((e3) => {
+  let s2 = {};
+  o2.options.customRules && (s2 = JSON.parse(JSON.stringify(o2.options.customRules))), i2.forEach((e3) => {
     const t2 = JSON.parse(JSON.stringify(e3)), i3 = e3.name;
     let a3;
-    n2[i3] || (n2[i3] = {}), a3 = n2[i3].rules, t2.rules && (a3 || (a3 = []), a3 = a3.concat(t2.rules)), t2.rules = a3, o2.options.customRules || (o2.options.customRules = {}), t2.beforeValidate = e3.beforeValidate, o2.options.customRules[i3] = t2;
+    s2[i3] || (s2[i3] = {}), a3 = s2[i3].rules, t2.rules && (a3 || (a3 = []), a3 = a3.concat(t2.rules)), t2.rules = a3, o2.options.customRules || (o2.options.customRules = {}), t2.beforeValidate = e3.beforeValidate, o2.options.customRules[i3] = t2;
   });
 }, doLayout(e2, i2) {
   i2 || (i2 = this.code);
-  const a2 = t.get(i2).hiddenColumns;
+  let a2 = false;
+  const o2 = t.get(i2).hiddenColumns;
   if (e2 && e2.length > 0) {
-    let t2 = a2;
-    t2 || (t2 = []), 0 === t2.length ? t2 = e2 : e2.forEach((e3) => {
-      t2.indexOf(e3) < 0 && t2.push(e3);
-    }), this.options.hiddenColumns = t2;
-  } else
-    this.options.hiddenColumns = a2;
+    const t2 = e2[0];
+    let i3;
+    t2 && "string" == typeof t2 && (a2 = true), a2 ? (i3 = [], e2.forEach((e3) => {
+      if (e3 && "string" == typeof e3) {
+        let t3 = { prop: e3, show: false };
+        i3.push(t3);
+      }
+    })) : i3 = e2, this.options.updateColumnsInfo = i3;
+  } else {
+    let e3;
+    o2 && (e3 = [], o2.forEach((t2) => {
+      let i3 = { prop: t2, show: false };
+      e3.push(i3);
+    })), this.options.updateColumnsInfo = e3;
+  }
   this.$refs && this.$refs.superGrid && this.$refs.superGrid.doLayout();
 }, getCustomFunc(e2) {
   window.$PageUtil.getCustomFunc(this.pageContext, e2);
 }, addRequiredClass(e2, i2, a2, o2) {
-  const n2 = t.get(i2);
-  this.isFormSubTable && this.isSubTableShowPage && (a2 -= 1, o2 !== this.currentPage && (this.currentPage = o2, this.changePage(o2))), n2.gridData[a2].validateErrorField = e2;
+  const s2 = t.get(i2);
+  this.isFormSubTable && this.isSubTableShowPage && (a2 -= 1, o2 !== this.currentPage && (this.currentPage = o2, this.changePage(o2))), s2.gridData[a2].validateErrorField = e2;
 }, handleSearch(e2, t2) {
   const i2 = this.packageSearchParamNormalType(e2, t2);
   this.doSearch(i2);
 }, wfSubTableDeleteRowConditionParse: (e2, t2, a2) => {
   var _a;
   return false !== i.parseSubTableActionCondition(e2, t2, a2, (_a = e2.options.actionPermission) == null ? void 0 : _a.deleteCondition) || (window.$vueApp.config.globalProperties.$message({ showClose: true, message: o.getI18n().t("superGrid.rowCanntDeleteTip"), type: "warning" }), false);
-} }, u = { data: () => ({ toolbarFieldParam: null, showSearch: false, isMobile: false, baseURL: "", currentPage: 1, pageSize: 10, code: "", pageCode: "", jumpPageSetting: null, isShowPageDialog: false, gridData: [], subTableData: [], searchForm: [], options: {}, lineEdit: null, loaded: false, configureObj: {}, additionalParamMap: {}, basicInfo: {}, dynamicColumnInfo: {}, $dataTypeMap: {}, mainDefaultValueColumns: [], dynamicServiceName: "", isHasDynamic: false, isMulitiSelect: false, sql: false, restoreCurrentRowTimer: null }), methods: { ...g } };
-exports.apisMixin = u, exports.default = g;
+} }, g = { data: () => ({ toolbarFieldParam: null, showSearch: false, isMobile: n.isMobileBrowser(), baseURL: "", currentPage: 1, pageSize: 10, code: "", pageCode: "", jumpPageSetting: null, isShowPageDialog: false, gridData: [], subTableData: [], searchForm: [], options: {}, lineEdit: null, loaded: false, configureObj: {}, additionalParamMap: {}, basicInfo: {}, dynamicColumnInfo: {}, $dataTypeMap: {}, mainDefaultValueColumns: [], dynamicServiceName: "", isHasDynamic: false, isMulitiSelect: false, sql: false, restoreCurrentRowTimer: null }), methods: { ...u } };
+exports.apisMixin = g, exports.default = u;