super-page-runtime 2.1.933 → 2.2.1

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

@@ -2,544 +2,348 @@ 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, o) {
+    const a = t.map((t2) => this.createExpression(e, t2, o)).join(" ");
+    return this.evaluateExpression(a);
   }
-  static createExpression(pageContext, condition, data2) {
-    const { propName, operator, propValue, leftBracket, rightBracket, joinSign, dataType } = condition;
-    if (!propName || propName === "") {
-      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();
+  static createExpression(e, t, o) {
+    const { propName: a, operator: r, propValue: n, leftBracket: s, rightBracket: l, joinSign: i, dataType: c } = t;
+    if (!a || "" === a) return "";
+    const u = getValueFromVariable(e.entity, a, o);
+    let p = `${s} ${this.getComparisonExpression(u, r, getValueFromVariable(e.entity, n, o), c)} ${l}`;
+    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, o, a) {
+    t || (t = "EQ");
+    const r = this.parseValue(e, a), n = this.parseValue(o, a);
+    switch (t) {
       case "EQ":
-        return `${parsedValue} === ${parsedPropValue}`;
+        return `${r} === ${n}`;
       case "GT":
-        return `${parsedValue} > ${parsedPropValue}`;
+        return `${r} > ${n}`;
       case "LT":
-        return `${parsedValue} < ${parsedPropValue}`;
+        return `${r} < ${n}`;
       case "GET":
-        return `${parsedValue} >= ${parsedPropValue}`;
+        return `${r} >= ${n}`;
       case "LET":
-        return `${parsedValue} <= ${parsedPropValue}`;
+        return `${r} <= ${n}`;
       case "NET":
-        return `${parsedValue} !== ${parsedPropValue}`;
+        return `${r} !== ${n}`;
       case "CONTAIN":
-        return `${parsedValue}.includes(${parsedPropValue})`;
+        return `${r}.includes(${n})`;
       case "NOT_CONTAIN":
-        return `!${parsedValue}.includes(${parsedPropValue})`;
+        return `!${r}.includes(${n})`;
       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 o = {};
+  return ((_a = e.props.summaries) == null ? void 0 : _a.dataColumn) && e.props.summaries.dataColumn.length > 0 && e.props.summaries.dataColumn.forEach((a) => {
+    var _a2;
+    const r = (_a2 = e.items) == null ? void 0 : _a2.find((e2) => a.prop === e2.props.base.prop);
+    r && ("table" === t && r.props.base.tableSummary || "group" === t && r.props.base.groupSummary) && (o[a.prop] = a);
+  }), o;
 }
-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) {
-        case "sum":
-          sumsIndex = ` ${values.reduce((prev, curr) => prev + curr, 0)}`;
-          break;
-        case "avg":
-          sumsIndex = ` ${values.reduce((prev, curr) => prev + curr, 0) / values.length}`;
-          break;
-        case "min":
-          sumsIndex = ` ${Math.min(...values)}`;
-          break;
-        case "max":
-          sumsIndex = ` ${Math.max(...values)}`;
-          break;
-        default:
-          sumsIndex = " N/A";
-      }
-    }
-  } else {
-    sumsIndex = " N/A";
+function summaryStatistics(e, t, o, a) {
+  let r = "";
+  const n = e.summaryMode, s = t.map((e2) => Number(e2[o])).filter((e2) => !Number.isNaN(e2));
+  if (s.length > 0) if ("custom" === n) {
+    const n2 = getCustomFunc(a, e.customFunc);
+    if (n2) {
+      const e2 = n2.apply(n2, [{ data: t, prop: o }]);
+      r = e2 ? ` ${e2}` : " N/A";
+    } else r = " N/A";
+  } else switch (n) {
+    case "sum":
+      r = ` ${s.reduce((e2, t2) => e2 + t2, 0)}`;
+      break;
+    case "avg":
+      r = " " + s.reduce((e2, t2) => e2 + t2, 0) / s.length;
+      break;
+    case "min":
+      r = ` ${Math.min(...s)}`;
+      break;
+    case "max":
+      r = ` ${Math.max(...s)}`;
+      break;
+    default:
+      r = " 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, o) => Object.prototype.hasOwnProperty.call(t, o) ? t[o] : "");
 }
-function getHeaderCellStyleUtil(data2, runtimeStyle, props) {
+function getHeaderCellStyleUtil(e, t, o) {
   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 a = {};
+  e.column.property && ((_a = t.titleStyle) == null ? void 0 : _a.forEach((t2) => {
+    if (t2.field && t2.field.includes(e.column.property)) if (t2.scopeFunc) {
+      const r2 = getCustomFunc(o.pageContext, t2.scopeFunc);
+      if (r2) {
+        false !== r2.apply(r2, [{ item: t2, data: e }]) && copyStyle(a, t2);
       }
-    });
-  }
-  const cellTitleStytle = getCellStyleUtil(data2, runtimeStyle.cellTitleStyle, props);
-  if (cellTitleStytle) {
-    Object.assign(headerStyle, cellTitleStytle);
-  }
-  return headerStyle;
+    } else copyStyle(a, t2);
+  }));
+  const r = getCellStyleUtil(e, t.cellTitleStyle, o);
+  return r && Object.assign(a, r), a;
 }
