agilebuilder-ui 1.1.65-tmp23 → 1.1.65-tmp24

package/es/super-grid/src/apis.mjs

@@ -1,35 +1,35 @@
 import { $emit as e } from "../../utils/gogocodeTransfer.mjs";
 import t from "./store.mjs";
-import { isEditOptionFunction as i, isLastEditRowSave as a, parseSubTableActionCondition as o, scrollYToBottom as s, isHasEditOption as n, getAdditionalParamMap as l, setCurrentRow as r, isDynamicDataSourceSource as d } from "./utils.mjs";
+import { isEditOptionFunction as a, isLastEditRowSave as i, parseSubTableActionCondition as o, scrollYToBottom as s, isHasEditOption as n, getAdditionalParamMap as l, setCurrentRow as r, isDynamicDataSourceSource as d } from "./utils.mjs";
 import g from "./formValidatorUtil.mjs";
 import "vue";
-import { setEntityFieldValue as p, getI18n as u, getEntityFieldValue as c, getPropValueNew as h, getPropValue as w } from "../../src/utils/util.mjs";
-import f from "./eventBus.mjs";
-import { isPromise as b } from "../../src/utils/common-util.mjs";
-import { updateWithPageValue as m } from "../../src/utils/jump-page-utils.mjs";
-import { getGuId as S } from "../../src/utils/guid.mjs";
-import { ElMessageBox as D } from "element-plus";
-const v = { toolbarRefresh(e2, t2, i2, a2) {
-  return this.toolbarFieldParam = i2, this.refresh(e2, t2, i2, a2);
-}, refresh(e2, i2, a2, o2) {
-  return new Promise((i3, s2) => {
+import { setEntityFieldValue as p, getI18n as u, getEntityFieldValue as c, getPropValueNew as h, getPropValue as b } from "../../src/utils/util.mjs";
+import w from "./eventBus.mjs";
+import { isPromise as f, isMobileBrowser as m } from "../../src/utils/common-util.mjs";
+import { updateWithPageValue as S } from "../../src/utils/jump-page-utils.mjs";
+import { getGuId as D } from "../../src/utils/guid.mjs";
+import { ElMessageBox as v } from "element-plus";
+const C = { toolbarRefresh(e2, t2, a2, i2) {
+  return this.toolbarFieldParam = a2, this.refresh(e2, t2, a2, i2);
+}, refresh(e2, a2, i2, o2) {
+  return new Promise((a3, s2) => {
     if (o2) {
       t.get(this.code).options.subTableData = null;
     }
-    if (!a2 && this.toolbarFieldParam && (a2 = this.toolbarFieldParam), this.$refs)
+    if (!i2 && this.toolbarFieldParam && (i2 = this.toolbarFieldParam), this.$refs)
       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) => s2(e3));
+          t2 && t2.length > 0 ? i2 && i2.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, i2)) : i2 && (t2 = [], t2 = i2), this.search(t2, false, e2).then(() => a3()).catch((e3) => s2(e3));
         } else
-          this.search(a2, false, e2).then(() => i3()).catch((e3) => s2(e3));
+          this.search(i2, false, e2).then(() => a3()).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) => s2(e4));
+        e3 && e3.length > 0 ? i2 && i2.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, i2)) : i2 && (e3 = [], e3 = i2), this.search(e3, false).then(() => a3()).catch((e4) => s2(e4));
       } else
-        this.search(a2, false).then(() => i3()).catch((e3) => s2(e3));
+        this.search(i2, false).then(() => a3()).catch((e3) => s2(e3));
     else
