super-page-runtime 2.3.43-sit2 → 2.3.44-sit1

package/dist/es/components/runtime/utils/events/validator-util.js

@@ -169,7 +169,7 @@ function w(e2, n2, r2, l2) {
                   });
                   s2.subRules && (Object.keys(s2.subRules).length > 0 ? s2.totalSubRules || (s2.totalSubRules = {}) : delete s2.subRules);
                   return s2;
-                }(u3, n4.hiddenNotValidatorCodes), y2 = window.$vueApp.config.globalProperties.$formValidator(e4, b2, m3, f3, d3, c3, g2, r6, { returnAllErrors: h2 }), o2 = y2 && Array.isArray(y2) ? 0 === y2.length || i().t("superPageRuntimeMessage.pleaseInputRequiredInfo") : !y2 || y2.msg;
+                }(u3, n4.hiddenNotValidatorCodes), y2 = window.$vueApp.config.globalProperties.$formValidator(e4, b2, m3, f3, d3, c3, g2, r6, { returnAllErrors: h2 }), o2 = y2 && Array.isArray(y2) ? 1 === y2.length && y2[0].message ? y2[0].message : 0 === y2.length || i().t("superPageRuntimeMessage.pleaseInputRequiredInfo") : !y2 || y2.msg;
               } else o2 = true;
               true !== o2 ? (t({ showClose: true, message: o2 + "", type: "warning" }), y2 && Array.isArray(y2) && y2.length > 0 ? (C(n4, y2), k(n4, P(n4, y2))) : y2.listCode ? (R(n4, y2), E(n4, y2)) : (R(n4, y2), v(n4, y2.field)), l4(false)) : (Object.keys(e4).indexOf("validateErrorField") >= 0 && delete e4.validateErrorField, l4(e4));
             } else u2(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);

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

@@ -37,7 +37,7 @@ export declare function getSummaryDataColumn(configure: Component, type: string)
  * @param pageContext 页面上下文
  * @returns
  */
-export declare function summaryStatistics(summaryColumn: any, data: any, prop: string, pageContext: PageContext): string;
+export declare function summaryStatistics(summaryColumn: any, data: any, prop: string, pageContext: PageContext, columnsConfig: any): string;
 export declare function replacePlaceholders(template: string, data: {
     [key: string]: any;
 }): string;

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

@@ -118,35 +118,44 @@ function getSummaryDataColumn(e, t) {
     a && ("table" === t && a.props.base.tableSummary || "group" === t && a.props.base.groupSummary) && (r[o.prop] = o);
   }), r;
 }
