agilebuilder-ui 1.1.65-tmp23 → 1.1.65-tmp24

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

@@ -11,26 +11,26 @@ import d from "./row-detail.vue.mjs";
 import c from "./components/mobile-table-card.mjs";
 import { setEntityFieldValue as p, getEntityFieldValueWithOutCase as u } from "../../src/utils/util.mjs";
 import g from "./eventBus.mjs";
-import { getSpanValuesForColumn as m, getRowIndexPage as b, getGridParams as f, isHasOptionFunction as C, getTableHeight as S, isEditOptionFunction as D, isHasEditOption as w, isObjectValueEqual as y, getControlConfig as P, getExtraParam as T, getFirstEditableColumn as v, addDynamicProp as x, isCanRefreshGrid as O, rowBeforeValidate as F, parseSubTableActionCondition as E } from "./utils.mjs";
-import $ from "sortablejs";
-import k from "./store.mjs";
-import M from "./events.mjs";
-import R from "./public-methods.mjs";
-import G from "./super-grid-service.mjs";
-import I from "./formValidatorUtil.mjs";
-import j from "./apis.mjs";
-import L from "./header-context-menu.vue.mjs";
-import { isMobileBrowser as H, isPromise as z } from "../../src/utils/common-util.mjs";
-import A from "../../src/utils/permission.mjs";
-import { getGuId as N } from "../../src/utils/guid.mjs";
-import q from "../../src/store/index.mjs";
-import { setPageInfoToChatStore as V, addListRefToStore as _ } from "../../src/utils/chat-ai-util.mjs";
-import B from "./search-methods.mjs";
-import { doFormat as J } from "./formatter.mjs";
-import { resolveComponent as U, resolveDirective as W, withDirectives as K, openBlock as Q, createElementBlock as X, normalizeStyle as Y, createBlock as Z, vShow as ee, createCommentVNode as te, createElementVNode as ie, normalizeClass as oe, withCtx as ae, Fragment as se, renderList as re, resolveDynamicComponent as ne, mergeProps as le, toHandlers as he, createVNode as de } from "vue";
+import { getSpanValuesForColumn as m, getRowIndexPage as b, getGridParams as f, isHasOptionFunction as S, getHeaderLable as C, getTableHeight as w, isEditOptionFunction as D, isHasEditOption as y, isObjectValueEqual as T, getControlConfig as P, getExtraParam as v, getFirstEditableColumn as x, addDynamicProp as F, caculateSearchCondition as O, isCanRefreshGrid as $, rowBeforeValidate as E, parseSubTableActionCondition as M } from "./utils.mjs";
+import k from "sortablejs";
+import R from "./store.mjs";
+import G from "./events.mjs";
+import I from "./public-methods.mjs";
+import L from "./super-grid-service.mjs";
+import j from "./formValidatorUtil.mjs";
+import H from "./apis.mjs";
+import z from "./header-context-menu.vue.mjs";
+import { isMobileBrowser as A, isPromise as N } from "../../src/utils/common-util.mjs";
+import q from "../../src/utils/permission.mjs";
+import { getGuId as _ } from "../../src/utils/guid.mjs";
+import V from "../../src/store/index.mjs";
+import { setPageInfoToChatStore as U, addListRefToStore as B } from "../../src/utils/chat-ai-util.mjs";
+import J from "./search-methods.mjs";
+import { doFormat as W } from "./formatter.mjs";
+import { resolveComponent as K, resolveDirective as Q, withDirectives as X, openBlock as Y, createElementBlock as Z, normalizeStyle as ee, createBlock as te, vShow as ie, createCommentVNode as oe, createElementVNode as ae, withCtx as se, createTextVNode as re, toDisplayString as ne, createVNode as le, Fragment as he, renderList as de, normalizeClass as ce, resolveDynamicComponent as pe, mergeProps as ue, toHandlers as ge } from "vue";
 import "./super-grid.vue2.mjs";
-import ce from "../../_virtual/_plugin-vue_export-helper.mjs";
-const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s, GroupColumn: r, ColumnsConfig: n, SearchForm: l, headerContextMenu: L, searchFormDialog: h, ElIconSetting: e, ElIconRefresh: t, RowDetail: d, MobileCard: c }, name: "SuperGrid", props: { isShowAutoCard: { type: Boolean, default: true }, code: { type: String, default: "" }, url: { type: String, default: "" }, options: { type: Object, default: function() {
+import me from "../../_virtual/_plugin-vue_export-helper.mjs";
+const be = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s, GroupColumn: r, ColumnsConfig: n, SearchForm: l, headerContextMenu: z, searchFormDialog: h, ElIconSetting: e, ElIconRefresh: t, RowDetail: d, MobileCard: c }, name: "SuperGrid", props: { isShowAutoCard: { type: Boolean, default: true }, code: { type: String, default: "" }, url: { type: String, default: "" }, options: { type: Object, default: function() {
   return {};
 } }, publishVersion: { type: Number, default: 0 }, customFormatter: { type: Object, default: null }, searchFormInfo: { type: Object, default: () => ({}) }, showPagination: { type: Boolean, default: true }, listToolbarFormData: { type: Object, default: null }, settings: { type: Object, default: null }, additionalParamMap: { type: Object, default: null }, manualHeightOffset: { type: [void 0, Number], default: void 0 }, isDialog: { type: Boolean, default: false } }, data() {
   let e2;
@@ -46,9 +46,9 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
   window.$vueApp.config.globalProperties.dataSourceType && (l2 = window.$vueApp.config.globalProperties.dataSourceType.toLowerCase());
   let h2, d2, c2, p2, u2 = this.options.pageDevMode;
   void 0 === u2 && (u2 = false), this.options && this.options.tableStyle && (h2 = this.options.tableStyle), h2 || (h2 = {}), h2.width = "100%", this.options && this.options.tableClass && (d2 = this.options.tableClass), d2 || (d2 = ""), d2 += " elTable", this.options && this.options.configureObj && (c2 = this.options.configureObj), this.options && this.options.pageContext && (p2 = this.options.pageContext);
-  const g2 = H();
+  const g2 = A();
   let m2 = false;
-  return this.options.checkStrictly && (m2 = true), { isLoading: false, currentPage: 1, showColumnConfig: false, basicInfo: { summary: "no" }, columns: [], loadCompleteQuery: false, pagination: null, query: null, lineEdit: null, gridData: [], summaries: null, sortInfo: null, pageSize: null, showSearch: false, myCustomFormatter: null, height: null, timer: null, timer2: null, isSql: false, parentProp: e2, checkStrictly: m2, hasLoadData: false, mergeFields: s2, newWidth: null, dragColumnProp: null, hasLoadedColumns: false, backgroundColorMap: {}, showHeaderContextmenu: false, rightClickColumn: null, externalClickFlag: false, dataTableCode: null, dynamicColumnInfo: null, mainDefaultValueColumns: null, dynamicServiceName: null, searchFormContent: null, initSearchProps: [], refreshGrid: true, optionTableHeight: i2, isFormSubTable: false, isShowPageDialog: false, jumpPageSetting: null, pageCode: o2, maxHeight: void 0, tableHeight: void 0, pageHeight: a2, currentSelectCell: null, isLazy: r2, defaultExpandAll: n2, parentFormData: null, stripe: true, dataSourceType: l2, pageDevMode: u2, toolbarFieldParam: [], tableName: null, listName: null, subTableData: [], isShowPage: false, isSubTableShowPage: false, isDelete: false, tableStyle: h2, tableClass: d2, pageContext: p2, configureObj: c2, isMobile: g2, isShowMobileSearch: false, subTableStyle: {}, detailColumn: null, currentEditRowIndex: null, showRowForm: false, baseURL: null, hasFilterDataEvent: false, selectionTableData: [], isScrollbarOnTop: false };
+  return this.options.checkStrictly && (m2 = true), { isLoading: false, currentPage: 1, showColumnConfig: false, basicInfo: { summary: "no" }, columns: [], loadCompleteQuery: false, pagination: null, query: null, lineEdit: null, gridData: [], summaries: null, sortInfo: null, pageSize: null, showSearch: false, myCustomFormatter: null, height: null, timer: null, timer2: null, isSql: false, parentProp: e2, checkStrictly: m2, hasLoadData: false, mergeFields: s2, newWidth: null, dragColumnProp: null, hasLoadedColumns: false, backgroundColorMap: {}, showHeaderContextmenu: false, rightClickColumn: null, externalClickFlag: false, dataTableCode: null, dynamicColumnInfo: null, mainDefaultValueColumns: null, dynamicServiceName: null, searchFormContent: null, initSearchProps: [], refreshGrid: true, optionTableHeight: i2, isFormSubTable: false, isShowPageDialog: false, jumpPageSetting: null, pageCode: o2, maxHeight: void 0, tableHeight: void 0, pageHeight: a2, currentSelectCell: null, isLazy: r2, defaultExpandAll: n2, parentFormData: null, stripe: true, dataSourceType: l2, pageDevMode: u2, toolbarFieldParam: [], tableName: null, listName: null, subTableData: [], isShowPage: false, isSubTableShowPage: false, isDelete: false, tableStyle: h2, tableClass: d2, pageContext: p2, configureObj: c2, isMobile: g2, isShowMobileSearch: false, subTableStyle: {}, detailColumn: null, currentEditRowIndex: null, showRowForm: false, baseURL: null, hasFilterDataEvent: false, selectionTableData: [], isScrollbarOnTop: false, showSubTableSearchDialog: false, subTableDataSearch: [], isSubSearch: false, isHasSearchColumn: false, orderField: null, orderType: "ascending", orderColumns: [], orderColumn: null, columnsMap: null };
 }, computed: { heightOffset() {
   var _a, _b, _c, _d, _e;
   return Number(this.manualHeightOffset ?? ((_e = (_d = (_c = (_b = (_a = this.options) == null ? void 0 : _a.configureObj) == null ? void 0 : _b.props) == null ? void 0 : _c.size) == null ? void 0 : _d.pc) == null ? void 0 : _e.heightOffset) ?? 0);
@@ -58,35 +58,45 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
 }, hasTableHeight() {
   if (this.tableHeight)
     return this.tableHeight <= 100 ? 100 : this.tableHeight + (0 !== this.heightOffset ? this.heightOffset : 30);
-}, isMobileListCard: () => q.getters.isMobileListCard, isShowCard() {
+}, isMobileListCard: () => V.getters.isMobileListCard, isShowCard() {
   var _a, _b, _c, _d;
-  return this.isShowAutoCard && this.isMobileListCard && !this.options.isAdministerListView && (((_d = (_c = (_b = (_a = this.options) == null ? void 0 : _a.configureObj) == null ? void 0 : _b.props) == null ? void 0 : _c.base) == null ? void 0 : _d.isMobileCard) ?? true);
+  return this.isMobile || this.isShowAutoCard && this.isMobileListCard && !this.options.isAdministerListView && (((_d = (_c = (_b = (_a = this.options) == null ? void 0 : _a.configureObj) == null ? void 0 : _b.props) == null ? void 0 : _c.base) == null ? void 0 : _d.isMobileCard) ?? true);
 }, visibleColumns() {
-  const e2 = k.get(this.code), t2 = this.getOptionOperations();
+  const e2 = R.get(this.code), t2 = this.getOptionOperations();
   e2.canntEdit = false;
   const i2 = (e3) => e3.map((e4) => ({ property: e4.prop, ...e4 }));
-  return t2 && t2.operation && t2.operation.length > 0 && t2.operation.forEach((t3) => {
-    "lineEditUpdate" === t3.props.code && A(t3.props.functionCode, this.basicInfo.systemCode) && (e2.canntEdit = true);
-  }), void 0 !== this.options.isAdministerListView && null != this.options.isAdministerListView && true === this.options.isAdministerListView ? i2(this.columns) : i2(this.columns.filter((i3) => {
-    if (void 0 !== this.options.multiple && false === this.options.multiple && "$selection" === i3.prop)
-      return false;
-    if (void 0 !== this.options.showIndex && false === this.options.showIndex && "$index" === i3.prop)
-      return false;
-    let o2;
-    if (this.storeHasDefaultValueColumns(i3, e2), void 0 === i3.show || i3.show) {
-      o2 = true;
-      const a2 = this.options.hiddenColumns;
-      if (i3.children && i3.children.length > 0 && this.packageHiddenColumnsWithChildren(i3, a2), a2 && a2.length > 0 && i3.prop && -1 !== a2.indexOf(i3.prop))
-        return o2 = false, o2;
-      this.initColumnOperation(i3, t2), e2.$dataTypeMap || (e2.$dataTypeMap = {}), e2.$dataTypeMap[i3.prop] = i3.dataType;
-    } else
-      o2 = false;
-    return o2;
-  }));
+  if (t2 && t2.operation && t2.operation.length > 0 && t2.operation.forEach((t3) => {
+    "lineEditUpdate" === t3.props.code && q(t3.props.functionCode, this.basicInfo.systemCode) && (e2.canntEdit = true);
+  }), void 0 !== this.options.isAdministerListView && null != this.options.isAdministerListView && true === this.options.isAdministerListView)
+    return i2(this.columns);
+  {
+    const o2 = this.options.updateColumnsInfo;
+    let a2;
+    o2 && (a2 = {}, o2.forEach((e3) => {
+      e3.prop && (a2[e3.prop] = e3);
+    }));
+    let s2 = {}, r2 = [];
+    return i2(this.columns.filter((i3) => {
+      if (!this.isHasSearchColumn && i3.queryType && "normal" === i3.queryType && (this.isHasSearchColumn = true), void 0 !== this.options.multiple && false === this.options.multiple && "$selection" === i3.prop)
+        return false;
+      if (void 0 !== this.options.showIndex && false === this.options.showIndex && "$index" === i3.prop)
+        return false;
+      let o3;
+      if (this.storeHasDefaultValueColumns(i3, e2), void 0 === i3.show || i3.show) {
+        o3 = true;
+        const n2 = this.options.hiddenColumns;
+        if (n2 && n2.length > 0 && i3.prop && -1 !== n2.indexOf(i3.prop) && (o3 = false), o3 = this.packageUpdateColunmInfo(i3, a2), i3.children && i3.children.length > 0 ? this.packageHiddenColumnsWithChildren(i3, n2, r2, a2, s2) : this.isMobileOrderColumn(i3) && r2.push(i3), i3.prop && (s2[i3.prop] = i3), this.orderColumns = r2, this.columnsMap = s2, !o3)
+          return o3;
+        this.initColumnOperation(i3, t2), e2.$dataTypeMap || (e2.$dataTypeMap = {}), e2.$dataTypeMap[i3.prop] = i3.dataType;
+      } else
+        o3 = false;
+      return o3;
+    }));
+  }
 }, visibleColumnsComponentData() {
   return this.visibleColumns.map((e2) => this.getColumnComponentData(e2, this.myCustomFormatter));
 }, mobileColumns: () => "Layout", tableDatas() {
-  const e2 = k.get(this.code), t2 = this.hasFilterDataEvent ? this.filterGridData : this.gridData;
+  const e2 = R.get(this.code), t2 = this.hasFilterDataEvent ? this.filterGridData : this.isFormSubTable && !this.isShowPageArea ? this.isSubSearch ? this.subTableDataSearch : this.subTableData : this.gridData;
   return e2 && e2.options && e2 && e2.options.allEditable && t2.forEach((e3) => {
     e3.$editing = true;
   }), t2;
@@ -98,7 +108,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
 }, showSummary() {
   return void 0 !== this.basicInfo.summary && "no" !== this.basicInfo.summary;
 }, getRowKeyProp() {
-  const e2 = k.get(this.code);
+  const e2 = R.get(this.code);
   return e2 && e2.options && e2.options.rowKeyProp ? e2.options.rowKeyProp : "$rowDataGuId";
 }, filterGridData() {
   return this.hasFilterDataEvent ? this.filterData() : this.gridData;
@@ -107,56 +117,50 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
     var _a;
     this.resizeTableHeight(), (_a = this.$refs.superGrid) == null ? void 0 : _a.doLayout();
   });
-} }, tableDatas: { deep: true, immediate: true, handler(e2, t2) {
 } }, "options.SuperGrid": { deep: true, handler: function() {
   this.externalClickFlag = true, this.initSetting(), this.initialize();
-} }, gridData: { deep: true, handler: function(e2) {
-  this.isSubTableShowPage || i(this, "change-grid-data", this.gridData);
 } }, subTableData: { deep: true, immediate: true, handler: function() {
-  if (this.isSubTableShowPage) {
-    const e2 = k.get(this.code);
-    if (i(this, "change-grid-data", this.subTableData), void 0 !== e2.isChangePage && e2.isChangePage || void 0 !== e2.isDelete && e2.isDelete) {
+  const e2 = R.get(this.code);
+  if (e2)
+    if (i(this, "change-grid-data", this.subTableData), void 0 !== e2.isAddRow && e2.isAddRow || void 0 !== e2.isChangePage && e2.isChangePage || void 0 !== e2.isDelete && e2.isDelete) {
       if (void 0 !== e2.isChangePage && e2.isChangePage) {
         const t2 = b(this.pageSize, e2.addRowIndex);
         this.currentPage = t2, this.changePage();
       } else
-        this.gridData = this.getSubTableGridData(this.subTableData), e2.gridData = this.gridData, e2.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)));
-      e2.lineEdit.editingCell && (e2.lineEdit.editingCell.row = this.gridData.length), e2.isChangePage = false, e2.isDelete = false;
+        this.isSubSearch ? this.gridData = this.getSubTableGridData(this.subTableDataSearch) : this.gridData = this.getSubTableGridData(this.subTableData), e2.gridData = this.gridData, e2.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)));
+      e2.lineEdit.editingCell && (e2.lineEdit.editingCell.row = this.gridData.length), e2.isChangePage = false, e2.isDelete = false, e2.isAddRow = false;
     } else
