super-page-runtime 2.3.27 → 2.3.28-sit1

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

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

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