super-page-runtime 2.2.77-sit8 → 2.2.78

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

@@ -2,20 +2,20 @@ import { getParamNames, getValueFromVariable } from "../../../../utils/page-help
 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, r) {
-    const o = t.map((t2) => this.createExpression(e, t2, r)).join(" ");
-    return this.evaluateExpression(o);
+  static evaluate(e, t, o) {
+    const r = t.map((t2) => this.createExpression(e, t2, o)).join(" ");
+    return this.evaluateExpression(r);
   }
-  static createExpression(e, t, r) {
-    const { propName: o, operator: a, propValue: n, 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, a, getValueFromVariable(e.entity, n, r), c)} ${l}`;
+  static createExpression(e, t, o) {
+    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, r, o) {
+  static getComparisonExpression(e, t, o, r) {
     t || (t = "EQ");
-    const a = this.parseValue(e, o), n = this.parseValue(r, o);
+    const a = this.parseValue(e, r), n = this.parseValue(o, r);
     switch (t) {
       case "EQ":
         return `${a} === ${n}`;
@@ -37,8 +37,6 @@ class ExpressionEvaluator {
         return `${a} === null`;
       case "IS_NOT_NULL":
         return `${a} !== null`;
-      case "IN":
-        return `[${n}].includes(${a})`;
       default:
         throw new Error(`比较符号不匹配: ${t}`);
     }
@@ -50,7 +48,7 @@ class ExpressionEvaluator {
   static parseValue(e, t) {
     switch (t = this.changeDataType(t)) {
       case "number":
-        return getNumberValue(e);
+        return Number(e);
       case "date":
         return new Date(e).getTime();
       case "string":
@@ -63,22 +61,10 @@ class ExpressionEvaluator {
     try {
       return eval(expression);
     } catch (e) {
-      return false;
+      return console.error("表达式错误:", expression, e), false;
     }
   }
 }
-function getNumberValue(e) {
-  if (isNumber(e)) return Number(e);
-  if (e && e.indexOf(",") > 0) {
-    const t = e.split(","), r = [];
-    for (let e2 = 0; e2 < t.length; e2++) r.push(Number(t[e2]));
-    return r;
-  }
-  return e;
-}
-function isNumber(e) {
-  return "number" == typeof e && !isNaN(e);
-}
 function getSummaryTitleColumn(e) {
   var _a;
   const t = {};
@@ -88,22 +74,23 @@ function getSummaryTitleColumn(e) {
 }
 function getSummaryDataColumn(e, t) {
   var _a;
-  const r = {};
-  return ((_a = e.props.summaries) == null ? void 0 : _a.dataColumn) && e.props.summaries.dataColumn.length > 0 && e.props.summaries.dataColumn.forEach((o) => {
+  const o = {};
+  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 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);
-  }), r;
+    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, r, o) {
+function summaryStatistics(e, t, o, r) {
   let a = "";
-  const n = e.summaryMode, s = t.map((e2) => Number(e2[r])).filter((e2) => !Number.isNaN(e2));
+  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(o, e.customFunc);
+    const n2 = getCustomFunc(r, e.customFunc);
     if (n2) try {
-      const e2 = n2.apply(n2, [{ data: t, prop: r }]);
+      const e2 = n2.apply(n2, [{ data: t, prop: o }]);
       a = e2 ? ` ${e2}` : " N/A";
     } catch (e2) {
+      console.error("自定义函数脚本错误:", t, e2);
     }
     else a = " N/A";
   } else switch (n) {
@@ -126,64 +113,67 @@ function summaryStatistics(e, t, r, o) {
   return a;
 }
 function replacePlaceholders(e, t) {
-  if (e) return e.replace(/\$\{row\.(\w+)\}/g, (e2, r) => Object.prototype.hasOwnProperty.call(t, r) ? t[r] : "");
+  if (e) return e.replace(/\$\{row\.(\w+)\}/g, (e2, o) => Object.prototype.hasOwnProperty.call(t, o) ? t[o] : "");
 }
-function getHeaderCellStyleUtil(e, t, r) {
+function getHeaderCellStyleUtil(e, t, o) {
   var _a;
-  const o = {};
+  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 a2 = getCustomFunc(r.pageContext, t2.scopeFunc);
+      const a2 = getCustomFunc(o.pageContext, t2.scopeFunc);
       if (a2) try {
-        false !== a2.apply(a2, [{ item: t2, data: e }]) && copyStyle(o, t2);
-      } catch (e2) {
+        false !== a2.apply(a2, [{ item: t2, data: e }]) && copyStyle(r, t2);
+      } catch (o2) {
+        console.error("自定义函数脚本错误:", t2, e, o2);
       }
-    } else copyStyle(o, t2);
+    } else copyStyle(r, t2);
   }));
-  const a = getCellStyleUtil(e, t.cellTitleStyle, r);
-  return a && Object.assign(o, a), o;
+  const a = getCellStyleUtil(e, t.cellTitleStyle, o);
+  return a && Object.assign(r, a), r;
 }
-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];
+function getRowStyleUtil(e, t, o) {
+  const r = {};
+  if (o.configure.style.rowStyle) for (let t2 = 0; t2 < o.configure.style.rowStyle.length; t2++) {
+    const a = o.configure.style.rowStyle[t2];
     if (a.scopeFunc) {
-      const t3 = getCustomFunc(r.pageContext, a.scopeFunc);
+      const t3 = getCustomFunc(o.pageContext, a.scopeFunc);
       if (t3) try {
-        const r2 = t3.apply(t3, [{ data: e }]);
-        null != r2 && false !== r2 && copyStyle(o, a);
-      } catch (e2) {
+        const o2 = t3.apply(t3, [{ data: e }]);
+        null != o2 && false !== o2 && copyStyle(r, a);
+      } 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);
+      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 = {};
-    if (r.configure.style.collectStyle && r.configure.style.collectStyle.length > 0) for (let t2 = 0; t2 < r.configure.style.collectStyle.length; t2++) {
-      copyStyle(e2, r.configure.style.collectStyle[t2]);
+    if (o.configure.style.collectStyle && o.configure.style.collectStyle.length > 0) for (let t2 = 0; t2 < o.configure.style.collectStyle.length; t2++) {
+      copyStyle(e2, o.configure.style.collectStyle[t2]);
     }
     return 0 === Object.keys(e2).length && (e2["background-color"] = "var(--el-table-row-hover-bg-color)"), e2;
   }
-  return o;
+  return r;
 }
-function getCellStyleUtil(e, t, r) {
-  const o = {};
+function getCellStyleUtil(e, t, o) {
+  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(r.pageContext, n.scopeFunc);
+      const t2 = getCustomFunc(o.pageContext, n.scopeFunc);
       if (t2) try {
-        false !== t2.apply(t2, [{ data: e }]) && copyStyle(o, n);
-      } catch (e2) {
+        false !== t2.apply(t2, [{ data: e }]) && copyStyle(r, n);
+      } 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);
+      const t2 = ExpressionEvaluator.evaluate(o.pageContext, n.matchingCondition, e.row);
+      (t2 || void 0 === t2) && copyStyle(r, n);
+    } else copyStyle(r, n);
   }
-  return o;
+  return r;
 }
 function isSetStyle(e) {
   let t;
@@ -192,96 +182,96 @@ function isSetStyle(e) {
 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 = {};
-  if (o && o.length > 0) e.forEach((e2) => {
-    const t2 = o.map((t3) => e2[t3]).join("|");
+function rowDataToColumn(e, t, o) {
+  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 r2 = {};
-      o.forEach((t3) => r2[t3] = e2[t3]), l[t2] = r2, s.push(r2);
+      const o2 = {};
+      r.forEach((t3) => o2[t3] = e2[t3]), l[t2] = o2, s.push(o2);
     }
-    n.forEach((r2) => {
-      const o2 = `${a.map((t3) => e2[t3]).join("")}${r2}`;
-      l[t2][o2] = e2[r2];
+    n.forEach((o2) => {
+      const r2 = `${a.map((t3) => e2[t3]).join("")}${o2}`;
+      l[t2][r2] = e2[o2];
     });
   });
   else {
     const t2 = [];
     e.forEach((e2) => {
-      a.forEach((r2) => {
-        e2[r2] && t2.push(e2[r2]);
+      a.forEach((o2) => {
+        e2[o2] && t2.push(e2[o2]);
       });
     }), n.forEach((t3) => {
-      const o2 = {}, n2 = r.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 && (o2.$GroupColumn = n2.props.base.name), e.forEach((e2) => {
-        a.forEach((r2) => {
-          const a2 = e2[r2], n3 = e2[t3];
-          o2[a2] = 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(o2);
+      }), s.push(r2);
     });
   }
   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 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, 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) => {
-    e2[r2] = t2.prop;
+  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) => {
     c.columns.forEach((t2) => {
       const i2 = c.prop, p = {};
-      if (r.forEach((t3) => {
+      if (o.forEach((t3) => {
         p[t3] = e2[t3];
       }), p[i2] = e2[t2], a.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]);
+        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]);
         });
       }
-      o.forEach((e3) => {
-        const r2 = n.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);
-        }), o2 || (p[e3.prop] = t2);
+      r.forEach((e3) => {
+        const o2 = n.filter((t3) => t3.relatedTitle === e3.prop);
+        let r2 = false;
+        o2 && o2.length > 0 && o2.forEach((o3) => {
+          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, r = e.props.dataOrigin.groupField, o = e.props.dataOrigin.columnToRow.titleColumns, a = e.props.dataOrigin.columnToRow.dataColumns, n = [];
-  r && r.length > 0 && r.forEach((e2) => {
+  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 r2 = t.find((t2) => t2.props.base.prop === e2);
-      r2 && n.push(r2);
+      const o2 = t.find((t2) => t2.props.base.prop === e2);
+      o2 && n.push(o2);
     }
   });
-  return [...o, ...a].forEach((e2) => {
+  return [...r, ...a].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: "" } } } });
+      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: "" } } } });
     }
   }), n;
 }
 function groupBy(e, t) {
-  const r = {};
+  const o = {};
   return e.forEach((e2) => {
-    const o = t.map((t2) => e2[t2]).join("|");
-    r[o] || (r[o] = { ...e2, records: [] }, t.forEach((t2, a) => {
-      r[o][t2] = e2[t2];
-    })), r[o].records.push(e2);
-  }), Object.values(r).map((e2) => ({ ...e2, records: void 0 }));
+    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, r, o) {
-  return { uuid: (/* @__PURE__ */ new Date()).getTime(), name: "", props: { base: { prop: e, name: t, displayOrder: r, sortable: true, headerAlign: "center", align: "center", fixed: false, visible: true, dataType: o }, 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) => {
@@ -294,15 +284,15 @@ function computeFormula(itemConfs, datas, entity) {
       else if (e.startsWith("${avg.")) totalValueMap[e] = getAvgValue(datas, getFieldName(e));
       else if (e.startsWith("${add.")) {
         const t = getFieldName(e);
-        let r = 0;
+        let o = 0;
         try {
-          r = Number(data[t]), datas.slice(0, index).forEach((e2) => {
-            r += Number(e2[t]);
+          o = Number(data[t]), datas.slice(0, index).forEach((e2) => {
+            o += Number(e2[t]);
           });
         } catch (e2) {
-          r = 0;
+          console.error("计算错误:", e2), o = 0;
         }
-        totalValueMap[e] = r;
+        totalValueMap[e] = o;
       } 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));
       let expr = itemConfs[key];
       Object.keys(totalValueMap).forEach((e) => {
@@ -312,7 +302,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;
       }
     });
   });
@@ -320,8 +310,8 @@ 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, o, r, a) {
+  const n = e[o.props.base.prop];
   switch (t.type) {
     case "number":
       return formatNumber(n, t);
@@ -330,29 +320,30 @@ function formatColContent(e, t, r, o, a) {
     case "percent":
       return formatPercent(n, t);
     case "custom":
-      return formatCustomFunc(e, t, r, o, a);
+      return formatCustomFunc(e, t, o, r, a);
     default:
       return n;
   }
 }
 function formatNumber(e, t) {
-  let r = e;
-  return r || (r = 0), t.scientific && (r = Number(e).toExponential(t.scientificNum)), t.decimalDigit && (r = Number(e).toFixed(t.decimalDigit)), t.thousandsSeparator && (r = r.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")), t.symbol && (r = `${t.symbol} ${r}`), r;
+  let o = e;
+  return o || (o = 0), t.scientific && (o = Number(e).toExponential(t.scientificNum)), t.decimalDigit && (o = Number(e).toFixed(t.decimalDigit)), t.thousandsSeparator && (o = o.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")), t.symbol && (o = `${t.symbol} ${o}`), o;
 }
 function formatCurrency(e, t) {
-  let r = e;
-  return r || (r = 0), t.decimalDigit && (r = Number(e).toFixed(t.decimalDigit)), t.symbol && (r = `${t.symbol} ${r}`), r;
+  let o = e;
+  return o || (o = 0), t.decimalDigit && (o = Number(e).toFixed(t.decimalDigit)), t.symbol && (o = `${t.symbol} ${o}`), o;
 }
 function formatPercent(e, t) {
-  let r = e;
-  return r || (r = 0), t.decimalDigit && (r = Number(e).toFixed(t.decimalDigit)), r + " %";
+  let o = e;
+  return o || (o = 0), t.decimalDigit && (o = Number(e).toFixed(t.decimalDigit)), o + " %";
 }
-function formatCustomFunc(e, t, r, o, a) {
-  const n = getCustomFunc(o, t.customFunc);
+function formatCustomFunc(e, t, o, r, a) {
+  const n = getCustomFunc(r, t.customFunc);
   if (n) {
     try {
-      return n.apply(n, [{ pageContext: o, configureObj: a, row: e, prop: r.props.base.prop }]);
-    } catch (e2) {
+      return n.apply(n, [{ pageContext: r, configureObj: a, row: e, prop: o.props.base.prop }]);
+    } catch (t2) {
+      console.error("自定义函数脚本错误:", e, t2);
     }
     return "";
   }