-function summaryStatistics(e, t, r, o) {
-  let a = "";
-  const n = e.summaryMode, s = t.map((e2) => Number(e2[r])).filter((e2) => !Number.isNaN(e2));
-  if (s.length > 0) if ("custom" === n) {
-    const n2 = getCustomFunc(o, e.customFunc);
-    if (n2) try {
-      const e2 = n2.apply(n2, [{ data: t, prop: r }]);
-      a = e2 ? ` ${e2}` : " N/A";
+function summaryStatistics(e, t, r, o, a) {
+  let n = "";
+  const s = e.summaryMode, l = t.map((e2) => Number(e2[r])).filter((e2) => !Number.isNaN(e2));
+  if (l.length > 0) if ("custom" === s) {
+    const a2 = getCustomFunc(o, e.customFunc);
+    if (a2) try {
+      const e2 = a2.apply(a2, [{ data: t, prop: r }]);
+      n = e2 ? ` ${e2}` : " N/A";
     } catch (e2) {
     }
-    else a = " N/A";
-  } else switch (n) {
+    else n = " N/A";
+  } else switch (s) {
     case "sum":
-      a = ` ${s.reduce((e2, t2) => e2 + t2, 0)}`;
+      n = `${l.reduce((e2, t2) => e2 + t2, 0)}`;
       break;
     case "avg":
-      a = " " + s.reduce((e2, t2) => e2 + t2, 0) / s.length;
+      n = "" + l.reduce((e2, t2) => e2 + t2, 0) / l.length;
       break;
     case "min":
-      a = ` ${Math.min(...s)}`;
+      n = `${Math.min(...l)}`;
       break;
     case "max":
-      a = ` ${Math.max(...s)}`;
+      n = `${Math.max(...l)}`;
       break;
     default:
-      a = " N/A";
+      n = "N/A";
   }
-  else a = " N/A";
-  return a;
+  else n = "N/A";
+  if (r && a) {
+    const e2 = a.findIndex((e3) => e3.props.base.prop === r);
+    if (-1 !== e2 && a[e2].props.format && a[e2].props.format.type) {
+      const t2 = {};
+      t2[r] = n;
+      const s2 = formatColContent(t2, a[e2].props.format, a[e2], o, {});
+      Number.isNaN(s2) || (n = ` ${s2}`);
+    }
+  }
+  return n;
 }
 function replacePlaceholders(e, t) {
   if (e) return e.replace(/\$\{row\.(\w+)\}/g, (e2, r) => Object.prototype.hasOwnProperty.call(t, r) ? t[r] : "");

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

@@ -1,7 +1,7 @@
-import { defineComponent as e, ref as o, computed as r, onMounted as t, watch as n, resolveComponent as i, createElementBlock as a, openBlock as u, normalizeClass as p, normalizeStyle as l, unref as s, withDirectives as c, createVNode as g, createBlock as f, createCommentVNode as m, vShow as d, withCtx as h, Fragment as v, renderList as C, h as y } from "vue";
+import { defineComponent as e, ref as o, computed as r, onMounted as n, watch as t, resolveComponent as i, createElementBlock as a, openBlock as u, normalizeClass as p, normalizeStyle as l, unref as s, withDirectives as c, createVNode as g, createBlock as f, createCommentVNode as m, vShow as d, withCtx as h, Fragment as v, renderList as y, h as C } from "vue";
 import b from "../common/common-chart-header.vue.js";
-import { getSizeConfig as x, getChartDatasFromPage as O, getValueFromVariable as S, caculateShowCondition as w, isPromise as E, setValueForVariableName as T, updateChartDatasourcesByComponent as j } from "../../../../utils/page-helper-util.js";
-import { handleChartEvent as $, getCustomFunc as F } from "../../../../utils/events/event-util.js";
+import { getSizeConfig as x, getChartDatasFromPage as O, getValueFromVariable as S, caculateShowCondition as w, isPromise as E, setValueForVariableName as $, updateChartDatasourcesByComponent as T } from "../../../../utils/page-helper-util.js";
+import { handleChartEvent as j, getCustomFunc as F } from "../../../../utils/events/event-util.js";
 import k from "./group-column.vue.js";
 import N from "./normal-column.vue.js";
 import I from "./table-pageination.vue.js";
@@ -9,10 +9,10 @@ import { getSummaryTitleColumn as R, getSummaryDataColumn as H, rowDataToColumn
 import { deepCopy as B } from "../../../../utils/common-util.js";
 const M = e({ __name: "table-runtime", props: { configure: { type: Object, default: () => ({}) }, pageContext: { type: Object, default: () => ({}) } }, setup(e2, { expose: M2 }) {
   var _a;
-  const Q = e2, X = Q.configure.runtime ? Q.configure.runtime : {}, Y = X.style, Z = X.class, ee = X.dataConfig, oe = X.headerInfo ? X.headerInfo : {}, re = o(null), te = o(X.props.isEnableGroupHeader), ne = o([]), ie = o([]), ae = o([]), ue = o([]), pe = o({}), le = o(false), se = o({}), ce = o({}), ge = o({}), fe = [], me = o({}), de = o({}), he = o(null), ve = r(() => te.value ? ue.value.filter((e3) => !e3.isLeaf || De(pe[e3.columnUuid])) : ie.value.filter((e3) => De(e3))), Ce = o(0);
-  let ye = [];
+  const Q = e2, X = Q.configure.runtime ? Q.configure.runtime : {}, Y = X.style, Z = X.class, ee = X.dataConfig, oe = X.headerInfo ? X.headerInfo : {}, re = o(null), ne = o(X.props.isEnableGroupHeader), te = o([]), ie = o([]), ae = o([]), ue = o([]), pe = o({}), le = o(false), se = o({}), ce = o({}), ge = o({}), fe = [], me = o({}), de = o({}), he = o(null), ve = r(() => ne.value ? ue.value.filter((e3) => !e3.isLeaf || De(pe[e3.columnUuid])) : ie.value.filter((e3) => De(e3))), ye = o(0);
+  let Ce = [];
   if (!Q.configure.props.modelCustom) {
-    if (te.value) {
+    if (ne.value) {
       const e3 = [];
       Q.configure.props.groupHeaders.forEach((o2) => {
         o2.parentUuid || e3.push(o2);
@@ -32,42 +32,42 @@ const M = e({ __name: "table-runtime", props: { configure: { type: Object, defau
   let be = 300, xe = x(Q.pageContext, Q.configure);
   function Oe(e3) {
     if (e3 || (e3 = []), Array.isArray(e3) && (e3 = e3.length > 0 ? e3[0] : {}), e3 || (e3 = {}), e3.hasRender) return void (e3.hasRender = true);
-    const o2 = te.value ? ue.value : ve;
-    $(Q.pageContext, Q.configure, "beforeUpdateChart", o2, { resultData: e3 }), function(e4) {
+    const o2 = ne.value ? ue.value : ve;
+    j(Q.pageContext, Q.configure, "beforeUpdateChart", o2, { resultData: e3 }), function(e4) {
       var _a2;
-      Je(e4), "service" === Q.configure.props.dataOrigin.dataSource && e4.result ? ye = e4.result[Q.configure.props.dataOrigin.service.serviceDataField] : "variable" === Q.configure.props.dataOrigin.dataSource && (ye = S(Q.pageContext.entity, Q.configure.props.dataOrigin.variable));
-      if (ye) if (((_a2 = Q.configure.props) == null ? void 0 : _a2.dataOrigin.limitEnable) && Q.configure.props.dataOrigin.itemNumSource) {
+      Je(e4), "service" === Q.configure.props.dataOrigin.dataSource && e4.result ? Ce = e4.result[Q.configure.props.dataOrigin.service.serviceDataField] : "variable" === Q.configure.props.dataOrigin.dataSource && (Ce = S(Q.pageContext.entity, Q.configure.props.dataOrigin.variable));
+      if (Ce) if (((_a2 = Q.configure.props) == null ? void 0 : _a2.dataOrigin.limitEnable) && Q.configure.props.dataOrigin.itemNumSource) {
         let o3 = 10;
         if ("fix" === Q.configure.props.dataOrigin.itemNumSource) o3 = Q.configure.props.dataOrigin.itemNumFix;
         else if ("variable" === Q.configure.props.dataOrigin.itemNumSource) {
           o3 = Number(S(Q.pageContext.entity, Q.configure.props.dataOrigin.itemNumVariable));
-          const r2 = Q.configure.props.dataOrigin.itemNumVariable.match(/\${(.*?)}/), t2 = r2 ? r2[1].split(".") : [], i2 = JSON.parse(JSON.stringify(ye));
-          n(() => t2.reduce((e5, o4) => e5[o4], Q.pageContext.entity), (o4) => {
+          const r2 = Q.configure.props.dataOrigin.itemNumVariable.match(/\${(.*?)}/), n2 = r2 ? r2[1].split(".") : [], i2 = JSON.parse(JSON.stringify(Ce));
+          t(() => n2.reduce((e5, o4) => e5[o4], Q.pageContext.entity), (o4) => {
             Se(o4, i2, e4);
           });
         }
-        Se(o3, ye, e4);
-      } else we(ye, e4);
-    }(e3), e3.hasRender = true, ee && (ee.autoRefresh = false), $(Q.pageContext, Q.configure, "afterUpdateChart", o2, { resultData: e3 });
+        Se(o3, Ce, e4);
+      } else we(Ce, e4);
+    }(e3), e3.hasRender = true, ee && (ee.autoRefresh = false), j(Q.pageContext, Q.configure, "afterUpdateChart", o2, { resultData: e3 });
   }
   function Se(e3, o2, r2) {
     var _a2;
     if (e3 && e3 < o2.length) {
-      let t2 = [];
-      if (((_a2 = Q.configure.props.dataOrigin.limitCountColumns) == null ? void 0 : _a2.length) > 0) t2 = Q.configure.props.dataOrigin.limitCountColumns;
+      let n2 = [];
+      if (((_a2 = Q.configure.props.dataOrigin.limitCountColumns) == null ? void 0 : _a2.length) > 0) n2 = Q.configure.props.dataOrigin.limitCountColumns;
       else {
         ie.value.filter((e4) => "number" === e4.props.base.dataType).forEach((e4) => {
-          t2.push(e4.props.base.prop);
+          n2.push(e4.props.base.prop);
         });
       }
-      if ((t2 == null ? void 0 : t2.length) > 0) {
-        const r3 = o2.slice(e3 - 1, o2.length), n2 = {};
+      if ((n2 == null ? void 0 : n2.length) > 0) {
+        const r3 = o2.slice(e3 - 1, o2.length), t2 = {};
         let i2 = ie.value[0].props.base.prop;
         "$index" === i2 && (i2 = ie.value[1].props.base.prop), r3.forEach((e4) => {
-          t2.forEach((o3) => {
-            void 0 === n2[o3] && (n2[o3] = 0), n2[o3] = n2[o3] + e4[o3];
+          n2.forEach((o3) => {
+            void 0 === t2[o3] && (t2[o3] = 0), t2[o3] = t2[o3] + e4[o3];
           });
-        }), o2.length > e3 && (o2 = o2.slice(0, e3 - 1)), n2[i2] = Q.configure.props.dataOrigin.overItemAlias, o2.push(n2);
+        }), o2.length > e3 && (o2 = o2.slice(0, e3 - 1)), t2[i2] = Q.configure.props.dataOrigin.overItemAlias, o2.push(t2);
       }
       we(o2, r2);
     } else we(o2, r2);
@@ -75,34 +75,34 @@ const M = e({ __name: "table-runtime", props: { configure: { type: Object, defau
   function we(e3, o2) {
     var _a2, _b, _c, _d, _e, _f, _g;
     if (Ee("rowToColumn")) {
-      if (ae.value = JSON.parse(JSON.stringify(Q.configure.items)), e3 = D(e3, Q.configure, ae.value), !te.value) {
+      if (ae.value = JSON.parse(JSON.stringify(Q.configure.items)), e3 = D(e3, Q.configure, ae.value), !ne.value) {
         const o3 = function(e4, o4, r2) {
           var _a3, _b2;
-          const t2 = Q.configure.props.dataOrigin.rowToColumn.titleColumns, n2 = Q.configure.props.dataOrigin.rowToColumn.dataColumns, i2 = e4.props.dataOrigin.groupField;
+          const n2 = Q.configure.props.dataOrigin.rowToColumn.titleColumns, t2 = Q.configure.props.dataOrigin.rowToColumn.dataColumns, i2 = e4.props.dataOrigin.groupField;
           if ((!i2 || 0 === i2.length) && r2.length > 0) {
-            const o5 = [], t3 = _("$GroupColumn", Q.configure.props.dataOrigin.rowToColumn.firstColumnTitle, 0, "string");
-            return ((_b2 = (_a3 = e4.props.dataOrigin) == null ? void 0 : _a3.rowToColumn) == null ? void 0 : _b2.minTitleColumnWidth) && (t3.props.base.minWidth = e4.props.dataOrigin.rowToColumn.minTitleColumnWidth), o5.push(t3), Object.keys(r2[0]).forEach((r3, t4) => {
+            const o5 = [], n3 = _("$GroupColumn", Q.configure.props.dataOrigin.rowToColumn.firstColumnTitle, 0, "string");
+            return ((_b2 = (_a3 = e4.props.dataOrigin) == null ? void 0 : _a3.rowToColumn) == null ? void 0 : _b2.minTitleColumnWidth) && (n3.props.base.minWidth = e4.props.dataOrigin.rowToColumn.minTitleColumnWidth), o5.push(n3), Object.keys(r2[0]).forEach((r3, n4) => {
               var _a4, _b3, _c2, _d2, _e2, _f2;
               if ("$GroupColumn" === r3) return;
-              const n3 = _(r3, r3, t4 + 1, "string");
-              ((_b3 = (_a4 = e4.props.dataOrigin) == null ? void 0 : _a4.rowToColumn) == null ? void 0 : _b3.minDataColumnWidth) && (n3.props.base.minWidth = e4.props.dataOrigin.rowToColumn.minDataColumnWidth), ((_d2 = (_c2 = e4.props.dataOrigin) == null ? void 0 : _c2.rowToColumn) == null ? void 0 : _d2.cellStyle) && (me.value[n3.props.base.prop] = { cellStyle: (_f2 = (_e2 = e4.props.dataOrigin) == null ? void 0 : _e2.rowToColumn) == null ? void 0 : _f2.cellStyle }), o5.push(n3);
+              const t3 = _(r3, r3, n4 + 1, "string");
+              ((_b3 = (_a4 = e4.props.dataOrigin) == null ? void 0 : _a4.rowToColumn) == null ? void 0 : _b3.minDataColumnWidth) && (t3.props.base.minWidth = e4.props.dataOrigin.rowToColumn.minDataColumnWidth), ((_d2 = (_c2 = e4.props.dataOrigin) == null ? void 0 : _c2.rowToColumn) == null ? void 0 : _d2.cellStyle) && (me.value[t3.props.base.prop] = { cellStyle: (_f2 = (_e2 = e4.props.dataOrigin) == null ? void 0 : _e2.rowToColumn) == null ? void 0 : _f2.cellStyle }), o5.push(t3);
             }), o5;
           }
           {
-            const e5 = [...o4].filter((e6) => !t2.includes(e6.props.base.prop) && !n2.includes(e6.props.base.prop)), i3 = new RegExp(`(${n2.join("|")})$`), a2 = /* @__PURE__ */ new Set();
+            const e5 = [...o4].filter((e6) => !n2.includes(e6.props.base.prop) && !t2.includes(e6.props.base.prop)), i3 = new RegExp(`(${t2.join("|")})$`), a2 = /* @__PURE__ */ new Set();
             return r2.forEach((e6) => {
               Object.keys(e6).forEach((e7) => {
-                if (n2.some((o5) => e7.includes(o5))) {
+                if (t2.some((o5) => e7.includes(o5))) {
                   const o5 = e7.split(i3)[0];
                   a2.add(o5);
                 }
               });
             }), a2.forEach((o5) => {
-              n2.forEach((t3) => {
+              t2.forEach((n3) => {
                 var _a4;
-                let n3 = (_a4 = ie.value.find((e6) => e6.props.base.prop === t3)) == null ? void 0 : _a4.props.base.name;
-                null == n3 && (n3 = "");
-                const i4 = _(`${o5}${t3}`, `${o5}${n3}`, e5.length + 1, "number" == typeof r2[0][`${o5}${t3}`] ? "number" : "string");
+                let t3 = (_a4 = ie.value.find((e6) => e6.props.base.prop === n3)) == null ? void 0 : _a4.props.base.name;
+                null == t3 && (t3 = "");
+                const i4 = _(`${o5}${n3}`, `${o5}${t3}`, e5.length + 1, "number" == typeof r2[0][`${o5}${n3}`] ? "number" : "string");
                 e5.push(i4);
               });
             }), e5;
@@ -110,7 +110,7 @@ const M = e({ __name: "table-runtime", props: { configure: { type: Object, defau
         }(Q.configure, ae.value, e3);
         ie.value = o3;
       }
-    } else Ee("columnToRow") && (te.value || (ie.value = J(Q.configure)), e3 = U(e3, Q.configure));
+    } else Ee("columnToRow") && (ne.value || (ie.value = J(Q.configure)), e3 = U(e3, Q.configure));
     if ((_b = (_a2 = Q.configure.props) == null ? void 0 : _a2.dataOrigin) == null ? void 0 : _b.dataFormatting) {
       const o3 = F(Q.pageContext, Q.configure.props.dataOrigin.dataFormatting);
       if (o3) {
@@ -119,13 +119,13 @@ const M = e({ __name: "table-runtime", props: { configure: { type: Object, defau
       }
     }
     if (Object.keys(de.value).length > 0 && e3 && e3.length > 0 && W(de.value, e3, Q.pageContext.entity), ((_c = Q.configure.pageination) == null ? void 0 : _c.enable) ? function(e4) {
-      "frontend" === Q.configure.pageination.type ? (Ce.value = ye.length, Re(1, Q.configure.pageination.pageSize)) : "backend" === Q.configure.pageination.type && (ne.value = ye, Q.configure.pageination.totalFrom && (Ce.value = e4.result[Q.configure.pageination.totalFrom]));
-    }(o2) : ne.value = e3, ((_e = (_d = Q.configure.props) == null ? void 0 : _d.highOrder) == null ? void 0 : _e.groupField) && ((_g = (_f = Q.configure.props) == null ? void 0 : _f.highOrder) == null ? void 0 : _g.groupField.length) > 0) {
+      "frontend" === Q.configure.pageination.type ? (ye.value = Ce.length, Re(1, Q.configure.pageination.pageSize)) : "backend" === Q.configure.pageination.type && (te.value = Ce, Q.configure.pageination.totalFrom && (ye.value = e4.result[Q.configure.pageination.totalFrom]));
+    }(o2) : te.value = e3, ((_e = (_d = Q.configure.props) == null ? void 0 : _d.highOrder) == null ? void 0 : _e.groupField) && ((_g = (_f = Q.configure.props) == null ? void 0 : _f.highOrder) == null ? void 0 : _g.groupField.length) > 0) {
       const e4 = Q.configure.props.highOrder.groupField;
-      ne.value = function(e5, o3) {
+      te.value = function(e5, o3) {
         var _a3, _b2;
         if (0 === ge.value.length) return e5;
-        const r2 = [], t2 = (_a3 = Q.configure.items) == null ? void 0 : _a3.filter((e6) => o3.includes(e6.props.base.prop)), n2 = (_b2 = Q.configure.items) == null ? void 0 : _b2.filter((e6) => true === e6.props.base.groupSummary), i2 = {};
+        const r2 = [], n2 = (_a3 = Q.configure.items) == null ? void 0 : _a3.filter((e6) => o3.includes(e6.props.base.prop)), t2 = (_b2 = Q.configure.items) == null ? void 0 : _b2.filter((e6) => true === e6.props.base.groupSummary), i2 = {};
         e5.forEach((e6) => {
           const r3 = o3.map((o4) => e6[o4]).join("|");
           i2[r3] || (i2[r3] = []), i2[r3].push(e6);
@@ -133,16 +133,16 @@ const M = e({ __name: "table-runtime", props: { configure: { type: Object, defau
         const a2 = Object.values(i2);
         for (let e6 = 0; e6 < a2.length; e6++) {
           const o4 = a2[e6], i3 = {};
-          n2 == null ? void 0 : n2.forEach((e7) => {
-            const r3 = e7.props.base.prop, t3 = z(ge.value[r3], o4, r3, Q.pageContext);
-            i3[r3] = t3;
-          }), r2.push(...o4), t2 == null ? void 0 : t2.forEach((e7) => {
+          t2 == null ? void 0 : t2.forEach((e7) => {
+            const r3 = e7.props.base.prop, n3 = z(ge.value[r3], o4, r3, Q.pageContext, ve.value);
+            i3[r3] = n3;
+          }), r2.push(...o4), n2 == null ? void 0 : n2.forEach((e7) => {
             const r3 = e7.props.base.prop;
             i3[r3] = A(e7.props.base.summaryTitle, o4[0]);
           }), r2.push(i3), fe.push(r2.length - 1);
         }
         return r2;
-      }(ne.value, e4);
+      }(te.value, e4);
     }
     !function(e4) {
       if (Q.configure.props.base.showIndex && -1 === e4.findIndex((e5) => "$index" === e5.props.base.prop)) {
@@ -154,25 +154,25 @@ const M = e({ __name: "table-runtime", props: { configure: { type: Object, defau
   function Ee(e3) {
     return Q.configure.props.dataOrigin.transition === e3 && Q.configure.props.dataOrigin[e3].titleColumns && Q.configure.props.dataOrigin[e3].titleColumns.length > 0 && Q.configure.props.dataOrigin[e3].dataColumns && Q.configure.props.dataOrigin[e3].dataColumns.length > 0;
   }
-  function Te(e3) {
+  function $e(e3) {
     const o2 = me.value[e3.column.property] ? me.value[e3.column.property].titleStyle : null, r2 = Y == null ? void 0 : Y.titleStyle;
     return V(e3, { cellTitleStyle: o2, titleStyle: r2 }, Q);
   }
-  function je(e3) {
+  function Te(e3) {
     return G(e3, fe, Q);
   }
-  function $e(e3) {
+  function je(e3) {
     const o2 = me.value[e3.column.property] ? me.value[e3.column.property].cellStyle : null;
     return K(e3, o2, Q);
   }
-  xe && xe.fixHeight && (be = xe.fixHeight), xe && xe.maxHeight && (be = xe.maxHeight), be && (be = Number(be + "")), t(() => {
+  xe && xe.fixHeight && (be = xe.fixHeight), xe && xe.maxHeight && (be = xe.maxHeight), be && (be = Number(be + "")), n(() => {
     const e3 = O(Q.pageContext, Q.configure);
     if (e3) Oe(e3);
     else if ("variable" === Q.configure.props.dataOrigin.dataSource) {
       !function() {
         const e4 = Q.configure.props.dataOrigin.variable.match(/\${(.*?)}/), o3 = e4 ? e4[1].split(".") : [];
-        n(() => o3.reduce((e5, o4) => e5[o4], Q.pageContext.entity), (e5) => {
-          e5 ? Oe(JSON.parse(JSON.stringify(e5))) : (ne.value = [], Q.configure.props.modelCustom ? Je(null) : te.value ? ue.value = Q.configure.props.groupHeaders : ie.value = Q.configure.items);
+        t(() => o3.reduce((e5, o4) => e5[o4], Q.pageContext.entity), (e5) => {
+          e5 ? Oe(JSON.parse(JSON.stringify(e5))) : (te.value = [], Q.configure.props.modelCustom ? Je(null) : ne.value ? ue.value = Q.configure.props.groupHeaders : ie.value = Q.configure.items);
         });
       }();
       const o2 = S(Q.pageContext.entity, Q.configure.props.dataOrigin.variable);
@@ -180,26 +180,28 @@ const M = e({ __name: "table-runtime", props: { configure: { type: Object, defau
     }
   });
   const Fe = (e3) => {
-    const { columns: o2, data: r2 } = e3, t2 = [];
+    const { columns: o2, data: r2 } = e3, n2 = [];
     return o2.forEach((e4, o3) => {
-      if (se.value[e4.property]) {
-        const n2 = se.value[e4.property].label;
-        t2[o3] = y("div", {}, [A(n2, r2)]);
+      if (se.value[e4.property] || "index" === e4.type && se.value.$index) {
+        let t2 = e4.property;
+        "index" === e4.type && (t2 = "$index");
+        const i2 = se.value[t2].label;
+        n2[o3] = C("div", {}, [A(i2, r2)]);
       } else if (ce.value[e4.property]) {
-        const n2 = r2.filter((e5, o4) => !fe.includes(o4));
-        t2[o3] = z(ce.value[e4.property], n2, e4.property, Q.pageContext);
+        const t2 = r2.filter((e5, o4) => !fe.includes(o4));
+        n2[o3] = z(ce.value[e4.property], t2, e4.property, Q.pageContext, ve.value);
       }
-    }), t2;
+    }), n2;
   };
-  function ke({ row: e3, column: o2, rowIndex: r2, columnIndex: t2 }) {
-    const n2 = o2.property, i2 = Q.configure.props.highOrder;
+  function ke({ row: e3, column: o2, rowIndex: r2, columnIndex: n2 }) {
+    const t2 = o2.property, i2 = Q.configure.props.highOrder;
     if (i2.scopeFunc) {
-      const n3 = F(Q.pageContext, i2.scopeFunc);
-      if (n3) {
-        const i3 = n3.apply(n3, [{ tableData: ne.value, row: e3, column: o2, rowIndex: r2, columnIndex: t2 }]);
+      const t3 = F(Q.pageContext, i2.scopeFunc);
+      if (t3) {
+        const i3 = t3.apply(t3, [{ tableData: te.value, row: e3, column: o2, rowIndex: r2, columnIndex: n2 }]);
         if (i3) return i3;
       }
-    } else if (i2 && i2.mergeColumn, i2 && i2.mergeRow && i2.mergeRow.includes(n2)) return L(e3, o2, r2, n2, ne.value);
+    } else if (i2 && i2.mergeColumn, i2 && i2.mergeRow && i2.mergeRow.includes(t2)) return L(e3, o2, r2, t2, te.value);
   }
   function Ne(e3, o2) {
     "frontend" === Q.configure.pageination.type ? Re(e3, o2) : He(e3, o2);
@@ -208,10 +210,10 @@ const M = e({ __name: "table-runtime", props: { configure: { type: Object, defau
     "frontend" === Q.configure.pageination.type ? Re(e3, o2) : He(e3, o2);
   }
   function Re(e3, o2) {
-    ye && (ne.value = ye.slice((e3 - 1) * o2, e3 * o2));
+    Ce && (te.value = Ce.slice((e3 - 1) * o2, e3 * o2));
   }
   function He(e3, o2) {
-    Q.configure.pageination.currentPageSet && T(Q.pageContext.entity, Q.configure.pageination.currentPageSet, e3), Q.configure.pageination.pageSizeSet && T(Q.pageContext.entity, Q.configure.pageination.pageSizeSet, o2), j(Q.pageContext, Q.configure.uuid);
+    Q.configure.pageination.currentPageSet && $(Q.pageContext.entity, Q.configure.pageination.currentPageSet, e3), Q.configure.pageination.pageSizeSet && $(Q.pageContext.entity, Q.configure.pageination.pageSizeSet, o2), T(Q.pageContext, Q.configure.uuid);
   }
   function De(e3) {
     const o2 = e3.showCondition;
@@ -230,19 +232,19 @@ const M = e({ __name: "table-runtime", props: { configure: { type: Object, defau
   }
   function Ue(e3, o2, r2) {
     e3.forEach((e4) => {
-      const t2 = e4.props.base.prop, n2 = e4.props.base.name;
-      let i2 = { name: t2, label: n2, i18nKey: n2 };
+      const n2 = e4.props.base.prop, t2 = e4.props.base.name;
+      let i2 = { name: n2, label: t2, i18nKey: t2 };
       e4.children && e4.children.length > 0 && (i2.children = [], Ue(e4.children, i2.children, r2)), e4.props.format && e4.props.format.type && r2.push(e4), o2.push(i2);
     });
   }
   return M2({ updateChartDatas: Oe, exportChart: function() {
     let e3 = [], o2 = [];
-    o2 = te.value ? Q.configure.props.groupHeaders : ve.value;
+    o2 = ne.value ? Q.configure.props.groupHeaders : ve.value;
     let r2 = [];
     Ue(o2, e3, r2);
     return { isTable: true, dataArr: function(e4) {
       let o3 = [];
-      ne.value && (o3 = B(ne.value), o3.forEach((o4) => {
+      te.value && (o3 = B(te.value), o3.forEach((o4) => {
         e4.forEach((e5) => {
           const r3 = q(o4, e5.props.format, e5, Q.pageContext, Q.configure);
           o4[e5.props.base.prop] = r3;
@@ -251,8 +253,8 @@ const M = e({ __name: "table-runtime", props: { configure: { type: Object, defau
       return o3;
     }(r2), columns: e3, title: oe == null ? void 0 : oe.title };
   } }), (o2, r2) => {
-    const t2 = i("el-table");
-    return u(), a("div", { style: l(s(Y)), class: p([s(Z), "amb-widget-chart amb-widget-flex amb-chart-table"]), ref: "thisRef" }, [c(g(b, { ref_key: "headerRef", ref: re, headerInfo: s(oe), configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["headerInfo", "configure", "pageContext"]), [[d, s(oe).showHeader || e2.pageContext.showHomepageSearch]]), g(t2, { ref_key: "gridRef", ref: he, data: ne.value, style: { width: "100%" }, "max-height": s(be), "header-cell-style": Te, "row-style": je, "cell-style": $e, border: true, "show-summary": le.value, stripe: e2.configure.props.base.stripe, "summary-method": Fe, "span-method": ke }, { default: h(() => [te.value ? (u(true), a(v, { key: 0 }, C(ue.value, (o3, r3) => (u(), a(v, { key: r3 }, [o3.isLeaf ? (u(), f(N, { key: 1, configure: e2.configure, pageContext: e2.pageContext, column: pe.value[o3.columnUuid] }, null, 8, ["configure", "pageContext", "column"])) : (u(), f(k, { key: 0, configure: e2.configure, pageContext: e2.pageContext, groupColumn: o3, columnsConfigKeyValues: pe.value }, null, 8, ["configure", "pageContext", "groupColumn", "columnsConfigKeyValues"]))], 64))), 128)) : (u(true), a(v, { key: 1 }, C(ve.value, (o3, r3) => (u(), f(N, { key: r3, column: o3, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["column", "configure", "pageContext"]))), 128))]), _: 1 }, 8, ["data", "max-height", "show-summary", "stripe"]), e2.configure.pageination && e2.configure.pageination.enable ? (u(), f(I, { key: 0, configure: e2.configure, "table-data": ne.value, total: Ce.value, onPageChange: Ne, onPageSizeChange: Ie }, null, 8, ["configure", "table-data", "total"])) : m("", true)], 6);
+    const n2 = i("el-table");
+    return u(), a("div", { style: l(s(Y)), class: p([s(Z), "amb-widget-chart amb-widget-flex amb-chart-table"]), ref: "thisRef" }, [c(g(b, { ref_key: "headerRef", ref: re, headerInfo: s(oe), configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["headerInfo", "configure", "pageContext"]), [[d, s(oe).showHeader || e2.pageContext.showHomepageSearch]]), g(n2, { ref_key: "gridRef", ref: he, data: te.value, style: { width: "100%" }, "max-height": s(be), "header-cell-style": $e, "row-style": Te, "cell-style": je, border: true, "show-summary": le.value, stripe: e2.configure.props.base.stripe, "summary-method": Fe, "span-method": ke }, { default: h(() => [ne.value ? (u(true), a(v, { key: 0 }, y(ue.value, (o3, r3) => (u(), a(v, { key: r3 }, [o3.isLeaf ? (u(), f(N, { key: 1, configure: e2.configure, pageContext: e2.pageContext, column: pe.value[o3.columnUuid] }, null, 8, ["configure", "pageContext", "column"])) : (u(), f(k, { key: 0, configure: e2.configure, pageContext: e2.pageContext, groupColumn: o3, columnsConfigKeyValues: pe.value }, null, 8, ["configure", "pageContext", "groupColumn", "columnsConfigKeyValues"]))], 64))), 128)) : (u(true), a(v, { key: 1 }, y(ve.value, (o3, r3) => (u(), f(N, { key: r3, column: o3, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["column", "configure", "pageContext"]))), 128))]), _: 1 }, 8, ["data", "max-height", "show-summary", "stripe"]), e2.configure.pageination && e2.configure.pageination.enable ? (u(), f(I, { key: 0, configure: e2.configure, "table-data": te.value, total: ye.value, onPageChange: Ne, onPageSizeChange: Ie }, null, 8, ["configure", "table-data", "total"])) : m("", true)], 6);
   };
 } });
 export {