-      this.gridData = this.getSubTableGridData(this.subTableData), e2.gridData = this.gridData, e2.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData))), e2.isChangePage = false, e2.isDelete = false;
-  }
+      this.isSubSearch ? this.gridData = this.getSubTableGridData(this.subTableDataSearch) : this.gridData = this.getSubTableGridData(this.subTableData), e2.gridData = this.gridData, e2.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData))), e2.isChangePage = false, e2.isDelete = false, e2.isAddRow = false;
 } }, currentSelectCell: { deep: true, handler: function(e2, t2) {
   this.$nextTick(() => {
     t2 && (t2.style.border = "");
   });
 } }, "options.validateRules": { deep: true, handler: function() {
   this.externalClickFlag = true;
-  const e2 = k.get(this.code);
-  e2 && e2.options && (e2.options.validateRules = this.options.validateRules, k.set(this.code, e2));
+  const e2 = R.get(this.code);
+  e2 && e2.options && (e2.options.validateRules = this.options.validateRules, R.set(this.code, e2));
 } }, "options.subTableCanAdd": { deep: true, handler: function() {
-  const e2 = k.get(this.code);
-  e2 && e2.options && (e2.options.subTableCanAdd = this.options.subTableCanAdd, k.set(this.code, e2));
+  const e2 = R.get(this.code);
+  e2 && e2.options && (e2.options.subTableCanAdd = this.options.subTableCanAdd, R.set(this.code, e2));
 } }, pageSize: { deep: true, handler(e2, t2) {
   i(this, "change-rows-per-page", this.pageSize);
-} }, "options.extraParam.entityMap": { deep: true, handler(e2, t2) {
-  this.parentFormData = e2, this.$emit("change-form-data", this.parentFormData);
 } } }, provide: () => ({}), created() {
   var _a, _b;
-  (_b = (_a = q) == null ? void 0 : _a.dispatch) == null ? void 0 : _b.call(_a, "startListeningToResize"), k.set(this.code, f()), k.set("_list_code", this.code), this.initSetting(), this.judgeIsFormSubTable();
+  (_b = (_a = V) == null ? void 0 : _a.dispatch) == null ? void 0 : _b.call(_a, "startListeningToResize"), R.set(this.code, f()), R.set("_list_code", this.code), this.initSetting(), this.judgeIsFormSubTable();
   let e2 = true;
-  C("rowStyleRender", this.code) && (e2 = false), this.stripe = e2, C("filterDataEvent", this.code) && (this.hasFilterDataEvent = true);
+  S("rowStyleRender", this.code) && (e2 = false), this.stripe = e2, S("filterDataEvent", this.code) && (this.hasFilterDataEvent = true);
 }, mounted() {
   this.initialize().then(() => {
-    const e2 = k.get(this.code);
+    const e2 = R.get(this.code);
     e2 && e2.basicInfo && e2.basicInfo.tableName && (this.tableName = e2.basicInfo.tableName), e2 && e2.basicInfo && e2.basicInfo.name && (this.listName = e2.basicInfo.name), i(this, "grid-onmounted"), this.$nextTick(() => {
       this.columns.forEach((e4) => {
         e4.valueSet && i(this, "set-select-options", { prop: this.code + "." + e4.prop, valueSet: e4.valueSet });
-      }), this.rowDrop(), this.columnDrop(), k.get(this.code).superGrid = this.$refs.superGrid, this.query && "embedded" === this.query.showType ? this.resizeTableHeight() : this.$watch("showSearch", function(e4, t3) {
+      }), this.rowDrop(), this.columnDrop(), R.get(this.code).superGrid = this.$refs.superGrid, this.query && "embedded" === this.query.showType ? this.resizeTableHeight() : this.$watch("showSearch", function(e4, t3) {
         this.resizeTableHeight();
       }, { immediate: true, deep: true }), window.addEventListener("resize", this.resizeTableHeight), this.isFormSubTable && this.initScrollbarPositionCheck(), this.$watch("hasLoadData", function(e4, t3) {
         true === e4 && this.$nextTick(() => {
-          const e5 = k.get(this.code);
-          C("gridComplete", this.code) && e5.options.gridComplete.call(this, { gridData: this.isSubTableShowPage ? this.subTableData : this.gridData, columns: e5.columns, superGrid: this.$refs.superGrid, pageGridData: this.isSubTableShowPage ? this.gridData : null, listCode: this.code, additionalParamMap: e5.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj }), this.$emit("gridComplete", { gridData: this.isSubTableShowPage ? this.subTableData : this.gridData, columns: e5.columns, superGrid: this.$refs.superGrid, isMobile: false, listCode: this.code, pageGridData: this.isSubTableShowPage ? this.gridData : null, additionalParamMap: e5.additionalParamMap });
+          const e5 = R.get(this.code);
+          S("gridComplete", this.code) && e5.options.gridComplete.call(this, { gridData: this.isFormSubTable ? this.subTableData : this.gridData, columns: e5.columns, superGrid: this.$refs.superGrid, pageGridData: this.isSubTableShowPage ? this.gridData : null, listCode: this.code, additionalParamMap: e5.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj }), this.$emit("gridComplete", { gridData: this.isFormSubTable ? this.subTableData : this.gridData, columns: e5.columns, superGrid: this.$refs.superGrid, isMobile: false, listCode: this.code, pageGridData: this.isSubTableShowPage ? this.gridData : null, additionalParamMap: e5.additionalParamMap });
         });
       }, { immediate: true, deep: true });
       const e3 = this, t2 = null !== document.querySelector(".user-tree");
@@ -168,15 +172,24 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
       };
     }), this.query && "popup" === this.query.showType && i(this, "setSearchType", true), this.$watch("options.extraParam", function(e3, t2) {
       this.options.extraParam = e3;
-      k.get(this.code).options.extraParam = e3;
-    }, { deep: true }), this.isFormSubTable ? _(this.pageContext, this) : V(this.pageContext, { listRefs: [{ ref: this }], pageType: "list" });
+      R.get(this.code).options.extraParam = e3;
+    }, { deep: true }), this.isFormSubTable ? B(this.pageContext, this) : U(this.pageContext, { listRefs: [{ ref: this }], pageType: "list" });
   });
 }, beforeDestroy() {
   window.removeEventListener("resize", this.resizeTableHeight), this.isFormSubTable && (window.removeEventListener("scroll", this.checkScrollbarPosition, true), window.removeEventListener("resize", this.checkScrollbarPosition));
-}, methods: { ...M, ...R, ...G, ...B, ...j, packageHiddenColumnsWithChildren(e2, t2) {
+}, methods: { ...G, ...I, ...L, ...J, ...H, isMobileOrderColumn(e2) {
+  return this.isMobile && e2.prop && "$selection" !== e2.prop && "$index" !== e2.prop && ("true" === e2.sortable || true === e2.sortable);
+}, getColumnLabel: (e2) => C(e2), packageHiddenColumnsWithChildren(e2, t2, i2, o2, a2) {
   e2.children && e2.children.length > 0 && e2.children.forEach((e3) => {
-    (void 0 === e3.show || e3.show) && (e3.children && e3.children.length > 0 && this.packageHiddenColumnsWithChildren(e3, t2), t2 && t2.length > 0 && e3.prop && -1 !== t2.indexOf(e3.prop) ? e3.dyn_show = false : e3.dyn_show = true);
+    !this.isHasSearchColumn && e3.queryType && "normal" === e3.queryType && (this.isHasSearchColumn = true), (void 0 === e3.show || e3.show) && (e3.children && e3.children.length > 0 && this.packageHiddenColumnsWithChildren(e3, t2, i2, o2, a2), t2 && t2.length > 0 && e3.prop && -1 !== t2.indexOf(e3.prop) ? e3.dyn_show = false : e3.dyn_show = true, this.packageUpdateColunmInfo(e3, o2), e3.dyn_show && (this.isMobileOrderColumn(e3) && i2.push(e3), e3.prop && (a2[e3.prop] = e3)));
   });
+}, packageUpdateColunmInfo(e2, t2) {
+  if (t2 && e2.prop && t2[e2.prop]) {
+    const i2 = t2[e2.prop];
+    void 0 !== i2.show && false === i2.show ? e2.dyn_show = false : void 0 !== i2.show && i2.show && (e2.dyn_show = true), i2.label ? void 0 !== i2.label && i2.label && (e2.orgLabel || (e2.orgLabel = e2.label), e2.label = i2.label) : e2.orgLabel && (e2.label = e2.orgLabel);
+  } else
+    t2 && e2.prop && !t2[e2.prop] && (e2.dyn_show = e2.show, e2.orgLabel && (e2.label = e2.orgLabel));
+  return !(void 0 !== e2.dyn_show && !e2.dyn_show) || e2.dyn_show;
 }, onResize(e2) {
   this.resizeTableHeight(), this.isFormSubTable && this.checkScrollbarPosition();
 }, initScrollbarPositionCheck() {
@@ -200,21 +213,21 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
   t2 && (this.isScrollbarOnTop ? t2.classList.add("scrollbar-on-top") : t2.classList.remove("scrollbar-on-top"));
 }, onClickMain() {
   var _a, _b;
-  (_b = (_a = q) == null ? void 0 : _a.dispatch) == null ? void 0 : _b.call(_a, "clearAllEditing");
+  (_b = (_a = V) == null ? void 0 : _a.dispatch) == null ? void 0 : _b.call(_a, "clearAllEditing");
 }, isDeleteChange(e2) {
   this.isDelete = e2;
 }, isCallEnterEvent(e2) {
   let t2 = true;
   void 0 !== e2.options.isEnableEnterEvent && false === e2.options.isEnableEnterEvent && (t2 = false);
-  const i2 = k.get(e2.code);
+  const i2 = R.get(e2.code);
   return t2 && i2.options && i2.options.isFormSubTable && (t2 = false), t2;
 }, isShowPageArea() {
   return !this.isFormSubTable || void 0 !== this.options.showPageArea && true === this.options.showPageArea;
 }, resizeTableHeight() {
   this.$nextTick(() => {
-    let e2, t2 = S(this.$refs.superGrid, this.code, this.pageHeight, this.isDialog);
-    const i2 = k.get(this.code);
-    if (C("resizeHeight", this.code)) {
+    let e2, t2 = w(this.$refs.superGrid, this.code, this.pageHeight, this.isDialog);
+    const i2 = R.get(this.code);
+    if (S("resizeHeight", this.code)) {
       let o2 = 0;
       this.$refs.sf && !this.isMobile && (o2 = this.$refs.sf.$el.offsetHeight);
       const a2 = i2.options.resizeHeight.call(this, { code: this.code, height: t2, searchHeight: o2, additionalParamMap: i2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj });
@@ -223,7 +236,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
     i2.options && i2.options.isFormSubTable && i2.options.isPdfEditor ? e2 = void 0 : i2.options && i2.options.isFormSubTable && i2.options.formSetMaxHeight && (e2 = i2.options.formSetMaxHeight), null == e2 && (e2 = this.optionTableHeight ? this.optionTableHeight : i2.options && i2.options.isFormSubTable && i2.options.isPdfEditor ? void 0 : i2.options && i2.options.isFormSubTable && i2.options.formSetHeight ? i2.options.formSetHeight : t2), null === e2 && (e2 = void 0), null != e2 && parseFloat(e2 + "") < 100 && (e2 = 100), null != e2 && (e2 = parseFloat(e2 + "")), i2.options && i2.options.isFormSubTable ? this.basicInfo.displayEffect && "" !== this.basicInfo.displayEffect && "default" !== this.basicInfo.displayEffect ? (this.tableHeight = e2, this.maxHeight = void 0) : (this.maxHeight = e2, this.tableHeight = void 0) : this.basicInfo.displayEffect && "" !== this.basicInfo.displayEffect && "cover" !== this.basicInfo.displayEffect ? (this.maxHeight = e2, this.tableHeight = void 0) : (this.tableHeight = e2, this.maxHeight = void 0);
   });
 }, enterOperation(e2) {
-  const t2 = k.get(e2.code);
+  const t2 = R.get(e2.code);
   if (t2.options && t2.options.isFormSubTable) {
     const e3 = t2.$editRow;
     e3 && (p(e3, "$editing", false), t2.$editRow = null);
@@ -240,7 +253,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
     }
   }
 }, escOperation(e2) {
-  const t2 = k.get(e2.code);
+  const t2 = R.get(e2.code);
   if (t2.options && !t2.options.isFormSubTable) {
     const i2 = t2.$rowIndex;
     if (null != i2) {
@@ -350,7 +363,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
     t2.defaultValueColumns.find((t3) => t3.prop === e2.prop) || t2.defaultValueColumns.push(e2);
   }
 }, judgeIsFormSubTable() {
-  const e2 = k.get(this.code);
+  const e2 = R.get(this.code);
   e2 && e2.options && void 0 !== e2.options.isFormSubTable && true === e2.options.isFormSubTable && (this.isFormSubTable = true, this.subTableStyle = { width: "100%" });
 }, initColumnOperation(e2, t2) {
   if (t2 && t2[e2.prop]) {
@@ -361,23 +374,23 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
   if (void 0 !== this.options.operations && null !== this.options.operations)
     return this.options.operations;
 }, initSetting() {
-  const e2 = k.get(this.code);
+  const e2 = R.get(this.code);
   let t2;
-  void 0 !== this.options ? (Object.assign(e2.options, this.options), e2.options.lineEditOptions || (e2.options.lineEditOptions = e2.defaultLineEditOptions), void 0 !== this.options.customFormatter && null !== this.options.customFormatter && (this.myCustomFormatter = this.options.customFormatter)) : (e2.options = {}, e2.options.lineEditOptions = e2.defaultLineEditOptions), w("input", this.code) || (e2.options.lineEditOptions.input = e2.defaultLineEditOptions.input), this.myCustomFormatter || void 0 === this.customFormatter || null === this.customFormatter || (this.myCustomFormatter = this.customFormatter), this.options && this.options.dynamicServiceName && void 0 !== this.options.dynamicServiceName && (this.dynamicServiceName = this.options.dynamicServiceName, e2.dynamicServiceName = this.dynamicServiceName), this.options && this.options.system && void 0 !== this.options.system && (e2.system = this.options.system), this.options && this.options.additionalParamMap && void 0 !== this.options.additionalParamMap && (e2.additionalParamMap = this.options.additionalParamMap), e2.options && e2.options.backendUrl && (t2 = e2.options.backendUrl), t2 || (t2 = window.$vueApp.config.globalProperties.baseURL), this.baseURL = t2, e2.colConfigureMap = this.packageListColumnSetting();
+  void 0 !== this.options ? (Object.assign(e2.options, this.options), e2.options.lineEditOptions || (e2.options.lineEditOptions = e2.defaultLineEditOptions), void 0 !== this.options.customFormatter && null !== this.options.customFormatter && (this.myCustomFormatter = this.options.customFormatter)) : (e2.options = {}, e2.options.lineEditOptions = e2.defaultLineEditOptions), y("input", this.code) || (e2.options.lineEditOptions.input = e2.defaultLineEditOptions.input), this.myCustomFormatter || void 0 === this.customFormatter || null === this.customFormatter || (this.myCustomFormatter = this.customFormatter), this.options && this.options.dynamicServiceName && void 0 !== this.options.dynamicServiceName && (this.dynamicServiceName = this.options.dynamicServiceName, e2.dynamicServiceName = this.dynamicServiceName), this.options && this.options.system && void 0 !== this.options.system && (e2.system = this.options.system), this.options && this.options.additionalParamMap && void 0 !== this.options.additionalParamMap && (e2.additionalParamMap = this.options.additionalParamMap), e2.options && e2.options.backendUrl && (t2 = e2.options.backendUrl), t2 || (t2 = window.$vueApp.config.globalProperties.baseURL), this.baseURL = t2, e2.colConfigureMap = this.packageListColumnSetting();
 }, changeRowStyle(e2) {
   if (e2.row.$editing)
     return { background: "var(--el-table-row-hover-bg-color)" };
-  const t2 = k.get(this.code);
-  return this.lineEdit && this.lineEdit.editable && e2.rowIndex === t2.$rowIndex && y(e2.row, t2.orgGridData[t2.$rowIndex]), C("rowStyleRender", this.code) ? (e2.additionalParamMap = t2.additionalParamMap, e2.pageContext = this.pageContext, e2.configureOb = this.configureObj, e2.row && (e2.row = this.handRowKeyToUpperCase(e2.row)), t2.options.rowStyleRender.call(this, e2)) : this.options && this.options.renderRow && this.options.renderRow.hasOwnProperty(e2.rowIndex) ? { background: this.options.renderRow[e2.rowIndex] } : void 0;
+  const t2 = R.get(this.code);
+  return this.lineEdit && this.lineEdit.editable && e2.rowIndex === t2.$rowIndex && T(e2.row, t2.orgGridData[t2.$rowIndex]), S("rowStyleRender", this.code) ? (e2.additionalParamMap = t2.additionalParamMap, e2.pageContext = this.pageContext, e2.configureOb = this.configureObj, e2.row && (e2.row = this.handRowKeyToUpperCase(e2.row)), t2.options.rowStyleRender.call(this, e2)) : this.options && this.options.renderRow && this.options.renderRow.hasOwnProperty(e2.rowIndex) ? { background: this.options.renderRow[e2.rowIndex] } : void 0;
 }, changeCellStyle(e2) {
-  const t2 = k.get(this.code);
+  const t2 = R.get(this.code);
   let i2 = null, o2 = null, a2 = null;
   if (e2 && e2.column && e2.column.property && t2 && t2.columnOptionMap && t2.columnOptionMap[e2.column.property]) {
     o2 = t2.columnOptionMap[e2.column.property], o2.events && o2.events.cellStyle && (i2 = o2.events.cellStyle);
     const s2 = P(o2);
     s2 && s2.cellStyle && (a2 = s2.cellStyle);
   }
-  if (C("cellStyleRender", this.code))
+  if (S("cellStyleRender", this.code))
     return e2.additionalParamMap = t2.additionalParamMap, e2.pageContext = this.pageContext, e2.configureObj = this.configureObj, e2.cellStyle = a2, e2.row && (e2.row = this.handRowKeyToUpperCase(e2.row)), t2.options.cellStyleRender.call(this, e2);
   if (null !== i2 && null !== o2 && t2.options && t2.options.eventCallBack && t2.options.eventCallBack[i2] && "function" == typeof t2.options.eventCallBack[i2]) {
     const s2 = { value: e2.row[e2.column.property], row: e2.row, column: o2, prop: e2.column.property, additionalParamMap: t2.additionalParamMap, rowIndex: e2.rowIndex, cellStyle: a2 };
@@ -395,14 +408,14 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
     } else if (t2.property && this.backgroundColorMap[t2.property])
       return { background: this.backgroundColorMap[t2.property] };
   } else {
-    const t2 = k.get(this.code);
+    const t2 = R.get(this.code);
     let i2 = null, o2 = null, a2 = null;
     if (e2 && e2.column && e2.column.property && t2 && t2.columnOptionMap && t2.columnOptionMap[e2.column.property]) {
       o2 = t2.columnOptionMap[e2.column.property], o2.events && o2.events.headerCellStyle && (i2 = o2.events.headerCellStyle);
       const s2 = P(o2);
       s2 && s2.titleStyle && (a2 = s2.titleStyle);
     }
-    if (C("titleStyleRender", this.code))
+    if (S("titleStyleRender", this.code))
       return e2.additionalParamMap = t2.additionalParamMap, e2.pageContext = this.pageContext, e2.configureObj = this.configureObj, e2.titleStyle = a2, t2.options.titleStyleRender.call(this, e2);
     if (t2.options.renderHeader && t2.options.renderHeader.props) {
       const i3 = e2.column, o3 = t2.options.renderHeader.props.split(",");
@@ -417,12 +430,12 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
       return e2.additionalParamMap = t2.additionalParamMap, e2.titleStyle = a2, t2.options.eventCallBack[i2].call(this, e2);
   }
 }, fetchData(e2, t2, i2, o2) {
-  const a2 = k.get(this.code);
+  const a2 = R.get(this.code);
   if (a2.options && a2.options.isPageInfo)
     ;
   else if (a2.options && a2.options.isAdministerListView) {
     if (a2.options.SuperGrid && a2.options.SuperGrid.simulationDate) {
-      if (C("gridDataLoaded", this.code)) {
+      if (S("gridDataLoaded", this.code)) {
         const e3 = a2.options.gridDataLoaded.call(this, { gridData: a2.options.SuperGrid.simulationDate, columns: a2.columns, additionalParamMap: a2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj });
         this.gridData = e3 || a2.options.SuperGrid.simulationDate;
       } else
@@ -430,7 +443,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
       a2.gridData = this.gridData;
     }
   } else if (a2.options && a2.options.isFormSubTable && a2.options.subTableData && a2.options.subTableData.length > 0)
-    this.packageSubTableData(a2, a2.options.subTableData);
+    this.packageSubTableData(a2, a2.options.subTableData, e2 == null ? void 0 : e2.sorts);
   else {
     if (this.canRefreshTableData(a2))
       return this.fetchListData(e2, t2, i2, o2);
@@ -440,36 +453,51 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
     }
     this.hasLoadData = true, a2.loaded = true;
   }
-}, isSubTableEmpty: (e2) => e2.options && e2.options.isFormSubTable && (void 0 === e2.options.subTableData || null === e2.options.subTableData || 0 === e2.options.subTableData.length), packageSubTableData(e2, t2) {
+}, isSubTableEmpty: (e2) => e2.options && e2.options.isFormSubTable && (void 0 === e2.options.subTableData || null === e2.options.subTableData || 0 === e2.options.subTableData.length), packageSubTableData(e2, t2, i2, o2, a2) {
   this.hasLoadData = false, e2.loaded = true;
-  let i2 = [];
-  if (C("gridDataLoaded", this.code)) {
-    const o2 = e2.options.gridDataLoaded.call(this, { gridData: t2, columns: e2.columns, additionalParamMap: e2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj });
-    o2 ? (i2 = o2, this.hasLoadData = true) : (i2 = t2, this.hasLoadData = true);
+  let s2 = [];
+  if (S("gridDataLoaded", this.code)) {
+    const i3 = e2.options.gridDataLoaded.call(this, { gridData: t2, columns: e2.columns, additionalParamMap: e2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj });
+    i3 ? (s2 = i3, this.hasLoadData = true) : (s2 = t2, this.hasLoadData = true);
   } else
-    i2 = t2, this.hasLoadData = true;
-  i2 && i2.forEach((t3) => {
-    this.setColumnsDefaultValue(e2.allColumns, t3);
-  }), this.pagination && true === this.isSubTableShowPage ? (this.subTableData = i2, this.pagination.total = this.subTableData.length, e2.subTableData = this.subTableData, this.gridData = this.getSubTableGridData(this.subTableData)) : (this.subTableAddGuId(i2), this.gridData = i2), e2.gridData = this.gridData, e2.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)));
+    s2 = t2, this.hasLoadData = true;
+  if (s2) {
+    const t3 = i2 && i2.length > 0 ? i2[0] : null, o3 = t3 && t3.prop ? t3.prop : null, r2 = t3 && t3.order ? t3.order : null;
+    let n2 = [];
+    s2.forEach((t4) => {
+      this.setColumnsDefaultValue(e2.allColumns, t4);
+    }), a2 ? n2.push(a2) : this.getSortColumn(this.visibleColumns, { property: o3 }, n2), this.sortSubTableData(s2, o3, r2, n2);
+  }
+  this.pagination && true === this.isSubTableShowPage ? (this.pagination.total = s2.length, o2 ? (this.subTableDataSearch = s2, this.gridData = this.getSubTableGridData(this.subTableDataSearch)) : (this.subTableDataSearch = [], this.subTableData = s2, this.gridData = this.getSubTableGridData(this.subTableData))) : (this.subTableAddGuId(s2), o2 ? this.subTableDataSearch = s2 : (this.subTableDataSearch = [], this.subTableData = s2), this.gridData = s2), e2.subTableData = this.subTableData, e2.subTableDataSearch = this.subTableDataSearch, e2.gridData = this.gridData, e2.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)));
+}, sortSubTableData(e2, t2, i2, o2) {
+  if (t2 && i2 && o2.length > 0) {
+    let a2 = o2[0];
+    e2.sort((e3, o3) => void 0 !== e3[t2] && null !== e3[t2] || void 0 !== o3[t2] && null !== o3[t2] ? void 0 !== e3[t2] && null !== e3[t2] || void 0 === o3[t2] || null === o3[t2] ? void 0 === e3[t2] || null === e3[t2] || void 0 !== o3[t2] && null !== o3[t2] ? "INTEGER" === a2.dataType || "LONG" === a2.dataType || "FLOAT" === a2.dataType || "DOUBLE" === a2.dataType || "DATE" === a2.dataType || "TIME" === a2.dataType ? "asc" === i2 || "ascending" === i2 ? e3[t2] - o3[t2] : o3[t2] - e3[t2] : "asc" === i2 || "ascending" === i2 ? e3[t2] < o3[t2] ? -1 : e3[t2] > o3[t2] ? 1 : 0 : e3[t2] < o3[t2] ? 1 : e3[t2] > o3[t2] ? -1 : 0 : "asc" === i2 || "ascending" === i2 ? 1 : -1 : "asc" === i2 || "ascending" === i2 ? -1 : 1 : 0);
+  }
 }, canRefreshTableData(e2) {
   let t2 = false;
   return (e2.options && !e2.options.isFormSubTable || e2.options && e2.options.isFormSubTable && void 0 !== e2.options.canRrefreshSubtableData && true === e2.options.canRrefreshSubtableData) && (t2 = true), t2;
 }, getSubTableGridData(e2, t2) {
-  let i2 = e2;
-  if (true === this.isSubTableShowPage && e2 && e2.length > 0) {
-    this.pagination.total = e2.length;
-    let o2 = null != t2 ? t2 : this.currentPage;
-    null == o2 && (o2 = 1);
-    let a2 = this.pageSize;
-    null === a2 && this.pagination && (a2 = this.pagination.pageSize), null == a2 && (a2 = 20);
-    const s2 = (o2 - 1) * a2;
-    let r2 = s2 + a2;
-    e2.length > s2 && (r2 > e2.length && (r2 = e2.length), i2 = e2.slice(s2, r2));
+  let i2 = null != t2 ? t2 : this.currentPage;
+  null == i2 && (i2 = 1);
+  let o2 = e2;
+  if (true === this.isSubTableShowPage) {
+    if (e2 && e2.length > 0) {
+      this.pagination.total = e2.length;
+      let t4 = this.pageSize;
+      null === t4 && this.pagination && (t4 = this.pagination.pageSize), null == t4 && (t4 = 20);
+      const a2 = (i2 - 1) * t4;
+      let s2 = a2 + t4;
+      e2.length > a2 && (s2 > e2.length && (s2 = e2.length), o2 = e2.slice(a2, s2));
+    }
+    let t3 = [];
+    this.isShowCard && i2 > 1 && (this.gridData.length !== e2.length ? (t3 = this.gridData.concat(o2), o2 = t3) : o2 = e2);
   }
-  return null == i2 && (i2 = []), this.subTableAddGuId(i2), i2;
+  return null == o2 && (o2 = []), this.subTableAddGuId(o2), o2;
 }, subTableAddGuId(e2) {
-  e2.forEach((e3) => {
-    e3.$rowDataGuId || (e3.$rowDataGuId = N());
+  const t2 = e2.filter((e3) => !e3.$rowDataGuId);
+  t2 && t2.length > 0 && t2.forEach((e3) => {
+    e3.$rowDataGuId || (e3.$rowDataGuId = _());
   });
 }, fetchListData(e2, t2, i2, o2) {
   if (this.isLoading = true, this.hasLoadData = false, void 0 === t2 || false === t2) {
@@ -483,14 +511,14 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
     }
   }
   window.sessionStorage.removeItem("refreshList-" + this.code), void 0 === e2 && (e2 = this.getSearchParam());
-  const a2 = k.get(this.code);
+  const a2 = R.get(this.code);
   let s2 = e2;
-  this.resetAdditionalParamMap(s2, a2), (a2.options.extraParam || void 0 !== i2) && (s2 = T(e2, a2)), a2.searchParam = e2, a2.url = this.url;
+  this.resetAdditionalParamMap(s2, a2), (a2.options.extraParam || void 0 !== i2) && (s2 = v(e2, a2)), a2.searchParam = e2, a2.url = this.url;
   let r2 = this.url;
   null != i2 && (s2 = Object.assign({}, s2), s2.searchParam.pagination = null, s2.parentIds = i2, s2.parentProp = this.parentProp, s2.systemCode = this.basicInfo.systemCode, r2 = this.options.subRowUrl), a2.isCreateRow = false, a2.isEditRow = false, a2.$lastSaveRowIndex = null, a2.$rowIndex = null, a2.canSaveRow = true, a2.withDataPermission = a2.options.isWithDataPermission, a2.isWorkflowEntity = a2.options.isWorkflowEntity, window.sessionStorage.setItem("searchParam-" + this.code, JSON.stringify(s2)), this.parentProp && e2.searchForm && e2.searchForm.length > 0 && (s2.listViewTreeSetting = null);
   let n2 = true;
-  return C("beforeRequest", this.code) && (n2 = a2.options.beforeRequest.call(this, { columns: this.columns, gridParams: a2, additionalParamMap: a2.additionalParamMap, requestParam: s2, pageContext: this.pageContext, configureObj: this.configureObj })), new Promise((e3, t3) => {
-    z(n2) ? n2.then((n3) => {
+  return S("beforeRequest", this.code) && (n2 = a2.options.beforeRequest.call(this, { columns: this.columns, gridParams: a2, additionalParamMap: a2.additionalParamMap, requestParam: s2, pageContext: this.pageContext, configureObj: this.configureObj })), new Promise((e3, t3) => {
+    N(n2) ? n2.then((n3) => {
       void 0 === n3 || n3 ? r2 ? this.doRequest(r2, s2, i2, a2, o2).then(() => {
         e3();
       }).catch((e4) => {
@@ -504,78 +532,67 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
       a2.loaded = true, t3(e4);
     }) : (a2.loaded = true, e3()) : (console.error("beforeRequest result is false!!"), a2.loaded = true, e3());
   });
+}, getChildren(e2) {
+  return (e2 == null ? void 0 : e2.map((e3) => {
+    var _a;
+    return { $rowDataGuId: e3.$rowDataGuId ? e3.$rowDataGuId : _(), ...e3, ...((_a = e3 == null ? void 0 : e3.children) == null ? void 0 : _a.length) ? { children: this.getChildren(e3.children) } : {} };
+  })) ?? [];
 }, doRequest(e2, t2, i2, o2, a2) {
   return new Promise((s2, r2) => {
     this.$http.post(e2, t2).then((e3) => {
       if (null == i2) {
-        const t3 = (e4) => (e4 == null ? void 0 : e4.map((e5) => {
-          var _a;
-          return { $rowDataGuId: N(), ...e5, ...((_a = e5 == null ? void 0 : e5.children) == null ? void 0 : _a.length) ? { children: t3(e5.children) } : {} };
-        })) ?? [], i3 = [...this.isShowCard && this.currentPage > 1 ? this.gridData : [], ...t3((e3 == null ? void 0 : e3.data) ?? [])];
-        let a3 = [];
-        if (C("gridDataLoaded", this.code)) {
-          const e4 = { gridData: i3, columns: o2.columns, additionalParamMap: o2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj };
+        const t3 = [...this.isShowCard && this.currentPage > 1 ? this.gridData : [], ...this.getChildren((e3 == null ? void 0 : e3.data) ?? [])];
+        let i3 = [];
+        if (S("gridDataLoaded", this.code)) {
+          const e4 = { gridData: t3, columns: o2.columns, additionalParamMap: o2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj };
           o2.searchParam && (e4.searchForm = o2.searchParam.searchForm, e4.additionalParamMap = o2.searchParam.additionalParamMap);
-          const t4 = o2.options.gridDataLoaded.call(this, e4);
-          a3 = t4 || i3;
+          const a3 = o2.options.gridDataLoaded.call(this, e4);
+          i3 = a3 || t3;
         } else
-          a3 = i3;
-        a3 || (a3 = []), o2.options.isFormSubTable ? (a3 && a3.forEach((e4) => {
+          i3 = t3;
+        i3 || (i3 = []), o2.options.isFormSubTable ? (i3 && i3.forEach((e4) => {
           this.setColumnsDefaultValue(o2.allColumns, e4);
-        }), this.pagination && true === this.isSubTableShowPage ? (this.subTableData = a3, this.gridData = this.getSubTableGridData(this.subTableData), o2.subTableData = this.subTableData) : this.gridData = a3, this.pagination && (this.pagination.total = a3.length)) : (this.gridData = a3, this.pagination && (this.pagination.total = e3.total)), e3.summaries && Object.keys(e3.summaries).length > 0 && (this.summaries = e3.summaries), o2.gridData = this.gridData, o2.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData))), o2.pagination = this.pagination, o2.loaded = true, this.lineEdit && this.lineEdit.editable && ("undefined" != typeof isSearch && false !== isSearch || (0 === this.gridData.length && this.options && null !== this.options.isDefaultShowEdit && void 0 !== this.options.isDefaultShowEdit && true === this.options.isDefaultShowEdit && this.createRow(this.code, null, this.gridData), this.gridData.length > 0 && (this.lineEdit.editingCell = { row: 0, prop: v(this.code) }))), this.hasLoadData = true;
+        }), this.pagination && true === this.isSubTableShowPage ? (this.subTableData = i3, this.gridData = this.getSubTableGridData(this.subTableData), o2.subTableData = this.subTableData) : this.gridData = i3, this.pagination && (this.pagination.total = i3.length)) : (this.gridData = i3, this.pagination && (this.pagination.total = e3.total)), e3.summaries && Object.keys(e3.summaries).length > 0 && (this.summaries = e3.summaries), o2.gridData = this.gridData, o2.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData))), o2.pagination = this.pagination, o2.loaded = true, this.lineEdit && this.lineEdit.editable && ("undefined" != typeof isSearch && false !== isSearch || (0 === this.gridData.length && this.options && null !== this.options.isDefaultShowEdit && void 0 !== this.options.isDefaultShowEdit && true === this.options.isDefaultShowEdit && this.createRow(this.code, null, this.gridData), this.gridData.length > 0 && (this.lineEdit.editingCell = { row: 0, prop: x(this.code) }))), this.hasLoadData = true;
       } else
-        o2.loaded = true, C("gridDataLoaded", this.code) && o2.options.gridDataLoaded.call(this, { gridData: e3, additionalParamMap: o2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj }), C("loadChildrenComplete", this.code) && o2.options.loadChildrenComplete.call(this, { parentRowIds: i2, gridData: e3, columns: o2.columns, additionalParamMap: o2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj }), null != a2 ? (this.removeGridStoreSelection(i2), a2(e3[i2[0]])) : (i2.forEach((t3) => {
+        o2.loaded = true, S("gridDataLoaded", this.code) && o2.options.gridDataLoaded.call(this, { gridData: e3, additionalParamMap: o2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj }), S("loadChildrenComplete", this.code) && o2.options.loadChildrenComplete.call(this, { parentRowIds: i2, gridData: e3, columns: o2.columns, additionalParamMap: o2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj }), null != a2 ? (this.removeGridStoreSelection(i2), a2(e3[i2[0]])) : (i2.forEach((t3) => {
           this.$refs.superGrid && (this.$refs.superGrid.store.states.lazyTreeNodeMap[t3] = e3[t3], this.$refs.superGrid.store.states.treeData[t3].children = e3[t3]);
         }), this.removeGridStoreSelection(i2)), this.hasLoadData = true;
       s2();
     }).catch((e3) => {
-      C("loadError", this.code) && o2.options.loadError.call(this, this.code, e3), r2(e3);
+      S("loadError", this.code) && o2.options.loadError.call(this, this.code, e3), r2(e3);
     });
   });
 }, getInitSearchForm(e2) {
-  const t2 = k.get(this.code);
+  const t2 = R.get(this.code);
   e2 && e2.length > 0 ? (this.searchFormContent = {}, e2.forEach((e3) => {
     let t3 = e3.propName;
     const i2 = e3.columnProp, o2 = e3.dataType;
     o2 && "BOOLEAN" === o2 && (t3 = i2), this.initSearchProps.push(t3);
     const a2 = e3.propValue;
-    t3 && t3.indexOf(".") > 0 ? x(this.searchFormContent, t3, a2) : this.searchFormContent[t3] = a2;
+    t3 && t3.indexOf(".") > 0 ? F(this.searchFormContent, t3, a2) : this.searchFormContent[t3] = a2;
   }), t2.searchForm = e2, this.showSearchForm()) : t2.searchForm = null;
-}, showDemo() {
-  this.isLoading = true, this.$http.get(this.url).then((e2) => {
-    this.getShowColumns(e2), Object.assign(this, e2);
-    const t2 = k.get(this.code);
-    if (t2.listCode = this.code, t2.columns = this.columns, t2.columns && this.options.dynamicColumns)
-      for (var i2 = 0; i2 < this.options.dynamicColumns.length; i2++)
-        this.options.dynamicColumns[i2].dynamic = true, t2.columns.push(this.options.dynamicColumns[i2]);
-    if (t2.lineEdit = this.lineEdit, t2.basicInfo = this.basicInfo, t2.pagination = this.pagination, t2.query = this.query, this.gridData = e2.gridData, C("gridDataLoaded", this.code)) {
-      const i3 = t2.options.gridDataLoaded.call(this, { gridData: e2.gridData, additionalParamMap: t2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj });
-      this.gridData = i3 || e2.gridData;
-    } else
-      this.gridData = e2.gridData;
-    this.pagination && (this.pagination.total = e2.total), this.gridData || (this.gridData = []), t2.gridData = this.gridData, t2.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData))), t2.pagination = this.pagination, this.lineEdit.editable && (0 === this.gridData.length && this.createRow(this.code, null, this.gridData), this.lineEdit.editingCell = { row: 0, prop: v(this.code) }), C("gridComplete", this.code) && t2.options.gridComplete.call(this, this.gridData, t2.columns, this.pageContext, this.configureObj);
-  }).catch((e2) => {
-    if (C("loadError", this.code)) {
-      k.get(this.code).options.loadError.call(this, this.code, e2);
-    }
-  });
 }, doSearch(e2) {
   this.currentPage = 1, e2 && e2.length > 0 ? this.toolbarFieldParam && this.toolbarFieldParam.length > 0 && (1 === e2.length && (e2[0].leftBracket = "(", e2[0].rightBracket = ")"), "or" === e2[e2.length - 1].joinSign && (e2[e2.length - 1].joinSign = "and"), Array.prototype.push.apply(e2, this.toolbarFieldParam)) : this.toolbarFieldParam && this.toolbarFieldParam.length > 0 && (e2 = this.toolbarFieldParam), this.search(e2, true);
 }, doSearchDialog(e2) {
   this.currentPage = 1, this.search(e2, true), this.closeSearchFormDialog();
+}, searSubTable(e2, t2) {
+  let i2 = [];
+  return e2 && e2.forEach((e3) => {
+    O(t2, e3) && i2.push(e3);
+  }), i2;
 }, search(e2, t2, o2) {
   i(this, "refresh");
   const a2 = this;
   return new Promise((s2, r2) => {
-    const n2 = k.get(a2.code);
+    const n2 = R.get(a2.code);
     if (n2.searchForm = null != e2 ? e2 : null, n2.options && n2.options.isAdministerListView) {
       if (n2.options.SuperGrid && n2.options.SuperGrid.simulationDate) {
         let e3;
-        C("gridDataLoaded", a2.code) ? (e3 = n2.options.gridDataLoaded.call(this, { gridData: n2.options.SuperGrid.simulationDate, columns: n2.columns, additionalParamMap: n2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj }), e3 || (e3 = n2.options.SuperGrid.simulationDate)) : e3 = n2.options.SuperGrid.simulationDate, s2(e3);
+        S("gridDataLoaded", a2.code) ? (e3 = n2.options.gridDataLoaded.call(this, { gridData: n2.options.SuperGrid.simulationDate, columns: n2.columns, additionalParamMap: n2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj }), e3 || (e3 = n2.options.SuperGrid.simulationDate)) : e3 = n2.options.SuperGrid.simulationDate, s2(e3);
       }
     } else if (n2.options && n2.options.isFormSubTable && n2.options.subTableData && n2.options.subTableData.length > 0) {
-      let e3;
-      a2.hasLoadData = false, n2.loaded = true, C("gridDataLoaded", a2.code) ? (e3 = n2.options.gridDataLoaded.call(this, { gridData: n2.options.subTableData, columns: n2.columns, additionalParamMap: n2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj }), e3 || (e3 = n2.options.subTableData, a2.hasLoadData = true)) : (e3 = n2.options.subTableData, a2.hasLoadData = true), s2(e3);
+      let o3 = n2.options.subTableData;
+      this.searchSubTable(o3, e2, t2, n2), a2.$refs && a2.$refs.sf && (a2.$refs.sf.loading = false, a2.$refs.sf.searchComplete()), a2.$refs && a2.$refs.sfDialog && (a2.$refs.sfDialog.loading = false, a2.$refs.sfDialog.searchComplete()), a2.showSubTableSearchDialog = false, i(a2, "cancel-search"), s2(o3);
     } else
       a2.fetchData(a2.getSearchParam(), t2, o2).then((e3) => {
         void 0 !== n2 && void 0 !== n2.options && void 0 !== n2.options.isHiddenSearchForm && true === n2.options.isHiddenSearchForm && (a2.showSearch = false, i(a2, "cancel-search")), a2.$refs && a2.$refs.sf && (a2.$refs.sf.loading = false, a2.$refs.sf.searchComplete()), this.resizeTableHeight(), s2(e3);
@@ -583,8 +600,11 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
         a2.$refs.sf && (a2.$refs.sf.loading = false, a2.$refs.sf.searchComplete()), r2(e3);
       });
   });
+}, searchSubTable(e2, t2, i2, o2) {
+  let a2 = e2;
+  i2 && (a2 = this.searSubTable(e2, t2)), this.packageSubTableData(o2, a2, this.sortInfo, i2, this.orderColumn), i2 ? (o2.isSubSearch = true, this.isSubSearch = true, this.subTableDataSearch = a2) : (o2.isSubSearch = false, this.isSubSearch = false, this.subTableDataSearch = []);
 }, getPaginationInfo() {
-  const e2 = k.get(this.code);
+  const e2 = R.get(this.code);
   if (this.pagination) {
     if (this.isDelete && this.currentPage > 1) {
       const e3 = Math.ceil((this.pagination.total - this.gridData.length) / this.pagination.pageSize);
@@ -595,7 +615,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
   }
   return { currentPage: 1, pageSize: 20, showTotal: true };
 }, getSearchParam() {
-  const e2 = { code: this.code, tableName: this.tableName }, t2 = k.get(this.code), i2 = this.getPaginationInfo();
+  const e2 = { code: this.code, tableName: this.tableName }, t2 = R.get(this.code), i2 = this.getPaginationInfo();
   if (i2 && null !== i2 && (e2.pagination = i2), null !== this.sortInfo && (e2.sorts = this.sortInfo), this.mergeFields && this.mergeFields.length > 0) {
     e2.sorts || (e2.sorts = []);
     const t3 = [];
@@ -616,27 +636,37 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
 }, getComponentType(e2) {
   const t2 = e2.prop;
   let i2 = "NormalColumn";
-  return "$index" === t2 ? i2 = "IndexColumn" : "$selection" === t2 ? (k.get(this.code).isMulitiSelect = true, i2 = "SelectionColumn") : void 0 === t2 && e2.children && e2.children.length > 0 && (i2 = "GroupColumn"), i2;
+  return "$index" === t2 ? i2 = "IndexColumn" : "$selection" === t2 ? (R.get(this.code).isMulitiSelect = true, i2 = "SelectionColumn") : void 0 === t2 && e2.children && e2.children.length > 0 && (i2 = "GroupColumn"), i2;
 }, focusOnFirstEditableInput() {
-  this.basicInfo.editable && (this.lineEdit.editingCell.row = 0, this.lineEdit.editingCell.prop = v(this.code));
+  this.basicInfo.editable && (this.lineEdit.editingCell.row = 0, this.lineEdit.editingCell.prop = x(this.code));
 }, handleSizeChange(e2) {
   this.options && this.options.isPageShow || (this.currentPage = 1, this.pageSize = e2, this.pagination.pageSize = e2, this.changePage());
 }, handleCurrentChange(e2) {
-  this.options && this.options.isPageShow || this.changePage();
+  this.options && this.options.isPageShow || this.changePage(e2);
 }, changePage(e2) {
   var _a;
   if ((_a = this.$refs.superGrid) == null ? void 0 : _a.clearFilter(), this.isSubTableShowPage) {
-    this.gridData = this.getSubTableGridData(this.subTableData, e2);
-    const t2 = k.get(this.code);
-    t2.gridData = this.gridData, t2.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)));
+    let t2;
+    t2 = this.isSubSearch ? this.getSubTableGridData(this.subTableDataSearch, e2) : this.getSubTableGridData(this.subTableData, e2), this.gridData = t2;
+    const i2 = R.get(this.code);
+    i2.gridData = this.gridData, i2.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)));
   } else
     this.fetchData(this.getSearchParam());
