super-page-runtime 2.3.12-sit1 → 2.3.12

package/dist/es/components/runtime/views/assemblys/chart/common/common-chart-header.vue.js

@@ -3,12 +3,13 @@ import { Search as p } from "@element-plus/icons-vue";
 import g from "./common-chart-header-group.vue.js";
 import m from "./common-chart-header-breadcrumb.vue.js";
 import b from "./common-homepage-search.vue.js";
-import { setVariableValueWithProp as v, getValueFromSource as y, setValueForVariableName as w } from "../../../../utils/page-helper-util.js";
-const x = { class: "amb-widget-chart-header" }, O = { class: "amb-widget-chart-header-item" }, k = { class: "amb-widget-chart-header-item amb-widget-chart-header-center" }, j = { class: "amb-widget-chart-header-item" }, C = { key: 0, class: "amb-widget-chart-header-item" }, P = e({ __name: "common-chart-header", props: { headerInfo: { type: Object, required: true }, configure: { type: Object, required: true }, pageContext: { type: Object, required: true } }, emits: ["drill-end"], setup(e2, { expose: P2, emit: _ }) {
+import { setVariableValueWithProp as v, getValueFromSource as y, setValueForVariableName as O } from "../../../../utils/page-helper-util.js";
+const w = { class: "amb-widget-chart-header" }, x = { class: "amb-widget-chart-header-item" }, k = { class: "amb-widget-chart-header-item amb-widget-chart-header-center" }, j = { class: "amb-widget-chart-header-item" }, C = { key: 0, class: "amb-widget-chart-header-item" }, P = e({ __name: "common-chart-header", props: { headerInfo: { type: Object, required: true }, configure: { type: Object, required: true }, pageContext: { type: Object, required: true } }, emits: ["drill-end"], setup(e2, { expose: P2, emit: _ }) {
   const N = e2, D = o(null), A = o(), R = _;
   function S(e3) {
     const o2 = N.headerInfo.drillOptions.length;
-    if (!(e3 >= o2)) {
+    if (e3 >= o2) N.headerInfo.drillOptions;
+    else {
       for (let r2 = o2 - 1; r2 >= e3; r2--) N.headerInfo.drillOptions.splice(r2, 1);
       q(e3);
     }
@@ -34,7 +35,7 @@ const x = { class: "amb-widget-chart-header" }, O = { class: "amb-widget-chart-h
     for (let e4 of o2.variables) {
       if (!e4.fieldName || !e4.variable) continue;
       const o3 = y(r2, e4.fieldName, void 0);
-      w(N.pageContext.entity, e4.variable, o3);
+      O(N.pageContext.entity, e4.variable, o3);
     }
   }
   N.headerInfo.drillOptions || (N.headerInfo.drillOptions = []);
@@ -46,11 +47,12 @@ const x = { class: "amb-widget-chart-header" }, O = { class: "amb-widget-chart-h
     if (r2 + 1 >= N.headerInfo.options.length) {
       return F(o2 && e3.dataIndex < o2.length ? o2[e3.dataIndex] : void 0), void R("drill-end", e3);
     }
+    N.headerInfo.options;
     const n2 = N.headerInfo.options[r2], t2 = o2 && e3.dataIndex < o2.length ? o2[e3.dataIndex] : null, a2 = { fieldName: n2.target ? n2.target.replace(".", "_") : "", rawFieldName: n2.target ? n2.target : "", label: e3.name, value: e3.name, data: t2 };
     N.headerInfo.drillOptions.push(a2), q(r2 + 1);
   }, closeDrill: S }), (o2, v2) => {
-    const y2 = r("el-icon"), w2 = r("el-tooltip");
-    return t(), n("div", x, [a("div", O, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && (!e2.headerInfo.textAlign || "left" == e2.headerInfo.textAlign)]]), !e2.headerInfo.showDrill || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(m, { key: 0, ref_key: "drillObjRef", ref: D, headerInfo: e2.headerInfo, onCloseDrill: S }, null, 8, ["headerInfo"])), !e2.headerInfo.showGroup || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"]))]), a("div", k, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "center" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "center" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "center" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), a("div", j, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "right" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "right" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "right" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), e2.pageContext.showHomepageSearch ? (t(), n("div", C, [c(w2, { content: "打开查询弹窗", effect: "light" }, { default: I(() => [c(y2, { onClick: G }, { default: I(() => [c(u(p))]), _: 1 })]), _: 1 }), c(b, { ref_key: "commonHomepageSearchRef", ref: A, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"])])) : l("", true)]);
+    const y2 = r("el-icon"), O2 = r("el-tooltip");
+    return t(), n("div", w, [a("div", x, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && (!e2.headerInfo.textAlign || "left" == e2.headerInfo.textAlign)]]), !e2.headerInfo.showDrill || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(m, { key: 0, ref_key: "drillObjRef", ref: D, headerInfo: e2.headerInfo, onCloseDrill: S }, null, 8, ["headerInfo"])), !e2.headerInfo.showGroup || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"]))]), a("div", k, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "center" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "center" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "center" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), a("div", j, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "right" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "right" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "right" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), e2.pageContext.showHomepageSearch ? (t(), n("div", C, [c(O2, { content: "打开查询弹窗", effect: "light" }, { default: I(() => [c(y2, { onClick: G }, { default: I(() => [c(u(p))]), _: 1 })]), _: 1 }), c(b, { ref_key: "commonHomepageSearchRef", ref: A, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"])])) : l("", true)]);
   };
 } });
 export {

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

@@ -11,24 +11,24 @@ class ExpressionEvaluator {
     return this.evaluateExpression(o);
   }
   static createExpression(e, t, r) {
-    const { propName: o, operator: a, propValue: n, leftBracket: s, rightBracket: l, joinSign: i, dataType: c } = t;
+    const { propName: o, operator: n, propValue: a, leftBracket: s, rightBracket: l, joinSign: i, dataType: c } = t;
     if (!o || "" === o) return "";
     const u = getValueFromVariable(e.entity, o, r);
-    let p = `${s} ${this.getComparisonExpression(u, t, getValueFromVariable(e.entity, n, r))} ${l}`;
+    let p = `${s} ${this.getComparisonExpression(u, t, getValueFromVariable(e.entity, a, r))} ${l}`;
     return i && ("and" === i || "AND" === i ? p += "&&" : "or" !== i && "OR" !== i || (p += "||")), p.trim();
   }
   static getComparisonExpression(e, t, r) {
-    const { dataType: o, variableIsNull: a } = t;
-    let n = t.operator;
-    n || (n = "EQ");
+    const { dataType: o, variableIsNull: n } = t;
+    let a = t.operator;
+    a || (a = "EQ");
     let s = this.parseValue(e, o);
     const l = this.parseValue(r, o);
-    if (null == l && a) {
-      if (null == s && (s = "null"), "null" === a) return `${s} === null`;
-      if ("ignore" === a) return "1=1";
-      if ("notequal" === a) return "1!=1";
+    if (null == l && n) {
+      if (null == s && (s = "null"), "null" === n) return `${s} === null`;
+      if ("ignore" === n) return "1=1";
+      if ("notequal" === n) return "1!=1";
     }
-    switch (n) {
+    switch (a) {
       case "EQ":
         return `${s} === ${l}`;
       case "GT":
@@ -55,7 +55,7 @@ class ExpressionEvaluator {
         }
         return `[${l}].includes(${s})`;
       default:
-        throw new Error(`比较符号不匹配: ${n}`);
+        throw new Error(`比较符号不匹配: ${a}`);
     }
   }
   static changeDataType(e) {
@@ -86,7 +86,7 @@ class ExpressionEvaluator {
     try {
       return eval(expression);
     } catch (e) {
-      return false;
+      return console.error("表达式错误:", expression, e), false;
     }
   }
 }
@@ -114,39 +114,40 @@ function getSummaryDataColumn(e, t) {
   const r = {};
   return ((_a = e.props.summaries) == null ? void 0 : _a.dataColumn) && e.props.summaries.dataColumn.length > 0 && e.props.summaries.dataColumn.forEach((o) => {
     var _a2;
-    const a = (_a2 = e.items) == null ? void 0 : _a2.find((e2) => o.prop === e2.props.base.prop);
-    a && ("table" === t && a.props.base.tableSummary || "group" === t && a.props.base.groupSummary) && (r[o.prop] = o);
+    const n = (_a2 = e.items) == null ? void 0 : _a2.find((e2) => o.prop === e2.props.base.prop);
+    n && ("table" === t && n.props.base.tableSummary || "group" === t && n.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";
+  let n = "";
+  const a = e.summaryMode, s = t.map((e2) => Number(e2[r])).filter((e2) => !Number.isNaN(e2));
+  if (s.length > 0) if ("custom" === a) {
+    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) {
+      console.error("自定义函数脚本错误:", t, e2);
     }
-    else a = " N/A";
-  } else switch (n) {
+    else n = " N/A";
+  } else switch (a) {
     case "sum":
-      a = ` ${s.reduce((e2, t2) => e2 + t2, 0)}`;
+      n = ` ${s.reduce((e2, t2) => e2 + t2, 0)}`;
       break;
     case "avg":
-      a = " " + s.reduce((e2, t2) => e2 + t2, 0) / s.length;
+      n = " " + s.reduce((e2, t2) => e2 + t2, 0) / s.length;
       break;
     case "min":
-      a = ` ${Math.min(...s)}`;
+      n = ` ${Math.min(...s)}`;
       break;
     case "max":
-      a = ` ${Math.max(...s)}`;
+      n = ` ${Math.max(...s)}`;
       break;
     default:
-      a = " N/A";
+      n = " N/A";
   }
-  else a = " N/A";
-  return a;
+  else n = " N/A";
+  return n;
 }
 function replacePlaceholders(e, t) {
   if (e) return e.replace(/\$\{row\.(\w+)\}/g, (e2, r) => Object.prototype.hasOwnProperty.call(t, r) ? t[r] : "");
@@ -156,31 +157,33 @@ function getHeaderCellStyleUtil(e, t, r) {
   const o = {};
   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 a2 = getCustomFunc(r.pageContext, t2.scopeFunc);
-      if (a2) try {
-        false !== a2.apply(a2, [{ item: t2, data: e }]) && copyStyle(o, t2);
-      } catch (e2) {
+      const n2 = getCustomFunc(r.pageContext, t2.scopeFunc);
+      if (n2) try {
+        false !== n2.apply(n2, [{ item: t2, data: e }]) && copyStyle(o, t2);
+      } catch (r2) {
+        console.error("自定义函数脚本错误:", t2, e, r2);
       }
     } else copyStyle(o, t2);
   }));
-  const a = getCellStyleUtil(e, t.cellTitleStyle, r);
-  return a && Object.assign(o, a), o;
+  const n = getCellStyleUtil(e, t.cellTitleStyle, r);
+  return n && Object.assign(o, n), o;
 }
 function getRowStyleUtil(e, t, r) {
   const o = {};
   if (r.configure.style.rowStyle) for (let t2 = 0; t2 < r.configure.style.rowStyle.length; t2++) {
-    const a = r.configure.style.rowStyle[t2];
-    if (a.scopeFunc) {
-      const t3 = getCustomFunc(r.pageContext, a.scopeFunc);
+    const n = r.configure.style.rowStyle[t2];
+    if (n.scopeFunc) {
+      const t3 = getCustomFunc(r.pageContext, n.scopeFunc);
       if (t3) try {
         const r2 = t3.apply(t3, [{ data: e }]);
-        null != r2 && false !== r2 && copyStyle(o, a);
-      } catch (e2) {
+        null != r2 && false !== r2 && copyStyle(o, n);
+      } catch (t4) {
+        console.error("自定义函数脚本错误:", e, t4);
       }
-    } else if (a.matchingCondition) {
-      const t3 = ExpressionEvaluator.evaluate(r.pageContext, a.matchingCondition, e.row);
-      (t3 || void 0 === t3) && copyStyle(o, a);
-    } else copyStyle(o, a);
+    } else if (n.matchingCondition) {
+      const t3 = ExpressionEvaluator.evaluate(r.pageContext, n.matchingCondition, e.row);
+      (t3 || void 0 === t3) && copyStyle(o, n);
+    } else copyStyle(o, n);
   }
   if (t && t.length > 0 && -1 !== t.indexOf(e.rowIndex)) {
     const e2 = {};
@@ -193,18 +196,19 @@ function getRowStyleUtil(e, t, r) {
 }
 function getCellStyleUtil(e, t, r) {
   const o = {};
-  if (t) for (let a = 0; a < t.length; a++) {
-    const n = t[a];
-    if (isSetStyle(n)) if (n.scopeFunc) {
-      const t2 = getCustomFunc(r.pageContext, n.scopeFunc);
+  if (t) for (let n = 0; n < t.length; n++) {
+    const a = t[n];
+    if (isSetStyle(a)) if (a.scopeFunc) {
+      const t2 = getCustomFunc(r.pageContext, a.scopeFunc);
       if (t2) try {
-        false !== t2.apply(t2, [{ data: e }]) && copyStyle(o, n);
-      } catch (e2) {
+        false !== t2.apply(t2, [{ data: e }]) && copyStyle(o, a);
+      } catch (t3) {
+        console.error("自定义函数脚本错误:", e, t3);
       }
-    } else if (n.matchingCondition) {
-      const t2 = ExpressionEvaluator.evaluate(r.pageContext, n.matchingCondition, e.row);
-      (t2 || void 0 === t2) && copyStyle(o, n);
-    } else copyStyle(o, n);
+    } else if (a.matchingCondition) {
+      const t2 = ExpressionEvaluator.evaluate(r.pageContext, a.matchingCondition, e.row);
+      (t2 || void 0 === t2) && copyStyle(o, a);
+    } else copyStyle(o, a);
   }
   return o;
 }
@@ -216,33 +220,33 @@ function copyStyle(e, t) {
   Object.assign(e, t.style), t.customStyle && Object.assign(e, JSON.parse(t.customStyle));
 }
 function rowDataToColumn(e, t, r) {
-  const o = t.props.dataOrigin.groupField, a = t.props.dataOrigin.rowToColumn.titleColumns, n = t.props.dataOrigin.rowToColumn.dataColumns, s = [], l = {};
+  const o = t.props.dataOrigin.groupField, n = t.props.dataOrigin.rowToColumn.titleColumns, a = t.props.dataOrigin.rowToColumn.dataColumns, s = [], l = {};
   if (o && o.length > 0) e.forEach((e2) => {
     const t2 = o.map((t3) => e2[t3]).join("|");
     if (!l[t2]) {
       const r2 = {};
       o.forEach((t3) => r2[t3] = e2[t3]), l[t2] = r2, s.push(r2);
     }
-    n.forEach((r2) => {
-      const o2 = `${a.map((t3) => e2[t3]).join("")}${r2}`;
+    a.forEach((r2) => {
+      const o2 = `${n.map((t3) => e2[t3]).join("")}${r2}`;
       l[t2][o2] = e2[r2];
     });
   });
   else {
     const t2 = [];
     e.forEach((e2) => {
-      a.forEach((r2) => {
+      n.forEach((r2) => {
         e2[r2] && t2.push(e2[r2]);
       });
-    }), n.forEach((t3) => {
-      const o2 = {}, n2 = r.find((e2) => {
+    }), a.forEach((t3) => {
+      const o2 = {}, a2 = r.find((e2) => {
         var _a, _b;
         return ((_b = (_a = e2.props) == null ? void 0 : _a.base) == null ? void 0 : _b.prop) === t3;
       });
-      n2 && (o2.$GroupColumn = n2.props.base.name), e.forEach((e2) => {
-        a.forEach((r2) => {
-          const a2 = e2[r2], n3 = e2[t3];
-          o2[a2] = n3;
+      a2 && (o2.$GroupColumn = a2.props.base.name), e.forEach((e2) => {
+        n.forEach((r2) => {
+          const n2 = e2[r2], a3 = e2[t3];
+          o2[n2] = a3;
         });
       }), s.push(o2);
     });
@@ -250,9 +254,9 @@ function rowDataToColumn(e, t, r) {
   return s;
 }
 function colDataToRow(e, t) {
-  const r = t.props.dataOrigin.groupField, o = t.props.dataOrigin.columnToRow.titleColumns, a = t.props.dataOrigin.columnToRow.dataColumns, n = t.props.dataOrigin.columnToRow.transColumns, s = t.props.dataOrigin.columnToRow.dataColumnsMapping;
+  const r = t.props.dataOrigin.groupField, o = t.props.dataOrigin.columnToRow.titleColumns, n = t.props.dataOrigin.columnToRow.dataColumns, a = t.props.dataOrigin.columnToRow.transColumns, s = t.props.dataOrigin.columnToRow.dataColumnsMapping;
   if (0 === e.length) return e;
-  const l = [], i = groupBy(e, r), c = a.reduce((e2, t2) => t2.columns.length > e2.columns.length ? t2 : e2, a[0]), u = a.reduce((e2, t2) => (t2.columns.forEach((r2) => {
+  const l = [], i = groupBy(e, r), c = n.reduce((e2, t2) => t2.columns.length > e2.columns.length ? t2 : e2, n[0]), u = n.reduce((e2, t2) => (t2.columns.forEach((r2) => {
     e2[r2] = t2.prop;
   }), e2), {});
   return i.forEach((e2) => {
@@ -260,14 +264,14 @@ function colDataToRow(e, t) {
       const i2 = c.prop, p = {};
       if (r.forEach((t3) => {
         p[t3] = e2[t3];
-      }), p[i2] = e2[t2], a.length > 1) {
+      }), p[i2] = e2[t2], n.length > 1) {
         const r2 = s.find((e3) => e3.props.includes(t2));
         r2 && r2.props.length > 1 && r2.props.forEach((r3) => {
           r3 !== t2 && u[r3] && (p[u[r3]] = e2[r3]);
         });
       }
       o.forEach((e3) => {
-        const r2 = n.filter((t3) => t3.relatedTitle === e3.prop);
+        const r2 = a.filter((t3) => t3.relatedTitle === e3.prop);
         let o2 = false;
         r2 && r2.length > 0 && r2.forEach((r3) => {
           if (r3.columns.includes(t2)) return p[e3.prop] = r3.label, void (o2 = true);
@@ -277,25 +281,25 @@ function colDataToRow(e, t) {
   }), l;
 }
 function getColumnToRowTableConfig(e) {
-  const t = e.items, r = e.props.dataOrigin.groupField, o = e.props.dataOrigin.columnToRow.titleColumns, a = e.props.dataOrigin.columnToRow.dataColumns, n = [];
+  const t = e.items, r = e.props.dataOrigin.groupField, o = e.props.dataOrigin.columnToRow.titleColumns, n = e.props.dataOrigin.columnToRow.dataColumns, a = [];
   r && r.length > 0 && r.forEach((e2) => {
     if (t) {
       const r2 = t.find((t2) => t2.props.base.prop === e2);
-      r2 && n.push(r2);
+      r2 && a.push(r2);
     }
   });
-  return [...o, ...a].forEach((e2) => {
+  return [...o, ...n].forEach((e2) => {
     if (t) {
       const r2 = t.find((t2) => t2.props.base.prop === e2);
-      r2 ? n.push(r2) : 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: "" } } } });
+      r2 ? a.push(r2) : a.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: "" } } } });
     }
-  }), n;
+  }), a;
 }
 function groupBy(e, t) {
   const r = {};
   return e.forEach((e2) => {
     const o = t.map((t2) => e2[t2]).join("|");
-    r[o] || (r[o] = { ...e2, records: [] }, t.forEach((t2, a) => {
+    r[o] || (r[o] = { ...e2, records: [] }, t.forEach((t2, n) => {
       r[o][t2] = e2[t2];
     })), r[o].records.push(e2);
   }), Object.values(r).map((e2) => ({ ...e2, records: void 0 }));
@@ -323,7 +327,7 @@ function computeFormula(itemConfs, datas, entity) {
             r += Number(e2[t]);
           });
         } catch (e2) {
-          r = 0;
+          console.error("计算错误:", e2), r = 0;
         }
         totalValueMap[e] = r;
       } else (e.startsWith("${page.") || e.startsWith("${data.") || e.startsWith("${row.") || e.startsWith("${request.") || e.startsWith("${context.") || e.startsWith("${system.") || e.startsWith("${fixed.")) && (totalValueMap[e] = getValueFromVariable(entity, e, data));
@@ -335,7 +339,7 @@ function computeFormula(itemConfs, datas, entity) {
       try {
         data[key] = eval(expr);
       } catch (e) {
-        data[key] = 0;
+        console.error(itemConfs[key] + " 计算错误, 替换后表达式为：" + expr, e), data[key] = 0;
       }
     });
   });
@@ -343,19 +347,19 @@ function computeFormula(itemConfs, datas, entity) {
 function getFieldName(e) {
   return e.substring(6, e.length - 1);
 }
-function formatColContent(e, t, r, o, a) {
-  const n = e[r.props.base.prop];
+function formatColContent(e, t, r, o, n) {
+  const a = e[r.props.base.prop];
   switch (t.type) {
     case "number":
-      return formatNumber(n, t);
+      return formatNumber(a, t);
     case "currency":
-      return formatCurrency(n, t);
+      return formatCurrency(a, t);
     case "percent":
-      return formatPercent(n, t);
+      return formatPercent(a, t);
     case "custom":
-      return formatCustomFunc(e, t, r, o, a);
+      return formatCustomFunc(e, t, r, o, n);
     default:
-      return n;
+      return a;
   }
 }
 function formatNumber(e, t) {
@@ -370,28 +374,29 @@ function formatPercent(e, t) {
   let r = e;
   return r || (r = 0), t.decimalDigit && (r = Number(e).toFixed(t.decimalDigit)), r + " %";
 }
-function formatCustomFunc(e, t, r, o, a) {
-  const n = getCustomFunc(o, t.customFunc);
-  if (n) {
+function formatCustomFunc(e, t, r, o, n) {
+  const a = getCustomFunc(o, t.customFunc);
+  if (a) {
     try {
-      return n.apply(n, [{ pageContext: o, configureObj: a, row: e, prop: r.props.base.prop }]);
-    } catch (e2) {
+      return a.apply(a, [{ pageContext: o, configureObj: n, row: e, prop: r.props.base.prop }]);
+    } catch (t2) {
+      console.error("自定义函数脚本错误:", e, t2);
     }
     return "";
   }
 }
-function mergeRowByProperty(e, t, r, o, a) {
-  const n = e[o];
+function mergeRowByProperty(e, t, r, o, n) {
+  const a = e[o];
   let s = 1, l = true;
   for (let e2 = r - 1; e2 >= 0; e2--) {
-    if (a[e2][o] === n) {
+    if (n[e2][o] === a) {
       l = false;
       break;
     }
     break;
   }
   if (!l) return [0, 0];
-  for (let e2 = r + 1; e2 < a.length && a[e2][o] === n; e2++) s++;
+  for (let e2 = r + 1; e2 < n.length && n[e2][o] === a; e2++) s++;
   return [s, 1];
 }
 export {

package/dist/es/components/runtime/views/assemblys/common/export-form-report-dialog.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent as e, ref as t, onMounted as l, resolveComponent as a, createBlock as o, openBlock as u, withCtx as p, createVNode as s, createTextVNode as r, toDisplayString as n } from "vue";
+import { defineComponent as e, ref as t, onMounted as l, resolveComponent as a, createBlock as o, openBlock as u, withCtx as p, createVNode as n, createTextVNode as s, toDisplayString as r } from "vue";
 import { packageTemplateFiles as i } from "../../../utils/common-util.js";
 import { ElMessage as m } from "element-plus";
 const c = "${", d = "}", g = e({ __name: "export-form-report-dialog", props: { configure: { type: Object, required: true }, pageContext: { type: Object, required: true } }, emits: ["export", "close"], setup(e2, { emit: g2 }) {
@@ -7,7 +7,7 @@ const c = "${", d = "}", g = e({ __name: "export-form-report-dialog", props: { c
   function N(e3) {
     let t2, l2, a2 = e3;
     const o2 = a2.indexOf(c), u2 = a2.indexOf(d);
-    return -1 !== o2 && -1 !== u2 ? (o2 > u2 ? a2 = a2.substring(0, u2) + a2.substring(u2 + 1) : (t2 = a2.substring(o2 + 2, u2), l2 = a2.substring(o2, u2 + 1), x.value.push(t2), a2 = a2.replace(l2, "")), N(a2)) : x.value;
+    return -1 !== o2 && -1 !== u2 ? (o2 > u2 ? a2 = a2.substring(0, u2) + a2.substring(u2 + 1) : (t2 = a2.substring(o2 + 2, u2), l2 = a2.substring(o2, u2 + 1), x.value.push(t2), x.value, a2 = a2.replace(l2, "")), N(a2)) : x.value;
   }
   function O(e3) {
     v("export", f.configure, e3);
@@ -17,16 +17,18 @@ const c = "${", d = "}", g = e({ __name: "export-form-report-dialog", props: { c
   }
   return l(() => {
     y.templateFiles && y.templateFiles.length > 0 ? h.value = i(y.templateFiles, f.pageContext, f.configure) : y.templateUuid && y.templateName && h.value.push({ templateUuid: y.templateUuid, templateName: y.templateName }), h.value.forEach((e3) => {
-      var t2;
-      e3 && e3.templateName && (e3.templateName = (N(t2 = e3.templateName).forEach((e4) => {
-        const l2 = c + e4 + d;
-        let a2;
-        -1 !== t2.indexOf(l2) && Object.prototype.hasOwnProperty.call(w, e4) && (a2 = w[e4] ? w[e4] : "", t2 = t2.replace(l2, a2));
-      }), t2));
+      e3 && e3.templateName && (e3.templateName = function(e4) {
+        const t2 = N(e4);
+        return t2.forEach((t3) => {
+          const l2 = c + t3 + d;
+          let a2;
+          -1 !== e4.indexOf(l2) && Object.prototype.hasOwnProperty.call(w, t3) && (a2 = w[t3] ? w[t3] : "", e4 = e4.replace(l2, a2));
+        }), e4;
+      }(e3.templateName));
     }), h.value && 0 !== h.value.length || (m({ message: "无符合条件可导出的模板！", type: "warning" }), v("close")), 1 === (h == null ? void 0 : h.value.length) ? (O(h.value[0]), v("close")) : b.value = true;
   }), (e3, t2) => {
     const l2 = a("el-table-column"), i2 = a("el-button"), m2 = a("el-table"), c2 = a("el-dialog");
-    return u(), o(c2, { modelValue: b.value, "onUpdate:modelValue": t2[0] || (t2[0] = (e4) => b.value = e4), "show-close": true, "append-to-body": true, title: e3.$t("superPageRuntimeMessage.selectTemplate"), onClose: _ }, { default: p(() => [s(m2, { data: h.value, style: { width: "100%" } }, { default: p(() => [s(l2, { label: e3.$t("superPageRuntimeMessage.temlpate"), prop: "templateShowPath" }, { default: p((e4) => [r(n(e4.row.templateName), 1)]), _: 1 }, 8, ["label"]), s(l2, { label: e3.$t("superPageRuntimeMessage.operating"), width: "200", fixed: "right" }, { default: p((t3) => [s(i2, { type: "text", size: "small", onClick: (e4) => O(t3.row) }, { default: p(() => [r(n(e3.$t("superPageRuntimeMessage.export")), 1)]), _: 2 }, 1032, ["onClick"])]), _: 1 }, 8, ["label"])]), _: 1 }, 8, ["data"])]), _: 1 }, 8, ["modelValue", "title"]);
+    return u(), o(c2, { modelValue: b.value, "onUpdate:modelValue": t2[0] || (t2[0] = (e4) => b.value = e4), "show-close": true, "append-to-body": true, title: e3.$t("superPageRuntimeMessage.selectTemplate"), onClose: _ }, { default: p(() => [n(m2, { data: h.value, style: { width: "100%" } }, { default: p(() => [n(l2, { label: e3.$t("superPageRuntimeMessage.temlpate"), prop: "templateShowPath" }, { default: p((e4) => [s(r(e4.row.templateName), 1)]), _: 1 }, 8, ["label"]), n(l2, { label: e3.$t("superPageRuntimeMessage.operating"), width: "200", fixed: "right" }, { default: p((t3) => [n(i2, { type: "text", size: "small", onClick: (e4) => O(t3.row) }, { default: p(() => [s(r(e3.$t("superPageRuntimeMessage.export")), 1)]), _: 2 }, 1032, ["onClick"])]), _: 1 }, 8, ["label"])]), _: 1 }, 8, ["data"])]), _: 1 }, 8, ["modelValue", "title"]);
   };
 } });
 export {

package/dist/es/components/runtime/views/assemblys/container/fixed/YxAffix.vue2.js

@@ -19,6 +19,7 @@ const p = e({ __name: "YxAffix", props: { offset: { type: Number, default: 0 },
         B.value = l2 ?? 0, R(n2 || i2 || false, e3);
       }
     } catch (e3) {
+      console.error(e3);
     }
   }, R = (e3, t2) => {
     var _a;
@@ -55,6 +56,7 @@ const p = e({ __name: "YxAffix", props: { offset: { type: Number, default: 0 },
           })();
           b.value = e3, T.value = e3[0], b.value.forEach((e4) => e4.addEventListener("scroll", z)), window.addEventListener("resize", L), S();
         } catch (e3) {
+          console.error(e3);
         }
       });
     }, 100);

package/dist/es/components/runtime/views/assemblys/data/bar-code/barcode-runtime.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent as e, computed as t, ref as a, onMounted as r, watch as l, resolveComponent as o, createBlock as u, openBlock as n, normalizeStyle as i, normalizeClass as s, unref as p, withCtx as c, createElementBlock as m, createCommentVNode as f, toDisplayString as g } from "vue";
+import { defineComponent as e, computed as t, ref as r, onMounted as a, watch as o, resolveComponent as l, createBlock as n, openBlock as u, normalizeStyle as i, normalizeClass as s, unref as c, withCtx as p, createElementBlock as m, createCommentVNode as f, toDisplayString as g } from "vue";
 import d from "qrcode";
 import v from "jsbarcode";
 import { getFormModelFields as y } from "../../../../utils/page-init-util.js";
@@ -12,7 +12,7 @@ const j = ["src"], D = e({ __name: "barcode-runtime", props: { pageContext: {},
   let k = y(q.pageContext, q.configure);
   const A = t({ get: () => x(N, k), set(e3) {
     h(N, k, e3);
-  } }), E = q.configure.runtime ? q.configure.runtime : {}, _ = a(E.props ? E.props : {}), O = E.style, P = E.class, S = E.headerStyle, $ = a(""), I = a(null), Q = a(_.value.brCodeFormat ?? "CODE128"), V = a([]);
+  } }), E = q.configure.runtime ? q.configure.runtime : {}, _ = r(E.props ? E.props : {}), O = E.style, P = E.class, S = E.headerStyle, $ = r(""), I = r(null), Q = r(_.value.brCodeFormat ?? "CODE128"), V = r([]);
   function F(e3) {
     return h(N, k, e3);
   }
@@ -22,31 +22,32 @@ const j = ["src"], D = e({ __name: "barcode-runtime", props: { pageContext: {},
   function L(e3) {
     var t2;
     "QR-code" === _.value.type ? (t2 = e3, d.toDataURL(t2, (e4, t3) => {
-      e4 || ($.value = t3);
+      e4 ? console.error(e4) : $.value = t3;
     })) : function(e4) {
       try {
         v(I.value, e4, { format: Q.value });
       } catch (e5) {
+        console.error("生成条形码时发生错误:", e5);
       }
     }(e3);
   }
-  return r(() => {
+  return a(() => {
     _.value.generateRule && ("fixed" === _.value.generateRuleType ? (V.value = Array.from(_.value.generateRule.matchAll(/\$\{(\w+)\}/g), (e3) => e3[1]), V.value.forEach((e3) => {
-      l(() => q.pageContext.entity.data[e3], (e4, t2) => {
+      o(() => q.pageContext.entity.data[e3], (e4, t2) => {
         null != e4 && function() {
           let e5 = true;
           V.value.forEach((t3) => {
             q.pageContext.entity.data[t3] || (e5 = false);
           }), e5 && J(function(e6, t3) {
-            const a2 = /\$\{(\w+)\}/g;
-            return e6.replace(a2, (e7, a3) => t3.hasOwnProperty(a3) ? t3[a3] : e7);
+            const r2 = /\$\{(\w+)\}/g;
+            return e6.replace(r2, (e7, r3) => t3.hasOwnProperty(r3) ? t3[r3] : e7);
           }(_.value.generateRule, q.pageContext.entity.data));
         }();
       });
     })) : w.get(window.$vueApp.config.globalProperties.baseAPI + "/dc/setting-barcode-models/by-code/" + _.value.generateRule).then((e3) => {
       const t2 = JSON.parse(e3.barcodeModelItems);
       t2.forEach((e4) => {
-        "-1" !== e4.propDbName && -1 !== e4.propDbName && (V.value.push(e4.propDbName), l(() => q.pageContext.entity.data[e4.propDbName], (e5, a2) => {
+        "-1" !== e4.propDbName && -1 !== e4.propDbName && (V.value.push(e4.propDbName), o(() => q.pageContext.entity.data[e4.propDbName], (e5, r2) => {
           if (null != e5) {
             const e6 = b(t2, q.pageContext.entity.data);
             e6 && J(e6);
@@ -54,12 +55,13 @@ const j = ["src"], D = e({ __name: "barcode-runtime", props: { pageContext: {},
         }));
       });
     }).catch((e3) => {
+      console.error("获取条码规则失败:", e3);
     })), A.value && L(A.value);
   }), D2({ getValue: function() {
     return x(N, k);
   }, setValue: F }), (e3, t2) => {
-    const a2 = o("el-form-item");
-    return n(), u(a2, { required: !!_.value.required, class: s(p(P)), "label-width": _.value.labelWidth, style: i(p(O)) }, { label: c(() => [_.value.tittleShow ? (n(), m("div", { key: 0, style: i({ ...p(S) }) }, g(p(R)(_.value.title)), 5)) : f("", true)]), default: c(() => ["QR-code" === _.value.type ? (n(), m("img", { key: 0, src: $.value }, null, 8, j)) : (n(), m("canvas", { key: 1, ref_key: "barcode", ref: I }, null, 512))]), _: 1 }, 8, ["required", "class", "label-width", "style"]);
+    const r2 = l("el-form-item");
+    return u(), n(r2, { required: !!_.value.required, class: s(c(P)), "label-width": _.value.labelWidth, style: i(c(O)) }, { label: p(() => [_.value.tittleShow ? (u(), m("div", { key: 0, style: i({ ...c(S) }) }, g(c(R)(_.value.title)), 5)) : f("", true)]), default: p(() => ["QR-code" === _.value.type ? (u(), m("img", { key: 0, src: $.value }, null, 8, j)) : (u(), m("canvas", { key: 1, ref_key: "barcode", ref: I }, null, 512))]), _: 1 }, 8, ["required", "class", "label-width", "style"]);
   };
 } });
 export {