super-page-runtime 2.3.18-tmp2 → 2.3.18-tmp3

package/dist/es/components/runtime/utils/barcode-util.js

@@ -1,11 +1,11 @@
-function e(e2, t) {
-  let n = true, r = "";
+function e(e2, n) {
+  let t = true, r = "";
   return e2.forEach((e3) => {
     if ("-1" !== e3.propDbName && -1 !== e3.propDbName) {
-      const a = t[e3.propDbName];
-      e3.supplementaryCharacters && e3.length ? a ? a.length > e3.length ? r += a.substring(0, e3.length) : r += a.padEnd(e3.length, e3.supplementaryCharacters) : r += "".padEnd(e3.length, e3.supplementaryCharacters) : a ? r += a : n = false;
+      const a = n[e3.propDbName];
+      e3.supplementaryCharacters && e3.length ? a ? a.length > e3.length ? r += a.substring(0, e3.length) : r += a.padEnd(e3.length, e3.supplementaryCharacters) : r += "".padEnd(e3.length, e3.supplementaryCharacters) : a ? r += a : t = false;
     } else r += e3.fixedValue;
-  }), n ? r : null;
+  }), console.log("跟据规则生成条码：" + r), t ? r : null;
 }
 export {
   e as generateCodeByRule

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

@@ -1,9 +1,9 @@
-import { getValueFromSource as o, setValueForVariableName as t } from "../page-helper-util.js";
-import { deepCopy as r } from "../common-util.js";
-import { setDefaultGrid as s, CommonName as e, caculateFormulaValue as l, executeChartFormula as n, sortDatas as p, limitDatas as i } from "./chart-util.js";
+import { getValueFromSource as o, setValueForVariableName as e } from "../page-helper-util.js";
+import { deepCopy as s } from "../common-util.js";
+import { setDefaultGrid as r, CommonName as t, caculateFormulaValue as l, executeChartFormula as n, sortDatas as p, limitDatas as i } from "./chart-util.js";
 function u(u2, c, a, f) {
   if (!f || !f.result) return;
-  s(a);
+  r(a);
   const g = f && f.result ? f.result : {};
   let m = f && f.groupValue ? f.groupValue : void 0;
   const h = c.serviceDataField;
@@ -14,67 +14,68 @@ function u(u2, c, a, f) {
     m = [];
     for (const o2 of y) m.push(o2.group);
   }
-  const x = {}, v = [], E = [];
-  for (const o2 of y) x[o2.group] = o2.target, o2.target && !v.includes(o2.target) && (v.push(o2.target), m.includes(o2.group) && E.push(o2.target));
-  let F = c.props ? c.props.mulGroupShow : "";
-  F = "break" == F ? "\r\n" : " ";
-  for (const t2 of d) {
-    if (!t2) continue;
-    const r2 = [];
-    for (const s3 of m) {
-      const e2 = x[s3], l2 = o(t2, e2, void 0);
-      l2 && r2.push(l2);
+  const v = {}, x = [], F = [];
+  for (const o2 of y) v[o2.group] = o2.target, o2.target && !x.includes(o2.target) && (x.push(o2.target), m.includes(o2.group) && F.push(o2.target));
+  let E = c.props ? c.props.mulGroupShow : "";
+  E = "break" == E ? "\r\n" : " ", console.log("groupValue", m);
+  for (const e2 of d) {
+    if (!e2) continue;
+    const s2 = [];
+    for (const r3 of m) {
+      const t2 = v[r3], l2 = o(e2, t2, void 0);
+      l2 && s2.push(l2);
     }
-    const s2 = r2.join(F);
-    t2[e.X_FIELD_NAME] = s2;
+    const r2 = s2.join(E);
+    e2[t.X_FIELD_NAME] = r2;
   }
   const S = c.items ? c.items : [];
-  if (0 == S.length) return;
+  if (0 == S.length) return void console.log("饼图的系列为空,操作失败!", c);
   const _ = c.props ? c.props : {};
   let A = _.yaxisField;
-  if (S[0].props.yaxisField = A, S[0].props.yaxisSource = _.yaxisSource, S[0].props.formula = _.formula, "formula" === _.yaxisSource) {
-    const t2 = [], r2 = l(S, d, t2);
-    let s2 = _.formula ? _.formula : "";
-    for (const o2 in r2) s2 = s2.replace(new RegExp(o2.replace("$", "\\$"), "g"), r2[o2]);
-    A = e.Y_TEMP_NAME;
+  if (console.log("valueField", A), S[0].props.yaxisField = A, S[0].props.yaxisSource = _.yaxisSource, S[0].props.formula = _.formula, "formula" === _.yaxisSource) {
+    const e2 = [], s2 = l(S, d, e2);
+    let r2 = _.formula ? _.formula : "";
+    for (const o2 in s2) r2 = r2.replace(new RegExp(o2.replace("$", "\\$"), "g"), s2[o2]);
+    A = t.Y_TEMP_NAME;
     const p2 = {};
-    for (const r3 of d) {
-      if (!r3) continue;
-      for (const s3 of t2) {
-        const t3 = o(r3, s3, void 0);
-        let e3 = p2[s3];
-        void 0 === t3 || isNaN(t3) || (void 0 === e3 ? e3 = t3 : e3 += t3), p2[s3] = e3;
+    for (const s3 of d) {
+      if (!s3) continue;
+      for (const r3 of e2) {
+        const e3 = o(s3, r3, void 0);
+        let t3 = p2[r3];
+        void 0 === e3 || isNaN(e3) || (void 0 === t3 ? t3 = e3 : t3 += e3), p2[r3] = t3;
       }
-      const e2 = n(s2, p2, r3, u2);
-      r3[A] = e2;
+      console.log("formula", r2);
+      const t2 = n(r2, p2, s3, u2);
+      console.log("formula-result", t2), s3[A] = t2;
     }
   }
-  S[0].props.yaxisField = A, S[0].props.yaxisSource = "", p(u2, c, d), d = i(u2, c, d, v, [A]);
+  S[0].props.yaxisField = A, S[0].props.yaxisSource = "", p(u2, c, d), d = i(u2, c, d, x, [A]);
   const D = [], M = [];
-  for (const t2 of d) {
-    if (!t2) continue;
-    D.push(t2[e.X_FIELD_NAME]);
-    const r2 = o(t2, A, void 0);
-    M.push(r2);
+  for (const e2 of d) {
+    if (!e2) continue;
+    D.push(e2[t.X_FIELD_NAME]);
+    const s2 = o(e2, A, void 0);
+    M.push(s2);
   }
   const N = c.defaultSeries;
   let j = N[0].pieColors;
   j = j || [];
-  let b = N[0].pieColorMap;
-  b = b || {};
-  const w = [];
+  let V = N[0].pieColorMap;
+  V = V || {};
+  const b = [];
   for (let o2 = 0; o2 < D.length && o2 < M.length; o2++) {
-    const t2 = { value: M[o2], name: D[o2] };
-    if (o2 < j.length || b[t2.name]) {
-      let r2 = b[t2.name];
-      r2 || (r2 = j[o2]), r2 && (t2.itemStyle = { color: r2 });
+    const e2 = { value: M[o2], name: D[o2] };
+    if (o2 < j.length || V[e2.name]) {
+      let s2 = V[e2.name];
+      s2 || (s2 = j[o2]), s2 && (e2.itemStyle = { color: s2 });
     }
-    w.push(t2);
+    b.push(e2);
   }
-  const I = r(N);
-  I[0].data = w, a.series = [I[0]];
-  const V = c.props ? c.props.selGroupVariable : null;
-  !(c.props ? c.props.enableDrill : null) && V && (c.highlightInfos = [], t(u2.entity, V, null)), c.groupFields = E, c.cacheDatas = d, c.rawResult = f;
+  const w = s(N);
+  w[0].data = b, a.series = [w[0]];
+  const I = c.props ? c.props.selGroupVariable : null;
+  !(c.props ? c.props.enableDrill : null) && I && (c.highlightInfos = [], e(u2.entity, I, null)), c.groupFields = F, c.cacheDatas = d, c.rawResult = f;
 }
 export {
   u as updateChartOption

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

@@ -1,13 +1,13 @@
 import { getValueFromSource as o } from "../page-helper-util.js";
 import { deepCopy as s } from "../common-util.js";
 import { setDefaultGrid as i, caculateFormulaValue as e, executeChartFormula as r } from "./chart-util.js";
-function t(t2, a, l, u) {
+function t(t2, l, a, u) {
   if (!u || !u.result) return;
-  i(l);
-  const f = u && u.result ? u.result : {}, c = a.serviceDataField;
+  i(a);
+  const c = u && u.result ? u.result : {}, f = l.serviceDataField;
   let d = null;
-  c ? d = f[c] : f && (d = Array.isArray(f) ? f : [f]), d || (d = []);
-  const n = a.items ? a.items : [], p = [], m = {};
+  f ? d = c[f] : c && (d = Array.isArray(c) ? c : [c]), d || (d = []);
+  const n = l.items ? l.items : [], p = [], m = {};
   for (const o2 of n) {
     const s2 = o2.props ? o2.props : {}, i2 = o2.props ? o2.style : {}, e2 = s2.xaxisField, r2 = s2.sizeField, t3 = { uuid: o2.uuid, xaxisField: e2, yaxisField: s2.yaxisField, yaxisSource: s2.yaxisSource, formula: s2.formula, sizeField: r2, symbolSize: i2.symbolSize, data: [] };
     p.push(t3), m[t3.uuid] = t3;
@@ -26,20 +26,22 @@ function t(t2, a, l, u) {
       void 0 === e2 || isNaN(e2) || (void 0 === r2 ? r2 = e2 : r2 += e2), F[i2] = r2;
     }
     for (const i2 of p) {
-      const e2 = i2.data, a2 = [];
-      if (a2.push(o(s2, i2.xaxisField, void 0)), "formula" === i2.yaxisSource) {
+      const e2 = i2.data, l2 = [];
+      if (l2.push(o(s2, i2.xaxisField, void 0)), "formula" === i2.yaxisSource) {
         const o2 = r(i2.formula, F, s2, t2);
-        a2.push(o2);
-      } else a2.push(o(s2, i2.yaxisField, void 0));
-      i2.sizeField ? a2.push(o(s2, i2.xaxisField, void 0)) : a2.push(i2.symbolSize), e2.push(a2);
+        l2.push(o2);
+      } else l2.push(o(s2, i2.yaxisField, void 0));
+      i2.sizeField ? l2.push(o(s2, i2.xaxisField, void 0)) : l2.push(i2.symbolSize), e2.push(l2);
     }
   }
-  const h = a.defaultSeries, S = s(h);
+  const h = l.defaultSeries;
+  console.log("defaultSeries", h);
+  const S = s(h);
   for (const o2 of S) {
     const s2 = m[o2.uuid];
     o2.data = s2.data;
   }
-  l.series = S, a.cacheDatas = d, a.rawResult = u;
+  a.series = S, l.cacheDatas = d, l.rawResult = u;
 }
 export {
   t as updateChartOption

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

@@ -2,7 +2,7 @@ import t from "../../../../assets/chart-themes/theme1.js";
 import e from "../../../../assets/chart-themes/theme2.js";
 import n from "../../../../assets/chart-themes/theme3.js";
 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 { getValueFromSource as o, setValueForVariableName as s, 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 d = { theme1: t, theme2: e, theme3: n };
@@ -12,11 +12,11 @@ function p(t2) {
 function h() {
   return [{ value: "theme1", label: "主题1" }, { value: "theme2", label: "主题2" }, { value: "theme3", label: "主题3" }];
 }
-function m(t2, e2, n2, i2, s2) {
-  return function(o2) {
-    let r2 = o2 == null ? void 0 : o2.value;
-    if (s2 && (r2 = o2), null == r2 || null == r2) return r2;
-    if (Array.isArray(r2)) return r2;
+function g(t2, e2, n2, i2, o2) {
+  return function(s2) {
+    let r2 = s2 == null ? void 0 : s2.value;
+    if (o2 && (r2 = s2), null == r2 || null == r2) return r2;
+    if (Array.isArray(r2)) return console.log("numformatter is array", r2), r2;
     if (isNaN(r2) || !t2 || !t2.indexOf) return r2;
     if (t2.indexOf("precision") > -1) {
       let t3 = parseInt(e2);
@@ -28,34 +28,36 @@ function m(t2, e2, n2, i2, s2) {
     return t2.indexOf("append") > -1 && i2 && (a2 = i2), l2 + r2.toLocaleString() + a2;
   };
 }
-function g(t2, e2) {
+function m(t2, e2) {
   if (!e2) return;
-  if (e2.tooltipFormatterArgs && (e2.tooltip || (e2.tooltip = {}), e2.tooltip.valueFormatter = m.apply(e2, e2.tooltipFormatterArgs)), e2.series) {
+  if (e2.tooltipFormatterArgs && (e2.tooltip || (e2.tooltip = {}), e2.tooltip.valueFormatter = g.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 = m.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");
+    for (const i3 of e2.series) e2.radar || (i3.data = []), i3.labelFormatterArgs && (i3.label || (i3.label = {}), i3.label.formatter = g.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");
   }
   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 s2 = e2.yAxis;
-  if (s2) for (const t3 of s2) t3.data && (t3.data = []), "auto" === t3._dataMin && (t3.min = function(t4) {
+  const o2 = e2.yAxis;
+  if (o2) for (const t3 of o2) t3.data && (t3.data = []), "auto" === t3._dataMin && (t3.min = function(t4) {
     if (t4.min) return 10 * Math.floor(t4.min / 10);
   }), "auto" === t3._dataMax && (t3.max = function(t4) {
     if (t4.max) return 10 * Math.ceil(t4.max / 10);
   });
-  t2.defaultYaxis = s2;
+  t2.defaultYaxis = o2;
 }
 function x(t2, e2, n2) {
   if (!(n2 && e2 && e2.clickSet && t2)) return;
   const i2 = e2.clickSet;
-  n2.on("click", function(s2) {
-    let o2 = e2.highlightInfos ? e2.highlightInfos : [], r2 = -1;
-    if (o2) {
+  n2.on("click", function(o2) {
+    let s2 = e2.highlightInfos ? e2.highlightInfos : [];
+    console.log("highlightInfos", s2, o2);
+    let r2 = -1;
+    if (s2) {
       const t3 = [];
-      for (let l2 = 0; l2 < o2.length; l2++) {
-        const a2 = o2[l2], c2 = a2.seriesIndex === s2.seriesIndex && a2.dataIndex === s2.dataIndex;
+      for (let l2 = 0; l2 < s2.length; l2++) {
+        const a2 = s2[l2], c2 = a2.seriesIndex === o2.seriesIndex && a2.dataIndex === o2.dataIndex;
         if (c2 || !i2.multiple) {
           if (i2.selected) {
             const t4 = "chart-pie" === e2.name ? "unselect" : "downplay";
@@ -64,24 +66,24 @@ function x(t2, e2, n2) {
         } else t3.push(a2);
         c2 && (r2 = l2);
       }
-      o2 = t3;
+      s2 = t3;
     }
     if (-1 === r2) {
       if (i2.selected) {
         const t3 = "chart-pie" === e2.name ? "select" : "highlight";
-        n2.dispatchAction({ type: t3, seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
+        n2.dispatchAction({ type: t3, seriesIndex: o2.seriesIndex, dataIndex: o2.dataIndex });
       }
-      o2.push({ seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
+      s2.push({ seriesIndex: o2.seriesIndex, dataIndex: o2.dataIndex });
     }
-    e2.highlightInfos = o2, b(t2, e2);
+    e2.highlightInfos = s2, b(t2, e2);
   });
 }
 function I(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], o2 = "chart-pie" === e2.name ? "unselect" : "downplay";
-    n2.dispatchAction({ type: o2, seriesIndex: s2.seriesIndex, dataIndex: s2.dataIndex });
+    const o2 = i2[t3], s2 = "chart-pie" === e2.name ? "unselect" : "downplay";
+    n2.dispatchAction({ type: s2, seriesIndex: o2.seriesIndex, dataIndex: o2.dataIndex });
   }
   e2.highlightInfos = [], b(t2, e2);
 }
@@ -95,18 +97,18 @@ function b(t2, e2) {
     if (!e3.fieldName || !e3.variable) continue;
     const i3 = [];
     for (const t3 of a2) {
-      const n3 = s(t3, e3.fieldName, void 0);
+      const n3 = o(t3, e3.fieldName, void 0);
       null != n3 && i3.push(n3);
     }
-    n2.multiple ? o(t2.entity, e3.variable, i3) : o(t2.entity, e3.variable, i3.length > 0 ? i3[0] : void 0);
+    n2.multiple ? s(t2.entity, e3.variable, i3) : s(t2.entity, e3.variable, i3.length > 0 ? i3[0] : void 0);
   }
 }
 function v(t2, e2, n2) {
-  const i2 = e2.items ? e2.items : [], o2 = e2.props ? e2.props.orderByTarget : "";
+  const i2 = e2.items ? e2.items : [], s2 = e2.props ? e2.props.orderByTarget : "";
   let r2 = null;
-  if ("x" == o2 || "X" == o2) r2 = "__x";
-  else if (o2) {
-    for (const t3 of i2) if (t3.uuid == o2) {
+  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;
@@ -122,11 +124,11 @@ function v(t2, e2, n2) {
     c2 = l(t2, n3);
   }
   c2 = "desc" == c2 || "DESC" == c2 ? "desc" : "asc", n2.sort((t3, e3) => {
-    const n3 = s(t3, r2, void 0), i3 = s(e3, r2, void 0);
+    const n3 = o(t3, r2, void 0), i3 = o(e3, r2, void 0);
     return "desc" === c2 ? i3 - n3 : n3 - i3;
   });
 }
-function N(t2, e2, n2, i2, o2) {
+function N(t2, e2, n2, i2, s2) {
   if (!n2) return n2;
   const r2 = e2.props ? e2.props : {};
   if (!r2.limitQuantity) return n2;
@@ -134,7 +136,7 @@ function N(t2, e2, n2, i2, o2) {
   if (r2.itemNumVariable ? (a2 = l(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 c2 = r2.overItemAlias, f2 = [], u2 = {};
-  i2 = i2 || [], o2 = o2 || [];
+  i2 = i2 || [], s2 = s2 || [];
   for (let t3 = 0; t3 < n2.length; t3++) {
     const e3 = n2[t3];
     if (t3 < a2) f2.push(e3);
@@ -142,14 +144,14 @@ function N(t2, e2, n2, i2, o2) {
       if (!c2) break;
       for (const t4 of i2) {
         if (!t4) continue;
-        let n3 = s(e3, t4, void 0);
+        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);
       }
-      for (const t4 of o2) {
+      for (const t4 of s2) {
         if (!t4) continue;
-        const n3 = s(e3, t4, void 0);
+        const n3 = o(e3, t4, void 0);
         if (isNaN(n3)) continue;
         const i3 = u2[t4];
         isNaN(i3) ? u2[t4] = n3 : u2[t4] = n3 + i3;
@@ -160,11 +162,11 @@ function N(t2, e2, n2, i2, o2) {
 }
 function y(t2, e2, n2) {
   const i2 = {};
-  for (const s2 of t2) {
-    const t3 = s2.props ? s2.props : {};
+  for (const o2 of t2) {
+    const t3 = o2.props ? o2.props : {};
     if ("formula" === t3.yaxisSource) {
-      const s3 = r(t3.formula);
-      for (const t4 of s3) if (!(t4 in i2)) {
+      const o3 = r(t3.formula);
+      for (const t4 of o3) if (!(t4 in i2)) {
         if (t4.startsWith("${min.")) i2[t4] = S(e2, t4.substring(6, t4.length - 1));
         else if (t4.startsWith("${max.")) i2[t4] = F(e2, t4.substring(6, t4.length - 1));
         else if (t4.startsWith("${sum.")) i2[t4] = _(e2, t4.substring(6, t4.length - 1));
@@ -181,7 +183,7 @@ function y(t2, e2, n2) {
 function S(t2, e2) {
   let n2;
   for (const i2 of t2) {
-    const t3 = parseFloat(s(i2, e2, null));
+    const t3 = parseFloat(o(i2, e2, null));
     (void 0 === n2 || !isNaN(t3) && t3 < n2) && (n2 = t3);
   }
   return n2;
@@ -189,7 +191,7 @@ function S(t2, e2) {
 function F(t2, e2) {
   let n2;
   for (const i2 of t2) {
-    const t3 = parseFloat(s(i2, e2, null));
+    const t3 = parseFloat(o(i2, e2, null));
     (void 0 === n2 || !isNaN(t3) && t3 > n2) && (n2 = t3);
   }
   return n2;
@@ -197,7 +199,7 @@ function F(t2, e2) {
 function _(t2, e2) {
   let n2;
   for (const i2 of t2) {
-    const t3 = parseFloat(s(i2, e2, null));
+    const t3 = parseFloat(o(i2, e2, null));
     void 0 === n2 ? n2 = t3 : isNaN(t3) || (n2 += t3);
   }
   return n2;
@@ -209,10 +211,10 @@ function A(t2, e2) {
 function k(t2, e2, n2, i2) {
   if (!t2) return;
   if (e2) for (const n3 in e2) t2 = t2.replace(new RegExp("\\${add." + n3 + "}", "g"), e2[n3]);
-  const o2 = r(t2);
-  for (const e3 of o2) {
-    let o3 = null;
-    o3 = e3.startsWith("${row.") ? s(n2, e3.substring(6, e3.length - 1), null) : a(i2.entity, e3), t2 = t2.replace(new RegExp(e3.replace("$", "\\$"), "g"), o3);
+  const s2 = r(t2);
+  for (const e3 of s2) {
+    let s3 = null;
+    s3 = e3.startsWith("${row.") ? o(n2, e3.substring(6, e3.length - 1), null) : a(i2.entity, e3), t2 = t2.replace(new RegExp(e3.replace("$", "\\$"), "g"), s3);
   }
   t2.includes("return ") || (t2 = "return " + t2);
   const l2 = new Function("params", t2);
@@ -222,26 +224,26 @@ function M(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 = n2[0], o2 = i2.width + ":" + i2.height;
+  return { isTable: false, fileContent: i2.toDataURL(), fileSize: o2, title: e2 == null ? void 0 : e2.title };
 }
 function $(t2, e2, n2) {
-  const s2 = window.localStorage.getItem("HOME_MY_CHARTS_CONDITIONS");
+  const o2 = window.localStorage.getItem("HOME_MY_CHARTS_CONDITIONS");
   let r2 = true;
-  if (s2) {
-    const t3 = JSON.parse(s2);
+  if (o2) {
+    const t3 = JSON.parse(o2);
     if (t3[n2]) {
       const i2 = t3[n2];
       if (Object.keys(i2).length > 0) {
         r2 = false;
-        for (const t4 in i2) null !== i2[t4] && void 0 !== i2[t4] && o(e2.entity, t4, i2[t4]);
+        for (const t4 in i2) null !== i2[t4] && void 0 !== i2[t4] && s(e2.entity, t4, i2[t4]);
       }
     }
   }
   if (r2 && t2) {
     for (const n3 of t2) if (n3.prop && n3.value) {
-      const t3 = i(e2, n3.value, "input-text", false), s3 = n3.prop.substring(2, n3.prop.length - 1).split(".");
-      null != t3 && c(e2.entity, s3, t3);
+      const t3 = i(e2, n3.value, "input-text", false), o3 = n3.prop.substring(2, n3.prop.length - 1).split(".");
+      null != t3 && c(e2.entity, o3, t3);
     }
   }
 }
@@ -262,9 +264,9 @@ export {
   h as getCustomThemeOptions,
   F as getMaxValue,
   S as getMinValue,
-  m as getNumFormatter,
+  g as getNumFormatter,
   _ as getSumValue,
-  g as initChartOption,
+  m as initChartOption,
   N as limitDatas,
   x as monitorChartClickToVariable,
   w as setDefaultGrid,