+}, getSortColumn(e2, t2, i2) {
+  for (let o2 = 0; o2 < e2.length; o2++) {
+    const a2 = e2[o2];
+    if (a2.children && a2.children.length > 0)
+      this.getSortColumn(a2.children, t2, i2);
+    else if (t2.property === a2.prop) {
+      i2.push(a2);
+      break;
+    }
+  }
 }, handleSortChange({ column: e2, prop: t2, order: o2 }) {
   var _a;
   if (!this.options || !this.options.isPageShow) {
-    let a2 = null;
-    const s2 = this.visibleColumns.filter((t3) => e2.property === t3.prop);
-    if (s2 && s2.length > 0 && (a2 = s2[0]), O(this.code)) {
+    let a2 = null, s2 = [];
+    if (this.getSortColumn(this.visibleColumns, e2, s2), s2 && s2.length > 0 && (a2 = s2[0]), $(this.code)) {
       if (null !== t2 && a2 && null !== a2) {
         let e3 = a2.orgProp;
         const t3 = "__";
@@ -645,7 +675,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
         this.sortInfo = null;
       this.fetchData(this.getSearchParam()), this.focusOnFirstEditableInput(), i(this, "sort-change", { columnSetting: a2, prop: t2, order: o2, column: e2 });
     } else {
-      k.get(this.code).$rowIndex, (_a = this.$refs.superGrid) == null ? void 0 : _a.clearSort();
+      R.get(this.code).$rowIndex, (_a = this.$refs.superGrid) == null ? void 0 : _a.clearSort();
     }
   }
 }, isMergeable(e2) {
@@ -674,7 +704,13 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
   const { columns: i2 } = e2, o2 = [];
   return i2.forEach((e3, i3) => {
     const a2 = e3.property, s2 = t2[a2];
-    o2[i3] = null != s2 ? s2 : "";
+    if (null != s2) {
+      let e4;
+      a2 && this.columnsMap && this.columnsMap[a2] && (e4 = this.columnsMap[a2]);
+      let t3 = s2;
+      e4 && (t3 = W(e4, s2)), o2[i3] = t3;
+    } else
+      o2[i3] = "";
   }), o2;
 }, getDefaultSummaries(e2) {
   const t2 = [], i2 = this.packageSummaryColumnProps();
@@ -686,16 +722,22 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
       const n2 = e3.property;
       if (n2 && "$selection" !== n2 && "$index" !== n2 && null == s2)
         return s2 = o3, void (t2[o3] = "合计");
-      i2.indexOf(n2) >= 0 ? (a2 && a2.forEach((e4) => {
-        let t3, i3 = u(e4, n2);
-        if (null != i3)
-          t3 = Number(i3);
-        else {
-          const o4 = /[A-Z]+/;
-          this.isSql && o4.test(n2) && (i3 = u(e4, n2.toLowerCase()), null != i3 && (t3 = Number(i3)));
-        }
-        null == t3 || isNaN(t3) || (r2 += t3);
-      }), t2[o3] = r2) : t2[o3] = "";
+      if (i2.indexOf(n2) >= 0) {
+        let e4;
+        a2 && a2.forEach((e5) => {
+          let t3, i4 = u(e5, n2);
+          if (null != i4)
+            t3 = Number(i4);
+          else {
+            const o4 = /[A-Z]+/;
+            this.isSql && o4.test(n2) && (i4 = u(e5, n2.toLowerCase()), null != i4 && (t3 = Number(i4)));
+          }
+          null == t3 || isNaN(t3) || (r2 += t3);
+        }), n2 && this.columnsMap && this.columnsMap[n2] && (e4 = this.columnsMap[n2]), this.columnsMap;
+        let i3 = r2;
+        e4 && (i3 = W(e4, r2)), t2[o3] = i3;
+      } else
+        t2[o3] = "";
     });
   }
   return t2;
