super-page-runtime 2.3.27 → 2.3.28

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

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

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

@@ -1,20 +1,20 @@
 import t from "../../../../assets/chart-themes/bar-theme.js";
 import e from "../../../../assets/chart-themes/gauge-theme.js";
-import n from "../../../../assets/chart-themes/pie-theme.js";
-import i from "../../../../assets/chart-themes/radar-theme.js";
+import i from "../../../../assets/chart-themes/pie-theme.js";
+import n from "../../../../assets/chart-themes/radar-theme.js";
 import s from "../../../../assets/chart-themes/scatter-theme.js";
 import { getDefaultValue as r } from "../page-init-util.js";
-import { getValueFromSource as o, setValueForVariableName as a, getParamNames as l, formatVariableValue as c, getValueFromVariable as f, setVariableValue as u } from "../page-helper-util.js";
+import { getValueFromSource as o, setValueForVariableName as a, getParamNames as l, getValueFromVariable as c, formatVariableValue as f, setVariableValue as u } from "../page-helper-util.js";
 import { getI18n as d } from "agilebuilder-ui/src/utils/util";
 import { appendDefaultMethods as p } from "../events/event-util.js";
 var h = ((t2) => (t2.X_FIELD_NAME = "__x", t2.Y_TEMP_NAME = "__y", t2))(h || {});
 function g(r2, o2 = "bar") {
-  return "bar" === o2 ? t[r2] : "gauge" === o2 ? e[r2] : "pie" === o2 ? n[r2] : "radar" === o2 ? i[r2] : "scatter" === o2 ? s[r2] : t[r2];
+  return "bar" === o2 ? t[r2] : "gauge" === o2 ? e[r2] : "pie" === o2 ? i[r2] : "radar" === o2 ? n[r2] : "scatter" === o2 ? s[r2] : t[r2];
 }
 function m() {
   return [{ value: "theme1", label: "主题1" }, { value: "theme2", label: "主题2" }, { value: "theme3", label: "主题3" }];
 }