-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);
-        }
-      } else {
-        copyStyle(returnStyle, rowStyle);
+function getRowStyleUtil(e, t, o) {
+  const a = {};
+  if (o.configure.style.rowStyle) for (let t2 = 0; t2 < o.configure.style.rowStyle.length; t2++) {
+    const r = o.configure.style.rowStyle[t2];
+    if (r.scopeFunc) {
+      const t3 = getCustomFunc(o.pageContext, r.scopeFunc);
+      if (t3) {
+        const o2 = t3.apply(t3, [{ data: e }]);
+        null != o2 && false !== o2 && copyStyle(a, r);
       }
-    }
+    } else if (r.matchingCondition) {
+      const t3 = ExpressionEvaluator.evaluate(o.pageContext, r.matchingCondition, e.row);
+      (t3 || void 0 === t3) && copyStyle(a, r);
+    } else copyStyle(a, r);
   }
-  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 (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]);
     }
-    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 a;
 }
-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);
-            }
-          }
-        } 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);
-        }
+function getCellStyleUtil(e, t, o) {
+  const a = {};
+  if (t) for (let r = 0; r < t.length; r++) {
+    const n = t[r];
+    if (isSetStyle(n)) if (n.scopeFunc) {
+      const t2 = getCustomFunc(o.pageContext, n.scopeFunc);
+      if (t2) {
+        false !== t2.apply(t2, [{ data: e }]) && copyStyle(a, n);
       }
-    }
+    } else if (n.matchingCondition) {
+      const t2 = ExpressionEvaluator.evaluate(o.pageContext, n.matchingCondition, e.row);
+      (t2 || void 0 === t2) && copyStyle(a, n);
+    } else copyStyle(a, n);
   }
-  return cellStyle;
+  return a;
 }
-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, o) {
+  const a = t.props.dataOrigin.groupField, r = t.props.dataOrigin.rowToColumn.titleColumns, n = t.props.dataOrigin.rowToColumn.dataColumns, s = [], l = {};
+  if (a && a.length > 0) e.forEach((e2) => {
+    const t2 = a.map((t3) => e2[t3]).join("|");
+    if (!l[t2]) {
+      const o2 = {};
+      a.forEach((t3) => o2[t3] = e2[t3]), l[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];
+    n.forEach((o2) => {
+      const a2 = `${r.map((t3) => e2[t3]).join("")}${o2}`;
+      l[t2][a2] = e2[o2];
     });
   });
-  return result;
-}
-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];
+  else {
+    const t2 = [];
+    e.forEach((e2) => {
+      r.forEach((o2) => {
+        e2[o2] && t2.push(e2[o2]);
       });
-      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];
-            }
-          });
-        }
-      }
-      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;
-        }
+    }), n.forEach((t3) => {
+      const a2 = {}, n2 = o.find((e2) => {
+        var _a, _b;
+        return ((_b = (_a = e2.props) == null ? void 0 : _a.base) == null ? void 0 : _b.prop) === t3;
       });
-      result.push(dataRow);
+      n2 && (a2.$GroupColumn = n2.props.base.name), e.forEach((e2) => {
+        r.forEach((o2) => {
+          const r2 = e2[o2], n3 = e2[t3];
+          a2[r2] = n3;
+        });
+      }), s.push(a2);
     });
-  });
-  return result;
+  }
+  return s;
 }
-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);
-      }
-    }
-  });
-  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: ""
-              }
-            }
-          }
+function colDataToRow(e, t) {
+  const o = t.props.dataOrigin.groupField, a = t.props.dataOrigin.columnToRow.titleColumns, r = t.props.dataOrigin.columnToRow.dataColumns, n = t.props.dataOrigin.columnToRow.transColumns, s = t.props.dataOrigin.columnToRow.dataColumnsMapping;
+  if (0 === e.length) return e;
+  const l = [], i = groupBy(e, o), c = r.reduce((e2, t2) => t2.columns.length > e2.columns.length ? t2 : e2, r[0]), u = r.reduce((e2, t2) => (t2.columns.forEach((o2) => {
+    e2[o2] = t2.prop;
+  }), e2), {});
+  return i.forEach((e2) => {
+    c.columns.forEach((t2) => {
+      const i2 = c.prop, p = {};
+      if (o.forEach((t3) => {
+        p[t3] = e2[t3];
+      }), p[i2] = e2[t2], r.length > 1) {
+        const o2 = s.find((e3) => e3.props.includes(t2));
+        o2 && o2.props.length > 1 && o2.props.forEach((o3) => {
+          o3 !== t2 && u[o3] && (p[u[o3]] = e2[o3]);
         });
       }
-    }
-  });
-  return newTableColumns;
+      a.forEach((e3) => {
+        const o2 = n.filter((t3) => t3.relatedTitle === e3.prop);
+        let a2 = false;
+        o2 && o2.length > 0 && o2.forEach((o3) => {
+          if (o3.columns.includes(t2)) return p[e3.prop] = o3.label, void (a2 = true);
+        }), a2 || (p[e3.prop] = t2);
+      }), l.push(p);
+    });
+  }), l;
 }
