super-page-runtime 2.3.7 → 2.3.8

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

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

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

@@ -1,35 +1,37 @@
 import { formatVariableValue as e, getValueFromSource as o } from "../page-helper-util.js";
 import { deepCopy as t } from "../common-util.js";
-function s(s2, l, r, i) {
-  if (!i || !i.result) return;
-  const p = i && i.result ? i.result : {}, n = l.serviceDataField;
-  let a = null;
-  n ? a = p[n] : p && (a = [p]), a || (a = []);
-  const u = l.props ? l.props.nameSource : void 0, c = l.props ? l.props.nameField : void 0, d = l.props ? l.props.nameFixed : void 0, m = l.props ? l.props.yaxisField : void 0, f = [c], h = [], v = [];
-  for (let t2 of a) {
+import { setDefaultGrid as s } from "./chart-util.js";
+function r(r2, l, i, p) {
+  if (!p || !p.result) return;
+  s(i);
+  const n = p && p.result ? p.result : {}, a = l.serviceDataField;
+  let u = null;
+  a ? u = n[a] : n && (u = [n]), u || (u = []);
+  const c = l.props ? l.props.nameSource : void 0, m = l.props ? l.props.nameField : void 0, d = l.props ? l.props.nameFixed : void 0, f = l.props ? l.props.yaxisField : void 0, h = [m], v = [], g = [];
+  for (const t2 of u) {
     if (!t2) continue;
-    let l2 = null;
-    l2 = "fixed" == u ? e(s2, d) : o(t2, c, void 0), h.push(l2);
-    const r2 = o(t2, m, void 0);
-    v.push(r2);
+    let s2 = null;
+    s2 = "fixed" == c ? e(r2, d) : o(t2, m, void 0), v.push(s2);
+    const l2 = o(t2, f, void 0);
+    g.push(l2);
   }
-  const g = l.defaultSeries;
-  let F = g[0].pieColors;
-  F = F || [];
-  let x = g[0].pieColorMap;
-  x = x || {};
+  const F = l.defaultSeries;
+  let x = F[0].pieColors;
+  x = x || [];
+  let j = F[0].pieColorMap;
+  j = j || {};
   const S = [];
-  for (let e2 = 0; e2 < h.length && e2 < v.length; e2++) {
-    const o2 = { value: v[e2], name: h[e2] };
-    if (e2 < F.length || x[o2.name]) {
-      let t2 = x[o2.name];
-      t2 || (t2 = F[e2]), t2 && (o2.itemStyle = { color: t2 });
+  for (let e2 = 0; e2 < v.length && e2 < g.length; e2++) {
+    const o2 = { value: g[e2], name: v[e2] };
+    if (e2 < x.length || j[o2.name]) {
+      let t2 = j[o2.name];
+      t2 || (t2 = x[e2]), t2 && (o2.itemStyle = { color: t2 });
     }
     S.push(o2);
   }
-  const j = t(g);
-  j[0].data = S, r.series = [j[0]], l.groupFields = f, l.cacheDatas = a, l.rawResult = i;
+  const y = t(F);
+  y[0].data = S, i.series = [y[0]], l.groupFields = h, l.cacheDatas = u, l.rawResult = p;
 }
 export {
-  s as updateChartOption
+  r as updateChartOption
 };

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

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

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

@@ -1,54 +1,55 @@
 import { getValueFromSource as e } from "../page-helper-util.js";
 import { deepCopy as o } from "../common-util.js";
-import { caculateFormulaValue as i, executeChartFormula as t } from "./chart-util.js";
-function a(a2, s, r, l) {
-  if (!l || !l.result) return;
-  const u = l && l.result ? l.result : {}, f = s.serviceDataField;
-  let d = null;
-  f ? d = u[f] : u && (d = Array.isArray(u) ? u : [u]), d || (d = []);
-  const n = s.items ? s.items : [], c = [], p = {}, m = [], x = i(n, d, m);
-  for (const e2 of n) {
+import { setDefaultGrid as i, caculateFormulaValue as t, executeChartFormula as a } from "./chart-util.js";
+function s(s2, r, l, u) {
+  if (!u || !u.result) return;
+  i(l);
+  const f = u && u.result ? u.result : {}, d = r.serviceDataField;
+  let n = null;
+  d ? n = f[d] : f && (n = Array.isArray(f) ? f : [f]), n || (n = []);
+  const c = r.items ? r.items : [], p = [], m = {}, x = [], v = t(c, n, x);
+  for (const e2 of c) {
     const o2 = e2.props ? e2.props : {}, i2 = o2.yaxisSource, t2 = o2.yaxisField;
-    let a3 = null;
+    let a2 = null;
     if (!t2 || i2 && "variable" != i2) if ("formula" == i2) {
       let i3 = o2.formula ? o2.formula : "";
-      for (const e3 in x) i3 = i3.replace(new RegExp(e3.replace("$", "\\$"), "g"), x[e3]);
-      a3 = { uuid: e2.uuid, type: "formula", formula: i3, data: [] };
-    } else a3 = { uuid: e2.uuid, type: "fixed", field: o2.yaxisFix, data: [] };
-    else a3 = { uuid: e2.uuid, type: "variable", field: t2, data: [] };
-    a3 && (c.push(a3), p[a3.uuid] = a3);
+      for (const e3 in v) i3 = i3.replace(new RegExp(e3.replace("$", "\\$"), "g"), v[e3]);
+      a2 = { uuid: e2.uuid, type: "formula", formula: i3, data: [] };
+    } else a2 = { uuid: e2.uuid, type: "fixed", field: o2.yaxisFix, data: [] };
+    else a2 = { uuid: e2.uuid, type: "variable", field: t2, data: [] };
+    a2 && (p.push(a2), m[a2.uuid] = a2);
   }
-  const v = s.props ? s.props : {}, y = v.nameField, h = v.maxSource, F = v.maxField, b = v.maxFixed, g = [], j = {};
-  for (const o2 of d) {
+  const y = r.props ? r.props : {}, h = y.nameField, F = y.maxSource, b = y.maxField, g = y.maxFixed, j = [], S = {};
+  for (const o2 of n) {
     if (!o2) continue;
-    const i2 = e(o2, y, void 0);
-    let s2 = null;
-    s2 = h && "variable" != h ? b : e(o2, F, void 0), g.push({ text: i2, max: s2 });
-    for (const i3 of m) {
-      const t2 = e(o2, i3, void 0);
-      let a3 = j[i3];
-      void 0 === t2 || isNaN(t2) || (void 0 === a3 ? a3 = t2 : a3 += t2), j[i3] = a3;
+    const i2 = e(o2, h, void 0);
+    let t2 = null;
+    t2 = F && "variable" != F ? g : e(o2, b, void 0), j.push({ text: i2, max: t2 });
+    for (const i3 of x) {
+      const t3 = e(o2, i3, void 0);
+      let a2 = S[i3];
+      void 0 === t3 || isNaN(t3) || (void 0 === a2 ? a2 = t3 : a2 += t3), S[i3] = a2;
     }
-    for (const i3 of c) {
-      const s3 = i3.data;
-      if ("fixed" == i3.type) s3.push(i3.field);
+    for (const i3 of p) {
+      const t3 = i3.data;
+      if ("fixed" == i3.type) t3.push(i3.field);
       else if ("variable" == i3.type) {
-        const t2 = e(o2, i3.field, void 0);
-        s3.push(t2);
+        const a2 = e(o2, i3.field, void 0);
+        t3.push(a2);
       } else if ("formula" == i3.type) {
-        const e2 = t(i3.formula, j, o2, a2);
-        s3.push(e2);
-      } else s3.push(void 0);
+        const e2 = a(i3.formula, S, o2, s2);
+        t3.push(e2);
+      } else t3.push(void 0);
     }
   }
-  r.radar[0].indicator = g;
-  const S = s.defaultSeries, w = o(S), A = w[0].data;
-  for (const e2 of A) {
-    const o2 = p[e2.uuid];
+  l.radar[0].indicator = j;
+  const w = r.defaultSeries, A = o(w), D = A[0].data;
+  for (const e2 of D) {
+    const o2 = m[e2.uuid];
     e2.value = o2.data;
   }
-  r.series = w, s.cacheDatas = d, s.rawResult = l;
+  l.series = A, r.cacheDatas = n, r.rawResult = u;
 }
 export {
-  a as updateChartOption
+  s as updateChartOption
 };

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

@@ -1,45 +1,46 @@
 import { getValueFromSource as o } from "../page-helper-util.js";
 import { deepCopy as s } from "../common-util.js";
-import { caculateFormulaValue as i, executeChartFormula as e } from "./chart-util.js";
-function r(r2, t, a, l) {
-  if (!l || !l.result) return;
-  const u = l && l.result ? l.result : {}, f = t.serviceDataField;
-  let c = null;
-  f ? c = u[f] : u && (c = Array.isArray(u) ? u : [u]), c || (c = []);
-  const d = t.items ? t.items : [], n = [], p = {};
-  for (const o2 of d) {
-    const s2 = o2.props ? o2.props : {}, i2 = o2.props ? o2.style : {}, e2 = s2.xaxisField, r3 = s2.sizeField, t2 = { uuid: o2.uuid, xaxisField: e2, yaxisField: s2.yaxisField, yaxisSource: s2.yaxisSource, formula: s2.formula, sizeField: r3, symbolSize: i2.symbolSize, data: [] };
-    n.push(t2), p[t2.uuid] = t2;
+import { setDefaultGrid as i, caculateFormulaValue as e, executeChartFormula as r } from "./chart-util.js";
+function t(t2, a, l, u) {
+  if (!u || !u.result) return;
+  i(l);
+  const f = u && u.result ? u.result : {}, c = a.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 = {};
+  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;
   }
-  const m = [], x = i(d, c, m);
-  for (const o2 of n) if ("formula" === o2.yaxisSource) {
+  const x = [], y = e(n, d, x);
+  for (const o2 of p) if ("formula" === o2.yaxisSource) {
     let s2 = o2.formula ? o2.formula : "";
-    for (const o3 in x) s2 = s2.replace(new RegExp(o3.replace("$", "\\$"), "g"), x[o3]);
+    for (const o3 in y) s2 = s2.replace(new RegExp(o3.replace("$", "\\$"), "g"), y[o3]);
     o2.formula = s2;
   }
-  const y = {};
-  for (const s2 of c) if (s2) {
-    for (const i2 of m) {
+  const F = {};
+  for (const s2 of d) if (s2) {
+    for (const i2 of x) {
       const e2 = o(s2, i2, void 0);
-      let r3 = y[i2];
-      void 0 === e2 || isNaN(e2) || (void 0 === r3 ? r3 = e2 : r3 += e2), y[i2] = r3;
+      let r2 = F[i2];
+      void 0 === e2 || isNaN(e2) || (void 0 === r2 ? r2 = e2 : r2 += e2), F[i2] = r2;
     }
-    for (const i2 of n) {
-      const t2 = i2.data, a2 = [];
+    for (const i2 of p) {
+      const e2 = i2.data, a2 = [];
       if (a2.push(o(s2, i2.xaxisField, void 0)), "formula" === i2.yaxisSource) {
-        const o2 = e(i2.formula, y, s2, r2);
+        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), t2.push(a2);
+      i2.sizeField ? a2.push(o(s2, i2.xaxisField, void 0)) : a2.push(i2.symbolSize), e2.push(a2);
     }
   }
-  const F = t.defaultSeries, h = s(F);
-  for (const o2 of h) {
-    const s2 = p[o2.uuid];
+  const h = a.defaultSeries, S = s(h);
+  for (const o2 of S) {
+    const s2 = m[o2.uuid];
     o2.data = s2.data;
   }
-  a.series = h, t.cacheDatas = c, t.rawResult = l;
+  l.series = S, a.cacheDatas = d, a.rawResult = u;
 }
 export {
-  r as updateChartOption
+  t as updateChartOption
 };

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

@@ -110,3 +110,4 @@ export declare function exportCommonChart(chartRef: any): {
     fileSize: string;
 };
 export declare function setHomeChartInitConfigValue(initConfig: any, tempContext: any, homeChartSettingUserId: any): void;
+export declare function setDefaultGrid(chartOption: any): void;