super-page-runtime 2.2.74 → 2.2.77-sit5

package/dist/es/components/runtime/utils/charts/chart-columnline-util.js

@@ -1,10 +1,10 @@
-import { getValueFromSource as e, formatVariableValue as i, setValueForVariableName as t } from "../page-helper-util.js";
+import { getValueFromSource as e, formatVariableValue as t, setValueForVariableName as i } from "../page-helper-util.js";
 import { deepCopy as s } from "../common-util.js";
-import { CommonName as o, caculateFormulaValue as a, sortDatas as l, limitDatas as n, executeChartFormula as u } from "./chart-util.js";
-import { handleChartEvent as r } from "../events/event-util.js";
+import { CommonName as o, caculateFormulaValue as a, sortDatas as l, limitDatas as n, executeChartFormula as r } from "./chart-util.js";
+import { handleChartEvent as u } from "../events/event-util.js";
 function c(c2, d, f, p) {
   if (!p || !p.result) return;
-  r(c2, d, "beforeUpdateChart", f, { resultData: p });
+  u(c2, d, "beforeUpdateChart", f, { resultData: p });
   const m = p && p.result ? p.result : {};
   let h = p && p.groupValue ? p.groupValue : void 0;
   const y = d.serviceDataField;
@@ -15,116 +15,116 @@ function c(c2, d, f, p) {
     h = [];
     for (const e2 of v) h.push(e2.group);
   }
-  const F = {}, D = [], S = [];
-  for (const e2 of v) F[e2.group] = e2.target, e2.target && !D.includes(e2.target) && (D.push(e2.target), h.includes(e2.group) && S.push(e2.target));
+  const F = {}, S = [], D = [];
+  for (const e2 of v) F[e2.group] = e2.target, e2.target && !S.includes(e2.target) && (S.push(e2.target), h.includes(e2.group) && D.push(e2.target));
   let x = d.props ? d.props.mulGroupShow : "";
   x = "break" == x ? "\r\n" : " ";
-  for (const i2 of g) {
-    if (!i2) continue;
-    const t2 = [];
+  for (const t2 of g) {
+    if (!t2) continue;
+    const i2 = [];
     for (const s3 of h) {
-      const o2 = F[s3], a2 = e(i2, o2, void 0);
-      a2 && t2.push(a2);
+      const o2 = F[s3], a2 = e(t2, o2, void 0);
+      a2 && i2.push(a2);
     }
-    const s2 = t2.join(x);
-    i2[o.X_FIELD_NAME] = s2;
+    const s2 = i2.join(x);
+    t2[o.X_FIELD_NAME] = s2;
   }
-  const N = d.items ? d.items : [], E = [], A = {}, _ = [], b = {}, C = [], I = [], X = [], w = a(N, g, X);
-  for (const e2 of X) C.push(e2);
+  const N = d.items ? d.items : [], E = [], A = {}, _ = [], b = {}, w = [], C = [], I = /* @__PURE__ */ new Set(), X = a(N, g, I);
+  for (const e2 of I) w.push(e2);
   for (const e2 of N) {
-    const i2 = e2.props ? e2.props : {}, t2 = i2.yaxisSource, s2 = i2.yaxisField, o2 = i2.isCumulative;
+    const t2 = e2.props ? e2.props : {}, i2 = t2.yaxisSource, s2 = t2.yaxisField, o2 = t2.isCumulative;
     let a2 = null;
-    if (!s2 || t2 && "variable" != t2) if ("formula" == t2) {
-      let t3 = i2.formula ? i2.formula : "";
-      for (const e3 in w) t3 = t3.replace(new RegExp(e3.replace("$", "\\$"), "g"), w[e3]);
-      a2 = { uuid: e2.uuid, type: "formula", formula: t3, data: [], dynamicDatas: [] };
-    } else a2 = { uuid: e2.uuid, type: "fixed", field: i2.yaxisFix, data: [], dynamicDatas: [] };
-    else a2 = { uuid: e2.uuid, type: "variable", field: s2, isCumulative: o2, data: [], dynamicDatas: [] }, s2 && !C.includes(s2) && (C.push(s2), I.push(s2)), o2 && !X.includes(s2) && X.push(s2);
-    null != a2 && (E.push(a2), A[e2.uuid] = a2), i2.dynamicSeriesField && !_.includes(i2.dynamicSeriesField) && a2 && (a2.dynamicField = i2.dynamicSeriesField, a2.dynamicSeriesTitle = i2.dynamicSeriesTitle, a2.dynamicShowStack = i2.dynamicShowStack, _.push(i2.dynamicSeriesField), b[i2.dynamicSeriesField] = s2);
+    if (!s2 || i2 && "variable" != i2) if ("formula" == i2) {
+      let i3 = t2.formula ? t2.formula : "";
+      for (const e3 in X) i3 = i3.replace(new RegExp(e3.replace("$", "\\$"), "g"), X[e3]);
+      a2 = { uuid: e2.uuid, type: "formula", formula: i3, data: [], dynamicDatas: [] };
+    } else a2 = { uuid: e2.uuid, type: "fixed", field: t2.yaxisFix, data: [], dynamicDatas: [] };
+    else a2 = { uuid: e2.uuid, type: "variable", field: s2, isCumulative: o2, data: [], dynamicDatas: [] }, s2 && !w.includes(s2) && (w.push(s2), C.push(s2)), o2 && !I.has(s2) && I.add(s2);
+    null != a2 && (E.push(a2), A[e2.uuid] = a2), t2.dynamicSeriesField && !_.includes(t2.dynamicSeriesField) && a2 && (a2.dynamicField = t2.dynamicSeriesField, a2.dynamicSeriesTitle = t2.dynamicSeriesTitle, a2.dynamicShowStack = t2.dynamicShowStack, _.push(t2.dynamicSeriesField), b[t2.dynamicSeriesField] = s2);
   }
   const L = {};
   if (_.length > 0) {
-    const i2 = [], t2 = {};
-    for (const s2 of g) if (s2) for (const a2 of C) {
+    const t2 = [], i2 = {};
+    for (const s2 of g) if (s2) for (const a2 of w) {
       const l2 = s2[o.X_FIELD_NAME];
-      let n2 = t2[l2];
+      let n2 = i2[l2];
       if (!n2) {
         n2 = {};
-        for (const e2 of D) n2[e2] = s2[e2];
-        n2[o.X_FIELD_NAME] = s2[o.X_FIELD_NAME], t2[l2] = n2, i2.push(n2);
+        for (const e2 of S) n2[e2] = s2[e2];
+        n2[o.X_FIELD_NAME] = s2[o.X_FIELD_NAME], i2[l2] = n2, t2.push(n2);
       }
-      let u2 = e(s2, a2, void 0);
-      if (!isNaN(u2)) {
+      let r2 = e(s2, a2, void 0);
+      if (!isNaN(r2)) {
         const e2 = n2[a2];
-        isNaN || (u2 += e2), n2[a2] = u2;
+        isNaN || (r2 += e2), n2[a2] = r2;
       }
     }
-    for (const i3 of _) {
+    for (const t3 of _) {
       const s2 = [];
       for (const a2 of g) {
         if (!a2) continue;
-        const l2 = t2[a2[o.X_FIELD_NAME]];
+        const l2 = i2[a2[o.X_FIELD_NAME]];
         if (!l2) continue;
-        let n2 = e(a2, i3, void 0);
-        n2 = null == n2 || null == n2 ? "" : n2, s2.includes(n2) || (s2.push(n2), I.push(n2), X.push(n2));
-        const u2 = b[i3];
-        if (void 0 !== u2) {
-          const i4 = e(a2, u2, void 0);
-          let t3 = l2[n2];
-          void 0 === t3 ? t3 = i4 : isNaN(i4) || (t3 += i4), l2[n2] = t3;
+        let n2 = e(a2, t3, void 0);
+        n2 = null == n2 || null == n2 ? "" : n2, s2.includes(n2) || (s2.push(n2), C.push(n2), I.add(n2));
+        const r2 = b[t3];
+        if (void 0 !== r2) {
+          const t4 = e(a2, r2, void 0);
+          let i3 = l2[n2];
+          void 0 === i3 ? i3 = t4 : isNaN(t4) || (i3 += t4), l2[n2] = i3;
         }
       }
-      L[i3] = s2;
+      L[t3] = s2;
     }
-    g = i2;
+    g = t2;
   }
-  l(c2, d, g), g = n(c2, d, g, D, I);
+  l(c2, d, g), g = n(c2, d, g, S, C);
   const M = [], j = {};
-  for (const i2 of g) if (i2) {
-    for (const t2 of X) {
-      const s2 = e(i2, t2, void 0);
-      let o2 = j[t2];
-      void 0 === s2 || isNaN(s2) || (void 0 === o2 ? o2 = s2 : o2 += s2), j[t2] = o2;
+  for (const t2 of g) if (t2) {
+    for (const i2 of I) {
+      const s2 = e(t2, i2, void 0);
+      let o2 = j[i2];
+      void 0 === s2 || isNaN(s2) || (void 0 === o2 ? o2 = s2 : o2 += s2), j[i2] = o2;
     }
-    M.push(i2[o.X_FIELD_NAME]);
-    for (const t2 of E) {
-      let s2 = t2.data;
-      const o2 = t2.dynamicDatas;
-      if (t2.dynamicField) {
-        let a2 = L[t2.dynamicField];
+    M.push(t2[o.X_FIELD_NAME]);
+    for (const i2 of E) {
+      let s2 = i2.data;
+      const o2 = i2.dynamicDatas;
+      if (i2.dynamicField) {
+        let a2 = L[i2.dynamicField];
         a2 = a2 || [];
         for (let l2 = 0; l2 < a2.length; l2++) {
           l2 >= o2.length && o2.push([]), s2 = o2[l2];
           const n2 = a2[l2];
-          let u2 = e(i2, n2, void 0);
-          t2.isCumulative && (u2 = j[n2]), s2.push(u2);
+          let r2 = e(t2, n2, void 0);
+          i2.isCumulative && (r2 = j[n2]), s2.push(r2);
         }
-      } else if ("fixed" === t2.type) s2.push(t2.field);
-      else if ("variable" === t2.type) {
-        let o3 = e(i2, t2.field, void 0);
-        t2.isCumulative && (o3 = j[t2.field]), s2.push(o3);
-      } else if ("formula" === t2.type) {
-        const e2 = u(t2.formula, j, i2, c2);
+      } else if ("fixed" === i2.type) s2.push(i2.field);
+      else if ("variable" === i2.type) {
+        let o3 = e(t2, i2.field, void 0);
+        i2.isCumulative && (o3 = j[i2.field]), s2.push(o3);
+      } else if ("formula" === i2.type) {
+        const e2 = r(i2.formula, j, t2, c2);
         s2.push(e2);
       } else s2.push(void 0);
     }
   }
   const k = d.defaultSeries, T = s(null == k ? [] : k), V = [];
   for (const e2 of T) {
-    const t2 = A[e2.uuid];
-    if (t2.dynamicField) {
-      let o2 = L[t2.dynamicField];
+    const i2 = A[e2.uuid];
+    if (i2.dynamicField) {
+      let o2 = L[i2.dynamicField];
       o2 = o2 || [];
-      const a2 = t2.dynamicDatas ? t2.dynamicDatas : [];
+      const a2 = i2.dynamicDatas ? i2.dynamicDatas : [];
       for (let l2 = 0; l2 < o2.length; l2++) {
-        const n2 = o2[l2], u2 = s(e2);
-        if (t2.dynamicSeriesTitle) {
-          const e3 = t2.dynamicSeriesTitle.replace("${name}", n2);
-          u2.name = i(c2, e3);
-        } else u2.name = n2;
-        u2.data = l2 < a2.length ? a2[l2] : [], "bar" == e2.type && t2.dynamicShowStack && (u2.stack = e2.uuid), V.push(u2);
+        const n2 = o2[l2], r2 = s(e2);
+        if (i2.dynamicSeriesTitle) {
+          const e3 = i2.dynamicSeriesTitle.replace("${name}", n2);
+          r2.name = t(c2, e3);
+        } else r2.name = n2;
+        r2.data = l2 < a2.length ? a2[l2] : [], "bar" == e2.type && i2.dynamicShowStack && (r2.stack = e2.uuid), V.push(r2);
       }
-    } else e2.data = t2 ? t2.data : [], V.push(e2);
+    } else e2.data = i2 ? i2.data : [], V.push(e2);
   }
   f.series = V;
   const $ = d.defaultXaxis, G = d.defaultYaxis;
@@ -133,7 +133,7 @@ function c(c2, d, f, p) {
     f.xAxis = $, f.yAxis = G;
   } else $ && $.length > 0 && ($[0].data = M), f.xAxis = $, f.yAxis = G;
   const R = d.props ? d.props.selGroupVariable : null;
-  !(d.props ? d.props.enableDrill : null) && R && (d.highlightInfos = [], t(c2.entity, R, null)), r(c2, d, "afterUpdateChart", f, { resultData: p }), d.groupFields = S, d.cacheDatas = g, d.rawResult = p;
+  !(d.props ? d.props.enableDrill : null) && R && (d.highlightInfos = [], i(c2.entity, R, null)), u(c2, d, "afterUpdateChart", f, { resultData: p }), d.groupFields = D, d.cacheDatas = g, d.rawResult = p;
 }
 export {
   c as updateChartOption

package/dist/es/components/runtime/utils/charts/chart-util.d.ts

@@ -66,7 +66,7 @@ export declare function limitDatas(pageContext: PageContext, configure: Componen
  * @param accumulateFields 累计计算的字段
  * @returns
  */
-export declare function caculateFormulaValue(itemConfs: any, datas: any, accumulateFields: any): any;
+export declare function caculateFormulaValue(itemConfs: any, datas: any, accumulateFields: Set<string>): any;
 /**
  * 获取数据源中的最小值
  * @param datas 数据源

package/dist/es/components/runtime/utils/charts/chart-util.js

@@ -5,9 +5,9 @@ import { getDefaultValue as i } from "../page-init-util.js";
 import { getValueFromSource as s, setValueForVariableName as o, getParamNames as r, formatVariableValue as l, getValueFromVariable as a, setVariableValue as c } from "../page-helper-util.js";
 import { appendDefaultMethods as f } from "../events/event-util.js";
 var u = ((t2) => (t2.X_FIELD_NAME = "__x", t2.Y_TEMP_NAME = "__y", t2))(u || {});
-const p = { theme1: t, theme2: e, theme3: n };
-function d(t2) {
-  return p[t2];
+const d = { theme1: t, theme2: e, theme3: n };
+function p(t2) {
+  return d[t2];
 }
 function h() {
   return [{ value: "theme1", label: "主题1" }, { value: "theme2", label: "主题2" }, { value: "theme3", label: "主题3" }];
@@ -177,7 +177,7 @@ function y(t2, e2, n2) {
         else if (t4.startsWith("${avg.")) i2[t4] = A(e2, t4.substring(6, t4.length - 1));
         else if (t4.startsWith("${add.")) {
           const e3 = t4.substring(6, t4.length - 1);
-          n2.push(e3);
+          n2.add(e3);
         }
       }
     }
@@ -258,7 +258,7 @@ export {
   k as executeChartFormula,
   M as exportCommonChart,
   A as getAvgValue,
-  d as getCustomTheme,
+  p as getCustomTheme,
   h as getCustomThemeOptions,
   F as getMaxValue,
   S as getMinValue,