super-page-runtime 2.3.33-sit2 → 2.3.33

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

@@ -1,190 +1,190 @@
-import { getOptionDatasSourceMap as t, getComponentOptionDatasFromPage as e, getVariableValue as n, setVariableValue as i, setValueForVariableName as o } from "../page-helper-util.js";
+import { getOptionDatasSourceMap as e, getComponentOptionDatasFromPage as t, 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 m } from "../events/standard-event.js";
-import { dynamicControlTableEdit as f, disabledAllFields as p, updateFormItemEditState as d } from "../events/validator-util.js";
+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 { 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 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();
+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}的组件`);
   });
-}, hideElement: function(t2, e2, n2) {
-  n2 ? O(t2, "hideElement", e2) : e2.forEach((e3) => {
-    const n3 = r(t2, e3);
-    n3 && n3.hide();
+}, 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}的组件`);
   });
-}, enableElement: function(t2, e2, n2) {
-  n2 ? O(t2, "enableElement", e2) : e2.forEach((e3) => {
-    const n3 = r(t2, e3);
+}, enableElement: function(e2, t2, n2) {
+  n2 ? D(e2, "enableElement", t2) : t2.forEach((t3) => {
+    const n3 = r(e2, t3);
     if (n3) {
-      const t3 = n3.getConfigure();
-      t3 && t3.runtime.props && (t3.runtime.props.state = "enabled");
-    }
+      const e3 = n3.getConfigure();
+      e3 && e3.runtime.props && (e3.runtime.props.state = "enabled");
+    } else console.error(`未找到code为${t3}的组件`);
   });
-}, disableElement: function(t2, e2, n2) {
-  n2 ? O(t2, "disableElement", e2) : e2.forEach((e3) => {
-    const n3 = r(t2, e3);
+}, disableElement: function(e2, t2, n2) {
+  n2 ? D(e2, "disableElement", t2) : t2.forEach((t3) => {
+    const n3 = r(e2, t3);
     if (n3) {
-      const t3 = n3.getConfigure();
-      t3 && t3.runtime.props && (t3.runtime.props.state = "disabled");
-    }
+      const e3 = n3.getConfigure();
+      e3 && e3.runtime.props && (e3.runtime.props.state = "disabled");
+    } else console.error(`未找到code为${t3}的组件`);
   });
-}, setEntityDataValue: function(t2, e2) {
-  Object.keys(e2).forEach((n2) => {
-    o(t2.entity, n2.startsWith("${") ? n2 : "${data." + n2 + "}", e2[n2]);
+}, setEntityDataValue: function(e2, t2) {
+  Object.keys(t2).forEach((n2) => {
+    i(e2.entity, n2.startsWith("${") ? n2 : "${data." + n2 + "}", t2[n2]);
   });
-}, setEntityPageValue: function(t2, e2) {
-  Object.keys(e2).forEach((n2) => {
-    o(t2.entity, n2.startsWith("${") ? n2 : "${page." + n2 + "}", e2[n2]);
+}, setEntityPageValue: function(e2, t2) {
+  Object.keys(t2).forEach((n2) => {
+    i(e2.entity, n2.startsWith("${") ? n2 : "${page." + n2 + "}", t2[n2]);
   });
-}, setEntityValueByType: function(t2, e2, n2) {
-  Object.keys(n2).forEach((i2) => {
-    o(t2.entity, i2.startsWith("${") ? i2 : "${" + e2 + "." + i2 + "}", n2[i2]);
+}, setEntityValueByType: function(e2, t2, n2) {
+  Object.keys(n2).forEach((o2) => {
+    i(e2.entity, o2.startsWith("${") ? o2 : "${" + t2 + "." + o2 + "}", n2[o2]);
   });
-}, 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) {
+}, 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) {
   let n2;
-  const i2 = r(t2, e2);
-  if (i2) {
-    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);
+  const o2 = r(e2, t2);
   if (o2) {
-    const t3 = o2.getConfigure();
-    t3 && t3.uuid && t3.name && "table" === t3.name && (i2 = t3.uuid);
+    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);
   }
-  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) {
+  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) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  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);
+  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);
     if (l3) {
-      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);
+      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);
         }
-      } 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);
+      } 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);
         if (a2) {
-          const t4 = A(a2.split(","), r3);
-          i(s2, e2, t4);
+          const e4 = j(a2.split(","), r3);
+          o(s2, t2, e4);
         }
       } else {
-        const e2 = E(o2, t3), a2 = A(n(s2, e2), r3);
-        i(s2, e2, a2);
+        const t2 = E(i2, e3), a2 = j(n(s2, t2), r3);
+        o(s2, t2, a2);
       }
     }
   }
