super-page-runtime 2.2.83 → 2.2.89-sit1

package/dist/es/components/runtime/utils/api/page-expose-util.js

@@ -1,149 +1,149 @@
-import { getOptionDatasSourceMap as e, getComponentOptionDatasFromPage as t, getVariableValue as n, setVariableValue as o, setValueForVariableName as i } from "../page-helper-util.js";
+import { getOptionDatasSourceMap as e, getComponentOptionDatasFromPage as t, getVariableValue as n, setVariableValue as i, setValueForVariableName as o } from "../page-helper-util.js";
 import { getComponentRef as a, getComponentRefByCode as r } from "../global-refs.js";
 import s from "../eventBus.js";
 import l from "agilebuilder-ui/src/utils/request";
 import { getFormData as c, getAdditionalParamMap as u, refreshPage as f } from "../events/standard-event.js";
-import { dynamicControlTableEdit as m, disabledAllFields as d, updateFormItemEditState as p } from "../events/validator-util.js";
+import { dynamicControlTableEdit as m, disabledAllFields as p, updateFormItemEditState as d } from "../events/validator-util.js";
 import { deepCopy as g, getBaseUrl as y } from "../common-util.js";
 import { isMobileBrowser as b } from "agilebuilder-ui/src/utils/common-util";
 import { getFormModelFields as h, getModelFields as E } from "../page-init-util.js";
 import { getCustomFunc as P } from "../events/event-util.js";
 const C = { showElement: function(e2, t2, n2) {
-  n2 ? V(e2, "showElement", t2) : t2.forEach((t3) => {
+  n2 ? $(e2, "showElement", t2) : t2.forEach((t3) => {
     const n3 = r(e2, t3);
-    n3 ? n3.show() : console.error(`未找到code为${t3}的组件`);
+    n3 && n3.show();
   });
 }, hideElement: function(e2, t2, n2) {
-  n2 ? V(e2, "hideElement", t2) : t2.forEach((t3) => {
+  n2 ? $(e2, "hideElement", t2) : t2.forEach((t3) => {
     const n3 = r(e2, t3);
-    n3 ? n3.hide() : console.error(`未找到code为${t3}的组件`);
+    n3 && n3.hide();
   });
 }, enableElement: function(e2, t2, n2) {
-  n2 ? V(e2, "enableElement", t2) : t2.forEach((t3) => {
+  n2 ? $(e2, "enableElement", t2) : t2.forEach((t3) => {
     const n3 = r(e2, t3);
     if (n3) {
       const e3 = n3.getConfigure();
       e3 && e3.runtime.props && (e3.runtime.props.state = "enabled");
-    } else console.error(`未找到code为${t3}的组件`);
+    }
   });
 }, disableElement: function(e2, t2, n2) {
-  n2 ? V(e2, "disableElement", t2) : t2.forEach((t3) => {
+  n2 ? $(e2, "disableElement", t2) : t2.forEach((t3) => {
     const n3 = r(e2, t3);
     if (n3) {
       const e3 = n3.getConfigure();
       e3 && e3.runtime.props && (e3.runtime.props.state = "disabled");
-    } else console.error(`未找到code为${t3}的组件`);
+    }
   });
 }, setEntityDataValue: function(e2, t2) {
   Object.keys(t2).forEach((n2) => {
-    i(e2.entity, n2.startsWith("${") ? n2 : "${data." + n2 + "}", t2[n2]);
+    o(e2.entity, n2.startsWith("${") ? n2 : "${data." + n2 + "}", t2[n2]);
   });
 }, setEntityPageValue: function(e2, t2) {
   Object.keys(t2).forEach((n2) => {
-    i(e2.entity, n2.startsWith("${") ? n2 : "${page." + n2 + "}", t2[n2]);
+    o(e2.entity, n2.startsWith("${") ? n2 : "${page." + n2 + "}", t2[n2]);
   });
 }, setEntityValueByType: function(e2, t2, n2) {
-  Object.keys(n2).forEach((o2) => {
-    i(e2.entity, o2.startsWith("${") ? o2 : "${" + t2 + "." + o2 + "}", n2[o2]);
+  Object.keys(n2).forEach((i2) => {
+    o(e2.entity, i2.startsWith("${") ? i2 : "${" + t2 + "." + i2 + "}", n2[i2]);
   });
 }, dynamicControlFormEdit: function(e2, t2, n2) {
-  n2 ? V(e2, "dynamicControlFormEdit", t2) : p(e2, t2);
+  n2 ? $(e2, "dynamicControlFormEdit", t2) : d(e2, t2);
 }, disabledAllFields(e2) {
-  d(e2);
+  p(e2);
 }, dynamicControlTableEdit(e2, t2, n2) {
   m(e2, t2, n2);
 }, executeServiceFlow: function(e2, t2, n2) {
-  const o2 = e2.code;
+  const i2 = e2.code;
   n2 || (n2 = { entity: e2.entity.data, serviceVariables: {}, requestParams: u(e2), taskParamMap: e2.entity.task, dynamicDimensionValue: [], dynamicSortValue: "" }), n2.entity || (n2.entity = e2.entity.data), n2.requestParams || (n2.requestParams = u(e2)), n2.taskParamMap || (n2.taskParamMap = e2.entity.task);
-  const i2 = e2.backendUrl, a2 = y(i2, e2.isTest);
-  return l.post(`${a2}/dsc/service-flow/execute/${o2}/${t2}`, n2);
+  const o2 = e2.backendUrl, a2 = y(o2, e2.isTest);
+  return l.post(`${a2}/dsc/service-flow/execute/${i2}/${t2}`, n2);
 }, openPage: function(e2, t2) {
   s.$emit(e2.code + "_open-dialog", { pageContext: e2, eventParams: t2.eventParams, configureObj: { props: { linkPage: t2 } } });
 }, refreshPage: function(e2, t2) {
   f(e2, t2);
 }, refreshSubTableHandle: function(e2, t2) {
   let n2;
-  const o2 = r(e2, t2);
-  if (o2) {
-    const e3 = o2.getConfigure();
-    e3 && e3.uuid && e3.name && "table" === e3.name && (n2 = e3.uuid);
-  }
-  n2 ? s.$emit("_refreshSubTableHandle_" + n2) : console.error("tableUUid is undefined");
-}, refreshChildData(e2, t2, n2) {
-  let o2;
   const i2 = r(e2, t2);
   if (i2) {
     const e3 = i2.getConfigure();
-    e3 && e3.uuid && e3.name && "table" === e3.name && (o2 = e3.uuid);
+    e3 && e3.uuid && e3.name && "table" === e3.name && (n2 = e3.uuid);
   }
-  o2 ? s.$emit("_refreshChildData_" + o2, n2) : console.error("tableUUid is undefined");
+  n2 && s.$emit("_refreshSubTableHandle_" + n2);
+}, refreshChildData(e2, t2, n2) {
+  let i2;
+  const o2 = r(e2, t2);
+  if (o2) {
+    const e3 = o2.getConfigure();
+    e3 && e3.uuid && e3.name && "table" === e3.name && (i2 = e3.uuid);
+  }
+  i2 && s.$emit("_refreshChildData_" + i2, n2);
 }, getServerConfigValue: (e2) => window.$vueApp.config.globalProperties[e2], getBackendUrl: (e2) => y(e2.backendUrl, false), getPlateBackendUrl: () => window.$vueApp.config.globalProperties.baseAPI, getEntity: (e2) => e2.entity.data, getEntityValue: (e2, t2) => e2.entity.data ? e2.entity.data[t2] : null, getPageData: (e2) => e2.entity.page, getPageDataValue: (e2, t2) => e2.entity.page ? e2.entity.page[t2] : null, getAdditionalParams: (e2) => u(e2), getAdditionalParamValue(e2, t2) {
   const n2 = u(e2);
   return n2 ? n2[t2] : null;
-}, isMobile: () => b(), getComponentRefByProp: (e2, t2) => r(e2, t2), getComponentRefByCode: (e2, t2) => a(e2, t2), getFormViewData(i2) {
+}, isMobile: () => b(), getComponentRefByProp: (e2, t2) => r(e2, t2), getComponentRefByCode: (e2, t2) => a(e2, t2), getFormViewData(o2) {
   var _a, _b, _c, _d, _e, _f, _g, _h;
-  const r2 = i2.entity ? i2.entity : {}, s2 = g(r2), l2 = e(i2);
+  const r2 = o2.entity ? o2.entity : {}, s2 = g(r2), l2 = e(o2);
   for (const e2 in l2) {
-    const r3 = t(i2, e2), l3 = a(i2, e2);
+    const r3 = t(o2, e2), l3 = a(o2, e2);
     if (l3) {
       const e3 = l3.getConfigure();
       if (e3 && ((_b = (_a = e3.props) == null ? void 0 : _a.dataOrigin) == null ? void 0 : _b.optionValueSetType) && ("static" === ((_d = (_c = e3.props) == null ? void 0 : _c.dataOrigin) == null ? void 0 : _d.optionValueSetType) || "optionGroup" === ((_f = (_e = e3.props) == null ? void 0 : _e.dataOrigin) == null ? void 0 : _f.optionValueSetType))) if (e3.name && ("select" === e3.name && ((_h = (_g = e3.props) == null ? void 0 : _g.base) == null ? void 0 : _h.multiple) || "checkbox" === e3.name)) {
-        const t2 = h(i2, e3), a2 = n(s2, t2);
+        const t2 = h(o2, e3), a2 = n(s2, t2);
         if (a2) {
-          const e4 = k(a2.split(","), r3);
-          o(s2, t2, e4);
+          const e4 = v(a2.split(","), r3);
+          i(s2, t2, e4);
         }
       } else {
-        const t2 = h(i2, e3), a2 = k(n(s2, t2), r3);
-        o(s2, t2, a2);
+        const t2 = h(o2, e3), a2 = v(n(s2, t2), r3);
+        i(s2, t2, a2);
       }
     }
   }
-  const c2 = i2.listCodesMap;
+  const c2 = o2.listCodesMap;
   for (const e2 in c2) {
     let t2;
     if (e2.indexOf("__") > 0 && (t2 = e2.substring(e2.lastIndexOf("__") + 2)), t2) {
-      const o2 = a(i2, t2);
-      if (o2) {
-        const t3 = o2.getConfigure(), i3 = t3.code ? t3.code : e2, a2 = E(t3, i3), r3 = n(s2, a2);
-        $(o2.getTableSelectOptions(e2), r3);
+      const i2 = a(o2, t2);
+      if (i2) {
+        const t3 = i2.getConfigure(), o3 = t3.code ? t3.code : e2, a2 = E(t3, o3), r3 = n(s2, a2);
+        k(i2.getTableSelectOptions(e2), r3);
       }
     }
   }
   return s2.data;
 }, getFormData: (e2, t2) => c(e2, t2), getCustomFunc: (e2, t2) => P(e2, t2) };
-function $(e2, t2) {
+function k(e2, t2) {
   e2 && t2 && t2.forEach((t3) => {
     Object.keys(e2).forEach((n2) => {
-      const o2 = t3[n2], i2 = e2[n2], a2 = i2.options, r2 = i2.column;
+      const i2 = t3[n2], o2 = e2[n2], a2 = o2.options, r2 = o2.column;
       let s2;
       if (r2 && r2.componentType && ("multiselect" === r2.componentType || "checkbox" === r2.componentType)) {
-        if (o2) {
-          s2 = k(o2.split(","), a2);
+        if (i2) {
+          s2 = v(i2.split(","), a2);
         }
-      } else s2 = k(o2, a2);
+      } else s2 = v(i2, a2);
       t3[n2] = s2;
     });
   });
 }
-function k(e2, t2) {
+function v(e2, t2) {
   let n2;
-  return null != e2 && t2 && (Array.isArray(e2) ? (n2 = "", e2.forEach((o2) => {
-    n2 = n2 + v(e2, t2) + ",";
-  }), n2.indexOf(",") > 0 && (n2 = n2.substring(0, n2.lastIndexOf(",")))) : (n2 = e2, n2 = v(e2, t2))), n2;
+  return null != e2 && t2 && (Array.isArray(e2) ? (n2 = "", e2.forEach((i2) => {
+    n2 = n2 + V(e2, t2) + ",";
+  }), n2.indexOf(",") > 0 && (n2 = n2.substring(0, n2.lastIndexOf(",")))) : (n2 = e2, n2 = V(e2, t2))), n2;
 }
-function v(e2, t2) {
+function V(e2, t2) {
   let n2 = e2;
-  if (null != e2 && t2) for (let o2 = 0; o2 < t2.length; o2++) {
-    const i2 = t2[o2].value, a2 = t2[o2].label ? t2[o2].label : t2[o2].name;
-    if (e2 + "" == i2 + "" && null != a2) {
+  if (null != e2 && t2) for (let i2 = 0; i2 < t2.length; i2++) {
+    const o2 = t2[i2].value, a2 = t2[i2].label ? t2[i2].label : t2[i2].name;
+    if (e2 + "" == o2 + "" && null != a2) {
       n2 = a2;
       break;
     }
   }
   return n2;
 }
-function V(e2, t2, n2) {
+function $(e2, t2, n2) {
   e2.initInfo || (e2.initInfo = {}), e2.initInfo[t2] = n2;
 }
 export {

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

@@ -1,11 +1,11 @@
-function e(e2, n) {
-  let t = true, r = "";
+function e(e2, t) {
+  let n = true, r = "";
   return e2.forEach((e3) => {
     if ("-1" !== e3.propDbName && -1 !== e3.propDbName) {
-      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;
+      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;
     } else r += e3.fixedValue;
-  }), console.log("跟据规则生成条码：" + r), t ? r : null;
+  }), n ? r : null;
 }
 export {
   e as generateCodeByRule

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-pie-util.js

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

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

@@ -1,46 +1,44 @@
 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, l, a) {
-  if (!a || !a.result) return;
-  const u = a && a.result ? a.result : {}, c = t.serviceDataField;
-  let f = null;
-  c ? f = u[c] : u && (f = Array.isArray(u) ? u : [u]), f || (f = []);
+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;
   }
-  const m = [], x = i(d, f, m);
+  const m = [], x = i(d, c, m);
   for (const o2 of n) 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]);
     o2.formula = s2;
   }
   const y = {};
-  for (const s2 of f) if (s2) {
+  for (const s2 of c) if (s2) {
     for (const i2 of m) {
       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;
     }
     for (const i2 of n) {
-      const t2 = i2.data, l2 = [];
-      if (l2.push(o(s2, i2.xaxisField, void 0)), "formula" === i2.yaxisSource) {
+      const t2 = i2.data, a2 = [];
+      if (a2.push(o(s2, i2.xaxisField, void 0)), "formula" === i2.yaxisSource) {
         const o2 = e(i2.formula, y, s2, r2);
-        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), t2.push(l2);
+        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);
     }
   }
-  const F = t.defaultSeries;
-  console.log("defaultSeries", F);
-  const h = s(F);
+  const F = t.defaultSeries, h = s(F);
   for (const o2 of h) {
     const s2 = p[o2.uuid];
     o2.data = s2.data;
   }
-  l.series = h, t.cacheDatas = f, t.rawResult = a;
+  a.series = h, t.cacheDatas = c, t.rawResult = l;
 }
 export {
   r 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 数据源