super-page-runtime 2.2.6 → 2.2.11

package/dist/es/components/runtime/utils/events/standard-event.js

@@ -494,7 +494,9 @@ function G(e2, s2) {
   f2.append("additionalParamMapStr", JSON.stringify(v2));
   const M2 = void 0 === p2.isPermission || "true" === p2.isPermission || p2.isPermission;
   f2.append("isPermission", M2 + "");
-  const R2 = i2.systemCode, S2 = i2.backendUrl;
+  const R2 = i2.systemCode;
+  R2 && f2.append("systemCode", R2);
+  const S2 = i2.backendUrl;
   let I2 = n(S2, i2.isTest) + "/dsc/commons/import-data";
   I2 = o(I2, R2, S2, i2.isTest), c.post(I2, f2).then((e3) => {
     if (h2) l({ showClose: true, type: "success", message: u().t("superPageRuntimeMessage.asyncImport") });

package/dist/es/components/runtime/utils/page-helper-util.js

@@ -67,7 +67,7 @@ function updateChartDatasources(t, e, o, n) {
     s.forEach((e2) => {
       const o2 = e2.services;
       if (o2 && o2.length > 0) {
-        let e3 = o2[0].serviceInputs;
+        const e3 = o2[0].serviceInputs;
         e3 && (o2[0].serviceInParams = {}, e3.forEach((e4) => {
           const n2 = e4.name, a2 = e4.value;
           o2[0].serviceInParams[n2] = getValueFromVariable(t.entity, a2);
@@ -79,7 +79,7 @@ function updateChartDatasources(t, e, o, n) {
     const l = {};
     i.task && Object.assign(l, i.task);
     const c = { entityMap: i.data, additionalParamMap: u, taskMap: l, dataSourceList: s, systemCode: t.systemCode, pageCode: t.code }, p = t.backendUrl, f = getBaseUrl(p, t.isTest) + "/common/common-data/find-chart-datas";
-    http.post(f, c).then((e2) => {
+    http.post(f, c, { headers: { customSystem: t.systemCode } }).then((e2) => {
       var _a, _b;
       t.chartDataSourceMap || (t.chartDataSourceMap = {});
       for (const o2 in e2) {

package/dist/es/components/runtime/views/assemblys/chart/table/chart-table-util.js

@@ -3,40 +3,40 @@ import { getCustomFunc } from "../../../../utils/events/event-util.js";
 import { getMinValue, getMaxValue, getSumValue, getAvgValue } from "../../../../utils/charts/chart-util.js";
 class ExpressionEvaluator {
   static evaluate(e, t, o) {
-    const a = t.map((t2) => this.createExpression(e, t2, o)).join(" ");
-    return this.evaluateExpression(a);
+    const r = t.map((t2) => this.createExpression(e, t2, o)).join(" ");
+    return this.evaluateExpression(r);
   }
   static createExpression(e, t, o) {
-    const { propName: a, operator: r, propValue: n, leftBracket: s, rightBracket: l, joinSign: i, dataType: c } = t;
-    if (!a || "" === a) return "";
-    const u = getValueFromVariable(e.entity, a, o);
-    let p = `${s} ${this.getComparisonExpression(u, r, getValueFromVariable(e.entity, n, o), c)} ${l}`;
+    const { propName: r, operator: a, propValue: n, leftBracket: s, rightBracket: l, joinSign: i, dataType: c } = t;
+    if (!r || "" === r) return "";
+    const u = getValueFromVariable(e.entity, r, o);
+    let p = `${s} ${this.getComparisonExpression(u, a, getValueFromVariable(e.entity, n, o), c)} ${l}`;
     return i && ("and" === i || "AND" === i ? p += "&&" : "or" !== i && "OR" !== i || (p += "||")), p.trim();
   }
-  static getComparisonExpression(e, t, o, a) {
+  static getComparisonExpression(e, t, o, r) {
     t || (t = "EQ");
-    const r = this.parseValue(e, a), n = this.parseValue(o, a);
+    const a = this.parseValue(e, r), n = this.parseValue(o, r);
     switch (t) {
       case "EQ":
-        return `${r} === ${n}`;
+        return `${a} === ${n}`;
       case "GT":
-        return `${r} > ${n}`;
+        return `${a} > ${n}`;
       case "LT":
-        return `${r} < ${n}`;
+        return `${a} < ${n}`;
       case "GET":
-        return `${r} >= ${n}`;
+        return `${a} >= ${n}`;
       case "LET":
-        return `${r} <= ${n}`;
+        return `${a} <= ${n}`;
       case "NET":
-        return `${r} !== ${n}`;
+        return `${a} !== ${n}`;
       case "CONTAIN":
-        return `${r}.includes(${n})`;
+        return `${a}.includes(${n})`;
       case "NOT_CONTAIN":
-        return `!${r}.includes(${n})`;
+        return `!${a}.includes(${n})`;
       case "IS_NULL":
-        return `${r} === null`;
+        return `${a} === null`;
       case "IS_NOT_NULL":
-        return `${r} !== null`;
+        return `${a} !== null`;
       default:
         throw new Error(`比较符号不匹配: ${t}`);
     }
@@ -75,71 +75,75 @@ function getSummaryTitleColumn(e) {
 function getSummaryDataColumn(e, t) {
   var _a;
   const o = {};
-  return ((_a = e.props.summaries) == null ? void 0 : _a.dataColumn) && e.props.summaries.dataColumn.length > 0 && e.props.summaries.dataColumn.forEach((a) => {
+  return ((_a = e.props.summaries) == null ? void 0 : _a.dataColumn) && e.props.summaries.dataColumn.length > 0 && e.props.summaries.dataColumn.forEach((r) => {
     var _a2;
-    const r = (_a2 = e.items) == null ? void 0 : _a2.find((e2) => a.prop === e2.props.base.prop);
-    r && ("table" === t && r.props.base.tableSummary || "group" === t && r.props.base.groupSummary) && (o[a.prop] = a);
+    const a = (_a2 = e.items) == null ? void 0 : _a2.find((e2) => r.prop === e2.props.base.prop);
+    a && ("table" === t && a.props.base.tableSummary || "group" === t && a.props.base.groupSummary) && (o[r.prop] = r);
   }), o;
 }
-function summaryStatistics(e, t, o, a) {
-  let r = "";
+function summaryStatistics(e, t, o, r) {
+  let a = "";
   const n = e.summaryMode, s = t.map((e2) => Number(e2[o])).filter((e2) => !Number.isNaN(e2));
   if (s.length > 0) if ("custom" === n) {
-    const n2 = getCustomFunc(a, e.customFunc);
-    if (n2) {
+    const n2 = getCustomFunc(r, e.customFunc);
+    if (n2) try {
       const e2 = n2.apply(n2, [{ data: t, prop: o }]);
-      r = e2 ? ` ${e2}` : " N/A";
-    } else r = " N/A";
+      a = e2 ? ` ${e2}` : " N/A";
+    } catch (e2) {
+    }
+    else a = " N/A";
   } else switch (n) {
     case "sum":
-      r = ` ${s.reduce((e2, t2) => e2 + t2, 0)}`;
+      a = ` ${s.reduce((e2, t2) => e2 + t2, 0)}`;
       break;
     case "avg":
-      r = " " + s.reduce((e2, t2) => e2 + t2, 0) / s.length;
+      a = " " + s.reduce((e2, t2) => e2 + t2, 0) / s.length;
       break;
     case "min":
-      r = ` ${Math.min(...s)}`;
+      a = ` ${Math.min(...s)}`;
       break;
     case "max":
-      r = ` ${Math.max(...s)}`;
+      a = ` ${Math.max(...s)}`;
       break;
     default:
-      r = " N/A";
+      a = " N/A";
   }
-  else r = " N/A";
-  return r;
+  else a = " N/A";
+  return a;
 }
 function replacePlaceholders(e, t) {
   if (e) return e.replace(/\$\{row\.(\w+)\}/g, (e2, o) => Object.prototype.hasOwnProperty.call(t, o) ? t[o] : "");
 }
 function getHeaderCellStyleUtil(e, t, o) {
   var _a;
-  const a = {};
+  const r = {};
   e.column.property && ((_a = t.titleStyle) == null ? void 0 : _a.forEach((t2) => {
     if (t2.field && t2.field.includes(e.column.property)) if (t2.scopeFunc) {
-      const r2 = getCustomFunc(o.pageContext, t2.scopeFunc);
-      if (r2) {
-        false !== r2.apply(r2, [{ item: t2, data: e }]) && copyStyle(a, t2);
+      const a2 = getCustomFunc(o.pageContext, t2.scopeFunc);
+      if (a2) try {
+        false !== a2.apply(a2, [{ item: t2, data: e }]) && copyStyle(r, t2);
+      } catch (e2) {
       }
-    } else copyStyle(a, t2);
+    } else copyStyle(r, t2);
   }));
-  const r = getCellStyleUtil(e, t.cellTitleStyle, o);
-  return r && Object.assign(a, r), a;
+  const a = getCellStyleUtil(e, t.cellTitleStyle, o);
+  return a && Object.assign(r, a), r;
 }
 function getRowStyleUtil(e, t, o) {
-  const a = {};
+  const r = {};
   if (o.configure.style.rowStyle) for (let t2 = 0; t2 < o.configure.style.rowStyle.length; t2++) {
-    const r = o.configure.style.rowStyle[t2];
-    if (r.scopeFunc) {
-      const t3 = getCustomFunc(o.pageContext, r.scopeFunc);
-      if (t3) {
+    const a = o.configure.style.rowStyle[t2];
+    if (a.scopeFunc) {
+      const t3 = getCustomFunc(o.pageContext, a.scopeFunc);
+      if (t3) try {
         const o2 = t3.apply(t3, [{ data: e }]);
-        null != o2 && false !== o2 && copyStyle(a, r);
+        null != o2 && false !== o2 && copyStyle(r, a);
+      } catch (e2) {
       }
-    } else if (r.matchingCondition) {
-      const t3 = ExpressionEvaluator.evaluate(o.pageContext, r.matchingCondition, e.row);
-      (t3 || void 0 === t3) && copyStyle(a, r);
-    } else copyStyle(a, r);
+    } else if (a.matchingCondition) {
+      const t3 = ExpressionEvaluator.evaluate(o.pageContext, a.matchingCondition, e.row);
+      (t3 || void 0 === t3) && copyStyle(r, a);
+    } else copyStyle(r, a);
   }
   if (t && t.length > 0 && -1 !== t.indexOf(e.rowIndex)) {
     const e2 = {};
@@ -148,23 +152,24 @@ function getRowStyleUtil(e, t, o) {
     }
     return 0 === Object.keys(e2).length && (e2["background-color"] = "var(--el-table-row-hover-bg-color)"), e2;
   }
-  return a;
+  return r;
 }
 function getCellStyleUtil(e, t, o) {
-  const a = {};
-  if (t) for (let r = 0; r < t.length; r++) {
-    const n = t[r];
+  const r = {};
+  if (t) for (let a = 0; a < t.length; a++) {
+    const n = t[a];
     if (isSetStyle(n)) if (n.scopeFunc) {
       const t2 = getCustomFunc(o.pageContext, n.scopeFunc);
-      if (t2) {
-        false !== t2.apply(t2, [{ data: e }]) && copyStyle(a, n);
+      if (t2) try {
+        false !== t2.apply(t2, [{ data: e }]) && copyStyle(r, n);
+      } catch (e2) {
       }
     } else if (n.matchingCondition) {
       const t2 = ExpressionEvaluator.evaluate(o.pageContext, n.matchingCondition, e.row);
-      (t2 || void 0 === t2) && copyStyle(a, n);
-    } else copyStyle(a, n);
+      (t2 || void 0 === t2) && copyStyle(r, n);
+    } else copyStyle(r, n);
   }
-  return a;
+  return r;
 }
 function isSetStyle(e) {
   let t;
@@ -174,43 +179,43 @@ function copyStyle(e, t) {
   Object.assign(e, t.style), t.customStyle && Object.assign(e, JSON.parse(t.customStyle));
 }
 function rowDataToColumn(e, t, o) {
-  const a = t.props.dataOrigin.groupField, r = t.props.dataOrigin.rowToColumn.titleColumns, n = t.props.dataOrigin.rowToColumn.dataColumns, s = [], l = {};
-  if (a && a.length > 0) e.forEach((e2) => {
-    const t2 = a.map((t3) => e2[t3]).join("|");
+  const r = t.props.dataOrigin.groupField, a = t.props.dataOrigin.rowToColumn.titleColumns, n = t.props.dataOrigin.rowToColumn.dataColumns, s = [], l = {};
+  if (r && r.length > 0) e.forEach((e2) => {
+    const t2 = r.map((t3) => e2[t3]).join("|");
     if (!l[t2]) {
       const o2 = {};
-      a.forEach((t3) => o2[t3] = e2[t3]), l[t2] = o2, s.push(o2);
+      r.forEach((t3) => o2[t3] = e2[t3]), l[t2] = o2, s.push(o2);
     }
     n.forEach((o2) => {
-      const a2 = `${r.map((t3) => e2[t3]).join("")}${o2}`;
-      l[t2][a2] = e2[o2];
+      const r2 = `${a.map((t3) => e2[t3]).join("")}${o2}`;
+      l[t2][r2] = e2[o2];
     });
   });
   else {
     const t2 = [];
     e.forEach((e2) => {
-      r.forEach((o2) => {
+      a.forEach((o2) => {
         e2[o2] && t2.push(e2[o2]);
       });
     }), n.forEach((t3) => {
-      const a2 = {}, n2 = o.find((e2) => {
+      const r2 = {}, n2 = o.find((e2) => {
         var _a, _b;
         return ((_b = (_a = e2.props) == null ? void 0 : _a.base) == null ? void 0 : _b.prop) === t3;
       });
-      n2 && (a2.$GroupColumn = n2.props.base.name), e.forEach((e2) => {
-        r.forEach((o2) => {
-          const r2 = e2[o2], n3 = e2[t3];
-          a2[r2] = n3;
+      n2 && (r2.$GroupColumn = n2.props.base.name), e.forEach((e2) => {
+        a.forEach((o2) => {
+          const a2 = e2[o2], n3 = e2[t3];
+          r2[a2] = n3;
         });
-      }), s.push(a2);
+      }), s.push(r2);
     });
   }
   return s;
 }
 function colDataToRow(e, t) {
-  const o = t.props.dataOrigin.groupField, a = t.props.dataOrigin.columnToRow.titleColumns, r = t.props.dataOrigin.columnToRow.dataColumns, n = t.props.dataOrigin.columnToRow.transColumns, s = t.props.dataOrigin.columnToRow.dataColumnsMapping;
+  const o = t.props.dataOrigin.groupField, r = t.props.dataOrigin.columnToRow.titleColumns, a = t.props.dataOrigin.columnToRow.dataColumns, n = t.props.dataOrigin.columnToRow.transColumns, s = t.props.dataOrigin.columnToRow.dataColumnsMapping;
   if (0 === e.length) return e;
-  const l = [], i = groupBy(e, o), c = r.reduce((e2, t2) => t2.columns.length > e2.columns.length ? t2 : e2, r[0]), u = r.reduce((e2, t2) => (t2.columns.forEach((o2) => {
+  const l = [], i = groupBy(e, o), c = a.reduce((e2, t2) => t2.columns.length > e2.columns.length ? t2 : e2, a[0]), u = a.reduce((e2, t2) => (t2.columns.forEach((o2) => {
     e2[o2] = t2.prop;
   }), e2), {});
   return i.forEach((e2) => {
@@ -218,31 +223,31 @@ function colDataToRow(e, t) {
       const i2 = c.prop, p = {};
       if (o.forEach((t3) => {
         p[t3] = e2[t3];
-      }), p[i2] = e2[t2], r.length > 1) {
+      }), p[i2] = e2[t2], a.length > 1) {
         const o2 = s.find((e3) => e3.props.includes(t2));
         o2 && o2.props.length > 1 && o2.props.forEach((o3) => {
           o3 !== t2 && u[o3] && (p[u[o3]] = e2[o3]);
         });
       }
-      a.forEach((e3) => {
+      r.forEach((e3) => {
         const o2 = n.filter((t3) => t3.relatedTitle === e3.prop);
-        let a2 = false;
+        let r2 = false;
         o2 && o2.length > 0 && o2.forEach((o3) => {
-          if (o3.columns.includes(t2)) return p[e3.prop] = o3.label, void (a2 = true);
-        }), a2 || (p[e3.prop] = t2);
+          if (o3.columns.includes(t2)) return p[e3.prop] = o3.label, void (r2 = true);
+        }), r2 || (p[e3.prop] = t2);
       }), l.push(p);
     });
   }), l;
 }
 function getColumnToRowTableConfig(e) {
-  const t = e.items, o = e.props.dataOrigin.groupField, a = e.props.dataOrigin.columnToRow.titleColumns, r = e.props.dataOrigin.columnToRow.dataColumns, n = [];
+  const t = e.items, o = e.props.dataOrigin.groupField, r = e.props.dataOrigin.columnToRow.titleColumns, a = e.props.dataOrigin.columnToRow.dataColumns, n = [];
   o && o.length > 0 && o.forEach((e2) => {
     if (t) {
       const o2 = t.find((t2) => t2.props.base.prop === e2);
       o2 && n.push(o2);
     }
   });
-  return [...a, ...r].forEach((e2) => {
+  return [...r, ...a].forEach((e2) => {
     if (t) {
       const o2 = t.find((t2) => t2.props.base.prop === e2);
       o2 ? n.push(o2) : n.push({ uuid: (/* @__PURE__ */ new Date()).getTime(), name: "", props: { base: { prop: e2.prop, name: e2.title, sortable: true, headerAlign: "center", align: "center", fixed: false, visible: true, dataType: "string" }, format: {}, size: { pc: {} } }, style: {}, componentIndex: 0, runtime: { common: { class: "", style: { pc_style: {}, pc_class: "" } } } });
@@ -252,17 +257,17 @@ function getColumnToRowTableConfig(e) {
 function groupBy(e, t) {
   const o = {};
   return e.forEach((e2) => {
-    const a = t.map((t2) => e2[t2]).join("|");
-    o[a] || (o[a] = { ...e2, records: [] }, t.forEach((t2, r) => {
-      o[a][t2] = e2[t2];
-    })), o[a].records.push(e2);
+    const r = t.map((t2) => e2[t2]).join("|");
+    o[r] || (o[r] = { ...e2, records: [] }, t.forEach((t2, a) => {
+      o[r][t2] = e2[t2];
+    })), o[r].records.push(e2);
   }), Object.values(o).map((e2) => ({ ...e2, records: void 0 }));
 }
 function getIndexColumn() {
   return { props: { base: { name: "序号", prop: "$index", columnWidth: 80, sortable: true, visible: true, displayOrder: 1, alignTitle: "center", alignContent: "center" } }, events: [], style: { titleFont: {}, contentFont: {}, width: {}, background: {}, tableCell: [{ type: "", model: "" }], conentPadding: {}, tittlePadding: {}, border: {}, shadow: {}, tittleClass: "" } };
 }
-function getNewColumnConfig(e, t, o, a) {
-  return { uuid: (/* @__PURE__ */ new Date()).getTime(), name: "", props: { base: { prop: e, name: t, displayOrder: o, sortable: true, headerAlign: "center", align: "center", fixed: false, visible: true, dataType: a }, format: {}, size: { pc: {} } }, style: {}, componentIndex: 0, runtime: { common: { class: "", style: { pc_style: {}, pc_class: "" } } } };
+function getNewColumnConfig(e, t, o, r) {
+  return { uuid: (/* @__PURE__ */ new Date()).getTime(), name: "", props: { base: { prop: e, name: t, displayOrder: o, sortable: true, headerAlign: "center", align: "center", fixed: false, visible: true, dataType: r }, format: {}, size: { pc: {} } }, style: {}, componentIndex: 0, runtime: { common: { class: "", style: { pc_style: {}, pc_class: "" } } } };
 }
 function computeFormula(itemConfs, datas, entity) {
   Object.keys(itemConfs).forEach((key) => {
@@ -301,7 +306,7 @@ function computeFormula(itemConfs, datas, entity) {
 function getFieldName(e) {
   return e.substring(6, e.length - 1);
 }
-function formatColContent(e, t, o, a, r) {
+function formatColContent(e, t, o, r, a) {
   const n = e[o.props.base.prop];
   switch (t.type) {
     case "number":
@@ -311,7 +316,7 @@ function formatColContent(e, t, o, a, r) {
     case "percent":
       return formatPercent(n, t);
     case "custom":
-      return formatCustomFunc(e, t, o, a, r);
+      return formatCustomFunc(e, t, o, r, a);
     default:
       return n;
   }
@@ -328,10 +333,14 @@ function formatPercent(e, t) {
   let o = e;
   return o || (o = 0), t.decimalDigit && (o = Number(e).toFixed(t.decimalDigit)), o + " %";
 }
-function formatCustomFunc(e, t, o, a, r) {
-  const n = getCustomFunc(a, t.customFunc);
+function formatCustomFunc(e, t, o, r, a) {
+  const n = getCustomFunc(r, t.customFunc);
   if (n) {
-    return n.apply(n, [{ pageContext: a, configureObj: r, row: e, prop: o.props.base.prop }]);
+    try {
+      return n.apply(n, [{ pageContext: r, configureObj: a, row: e, prop: o.props.base.prop }]);
+    } catch (e2) {
+    }
+    return "";
   }
 }
 export {

package/dist/es/components/runtime/views/assemblys/chart/table/table-runtime.vue2.js

@@ -1,39 +1,54 @@
-import { defineComponent as e, ref as o, onMounted as n, watch as r, resolveComponent as t, createElementBlock as a, openBlock as i, normalizeClass as u, normalizeStyle as p, unref as l, withDirectives as s, createVNode as c, createBlock as g, createCommentVNode as f, vShow as m, withCtx as d, Fragment as h, renderList as v, h as y } from "vue";
+import { defineComponent as e, ref as o, onMounted as n, watch as r, resolveComponent as t, createElementBlock as i, openBlock as a, normalizeClass as u, normalizeStyle as p, unref as l, withDirectives as s, createVNode as c, createBlock as g, createCommentVNode as f, vShow as d, withCtx as m, Fragment as h, renderList as v, h as y } from "vue";
 import C from "../common/common-chart-header.vue.js";
-import { getSizeConfig as b, getChartDatasFromPage as x, getValueFromVariable as O, isPromise as S, setValueForVariableName as w, updateChartDatasourcesByComponent as j, caculateShowCondition as k } from "../../../../utils/page-helper-util.js";
-import { getCustomFunc as E } from "../../../../utils/events/event-util.js";
-import F from "./group-column.vue.js";
-import $ from "./normal-column.vue.js";
-import R from "./table-pageination.vue.js";
-import { getSummaryTitleColumn as H, getSummaryDataColumn as I, rowDataToColumn as T, getColumnToRowTableConfig as _, colDataToRow as z, computeFormula as D, getNewColumnConfig as P, summaryStatistics as G, replacePlaceholders as K, getIndexColumn as N, getHeaderCellStyleUtil as J, getRowStyleUtil as U, getCellStyleUtil as V, formatColContent as A } from "./chart-table-util.js";
-import { deepCopy as L } from "../../../../utils/common-util.js";
+import { getSizeConfig as x, getChartDatasFromPage as b, getValueFromVariable as O, isPromise as w, setValueForVariableName as S, updateChartDatasourcesByComponent as j, caculateShowCondition as E } from "../../../../utils/page-helper-util.js";
+import { getCustomFunc as $ } from "../../../../utils/events/event-util.js";
+import k from "./group-column.vue.js";
+import F from "./normal-column.vue.js";
+import I from "./table-pageination.vue.js";
+import { getSummaryTitleColumn as R, getSummaryDataColumn as H, rowDataToColumn as T, getColumnToRowTableConfig as _, colDataToRow as z, computeFormula as D, getNewColumnConfig as P, summaryStatistics as U, replacePlaceholders as G, getIndexColumn as K, getHeaderCellStyleUtil as N, getRowStyleUtil as J, getCellStyleUtil as L, formatColContent as V } from "./chart-table-util.js";
+import { deepCopy as A } from "../../../../utils/common-util.js";
 const q = e({ __name: "table-runtime", props: { configure: { type: Object, default: () => ({}) }, pageContext: { type: Object, default: () => ({}) } }, setup(e2, { expose: q2 }) {
   var _a;
-  const B = e2, M = B.configure.runtime ? B.configure.runtime : {}, Q = M.style, W = M.class, X = M.dataConfig, Y = M.headerInfo ? M.headerInfo : {}, Z = o(null), ee = o(M.props.isEnableGroupHeader), oe = o([]), ne = o([]), re = o([]), te = o({}), ae = o(false), ie = o({}), ue = o({}), pe = o({}), le = [], se = o({}), ce = o({}), ge = o(null), fe = o(0);
-  let me, de = [];
-  B.configure.props.modelCustom || (ee.value ? re.value = B.configure.props.groupHeaders : ne.value = B.configure.items, (_a = B.configure.items) == null ? void 0 : _a.forEach((e3) => {
-    te.value[e3.uuid] = e3, Object.keys(e3.style).length > 0 && (se.value[e3.props.base.prop] = { cellStyle: e3.style, titleStyle: e3.titleStyle }), e3.formula && "" !== e3.formula.trim() && (ce.value[e3.props.base.prop] = e3.formula);
-  })), ae.value = B.configure.props.base.showSummary, (ae.value || B.configure.props.highOrder.groupField && B.configure.props.highOrder.groupField.length > 0) && (ie.value = H(B.configure), ae.value && (ue.value = I(B.configure, "table")), B.configure.props.highOrder.groupField && B.configure.props.highOrder.groupField.length > 0 && (pe.value = I(B.configure, "group")));
-  let he = b(B.pageContext, B.configure);
+  const B = e2, M = B.configure.runtime ? B.configure.runtime : {}, Q = M.style, W = M.class, X = M.dataConfig, Y = M.headerInfo ? M.headerInfo : {}, Z = o(null), ee = o(M.props.isEnableGroupHeader), oe = o([]), ne = o([]), re = o([]), te = o({}), ie = o(false), ae = o({}), ue = o({}), pe = o({}), le = [], se = o({}), ce = o({}), ge = o(null), fe = o(0);
+  let de, me = [];
+  if (!B.configure.props.modelCustom) {
+    if (ee.value) {
+      const e3 = [];
+      B.configure.props.groupHeaders.forEach((o2) => {
+        o2.parentUuid || e3.push(o2);
+      }), e3.sort((e4, o2) => e4.displayOrder - o2.displayOrder), re.value = e3, function() {
+        if (B.configure.props.base.showIndex) {
+          re.value.unshift({ columnUuid: "$index", displayOrder: 0, isLeaf: true, prop: "$index", titleText: "序号", uuid: "$index" });
+          const e4 = K();
+          e4 && (te.value.$index = e4);
+        }
+      }();
+    } else ne.value = B.configure.items;
+    (_a = B.configure.items) == null ? void 0 : _a.forEach((e3) => {
+      te.value[e3.uuid] = e3, Object.keys(e3.style).length > 0 && (se.value[e3.props.base.prop] = { cellStyle: e3.style, titleStyle: e3.titleStyle }), e3.formula && "" !== e3.formula.trim() && (ce.value[e3.props.base.prop] = e3.formula);
+    });
+  }
+  ie.value = B.configure.props.base.showSummary, (ie.value || B.configure.props.highOrder.groupField && B.configure.props.highOrder.groupField.length > 0) && (ae.value = R(B.configure), ie.value && (ue.value = H(B.configure, "table")), B.configure.props.highOrder.groupField && B.configure.props.highOrder.groupField.length > 0 && (pe.value = H(B.configure, "group")));
+  let he = x(B.pageContext, B.configure);
   function ve() {
     const e3 = B.configure.props.dataOrigin.variable.match(/\${(.*?)}/), o2 = e3 ? e3[1].split(".") : [];
     r(() => o2.reduce((e4, o3) => e4[o3], B.pageContext.entity), (e4) => {
-      e4 ? ye(JSON.parse(JSON.stringify(e4))) : (oe.value = [], B.configure.props.modelCustom ? He(null) : ee.value ? re.value = B.configure.props.groupHeaders : ne.value = B.configure.items);
+      e4 ? ye(JSON.parse(JSON.stringify(e4))) : (oe.value = [], B.configure.props.modelCustom ? Re(null) : ee.value ? re.value = B.configure.props.groupHeaders : ne.value = B.configure.items);
     });
   }
   function ye(e3) {
     e3 || (e3 = []), (e3 = e3.length > 0 ? e3[0] : {}) || (e3 = {}), e3.hasRender ? e3.hasRender = true : (!function(e4) {
-      He(e4), "service" === B.configure.props.dataOrigin.dataSource && e4.result ? de = e4.result[B.configure.props.dataOrigin.service.serviceDataField] : "variable" === B.configure.props.dataOrigin.dataSource && (ve(), de = O(B.pageContext.entity, B.configure.props.dataOrigin.variable));
-      de && Ce(de, e4);
+      Re(e4), "service" === B.configure.props.dataOrigin.dataSource && e4.result ? me = e4.result[B.configure.props.dataOrigin.service.serviceDataField] : "variable" === B.configure.props.dataOrigin.dataSource && (ve(), me = O(B.pageContext.entity, B.configure.props.dataOrigin.variable));
+      me && Ce(me, e4);
     }(e3), e3.hasRender = true, X && (X.autoRefresh = false));
   }
   function Ce(e3, o2) {
     var _a2;
-    if (be("rowToColumn")) {
+    if (xe("rowToColumn")) {
       if (e3 = T(e3, B.configure, ne.value), !ee.value) {
         const o3 = function(e4, o4, n2) {
-          const r2 = B.configure.props.dataOrigin.rowToColumn.titleColumns, t2 = B.configure.props.dataOrigin.rowToColumn.dataColumns, a2 = e4.props.dataOrigin.groupField;
-          if ((!a2 || 0 === a2.length) && n2.length > 0) {
+          const r2 = B.configure.props.dataOrigin.rowToColumn.titleColumns, t2 = B.configure.props.dataOrigin.rowToColumn.dataColumns, i2 = e4.props.dataOrigin.groupField;
+          if ((!i2 || 0 === i2.length) && n2.length > 0) {
             const e5 = [];
             return e5.push(P("$GroupColumn", B.configure.props.dataOrigin.rowToColumn.firstColumnTitle, 0, "string")), Object.keys(n2[0]).forEach((o5, n3) => {
               if ("$GroupColumn" === o5) return;
@@ -42,15 +57,15 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
             }), e5;
           }
           {
-            const e5 = [...o4].filter((e6) => !r2.includes(e6.props.base.prop) && !t2.includes(e6.props.base.prop)), a3 = new RegExp(`(${t2.join("|")})$`), i2 = /* @__PURE__ */ new Set();
+            const e5 = [...o4].filter((e6) => !r2.includes(e6.props.base.prop) && !t2.includes(e6.props.base.prop)), i3 = new RegExp(`(${t2.join("|")})$`), a2 = /* @__PURE__ */ new Set();
             return n2.forEach((e6) => {
               Object.keys(e6).forEach((e7) => {
                 if (t2.some((o5) => e7.includes(o5))) {
-                  const o5 = e7.split(a3)[0];
-                  i2.add(o5);
+                  const o5 = e7.split(i3)[0];
+                  a2.add(o5);
                 }
               });
-            }), i2.forEach((o5) => {
+            }), a2.forEach((o5) => {
               t2.forEach((r3) => {
                 var _a3;
                 (_a3 = ne.value.find((e6) => e6.props.base.prop === r3)) == null ? void 0 : _a3.props.base.name;
@@ -62,63 +77,63 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
         }(B.configure, ne.value, e3);
         ne.value = o3;
       }
-    } else be("columnToRow") && (ee.value || (ne.value = _(B.configure)), e3 = z(e3, B.configure));
+    } else xe("columnToRow") && (ee.value || (ne.value = _(B.configure)), e3 = z(e3, B.configure));
     if (B.configure.props.dataOrigin.dataFormatting) {
-      const o3 = E(B.pageContext, B.configure.props.dataOrigin.dataFormatting);
+      const o3 = $(B.pageContext, B.configure.props.dataOrigin.dataFormatting);
       if (o3) {
         const n2 = o3.apply(o3, [{ tableData: e3 }]);
         n2 && (e3 = n2);
       }
     }
     if (Object.keys(ce.value).length > 0 && e3 && e3.length > 0 && D(ce.value, e3, B.pageContext.entity), ((_a2 = B.configure.pageination) == null ? void 0 : _a2.enable) ? function(e4) {
-      "frontend" === B.configure.pageination.type ? (fe.value = de.length, Fe(1, B.configure.pageination.pageSize)) : "backend" === B.configure.pageination.type && (oe.value = de, B.configure.pageination.totalFrom && (fe.value = e4.result[B.configure.pageination.totalFrom]));
+      "frontend" === B.configure.pageination.type ? (fe.value = me.length, ke(1, B.configure.pageination.pageSize)) : "backend" === B.configure.pageination.type && (oe.value = me, B.configure.pageination.totalFrom && (fe.value = e4.result[B.configure.pageination.totalFrom]));
     }(o2) : oe.value = e3, B.configure.props.highOrder.groupField && B.configure.props.highOrder.groupField.length > 0) {
       const e4 = B.configure.props.highOrder.groupField;
       oe.value = function(e5, o3) {
         var _a3, _b;
         if (0 === pe.value.length) return e5;
-        const n2 = [], r2 = (_a3 = B.configure.items) == null ? void 0 : _a3.filter((e6) => o3.includes(e6.props.base.prop)), t2 = (_b = B.configure.items) == null ? void 0 : _b.filter((e6) => true === e6.props.base.groupSummary), a2 = {};
+        const n2 = [], r2 = (_a3 = B.configure.items) == null ? void 0 : _a3.filter((e6) => o3.includes(e6.props.base.prop)), t2 = (_b = B.configure.items) == null ? void 0 : _b.filter((e6) => true === e6.props.base.groupSummary), i2 = {};
         e5.forEach((e6) => {
           const n3 = o3.map((o4) => e6[o4]).join("|");
-          a2[n3] || (a2[n3] = []), a2[n3].push(e6);
+          i2[n3] || (i2[n3] = []), i2[n3].push(e6);
         });
-        const i2 = Object.values(a2);
-        for (let e6 = 0; e6 < i2.length; e6++) {
-          const o4 = i2[e6], a3 = {};
+        const a2 = Object.values(i2);
+        for (let e6 = 0; e6 < a2.length; e6++) {
+          const o4 = a2[e6], i3 = {};
           t2 == null ? void 0 : t2.forEach((e7) => {
-            const n3 = e7.props.base.prop, r3 = G(pe.value[n3], o4, n3, B.pageContext);
-            a3[n3] = r3;
+            const n3 = e7.props.base.prop, r3 = U(pe.value[n3], o4, n3, B.pageContext);
+            i3[n3] = r3;
           }), n2.push(...o4), r2 == null ? void 0 : r2.forEach((e7) => {
             const n3 = e7.props.base.prop;
-            a3[n3] = K(e7.props.base.summaryTitle, o4[0]);
-          }), n2.push(a3), le.push(n2.length - 1);
+            i3[n3] = G(e7.props.base.summaryTitle, o4[0]);
+          }), n2.push(i3), le.push(n2.length - 1);
         }
         return n2;
       }(oe.value, e4);
     }
     !function(e4) {
       if (B.configure.props.base.showIndex && -1 === e4.findIndex((e5) => "$index" === e5.props.base.prop)) {
-        const o3 = N();
+        const o3 = K();
         o3 && e4.unshift(o3);
       }
     }(ne.value);
   }
-  function be(e3) {
+  function xe(e3) {
     return B.configure.props.dataOrigin.transition === e3 && B.configure.props.dataOrigin[e3].titleColumns && B.configure.props.dataOrigin[e3].titleColumns.length > 0 && B.configure.props.dataOrigin[e3].dataColumns && B.configure.props.dataOrigin[e3].dataColumns.length > 0;
   }
-  function xe(e3) {
+  function be(e3) {
     const o2 = se.value[e3.column.property] ? se.value[e3.column.property].titleStyle : null, n2 = Q == null ? void 0 : Q.titleStyle;
-    return J(e3, { cellTitleStyle: o2, titleStyle: n2 }, B);
+    return N(e3, { cellTitleStyle: o2, titleStyle: n2 }, B);
   }
   function Oe(e3) {
-    return U(e3, le, B);
+    return J(e3, le, B);
   }
-  function Se(e3) {
+  function we(e3) {
     const o2 = se.value[e3.column.property] ? se.value[e3.column.property].cellStyle : null;
-    return V(e3, o2, B);
+    return L(e3, o2, B);
   }
-  he && he.maxHeight && (me = he.maxHeight), !me && he && he.fixHeight && (me = he.fixHeight), me && (me = Number(me + "")), n(() => {
-    const e3 = x(B.pageContext, B.configure);
+  he && he.maxHeight && (de = he.maxHeight), !de && he && he.fixHeight && (de = he.fixHeight), de && (de = Number(de + "")), n(() => {
+    const e3 = b(B.pageContext, B.configure);
     if (e3) ye(e3);
     else if ("variable" === B.configure.props.dataOrigin.dataSource) {
       ve();
@@ -126,72 +141,72 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
       o2 && Ce(o2, e3);
     }
   });
-  const we = (e3) => {
+  const Se = (e3) => {
     const { columns: o2, data: n2 } = e3, r2 = [];
     return o2.forEach((e4, o3) => {
-      if (ie.value[e4.property]) {
-        const t2 = ie.value[e4.property].label;
-        r2[o3] = y("div", {}, [K(t2, n2)]);
+      if (ae.value[e4.property]) {
+        const t2 = ae.value[e4.property].label;
+        r2[o3] = y("div", {}, [G(t2, n2)]);
       } else if (ue.value[e4.property]) {
         const t2 = n2.filter((e5, o4) => !le.includes(o4));
-        r2[o3] = G(ue.value[e4.property], t2, e4.property, B.pageContext);
+        r2[o3] = U(ue.value[e4.property], t2, e4.property, B.pageContext);
       }
     }), r2;
   };
   function je({ row: e3, column: o2, rowIndex: n2, columnIndex: r2 }) {
-    const t2 = o2.property, a2 = B.configure.props.highOrder;
-    if (a2.scopeFunc) {
-      const t3 = E(B.pageContext, a2.scopeFunc);
+    const t2 = o2.property, i2 = B.configure.props.highOrder;
+    if (i2.scopeFunc) {
+      const t3 = $(B.pageContext, i2.scopeFunc);
       if (t3) {
-        const a3 = t3.apply(t3, [{ tableData: oe.value, row: e3, column: o2, rowIndex: n2, columnIndex: r2 }]);
-        if (a3) return a3;
+        const i3 = t3.apply(t3, [{ tableData: oe.value, row: e3, column: o2, rowIndex: n2, columnIndex: r2 }]);
+        if (i3) return i3;
       }
-    } else if (a2 && a2.mergeColumn, a2 && a2.mergeRow && a2.mergeRow.includes(t2) && 0 === n2) return { rowspan: oe.value.length, colspan: 1 };
-  }
-  function ke(e3, o2) {
-    "frontend" === B.configure.pageination.type ? Fe(e3, o2) : $e(e3, o2);
+    } else if (i2 && i2.mergeColumn, i2 && i2.mergeRow && i2.mergeRow.includes(t2) && 0 === n2) return { rowspan: oe.value.length, colspan: 1 };
   }
   function Ee(e3, o2) {
-    "frontend" === B.configure.pageination.type ? Fe(e3, o2) : $e(e3, o2);
-  }
-  function Fe(e3, o2) {
-    de && (oe.value = de.slice((e3 - 1) * o2, e3 * o2));
+    "frontend" === B.configure.pageination.type ? ke(e3, o2) : Fe(e3, o2);
   }
   function $e(e3, o2) {
-    B.configure.pageination.currentPageSet && w(B.pageContext.entity, B.configure.pageination.currentPageSet, e3), B.configure.pageination.pageSizeSet && w(B.pageContext.entity, B.configure.pageination.pageSizeSet, o2), j(B.pageContext, B.configure.uuid);
+    "frontend" === B.configure.pageination.type ? ke(e3, o2) : Fe(e3, o2);
   }
-  function Re(e3) {
+  function ke(e3, o2) {
+    me && (oe.value = me.slice((e3 - 1) * o2, e3 * o2));
+  }
+  function Fe(e3, o2) {
+    B.configure.pageination.currentPageSet && S(B.pageContext.entity, B.configure.pageination.currentPageSet, e3), B.configure.pageination.pageSizeSet && S(B.pageContext.entity, B.configure.pageination.pageSizeSet, o2), j(B.pageContext, B.configure.uuid);
+  }
+  function Ie(e3) {
     const o2 = e3.showCondition;
-    return k(B.pageContext, o2);
+    return E(B.pageContext, o2);
   }
-  function He(e3) {
+  function Re(e3) {
     if (B.configure.props.modelCustom) {
-      const o2 = E(B.pageContext, B.configure.props.modelCustom);
+      const o2 = $(B.pageContext, B.configure.props.modelCustom);
       if (o2) {
         const n2 = o2.apply(o2, [{ pageContext: B.pageContext, configureObj: B.configure, value: e3 }]);
-        S(n2) ? n2.then((e4) => {
+        w(n2) ? n2.then((e4) => {
           ne.value = e4.columns;
         }) : ne.value = n2.columns;
       }
     }
   }
-  function Ie(e3, o2, n2) {
+  function He(e3, o2, n2) {
     e3.forEach((e4) => {
       const r2 = e4.props.base.prop, t2 = e4.props.base.name;
-      let a2 = { name: r2, label: t2, i18nKey: t2 };
-      e4.children && e4.childern.length > 0 && (a2.children = [], Ie(e4.children, a2.children, n2)), e4.props.format && e4.props.format.type && n2.push(e4), o2.push(a2);
+      let i2 = { name: r2, label: t2, i18nKey: t2 };
+      e4.children && e4.childern.length > 0 && (i2.children = [], He(e4.children, i2.children, n2)), e4.props.format && e4.props.format.type && n2.push(e4), o2.push(i2);
     });
   }
   return q2({ updateChartDatas: ye, exportChart: function() {
     let e3 = [], o2 = [];
     o2 = ee.value ? B.configure.props.groupHeaders : B.configure.items;
     let n2 = [];
-    Ie(o2, e3, n2);
+    He(o2, e3, n2);
     return { isTable: true, dataArr: function(e4) {
       let o3 = [];
-      oe.value && (o3 = L(oe.value), o3.forEach((o4) => {
+      oe.value && (o3 = A(oe.value), o3.forEach((o4) => {
         e4.forEach((e5) => {
-          const n3 = A(o4, e5.props.format, e5, B.pageContext, B.configure);
+          const n3 = V(o4, e5.props.format, e5, B.pageContext, B.configure);
           o4[e5.props.base.prop] = n3;
         });
       }));
@@ -199,7 +214,7 @@ const q = e({ __name: "table-runtime", props: { configure: { type: Object, defau
     }(n2), columns: e3 };
   } }), (o2, n2) => {
     const r2 = t("el-table");
-    return i(), a("div", { style: p(l(Q)), class: u([l(W), "amb-widget-chart"]), ref: "thisRef" }, [s(c(C, { ref_key: "headerRef", ref: Z, headerInfo: l(Y), configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["headerInfo", "configure", "pageContext"]), [[m, l(Y).showHeader || e2.pageContext.showHomepageSearch]]), c(r2, { ref_key: "gridRef", ref: ge, data: oe.value, style: { width: "100%" }, "max-height": l(me), "header-cell-style": xe, "row-style": Oe, "cell-style": Se, "show-summary": ae.value, stripe: e2.configure.props.base.stripe, "summary-method": we, "span-method": je }, { default: d(() => [ee.value ? (i(true), a(h, { key: 0 }, v(re.value, (o3, n3) => (i(), a(h, { key: n3 }, [o3.isLeaf ? Re(te.value[o3.columnUuid]) ? (i(), g($, { key: 1, configure: e2.configure, pageContext: e2.pageContext, column: te.value[o3.columnUuid] }, null, 8, ["configure", "pageContext", "column"])) : f("", true) : (i(), g(F, { key: 0, configure: e2.configure, pageContext: e2.pageContext, groupColumn: o3, columnsConfigKeyValues: te.value }, null, 8, ["configure", "pageContext", "groupColumn", "columnsConfigKeyValues"]))], 64))), 128)) : (i(true), a(h, { key: 1 }, v(ne.value, (o3, n3) => (i(), a(h, { key: n3 }, [Re(o3) ? (i(), g($, { key: 0, column: o3, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["column", "configure", "pageContext"])) : f("", true)], 64))), 128))]), _: 1 }, 8, ["data", "max-height", "show-summary", "stripe"]), e2.configure.pageination && e2.configure.pageination.enable ? (i(), g(R, { key: 0, configure: e2.configure, "table-data": oe.value, total: fe.value, onPageChange: ke, onPageSizeChange: Ee }, null, 8, ["configure", "table-data", "total"])) : f("", true)], 6);
+    return a(), i("div", { style: p(l(Q)), class: u([l(W), "amb-widget-chart"]), ref: "thisRef" }, [s(c(C, { ref_key: "headerRef", ref: Z, headerInfo: l(Y), configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["headerInfo", "configure", "pageContext"]), [[d, l(Y).showHeader || e2.pageContext.showHomepageSearch]]), c(r2, { ref_key: "gridRef", ref: ge, data: oe.value, style: { width: "100%" }, "max-height": l(de), "header-cell-style": be, "row-style": Oe, "cell-style": we, "show-summary": ie.value, stripe: e2.configure.props.base.stripe, "summary-method": Se, "span-method": je }, { default: m(() => [ee.value ? (a(true), i(h, { key: 0 }, v(re.value, (o3, n3) => (a(), i(h, { key: n3 }, [o3.isLeaf ? Ie(te.value[o3.columnUuid]) ? (a(), g(F, { key: 1, configure: e2.configure, pageContext: e2.pageContext, column: te.value[o3.columnUuid] }, null, 8, ["configure", "pageContext", "column"])) : f("", true) : (a(), g(k, { key: 0, configure: e2.configure, pageContext: e2.pageContext, groupColumn: o3, columnsConfigKeyValues: te.value }, null, 8, ["configure", "pageContext", "groupColumn", "columnsConfigKeyValues"]))], 64))), 128)) : (a(true), i(h, { key: 1 }, v(ne.value, (o3, n3) => (a(), i(h, { key: n3 }, [Ie(o3) ? (a(), g(F, { key: 0, column: o3, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["column", "configure", "pageContext"])) : f("", true)], 64))), 128))]), _: 1 }, 8, ["data", "max-height", "show-summary", "stripe"]), e2.configure.pageination && e2.configure.pageination.enable ? (a(), g(I, { key: 0, configure: e2.configure, "table-data": oe.value, total: fe.value, onPageChange: Ee, onPageSizeChange: $e }, null, 8, ["configure", "table-data", "total"])) : f("", true)], 6);
   };
 } });
 export {

package/dist/es/components/runtime/views/assemblys/data/table/main-table-runtime.vue.js

@@ -1,5 +1,5 @@
 import { defineComponent as e, ref as t, onMounted as n, watch as o, onUnmounted as i, resolveComponent as a, createElementBlock as l, openBlock as r, createVNode as u, unref as s } from "vue";
-import { setTableEvents as c, canExecuteButton as p, doAfterClickEvent as f, doBeforeClickEvent as d, gridSelectRecord as g, gridSelectAllRecords as m, gridSelectionChange as v, cellClick as h, cellDblClick as b, rowClick as w, rowDblClick as S, headerClick as C, getEventNameByType as y, getEventFuncByType as x, getHandleEvent as E } from "../../../../utils/events/event-util.js";
+import { setTableEvents as c, canExecuteButton as p, doAfterClickEvent as d, doBeforeClickEvent as f, gridSelectRecord as g, gridSelectAllRecords as m, gridSelectionChange as v, cellClick as h, cellDblClick as b, rowClick as w, rowDblClick as S, headerClick as C, getEventNameByType as y, getEventFuncByType as x, getHandleEvent as E } from "../../../../utils/events/event-util.js";
 import { getBaseUrl as D, getListCode as O, getRealRestApiPath as k, isWorkflowPage as I, isVariableInvalidValue as T } from "../../../../utils/common-util.js";
 import { getAdditionalParamMap as R, getSaveFormRequestWithRow as V, standardEvents as j } from "../../../../utils/events/standard-event.js";
 import { isPromise as N } from "agilebuilder-ui/src/utils/common-util";
@@ -7,13 +7,13 @@ import { getOperationButtons as P, popupToPage as U } from "../../../../utils/ta
 import B from "../../../../utils/eventBus.js";
 import { getDefaultValue as M } from "../../../../utils/page-init-util.js";
 import { decomposeVariable as $, getSizeConfig as F } from "../../../../utils/page-helper-util.js";
-import { getRowStyleUtil as _, getCellStyleUtil as L, getHeaderCellStyleUtil as A } from "../../chart/table/chart-table-util.js";
+import { getRowStyleUtil as L, getCellStyleUtil as _, getHeaderCellStyleUtil as A } from "../../chart/table/chart-table-util.js";
 const H = e({ __name: "main-table-runtime", props: { pageContext: {}, configure: {} }, emits: ["setSafeDeleteTableCode"], setup(e2, { expose: H2, emit: z }) {
   const W = e2, q = W.pageContext;
   let G = W.configure;
   const Q = t({});
   q.isTest ? Q.value = W.configure.runtime ? W.configure.runtime : {} : q.tableRuntimes && q.tableRuntimes[G.uuid] && (G = JSON.parse(q.tableRuntimes[G.uuid].configure), Q.value = G.runtime ? G.runtime : {});
-  const J = Q.value.style, X = Q.value.class, K = q.systemCode, Y = q.backendUrl, Z = G.props && G.props.dataOrigin && G.props.dataOrigin.tableName;
+  const J = Q.value.style, K = Q.value.class, X = q.systemCode, Y = q.backendUrl, Z = G.props && G.props.dataOrigin && G.props.dataOrigin.tableName;
   let ee = D(q.backendUrl, q.isTest);
   ee || (ee = window.$vueApp.config.globalProperties.baseURL);
   const te = t({}), ne = [], oe = t({});
@@ -21,7 +21,7 @@ const H = e({ __name: "main-table-runtime", props: { pageContext: {}, configure:
     const e3 = q.systemCode, t2 = q.code;
     let n2 = G.props && G.props.dataOrigin && "[]" !== G.props.dataOrigin.sqlFilterCondition ? G.props.dataOrigin.sqlFilterCondition : null;
     null == n2 && (n2 = []);
-    const i2 = { isSql: true, extraParam: { beanName: q.beanName, functionCode: t2 + ".listData", tableName: Z, systemCode: e3, pageCode: q.code, pageVersion: q.version }, initSearchForm: n2, lineEditOptions: { aftersaveIsCreateRow: false, autoSave: false, enter: me, esc: Se }, indexContinuous: !(!G.props || !G.props.otherSettings) && G.props.otherSettings.serialNumberContinuous, initSearch: !G.props || false !== G.props.dataOrigin.initializationQuery, resizeHeight: ke, pageCode: q.code, pageVersion: q.version, additionalParamMap: R(q), showOverflowTooltip: !(!G.props || !G.props.otherSettings || void 0 !== G.props.otherSettings.isBreakLine && false !== G.props.otherSettings.isBreakLine), isEnableEnterEvent: G.props && G.props.otherSettings && G.props.otherSettings.isEnableEnterEvent, isWithDataPermission: !!(G.props && G.props.otherSettings && G.props.otherSettings.isWithDataPermission) && G.props.otherSettings.isWithDataPermission, pageDevMode: false, isWorkflowEntity: I(q), tableClass: X, tableStyle: J, pageContext: q, configureObj: G, backendUrl: ee, cellStyleRender: Ae, rowStyleRender: Le, titleStyleRender: He };
+    const i2 = { isSql: true, rowKeyProp: G.props.dataOrigin.principalLinkage, extraParam: { beanName: q.beanName, functionCode: t2 + ".listData", tableName: Z, systemCode: e3, pageCode: q.code, pageVersion: q.version }, initSearchForm: n2, lineEditOptions: { aftersaveIsCreateRow: false, autoSave: false, enter: me, esc: Se }, indexContinuous: !(!G.props || !G.props.otherSettings) && G.props.otherSettings.serialNumberContinuous, initSearch: !G.props || false !== G.props.dataOrigin.initializationQuery, resizeHeight: ke, pageCode: q.code, pageVersion: q.version, additionalParamMap: R(q), showOverflowTooltip: !(!G.props || !G.props.otherSettings || void 0 !== G.props.otherSettings.isBreakLine && false !== G.props.otherSettings.isBreakLine), isEnableEnterEvent: G.props && G.props.otherSettings && G.props.otherSettings.isEnableEnterEvent, isWithDataPermission: !!(G.props && G.props.otherSettings && G.props.otherSettings.isWithDataPermission) && G.props.otherSettings.isWithDataPermission, pageDevMode: false, isWorkflowEntity: I(q), tableClass: K, tableStyle: J, pageContext: q, configureObj: G, backendUrl: ee, cellStyleRender: Ae, rowStyleRender: _e, titleStyleRender: He };
     (function(e4) {
       const t3 = [];
       e4.operations || (e4.operations = {});
@@ -74,9 +74,9 @@ const H = e({ __name: "main-table-runtime", props: { pageContext: {}, configure:
   }();
   const ie = t(), ae = function() {
     let e3 = ee + "/dsc/commons/list";
-    e3 && (e3 = k(e3, K, Y, q.isTest));
+    e3 && (e3 = k(e3, X, Y, q.isTest));
     return e3;
-  }(), le = O(q.code, q.version, G.uuid), re = q.code + "_" + le, ue = t([]), se = q.entity.page, ce = t({ data: [] }), pe = q.superGridItems, fe = pe ? pe[G.uuid] : null, de = t(false), ge = z;
+  }(), le = O(q.code, q.version, G.uuid), re = q.code + "_" + le, ue = t([]), se = q.entity.page, ce = t({ data: [] }), pe = q.superGridItems, de = pe ? pe[G.uuid] : null, fe = t(false), ge = z;
   function me({ rowIndex: e3, column: t2, row: n2, orgRow: o2 }) {
     ve(null, null, n2, t2, e3);
   }
@@ -84,7 +84,7 @@ const H = e({ __name: "main-table-runtime", props: { pageContext: {}, configure:
     const a2 = te.value.lineEditSave, l2 = G;
     a2.props.base.tableUuid = l2.uuid, oe.value.lineEditOptions.beforeSave = be, q.editData = n2, p({ pageContext: q, configureObj: a2 }).then((l3) => {
       true === l3.canExecute && (oe.value.lineEditOptions.saveRow = we, ie.value.saveRow(i2, le).then(() => {
-        f(q, a2, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
+        d(q, a2, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
       }));
     }).finally(() => {
       q.editData = null;
@@ -104,7 +104,7 @@ const H = e({ __name: "main-table-runtime", props: { pageContext: {}, configure:
   function be({ row: e3, columns: t2, additionalParamMap: n2 }) {
     const o2 = te.value.lineEditSave, i2 = G;
     o2.props.base.tableUuid = i2.uuid;
-    return d(q, o2, { row: e3, columns: t2 });
+    return f(q, o2, { row: e3, columns: t2 });
   }
   function we({ row: e3, columns: t2, dataTypeMap: n2, dynamicColumnInfo: o2, additionalParamMap: i2, mainDefaultValueColumns: a2 }) {
     const l2 = te.value.lineEditSave, r2 = G;
@@ -123,17 +123,17 @@ const H = e({ __name: "main-table-runtime", props: { pageContext: {}, configure:
   function Ce(e3, t2, n2, o2, i2) {
     const a2 = te.value.restoreEdit, l2 = G;
     a2.props.base.tableUuid = l2.uuid;
-    const r2 = d(q, a2, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
+    const r2 = f(q, a2, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
     if (!r2) return;
     N(r2) ? r2.then((e4) => {
       e4 && ie.value.restoreRow(i2, le);
     }) : ie.value.restoreRow(i2, le);
-    f(q, G, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
+    d(q, G, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
   }
   function ye(e3, t2, n2, o2, i2) {
     const a2 = te.value.lineEditUpdate, l2 = G;
     a2.props.base.tableUuid = l2.uuid;
-    const r2 = d(q, a2, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
+    const r2 = f(q, a2, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
     r2 && (N(r2) ? r2.then((l3) => {
       l3 && xe(e3, t2, n2, o2, i2, a2);
     }) : xe(e3, t2, n2, o2, i2, a2));
@@ -142,7 +142,7 @@ const H = e({ __name: "main-table-runtime", props: { pageContext: {}, configure:
     q.editData = n2, p({ pageContext: q, configureObj: a2 }).then((a3) => {
       if (true === a3.canExecute) {
         ie.value.editRow(i2, le);
-        f(q, G, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
+        d(q, G, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
       }
     }).finally(() => {
       q.editData = null;
@@ -151,7 +151,7 @@ const H = e({ __name: "main-table-runtime", props: { pageContext: {}, configure:
   function Ee(e3, t2, n2, o2, i2) {
     const a2 = te.value.lineEditDelete, l2 = G;
     a2.props.base.tableUuid = l2.uuid;
-    const r2 = d(q, a2, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
+    const r2 = f(q, a2, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
     r2 && (N(r2) ? r2.then((l3) => {
       l3 && De(e3, t2, n2, o2, i2, a2);
     }) : De(e3, t2, n2, o2, i2, a2));
@@ -167,7 +167,7 @@ const H = e({ __name: "main-table-runtime", props: { pageContext: {}, configure:
     });
     else {
       Ce(e3, t2, n2, o2, i2);
-      f(q, G, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
+      d(q, G, { originalValue: e3, formatValue: t2, row: n2, column: o2, rowIndex: i2 });
     }
   }
   function Oe(e3) {
@@ -245,14 +245,14 @@ const H = e({ __name: "main-table-runtime", props: { pageContext: {}, configure:
   function Fe() {
     ue.value = [];
   }
-  function _e(e3) {
-    de.value = true;
-  }
   function Le(e3) {
-    return _(e3, [], W);
+    fe.value = true;
+  }
+  function _e(e3) {
+    return L(e3, [], W);
   }
   function Ae(e3) {
-    return L(e3, e3.cellStyle, W);
+    return _(e3, e3.cellStyle, W);
   }
   function He(e3) {
     const t2 = e3.titleStyle, n2 = W.configure.style.titleStyle;
@@ -305,7 +305,7 @@ const H = e({ __name: "main-table-runtime", props: { pageContext: {}, configure:
   }, validatorSunTableListData: function() {
     return ie.value.validatorSunTableListData();
   }, showMobileSearch: function() {
-    de.value && ie.value.showMobileSearch();
+    fe.value && ie.value.showMobileSearch();
   }, getTableSelectOptions: function() {
     if (ie.value) return ie.value.getTableSelectOptions(le);
   }, dynamicControlTableEdit: function(e3, t2, n2) {
@@ -314,7 +314,7 @@ const H = e({ __name: "main-table-runtime", props: { pageContext: {}, configure:
     ie.value && ie.value.doLayout(e3);
   } }), (e3, t2) => {
     const n2 = a("super-grid");
-    return r(), l("div", null, [u(n2, { ref_key: "gridRef", ref: ie, url: s(ae), options: oe.value, code: s(le), settings: s(fe), "search-form-info": ce.value, "list-toolbar-form-data": s(se), onSelect: Ve, onSelectAll: je, onSelectionChange: Ne, onCellClick: Pe, onCellDblclick: Ue, onRowClick: Be, onRowDblclick: Me, onHeaderClick: $e, onRefresh: Fe, onNewOpenGridDialog: s(U), onCanShowMobileSearch: _e }, null, 8, ["url", "options", "code", "settings", "search-form-info", "list-toolbar-form-data", "onNewOpenGridDialog"])]);
+    return r(), l("div", null, [u(n2, { ref_key: "gridRef", ref: ie, url: s(ae), options: oe.value, code: s(le), settings: s(de), "search-form-info": ce.value, "list-toolbar-form-data": s(se), onSelect: Ve, onSelectAll: je, onSelectionChange: Ne, onCellClick: Pe, onCellDblclick: Ue, onRowClick: Be, onRowDblclick: Me, onHeaderClick: $e, onRefresh: Fe, onNewOpenGridDialog: s(U), onCanShowMobileSearch: Le }, null, 8, ["url", "options", "code", "settings", "search-form-info", "list-toolbar-form-data", "onNewOpenGridDialog"])]);
   };
 } });
 export {

package/dist/es/components/runtime/views/assemblys/form/select/select-runtime.vue2.js

@@ -2,16 +2,16 @@ import { defineComponent as e, ref as t, computed as l, watch as o, onMounted as
 import { setVariableValue as C, getVariableValue as _, getOptionDatasFromPage as k, queryOptionDatasources as w, autoSetAfterSelect as S } from "../../../../utils/page-helper-util.js";
 import { getFormModelFields as T } from "../../../../utils/page-init-util.js";
 import { handleFormEvent as j, handleAfterInitEvent as R } from "../../../../utils/events/event-util.js";
-import z from "../common/title-suffix-element.vue.js";
-import { $t as I } from "../../../../utils/i18n-util.js";
-const M = { style: { float: "left" } }, V = { style: { float: "right", color: "var(--el-text-color-secondary)", "font-size": "13px" } }, q = e({ __name: "select-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: q2 }) {
+import V from "../common/title-suffix-element.vue.js";
+import { $t as z } from "../../../../utils/i18n-util.js";
+const I = { style: { float: "left" } }, M = { style: { float: "right", color: "var(--el-text-color-secondary)", "font-size": "13px" } }, q = e({ __name: "select-runtime", props: { pageContext: {}, configure: {} }, setup(e2, { expose: q2 }) {
   const O = e2, P = O.pageContext.entity ? O.pageContext.entity : {};
   let A = T(O.pageContext, O.configure);
   const D = O.configure.runtime ? O.configure.runtime : {}, W = D.style, E = D.class, F = D.headerStyle, U = D.titleExceedStyle, $ = t(D.props ? D.props : {}), B = l({ get() {
     let e3 = _(P, A);
-    return null != e3 && (e3 += ""), $.value.multiple && e3 && (e3 = e3.split(",")), e3;
+    return null != e3 && (e3 += ""), $.value.multiple && (e3 = e3 ? e3.split(",") : []), e3;
   }, set(e3) {
-    $.value.multiple && e3 && e3.length > 0 && (e3 = e3.join(",")), C(P, A, e3);
+    $.value.multiple && e3 && e3.length > 0 && !$.value.arrayValue && (e3 = e3.join(",")), C(P, A, e3);
   } }), G = t($.value.options ? $.value.options : []), H = k(O.pageContext, O.configure);
   H.length > 0 && (G.value = H);
   const J = t(false), K = O.configure.props && O.configure.props.dataOrigin ? O.configure.props.dataOrigin : {}, L = K.optionValueSetType;
@@ -75,7 +75,7 @@ const M = { style: { float: "left" } }, V = { style: { float: "right", color: "v
     G.value = e3 || [];
   } }), (e3, t2) => {
     const l2 = n("el-option"), o2 = n("el-select"), a2 = n("el-form-item");
-    return r(), i(a2, { ref_key: "formItemRef", ref: oe, required: !!$.value.required, class: p(f(E)), "label-width": $.value.labelWidth, style: s(f(W)) }, { label: c(() => [$.value.tittleShow ? (r(), g("div", { key: 0, ref_key: "titleRef", ref: ue, style: s({ ...f(F), ...f(U) }) }, [$.value.prefixType ? (r(), i(z, { key: 0, pageContext: e3.pageContext, property: $.value }, null, 8, ["pageContext", "property"])) : (r(), g(m, { key: 1 }, [b(x(f(I)($.value.title)), 1)], 64))], 4)) : h("", true)]), default: c(() => [v(o2, { ref_key: "componentRef", ref: ae, style: { width: "100%" }, disabled: "disabled" === $.value.state, size: $.value.size, clearable: $.value.clearable, multiple: $.value.multiple, "collapse-tags": $.value.collapseTags, "collapse-tags-tooltip": $.value.collapseTagsTooltip, filterable: $.value.filterable, "allow-create": $.value.allowCreate, placeholder: $.value.placeholder, "remote-show-suffix": $.value.remoteShowSuffix, remote: $.value.remote, "remote-method": $.value.remoteMethod, loading: J.value, onChange: $.value.changeMethod, modelValue: B.value, "onUpdate:modelValue": t2[0] || (t2[0] = (e4) => B.value = e4) }, { default: c(() => [(r(true), g(m, null, d(G.value, (t3) => (r(), i(l2, { key: t3.value, label: t3.label, value: t3.value, onClick: (l3) => f(j)(t3.value, e3.pageContext, e3.configure, "click", { values: B.value }) }, { default: c(() => [t3._description_ ? (r(), g(m, { key: 0 }, [y("span", M, x(t3.label), 1), y("span", V, x(t3._description_), 1)], 64)) : h("", true)]), _: 2 }, 1032, ["label", "value", "onClick"]))), 128))]), _: 1 }, 8, ["disabled", "size", "clearable", "multiple", "collapse-tags", "collapse-tags-tooltip", "filterable", "allow-create", "placeholder", "remote-show-suffix", "remote", "remote-method", "loading", "onChange", "modelValue"])]), _: 1 }, 8, ["required", "class", "label-width", "style"]);
+    return r(), i(a2, { ref_key: "formItemRef", ref: oe, required: !!$.value.required, class: p(f(E)), "label-width": $.value.labelWidth, style: s(f(W)) }, { label: c(() => [$.value.tittleShow ? (r(), g("div", { key: 0, ref_key: "titleRef", ref: ue, style: s({ ...f(F), ...f(U) }) }, [$.value.prefixType ? (r(), i(V, { key: 0, pageContext: e3.pageContext, property: $.value }, null, 8, ["pageContext", "property"])) : (r(), g(m, { key: 1 }, [b(x(f(z)($.value.title)), 1)], 64))], 4)) : h("", true)]), default: c(() => [v(o2, { ref_key: "componentRef", ref: ae, style: { width: "100%" }, disabled: "disabled" === $.value.state, size: $.value.size, clearable: $.value.clearable, multiple: $.value.multiple, "collapse-tags": $.value.collapseTags, "collapse-tags-tooltip": $.value.collapseTagsTooltip, filterable: $.value.filterable, "allow-create": $.value.allowCreate, placeholder: $.value.placeholder, "remote-show-suffix": $.value.remoteShowSuffix, remote: $.value.remote, "remote-method": $.value.remoteMethod, loading: J.value, onChange: $.value.changeMethod, modelValue: B.value, "onUpdate:modelValue": t2[0] || (t2[0] = (e4) => B.value = e4) }, { default: c(() => [(r(true), g(m, null, d(G.value, (t3) => (r(), i(l2, { key: t3.value, label: t3.label, value: t3.value, onClick: (l3) => f(j)(t3.value, e3.pageContext, e3.configure, "click", { values: B.value }) }, { default: c(() => [t3._description_ ? (r(), g(m, { key: 0 }, [y("span", I, x(t3.label), 1), y("span", M, x(t3._description_), 1)], 64)) : h("", true)]), _: 2 }, 1032, ["label", "value", "onClick"]))), 128))]), _: 1 }, 8, ["disabled", "size", "clearable", "multiple", "collapse-tags", "collapse-tags-tooltip", "filterable", "allow-create", "placeholder", "remote-show-suffix", "remote", "remote-method", "loading", "onChange", "modelValue"])]), _: 1 }, 8, ["required", "class", "label-width", "style"]);
   };
 } });
 export {

package/dist/es/components/runtime/views/assemblys/object-render.vue.js

@@ -1,11 +1,11 @@
-import { defineComponent as e, ref as o, computed as t, markRaw as n, onMounted as i, resolveDirective as s, withDirectives as r, createCommentVNode as u, unref as l, createBlock as p, openBlock as a, resolveDynamicComponent as c, normalizeClass as g, normalizeStyle as f, vShow as d, nextTick as v } from "vue";
+import { defineComponent as e, ref as o, computed as t, markRaw as n, onMounted as i, resolveDirective as s, withDirectives as r, createCommentVNode as u, unref as l, createBlock as p, openBlock as a, resolveDynamicComponent as c, normalizeClass as f, normalizeStyle as g, vShow as d, nextTick as v } from "vue";
 import m from "./error-render.vue.js";
 import { getRuntimeComponentByName as C } from "../../utils/assemblys-config.js";
 import { PageDimensions as x } from "../../utils/interfaces/page-design-types.js";
-import { addComponentRef as h, addComponentRefByCode as b } from "../../utils/global-refs.js";
+import { addComponentRef as b, addComponentRefByCode as h } from "../../utils/global-refs.js";
 import { getPermissionCodes as y, packageFormRules as w, controlObjectRenderState as j } from "../../utils/page-init-util.js";
-import { caculateShowCondition as _, getFormPropName as S, getSizeConfig as B } from "../../utils/page-helper-util.js";
-import { isWorkflowPage as O, getPropClassName as P, isNumber as R } from "../../utils/common-util.js";
+import { caculateShowCondition as _, getFormPropName as B, getSizeConfig as O } from "../../utils/page-helper-util.js";
+import { isWorkflowPage as P, getPropClassName as R, isNumber as S } from "../../utils/common-util.js";
 import { isShowComponent as M } from "../../utils/events/event-util.js";
 const N = e({ __name: "object-render", props: { pageContext: {}, configure: {} }, setup(e2) {
   var _a, _b;
@@ -13,10 +13,10 @@ const N = e({ __name: "object-render", props: { pageContext: {}, configure: {} }
   null == N2.configure.style && (N2.configure.style = {});
   const $ = y(N2.configure, N2.pageContext);
   N2.configure && N2.configure.props && N2.configure.props.base && (N2.configure.props.base.functionCode = $), w(N2.pageContext, N2.configure);
-  let E = o(true), F = o(true), H = o("");
+  let E = o(true), H = o(true), k = o("");
   if (N2.configure && N2.configure.props) {
     let e3 = [];
-    ((_a = N2.configure.props.base) == null ? void 0 : _a.showConditions) && (e3 = "string" == typeof N2.configure.props.base.showConditions ? JSON.parse(N2.configure.props.base.showConditions) : N2.configure.props.base.showConditions), F = t(() => {
+    ((_a = N2.configure.props.base) == null ? void 0 : _a.showConditions) && (e3 = "string" == typeof N2.configure.props.base.showConditions ? JSON.parse(N2.configure.props.base.showConditions) : N2.configure.props.base.showConditions), H = t(() => {
       var _a2;
       let o2 = true;
       if (E.value) if (e3 && e3.length > 0) o2 = _(N2.pageContext, e3);
@@ -25,38 +25,38 @@ const N = e({ __name: "object-render", props: { pageContext: {}, configure: {} }
         e4 && "hidden" === e4 && (o2 = false);
       }
       else o2 = false;
-      return N2.configure._dynamicShowFlag = o2, o2;
+      return o2;
     });
-    if (N2.configure._dynamicShowFlag = F, (_b = N2.configure.props.base) == null ? void 0 : _b.editConditions) {
+    if (N2.configure._dynamicShowFlag = H, (_b = N2.configure.props.base) == null ? void 0 : _b.editConditions) {
       const e4 = N2.configure.props.base.editConditions;
       if (e4.length > 0) {
         const o2 = N2.configure.runtime ? N2.configure.runtime : {}, n2 = o2.props ? o2.props : {};
-        if (n2.rawSate = n2.state, O(N2.pageContext) && N2.pageContext.fieldPermissionMap) {
+        if (n2.rawSate = n2.state, P(N2.pageContext) && N2.pageContext.fieldPermissionMap) {
           const e5 = N2.pageContext.fieldPermissionMap.get("all_fields");
-          if (false === (e5 == null ? void 0 : e5.canEdit)) H.value = "disabled";
+          if (false === (e5 == null ? void 0 : e5.canEdit)) k.value = "disabled";
           else {
             const e6 = N2.configure.props.base;
             if (e6 && e6.prop) {
               let o3 = e6.prop;
-              o3 = S(o3);
+              o3 = B(o3);
               const t2 = N2.pageContext.fieldPermissionMap.get(o3);
-              t2 && false === t2.canEdit && (H.value = "disabled");
+              t2 && false === t2.canEdit && (k.value = "disabled");
             }
           }
         }
         n2.state = t({ get() {
-          if ("disabled" === H.value) return H.value;
+          if ("disabled" === k.value) return k.value;
           return _(N2.pageContext, e4) ? "" : "disabled";
         }, set() {
         } });
       }
     }
   }
-  const k = o({});
-  k.value = n(C(N2.configure.name));
+  const F = o({});
+  F.value = n(C(N2.configure.name));
   const J = o(true);
-  null == k.value && (k.value = m, J.value = false);
-  const W = o(null), q = o({}), z = o(""), A = P(N2.configure);
+  null == F.value && (F.value = m, J.value = false);
+  const W = o(null), q = o({}), z = o(""), A = R(N2.configure);
   A && (z.value = A);
   const D = N2.configure.runtime && N2.configure.runtime.common ? N2.configure.runtime.common : {};
   if (D.class && (z.value += " " + D.class), D.style) {
@@ -73,22 +73,22 @@ const N = e({ __name: "object-render", props: { pageContext: {}, configure: {} }
       E.value = false;
     }), e3 && !e3.getConfigure && (e3.getConfigure = function() {
       return N2.configure;
-    }), N2.configure.uuid && h(N2.pageContext, N2.configure.uuid, W), N2.configure.code) b(N2.pageContext, N2.configure.code, W);
+    }), N2.configure.uuid && b(N2.pageContext, N2.configure.uuid, W), N2.configure.code) h(N2.pageContext, N2.configure.code, W);
     else if (N2.configure.props && N2.configure.props.base) {
       const e4 = N2.configure.props.base;
       if (e4.prop) {
         let o3 = e4.prop;
-        o3.startsWith("${") && (o3 = o3.substring(2, o3.length - 1)), o3.includes(".") && (o3 = o3.substring(o3.indexOf(".") + 1)), b(N2.pageContext, o3, W);
+        o3.startsWith("${") && (o3 = o3.substring(2, o3.length - 1)), o3.includes(".") && (o3 = o3.substring(o3.indexOf(".") + 1)), h(N2.pageContext, o3, W);
       }
     }
     const o2 = N2.configure.props ? N2.configure.props.base : null;
     if (o2 && o2.prop) {
       let e4 = o2.prop;
-      e4 = S(e4), j(N2.pageContext, e4);
+      e4 = B(e4), j(N2.pageContext, e4);
     }
     !function() {
       if (!W.value) return;
-      const e4 = B(N2.pageContext, N2.configure);
+      const e4 = O(N2.pageContext, N2.configure);
       "table" !== N2.configure.name && e4 && e4.isCalcHeight && v(() => {
         let e5 = W.value.$el;
         e5 || (e5 = W.value);
@@ -96,7 +96,7 @@ const N = e({ __name: "object-render", props: { pageContext: {}, configure: {} }
         if (!e5 || !o3) return;
         const t2 = e5.getBoundingClientRect();
         let n2 = window.innerHeight - t2.y - 80, i2 = n2 + "";
-        R(n2) && (i2 = n2 + "px"), q.value.height = i2, q.value["overflow-y"] = "auto", q.value["overflow-x"] = "hidden", N2.configure.sytle || (N2.configure.sytle = {}), N2.configure.sytle._heightStyle = i2;
+        S(n2) && (i2 = n2 + "px"), q.value.height = i2, q.value["overflow-y"] = "auto", q.value["overflow-x"] = "hidden", N2.configure.sytle || (N2.configure.sytle = {}), N2.configure.sytle._heightStyle = i2;
       });
     }();
   }
@@ -128,7 +128,7 @@ const N = e({ __name: "object-render", props: { pageContext: {}, configure: {} }
   };
   return (e3, o2) => {
     const t2 = s("permission");
-    return l(M)(e3.configure) ? r((a(), p(c(k.value), { key: 0, ref: G, style: f(q.value), class: g(z.value), configure: e3.configure, pageContext: e3.pageContext }, null, 8, ["style", "class", "configure", "pageContext"])), [[d, l(F)], [t2, l($) ? l($) : "true"]]) : u("", true);
+    return l(M)(e3.configure) ? r((a(), p(c(F.value), { key: 0, ref: G, style: g(q.value), class: f(z.value), configure: e3.configure, pageContext: e3.pageContext }, null, 8, ["style", "class", "configure", "pageContext"])), [[d, l(H)], [t2, l($) ? l($) : "true"]]) : u("", true);
   };
 } });
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.2.6",
+  "version": "2.2.11",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -48,7 +48,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/test-utils": "^2.4.4",
-    "agilebuilder-ui": "1.1.5",
+    "agilebuilder-ui": "1.1.7",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",