-  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);
+  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);
       }
     }
   }
   return s2.data;
-}, getFormData: (t2, e2) => c(t2, e2), getCustomFunc: (t2, e2) => P(t2, e2), replaceUrlPrefix: (t2) => b(t2), isHasFieldAuthPermission: (t2) => {
+}, getFormData: (e2, t2) => c(e2, t2), getCustomFunc: (e2, t2) => P(e2, t2), replaceUrlPrefix: (e2) => b(e2), isHasFieldAuthPermission: (e2) => {
   var _a, _b, _c, _d;
-  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;
+  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;
   if (n2) {
-    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;
+    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;
   }
   return false;
 } };
-function j(t2, e2, n2, i2) {
-  if (t2 && e2) {
-    const o2 = i2.getSuperGridRef();
-    e2.forEach((e3) => {
+function V(e2, t2, n2, o2) {
+  if (e2 && t2) {
+    const i2 = o2.getSuperGridRef();
+    t2.forEach((t3) => {
       if (n2 == null ? void 0 : n2.formatDateColumns) {
-        const t3 = n2.formatDateColumns;
-        Object.keys(t3).forEach((n3) => {
-          const i3 = t3[n3];
-          e3[n3] && (e3[n3] = o2.rowDoFormat(i3, e3[n3]));
+        const e3 = n2.formatDateColumns;
+        Object.keys(e3).forEach((n3) => {
+          const o3 = e3[n3];
+          t3[n3] && (t3[n3] = i2.rowDoFormat(o3, t3[n3]));
         });
       }
-      Object.keys(t2).forEach((n3) => {
-        const i3 = e3[n3], o3 = t2[n3], a2 = o3.options, r2 = o3.column;
+      Object.keys(e2).forEach((n3) => {
+        const o3 = t3[n3], i3 = e2[n3], a2 = i3.options, r2 = i3.column;
         let s2;
         if (r2 && r2.componentType && ("multiselect" === r2.componentType || "checkbox" === r2.componentType)) {
-          if (i3) {
-            s2 = A(i3.split(","), a2);
+          if (o3) {
+            s2 = j(o3.split(","), a2);
           }
-        } else s2 = A(i3, a2);
-        e3[n3] = s2;
+        } else s2 = j(o3, a2);
+        t3[n3] = s2;
       });
     });
   }
 }
-function A(t2, e2) {
+function j(e2, t2) {
   let 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;
+  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;
 }
-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) {
+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) {
       n2 = a2;
       break;
     }
   }
   return n2;
 }
-function O(t2, e2, n2) {
-  t2.initInfo || (t2.initInfo = {}), t2.initInfo[e2] = n2;
+function D(e2, t2, n2) {
+  e2.initInfo || (e2.initInfo = {}), e2.initInfo[t2] = n2;
 }
 export {
-  V as functions
+  v as functions
 };

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

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

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

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

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

@@ -35,7 +35,9 @@ function l(l2, u, f, c) {
       e2.sizeField ? r2.push(o(s2, e2.xaxisField, void 0)) : r2.push(e2.symbolSize), i2.push(r2);
     }
   }
-  const S = u.defaultSeries, z = s(S);
+  const S = u.defaultSeries;
+  console.log("defaultSeries", S);
+  const z = s(S);
   for (const o2 of z) {
     const s2 = y[o2.uuid];
     o2.data = s2.data;