-      i3();
+      a3();
   });
 }, showSearchForm() {
   this.showSearch = true, e(this, "showSearch");
@@ -43,23 +43,23 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
   return d2 && d2.rowIndex > -1 && (g2 = d2.rowIndex + 1), new Promise((d3, c2) => {
     var _a, _b, _c;
     n2 || (n2 = t.get("_list_code"));
-    const h2 = t.get(n2), w2 = h2.gridData;
+    const h2 = t.get(n2), b2 = h2.gridData;
     if ((_b = (_a = h2.superGrid) == null ? void 0 : _a.clearSort) == null ? void 0 : _b.call(_a), h2.lineEdit && h2.lineEdit.editable && void 0 !== h2.loaded && true === h2.loaded) {
       let t2 = true;
-      if (i("beforeInsertRow", n2)) {
-        const e2 = h2.isSubTableShowPage, i2 = h2.pagination && h2.pagination.pageSize, a2 = this.isMobile;
-        t2 = h2.pageContext ? h2.options.lineEditOptions.beforeInsertRow.call(this, { gridData: e2 ? h2.subTableData : h2.gridData, rowIndex: h2.$rowIndex, isMobile: a2, baseURL: this.baseURL, totalData: e2 ? h2.gridData : null, pageSize: i2, additionalParamMap: h2.additionalParamMap, row: l2, pageContext: h2.pageContext, configureObj: h2.configureObj }) : h2.options.lineEditOptions.beforeInsertRow.call(this, e2 ? h2.subTableData : h2.gridData, h2.$rowIndex, a2, this.baseURL, e2 ? h2.gridData : null, i2, h2.additionalParamMap, l2);
+      if (a("beforeInsertRow", n2)) {
+        const e2 = h2.isSubTableShowPage, a2 = h2.pagination && h2.pagination.pageSize, i2 = this.isMobile;
+        t2 = h2.pageContext ? h2.options.lineEditOptions.beforeInsertRow.call(this, { gridData: e2 ? h2.subTableData : h2.gridData, rowIndex: h2.$rowIndex, isMobile: i2, baseURL: this.baseURL, totalData: e2 ? h2.gridData : null, pageSize: a2, additionalParamMap: h2.additionalParamMap, row: l2, pageContext: h2.pageContext, configureObj: h2.configureObj }) : h2.options.lineEditOptions.beforeInsertRow.call(this, e2 ? h2.subTableData : h2.gridData, h2.$rowIndex, i2, this.baseURL, e2 ? h2.gridData : null, a2, h2.additionalParamMap, l2);
       }
       if (void 0 === t2 || true === t2) {
         if (h2.options && h2.options.isFormSubTable) {
           let t4 = h2.gridData;
           void 0 !== h2.isSubTableShowPage && true === h2.isSubTableShowPage && (t4 = h2.subTableData);
-          const i2 = t4.filter((e2) => void 0 !== e2.$editing && true === e2.$editing);
-          i2 && i2.length > 0 && i2.forEach((t5) => {
-            p(t5, "$editing", false), e(f, "un-edit", { row: t5 });
+          const a2 = t4.filter((e2) => void 0 !== e2.$editing && true === e2.$editing);
+          a2 && a2.length > 0 && a2.forEach((t5) => {
+            p(t5, "$editing", false), e(w, "un-edit", { row: t5 });
           }), h2.isEditRow = false;
         } else {
-          if (!a(n2) || void 0 !== h2.isCreateRow && true === h2.isCreateRow)
+          if (!i(n2) || void 0 !== h2.isCreateRow && true === h2.isCreateRow)
             return window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.pleaseSaveLine", { row: h2.$rowIndex + 1 }), type: "warning" }), void c2(new Error("please save line"));
           if (void 0 !== h2.$rowIndex && null !== h2.$rowIndex && h2.$rowIndex < h2.gridData.length) {
             const e2 = h2.gridData[h2.$rowIndex];
@@ -69,25 +69,28 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
         if (false === o(h2, this.parentFormData, {}, (_c = h2.options.actionPermission) == null ? void 0 : _c.addCondition))
           return window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.canntAddTip"), type: "warning" }), void c2(new Error("can not create"));
         if (l2 = this.getNewRow(h2.defaultValueColumns, h2.additionalParamMap, h2.contextParameter, l2, n2, r2 ? r2.getDefaultValueFunc : null), p(l2, "$editing", true), h2.isEditRow = true, h2.options && h2.options.isFormSubTable) {
-          if (void 0 !== h2.isSubTableShowPage && true === h2.isSubTableShowPage)
-            if (h2.isChangePage = true, g2 >= 0) {
-              const e2 = (this.currentPage - 1) * this.pageSize + g2;
-              h2.addRowIndex = e2 + 1, h2.subTableData.splice(e2, 0, l2);
+          if (void 0 !== h2.isSubTableShowPage && true === h2.isSubTableShowPage ? h2.isChangePage = true : h2.isAddRow = true, g2 >= 0) {
+            const e2 = (this.currentPage - 1) * this.pageSize + g2;
+            h2.addRowIndex = e2 + 1, h2.isSubSearch && h2.subTableDataSearch ? (h2.subTableDataSearch.splice(e2, 0, l2), h2.subTableData.splice(e2, 0, l2)) : h2.subTableData.splice(e2, 0, l2);
+          } else {
+            if (h2.isSubSearch && h2.subTableDataSearch) {
+              let e2 = h2.subTableDataSearch.length;
+              e2 <= 0 && (e2 = -1), h2.subTableDataSearch.splice(e2, 0, l2), h2.subTableData.splice(e2, 0, l2);
             } else {
               let e2 = h2.subTableData.length;
-              e2 <= 0 && (e2 = -1), h2.subTableData.splice(e2, 0, l2), h2.addRowIndex = h2.subTableData.length;
+              e2 <= 0 && (e2 = -1), h2.subTableData.splice(e2, 0, l2);
             }
-          else
-            g2 >= 0 ? w2.splice(g2, 0, l2) : w2.splice(w2.length, 0, l2), h2.lineEdit.editingCell && (h2.lineEdit.editingCell.row = w2.length);
-          h2.$rowIndex = w2.length, this.$nextTick(() => {
+            h2.addRowIndex = h2.subTableData.length;
+          }
+          h2.$rowIndex = b2.length, this.isMobile || this.$nextTick(() => {
             s(n2);
           });
         } else
-          w2.splice(0, 0, l2), h2.lineEdit.editingCell && (h2.lineEdit.editingCell.row = 0), h2.$rowIndex = 0;
+          b2.splice(0, 0, l2), h2.lineEdit.editingCell && (h2.lineEdit.editingCell.row = 0), h2.$rowIndex = 0;
         const t3 = Object.assign({}, l2);
-        if (g2 >= 0 ? h2.orgGridData.splice(g2, 0, t3) : h2.orgGridData.splice(0, 0, t3), h2.lineEdit.editingCell || (h2.lineEdit.editingCell = {}, h2.lineEdit.validateErrorField = ""), i("afterInsertRow", n2)) {
-          const e2 = h2.isSubTableShowPage, t4 = h2.pagination && h2.pagination.pageSize, i2 = this.isMobile;
-          h2.pageContext ? h2.options.lineEditOptions.afterInsertRow.call(this, { gridData: e2 ? h2.subTableData : h2.gridData, rowIndex: h2.$rowIndex, isMobile: i2, baseURL: this.baseURL, totalData: e2 ? h2.gridData : null, pageSize: t4, additionalParamMap: h2.additionalParamMap, pageContext: h2.pageContext, configureObj: h2.configureObj }) : h2.options.lineEditOptions.afterInsertRow.call(this, e2 ? h2.subTableData : h2.gridData, h2.$rowIndex, i2, this.baseURL, e2 ? h2.gridData : null, t4, h2.additionalParamMap);
+        if (g2 >= 0 ? h2.orgGridData.splice(g2, 0, t3) : h2.orgGridData.splice(0, 0, t3), h2.lineEdit.editingCell || (h2.lineEdit.editingCell = {}, h2.lineEdit.validateErrorField = ""), a("afterInsertRow", n2)) {
+          const e2 = h2.isSubTableShowPage, t4 = h2.pagination && h2.pagination.pageSize, a2 = this.isMobile;
+          h2.pageContext ? h2.options.lineEditOptions.afterInsertRow.call(this, { gridData: e2 ? h2.subTableData : h2.gridData, rowIndex: h2.$rowIndex, isMobile: a2, baseURL: this.baseURL, totalData: e2 ? h2.gridData : null, pageSize: t4, additionalParamMap: h2.additionalParamMap, pageContext: h2.pageContext, configureObj: h2.configureObj }) : h2.options.lineEditOptions.afterInsertRow.call(this, e2 ? h2.subTableData : h2.gridData, h2.$rowIndex, a2, this.baseURL, e2 ? h2.gridData : null, t4, h2.additionalParamMap);
         }
         h2.isCreateRow = true, d3(l2);
       } else
@@ -95,7 +98,7 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
     } else
       c2(new Error("list not editable or data not loaded completely"));
   });
-}, getNewRow(e2, i2, a2, o2, s2, n2) {
+}, getNewRow(e2, a2, i2, o2, s2, n2) {
   o2 || (o2 = {}), s2 || (s2 = t.get("_list_code"));
   const l2 = t.get(s2);
   if (l2 && l2.allColumns && this.setColumnsDefaultValue(l2.allColumns, o2, l2, n2), e2 && e2.length > 0)
@@ -105,41 +108,49 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
         const e3 = c(o2, t2.prop);
         if ("$selection" !== t2.prop && "$index" !== t2.prop && t2.defaultValue && "" !== t2.defaultValue && (void 0 === e3 || "" === e3 || null === e3)) {
           let e4;
-          e4 = l2.pageContext ? h(t2.defaultValue, l2.pageContext) : w(t2.defaultValue, o2, i2, a2), p(o2, t2.prop, e4);
+          e4 = l2.pageContext ? h(t2.defaultValue, l2.pageContext) : b(t2.defaultValue, o2, a2, i2), p(o2, t2.prop, e4);
         }
       }
     }
-  return { $rowDataGuId: S(), ...o2 };
-}, setColumnsDefaultValue(e2, t2, i2, a2) {
+  return { $rowDataGuId: D(), ...o2 };
+}, setColumnsDefaultValue(e2, t2, a2, i2) {
   for (let o2 = 0; o2 < e2.length; o2++) {
     const s2 = e2[o2], n2 = s2.prop;
     if ("$index" !== n2 && "$selection" !== n2 && "operation" !== n2) {
       if (s2.hasOwnProperty("children"))
-        this.setChildrenColumnsDefaultValue(s2.children, t2);
+        this.setChildrenColumnsDefaultValue(s2.children, t2, a2, i2);
       else if (void 0 === t2[n2]) {
-        const e3 = s2.defaultValue;
-        let o3 = null;
-        a2 && (o3 = a2(i2.pageContext, e3, null, null), void 0 === o3 && (o3 = null)), p(t2, n2, o3);
+        let e3 = this.getColumnDefaultValue(s2, a2, i2);
+        p(t2, n2, e3);
       }
     }
   }
   p(t2, "$editing", false);
-}, setChildrenColumnsDefaultValue(e2, t2) {
-  for (let i2 = 0; i2 < e2.length; i2++) {
-    const a2 = e2[i2], o2 = a2.prop;
-    a2.hasOwnProperty("children") ? this.setChildrenColumnsDefaultValue(a2.children, t2) : void 0 === t2[o2] && "operation" !== o2 && p(t2, o2, null);
+}, setChildrenColumnsDefaultValue(e2, t2, a2, i2) {
+  for (let o2 = 0; o2 < e2.length; o2++) {
+    const s2 = e2[o2], n2 = s2.prop;
+    if (s2.hasOwnProperty("children"))
+      this.setChildrenColumnsDefaultValue(s2.children, t2, a2, i2);
+    else if (void 0 === t2[n2] && "operation" !== n2) {
+      let e3 = this.getColumnDefaultValue(s2, a2, i2);
+      p(t2, n2, e3);
+    }
   }
+}, getColumnDefaultValue(e2, t2, a2) {
+  const i2 = e2.defaultValue;
+  let o2 = null;
+  return a2 && (o2 = a2(t2.pageContext, i2, null, null), void 0 === o2 && (o2 = null)), o2;
 }, isLastEditRowSaveMessage(e2) {
   e2 || (e2 = t.get("_list_code"));
-  const i2 = t.get(e2);
-  return !!a(e2) || (window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.pleaseSaveLine", { row: i2.$rowIndex + 1 }), type: "warning" }), false);
-}, confirmBeforeSwitchingRow(e2, i2) {
+  const a2 = t.get(e2);
+  return !!i(e2) || (window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.pleaseSaveLine", { row: a2.$rowIndex + 1 }), type: "warning" }), false);
+}, confirmBeforeSwitchingRow(e2, a2) {
   e2 || (e2 = t.get("_list_code"));
   const { t: o2 } = u(), s2 = t.get(e2).$rowIndex;
-  a(e2) || D.confirm(o2("superGrid.rowEditMessageBox.content"), o2("superGrid.rowEditMessageBox.title"), { distinguishCancelAndClose: true, confirmButtonText: o2("superGrid.rowEditMessageBox.confirmButton"), cancelButtonText: o2("superGrid.rowEditMessageBox.cancelButton"), showClose: true, beforeClose: (t2, a2, o3) => {
+  i(e2) || v.confirm(o2("superGrid.rowEditMessageBox.content"), o2("superGrid.rowEditMessageBox.title"), { distinguishCancelAndClose: true, confirmButtonText: o2("superGrid.rowEditMessageBox.confirmButton"), cancelButtonText: o2("superGrid.rowEditMessageBox.cancelButton"), showClose: true, beforeClose: (t2, i2, o3) => {
     "confirm" === t2 ? this.saveRow(s2, e2).then((e3) => {
-      i2 == null ? void 0 : i2("confirm"), o3();
-    }) : "cancel" === t2 ? (this.restoreCurrentRow(s2, e2), i2 == null ? void 0 : i2("cancel"), o3()) : "close" === t2 && o3();
+      a2 == null ? void 0 : a2("confirm"), o3();
+    }) : "cancel" === t2 ? (this.restoreCurrentRow(s2, e2), a2 == null ? void 0 : a2("cancel"), o3()) : "close" === t2 && o3();
   } });
 }, editRow(e2, o2, s2, r2) {
   o2 || (o2 = t.get("_list_code"));
@@ -151,15 +162,15 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
           return void this.saveRow(d2.$rowIndex, o2).then((t3) => {
             this.editRow(e2, o2, true);
           });
-      } else if (!a(o2))
+      } else if (!i(o2))
         return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.pleaseSaveLine", { row: d2.$rowIndex + 1 }), type: "warning" });
     }
     let t2 = true;
-    if (!r2 && i("beforeEdit", o2)) {
-      const i2 = d2.isSubTableShowPage, a2 = d2.pagination && d2.pagination.pageSize;
-      t2 = d2.options.lineEditOptions.beforeEdit.call(this, { gridData: i2 ? d2.subTableData : d2.gridData, listCode: o2, entity: d2.gridData[e2], row: d2.gridData[e2], rowIndex: e2, columns: d2.columns, isMobile: false, pageGridData: i2 ? d2.gridData : null, pageSize: a2, additionalParamMap: l(d2), pageContext: d2.pageContext, configureObj: d2.configureObj });
+    if (!r2 && a("beforeEdit", o2)) {
+      const a2 = d2.isSubTableShowPage, i2 = d2.pagination && d2.pagination.pageSize;
+      t2 = d2.options.lineEditOptions.beforeEdit.call(this, { gridData: a2 ? d2.subTableData : d2.gridData, listCode: o2, entity: d2.gridData[e2], row: d2.gridData[e2], rowIndex: e2, columns: d2.columns, isMobile: false, pageGridData: a2 ? d2.gridData : null, pageSize: i2, additionalParamMap: l(d2), pageContext: d2.pageContext, configureObj: d2.configureObj });
     }
-    b(t2) ? t2.then((t3) => {
+    f(t2) ? t2.then((t3) => {
       void 0 !== t3 && true !== t3 || this.doEditRow(d2, e2);
     }) : void 0 !== t2 && true !== t2 || this.doEditRow(d2, e2);
   }
@@ -168,14 +179,14 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
     const t3 = e2.gridData[e2.$rowIndex];
     p(t3, "$editing", false), e2.isEditRow = false;
   }
-  const i2 = e2.gridData[t2];
-  p(i2, "$editing", true), e2.$lastSaveRowIndex = null, e2.$rowIndex = t2, e2.isEditRow = true, e2.lineEdit.editingCell && (e2.lineEdit.editingCell.row = t2);
+  const a2 = e2.gridData[t2];
+  p(a2, "$editing", true), e2.$lastSaveRowIndex = null, e2.$rowIndex = t2, e2.isEditRow = true, e2.lineEdit.editingCell && (e2.lineEdit.editingCell.row = t2);
 }, saveRow(e2, t2) {
-  return new Promise((i2, a2) => {
+  return new Promise((a2, i2) => {
     const o2 = this;
     setTimeout(function() {
       o2.saveCurrentRow(e2, t2).then((e3) => {
-        i2(e3);
+        a2(e3);
       });
     }, 100);
   });
@@ -186,9 +197,9 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
     if (p2.lineEdit && p2.lineEdit.editable) {
       if (void 0 === p2.gridData[o2].$editing || false === p2.gridData[o2].$editing)
         return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.noNeedToSaveRow", { row: o2 + 1 }), type: "warning" });
-      if (p2.$rowIndex !== o2 && !a(s2))
+      if (p2.$rowIndex !== o2 && !i(s2))
         return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.pleaseSaveLine", { row: p2.$rowIndex + 1 }), type: "warning" });
-      if (p2.$lastSaveRowIndex = null, void 0 !== p2.isHasDynamic && false === p2.isHasDynamic && !p2.lineEdit.urlToSaveRow && !n("urlToSaveRow", s2) && !i("saveRow", s2))
+      if (p2.$lastSaveRowIndex = null, void 0 !== p2.isHasDynamic && false === p2.isHasDynamic && !p2.lineEdit.urlToSaveRow && !n("urlToSaveRow", s2) && !a("saveRow", s2))
         return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.pleaseSetURLToSaveRowInformation"), type: "warning" });
       if (!p2.canSaveRow)
         return;
@@ -198,18 +209,18 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
       n("isEnableValidate", s2) && (c2 = p2.options.lineEditOptions.isEnableValidate);
       let h2 = true;
       if (true === c2 && (h2 = g.validator(t2, s2, o2)), true === h2) {
-        let a2 = true;
-        if (i("beforeSave", s2) && (a2 = p2.pageContext ? p2.options.lineEditOptions.beforeSave.call(this, { row: t2, columns: p2.columns, additionalParamMap: p2.additionalParamMap, pageContext: p2.pageContext, configureObj: p2.configureObj }) : p2.options.lineEditOptions.beforeSave.call(this, t2, p2.columns, p2.additionalParamMap)), void 0 === a2 || true === a2) {
-          e(f, "un-edit", { row: t2 });
-          const a3 = l(p2);
+        let i2 = true;
+        if (a("beforeSave", s2) && (i2 = p2.pageContext ? p2.options.lineEditOptions.beforeSave.call(this, { row: t2, columns: p2.columns, additionalParamMap: p2.additionalParamMap, pageContext: p2.pageContext, configureObj: p2.configureObj }) : p2.options.lineEditOptions.beforeSave.call(this, t2, p2.columns, p2.additionalParamMap)), void 0 === i2 || true === i2) {
+          e(w, "un-edit", { row: t2 });
+          const i3 = l(p2);
           let g2;
-          if (i("saveRow", s2) && (g2 = p2.pageContext ? p2.options.lineEditOptions.saveRow.call(this, { row: t2, columns: p2.columns, dataTypeMap: p2.$dataTypeMap, dynamicColumnInfo: p2.dynamicColumnInfo, additionalParamMap: a3, mainDefaultValueColumns: p2.mainDefaultValueColumns, pageContext: p2.pageContext, configureObj: p2.configureObj }) : p2.options.lineEditOptions.saveRow.call(this, t2, p2.columns, p2.$dataTypeMap, p2.dynamicColumnInfo, a3, p2.mainDefaultValueColumns)), !g2 && p2.lineEdit && p2.lineEdit.urlToSaveRow) {
+          if (a("saveRow", s2) && (g2 = p2.pageContext ? p2.options.lineEditOptions.saveRow.call(this, { row: t2, columns: p2.columns, dataTypeMap: p2.$dataTypeMap, dynamicColumnInfo: p2.dynamicColumnInfo, additionalParamMap: i3, mainDefaultValueColumns: p2.mainDefaultValueColumns, pageContext: p2.pageContext, configureObj: p2.configureObj }) : p2.options.lineEditOptions.saveRow.call(this, t2, p2.columns, p2.$dataTypeMap, p2.dynamicColumnInfo, i3, p2.mainDefaultValueColumns)), !g2 && p2.lineEdit && p2.lineEdit.urlToSaveRow) {
             let e2 = p2.lineEdit.urlToSaveRow;
             n("urlToSaveRow", s2) && (e2 = p2.options.lineEditOptions.urlToSaveRow), g2 = window.$vueApp.config.globalProperties.$http.post(window.$vueApp.config.globalProperties.baseURL + e2, t2);
           }
           if (void 0 !== p2.isHasDynamic && true === p2.isHasDynamic && !g2) {
-            const e2 = "/common/dynamic-values", i2 = { mainTableName: p2.basicInfo && p2.basicInfo.tableName ? p2.basicInfo.tableName : "", row: t2, dynamicColumnInfo: p2.dynamicColumnInfo, additionalParamMap: a3, dataTypeMap: p2.$dataTypeMap, dynamicServiceName: p2.dynamicServiceName, mainDefaultValueColumns: p2.mainDefaultValueColumns };
-            g2 = window.$vueApp.config.globalProperties.$http.post(window.$vueApp.config.globalProperties.baseURL + e2, i2);
+            const e2 = "/common/dynamic-values", a2 = { mainTableName: p2.basicInfo && p2.basicInfo.tableName ? p2.basicInfo.tableName : "", row: t2, dynamicColumnInfo: p2.dynamicColumnInfo, additionalParamMap: i3, dataTypeMap: p2.$dataTypeMap, dynamicServiceName: p2.dynamicServiceName, mainDefaultValueColumns: p2.mainDefaultValueColumns };
+            g2 = window.$vueApp.config.globalProperties.$http.post(window.$vueApp.config.globalProperties.baseURL + e2, a2);
           }
           g2 ? g2.then((e2) => {
             this.afterSave(p2, o2, s2, e2, t2).then((e3) => {
@@ -218,7 +229,7 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
               d2(e3);
             });
           }).catch((e2) => {
-            p2.canSaveRow = true, i("saveError", s2) && p2.options.lineEditOptions.saveError.call(this, t2, p2.columns, o2, e2), d2(e2);
+            p2.canSaveRow = true, a("saveError", s2) && p2.options.lineEditOptions.saveError.call(this, t2, p2.columns, o2, e2), d2(e2);
           }) : (p2.canSaveRow = true, d2(u().t("saveRowRequest is undefined")));
         } else
           p2.canSaveRow = true, d2(u().t("superGrid.theReturnValueOfTheBeforesaveCallbackMethodIsFalse"));
@@ -226,36 +237,36 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
         p2.canSaveRow = true, d2(u().t("imatrixUIMessage.validationFailed"));
     }
   });
-}, afterSave(e2, t2, a2, o2, s2) {
+}, afterSave(e2, t2, i2, o2, s2) {
   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: u().t("superGrid.lineSavedSuccessfully", { row: t2 + 1 }), type: "success" }), (void 0 === e2.options.lineEditOptions.aftersaveIsCancelEditState || n("aftersaveIsCancelEditState", a2) && true === e2.options.lineEditOptions.aftersaveIsCancelEditState) && (p(s2, "$editing", false), e2.isEditRow = false), i("saveSuccess", a2) && (e2.pageContext ? e2.options.lineEditOptions.saveSuccess.call(this, { data: o2, columns: e2.columns, rowIndex: t2, row: s2, additionalParamMap: e2.additionalParamMap, pageContext: e2.pageContext, configureObj: e2.configureObj }) : e2.options.lineEditOptions.saveSuccess.call(this, o2, e2.columns, t2, s2, e2.additionalParamMap), e2.options.lineEditOptions.saveSuccess.call(this, o2, e2.columns, t2, s2, e2.additionalParamMap)), Object.assign(e2.orgGridData[t2], o2), Object.assign(e2.gridData[t2], o2), this.refresh(false, true).then(() => {
-      (void 0 === e2.options.lineEditOptions.aftersaveIsCreateRow || e2.options.lineEditOptions.aftersaveIsCreateRow) && this.createRow(a2), l2({ rowIndex: t2, listCode: a2 });
+    e2.isCreateRow = false, e2.canSaveRow = true, e2.$rowIndex = null, e2.isEditRow = false, e2.$lastSaveRowIndex = t2, window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.lineSavedSuccessfully", { row: t2 + 1 }), type: "success" }), (void 0 === e2.options.lineEditOptions.aftersaveIsCancelEditState || n("aftersaveIsCancelEditState", i2) && true === e2.options.lineEditOptions.aftersaveIsCancelEditState) && (p(s2, "$editing", false), e2.isEditRow = false), a("saveSuccess", i2) && (e2.pageContext ? e2.options.lineEditOptions.saveSuccess.call(this, { data: o2, columns: e2.columns, rowIndex: t2, row: s2, additionalParamMap: e2.additionalParamMap, pageContext: e2.pageContext, configureObj: e2.configureObj }) : e2.options.lineEditOptions.saveSuccess.call(this, o2, e2.columns, t2, s2, e2.additionalParamMap), e2.options.lineEditOptions.saveSuccess.call(this, o2, e2.columns, t2, s2, e2.additionalParamMap)), Object.assign(e2.orgGridData[t2], o2), Object.assign(e2.gridData[t2], o2), this.refresh(false, true).then(() => {
+      (void 0 === e2.options.lineEditOptions.aftersaveIsCreateRow || e2.options.lineEditOptions.aftersaveIsCreateRow) && this.createRow(i2), l2({ rowIndex: t2, listCode: i2 });
     }).catch((e3) => r2(e3));
   });
 }, restoreRow(e2, t2) {
-  return new Promise((i2, a2) => {
-    this.restoreCurrentRow(e2, t2), i2();
+  return new Promise((a2, i2) => {
+    this.restoreCurrentRow(e2, t2), a2();
   });
 }, restoreCurrentRow(e2, o2) {
   o2 || (o2 = t.get("_list_code"));
   const s2 = t.get(o2);
   if (s2.lineEdit && s2.lineEdit.editable) {
-    if (null !== s2.$rowIndex && s2.$rowIndex !== e2 && !a(o2))
+    if (null !== s2.$rowIndex && s2.$rowIndex !== e2 && !i(o2))
       return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.pleaseSaveLine", { row: s2.$rowIndex + 1 }), type: "warning" });
     const t2 = null !== s2.$lastSaveRowIndex && s2.$lastSaveRowIndex === e2 && void 0 !== s2.gridData[e2].id;
     let l2 = true;
-    if (i("beforeRestoreValidate", o2)) {
-      const i2 = s2.isSubTableShowPage, a2 = s2.pagination && s2.pagination.pageSize, o3 = this.isMobile;
-      l2 = s2.options.lineEditOptions.beforeRestoreValidate.call(this, { rowIndex: e2, gridData: i2 ? s2.subTableData : s2.gridData, entity: s2.gridData[e2], isMobile: o3, baseURL: this.baseURL, isEditing: !t2, pageGridData: i2 ? s2.gridData : null, pageSize: a2, additionalParamMap: s2.additionalParamMap, pageContext: s2.pageContext, configureObj: s2.configureObj });
+    if (a("beforeRestoreValidate", o2)) {
+      const a2 = s2.isSubTableShowPage, i2 = s2.pagination && s2.pagination.pageSize, o3 = this.isMobile;
+      l2 = s2.options.lineEditOptions.beforeRestoreValidate.call(this, { rowIndex: e2, gridData: a2 ? s2.subTableData : s2.gridData, entity: s2.gridData[e2], isMobile: o3, baseURL: this.baseURL, isEditing: !t2, pageGridData: a2 ? s2.gridData : null, pageSize: i2, additionalParamMap: s2.additionalParamMap, pageContext: s2.pageContext, configureObj: s2.configureObj });
     }
     if (void 0 !== l2 && true !== l2)
       return;
     if (true === t2)
       return void window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.lineNoNeedToUndoEdit", { row: e2 + 1 }), type: "warning" });
     let r2 = true;
-    if (i("beforeRestore", o2)) {
-      const i2 = s2.isSubTableShowPage, a2 = s2.pagination && s2.pagination.pageSize, o3 = this.isMobile;
-      r2 = s2.options.lineEditOptions.beforeRestore.call(this, { rowIndex: e2, gridData: i2 ? s2.subTableData : s2.gridData, entity: s2.gridData[e2], isMobile: o3, baseURL: window.$vueApp.config.globalProperties.baseURL, isEditing: !t2, pageGridData: i2 ? s2.gridData : null, pageSize: a2, additionalParamMap: s2.additionalParamMap, pageContext: s2.pageContext, configureObj: s2.configureObj });
+    if (a("beforeRestore", o2)) {
+      const a2 = s2.isSubTableShowPage, i2 = s2.pagination && s2.pagination.pageSize, o3 = this.isMobile;
+      r2 = s2.options.lineEditOptions.beforeRestore.call(this, { rowIndex: e2, gridData: a2 ? s2.subTableData : s2.gridData, entity: s2.gridData[e2], isMobile: o3, baseURL: window.$vueApp.config.globalProperties.baseURL, isEditing: !t2, pageGridData: a2 ? s2.gridData : null, pageSize: i2, additionalParamMap: s2.additionalParamMap, pageContext: s2.pageContext, configureObj: s2.configureObj });
     }
     if (void 0 === r2 || true === r2) {
       if (s2.orgGridData[e2].id || s2.orgGridData[e2].ID) {
@@ -269,78 +280,84 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
         }, 100);
       } else
         this.deleteRow(e2, o2, true);
-      s2.$rowIndex = null, s2.isCreateRow = false, i("afterRestore", o2) && (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));
+      s2.$rowIndex = null, s2.isCreateRow = false, a("afterRestore", o2) && (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, o2) {
+}, deleteRow(e2, i2, o2) {
   return new Promise((s2, n2) => {
     var _a, _b;
-    a2 || (a2 = t.get("_list_code"));
-    const l2 = t.get(a2);
+    i2 || (i2 = t.get("_list_code"));
+    const l2 = t.get(i2);
     let r2 = true;
-    if (i("beforeDelete", a2)) {
-      const t2 = l2.isSubTableShowPage, i2 = l2.pagination && l2.pagination.pageSize, a3 = t2 ? l2.subTableData : l2.gridData, o3 = this.isMobile;
-      r2 = l2.pageContext ? l2.options.lineEditOptions.beforeDelete.call(this, { rowIndex: e2, row: l2.gridData[e2], gridData: a3, isMobile: o3, baseURL: this.baseURL, totalData: t2 ? l2.gridData : null, pageSize: i2, additionalParamMap: l2.additionalParamMap, pageContext: l2.pageContext, configureObj: l2.configureObj }) : l2.options.lineEditOptions.beforeDelete.call(this, e2, l2.gridData[e2], a3, o3, this.baseURL, t2 ? l2.gridData : null, i2, l2.additionalParamMap);
+    if (a("beforeDelete", i2)) {
+      const t2 = l2.isSubTableShowPage, a2 = l2.pagination && l2.pagination.pageSize, i3 = t2 ? l2.subTableData : l2.gridData, o3 = this.isMobile;
+      r2 = l2.pageContext ? l2.options.lineEditOptions.beforeDelete.call(this, { rowIndex: e2, row: l2.gridData[e2], gridData: i3, isMobile: o3, baseURL: this.baseURL, totalData: t2 ? l2.gridData : null, pageSize: a2, additionalParamMap: l2.additionalParamMap, pageContext: l2.pageContext, configureObj: l2.configureObj }) : l2.options.lineEditOptions.beforeDelete.call(this, e2, l2.gridData[e2], i3, o3, this.baseURL, t2 ? l2.gridData : null, a2, l2.additionalParamMap);
     }
     if (void 0 === r2 || true === r2) {
       if (!this.wfSubTableDeleteRowConditionParse(l2, this.parentFormData, l2.gridData[e2]))
         return;
-      if (void 0 !== l2.isSubTableShowPage && true === l2.isSubTableShowPage) {
+      if (l2.options && l2.options.isFormSubTable) {
         l2.isDelete = true;
-        const t2 = (this.currentPage - 1) * this.pageSize + e2;
-        l2.subTableData.splice(t2, 1);
+        let t2 = e2;
+        if (this.isMobile || (t2 = (this.currentPage - 1) * this.pageSize + e2), l2.isSubSearch && l2.subTableDataSearch) {
+          const e3 = l2.subTableDataSearch[t2];
+          l2.subTableDataSearch.splice(t2, 1);
+          const a2 = l2.subTableData.findIndex((t3) => e3.$rowDataGuId && t3.$rowDataGuId && e3.$rowDataGuId === t3.$rowDataGuId);
+          -1 !== a2 && l2.subTableData.splice(a2, 1);
+        } else
+          l2.subTableData.splice(t2, 1);
       } else
         l2.gridData.splice(e2, 1), l2.orgGridData.splice(e2, 1);
-      if (l2.$lastSaveRowIndex = null, l2.$rowIndex = null, l2.isEditRow = false, window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.deleteSuccessful"), type: "success" }), 0 === l2.gridData.length && l2.options && null !== l2.options.isDefaultShowEdit && void 0 !== l2.options.isDefaultShowEdit && true === l2.options.isDefaultShowEdit && this.createRow(a2), l2.isMulitiSelect && ((_b = (_a = l2.superGrid) == null ? void 0 : _a.clearSelection) == null ? void 0 : _b.call(_a)), l2.isCreateRow = false, (void 0 === o2 || !o2) && i("afterDelete", a2)) {
-        const t2 = l2.isSubTableShowPage, i2 = l2.pagination && l2.pagination.pageSize, a3 = this.isMobile;
-        l2.pageContext ? l2.options.lineEditOptions.afterDelete.call(this, { rowIndex: e2, row: l2.orgGridData[e2], gridData: t2 ? l2.subTableData : l2.gridData, isMobile: a3, baseURL: this.baseURL, totalData: t2 ? l2.gridData : null, pageSize: i2, additionalParamMap: l2.additionalParamMap, pageContext: l2.pageContext, configureObj: l2.configureObj }) : l2.options.lineEditOptions.afterDelete.call(this, e2, l2.orgGridData[e2], t2 ? l2.subTableData : l2.gridData, a3, this.baseURL, t2 ? l2.gridData : null, i2, l2.additionalParamMap);
+      if (l2.$lastSaveRowIndex = null, l2.$rowIndex = null, l2.isEditRow = false, window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.deleteSuccessful"), type: "success" }), 0 === l2.gridData.length && l2.options && null !== l2.options.isDefaultShowEdit && void 0 !== l2.options.isDefaultShowEdit && true === l2.options.isDefaultShowEdit && this.createRow(i2), l2.isMulitiSelect && ((_b = (_a = l2.superGrid) == null ? void 0 : _a.clearSelection) == null ? void 0 : _b.call(_a)), l2.isCreateRow = false, (void 0 === o2 || !o2) && a("afterDelete", i2)) {
+        const t2 = l2.isSubTableShowPage, a2 = l2.pagination && l2.pagination.pageSize, i3 = this.isMobile;
+        l2.pageContext ? l2.options.lineEditOptions.afterDelete.call(this, { rowIndex: e2, row: l2.orgGridData[e2], gridData: t2 ? l2.subTableData : l2.gridData, isMobile: i3, baseURL: this.baseURL, totalData: t2 ? l2.gridData : null, pageSize: a2, additionalParamMap: l2.additionalParamMap, pageContext: l2.pageContext, configureObj: l2.configureObj }) : l2.options.lineEditOptions.afterDelete.call(this, e2, l2.orgGridData[e2], t2 ? l2.subTableData : l2.gridData, i3, this.baseURL, t2 ? l2.gridData : null, a2, l2.additionalParamMap);
       }
     }
     s2();
   });
-}, getDeleteIndexes(e2, t2, i2) {
-  const a2 = [];
+}, getDeleteIndexes(e2, t2, a2) {
+  const i2 = [];
   return e2.forEach((e3, o2) => {
-    if (a2.length !== t2.length) {
+    if (i2.length !== t2.length) {
       for (const s2 of t2)
-        if (e3[i2] === s2[i2]) {
-          a2.push(o2);
+        if (e3[a2] === s2[a2]) {
+          i2.push(o2);
           break;
         }
     }
-  }), a2.sort((e3, t3) => t3 - e3);
-}, batchDeleteSubTableRowApi(e2, a2, o2) {
+  }), i2.sort((e3, t3) => t3 - e3);
+}, batchDeleteSubTableRowApi(e2, i2, o2) {
   return new Promise((s2, n2) => {
     var _a, _b;
-    if (!(a2 = a2 || []).length)
+    if (!(i2 = i2 || []).length)
       return window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("imatrixUIMessage.pleaseSelectDeleteData"), type: "warning" }), void s2();
     e2 = e2 || t.get("_list_code");
     const l2 = t.get(e2);
     let r2 = true;
-    if (i("beforeDelete", e2)) {
-      const e3 = l2.isSubTableShowPage, t2 = l2.pagination && l2.pagination.pageSize, i2 = e3 ? l2.subTableData : l2.gridData, o3 = this.isMobile;
-      r2 = l2.pageContext ? l2.options.lineEditOptions.beforeDelete.call(this, { deleteRows: a2, gridData: i2, isMobile: o3, baseURL: this.baseURL, totalData: e3 ? l2.gridData : null, pageSize: t2, additionalParamMap: l2.additionalParamMap, pageContext: l2.pageContext, configureObj: l2.configureObj }) : l2.options.lineEditOptions.beforeDelete.call(this, a2, i2, o3, this.baseURL, e3 ? l2.gridData : null, t2, l2.additionalParamMap);
+    if (a("beforeDelete", e2)) {
+      const e3 = l2.isSubTableShowPage, t2 = l2.pagination && l2.pagination.pageSize, a2 = e3 ? l2.subTableData : l2.gridData, o3 = this.isMobile;
+      r2 = l2.pageContext ? l2.options.lineEditOptions.beforeDelete.call(this, { deleteRows: i2, gridData: a2, isMobile: o3, baseURL: this.baseURL, totalData: e3 ? l2.gridData : null, pageSize: t2, additionalParamMap: l2.additionalParamMap, pageContext: l2.pageContext, configureObj: l2.configureObj }) : l2.options.lineEditOptions.beforeDelete.call(this, i2, a2, o3, this.baseURL, e3 ? l2.gridData : null, t2, l2.additionalParamMap);
     }
     if (void 0 === r2 || true === r2) {
       let t2 = [];
       if (void 0 !== l2.isSubTableShowPage && true === l2.isSubTableShowPage) {
-        l2.isDelete = true, t2 = this.getDeleteIndexes(l2.subTableData, a2, o2);
+        l2.isDelete = true, t2 = this.getDeleteIndexes(l2.subTableData, i2, o2);
         for (const e3 of t2) {
           if (!this.wfSubTableDeleteRowConditionParse(l2, this.parentFormData, l2.subTableData[e3]))
             return;
           l2.subTableData.splice(e3, 1);
         }
       } else {
-        t2 = this.getDeleteIndexes(l2.gridData, a2, o2);
+        t2 = this.getDeleteIndexes(l2.gridData, i2, o2);
         for (const e3 of t2) {
           if (!this.wfSubTableDeleteRowConditionParse(l2, this.parentFormData, l2.gridData[e3]))
             return;
           l2.gridData.splice(e3, 1), l2.orgGridData.splice(e3, 1);
         }
       }
-      if (l2.$lastSaveRowIndex = null, l2.$rowIndex = null, l2.isEditRow = false, window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.deleteSuccessful"), type: "success" }), 0 === l2.gridData.length && l2.options && null !== l2.options.isDefaultShowEdit && void 0 !== l2.options.isDefaultShowEdit && true === l2.options.isDefaultShowEdit && this.createRow(e2), l2.isMulitiSelect && ((_b = (_a = l2.superGrid) == null ? void 0 : _a.clearSelection) == null ? void 0 : _b.call(_a)), l2.isCreateRow = false, (void 0 === isRestore || !isRestore) && i("afterDelete", e2)) {
-        const e3 = l2.isSubTableShowPage, t3 = l2.pagination && l2.pagination.pageSize, i2 = this.isMobile;
-        l2.pageContext ? l2.options.lineEditOptions.afterDelete.call(this, { deleteRows: a2, gridData: e3 ? l2.subTableData : l2.gridData, isMobile: i2, baseURL: this.baseURL, totalData: e3 ? l2.gridData : null, pageSize: t3, additionalParamMap: l2.additionalParamMap, pageContext: l2.pageContext, configureObj: l2.configureObj }) : l2.options.lineEditOptions.afterDelete.call(this, a2, e3 ? l2.subTableData : l2.gridData, i2, this.baseURL, e3 ? l2.gridData : null, t3, l2.additionalParamMap);
+      if (l2.$lastSaveRowIndex = null, l2.$rowIndex = null, l2.isEditRow = false, window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.deleteSuccessful"), type: "success" }), 0 === l2.gridData.length && l2.options && null !== l2.options.isDefaultShowEdit && void 0 !== l2.options.isDefaultShowEdit && true === l2.options.isDefaultShowEdit && this.createRow(e2), l2.isMulitiSelect && ((_b = (_a = l2.superGrid) == null ? void 0 : _a.clearSelection) == null ? void 0 : _b.call(_a)), l2.isCreateRow = false, (void 0 === isRestore || !isRestore) && a("afterDelete", e2)) {
+        const e3 = l2.isSubTableShowPage, t3 = l2.pagination && l2.pagination.pageSize, a2 = this.isMobile;
+        l2.pageContext ? l2.options.lineEditOptions.afterDelete.call(this, { deleteRows: i2, gridData: e3 ? l2.subTableData : l2.gridData, isMobile: a2, baseURL: this.baseURL, totalData: e3 ? l2.gridData : null, pageSize: t3, additionalParamMap: l2.additionalParamMap, pageContext: l2.pageContext, configureObj: l2.configureObj }) : l2.options.lineEditOptions.afterDelete.call(this, i2, e3 ? l2.subTableData : l2.gridData, a2, this.baseURL, e3 ? l2.gridData : null, t3, l2.additionalParamMap);
       }
     }
     s2();
@@ -349,8 +366,8 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
   r(e2, t2);
 }, getGridData(e2) {
   e2 || (e2 = t.get("_list_code"));
-  const i2 = t.get(e2);
-  return i2.isSubTableShowPage ? i2.subTableData : i2.gridData;
+  const a2 = t.get(e2);
+  return a2.options && a2.options.isFormSubTable ? a2.subTableData : a2.gridData;
 }, getColumns(e2) {
   e2 || (e2 = t.get("_list_code"));
   return t.get(e2).columns;
@@ -358,39 +375,39 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
   e2 || (e2 = t.get("_list_code"));
   return t.get(e2).pagination;
 }, getOptionsValueSet(e2) {
-  const i2 = {};
+  const a2 = {};
   e2 || (e2 = t.get("_list_code"));
   return t.get(e2).columns.forEach((e3) => {
     const t2 = e3.prop;
-    !d(e3) && e3.valueSet && e3.valueSet.length > 0 && (i2[t2] = e3.valueSet);
-  }), i2;
+    !d(e3) && e3.valueSet && e3.valueSet.length > 0 && (a2[t2] = e3.valueSet);
+  }), a2;
 }, getTableSelectOptions(e2) {
-  const i2 = {};
+  const a2 = {};
   e2 || (e2 = t.get("_list_code"));
   return t.get(e2).columns.forEach((e3) => {
     const t2 = e3.prop;
-    !d(e3) && e3.valueSet && e3.valueSet.length > 0 && (i2[t2] = { options: e3.valueSet, column: e3 });
-  }), i2;
-}, restoreGridEdit(i2) {
-  i2 || (i2 = t.get("_list_code"));
-  const a2 = t.get(i2);
-  if (a2.options && a2.options.isFormSubTable) {
+    !d(e3) && e3.valueSet && e3.valueSet.length > 0 && (a2[t2] = { options: e3.valueSet, column: e3 });
+  }), a2;
+}, restoreGridEdit(a2) {
+  a2 || (a2 = t.get("_list_code"));
+  const i2 = t.get(a2);
+  if (i2.options && i2.options.isFormSubTable) {
     let t2 = [];
-    if (t2 = a2.isSubTableShowPage ? a2.subTableData : a2.gridData, t2 && t2.length > 0)
-      for (let i3 = 0; i3 < t2.length; i3++) {
-        const a3 = t2[i3];
-        if (void 0 !== a3.$editing && true === a3.$editing) {
-          p(a3, "$editing", false), e(f, "un-edit", { row: a3 });
+    if (t2 = i2.isSubTableShowPage ? i2.subTableData : i2.gridData, t2 && t2.length > 0)
+      for (let a3 = 0; a3 < t2.length; a3++) {
+        const i3 = t2[a3];
+        if (void 0 !== i3.$editing && true === i3.$editing) {
+          p(i3, "$editing", false), e(w, "un-edit", { row: i3 });
           break;
         }
       }
   }
 }, closePageDialog(e2) {
   if (this.jumpPageSetting, this.jumpPageSetting) {
-    const i2 = t.get(this.code), a2 = this.jumpPageSetting.closeEvent, o2 = this.jumpPageSetting.row;
+    const a2 = t.get(this.code), i2 = this.jumpPageSetting.closeEvent, o2 = this.jumpPageSetting.row;
     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 };
+    if (a2.options.eventCallBack && i2 && null !== i2 && a2.options.eventCallBack[i2] && (s2 = a2.options.eventCallBack[i2]), s2) {
+      const t2 = { params: a2.additionalParamMap, additionalParamMap: a2.additionalParamMap, entity: o2 };
       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 n2 = this.jumpPageSetting.isRefreshWhenClosePopup;
@@ -400,59 +417,68 @@ const v = { toolbarRefresh(e2, t2, i2, a2) {
     }
   }
   this.isShowPageDialog = false, this.jumpPageSetting = null;
-}, updateValues(e2, i2, a2) {
-  const o2 = t.get(this.code), s2 = a2;
+}, updateValues(e2, a2, i2) {
+  const o2 = t.get(this.code), s2 = i2;
   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;
-    m(e2, i2, this.jumpPageSetting, this.gridData[s2], a3, !t2);
+    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), i3 = this.tableName;
+    S(e2, a2, this.jumpPageSetting, this.gridData[s2], i3, !t2);
     const n2 = this.jumpPageSetting && this.jumpPageSetting.updateValueEvent ? this.jumpPageSetting.updateValueEvent : null;
     let l2;
-    o2.options.eventCallBack && n2 && null !== n2 && o2.options.eventCallBack[n2] && (l2 = o2.options.eventCallBack[n2]), l2 && l2.call(this, { sourceModel: e2, sourceTableName: i2, jumpPageSetting: this.jumpPageSetting, entity: this.gridData[s2], targetTableName: a3, isNeedReplaceFieldName: !t2, additionalParamMap: o2.additionalParamMap });
+    o2.options.eventCallBack && n2 && null !== n2 && o2.options.eventCallBack[n2] && (l2 = o2.options.eventCallBack[n2]), l2 && l2.call(this, { sourceModel: e2, sourceTableName: a2, jumpPageSetting: this.jumpPageSetting, entity: this.gridData[s2], targetTableName: i3, 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);
+}, refreshChildData(e2, a2, i2) {
+  t.get(e2).subTableData = a2, this.subTableData = a2;
 }, getDefaultValueColumns(e2) {
-  const i2 = {}, a2 = t.get(e2).defaultValueColumns;
-  return a2 && a2.length > 0 && a2.forEach((e3) => {
-    i2[e3.prop] = e3.defaultValue;
-  }), i2;
+  const a2 = {}, i2 = t.get(e2).defaultValueColumns;
+  return i2 && i2.length > 0 && i2.forEach((e3) => {
+    a2[e3.prop] = e3.defaultValue;
+  }), a2;
 }, reloadSubTableData(e2) {
   t.get(e2).options.subTableData = null, this.fetchListData();
-}, dynamicControlTableEdit(e2, i2, a2) {
-  const o2 = t.get(a2);
-  if (!i2)
+}, dynamicControlTableEdit(e2, a2, i2) {
+  const o2 = t.get(i2);
+  if (!a2)
     return;
   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;
-    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;
+  o2.options.customRules && (s2 = JSON.parse(JSON.stringify(o2.options.customRules))), a2.forEach((e3) => {
+    const t2 = JSON.parse(JSON.stringify(e3)), a3 = e3.name;
+    let i3;
+    s2[a3] || (s2[a3] = {}), i3 = s2[a3].rules, t2.rules && (i3 || (i3 = []), i3 = i3.concat(t2.rules)), t2.rules = i3, o2.options.customRules || (o2.options.customRules = {}), t2.beforeValidate = e3.beforeValidate, o2.options.customRules[a3] = t2;
   });
-}, doLayout(e2, i2) {
-  i2 || (i2 = this.code);
-  const a2 = t.get(i2).hiddenColumns;
+}, doLayout(e2, a2) {
+  a2 || (a2 = this.code);
+  let i2 = false;
+  const o2 = t.get(a2).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 a3;
+    t2 && "string" == typeof t2 && (i2 = true), i2 ? (a3 = [], e2.forEach((e3) => {
+      if (e3 && "string" == typeof e3) {
+        let t3 = { prop: e3, show: false };
+        a3.push(t3);
+      }
+    })) : a3 = e2, this.options.updateColumnsInfo = a3;
+  } else {
+    let e3;
+    o2 && (e3 = [], o2.forEach((t2) => {
+      let a3 = { prop: t2, show: false };
+      e3.push(a3);
+    })), 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 s2 = t.get(i2);
-  this.isFormSubTable && this.isSubTableShowPage && (a2 -= 1, o2 !== this.currentPage && (this.currentPage = o2, this.changePage(o2))), s2.gridData[a2].validateErrorField = e2;
+}, addRequiredClass(e2, a2, i2, o2) {
+  const s2 = t.get(a2);
+  this.isFormSubTable && this.isSubTableShowPage && (i2 -= 1, o2 !== this.currentPage && (this.currentPage = o2, this.changePage(o2))), s2.gridData[i2].validateErrorField = e2;
 }, handleSearch(e2, t2) {
-  const i2 = this.packageSearchParamNormalType(e2, t2);
-  this.doSearch(i2);
-}, wfSubTableDeleteRowConditionParse: (e2, t2, i2) => {
+  const a2 = this.packageSearchParamNormalType(e2, t2);
+  this.doSearch(a2);
+}, wfSubTableDeleteRowConditionParse: (e2, t2, a2) => {
   var _a;
-  return false !== o(e2, t2, i2, (_a = e2.options.actionPermission) == null ? void 0 : _a.deleteCondition) || (window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.rowCanntDeleteTip"), type: "warning" }), false);
-} }, C = { 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: { ...v } };
+  return false !== o(e2, t2, a2, (_a = e2.options.actionPermission) == null ? void 0 : _a.deleteCondition) || (window.$vueApp.config.globalProperties.$message({ showClose: true, message: u().t("superGrid.rowCanntDeleteTip"), type: "warning" }), false);
+} }, R = { data: () => ({ toolbarFieldParam: null, showSearch: false, isMobile: m(), 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: { ...C } };
 export {
-  C as apisMixin,
-  v as default
+  R as apisMixin,
+  C as default
 };