@@ -706,7 +748,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
     const e2 = document.querySelector(".el-table__body-wrapper tbody");
     if (null != e2) {
       const t2 = this;
-      $.create(e2, { onEnd({ newIndex: e3, oldIndex: i2 }) {
+      k.create(e2, { onEnd({ newIndex: e3, oldIndex: i2 }) {
         const o2 = { oldIndex: i2, newIndex: e3 };
         this.$http.post(this.lineEdit.urlToSaveOrder, o2).then((o3) => {
           const a2 = t2.gridData.splice(i2, 1)[0];
@@ -750,8 +792,8 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
 }, changeHederWidth(e2, t2, o2, a2) {
   let s2 = e2 - 5;
   this.dragColumnProp = o2.property;
-  const r2 = k.get(this.code);
-  if (C("resizeColumn", this.code)) {
+  const r2 = R.get(this.code);
+  if (S("resizeColumn", this.code)) {
     const e3 = r2.options.resizeColumn.call(this, { code: this.code, newWidth: e3, oldWidth: t2, column: o2, additionalParamMap: r2.additionalParamMap, pageContext: this.pageContext, configureObj: this.configureObj });
     e3 && (s2 = e3);
   }
@@ -797,7 +839,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
 }, validatorSunTableListData() {
   let e2 = this.gridData;
   if (this.isSubTableShowPage && (e2 = this.subTableData), e2 && e2.length > 0) {
-    const t2 = k.get(this.code), o2 = t2.options.customRules, a2 = this.pagination && this.pagination.pageSize, s2 = I.getValidator(this.code);
+    const t2 = R.get(this.code), o2 = t2.options.customRules, a2 = this.pagination && this.pagination.pageSize, s2 = j.getValidator(this.code);
     for (let r2 = 0; r2 < e2.length; r2++) {
       const n2 = e2[r2];
       let l2 = s2;
@@ -806,17 +848,17 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
         if (e3.length > 0) {
           for (const i2 of e3)
             if (o2[i2].beforeValidate) {
-              false === F(o2[i2], t2, n2) && l2[i2] && (l2 = JSON.parse(JSON.stringify(s2)), l2[i2] = []);
+              false === E(o2[i2], t2, n2) && l2[i2] && (l2 = JSON.parse(JSON.stringify(s2)), l2[i2] = []);
             }
         }
       }
       void 0 !== n2.$editing && true === n2.$editing && (p(n2, "$editing", false), i(g, "un-edit", { row: n2 }));
       let h2 = true;
-      w("isEnableValidate", this.code) && (h2 = t2.options.lineEditOptions.isEnableValidate);
+      y("isEnableValidate", this.code) && (h2 = t2.options.lineEditOptions.isEnableValidate);
       let d2 = true;
       if (true === h2) {
         let e3, t3;
-        this.isSubTableShowPage && void 0 !== a2 && a2 > 0 && (e3 = Math.ceil((r2 + 1) / a2), t3 = r2 + 1 - (e3 - 1) * a2), d2 = I.validator(n2, this.code, r2, l2, this.isSubTableShowPage, e3, t3);
+        this.isSubTableShowPage && void 0 !== a2 && a2 > 0 && (e3 = Math.ceil((r2 + 1) / a2), t3 = r2 + 1 - (e3 - 1) * a2), d2 = j.validator(n2, this.code, r2, l2, this.isSubTableShowPage, e3, t3);
       }
       if (null != d2 && ("string" == typeof d2 || false === d2))
         return false;
@@ -827,18 +869,18 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
 }, getSunTableListData() {
   return this.isSubTableShowPage ? this.subTableData : this.gridData;
 }, rowDblclickEvent(e2, t2, i2) {
-  const o2 = k.get(this.code);
+  const o2 = R.get(this.code);
   if (o2.options && o2.options.isFormSubTable && o2.options.isPdfEditor)
     ;
   else if (this.isFormSubTable) {
     if (t2.property && "operation" !== t2.property) {
       let t3 = true;
-      const i3 = k.get(this.code);
+      const i3 = R.get(this.code);
       if (D("beforeEdit", this.code)) {
         const o3 = i3.isSubTableShowPage, a2 = i3.pagination && i3.pagination.pageSize;
         t3 = i3.options.lineEditOptions.beforeEdit.call(this, { gridData: o3 ? i3.subTableData : i3.gridData, listCode: this.code, entity: e2, columns: i3.columns, isMobile: this.isMobile, pageGridData: o3 ? i3.gridData : null, pageSize: a2, additionalParamMap: i3.additionalParamMap, pageContext: i3.pageContext, configureObj: i3.configureObj });
       }
-      z(t3) ? t3.then((t4) => {
+      N(t3) ? t3.then((t4) => {
         void 0 !== t4 && true !== t4 || this.rowDbClickEditRow(i3, e2);
       }) : void 0 !== t3 && true !== t3 || this.rowDbClickEditRow(i3, e2);
     }
@@ -852,10 +894,10 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
 }, rowDbClickEditRow(e2, t2) {
   var _a;
   let i2;
-  i2 = this.isSubTableShowPage ? this.subTableData.filter((e3) => void 0 !== e3.$editing && true === e3.$editing) : this.gridData.filter((e3) => void 0 !== e3.$editing && true === e3.$editing), i2 && i2.length > 0 && i2.forEach((e3) => {
+  i2 = this.isFormSubTable ? this.subTableData.filter((e3) => void 0 !== e3.$editing && true === e3.$editing) : this.gridData.filter((e3) => void 0 !== e3.$editing && true === e3.$editing), i2 && i2.length > 0 && i2.forEach((e3) => {
     p(e3, "$editing", false), g.$emit("un-edit", { row: e3 });
   }), e2.isEditRow = false;
-  false !== E(e2, this.parentFormData, t2, (_a = e2.options.actionPermission) == null ? void 0 : _a.updateCondition) ? (p(t2, "$editing", true), e2.$editRow = t2, e2.isEditRow = true) : window.$vueApp.config.globalProperties.$message({ showClose: true, message: this.$t("superGrid.rowCanntEditTip"), type: "warning" });
+  false !== M(e2, this.parentFormData, t2, (_a = e2.options.actionPermission) == null ? void 0 : _a.updateCondition) ? (p(t2, "$editing", true), e2.$editRow = t2, e2.isEditRow = true) : window.$vueApp.config.globalProperties.$message({ showClose: true, message: this.$t("superGrid.rowCanntEditTip"), type: "warning" });
 }, rowClickEvent(e2, t2, i2) {
   this.rowClick(e2, t2, i2);
 }, openPageDialog(e2) {
@@ -865,7 +907,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
   if (this.pageContext) {
     const e3 = this.isMobile;
     if ("popup" === t2 || "refresh" === t2 || e3 && "newTab" === t2) {
-      const t3 = k.get(this.code);
+      const t3 = R.get(this.code);
       this.jumpPageSetting = i2;
       const o2 = t3.isSubTableShowPage, a2 = t3.pagination && t3.pagination.pageSize, s2 = i2.row, r2 = { position: i2._position, listCode: i2._listCode, rowIndex: i2._rowIndex, row: i2.row, columnProp: i2._columnProp, id: s2 ? s2.ID ? s2.ID : s2.id : null, isMobile: e3, gridData: o2 ? t3.subTableData : t3.gridData, pageGridData: o2 ? t3.gridData : null, pageSize: a2 };
       this.$emit("new-open-grid-dialog", { pageContext: this.pageContext, configureObj: this.configureObj, eventParams: r2, jumpPageSetting: this.jumpPageSetting });
@@ -873,7 +915,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
   } else
     "popup" === t2 ? (this.jumpPageSetting = i2, this.$emit("open-grid-dialog", this.jumpPageSetting), this.isShowPageDialog = true) : "refresh" === t2 && this.$router.push({ path: "/dsc/page", query: i2 });
 }, closeSearchFormDialog() {
-  this.showSearch = false;
+  this.showSearch = false, this.showSubTableSearchDialog = false;
 }, getQueryMode() {
   return this.query && "popup" === this.query.showType ? "popup" : "embedded";
 }, selectCell(e2, t2, i2, o2) {
@@ -883,8 +925,8 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
 }, refreshGridData() {
   this.refresh(false, true);
 }, refresData(e2) {
-  const t2 = k.get(this.code);
-  t2.gridData = e2, k.set(this.code, t2), this.parentFormData && (this.parentFormData[this.code] = e2), this.gridData = e2;
+  const t2 = R.get(this.code);
+  t2.gridData = e2, R.set(this.code, t2), this.parentFormData && (this.parentFormData[this.code] = e2), this.gridData = e2;
 }, refresPortData(e2, t2, i2) {
   this.gridData[i2] && (this.gridData[i2][e2] = t2, this.$forceUpdate());
 }, refresPortsData(e2, t2) {
@@ -914,21 +956,21 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
   }
   return this.checkStrictly && (a2.checkStrictly = true), a2;
 }, refreshSubTableData(e2) {
-  const t2 = k.get(this.code);
-  t2.subTableData = e2, k.set(this.code, t2), this.subTableData = e2;
+  const t2 = R.get(this.code);
+  t2.subTableData = e2, R.set(this.code, t2), this.subTableData = e2;
 }, refreshList() {
   this.fetchData(this.getSearchParam());
 }, selectRecord(e2, t2) {
   var _a;
   this.selectionTableData = t2;
   let i2 = true;
-  const o2 = k.get(this.code);
-  C("selectRecord", this.code) && (i2 = o2.options.selectRecord.call(this, { gridData: this.isSubTableShowPage ? this.subTableData : this.gridData, columns: o2.columns, superGrid: this.$refs.superGrid, pageGridData: this.isSubTableShowPage ? this.gridData : null, additionalParamMap: o2.additionalParamMap, selection: e2, row: t2, parentFormData: this.parentFormData, pageContext: this.pageContext, configureObj: this.configureObj }), void 0 !== i2 && false === i2 && ((_a = this.$refs.superGrid) == null ? void 0 : _a.toggleRowSelection(t2, false))), this.select(e2, t2);
+  const o2 = R.get(this.code);
+  S("selectRecord", this.code) && (i2 = o2.options.selectRecord.call(this, { gridData: this.isSubTableShowPage ? this.subTableData : this.gridData, columns: o2.columns, superGrid: this.$refs.superGrid, pageGridData: this.isSubTableShowPage ? this.gridData : null, additionalParamMap: o2.additionalParamMap, selection: e2, row: t2, parentFormData: this.parentFormData, pageContext: this.pageContext, configureObj: this.configureObj }), void 0 !== i2 && false === i2 && ((_a = this.$refs.superGrid) == null ? void 0 : _a.toggleRowSelection(t2, false))), this.select(e2, t2);
 }, selectAllRecord(e2) {
   var _a;
   let t2 = true;
-  const i2 = k.get(this.code);
-  C("selectAllRecords", this.code) && (t2 = i2.options.selectAllRecords.call(this, { gridData: this.isSubTableShowPage ? this.subTableData : this.gridData, columns: i2.columns, superGrid: this.$refs.superGrid, pageGridData: this.isSubTableShowPage ? this.gridData : null, additionalParamMap: i2.additionalParamMap, selection: e2, parentFormData: this.parentFormData, pageContext: this.pageContext, configureObj: this.configureObj }), void 0 !== t2 && false === t2 && ((_a = this.$refs.superGrid) == null ? void 0 : _a.toggleAllSelection())), this.selectAll(e2);
+  const i2 = R.get(this.code);
+  S("selectAllRecords", this.code) && (t2 = i2.options.selectAllRecords.call(this, { gridData: this.isSubTableShowPage ? this.subTableData : this.gridData, columns: i2.columns, superGrid: this.$refs.superGrid, pageGridData: this.isSubTableShowPage ? this.gridData : null, additionalParamMap: i2.additionalParamMap, selection: e2, parentFormData: this.parentFormData, pageContext: this.pageContext, configureObj: this.configureObj }), void 0 !== t2 && false === t2 && ((_a = this.$refs.superGrid) == null ? void 0 : _a.toggleAllSelection())), this.selectAll(e2);
 }, cardSelectionChangeEvent(e2) {
   var _a, _b;
   try {
@@ -943,8 +985,8 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
   this.selectionChangeEvent(e2);
 }, selectionChangeEvent(e2) {
   this.selectionTableData = e2;
-  const t2 = k.get(this.code);
-  C("selectionChange", this.code) && t2.options.selectionChange.call(this, { gridData: this.isSubTableShowPage ? this.subTableData : this.gridData, columns: t2.columns, superGrid: this.$refs.superGrid, pageGridData: this.isSubTableShowPage ? this.gridData : null, additionalParamMap: t2.additionalParamMap, selection: e2, parentFormData: this.parentFormData, pageContext: this.pageContext, configureObj: this.configureObj }), this.selectionChange(e2);
+  const t2 = R.get(this.code);
+  S("selectionChange", this.code) && t2.options.selectionChange.call(this, { gridData: this.isSubTableShowPage ? this.subTableData : this.gridData, columns: t2.columns, superGrid: this.$refs.superGrid, pageGridData: this.isSubTableShowPage ? this.gridData : null, additionalParamMap: t2.additionalParamMap, selection: e2, parentFormData: this.parentFormData, pageContext: this.pageContext, configureObj: this.configureObj }), this.selectionChange(e2);
 }, showMobileSearch() {
   this.isShowMobileSearch, this.isMobile, this.isShowMobileSearch = true, this.$refs.sf && this.$refs.sf.showMobileSearch();
 }, pickFileDone(e2) {
@@ -958,7 +1000,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
 }, closeRowForm() {
   this.showRowForm = false;
 }, filterData() {
-  const e2 = k.get(this.code), t2 = { pageContext: this.pageContext, configureObj: this.configureObj, gridData: this.gridData };
+  const e2 = R.get(this.code), t2 = { pageContext: this.pageContext, configureObj: this.configureObj, gridData: this.gridData };
   return e2.options.filterDataEvent.call(this, t2);
 }, resetAdditionalParamMap(e2, t2) {
   if (this.pageContext && this.pageContext.entity) {
@@ -983,7 +1025,7 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
   var _a, _b;
   try {
     const i2 = this.getComponentType(e2);
-    return { column: e2, getComponentType: this.getComponentType, customFormat: t2, $bind: { column: e2, ref: e2.prop, "is-sql": this.isSql, "list-code": this.code, "new-width": this.newWidth, "drag-column-prop": this.dragColumnProp, "right-click-menu-arr": (_a = this.options) == null ? void 0 : _a.rightClickMenuArr, "table-name": this.tableName, "page-code": this.pageCode, "list-name": this.listName, options: this.options, "current-page": this.currentPage, pagination: this.pagination, "is-data-children": this.tableDatas.some((e3) => Array.isArray(e3 == null ? void 0 : e3.children)), "grid-data": this.isSubTableShowPage ? this.subTableData : this.gridData, "page-grid-data": this.isSubTableShowPage ? this.getSubTableGridData(this.subTableData) : this.gridData, ...t2 ? { "custom-format": ["GroupColumn"].includes(i2) ? t2 : t2[e2.prop] } : { "is-line-edit": ((_b = this.lineEdit) == null ? void 0 : _b.editable) ?? false, "list-toolbar-form-data": this.listToolbarFormData } }, $on: { "open-page": this.openPageDialog, refresData: this.refresData, "refresh-list": this.refreshList, refresPortData: this.refresPortData, refresPortsData: this.refresPortsData, refresMainTableFields: this.refresMainTableFields, prohibitToEdit: this.prohibitToEdit, batchDeleteSubTableRow: this.batchDeleteSubTableRow } };
+    return { column: e2, getComponentType: this.getComponentType, customFormat: t2, $bind: { column: e2, ref: e2.prop, "is-sql": this.isSql, "list-code": this.code, "new-width": this.newWidth, "drag-column-prop": this.dragColumnProp, "right-click-menu-arr": (_a = this.options) == null ? void 0 : _a.rightClickMenuArr, "table-name": this.tableName, "page-code": this.pageCode, "list-name": this.listName, options: this.options, "current-page": this.currentPage, pagination: this.pagination, "grid-data": this.isFormSubTable ? this.isSubSearch ? this.subTableDataSearch : this.subTableData : this.gridData, ...t2 ? { "custom-format": ["GroupColumn"].includes(i2) ? t2 : t2[e2.prop] } : { "is-line-edit": ((_b = this.lineEdit) == null ? void 0 : _b.editable) ?? false, "list-toolbar-form-data": this.listToolbarFormData } }, $on: { "open-page": this.openPageDialog, refresData: this.refresData, "refresh-list": this.refreshList, refresPortData: this.refresPortData, refresPortsData: this.refresPortsData, refresMainTableFields: this.refresMainTableFields, prohibitToEdit: this.prohibitToEdit, batchDeleteSubTableRow: this.batchDeleteSubTableRow } };
   } catch (t3) {
     return console.error(t3), { column: e2 };
   }
@@ -1041,12 +1083,32 @@ const pe = { components: { IndexColumn: o, SelectionColumn: a, NormalColumn: s,
       a2 && (o2[a2.label] = e3[t3]);
     }), t2.push(o2);
   }), t2;
-}, rowDoFormat: (e2, t2) => J(e2, t2) }, emits: ["change-grid-data", "change-rows-per-page", "set-select-options", "setSearchType", "sort-change", "changeHederWidth", "header-click", "un-edit", "refresMainTableFields", "refresh", "cancel-search", "changeOperationAddState"] }, ue = { key: 2, class: "super-grid-main-table-footer-view" }, ge = { class: "yx-flex-wrap", style: { gap: "10px" } }, me = ["title"], be = ["title"];
-const fe = ce(pe, [["render", function(e2, t2, i2, o2, a2, s2) {
-  var _a, _b, _c;
-  const r2 = U("search-form"), n2 = U("search-form-dialog"), l2 = U("MobileCard"), h2 = U("row-detail"), d2 = U("el-table"), c2 = U("el-icon-setting"), p2 = U("el-icon-refresh"), u2 = U("el-pagination"), g2 = U("columns-config"), m2 = U("header-context-menu"), b2 = U("row-form"), f2 = W("resize");
-  return K((Q(), X("div", { "data-v": "1.0.0", class: "super-grid-main-view", style: Y(a2.subTableStyle), onClick: t2[9] || (t2[9] = (...t3) => e2.onClickTableMain && e2.onClickTableMain(...t3)) }, [!a2.isFormSubTable && a2.hasLoadedColumns && a2.query && "embedded" === a2.query.showType ? K((Q(), Z(r2, { key: 0, ref: "sf", columns: a2.columns, code: i2.code, url: i2.url, pagination: a2.pagination, query: a2.query, "search-form-info": i2.searchFormInfo, "search-param": a2.searchFormContent, "init-search-props": a2.initSearchProps, "list-toolbar-form-data": i2.listToolbarFormData, "load-complete-query": a2.loadCompleteQuery, class: "super-grid-main-search-view", onSearch: s2.doSearch, onReset: s2.resetSearch, onOpenFold: s2.openFold, onCanShowMobileSearch: t2[0] || (t2[0] = (t3) => e2.$emit("can-show-mobile-search", i2.code)), onCloseMobileSearch: t2[1] || (t2[1] = (e3) => a2.isShowMobileSearch = false) }, null, 8, ["columns", "code", "url", "pagination", "query", "search-form-info", "search-param", "init-search-props", "list-toolbar-form-data", "load-complete-query", "onSearch", "onReset", "onOpenFold"])), [[ee, !a2.isMobile || a2.isMobile && a2.isShowMobileSearch]]) : te("", true), a2.hasLoadedColumns && a2.query && "popup" === a2.query.showType ? (Q(), Z(n2, { key: 1, ref: "sfDialog", columns: a2.columns, code: i2.code, url: i2.url, pagination: a2.pagination, query: a2.query, "search-param": a2.searchFormContent, "init-search-props": a2.initSearchProps, onSearch: s2.doSearchDialog, onReset: s2.resetSearch, onClose: s2.closeSearchFormDialog }, null, 8, ["columns", "code", "url", "pagination", "query", "search-param", "init-search-props", "onSearch", "onReset", "onClose"])) : te("", true), ie("div", { ref: "superGridMain", class: oe(["grid-area " + i2.code, "super-grid-main-body"]) }, [s2.isShowCard ? (Q(), Z(l2, { key: 0, selection: a2.selectionTableData, columns: s2.visibleColumns, listCode: i2.code, getColumnComponentData: s2.getColumnComponentData, data: s2.tableDatas, "current-page": a2.currentPage, "onUpdate:currentPage": t2[2] || (t2[2] = (e3) => a2.currentPage = e3), "page-size": (_b = (_a = a2.pagination) == null ? void 0 : _a.pageSizes) == null ? void 0 : _b[0], "page-total": (_c = a2.pagination) == null ? void 0 : _c.total, class: "super-grid-main-card-view", onSelect: s2.selectRecord, onSelectionChange: s2.cardSelectionChangeEvent, onCurrentChange: s2.handleCurrentChange, onRowClick: s2.rowClickEvent, onRowDblclick: s2.rowDblclickEvent }, null, 8, ["selection", "columns", "listCode", "getColumnComponentData", "data", "current-page", "page-size", "page-total", "onSelect", "onSelectionChange", "onCurrentChange", "onRowClick", "onRowDblclick"])) : a2.refreshGrid && a2.hasLoadedColumns && !s2.isShowCard ? (Q(), Z(d2, { key: 1, ref: "superGrid", data: s2.tableDatas, "row-key": s2.getRowKeyProp, "show-summary": s2.showSummary, "summary-method": s2.getSummaries, style: Y(a2.tableStyle), stripe: a2.stripe, border: true, "default-expand-all": a2.defaultExpandAll, lazy: a2.isLazy, load: s2.loadChildren, "row-style": s2.changeRowStyle, "cell-style": s2.changeCellStyle, "header-cell-style": s2.changeHeaderStyle, "highlight-current-row": true, "span-method": s2.rowSpan, "max-height": s2.hasMaxHeight, height: s2.hasTableHeight, class: oe([a2.tableClass, "super-grid-main-table-view"]), "tree-props": s2.getTreeProps(a2.parentProp, a2.isSql, a2.isLazy, a2.dataSourceType), "scrollbar-always-on": s2.scrollbarAlwaysOn, onSortChange: s2.handleSortChange, onSelect: s2.selectRecord, onSelectAll: s2.selectAllRecord, onSelectionChange: s2.selectionChangeEvent, onRowClick: s2.rowClickEvent, onRowDblclick: s2.rowDblclickEvent, onExpandChange: s2.expandChange, onHeaderClick: s2.headerClickEvent, onHeaderDragend: s2.changeHederWidth, onHeaderContextmenu: s2.headerContextmenu, onCellClick: s2.selectCell, onCellDblclick: e2.cellDblClick }, { default: ae(() => [a2.detailColumn ? (Q(), Z(h2, { key: 0, column: a2.detailColumn, "list-code": i2.code, onShowDetail: s2.openRowForm }, null, 8, ["column", "list-code", "onShowDetail"])) : te("", true), (Q(true), X(se, null, re(s2.visibleColumnsComponentData, ({ column: e3, ...t3 }, i3) => (Q(), Z(ne(s2.getComponentType(e3)), le({ ref_for: true, ref: e3.prop, key: e3.label + i3 }, t3.$bind, he(t3.$on)), null, 16))), 128))]), _: 1 }, 8, ["data", "row-key", "show-summary", "summary-method", "style", "stripe", "default-expand-all", "lazy", "load", "row-style", "cell-style", "header-cell-style", "span-method", "max-height", "height", "class", "tree-props", "scrollbar-always-on", "onSortChange", "onSelect", "onSelectAll", "onSelectionChange", "onRowClick", "onRowDblclick", "onExpandChange", "onHeaderClick", "onHeaderDragend", "onHeaderContextmenu", "onCellClick", "onCellDblclick"])) : te("", true), i2.showPagination && !s2.isShowCard ? (Q(), X("div", ue, [ie("div", ge, [a2.basicInfo.customConfig && !a2.isFormSubTable ? (Q(), X("div", { key: 0, class: "el-icon-setting", title: e2.$t("superGrid.columnConfig"), onClick: t2[3] || (t2[3] = (...e3) => s2.configColumns && s2.configColumns(...e3)) }, [de(c2, { style: { width: "16px", height: "16px", color: "#777", cursor: "pointer" } })], 8, me)) : te("", true), a2.isFormSubTable ? te("", true) : (Q(), X("div", { key: 1, class: "el-icon-refresh", title: e2.$t("superGrid.refresh"), onClick: t2[4] || (t2[4] = (...e3) => s2.refreshGridData && s2.refreshGridData(...e3)) }, [de(p2, { style: { width: "16px", height: "16px", color: "#777", cursor: "pointer" } })], 8, be))]), a2.pagination && a2.isShowPage ? (Q(), Z(u2, { key: 0, "current-page": a2.currentPage, "onUpdate:currentPage": t2[5] || (t2[5] = (e3) => a2.currentPage = e3), "page-size": a2.pagination.pageSize, "onUpdate:pageSize": t2[6] || (t2[6] = (e3) => a2.pagination.pageSize = e3), background: "", "page-sizes": a2.pagination.pageSizes, layout: a2.pagination.layout, total: a2.pagination.showTotal ? void 0 !== a2.pagination.total && "" !== a2.pagination.total && null !== a2.pagination.total ? a2.pagination.total : 0 : 1e11, onSizeChange: s2.handleSizeChange, onCurrentChange: s2.handleCurrentChange }, null, 8, ["current-page", "page-size", "page-sizes", "layout", "total", "onSizeChange", "onCurrentChange"])) : te("", true)])) : te("", true)], 2), a2.showColumnConfig ? (Q(), Z(g2, { key: 2, "visible-columns": s2.visibleColumns, "list-code": i2.code, "is-sql": a2.isSql, onClose: t2[7] || (t2[7] = (e3) => s2.closeCustomConfig(e3)), onReset: t2[8] || (t2[8] = (e3) => s2.resetCustomConfig(e3)) }, null, 8, ["visible-columns", "list-code", "is-sql"])) : te("", true), a2.showHeaderContextmenu ? (Q(), Z(m2, { key: 3, ref: "headerMenu", "buttom-arr": i2.options.rightClickMenuArr, column: a2.rightClickColumn, onClearHeaderContextmenu: s2.clearHeaderContextmenu }, null, 8, ["buttom-arr", "column", "onClearHeaderContextmenu"])) : te("", true), a2.showRowForm ? (Q(), Z(b2, { key: 4, "parent-form-data": a2.parentFormData, columns: s2.visibleColumns, "row-index": a2.currentEditRowIndex, "list-code": i2.code, "drag-column-prop": a2.dragColumnProp, "is-sql": a2.isSql, "base-url": a2.baseURL, options: i2.options, "table-name": a2.tableName, "page-code": a2.pageCode, "list-toolbar-form-data": i2.listToolbarFormData, "list-name": a2.listName, "current-page": a2.currentPage, "grid-data": a2.isSubTableShowPage ? a2.subTableData : a2.gridData, "page-grid-data": a2.isSubTableShowPage ? s2.getSubTableGridData(a2.subTableData) : a2.gridData, "line-edit": a2.lineEdit, "show-page": a2.pagination && a2.isShowPage, "page-size": a2.pagination ? a2.pagination.pageSize : null, onClose: s2.closeRowForm, onRefresData: s2.refresData, onRefresPortData: s2.refresPortData, onRefresPortsData: s2.refresPortsData, onRefresMainTableFields: s2.refresMainTableFields, onOpenPage: s2.openPageDialog, onProhibitToEdit: s2.prohibitToEdit, onRefreshList: s2.refreshList }, null, 8, ["parent-form-data", "columns", "row-index", "list-code", "drag-column-prop", "is-sql", "base-url", "options", "table-name", "page-code", "list-toolbar-form-data", "list-name", "current-page", "grid-data", "page-grid-data", "line-edit", "show-page", "page-size", "onClose", "onRefresData", "onRefresPortData", "onRefresPortsData", "onRefresMainTableFields", "onOpenPage", "onProhibitToEdit", "onRefreshList"])) : te("", true)], 4)), [[f2, s2.onResize]]);
-}], ["__scopeId", "data-v-2eb1c8ec"]]);
+}, rowDoFormat: (e2, t2) => W(e2, t2), showSubTableSearch() {
+  this.isMobile ? this.showMobileSearch() : (this.showSubTableSearchDialog = true, this.$refs.sfDialog && this.$refs.sfDialog.showSubTableSearchDialog());
+}, sortChangeColumn(e2) {
+  if (e2 && this.orderColumns) {
+    const t2 = this.orderColumns.filter((t3) => t3.prop && t3.prop === e2);
+    t2 && t2.length > 0 && (this.orderColumn = t2[0]), e2 && this.orderType && this.sortChangeFunc(e2, this.orderType);
+  } else
+    this.orderColumn = null;
+}, sortChangeType(e2) {
+  this.orderField && e2 && this.sortChangeFunc(this.orderField, e2);
+}, sortChangeFunc(e2, t2) {
+  if (e2 && t2)
+    if (this.sortInfo = [{ prop: e2, order: t2 }], this.isFormSubTable) {
+      let e3;
+      e3 = this.isSubSearch ? this.subTableDataSearch : this.subTableData;
+      const t3 = R.get(this.code);
+      let i2 = [];
+      void 0 !== t3.searchForm && (i2 = t3.searchForm), this.searchSubTable(e3, i2, this.isSubSearch, t3);
+    } else
+      this.search(null, true);
+} }, emits: ["change-grid-data", "change-rows-per-page", "set-select-options", "setSearchType", "sort-change", "changeHederWidth", "header-click", "un-edit", "refresMainTableFields", "refresh", "cancel-search", "changeOperationAddState"] }, fe = { class: "yx-flex-wrap", justify: "space-between" }, Se = { style: { flex: "'1 1 auto'", width: "60px" } }, Ce = { key: 0, class: "yx-flex-wrap" }, we = { key: 2, class: "super-grid-main-table-footer-view" }, De = { class: "yx-flex-wrap", style: { gap: "10px" } }, ye = { key: 0, style: { width: "16px", height: "16px" } }, Te = ["title"], Pe = ["title"];
+const ve = me(be, [["render", function(e2, t2, i2, o2, a2, s2) {
+  var _a, _b, _c, _d;
+  const r2 = K("search-form"), n2 = K("el-button"), l2 = K("el-option"), h2 = K("el-select"), d2 = K("search-form-dialog"), c2 = K("MobileCard"), p2 = K("row-detail"), u2 = K("el-table"), g2 = K("el-icon-setting"), m2 = K("el-icon-refresh"), b2 = K("el-pagination"), f2 = K("columns-config"), S2 = K("header-context-menu"), C2 = K("row-form"), w2 = Q("resize");
+  return X((Y(), Z("div", { "data-v": "1.0.0", class: "super-grid-main-view", style: ee(a2.subTableStyle), onClick: t2[11] || (t2[11] = (...t3) => e2.onClickTableMain && e2.onClickTableMain(...t3)) }, [(a2.isFormSubTable && a2.isMobile && a2.isHasSearchColumn && a2.query && ("embedded" === a2.query.showType || "popup" === a2.query.showType) || !a2.isFormSubTable && a2.query && "embedded" === a2.query.showType) && a2.hasLoadedColumns ? X((Y(), te(r2, { key: 0, ref: "sf", columns: a2.columns, code: i2.code, url: i2.url, pagination: a2.pagination, query: a2.query, "search-form-info": i2.searchFormInfo, "search-param": a2.searchFormContent, "init-search-props": a2.initSearchProps, "list-toolbar-form-data": i2.listToolbarFormData, "load-complete-query": a2.loadCompleteQuery, class: "super-grid-main-search-view", onSearch: s2.doSearch, onReset: s2.resetSearch, onOpenFold: s2.openFold, onCanShowMobileSearch: t2[0] || (t2[0] = (t3) => e2.$emit("can-show-mobile-search", i2.code)), onCloseMobileSearch: t2[1] || (t2[1] = (e3) => a2.isShowMobileSearch = false) }, null, 8, ["columns", "code", "url", "pagination", "query", "search-form-info", "search-param", "init-search-props", "list-toolbar-form-data", "load-complete-query", "onSearch", "onReset", "onOpenFold"])), [[ie, !a2.isMobile || a2.isMobile && a2.isShowMobileSearch]]) : oe("", true), ae("div", fe, [ae("div", Se, [a2.isFormSubTable && a2.isHasSearchColumn && a2.query && ("embedded" === a2.query.showType || "popup" === a2.query.showType) ? (Y(), te(n2, { key: 0, size: "small", onClick: s2.showSubTableSearch }, { default: se(() => [re(ne(e2.$t("imatrixUIMessage.search")), 1)]), _: 1 }, 8, ["onClick"])) : oe("", true)]), a2.isMobile && a2.orderColumns.length > 0 ? (Y(), Z("div", Ce, [le(h2, { style: { width: "120px", "padding-right": "10px" }, placeholder: e2.$t("superGrid.orderField"), clearable: "", filterable: "", modelValue: a2.orderField, "onUpdate:modelValue": t2[2] || (t2[2] = (e3) => a2.orderField = e3), onChange: s2.sortChangeColumn }, { default: se(() => [(Y(true), Z(he, null, de(a2.orderColumns, (e3) => (Y(), te(l2, { key: e3.prop, value: e3.prop, label: s2.getColumnLabel(e3) }, null, 8, ["value", "label"]))), 128))]), _: 1 }, 8, ["placeholder", "modelValue", "onChange"]), le(h2, { style: { width: "120px" }, placeholder: e2.$t("superGrid.orderType"), clearable: "", modelValue: a2.orderType, "onUpdate:modelValue": t2[3] || (t2[3] = (e3) => a2.orderType = e3), onChange: s2.sortChangeType }, { default: se(() => [le(l2, { value: "ascending", label: e2.$t("superGrid.orderTypeAsc") }, null, 8, ["label"]), le(l2, { value: "descending", label: e2.$t("superGrid.orderTypeDesc") }, null, 8, ["label"])]), _: 1 }, 8, ["placeholder", "modelValue", "onChange"])])) : oe("", true)]), a2.hasLoadedColumns ? (Y(), te(d2, { key: 1, ref: "sfDialog", columns: a2.columns, code: i2.code, url: i2.url, pagination: a2.pagination, query: a2.query, "search-form-info": i2.searchFormInfo, "search-param": a2.searchFormContent, "init-search-props": a2.initSearchProps, "list-toolbar-form-data": i2.listToolbarFormData, "load-complete-query": a2.loadCompleteQuery, onSearch: s2.doSearchDialog, onReset: s2.resetSearch, onClose: s2.closeSearchFormDialog }, null, 8, ["columns", "code", "url", "pagination", "query", "search-form-info", "search-param", "init-search-props", "list-toolbar-form-data", "load-complete-query", "onSearch", "onReset", "onClose"])) : oe("", true), ae("div", { ref: "superGridMain", class: ce(["grid-area " + i2.code, "super-grid-main-body"]) }, [s2.isShowCard ? (Y(), te(c2, { key: 0, selection: a2.selectionTableData, columns: s2.visibleColumns, listCode: i2.code, getColumnComponentData: s2.getColumnComponentData, data: s2.tableDatas, isEnableEdit: (_a = a2.lineEdit) == null ? void 0 : _a.editable, "current-page": a2.currentPage, "onUpdate:currentPage": t2[4] || (t2[4] = (e3) => a2.currentPage = e3), "page-size": (_c = (_b = a2.pagination) == null ? void 0 : _b.pageSizes) == null ? void 0 : _c[0], "page-total": (_d = a2.pagination) == null ? void 0 : _d.total, class: "super-grid-main-card-view", onSelect: s2.selectRecord, onSelectionChange: s2.cardSelectionChangeEvent, onCurrentChange: s2.handleCurrentChange, onRowClick: s2.rowClickEvent, onRowDblclick: s2.rowDblclickEvent }, null, 8, ["selection", "columns", "listCode", "getColumnComponentData", "data", "isEnableEdit", "current-page", "page-size", "page-total", "onSelect", "onSelectionChange", "onCurrentChange", "onRowClick", "onRowDblclick"])) : a2.refreshGrid && a2.hasLoadedColumns && !s2.isShowCard ? (Y(), te(u2, { key: 1, ref: "superGrid", data: s2.tableDatas, "row-key": s2.getRowKeyProp, "show-summary": s2.showSummary, "summary-method": s2.getSummaries, style: ee(a2.tableStyle), stripe: a2.stripe, border: true, "default-expand-all": a2.defaultExpandAll, lazy: a2.isLazy, load: s2.loadChildren, "row-style": s2.changeRowStyle, "cell-style": s2.changeCellStyle, "header-cell-style": s2.changeHeaderStyle, "highlight-current-row": true, "span-method": s2.rowSpan, "max-height": s2.hasMaxHeight, height: s2.hasTableHeight, class: ce([a2.tableClass, "super-grid-main-table-view"]), "tree-props": s2.getTreeProps(a2.parentProp, a2.isSql, a2.isLazy, a2.dataSourceType), "scrollbar-always-on": s2.scrollbarAlwaysOn, onSortChange: s2.handleSortChange, onSelect: s2.selectRecord, onSelectAll: s2.selectAllRecord, onSelectionChange: s2.selectionChangeEvent, onRowClick: s2.rowClickEvent, onRowDblclick: s2.rowDblclickEvent, onExpandChange: s2.expandChange, onHeaderClick: s2.headerClickEvent, onHeaderDragend: s2.changeHederWidth, onHeaderContextmenu: s2.headerContextmenu, onCellClick: s2.selectCell, onCellDblclick: e2.cellDblClick }, { default: se(() => [a2.detailColumn ? (Y(), te(p2, { key: 0, column: a2.detailColumn, "list-code": i2.code, onShowDetail: s2.openRowForm }, null, 8, ["column", "list-code", "onShowDetail"])) : oe("", true), (Y(true), Z(he, null, de(s2.visibleColumnsComponentData, ({ column: e3, ...t3 }, i3) => (Y(), te(pe(s2.getComponentType(e3)), ue({ ref_for: true, ref: e3.prop, key: e3.label + i3 }, t3.$bind, ge(t3.$on)), null, 16))), 128))]), _: 1 }, 8, ["data", "row-key", "show-summary", "summary-method", "style", "stripe", "default-expand-all", "lazy", "load", "row-style", "cell-style", "header-cell-style", "span-method", "max-height", "height", "class", "tree-props", "scrollbar-always-on", "onSortChange", "onSelect", "onSelectAll", "onSelectionChange", "onRowClick", "onRowDblclick", "onExpandChange", "onHeaderClick", "onHeaderDragend", "onHeaderContextmenu", "onCellClick", "onCellDblclick"])) : oe("", true), i2.showPagination && !s2.isShowCard ? (Y(), Z("div", we, [ae("div", De, [a2.isFormSubTable && a2.pagination && a2.isShowPage ? (Y(), Z("div", ye)) : oe("", true), a2.basicInfo.customConfig && !a2.isFormSubTable ? (Y(), Z("div", { key: 1, class: "el-icon-setting", title: e2.$t("superGrid.columnConfig"), onClick: t2[5] || (t2[5] = (...e3) => s2.configColumns && s2.configColumns(...e3)) }, [le(g2, { style: { width: "16px", height: "16px", color: "#777", cursor: "pointer" } })], 8, Te)) : oe("", true), a2.isFormSubTable ? oe("", true) : (Y(), Z("div", { key: 2, class: "el-icon-refresh", title: e2.$t("superGrid.refresh"), onClick: t2[6] || (t2[6] = (...e3) => s2.refreshGridData && s2.refreshGridData(...e3)) }, [le(m2, { style: { width: "16px", height: "16px", color: "#777", cursor: "pointer" } })], 8, Pe))]), a2.pagination && a2.isShowPage ? (Y(), te(b2, { key: 0, "current-page": a2.currentPage, "onUpdate:currentPage": t2[7] || (t2[7] = (e3) => a2.currentPage = e3), "page-size": a2.pagination.pageSize, "onUpdate:pageSize": t2[8] || (t2[8] = (e3) => a2.pagination.pageSize = e3), background: "", "page-sizes": a2.pagination.pageSizes, layout: a2.pagination.layout, total: a2.pagination.showTotal ? void 0 !== a2.pagination.total && "" !== a2.pagination.total && null !== a2.pagination.total ? a2.pagination.total : 0 : 1e11, onSizeChange: s2.handleSizeChange, onCurrentChange: s2.handleCurrentChange }, null, 8, ["current-page", "page-size", "page-sizes", "layout", "total", "onSizeChange", "onCurrentChange"])) : oe("", true)])) : oe("", true)], 2), a2.showColumnConfig ? (Y(), te(f2, { key: 2, "visible-columns": s2.visibleColumns, "list-code": i2.code, "is-sql": a2.isSql, onClose: t2[9] || (t2[9] = (e3) => s2.closeCustomConfig(e3)), onReset: t2[10] || (t2[10] = (e3) => s2.resetCustomConfig(e3)) }, null, 8, ["visible-columns", "list-code", "is-sql"])) : oe("", true), a2.showHeaderContextmenu ? (Y(), te(S2, { key: 3, ref: "headerMenu", "buttom-arr": i2.options.rightClickMenuArr, column: a2.rightClickColumn, onClearHeaderContextmenu: s2.clearHeaderContextmenu }, null, 8, ["buttom-arr", "column", "onClearHeaderContextmenu"])) : oe("", true), a2.showRowForm ? (Y(), te(C2, { key: 4, "parent-form-data": a2.parentFormData, columns: s2.visibleColumns, "row-index": a2.currentEditRowIndex, "list-code": i2.code, "drag-column-prop": a2.dragColumnProp, "is-sql": a2.isSql, "base-url": a2.baseURL, options: i2.options, "table-name": a2.tableName, "page-code": a2.pageCode, "list-toolbar-form-data": i2.listToolbarFormData, "list-name": a2.listName, "current-page": a2.currentPage, "grid-data": a2.isSubTableShowPage ? a2.subTableData : a2.gridData, "page-grid-data": a2.isSubTableShowPage ? s2.getSubTableGridData(a2.subTableData) : a2.gridData, "line-edit": a2.lineEdit, "show-page": a2.pagination && a2.isShowPage, "page-size": a2.pagination ? a2.pagination.pageSize : null, onClose: s2.closeRowForm, onRefresData: s2.refresData, onRefresPortData: s2.refresPortData, onRefresPortsData: s2.refresPortsData, onRefresMainTableFields: s2.refresMainTableFields, onOpenPage: s2.openPageDialog, onProhibitToEdit: s2.prohibitToEdit, onRefreshList: s2.refreshList }, null, 8, ["parent-form-data", "columns", "row-index", "list-code", "drag-column-prop", "is-sql", "base-url", "options", "table-name", "page-code", "list-toolbar-form-data", "list-name", "current-page", "grid-data", "page-grid-data", "line-edit", "show-page", "page-size", "onClose", "onRefresData", "onRefresPortData", "onRefresPortsData", "onRefresMainTableFields", "onOpenPage", "onProhibitToEdit", "onRefreshList"])) : oe("", true)], 4)), [[w2, s2.onResize]]);
+}], ["__scopeId", "data-v-664b8a45"]]);
 export {
-  fe as default
+  ve as default
 };