super-page-runtime 2.1.92 → 2.1.95

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

@@ -2,535 +2,304 @@ 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(pageContext, conditions, data2) {
-    const expressions = conditions.map(
-      (condition) => this.createExpression(pageContext, condition, data2)
-    );
-    const joinedExpression = expressions.join(" ");
-    return this.evaluateExpression(joinedExpression);
+  static evaluate(e, t, a) {
+    const o = t.map((t2) => this.createExpression(e, t2, a)).join(" ");
+    return this.evaluateExpression(o);
   }
-  static createExpression(pageContext, condition, data2) {
-    const { propName, operator, propValue, leftBracket, rightBracket, joinSign, dataType } = condition;
-    if (!propName || propName === "") {
+  static createExpression(e, t, a) {
+    const { propName: o, operator: r, propValue: s, leftBracket: n, rightBracket: l, joinSign: i, dataType: c } = t;
+    if (!o || "" === o)
       return "";
-    }
-    const value = getValueFromVariable(pageContext.entity, propName, data2);
-    let expression2 = `${leftBracket} ${this.getComparisonExpression(value, operator, getValueFromVariable(pageContext.entity, propValue, data2), dataType)} ${rightBracket}`;
-    if (joinSign) {
-      if (joinSign === "and" || joinSign === "AND") {
-        expression2 += "&&";
-      } else if (joinSign === "or" || joinSign === "OR") {
-        expression2 += "||";
-      }
-    }
-    return expression2.trim();
+    const u = getValueFromVariable(e.entity, o, a);
+    let p = `${n} ${this.getComparisonExpression(u, r, getValueFromVariable(e.entity, s, a), c)} ${l}`;
+    return i && ("and" === i || "AND" === i ? p += "&&" : "or" !== i && "OR" !== i || (p += "||")), p.trim();
   }
-  static getComparisonExpression(value, operator, propValue, dataType) {
-    if (!operator) {
-      operator = "EQ";
-    }
-    const parsedValue = this.parseValue(value, dataType);
-    const parsedPropValue = this.parseValue(propValue, dataType);
-    switch (operator) {
+  static getComparisonExpression(e, t, a, o) {
+    t || (t = "EQ");
+    const r = this.parseValue(e, o), s = this.parseValue(a, o);
+    switch (t) {
       case "EQ":
-        return `${parsedValue} === ${parsedPropValue}`;
+        return `${r} === ${s}`;
       case "GT":
-        return `${parsedValue} > ${parsedPropValue}`;
+        return `${r} > ${s}`;
       case "LT":
-        return `${parsedValue} < ${parsedPropValue}`;
+        return `${r} < ${s}`;
       case "GET":
-        return `${parsedValue} >= ${parsedPropValue}`;
+        return `${r} >= ${s}`;
       case "LET":
-        return `${parsedValue} <= ${parsedPropValue}`;
+        return `${r} <= ${s}`;
       case "NET":
-        return `${parsedValue} !== ${parsedPropValue}`;
+        return `${r} !== ${s}`;
       case "CONTAIN":
-        return `${parsedValue}.includes(${parsedPropValue})`;
+        return `${r}.includes(${s})`;
       case "NOT_CONTAIN":
-        return `!${parsedValue}.includes(${parsedPropValue})`;
+        return `!${r}.includes(${s})`;
       case "IS_NULL":
-        return `${parsedValue} === null`;
+        return `${r} === null`;
       case "IS_NOT_NULL":
-        return `${parsedValue} !== null`;
+        return `${r} !== null`;
       default:
-        throw new Error(`比较符号不匹配: ${operator}`);
+        throw new Error(`比较符号不匹配: ${t}`);
     }
   }
-  static changeDataType(dataType) {
-    let resultDataType = dataType;
-    if (dataType) {
-      if (dataType === "TEXT") {
-        resultDataType = "string";
-      } else if (dataType === "DATE" || dataType === "TIME") {
-        resultDataType = "date";
-      } else if (dataType === "DOUBLE" || dataType === "FLOAT" || dataType === "INTEGER" || dataType === "LONG" || dataType === "BOOLEAN") {
-        resultDataType = "number";
-      }
-    }
-    return resultDataType;
+  static changeDataType(e) {
+    let t = e;
+    return e && ("TEXT" === e ? t = "string" : "DATE" === e || "TIME" === e ? t = "date" : "DOUBLE" !== e && "FLOAT" !== e && "INTEGER" !== e && "LONG" !== e && "BOOLEAN" !== e || (t = "number")), t;
   }
-  static parseValue(value, dataType) {
-    dataType = this.changeDataType(dataType);
-    switch (dataType) {
+  static parseValue(e, t) {
+    switch (t = this.changeDataType(t)) {
       case "number":
-        return Number(value);
+        return Number(e);
       case "date":
-        return new Date(value).getTime();
+        return new Date(e).getTime();
       case "string":
-        return `"${value}"`;
+        return `"${e}"`;
       default:
-        throw new Error(`数据类型解析错误: ${dataType}`);
+        throw new Error(`数据类型解析错误: ${t}`);
     }
   }
   static evaluateExpression(expression) {
     try {
       return eval(expression);
-    } catch (error) {
-      console.error("表达式错误:", expression, error);
+    } catch (e) {
       return false;
     }
   }
 }
-function getSummaryTitleColumn(configure) {
+function getSummaryTitleColumn(e) {
   var _a;
-  const result = {};
-  if (((_a = configure.props.summaries) == null ? void 0 : _a.titleColumn) && configure.props.summaries.titleColumn.length > 0) {
-    configure.props.summaries.titleColumn.forEach((item) => {
-      result[item.prop] = item;
-    });
-  }
-  return result;
+  const t = {};
+  return ((_a = e.props.summaries) == null ? void 0 : _a.titleColumn) && e.props.summaries.titleColumn.length > 0 && e.props.summaries.titleColumn.forEach((e2) => {
+    t[e2.prop] = e2;
+  }), t;
 }
-function getSummaryDataColumn(configure, type) {
+function getSummaryDataColumn(e, t) {
   var _a;
-  const result = {};
-  if (((_a = configure.props.summaries) == null ? void 0 : _a.dataColumn) && configure.props.summaries.dataColumn.length > 0) {
-    configure.props.summaries.dataColumn.forEach((item) => {
-      var _a2;
-      const columnConfigs = (_a2 = configure.items) == null ? void 0 : _a2.find(
-        (columnItem) => item.prop === columnItem.props.base.prop
-      );
-      if (columnConfigs) {
-        if (type === "table" && columnConfigs.props.base.tableSummary) {
-          result[item.prop] = item;
-        } else if (type === "group" && columnConfigs.props.base.groupSummary) {
-          result[item.prop] = item;
-        }
-      }
-    });
-  }
-  return result;
+  const a = {};
+  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 r = (_a2 = e.items) == null ? void 0 : _a2.find((e2) => o.prop === e2.props.base.prop);
+    r && ("table" === t && r.props.base.tableSummary || "group" === t && r.props.base.groupSummary) && (a[o.prop] = o);
+  }), a;
 }
-function summaryStatistics(summaryColumn, data2, prop, pageContext) {
-  let sumsIndex = "";
-  const summaryMode = summaryColumn.summaryMode;
-  const values = data2.map((item) => Number(item[prop])).filter((value) => !Number.isNaN(value));
-  if (values.length > 0) {
-    if (summaryMode === "custom") {
-      const func = getCustomFunc(pageContext, summaryColumn.customFunc);
-      if (func) {
-        const resultValue = func.apply(func, [{ data: data2, prop }]);
-        if (resultValue) {
-          sumsIndex = ` ${resultValue}`;
-        } else {
-          sumsIndex = " N/A";
-        }
-      } else {
-        sumsIndex = " N/A";
-      }
-    } else {
-      switch (summaryMode) {
+function summaryStatistics(e, t, a, o) {
+  let r = "";
+  const s = e.summaryMode, n = t.map((e2) => Number(e2[a])).filter((e2) => !Number.isNaN(e2));
+  if (n.length > 0)
+    if ("custom" === s) {
+      const s2 = getCustomFunc(o, e.customFunc);
+      if (s2) {
+        const e2 = s2.apply(s2, [{ data: t, prop: a }]);
+        r = e2 ? ` ${e2}` : " N/A";
+      } else
+        r = " N/A";
+    } else
+      switch (s) {
         case "sum":
-          sumsIndex = ` ${values.reduce((prev, curr) => prev + curr, 0)}`;
+          r = ` ${n.reduce((e2, t2) => e2 + t2, 0)}`;
           break;
         case "avg":
-          sumsIndex = ` ${values.reduce((prev, curr) => prev + curr, 0) / values.length}`;
+          r = " " + n.reduce((e2, t2) => e2 + t2, 0) / n.length;
           break;
         case "min":
-          sumsIndex = ` ${Math.min(...values)}`;
+          r = ` ${Math.min(...n)}`;
           break;
         case "max":
-          sumsIndex = ` ${Math.max(...values)}`;
+          r = ` ${Math.max(...n)}`;
           break;
         default:
-          sumsIndex = " N/A";
+          r = " N/A";
       }
-    }
-  } else {
-    sumsIndex = " N/A";
-  }
-  return sumsIndex;
+  else
+    r = " N/A";
+  return r;
 }
-function replacePlaceholders(template, data2) {
-  if (template) {
-    return template.replace(/\$\{row\.(\w+)\}/g, (match, p1) => {
-      return Object.prototype.hasOwnProperty.call(data2, p1) ? data2[p1] : "";
-    });
-  }
+function replacePlaceholders(e, t) {
+  if (e)
+    return e.replace(/\$\{row\.(\w+)\}/g, (e2, a) => Object.prototype.hasOwnProperty.call(t, a) ? t[a] : "");
 }
-function getHeaderCellStyleUtil(data2, runtimeStyle, props) {
+function getHeaderCellStyleUtil(e, t, a) {
   var _a;
-  const headerStyle = {};
-  if (data2.column.property) {
-    (_a = runtimeStyle.titleStyle) == null ? void 0 : _a.forEach((item) => {
-      if (item.field && item.field.includes(data2.column.property)) {
-        if (item.scopeFunc) {
-          const func = getCustomFunc(props.pageContext, item.scopeFunc);
-          if (func) {
-            const funcResult = func.apply(func, [{ item, data: data2 }]);
-            if (funcResult !== false) {
-              copyStyle(headerStyle, item);
-            }
-          }
-        } else {
-          copyStyle(headerStyle, item);
+  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 r2 = getCustomFunc(a.pageContext, t2.scopeFunc);
+        if (r2) {
+          false !== r2.apply(r2, [{ item: t2, data: e }]) && copyStyle(o, t2);
         }
-      }
-    });
-  }
-  const cellTitleStytle = getCellStyleUtil(data2, runtimeStyle.cellTitleStyle, props);
-  if (cellTitleStytle) {
-    Object.assign(headerStyle, cellTitleStytle);
-  }
-  return headerStyle;
+      } else
+        copyStyle(o, t2);
+  }));
+  const r = getCellStyleUtil(e, t.cellTitleStyle, a);
+  return r && Object.assign(o, r), o;
 }
-function getRowStyleUtil(data2, groupSummaryDataRowIndex, props) {
-  const returnStyle = {};
-  if (props.configure.style.rowStyle) {
-    for (let i = 0; i < props.configure.style.rowStyle.length; i++) {
-      const rowStyle = props.configure.style.rowStyle[i];
-      if (rowStyle.scopeFunc) {
-        const func = getCustomFunc(props.pageContext, rowStyle.scopeFunc);
-        if (func) {
-          const funcResult = func.apply(func, [{ data: data2 }]);
-          if (funcResult !== void 0 && funcResult !== null && funcResult !== false) {
-            copyStyle(returnStyle, rowStyle);
-          }
-        }
-      } else if (rowStyle.matchingCondition) {
-        const result = ExpressionEvaluator.evaluate(
-          props.pageContext,
-          rowStyle.matchingCondition,
-          data2.row
-        );
-        if (result || result === void 0) {
-          copyStyle(returnStyle, rowStyle);
+function getRowStyleUtil(e, t, a) {
+  const o = {};
+  if (a.configure.style.rowStyle)
+    for (let t2 = 0; t2 < a.configure.style.rowStyle.length; t2++) {
+      const r = a.configure.style.rowStyle[t2];
+      if (r.scopeFunc) {
+        const t3 = getCustomFunc(a.pageContext, r.scopeFunc);
+        if (t3) {
+          const a2 = t3.apply(t3, [{ data: e }]);
+          null != a2 && false !== a2 && copyStyle(o, r);
         }
-      } else {
-        copyStyle(returnStyle, rowStyle);
-      }
+      } else if (r.matchingCondition) {
+        const t3 = ExpressionEvaluator.evaluate(a.pageContext, r.matchingCondition, e.row);
+        (t3 || void 0 === t3) && copyStyle(o, r);
+      } else
+        copyStyle(o, r);
     }
-  }
-  if (groupSummaryDataRowIndex && groupSummaryDataRowIndex.length > 0 && groupSummaryDataRowIndex.indexOf(data2.rowIndex) !== -1) {
-    const result = {};
-    if (props.configure.style.collectStyle && props.configure.style.collectStyle.length > 0) {
-      for (let i = 0; i < props.configure.style.collectStyle.length; i++) {
-        const collectStyle = props.configure.style.collectStyle[i];
-        copyStyle(result, collectStyle);
+  if (t && t.length > 0 && -1 !== t.indexOf(e.rowIndex)) {
+    const e2 = {};
+    if (a.configure.style.collectStyle && a.configure.style.collectStyle.length > 0)
+      for (let t2 = 0; t2 < a.configure.style.collectStyle.length; t2++) {
+        copyStyle(e2, a.configure.style.collectStyle[t2]);
       }
-    }
-    if (Object.keys(result).length === 0) {
-      result["background-color"] = "var(--el-table-row-hover-bg-color)";
-    }
-    return result;
+    return 0 === Object.keys(e2).length && (e2["background-color"] = "var(--el-table-row-hover-bg-color)"), e2;
   }
-  return returnStyle;
+  return o;
 }
-function getCellStyleUtil(data2, cellStyles, props) {
-  const cellStyle = {};
-  if (cellStyles) {
-    for (let i = 0; i < cellStyles.length; i++) {
-      const columnsStyleSetting = cellStyles[i];
-      if (isSetStyle(columnsStyleSetting)) {
-        if (columnsStyleSetting.scopeFunc) {
-          const func = getCustomFunc(props.pageContext, columnsStyleSetting.scopeFunc);
-          if (func) {
-            const funcResult = func.apply(func, [{ data: data2 }]);
-            if (funcResult !== false) {
-              copyStyle(cellStyle, columnsStyleSetting);
-            }
+function getCellStyleUtil(e, t, a) {
+  const o = {};
+  if (t)
+    for (let r = 0; r < t.length; r++) {
+      const s = t[r];
+      if (isSetStyle(s))
+        if (s.scopeFunc) {
+          const t2 = getCustomFunc(a.pageContext, s.scopeFunc);
+          if (t2) {
+            false !== t2.apply(t2, [{ data: e }]) && copyStyle(o, s);
           }
-        } else if (columnsStyleSetting.matchingCondition) {
-          const result = ExpressionEvaluator.evaluate(
-            props.pageContext,
-            columnsStyleSetting.matchingCondition,
-            data2.row
-          );
-          if (result || result === void 0) {
-            copyStyle(cellStyle, columnsStyleSetting);
-          }
-        } else {
-          copyStyle(cellStyle, columnsStyleSetting);
-        }
-      }
+        } else if (s.matchingCondition) {
+          const t2 = ExpressionEvaluator.evaluate(a.pageContext, s.matchingCondition, e.row);
+          (t2 || void 0 === t2) && copyStyle(o, s);
+        } else
+          copyStyle(o, s);
     }
-  }
-  return cellStyle;
+  return o;
 }
-function isSetStyle(columnsStyleSetting) {
-  let customStyle;
-  if (columnsStyleSetting.customStyle) {
-    customStyle = JSON.parse(columnsStyleSetting.customStyle);
-  }
-  if (columnsStyleSetting.style && Object.keys(columnsStyleSetting.style).length > 0 || customStyle && Object.keys(customStyle).length > 0) {
-    return true;
-  }
-  return false;
+function isSetStyle(e) {
+  let t;
+  return e.customStyle && (t = JSON.parse(e.customStyle)), !!(e.style && Object.keys(e.style).length > 0 || t && Object.keys(t).length > 0);
 }
-function copyStyle(target, source) {
-  Object.assign(target, source.style);
-  if (source.customStyle) {
-    Object.assign(target, JSON.parse(source.customStyle));
-  }
+function copyStyle(e, t) {
+  Object.assign(e, t.style), t.customStyle && Object.assign(e, JSON.parse(t.customStyle));
 }
-function rowDataToColumn(data2, configure) {
-  const groupByFields = configure.props.dataOrigin.groupField;
-  const titleColumns = configure.props.dataOrigin.rowToColumn.titleColumns;
-  const dataColumns = configure.props.dataOrigin.rowToColumn.dataColumns;
-  const result = [];
-  const groupedData = {};
-  data2.forEach((item) => {
-    const key2 = groupByFields.map((field) => item[field]).join("|");
-    if (!groupedData[key2]) {
-      const group = {};
-      groupByFields.forEach((field) => group[field] = item[field]);
-      groupedData[key2] = group;
-      result.push(group);
+function rowDataToColumn(e, t) {
+  const a = t.props.dataOrigin.groupField, o = t.props.dataOrigin.rowToColumn.titleColumns, r = t.props.dataOrigin.rowToColumn.dataColumns, s = [], n = {};
+  return e.forEach((e2) => {
+    const t2 = a.map((t3) => e2[t3]).join("|");
+    if (!n[t2]) {
+      const o2 = {};
+      a.forEach((t3) => o2[t3] = e2[t3]), n[t2] = o2, s.push(o2);
     }
-    dataColumns.forEach((valueField) => {
-      const columnNameParts = titleColumns.map((field) => item[field]);
-      const columnName = `${columnNameParts.join("")}${valueField}`;
-      groupedData[key2][columnName] = item[valueField];
+    r.forEach((a2) => {
+      const r2 = `${o.map((t3) => e2[t3]).join("")}${a2}`;
+      n[t2][r2] = e2[a2];
     });
-  });
-  return result;
+  }), s;
 }
-function colDataToRow(data2, configure) {
-  const groupByFields = configure.props.dataOrigin.groupField;
-  const titleColumns = configure.props.dataOrigin.columnToRow.titleColumns;
-  const dataColumns = configure.props.dataOrigin.columnToRow.dataColumns;
-  const transColumns = configure.props.dataOrigin.columnToRow.transColumns;
-  const dataColumnsMapping = configure.props.dataOrigin.columnToRow.dataColumnsMapping;
-  if (data2.length === 0) {
-    return data2;
-  }
-  const result = [];
-  const newData = groupBy(data2, groupByFields);
-  const dataColumnsConfig = dataColumns.reduce((max, current) => {
-    return current.columns.length > max.columns.length ? current : max;
-  }, dataColumns[0]);
-  const dataColumnsAndNewColumnMapping = dataColumns.reduce((acc, item) => {
-    item.columns.forEach((column) => {
-      acc[column] = item.prop;
-    });
-    return acc;
-  }, {});
-  newData.forEach((item) => {
-    dataColumnsConfig.columns.forEach((col) => {
-      const newColumnsProp = dataColumnsConfig.prop;
-      const dataRow = {};
-      groupByFields.forEach((field) => {
-        dataRow[field] = item[field];
-      });
-      dataRow[newColumnsProp] = item[col];
-      if (dataColumns.length > 1) {
-        const columnMapping = dataColumnsMapping.find((item2) => item2.props.includes(col));
-        if (columnMapping && columnMapping.props.length > 1) {
-          columnMapping.props.forEach((prop) => {
-            if (prop !== col && dataColumnsAndNewColumnMapping[prop]) {
-              dataRow[dataColumnsAndNewColumnMapping[prop]] = item[prop];
-            }
-          });
-        }
+function colDataToRow(e, t) {
+  const a = t.props.dataOrigin.groupField, o = t.props.dataOrigin.columnToRow.titleColumns, r = t.props.dataOrigin.columnToRow.dataColumns, s = t.props.dataOrigin.columnToRow.transColumns, n = t.props.dataOrigin.columnToRow.dataColumnsMapping;
+  if (0 === e.length)
+    return e;
+  const l = [], i = groupBy(e, a), c = r.reduce((e2, t2) => t2.columns.length > e2.columns.length ? t2 : e2, r[0]), u = r.reduce((e2, t2) => (t2.columns.forEach((a2) => {
+    e2[a2] = t2.prop;
+  }), e2), {});
+  return i.forEach((e2) => {
+    c.columns.forEach((t2) => {
+      const i2 = c.prop, p = {};
+      if (a.forEach((t3) => {
+        p[t3] = e2[t3];
+      }), p[i2] = e2[t2], r.length > 1) {
+        const a2 = n.find((e3) => e3.props.includes(t2));
+        a2 && a2.props.length > 1 && a2.props.forEach((a3) => {
+          a3 !== t2 && u[a3] && (p[u[a3]] = e2[a3]);
+        });
       }
-      titleColumns.forEach((titleCol) => {
-        const sourceTitleRenameConfigs = transColumns.filter(
-          (transCol) => transCol.relatedTitle === titleCol.prop
-        );
-        let rename = false;
-        if (sourceTitleRenameConfigs && sourceTitleRenameConfigs.length > 0) {
-          sourceTitleRenameConfigs.forEach((item2) => {
-            if (item2.columns.includes(col)) {
-              dataRow[titleCol.prop] = item2.label;
-              rename = true;
-              return;
-            }
-          });
-        }
-        if (!rename) {
-          dataRow[titleCol.prop] = col;
-        }
-      });
-      result.push(dataRow);
+      o.forEach((e3) => {
+        const a2 = s.filter((t3) => t3.relatedTitle === e3.prop);
+        let o2 = false;
+        a2 && a2.length > 0 && a2.forEach((a3) => {
+          if (a3.columns.includes(t2))
+            return p[e3.prop] = a3.label, void (o2 = true);
+        }), o2 || (p[e3.prop] = t2);
+      }), l.push(p);
     });
-  });
-  return result;
+  }), l;
 }
-function getColumnToRowTableConfig(configure) {
-  const sourceConfig = configure.items;
-  const groupField = configure.props.dataOrigin.groupField;
-  const titleColumns = configure.props.dataOrigin.columnToRow.titleColumns;
-  const dataColumns = configure.props.dataOrigin.columnToRow.dataColumns;
-  const newTableColumns = [];
-  groupField.forEach((field) => {
-    if (sourceConfig) {
-      const column = sourceConfig.find((item) => item.props.base.prop === field);
-      if (column) {
-        newTableColumns.push(column);
-      }
+function getColumnToRowTableConfig(e) {
+  const t = e.items, a = e.props.dataOrigin.groupField, o = e.props.dataOrigin.columnToRow.titleColumns, r = e.props.dataOrigin.columnToRow.dataColumns, s = [];
+  a.forEach((e2) => {
+    if (t) {
+      const a2 = t.find((t2) => t2.props.base.prop === e2);
+      a2 && s.push(a2);
     }
   });
-  const newCols = [...titleColumns, ...dataColumns];
-  newCols.forEach((field) => {
-    if (sourceConfig) {
-      const column = sourceConfig.find((item) => item.props.base.prop === field);
-      if (column) {
-        newTableColumns.push(column);
-      } else {
-        newTableColumns.push({
-          uuid: (/* @__PURE__ */ new Date()).getTime(),
-          // 生成新的UUID
-          name: "",
-          props: {
-            base: {
-              prop: field.prop,
-              name: field.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: ""
-              }
-            }
-          }
-        });
-      }
+  return [...o, ...r].forEach((e2) => {
+    if (t) {
+      const a2 = t.find((t2) => t2.props.base.prop === e2);
+      a2 ? s.push(a2) : s.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: "" } } } });
     }
-  });
-  return newTableColumns;
+  }), s;
 }
-function groupBy(data2, groupFields) {
-  const grouped = {};
-  data2.forEach((item) => {
-    const key2 = groupFields.map((field) => item[field]).join("|");
-    if (!grouped[key2]) {
-      grouped[key2] = {
-        ...item,
-        // 复制所有字段
-        records: []
-        // 初始化记录数组
-      };
-      groupFields.forEach((field, index2) => {
-        grouped[key2][field] = item[field];
-      });
-    }
-    grouped[key2].records.push(item);
-  });
-  return Object.values(grouped).map((group) => ({
-    ...group,
-    // 复制所有分组信息
-    records: void 0
-    // 移除records字段，因为不需要展示
-  }));
+function groupBy(e, t) {
+  const a = {};
+  return e.forEach((e2) => {
+    const o = t.map((t2) => e2[t2]).join("|");
+    a[o] || (a[o] = { ...e2, records: [] }, t.forEach((t2, r) => {
+      a[o][t2] = e2[t2];
+    })), a[o].records.push(e2);
+  }), Object.values(a).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: ""
-    }
-  };
+  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 computeFormula(itemConfs, datas, entity) {
   Object.keys(itemConfs).forEach((key) => {
     const paramNames = getParamNames(itemConfs[key]);
     datas.forEach((data, index) => {
       const totalValueMap = {};
-      for (const paramName of paramNames) {
-        if (paramName.startsWith("${min.")) {
-          totalValueMap[paramName] = getMinValue(datas, getFieldName(paramName));
-        } else if (paramName.startsWith("${max.")) {
-          totalValueMap[paramName] = getMaxValue(datas, getFieldName(paramName));
-        } else if (paramName.startsWith("${sum.")) {
-          totalValueMap[paramName] = getSumValue(datas, getFieldName(paramName));
-        } else if (paramName.startsWith("${avg.")) {
-          totalValueMap[paramName] = getAvgValue(datas, getFieldName(paramName));
-        } else if (paramName.startsWith("${add.")) {
-          const fieldName = getFieldName(paramName);
-          let currentRowValue = 0;
+      for (const e of paramNames)
+        if (e.startsWith("${min."))
+          totalValueMap[e] = getMinValue(datas, getFieldName(e));
+        else if (e.startsWith("${max."))
+          totalValueMap[e] = getMaxValue(datas, getFieldName(e));
+        else if (e.startsWith("${sum."))
+          totalValueMap[e] = getSumValue(datas, getFieldName(e));
+        else if (e.startsWith("${avg."))
+          totalValueMap[e] = getAvgValue(datas, getFieldName(e));
+        else if (e.startsWith("${add.")) {
+          const t = getFieldName(e);
+          let a = 0;
           try {
-            currentRowValue = Number(data[fieldName]);
-            datas.slice(0, index).forEach((item) => {
-              currentRowValue += Number(item[fieldName]);
+            a = Number(data[t]), datas.slice(0, index).forEach((e2) => {
+              a += Number(e2[t]);
             });
-          } catch (e) {
-            console.error("计算错误:", e);
-            currentRowValue = 0;
+          } catch (e2) {
+            a = 0;
           }
-          totalValueMap[paramName] = currentRowValue;
-        } else if (paramName.startsWith("${page.") || paramName.startsWith("${data.") || paramName.startsWith("${row.") || paramName.startsWith("${request.") || paramName.startsWith("${context.") || paramName.startsWith("${system.") || paramName.startsWith("${fixed.")) {
-          totalValueMap[paramName] = getValueFromVariable(entity, paramName, data);
-        }
-      }
+          totalValueMap[e] = a;
+        } 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((exprParam) => {
-        if (expr.indexOf(exprParam) > -1) {
-          expr = expr.replaceAll(exprParam, totalValueMap[exprParam]);
-        }
+      Object.keys(totalValueMap).forEach((e) => {
+        expr.indexOf(e) > -1 && (expr = expr.replaceAll(e, totalValueMap[e]));
       });
-      for (const paramName of paramNames) {
-        if (expr.indexOf(paramName) > -1) {
-          expr = expr.replaceAll(paramName, 0);
-        }
-      }
+      for (const e of paramNames)
+        expr.indexOf(e) > -1 && (expr = expr.replaceAll(e, 0));
       try {
         data[key] = eval(expr);
       } catch (e) {
-        console.error(itemConfs[key] + " 计算错误, 替换后表达式为：" + expr, e);
         data[key] = 0;
       }
     });
   });
 }
-function getFieldName(paramName) {
-  return paramName.substring(6, paramName.length - 1);
+function getFieldName(e) {
+  return e.substring(6, e.length - 1);
 }
 export {
   ExpressionEvaluator,