-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];
-      });
+function getColumnToRowTableConfig(e) {
+  const t = e.items, o = e.props.dataOrigin.groupField, a = e.props.dataOrigin.columnToRow.titleColumns, r = e.props.dataOrigin.columnToRow.dataColumns, n = [];
+  o && o.length > 0 && o.forEach((e2) => {
+    if (t) {
+      const o2 = t.find((t2) => t2.props.base.prop === e2);
+      o2 && n.push(o2);
     }
-    grouped[key2].records.push(item);
   });
-  return Object.values(grouped).map((group) => ({
-    ...group,
-    // 复制所有分组信息
-    records: void 0
-    // 移除records字段，因为不需要展示
-  }));
+  return [...a, ...r].forEach((e2) => {
+    if (t) {
+      const o2 = t.find((t2) => t2.props.base.prop === e2);
+      o2 ? n.push(o2) : n.push({ uuid: (/* @__PURE__ */ new Date()).getTime(), name: "", props: { base: { prop: e2.prop, name: e2.title, sortable: true, headerAlign: "center", align: "center", fixed: false, visible: true, dataType: "string" }, format: {}, size: { pc: {} } }, style: {}, componentIndex: 0, runtime: { common: { class: "", style: { pc_style: {}, pc_class: "" } } } });
+    }
+  }), n;
+}
+function groupBy(e, t) {
+  const o = {};
+  return e.forEach((e2) => {
+    const a = t.map((t2) => e2[t2]).join("|");
+    o[a] || (o[a] = { ...e2, records: [] }, t.forEach((t2, r) => {
+      o[a][t2] = e2[t2];
+    })), o[a].records.push(e2);
+  }), 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: ""
-    }
-  };
+  return { props: { base: { name: "序号", prop: "$index", columnWidth: 80, sortable: true, visible: true, displayOrder: 1, alignTitle: "center", alignContent: "center" } }, events: [], style: { titleFont: {}, contentFont: {}, width: {}, background: {}, tableCell: [{ type: "", model: "" }], conentPadding: {}, tittlePadding: {}, border: {}, shadow: {}, tittleClass: "" } };
+}
+function getNewColumnConfig(e, t, o, a) {
+  return { uuid: (/* @__PURE__ */ new Date()).getTime(), name: "", props: { base: { prop: e, name: t, displayOrder: o, sortable: true, headerAlign: "center", align: "center", fixed: false, visible: true, dataType: a }, format: {}, size: { pc: {} } }, style: {}, componentIndex: 0, runtime: { common: { class: "", style: { pc_style: {}, pc_class: "" } } } };
 }
 function 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;
-          try {
-            currentRowValue = Number(data[fieldName]);
-            datas.slice(0, index).forEach((item) => {
-              currentRowValue += Number(item[fieldName]);
-            });
-          } catch (e) {
-            console.error("计算错误:", e);
-            currentRowValue = 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);
+      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 o = 0;
+        try {
+          o = Number(data[t]), datas.slice(0, index).forEach((e2) => {
+            o += Number(e2[t]);
+          });
+        } catch (e2) {
+          o = 0;
         }
-      }
+        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((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);
+}
+function formatColContent(e, t, o, a, r) {
+  const n = e[o.props.base.prop];
+  switch (t.type) {
+    case "number":
+      return formatNumber(n, t);
+    case "currency":
+      return formatCurrency(n, t);
+    case "percent":
+      return formatPercent(n, t);
+    case "custom":
+      return formatCustomFunc(e, t, o, a, r);
+    default:
+      return n;
+  }
+}
+function formatNumber(e, t) {
+  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 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 o = e;
+  return o || (o = 0), t.decimalDigit && (o = Number(e).toFixed(t.decimalDigit)), o + " %";
+}
+function formatCustomFunc(e, t, o, a, r) {
+  const n = getCustomFunc(a, t.customFunc);
+  if (n) {
+    return n.apply(n, [{ pageContext: a, configureObj: r, row: e, prop: o.props.base.prop }]);
+  }
 }
 export {
   ExpressionEvaluator,
   colDataToRow,
   computeFormula,
+  formatColContent,
   getCellStyleUtil,
   getColumnToRowTableConfig,
   getHeaderCellStyleUtil,
   getIndexColumn,
+  getNewColumnConfig,
   getRowStyleUtil,
   getSummaryDataColumn,
   getSummaryTitleColumn,