-function x(t2, e2, n2, i2, s2) {
+function x(t2, e2, i2, n2, s2) {
   return function(r2) {
     let o2 = r2 == null ? void 0 : r2.value;
     if (s2 && (o2 = r2), null == o2 || null == o2) return o2;
@@ -25,22 +25,22 @@ function x(t2, e2, n2, i2, s2) {
       (null == t3 || isNaN(t3)) && (t3 = 2), o2 = parseFloat(parseFloat(o2).toFixed(t3));
     }
     let a2 = "";
-    t2.indexOf("prefix") > -1 && n2 && (a2 = n2);
+    t2.indexOf("prefix") > -1 && i2 && (a2 = i2);
     let l2 = "";
-    return t2.indexOf("append") > -1 && i2 && (l2 = i2), a2 + o2.toLocaleString() + l2;
+    return t2.indexOf("append") > -1 && n2 && (l2 = n2), a2 + o2.toLocaleString() + l2;
   };
 }
 function b(t2, e2) {
   if (!e2) return;
   if (e2.tooltipFormatterArgs && (e2.tooltip || (e2.tooltip = {}), e2.tooltip.valueFormatter = x.apply(e2, e2.tooltipFormatterArgs)), e2.series) {
-    const n3 = t2.props ? t2.props.enableDrill : null;
-    for (const i3 of e2.series) e2.radar || (i3.data = []), i3.labelFormatterArgs && (i3.label || (i3.label = {}), i3.label.formatter = x.apply(i3, i3.labelFormatterArgs)), !n3 && t2.clickSet && t2.clickSet.selected && i3.emphasis && (i3.emphasis.disabled = false), "pie" === i3.type && t2.clickSet && t2.clickSet.selected && (t2.clickSet.multiple ? i3.selectedMode = "multiple" : i3.selectedMode = "single");
+    const i3 = t2.props ? t2.props.enableDrill : null;
+    for (const n3 of e2.series) e2.radar || (n3.data = []), n3.labelFormatterArgs && (n3.label || (n3.label = {}), n3.label.formatter = x.apply(n3, n3.labelFormatterArgs)), !i3 && t2.clickSet && t2.clickSet.selected && n3.emphasis && (n3.emphasis.disabled = false), "pie" === n3.type && t2.clickSet && t2.clickSet.selected && (t2.clickSet.multiple ? n3.selectedMode = "multiple" : n3.selectedMode = "single");
   }
   if (e2.radar) for (const t3 of e2.radar) t3.indicator = [];
-  const n2 = e2.series;
-  t2.defaultSeries = n2;
-  const i2 = e2.xAxis;
-  i2 && i2.length > 0 && i2[0].data && (i2[0].data = []), t2.defaultXaxis = i2;
+  const i2 = e2.series;
+  t2.defaultSeries = i2;
+  const n2 = e2.xAxis;
+  n2 && n2.length > 0 && n2[0].data && (n2[0].data = []), t2.defaultXaxis = n2;
   const s2 = e2.yAxis;
   if (s2) for (const t3 of s2) t3.data && (t3.data = []), "auto" === t3._dataMin && (t3.min = function(t4) {
     if (t4.min) return 10 * Math.floor(t4.min / 10);
@@ -49,19 +49,19 @@ function b(t2, e2) {
   });
   t2.defaultYaxis = s2;
 }
-function I(t2, e2, n2) {
-  if (!(n2 && e2 && e2.clickSet && t2)) return;
-  const i2 = e2.clickSet;
-  n2.on("click", function(s2) {
+function I(t2, e2, i2) {
+  if (!(i2 && e2 && e2.clickSet && t2)) return;
+  const n2 = e2.clickSet;
+  i2.on("click", function(s2) {
     let r2 = e2.highlightInfos ? e2.highlightInfos : [], o2 = -1;
     if (r2) {
       const t3 = [];
       for (let a2 = 0; a2 < r2.length; a2++) {
         const l2 = r2[a2], c2 = l2.seriesIndex === s2.seriesIndex && l2.dataIndex === s2.dataIndex;
-        if (c2 || !i2.multiple) {
-          if (i2.selected) {
+        if (c2 || !n2.multiple) {
+          if (n2.selected) {
             const t4 = "chart-pie" === e2.name ? "unselect" : "downplay";
-            n2.dispatchAction({ type: t4, seriesIndex: l2.seriesIndex, dataIndex: l2.dataIndex });
+            i2.dispatchAction({ type: t4, seriesIndex: l2.seriesIndex, dataIndex: l2.dataIndex });
           }
         } else t3.push(l2);
         c2 && (o2 = a2);
@@ -69,49 +69,53 @@ function I(t2, e2, n2) {
       r2 = t3;
     }
     if (-1 === o2) {
-      if (i2.selected) {
+      if (n2.selected) {
         const t3 = "chart-pie" === e2.name ? "select" : "highlight";
-        n2.dispatchAction({ type: t3, seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
+        i2.dispatchAction({ type: t3, seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
       }
       r2.push({ seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
     }
     e2.highlightInfos = r2, N(t2, e2);
   });
 }
-function v(t2, e2, n2) {
-  if (!n2 || !e2 || !t2) return;
-  const i2 = e2.highlightInfos ? e2.highlightInfos : [];
-  for (let t3 = 0; t3 < i2.length; t3++) {
-    const s2 = i2[t3], r2 = "chart-pie" === e2.name ? "unselect" : "downplay";
-    n2.dispatchAction({ type: r2, seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
+function v(t2, e2, i2) {
+  if (!i2 || !e2 || !t2) return;
+  const n2 = e2.highlightInfos ? e2.highlightInfos : [];
+  for (let t3 = 0; t3 < n2.length; t3++) {
+    const s2 = n2[t3], r2 = "chart-pie" === e2.name ? "unselect" : "downplay";
+    i2.dispatchAction({ type: r2, seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
   }
   e2.highlightInfos = [], N(t2, e2);
 }
 function N(t2, e2) {
   if (!e2.clickSet) return;
-  const n2 = e2.clickSet, i2 = n2.variables;
-  if (!i2 || 0 == i2.length) return;
+  const i2 = e2.clickSet, n2 = i2.variables;
+  if (!n2 || 0 == n2.length) return;
   const s2 = e2.highlightInfos ? e2.highlightInfos : [], r2 = e2.cacheDatas ? e2.cacheDatas : [], l2 = [], c2 = [];
   for (const t3 of s2) c2.includes(t3.dataIndex) || (c2.push(t3.dataIndex), t3.dataIndex < r2.length && l2.push(r2[t3.dataIndex]));
-  for (const e3 of i2) {
+  for (const e3 of n2) {
     if (!e3.fieldName || !e3.variable) continue;
-    const i3 = [];
+    const n3 = [];
     for (const t3 of l2) {
-      const n3 = o(t3, e3.fieldName, void 0);
-      null != n3 && i3.push(n3);
+      const i3 = o(t3, e3.fieldName, void 0);
+      null != i3 && n3.push(i3);
     }
-    n2.multiple ? a(t2.entity, e3.variable, i3) : a(t2.entity, e3.variable, i3.length > 0 ? i3[0] : void 0);
+    i2.multiple ? a(t2.entity, e3.variable, n3) : a(t2.entity, e3.variable, n3.length > 0 ? n3[0] : void 0);
   }
 }
-function y(t2, e2, n2) {
-  const i2 = e2.items ? e2.items : [], s2 = e2.props ? e2.props.orderByTarget : "";
+function y(t2, e2, i2) {
+  const n2 = e2.items ? e2.items : [], s2 = e2.props ? e2.props.orderByTarget : "";
   let r2 = null;
   if ("x" == s2 || "X" == s2) r2 = "__x";
   else if (s2) {
-    for (const t3 of i2) if (t3.uuid == s2) {
-      const e3 = t3.props ? t3.props : {}, n3 = e3.yaxisSource, i3 = e3.yaxisField;
-      if (i3 && (!n3 || "variable" == n3)) {
-        r2 = i3;
+    for (const t3 of n2) if (t3.uuid == s2) {
+      const e3 = t3.props ? t3.props : {}, i3 = e3.yaxisSource, n3 = e3.yaxisField;
+      if (n3 && (!i3 || "variable" == i3)) {
+        r2 = n3;
+        break;
+      }
+      if ("formula" == i3 && e3.formula) {
+        r2 = t3.uuid + "_field";
         break;
       }
     }
@@ -120,137 +124,137 @@ function y(t2, e2, n2) {
   const a2 = e2.props ? e2.props.orderSource : "";
   let l2 = e2.props ? e2.props.orderFix : "";
   if ("variable" == a2) {
-    const n3 = e2.props ? e2.props.orderVariable : "";
-    l2 = c(t2, n3);
+    const i3 = e2.props ? e2.props.orderVariable : "";
+    l2 = f(t2, i3);
   }
-  l2 = "desc" == l2 || "DESC" == l2 ? "desc" : "asc", n2.sort((t3, e3) => {
-    const n3 = o(t3, r2, void 0), i3 = o(e3, r2, void 0);
-    return "desc" === l2 ? i3 - n3 : n3 - i3;
+  l2 = "desc" == l2 || "DESC" == l2 ? "desc" : "asc", i2.sort((t3, e3) => {
+    const i3 = o(t3, r2, void 0), n3 = o(e3, r2, void 0);
+    return "desc" === l2 ? n3 - i3 : i3 - n3;
   });
 }
-function S(t2, e2, n2, i2, s2) {
-  if (!n2) return n2;
+function S(t2, e2, i2, n2, s2) {
+  if (!i2) return i2;
   const r2 = e2.props ? e2.props : {};
-  if (!r2.limitQuantity) return n2;
+  if (!r2.limitQuantity) return i2;
   let a2 = null;
-  if (r2.itemNumVariable ? (a2 = c(t2, r2.itemNumVariable), a2 = parseInt(a2)) : a2 = r2.itemNumFix ? r2.itemNumFix : 10, null == a2 || null == a2 || isNaN(a2)) return n2;
-  if (n2.length < a2) return n2;
-  const l2 = r2.overItemAlias, f2 = [], u2 = {};
-  i2 = i2 || [], s2 = s2 || [];
-  for (let t3 = 0; t3 < n2.length; t3++) {
-    const e3 = n2[t3];
-    if (t3 < a2) f2.push(e3);
+  if (r2.itemNumVariable ? (a2 = f(t2, r2.itemNumVariable), a2 = parseInt(a2)) : a2 = r2.itemNumFix ? r2.itemNumFix : 10, null == a2 || null == a2 || isNaN(a2)) return i2;
+  if (i2.length < a2) return i2;
+  const l2 = r2.overItemAlias, c2 = [], u2 = {};
+  n2 = n2 || [], s2 = s2 || [];
+  for (let t3 = 0; t3 < i2.length; t3++) {
+    const e3 = i2[t3];
+    if (t3 < a2) c2.push(e3);
     else {
       if (!l2) break;
-      for (const t4 of i2) {
+      for (const t4 of n2) {
         if (!t4) continue;
-        let n3 = o(e3, t4, void 0);
-        n3 = null == n3 || null == n3 ? "" : n3, u2[t4] || (u2[t4] = []);
-        const i3 = u2[t4];
-        i3.includes(n3) || i3.push(n3);
+        let i3 = o(e3, t4, void 0);
+        i3 = null == i3 || null == i3 ? "" : i3, u2[t4] || (u2[t4] = []);
+        const n3 = u2[t4];
+        n3.includes(i3) || n3.push(i3);
       }
       for (const t4 of s2) {
         if (!t4) continue;
-        const n3 = o(e3, t4, void 0);
-        if (isNaN(n3)) continue;
-        const i3 = u2[t4];
-        isNaN(i3) ? u2[t4] = n3 : u2[t4] = n3 + i3;
+        const i3 = o(e3, t4, void 0);
+        if (isNaN(i3)) continue;
+        const n3 = u2[t4];
+        isNaN(n3) ? u2[t4] = i3 : u2[t4] = i3 + n3;
       }
     }
   }
-  return l2 && (u2.__x = l2, f2.push(u2)), f2;
+  return l2 && (u2.__x = l2, c2.push(u2)), c2;
 }
-function F(t2, e2, n2) {
-  const i2 = {};
+function F(t2, e2, i2) {
+  const n2 = {};
   for (const s2 of t2) {
     const t3 = s2.props ? s2.props : {};
     if ("formula" === t3.yaxisSource) {
       const s3 = l(t3.formula);
-      for (const t4 of s3) if (!(t4 in i2)) {
-        if (t4.startsWith("${min.")) i2[t4] = _(e2, t4.substring(6, t4.length - 1));
-        else if (t4.startsWith("${max.")) i2[t4] = A(e2, t4.substring(6, t4.length - 1));
-        else if (t4.startsWith("${sum.")) i2[t4] = M(e2, t4.substring(6, t4.length - 1));
-        else if (t4.startsWith("${avg.")) i2[t4] = k(e2, t4.substring(6, t4.length - 1));
+      for (const t4 of s3) if (!(t4 in n2)) {
+        if (t4.startsWith("${min.")) n2[t4] = _(e2, t4.substring(6, t4.length - 1));
+        else if (t4.startsWith("${max.")) n2[t4] = A(e2, t4.substring(6, t4.length - 1));
+        else if (t4.startsWith("${sum.")) n2[t4] = M(e2, t4.substring(6, t4.length - 1));
+        else if (t4.startsWith("${avg.")) n2[t4] = k(e2, t4.substring(6, t4.length - 1));
         else if (t4.startsWith("${add.")) {
           const e3 = t4.substring(6, t4.length - 1);
-          n2.add(e3);
+          i2.add(e3);
         }
       }
     }
   }
-  return i2;
+  return n2;
 }
 function _(t2, e2) {
-  let n2;
-  for (const i2 of t2) {
-    const t3 = parseFloat(o(i2, e2, null));
-    (void 0 === n2 || !isNaN(t3) && t3 < n2) && (n2 = t3);
+  let i2;
+  for (const n2 of t2) {
+    const t3 = parseFloat(o(n2, e2, null));
+    (void 0 === i2 || !isNaN(t3) && t3 < i2) && (i2 = t3);
   }
-  return n2;
+  return i2;
 }
 function A(t2, e2) {
-  let n2;
-  for (const i2 of t2) {
-    const t3 = parseFloat(o(i2, e2, null));
-    (void 0 === n2 || !isNaN(t3) && t3 > n2) && (n2 = t3);
+  let i2;
+  for (const n2 of t2) {
+    const t3 = parseFloat(o(n2, e2, null));
+    (void 0 === i2 || !isNaN(t3) && t3 > i2) && (i2 = t3);
   }
-  return n2;
+  return i2;
 }
 function M(t2, e2) {
-  let n2;
-  for (const i2 of t2) {
-    const t3 = parseFloat(o(i2, e2, null));
-    void 0 === n2 ? n2 = t3 : isNaN(t3) || (n2 += t3);
+  let i2;
+  for (const n2 of t2) {
+    const t3 = parseFloat(o(n2, e2, null));
+    void 0 === i2 ? i2 = t3 : isNaN(t3) || (i2 += t3);
   }
-  return n2;
+  return i2;
 }
 function k(t2, e2) {
-  const n2 = M(t2, e2);
-  return void 0 === n2 || 0 === t2.length ? n2 : parseFloat((n2 / t2.length).toFixed(5));
+  const i2 = M(t2, e2);
+  return void 0 === i2 || 0 === t2.length ? i2 : parseFloat((i2 / t2.length).toFixed(5));
 }
-function w(t2, e2, n2, i2) {
+function w(t2, e2, i2, n2) {
   if (!t2) return;
-  if (e2) for (const n3 in e2) t2 = t2.replace(new RegExp("\\${add." + n3 + "}", "g"), e2[n3]);
+  if (e2) for (const i3 in e2) t2 = t2.replace(new RegExp("\\${add." + i3 + "}", "g"), e2[i3]);
   const s2 = l(t2);
   for (const e3 of s2) {
     let s3 = null;
-    s3 = e3.startsWith("${row.") ? o(n2, e3.substring(6, e3.length - 1), null) : f(i2.entity, e3), t2 = t2.replace(new RegExp(e3.replace("$", "\\$"), "g"), s3);
+    s3 = e3.startsWith("${row.") ? o(i2, e3.substring(6, e3.length - 1), null) : c(n2.entity, e3), t2 = t2.replace(new RegExp(e3.replace("$", "\\$"), "g"), s3);
   }
   t2.includes("return ") || (t2 = "return " + t2);
   const r2 = new Function("params", t2);
-  return p(r2, i2), r2({ pageContext: i2, row: n2 });
+  return p(r2, n2), r2({ pageContext: n2, row: i2 });
 }
 function $(t2, e2) {
   if (!t2 || !t2.$el) return;
-  const n2 = t2.$el.getElementsByTagName("canvas");
-  if (!n2 || 0 === n2.length) return;
-  const i2 = n2[0], s2 = i2.width + ":" + i2.height;
-  return { isTable: false, fileContent: i2.toDataURL(), fileSize: s2, title: e2 == null ? void 0 : e2.title };
+  const i2 = t2.$el.getElementsByTagName("canvas");
+  if (!i2 || 0 === i2.length) return;
+  const n2 = i2[0], s2 = n2.width + ":" + n2.height;
+  return { isTable: false, fileContent: n2.toDataURL(), fileSize: s2, title: e2 == null ? void 0 : e2.title };
 }
-function j(t2, e2, n2) {
-  const i2 = window.localStorage.getItem("HOME_MY_CHARTS_CONDITIONS");
+function j(t2, e2, i2) {
+  const n2 = window.localStorage.getItem("HOME_MY_CHARTS_CONDITIONS");
   let s2 = true;
-  if (i2) {
-    const t3 = JSON.parse(i2);
-    if (t3[n2]) {
-      const i3 = t3[n2];
-      if (Object.keys(i3).length > 0) {
+  if (n2) {
+    const t3 = JSON.parse(n2);
+    if (t3[i2]) {
+      const n3 = t3[i2];
+      if (Object.keys(n3).length > 0) {
         s2 = false;
-        for (const t4 in i3) null !== i3[t4] && void 0 !== i3[t4] && a(e2.entity, t4, i3[t4]);
+        for (const t4 in n3) null !== n3[t4] && void 0 !== n3[t4] && a(e2.entity, t4, n3[t4]);
       }
     }
   }
   if (s2 && t2) {
-    for (const n3 of t2) if (n3.prop && n3.value) {
-      const t3 = r(e2, n3.value, "input-text", false), i3 = n3.prop.substring(2, n3.prop.length - 1).split(".");
-      null != t3 && u(e2.entity, i3, t3);
+    for (const i3 of t2) if (i3.prop && i3.value) {
+      const t3 = r(e2, i3.value, "input-text", false), n3 = i3.prop.substring(2, i3.prop.length - 1).split(".");
+      null != t3 && u(e2.entity, n3, t3);
     }
   }
 }
 function O(t2) {
   if (t2 == null ? void 0 : t2.grid) {
-    const e2 = t2.grid, n2 = (t3) => !t3 || "0" === t3;
-    n2(e2.top) && n2(e2.right) && n2(e2.bottom) && n2(e2.left) && Object.assign(e2, { right: "10%", bottom: "60", left: "10%" });
+    const e2 = t2.grid, i2 = (t3) => !t3 || "0" === t3;
+    i2(e2.top) && i2(e2.right) && i2(e2.bottom) && i2(e2.left) && Object.assign(e2, { right: "10%", bottom: "60", left: "10%" });
   }
 }
 function E(t2) {