super-page-runtime 2.3.41 → 2.3.42-sit1

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

@@ -1,4 +1,7 @@
-import { ElMessage as e, ElMessageBox as s } from "element-plus";
-import { functions as o } from "./page-expose-util.js";
-import { standardEvents as t } from "../events/standard-event.js";
-o.standardEvents = t, window.$PageUtil = o, window.$message = e, window.$messageBox = s;
+import { ElMessage as e, ElMessageBox as o, ElLoading as n } from "element-plus";
+import { functions as t } from "./page-expose-util.js";
+import { standardEvents as i } from "../events/standard-event.js";
+t.standardEvents = i, window.$PageUtil = t, window.$message = e, window.$messageBox = o, Object.defineProperty(window, "$elLoading", { get() {
+  const e2 = n.service;
+  return Object.defineProperty(window, "$elLoading", { value: e2, writable: false, configurable: true }), e2;
+}, configurable: true });

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

@@ -1,5 +1,5 @@
-import { getOptionDatasSourceMap as e, getComponentOptionDatasFromPage as t, getVariableValue as n, setVariableValue as o, setValueForVariableName as i } from "../page-helper-util.js";
-import { getComponentRef as r, getComponentRefByCode as a } from "../global-refs.js";
+import { getOptionDatasSourceMap as t, getComponentOptionDatasFromPage as e, getVariableValue as n, setVariableValue as o, setValueForVariableName as i } 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";
@@ -10,193 +10,193 @@ import { getFormModelFields as E, getModelFields as C } from "../page-init-util.
 import { getCustomFunc as P } from "../events/event-util.js";
 import { isHasFieldPermissionAuth as T } from "../table-utils.js";
 import { scrollIntoComponentWithCode as k, scrollIntoComponentWithUuid as v } from "../anchor-util.js";
-const $ = { showElement: function(e2, t2, n2) {
-  n2 ? V(e2, "showElement", t2) : t2.forEach((t3) => {
-    const n3 = a(e2, t3);
-    n3 ? n3.show() : console.error(`未找到code为${t3}的组件`);
+const j = { showElement: function(t2, e2, n2) {
+  n2 ? A(t2, "showElement", e2) : e2.forEach((e3) => {
+    const n3 = r(t2, e3);
+    n3 && n3.show();
   });
-}, hideElement: function(e2, t2, n2) {
-  n2 ? V(e2, "hideElement", t2) : t2.forEach((t3) => {
-    const n3 = a(e2, t3);
-    n3 ? n3.hide() : console.error(`未找到code为${t3}的组件`);
+}, hideElement: function(t2, e2, n2) {
+  n2 ? A(t2, "hideElement", e2) : e2.forEach((e3) => {
+    const n3 = r(t2, e3);
+    n3 && n3.hide();
   });
-}, enableElement: function(e2, t2, n2) {
-  n2 ? V(e2, "enableElement", t2) : t2.forEach((t3) => {
-    const n3 = a(e2, t3);
+}, enableElement: function(t2, e2, n2) {
+  n2 ? A(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 ? V(e2, "disableElement", t2) : t2.forEach((t3) => {
-    const n3 = a(e2, t3);
+}, disableElement: function(t2, e2, n2) {
+  n2 ? A(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) => {
+    i(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) => {
+    i(t2.entity, n2.startsWith("${") ? n2 : "${page." + n2 + "}", e2[n2]);
   });
-}, setEntityValueByType: function(e2, t2, n2) {
+}, setEntityValueByType: function(t2, e2, n2) {
   Object.keys(n2).forEach((o2) => {
-    i(e2.entity, o2.startsWith("${") ? o2 : "${" + t2 + "." + o2 + "}", n2[o2]);
+    i(t2.entity, o2.startsWith("${") ? o2 : "${" + e2 + "." + o2 + "}", n2[o2]);
   });
-}, dynamicControlFormEdit: function(e2, t2, n2) {
-  n2 ? V(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, r2 = y(i2, e2.isTest);
-  return l.post(`${r2}/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 ? A(t2, "dynamicControlFormEdit", e2) : d(t2, e2);
+}, disabledAllFields(t2) {
+  p(t2);
+}, dynamicControlTableEdit(t2, e2, n2) {
+  m(t2, e2, n2);
+}, executeServiceFlow: function(t2, e2, n2) {
+  const o2 = 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 i2 = t2.backendUrl, a2 = y(i2, t2.isTest);
+  return l.post(`${a2}/dsc/service-flow/execute/${o2}/${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) {
+  f(t2, e2);
+}, refreshSubTableHandle: function(t2, e2) {
   let n2;
-  const o2 = a(e2, t2);
+  const o2 = r(t2, e2);
   if (o2) {
-    const e3 = o2.getConfigure();
-    e3 && e3.uuid && e3.name && "table" === e3.name && (n2 = e3.uuid);
+    const t3 = o2.getConfigure();
+    t3 && t3.uuid && t3.name && "table" === t3.name && (n2 = t3.uuid);
   }
-  n2 ? s.$emit("_refreshSubTableHandle_" + n2) : console.error("tableUUid is undefined");
-}, refreshChildData(e2, t2, n2) {
+  n2 && s.$emit("_refreshSubTableHandle_" + n2);
+}, refreshChildData(t2, e2, n2) {
   let o2;
-  const i2 = a(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 && (o2 = 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) => a(e2, t2), getComponentRefByCode: (e2, t2) => r(e2, t2), getFormViewData(i2) {
+  o2 && s.$emit("_refreshChildData_" + o2, 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(i2) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  const a2 = i2.entity ? i2.entity : {}, s2 = g(a2), l2 = e(i2);
-  for (const e2 in l2) {
-    const a3 = t(i2, e2), l3 = r(i2, e2);
+  const r2 = i2.entity ? i2.entity : {}, s2 = g(r2), l2 = t(i2);
+  for (const t2 in l2) {
+    const r3 = e(i2, t2), l3 = a(i2, 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), r2 = l3.getSelectItemsTitle(), a4 = r2 && r2.length > 0 ? r2 : n(s2, t2);
-          o(s2, t2, a4);
+      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(i2, t3), a2 = l3.getSelectItemsTitle(), r4 = a2 && a2.length > 0 ? a2 : n(s2, e2);
+          o(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), r2 = n(s2, t2);
-        if (r2) {
-          const e4 = S(r2.split(","), a3);
-          o(s2, t2, e4);
+      } 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(i2, t3), a2 = n(s2, e2);
+        if (a2) {
+          const t4 = V(a2.split(","), r3);
+          o(s2, e2, t4);
         }
       } else {
-        const t2 = E(i2, e3), r2 = S(n(s2, t2), a3);
-        o(s2, t2, r2);
+        const e2 = E(i2, t3), a2 = V(n(s2, e2), r3);
+        o(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 = r(i2, t2);
+  for (const t2 in c2) {
+    let e2;
+    if (t2.indexOf("__") > 0 && (e2 = t2.substring(t2.lastIndexOf("__") + 2)), e2) {
+      const o2 = a(i2, e2);
       if (o2) {
-        const t3 = o2.getConfigure(), i3 = t3.code ? t3.code : e2, r2 = C(t3, i3), a3 = n(s2, r2), 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, j(l3, a3, u2, o2);
+        const e3 = o2.getConfigure(), i3 = e3.code ? e3.code : t2, a2 = C(e3, i3), r3 = n(s2, a2), l3 = o2.getTableSelectOptions(t2), c3 = o2.getColumns(), u2 = {}, f2 = {};
+        c3 && c3.length > 0 && c3.forEach((t3) => {
+          "DATE" !== t3.dataType && "TIME" !== t3.dataType || (f2[t3.prop] = t3);
+        }), u2.formatDateColumns = f2, S(l3, r3, u2, o2);
       }
     }
   }
   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) {
-  v(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 j(e2, t2, n2, o2) {
-  if (e2 && t2) {
+function S(t2, e2, n2, o2) {
+  if (t2 && e2) {
     const i2 = o2.getSuperGridRef();
-    t2.forEach((t3) => {
+    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 o3 = t3[n3];
+          e3[n3] && (e3[n3] = i2.rowDoFormat(o3, e3[n3]));
         });
       }
-      Object.keys(e2).forEach((n3) => {
-        const o3 = t3[n3], i3 = e2[n3], r2 = i3.options, a2 = i3.column;
+      Object.keys(t2).forEach((n3) => {
+        const o3 = e3[n3], i3 = t2[n3], a2 = i3.options, r2 = i3.column;
         let s2;
-        if (a2 && a2.componentType && ("multiselect" === a2.componentType || "checkbox" === a2.componentType)) {
+        if (r2 && r2.componentType && ("multiselect" === r2.componentType || "checkbox" === r2.componentType)) {
           if (o3) {
-            s2 = S(o3.split(","), r2);
+            s2 = V(o3.split(","), a2);
           }
-        } else s2 = S(o3, r2);
-        t3[n3] = s2;
+        } else s2 = V(o3, a2);
+        e3[n3] = s2;
       });
     });
   }
 }
-function S(e2, t2) {
-  if (null == e2 || !t2) return "";
-  if (Array.isArray(e2)) {
-    const n2 = function(e3) {
-      const t3 = /* @__PURE__ */ new Map();
-      for (const n3 of e3) {
-        const e4 = String(n3.value);
-        if (!t3.has(e4)) {
+function V(t2, e2) {
+  if (null == t2 || !e2) return "";
+  if (Array.isArray(t2)) {
+    const n2 = function(t3) {
+      const e3 = /* @__PURE__ */ new Map();
+      for (const n3 of t3) {
+        const t4 = String(n3.value);
+        if (!e3.has(t4)) {
           const o2 = n3.label ? n3.label : n3.name;
-          null != o2 && t3.set(e4, o2);
+          null != o2 && e3.set(t4, o2);
         }
       }
-      return t3;
-    }(t2);
-    return e2.map((e3) => {
-      const t3 = String(e3);
-      return n2.has(t3) ? n2.get(t3) : e3;
+      return e3;
+    }(e2);
+    return t2.map((t3) => {
+      const e3 = String(t3);
+      return n2.has(e3) ? n2.get(e3) : t3;
     }).join(",");
   }
-  return function(e3, t3) {
-    if (null == e3 || !t3) return e3;
-    const n2 = String(e3);
-    for (const e4 of t3) if (String(e4.value) === n2) {
-      const t4 = e4.label ? e4.label : e4.name;
-      if (null != t4) return t4;
+  return function(t3, e3) {
+    if (null == t3 || !e3) return t3;
+    const n2 = String(t3);
+    for (const t4 of e3) if (String(t4.value) === n2) {
+      const e4 = t4.label ? t4.label : t4.name;
+      if (null != e4) return e4;
     }
-    return e3;
-  }(e2, t2);
+    return t3;
+  }(t2, e2);
 }
-function V(e2, t2, n2) {
-  e2.initInfo || (e2.initInfo = {}), e2.initInfo[t2] = n2;
+function A(t2, e2, n2) {
+  t2.initInfo || (t2.initInfo = {}), t2.initInfo[e2] = n2;
 }
 export {
-  $ as functions
+  j as functions
 };

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

@@ -5,31 +5,31 @@ import { handleChartEvent as f } from "../events/event-util.js";
 function c(c2, m, h, y) {
   if (!y || !y.result) return;
   s(h), h.tooltip || (h.tooltip = {}), f(c2, m, "beforeUpdateChart", h, { resultData: y });
-  const g = y && y.result ? y.result : {};
-  let v = y && y.groupValue ? y.groupValue : void 0;
-  const F = m.serviceDataField;
-  let S = null;
-  F ? S = g[F] : g && (S = Array.isArray(g) ? g : [g]), S || (S = []), m.runtime.dataConfig.runtimeData = S;
+  const S = y && y.result ? y.result : {};
+  let g = y && y.groupValue ? y.groupValue : void 0;
+  const v = m.serviceDataField;
+  let F = null;
+  v ? F = S[v] : S && (F = Array.isArray(S) ? S : [S]), F || (F = []), m.runtime.dataConfig.runtimeData = F;
   let D = m.props ? m.props.groups : null;
-  if (D || (D = []), !v || 0 === v.length) {
-    v = [];
-    for (const e2 of D) v.push(e2.group);
+  if (D || (D = []), !g || 0 === g.length) {
+    g = [];
+    for (const e2 of D) g.push(e2.group);
   }
   const _ = {}, x = [], A = [];
-  for (const e2 of D) _[e2.group] = e2.target, e2.target && !x.includes(e2.target) && (x.push(e2.target), v.includes(e2.group) && A.push(e2.target));
+  for (const e2 of D) _[e2.group] = e2.target, e2.target && !x.includes(e2.target) && (x.push(e2.target), g.includes(e2.group) && A.push(e2.target));
   let N = m.props ? m.props.mulGroupShow : "";
   N = "break" == N ? "\r\n" : " ";
-  for (const t2 of S) {
+  for (const t2 of F) {
     if (!t2) continue;
     const i2 = [];
-    for (const o3 of v) {
+    for (const o3 of g) {
       const s2 = _[o3], a2 = e(t2, s2, void 0);
       a2 && i2.push(a2);
     }
     const o2 = i2.join(N);
     t2[a.X_FIELD_NAME] = o2;
   }
-  const E = m.items ? m.items : [], C = [], b = {}, w = [], I = {}, X = [], L = [], M = /* @__PURE__ */ new Set(), j = l(E, S, M);
+  const E = m.items ? m.items : [], C = [], b = {}, w = [], I = {}, X = [], L = [], M = /* @__PURE__ */ new Set(), j = l(E, F, M);
   for (const e2 of M) X.push(e2);
   for (const e2 of E) {
     const t2 = e2.props ? e2.props : {}, i2 = t2.yaxisSource, o2 = t2.yaxisField, s2 = t2.isCumulative;
@@ -47,7 +47,7 @@ function c(c2, m, h, y) {
   const k = {};
   if (w.length > 0) {
     const t2 = [], i2 = {};
-    for (const o2 of S) if (o2) for (const s2 of X) {
+    for (const o2 of F) if (o2) for (const s2 of X) {
       const l2 = o2[a.X_FIELD_NAME];
       let r2 = i2[l2];
       if (!r2) {
@@ -63,7 +63,7 @@ function c(c2, m, h, y) {
     }
     for (const t3 of w) {
       const o2 = [];
-      for (const s2 of S) {
+      for (const s2 of F) {
         if (!s2) continue;
         const l2 = i2[s2[a.X_FIELD_NAME]];
         if (!l2) continue;
@@ -78,21 +78,21 @@ function c(c2, m, h, y) {
       }
       k[t3] = o2;
     }
-    S = t2;
+    F = t2;
   }
   let T = {};
   const V = /* @__PURE__ */ new Set(), $ = m.props ? m.props.orderByTarget : "";
   for (const e2 of C) "formula" === e2.type && e2.isFormulaCalculateAfterSort && $ !== e2.uuid && V.add(e2.uuid + "_field");
-  for (const e2 of S) if (e2) {
+  for (const e2 of F) if (e2) {
     p(e2, M, T);
     for (const t2 of C) if ("formula" === t2.type && !t2.isFormulaCalculateAfterSort) {
       const i2 = r(t2.formula, T, e2, c2);
       e2[t2.uuid + "_field"] = i2;
     }
   }
-  if (n(c2, m, S), V.size > 0) {
+  if (n(c2, m, F), V.size > 0) {
     const e2 = {};
-    for (const t2 of S) {
+    for (const t2 of F) {
       p(t2, M, e2);
       for (const i2 of C) if ("formula" === i2.type && V.has(i2.uuid + "_field")) {
         const o2 = r(i2.formula, e2, t2, c2);
@@ -100,10 +100,10 @@ function c(c2, m, h, y) {
       }
     }
   }
-  S = u(c2, m, S, x, L);
+  F = u(c2, m, F, x, L);
   const B = [];
   T = {};
-  for (const t2 of S) if (t2) {
+  for (const t2 of F) if (t2) {
     for (const i2 of M) {
       const o2 = e(t2, i2, void 0);
       let s2 = T[i2];
@@ -146,7 +146,7 @@ function c(c2, m, h, y) {
       }
     } else e2.data = i2 ? i2.data : [], U.push(e2);
   }
-  h.series = U;
+  h.series = U, m.props && m.props.hideEmptySeries && (h.series = h.series.filter((e2) => (e2.data || []).some((e3) => null != e3)));
   const z = m.defaultXaxis, Y = m.defaultYaxis;
   if (h.isBar) {
     if (Y) for (const e2 of Y) e2.data = B;
@@ -154,7 +154,7 @@ function c(c2, m, h, y) {
   } else z && z.length > 0 && (z[0].data = B), h.xAxis = z, h.yAxis = Y;
   d(h);
   const q = m.props ? m.props.selGroupVariable : null;
-  !(m.props ? m.props.enableDrill : null) && q && (m.highlightInfos = [], i(c2.entity, q, null)), f(c2, m, "afterUpdateChart", h, { resultData: y }), m.groupFields = A, m.cacheDatas = S, m.rawResult = y;
+  !(m.props ? m.props.enableDrill : null) && q && (m.highlightInfos = [], i(c2.entity, q, null)), f(c2, m, "afterUpdateChart", h, { resultData: y }), m.groupFields = A, m.cacheDatas = F, m.rawResult = y;
 }
 function p(t2, i2, o2) {
   for (const s2 of i2) {