super-page-runtime 2.2.26 → 2.2.29-tmp1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/dist/es/components/runtime/utils/api/page-expose-util.js +56 -56
  2. package/dist/es/components/runtime/utils/barcode-util.js +5 -5
  3. package/dist/es/components/runtime/utils/charts/chart-pie-util.js +46 -45
  4. package/dist/es/components/runtime/utils/charts/chart-scatter-util.js +16 -14
  5. package/dist/es/components/runtime/utils/charts/chart-util.js +4 -2
  6. package/dist/es/components/runtime/utils/events/event-util.js +113 -113
  7. package/dist/es/components/runtime/utils/events/print-label.js +38 -37
  8. package/dist/es/components/runtime/utils/events/standard-event.js +443 -431
  9. package/dist/es/components/runtime/utils/events/validator-util.js +30 -30
  10. package/dist/es/components/runtime/utils/form/scan-util.js +4 -3
  11. package/dist/es/components/runtime/utils/page-helper-util.js +215 -214
  12. package/dist/es/components/runtime/utils/page-init-util.js +46 -42
  13. package/dist/es/components/runtime/utils/page-store.js +1 -1
  14. package/dist/es/components/runtime/utils/table-utils.js +23 -23
  15. package/dist/es/components/runtime/views/assemblys/chart/column-line/column-line-runtime.vue2.js +16 -12
  16. package/dist/es/components/runtime/views/assemblys/chart/common/common-chart-header-group.vue.js +10 -6
  17. package/dist/es/components/runtime/views/assemblys/chart/common/common-chart-header.vue.js +11 -9
  18. package/dist/es/components/runtime/views/assemblys/chart/gauge/gauge-runtime.vue2.js +13 -12
  19. package/dist/es/components/runtime/views/assemblys/chart/pie/pie-runtime.vue2.js +14 -13
  20. package/dist/es/components/runtime/views/assemblys/chart/radar/radar-runtime.vue2.js +15 -14
  21. package/dist/es/components/runtime/views/assemblys/chart/scatter/scatter-runtime.vue2.js +17 -16
  22. package/dist/es/components/runtime/views/assemblys/chart/table/chart-table-util.js +12 -7
  23. package/dist/es/components/runtime/views/assemblys/chart/table/table-runtime.vue2.js +16 -15
  24. package/dist/es/components/runtime/views/assemblys/common/export-form-report-dialog.vue.js +26 -22
  25. package/dist/es/components/runtime/views/assemblys/container/tools/tools-runtime.vue2.js +3 -3
  26. package/dist/es/components/runtime/views/assemblys/data/bar-code/barcode-runtime.vue2.js +12 -10
  27. package/dist/es/components/runtime/views/assemblys/data/table/main-table-runtime.vue.js +114 -111
  28. package/dist/es/components/runtime/views/assemblys/data/table/sub-table-runtime.vue.js +139 -136
  29. package/dist/es/components/runtime/views/assemblys/form/checkbox/checkbox-runtime.vue2.js +1 -0
  30. package/dist/es/components/runtime/views/assemblys/form/custom/custom-runtime.vue2.js +29 -29
  31. package/dist/es/components/runtime/views/assemblys/form/date-picker/datepicker-runtime.vue2.js +40 -38
  32. package/dist/es/components/runtime/views/assemblys/form/file-upload/fileupload-runtime.vue2.js +22 -22
  33. package/dist/es/components/runtime/views/assemblys/form/input-text/inputtext-runtime.vue2.js +39 -38
  34. package/dist/es/components/runtime/views/assemblys/form/label/label-runtime.vue2.js +8 -6
  35. package/dist/es/components/runtime/views/assemblys/form/link/link-runtime.vue2.js +10 -9
  36. package/dist/es/components/runtime/views/assemblys/form/radio/radio-runtime.vue2.js +1 -0
  37. package/dist/es/components/runtime/views/assemblys/form/rich-text/richtext-runtime.vue2.js +1 -0
  38. package/dist/es/components/runtime/views/assemblys/form/select/select-runtime.vue2.js +8 -8
  39. package/dist/es/components/runtime/views/home-chart.vue.js +10 -9
  40. package/dist/es/components/runtime/views/super-page-dialog.vue.js +13 -12
  41. package/dist/es/components/runtime/views/super-page.vue.js +134 -132
  42. package/package.json +2 -2
@@ -1,149 +1,149 @@
1
- import { getOptionDatasSourceMap as e, getComponentOptionDatasFromPage as t, getVariableValue as n, setVariableValue as i, setValueForVariableName as o } from "../page-helper-util.js";
1
+ import { getOptionDatasSourceMap as e, getComponentOptionDatasFromPage as t, getVariableValue as n, setVariableValue as o, setValueForVariableName as i } from "../page-helper-util.js";
2
2
  import { getComponentRef as a, getComponentRefByCode as r } from "../global-refs.js";
3
3
  import s from "../eventBus.js";
4
4
  import l from "agilebuilder-ui/src/utils/request";
5
5
  import { getFormData as c, getAdditionalParamMap as u, refreshPage as f } from "../events/standard-event.js";
6
- import { dynamicControlTableEdit as m, disabledAllFields as p, updateFormItemEditState as d } from "../events/validator-util.js";
6
+ import { dynamicControlTableEdit as m, disabledAllFields as d, updateFormItemEditState as p } from "../events/validator-util.js";
7
7
  import { deepCopy as g, getBaseUrl as y } from "../common-util.js";
8
8
  import { isMobileBrowser as b } from "agilebuilder-ui/src/utils/common-util";
9
9
  import { getFormModelFields as h, getModelFields as E } from "../page-init-util.js";
10
10
  import { getCustomFunc as P } from "../events/event-util.js";
11
11
  const C = { showElement: function(e2, t2, n2) {
12
- n2 ? $(e2, "showElement", t2) : t2.forEach((t3) => {
12
+ n2 ? V(e2, "showElement", t2) : t2.forEach((t3) => {
13
13
  const n3 = r(e2, t3);
14
- n3 && n3.show();
14
+ n3 ? n3.show() : console.error(`未找到code为${t3}的组件`);
15
15
  });
16
16
  }, hideElement: function(e2, t2, n2) {
17
- n2 ? $(e2, "hideElement", t2) : t2.forEach((t3) => {
17
+ n2 ? V(e2, "hideElement", t2) : t2.forEach((t3) => {
18
18
  const n3 = r(e2, t3);
19
- n3 && n3.hide();
19
+ n3 ? n3.hide() : console.error(`未找到code为${t3}的组件`);
20
20
  });
21
21
  }, enableElement: function(e2, t2, n2) {
22
- n2 ? $(e2, "enableElement", t2) : t2.forEach((t3) => {
22
+ n2 ? V(e2, "enableElement", t2) : t2.forEach((t3) => {
23
23
  const n3 = r(e2, t3);
24
24
  if (n3) {
25
25
  const e3 = n3.getConfigure();
26
26
  e3 && e3.runtime.props && (e3.runtime.props.state = "enabled");
27
- }
27
+ } else console.error(`未找到code为${t3}的组件`);
28
28
  });
29
29
  }, disableElement: function(e2, t2, n2) {
30
- n2 ? $(e2, "disableElement", t2) : t2.forEach((t3) => {
30
+ n2 ? V(e2, "disableElement", t2) : t2.forEach((t3) => {
31
31
  const n3 = r(e2, t3);
32
32
  if (n3) {
33
33
  const e3 = n3.getConfigure();
34
34
  e3 && e3.runtime.props && (e3.runtime.props.state = "disabled");
35
- }
35
+ } else console.error(`未找到code为${t3}的组件`);
36
36
  });
37
37
  }, setEntityDataValue: function(e2, t2) {
38
38
  Object.keys(t2).forEach((n2) => {
39
- o(e2.entity, n2.startsWith("${") ? n2 : "${data." + n2 + "}", t2[n2]);
39
+ i(e2.entity, n2.startsWith("${") ? n2 : "${data." + n2 + "}", t2[n2]);
40
40
  });
41
41
  }, setEntityPageValue: function(e2, t2) {
42
42
  Object.keys(t2).forEach((n2) => {
43
- o(e2.entity, n2.startsWith("${") ? n2 : "${page." + n2 + "}", t2[n2]);
43
+ i(e2.entity, n2.startsWith("${") ? n2 : "${page." + n2 + "}", t2[n2]);
44
44
  });
45
45
  }, setEntityValueByType: function(e2, t2, n2) {
46
- Object.keys(n2).forEach((i2) => {
47
- o(e2.entity, i2.startsWith("${") ? i2 : "${" + t2 + "." + i2 + "}", n2[i2]);
46
+ Object.keys(n2).forEach((o2) => {
47
+ i(e2.entity, o2.startsWith("${") ? o2 : "${" + t2 + "." + o2 + "}", n2[o2]);
48
48
  });
49
49
  }, dynamicControlFormEdit: function(e2, t2, n2) {
50
- n2 ? $(e2, "dynamicControlFormEdit", t2) : d(e2, t2);
50
+ n2 ? V(e2, "dynamicControlFormEdit", t2) : p(e2, t2);
51
51
  }, disabledAllFields(e2) {
52
- p(e2);
52
+ d(e2);
53
53
  }, dynamicControlTableEdit(e2, t2, n2) {
54
54
  m(e2, t2, n2);
55
55
  }, executeServiceFlow: function(e2, t2, n2) {
56
- const i2 = e2.code;
56
+ const o2 = e2.code;
57
57
  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);
58
- const o2 = e2.backendUrl, a2 = y(o2, e2.isTest);
59
- return l.post(`${a2}/dsc/service-flow/execute/${i2}/${t2}`, n2);
58
+ const i2 = e2.backendUrl, a2 = y(i2, e2.isTest);
59
+ return l.post(`${a2}/dsc/service-flow/execute/${o2}/${t2}`, n2);
60
60
  }, openPage: function(e2, t2) {
61
61
  s.$emit(e2.code + "_open-dialog", { pageContext: e2, eventParams: t2.eventParams, configureObj: { props: { linkPage: t2 } } });
62
62
  }, refreshPage: function(e2, t2) {
63
63
  f(e2, t2);
64
64
  }, refreshSubTableHandle: function(e2, t2) {
65
65
  let n2;
66
- const i2 = r(e2, t2);
67
- if (i2) {
68
- const e3 = i2.getConfigure();
69
- e3 && e3.uuid && e3.name && "table" === e3.name && (n2 = e3.uuid);
70
- }
71
- n2 && s.$emit("_refreshSubTableHandle_" + n2);
72
- }, refreshChildData(e2, t2, n2) {
73
- let i2;
74
66
  const o2 = r(e2, t2);
75
67
  if (o2) {
76
68
  const e3 = o2.getConfigure();
77
- e3 && e3.uuid && e3.name && "table" === e3.name && (i2 = e3.uuid);
69
+ e3 && e3.uuid && e3.name && "table" === e3.name && (n2 = e3.uuid);
78
70
  }
79
- i2 && s.$emit("_refreshChildData_" + i2, n2);
71
+ n2 ? s.$emit("_refreshSubTableHandle_" + n2) : console.error("tableUUid is undefined");
72
+ }, refreshChildData(e2, t2, n2) {
73
+ let o2;
74
+ const i2 = r(e2, t2);
75
+ if (i2) {
76
+ const e3 = i2.getConfigure();
77
+ e3 && e3.uuid && e3.name && "table" === e3.name && (o2 = e3.uuid);
78
+ }
79
+ o2 ? s.$emit("_refreshChildData_" + o2, n2) : console.error("tableUUid is undefined");
80
80
  }, 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) {
81
81
  const n2 = u(e2);
82
82
  return n2 ? n2[t2] : null;
83
- }, isMobile: () => b(), getComponentRefByProp: (e2, t2) => r(e2, t2), getComponentRefByCode: (e2, t2) => a(e2, t2), getFormViewData(o2) {
83
+ }, isMobile: () => b(), getComponentRefByProp: (e2, t2) => r(e2, t2), getComponentRefByCode: (e2, t2) => a(e2, t2), getFormViewData(i2) {
84
84
  var _a, _b, _c, _d, _e, _f, _g, _h;
85
- const r2 = o2.entity ? o2.entity : {}, s2 = g(r2), l2 = e(o2);
85
+ const r2 = i2.entity ? i2.entity : {}, s2 = g(r2), l2 = e(i2);
86
86
  for (const e2 in l2) {
87
- const r3 = t(o2, e2), l3 = a(o2, e2);
87
+ const r3 = t(i2, e2), l3 = a(i2, e2);
88
88
  if (l3) {
89
89
  const e3 = l3.getConfigure();
90
90
  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)) {
91
- const t2 = h(o2, e3), a2 = n(s2, t2);
91
+ const t2 = h(i2, e3), a2 = n(s2, t2);
92
92
  if (a2) {
93
- const e4 = v(a2.split(","), r3);
94
- i(s2, t2, e4);
93
+ const e4 = k(a2.split(","), r3);
94
+ o(s2, t2, e4);
95
95
  }
96
96
  } else {
97
- const t2 = h(o2, e3), a2 = v(n(s2, t2), r3);
98
- i(s2, t2, a2);
97
+ const t2 = h(i2, e3), a2 = k(n(s2, t2), r3);
98
+ o(s2, t2, a2);
99
99
  }
100
100
  }
101
101
  }
102
- const c2 = o2.listCodesMap;
102
+ const c2 = i2.listCodesMap;
103
103
  for (const e2 in c2) {
104
104
  let t2;
105
105
  if (e2.indexOf("__") > 0 && (t2 = e2.substring(e2.lastIndexOf("__") + 2)), t2) {
106
- const i2 = a(o2, t2);
107
- if (i2) {
108
- const t3 = i2.getConfigure(), o3 = t3.code ? t3.code : e2, a2 = E(t3, o3), r3 = n(s2, a2);
109
- k(i2.getTableSelectOptions(e2), r3);
106
+ const o2 = a(i2, t2);
107
+ if (o2) {
108
+ const t3 = o2.getConfigure(), i3 = t3.code ? t3.code : e2, a2 = E(t3, i3), r3 = n(s2, a2);
109
+ $(o2.getTableSelectOptions(e2), r3);
110
110
  }
111
111
  }
112
112
  }
113
113
  return s2.data;
114
114
  }, getFormData: (e2, t2) => c(e2, t2), getCustomFunc: (e2, t2) => P(e2, t2) };
115
- function k(e2, t2) {
115
+ function $(e2, t2) {
116
116
  e2 && t2 && t2.forEach((t3) => {
117
117
  Object.keys(e2).forEach((n2) => {
118
- const i2 = t3[n2], o2 = e2[n2], a2 = o2.options, r2 = o2.column;
118
+ const o2 = t3[n2], i2 = e2[n2], a2 = i2.options, r2 = i2.column;
119
119
  let s2;
120
120
  if (r2 && r2.componentType && ("multiselect" === r2.componentType || "checkbox" === r2.componentType)) {
121
- if (i2) {
122
- s2 = v(i2.split(","), a2);
121
+ if (o2) {
122
+ s2 = k(o2.split(","), a2);
123
123
  }
124
- } else s2 = v(i2, a2);
124
+ } else s2 = k(o2, a2);
125
125
  t3[n2] = s2;
126
126
  });
127
127
  });
128
128
  }
129
- function v(e2, t2) {
129
+ function k(e2, t2) {
130
130
  let n2;
131
- return null != e2 && t2 && (Array.isArray(e2) ? (n2 = "", e2.forEach((i2) => {
132
- n2 = n2 + V(e2, t2) + ",";
133
- }), n2.indexOf(",") > 0 && (n2 = n2.substring(0, n2.lastIndexOf(",")))) : (n2 = e2, n2 = V(e2, t2))), n2;
131
+ return null != e2 && t2 && (Array.isArray(e2) ? (n2 = "", e2.forEach((o2) => {
132
+ n2 = n2 + v(e2, t2) + ",";
133
+ }), n2.indexOf(",") > 0 && (n2 = n2.substring(0, n2.lastIndexOf(",")))) : (n2 = e2, n2 = v(e2, t2))), n2;
134
134
  }
135
- function V(e2, t2) {
135
+ function v(e2, t2) {
136
136
  let n2 = e2;
137
- if (null != e2 && t2) for (let i2 = 0; i2 < t2.length; i2++) {
138
- const o2 = t2[i2].value, a2 = t2[i2].label ? t2[i2].label : t2[i2].name;
139
- if (e2 + "" == o2 + "" && null != a2) {
137
+ if (null != e2 && t2) for (let o2 = 0; o2 < t2.length; o2++) {
138
+ const i2 = t2[o2].value, a2 = t2[o2].label ? t2[o2].label : t2[o2].name;
139
+ if (e2 + "" == i2 + "" && null != a2) {
140
140
  n2 = a2;
141
141
  break;
142
142
  }
143
143
  }
144
144
  return n2;
145
145
  }
146
- function $(e2, t2, n2) {
146
+ function V(e2, t2, n2) {
147
147
  e2.initInfo || (e2.initInfo = {}), e2.initInfo[t2] = n2;
148
148
  }
149
149
  export {
@@ -1,11 +1,11 @@
1
- function e(e2, t) {
2
- let n = true, r = "";
1
+ function e(e2, n) {
2
+ let t = true, r = "";
3
3
  return e2.forEach((e3) => {
4
4
  if ("-1" !== e3.propDbName && -1 !== e3.propDbName) {
5
- const a = t[e3.propDbName];
6
- 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;
5
+ const a = n[e3.propDbName];
6
+ 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;
7
7
  } else r += e3.fixedValue;
8
- }), n ? r : null;
8
+ }), console.log("跟据规则生成条码:" + r), t ? r : null;
9
9
  }
10
10
  export {
11
11
  e as generateCodeByRule
@@ -1,6 +1,6 @@
1
- import { getValueFromSource as o, setValueForVariableName as t } from "../page-helper-util.js";
2
- import { deepCopy as r } from "../common-util.js";
3
- import { CommonName as s, caculateFormulaValue as e, executeChartFormula as l, sortDatas as n, limitDatas as p } from "./chart-util.js";
1
+ import { getValueFromSource as o, setValueForVariableName as e } from "../page-helper-util.js";
2
+ import { deepCopy as s } from "../common-util.js";
3
+ import { CommonName as r, caculateFormulaValue as t, executeChartFormula as l, sortDatas as n, limitDatas as p } from "./chart-util.js";
4
4
  function i(i2, u, c, a) {
5
5
  if (!a || !a.result) return;
6
6
  const f = a && a.result ? a.result : {};
@@ -13,67 +13,68 @@ function i(i2, u, c, a) {
13
13
  g = [];
14
14
  for (const o2 of d) g.push(o2.group);
15
15
  }
16
- const y = {}, x = [], v = [];
17
- 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));
18
- let E = u.props ? u.props.mulGroupShow : "";
19
- E = "break" == E ? "\r\n" : " ";
20
- for (const t2 of h) {
21
- if (!t2) continue;
22
- const r2 = [];
23
- for (const s2 of g) {
24
- const e3 = y[s2], l2 = o(t2, e3, void 0);
25
- l2 && r2.push(l2);
16
+ const y = {}, v = [], x = [];
17
+ 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));
18
+ let F = u.props ? u.props.mulGroupShow : "";
19
+ F = "break" == F ? "\r\n" : " ", console.log("groupValue", g);
20
+ for (const e2 of h) {
21
+ if (!e2) continue;
22
+ const s2 = [];
23
+ for (const r2 of g) {
24
+ const t3 = y[r2], l2 = o(e2, t3, void 0);
25
+ l2 && s2.push(l2);
26
26
  }
27
- const e2 = r2.join(E);
28
- t2[s.X_FIELD_NAME] = e2;
27
+ const t2 = s2.join(F);
28
+ e2[r.X_FIELD_NAME] = t2;
29
29
  }
30
- const F = u.items ? u.items : [];
31
- if (0 == F.length) return;
30
+ const E = u.items ? u.items : [];
31
+ if (0 == E.length) return void console.log("饼图的系列为空,操作失败!", u);
32
32
  const S = u.props ? u.props : {};
33
33
  let _ = S.yaxisField;
34
- if (F[0].props.yaxisField = _, F[0].props.yaxisSource = S.yaxisSource, F[0].props.formula = S.formula, "formula" === S.yaxisSource) {
35
- const t2 = [], r2 = e(F, h, t2);
34
+ if (console.log("valueField", _), E[0].props.yaxisField = _, E[0].props.yaxisSource = S.yaxisSource, E[0].props.formula = S.formula, "formula" === S.yaxisSource) {
35
+ const e2 = [], s2 = t(E, h, e2);
36
36
  let n2 = S.formula ? S.formula : "";
37
- for (const o2 in r2) n2 = n2.replace(new RegExp(o2.replace("$", "\\$"), "g"), r2[o2]);
38
- _ = s.Y_TEMP_NAME;
37
+ for (const o2 in s2) n2 = n2.replace(new RegExp(o2.replace("$", "\\$"), "g"), s2[o2]);
38
+ _ = r.Y_TEMP_NAME;
39
39
  const p2 = {};
40
- for (const r3 of h) {
41
- if (!r3) continue;
42
- for (const s3 of t2) {
43
- const t3 = o(r3, s3, void 0);
44
- let e2 = p2[s3];
45
- void 0 === t3 || isNaN(t3) || (void 0 === e2 ? e2 = t3 : e2 += t3), p2[s3] = e2;
40
+ for (const s3 of h) {
41
+ if (!s3) continue;
42
+ for (const r3 of e2) {
43
+ const e3 = o(s3, r3, void 0);
44
+ let t2 = p2[r3];
45
+ void 0 === e3 || isNaN(e3) || (void 0 === t2 ? t2 = e3 : t2 += e3), p2[r3] = t2;
46
46
  }
47
- const s2 = l(n2, p2, r3, i2);
48
- r3[_] = s2;
47
+ console.log("formula", n2);
48
+ const r2 = l(n2, p2, s3, i2);
49
+ console.log("formula-result", r2), s3[_] = r2;
49
50
  }
50
51
  }
51
- F[0].props.yaxisField = _, F[0].props.yaxisSource = "", n(i2, u, h), h = p(i2, u, h, x, [_]);
52
+ E[0].props.yaxisField = _, E[0].props.yaxisSource = "", n(i2, u, h), h = p(i2, u, h, v, [_]);
52
53
  const A = [], D = [];
53
- for (const t2 of h) {
54
- if (!t2) continue;
55
- A.push(t2[s.X_FIELD_NAME]);
56
- const r2 = o(t2, _, void 0);
57
- D.push(r2);
54
+ for (const e2 of h) {
55
+ if (!e2) continue;
56
+ A.push(e2[r.X_FIELD_NAME]);
57
+ const s2 = o(e2, _, void 0);
58
+ D.push(s2);
58
59
  }
59
60
  const M = u.defaultSeries;
60
61
  let N = M[0].pieColors;
61
62
  N = N || [];
62
63
  let j = M[0].pieColorMap;
63
64
  j = j || {};
64
- const b = [];
65
+ const V = [];
65
66
  for (let o2 = 0; o2 < A.length && o2 < D.length; o2++) {
66
- const t2 = { value: D[o2], name: A[o2] };
67
- if (o2 < N.length || j[t2.name]) {
68
- let r2 = j[t2.name];
69
- r2 || (r2 = N[o2]), r2 && (t2.itemStyle = { color: r2 });
67
+ const e2 = { value: D[o2], name: A[o2] };
68
+ if (o2 < N.length || j[e2.name]) {
69
+ let s2 = j[e2.name];
70
+ s2 || (s2 = N[o2]), s2 && (e2.itemStyle = { color: s2 });
70
71
  }
71
- b.push(t2);
72
+ V.push(e2);
72
73
  }
73
- const w = r(M);
74
- w[0].data = b, c.series = [w[0]];
75
- const I = u.props ? u.props.selGroupVariable : null;
76
- !(u.props ? u.props.enableDrill : null) && I && (u.highlightInfos = [], t(i2.entity, I, null)), u.groupFields = v, u.cacheDatas = h, u.rawResult = a;
74
+ const b = s(M);
75
+ b[0].data = V, c.series = [b[0]];
76
+ const w = u.props ? u.props.selGroupVariable : null;
77
+ !(u.props ? u.props.enableDrill : null) && w && (u.highlightInfos = [], e(i2.entity, w, null)), u.groupFields = x, u.cacheDatas = h, u.rawResult = a;
77
78
  }
78
79
  export {
79
80
  i as updateChartOption
@@ -1,44 +1,46 @@
1
1
  import { getValueFromSource as o } from "../page-helper-util.js";
2
2
  import { deepCopy as s } from "../common-util.js";
3
3
  import { caculateFormulaValue as i, executeChartFormula as e } from "./chart-util.js";
4
- function r(r2, t, a, l) {
5
- if (!l || !l.result) return;
6
- const u = l && l.result ? l.result : {}, f = t.serviceDataField;
7
- let c = null;
8
- f ? c = u[f] : u && (c = Array.isArray(u) ? u : [u]), c || (c = []);
4
+ function r(r2, t, l, a) {
5
+ if (!a || !a.result) return;
6
+ const u = a && a.result ? a.result : {}, c = t.serviceDataField;
7
+ let f = null;
8
+ c ? f = u[c] : u && (f = Array.isArray(u) ? u : [u]), f || (f = []);
9
9
  const d = t.items ? t.items : [], n = [], p = {};
10
10
  for (const o2 of d) {
11
11
  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: [] };
12
12
  n.push(t2), p[t2.uuid] = t2;
13
13
  }
14
- const m = [], x = i(d, c, m);
14
+ const m = [], x = i(d, f, m);
15
15
  for (const o2 of n) if ("formula" === o2.yaxisSource) {
16
16
  let s2 = o2.formula ? o2.formula : "";
17
17
  for (const o3 in x) s2 = s2.replace(new RegExp(o3.replace("$", "\\$"), "g"), x[o3]);
18
18
  o2.formula = s2;
19
19
  }
20
20
  const y = {};
21
- for (const s2 of c) if (s2) {
21
+ for (const s2 of f) if (s2) {
22
22
  for (const i2 of m) {
23
23
  const e2 = o(s2, i2, void 0);
24
24
  let r3 = y[i2];
25
25
  void 0 === e2 || isNaN(e2) || (void 0 === r3 ? r3 = e2 : r3 += e2), y[i2] = r3;
26
26
  }
27
27
  for (const i2 of n) {
28
- const t2 = i2.data, a2 = [];
29
- if (a2.push(o(s2, i2.xaxisField, void 0)), "formula" === i2.yaxisSource) {
28
+ const t2 = i2.data, l2 = [];
29
+ if (l2.push(o(s2, i2.xaxisField, void 0)), "formula" === i2.yaxisSource) {
30
30
  const o2 = e(i2.formula, y, s2, r2);
31
- a2.push(o2);
32
- } else a2.push(o(s2, i2.yaxisField, void 0));
33
- i2.sizeField ? a2.push(o(s2, i2.xaxisField, void 0)) : a2.push(i2.symbolSize), t2.push(a2);
31
+ l2.push(o2);
32
+ } else l2.push(o(s2, i2.yaxisField, void 0));
33
+ i2.sizeField ? l2.push(o(s2, i2.xaxisField, void 0)) : l2.push(i2.symbolSize), t2.push(l2);
34
34
  }
35
35
  }
36
- const F = t.defaultSeries, h = s(F);
36
+ const F = t.defaultSeries;
37
+ console.log("defaultSeries", F);
38
+ const h = s(F);
37
39
  for (const o2 of h) {
38
40
  const s2 = p[o2.uuid];
39
41
  o2.data = s2.data;
40
42
  }
41
- a.series = h, t.cacheDatas = c, t.rawResult = l;
43
+ l.series = h, t.cacheDatas = f, t.rawResult = a;
42
44
  }
43
45
  export {
44
46
  r as updateChartOption
@@ -16,7 +16,7 @@ function m(t2, e2, n2, i2, s2) {
16
16
  return function(o2) {
17
17
  let r2 = o2.value;
18
18
  if (s2 && (r2 = o2), null == r2 || null == r2) return r2;
19
- if (Array.isArray(r2)) return r2;
19
+ if (Array.isArray(r2)) return console.log("numformatter is array", r2), r2;
20
20
  if (isNaN(r2) || !t2 || !t2.indexOf) return r2;
21
21
  if (t2.indexOf("precision") > -1) {
22
22
  let t3 = parseInt(e2);
@@ -51,7 +51,9 @@ function x(t2, e2, n2) {
51
51
  if (!(n2 && e2 && e2.clickSet && t2)) return;
52
52
  const i2 = e2.clickSet;
53
53
  n2.on("click", function(s2) {
54
- let o2 = e2.highlightInfos ? e2.highlightInfos : [], r2 = -1;
54
+ let o2 = e2.highlightInfos ? e2.highlightInfos : [];
55
+ console.log("highlightInfos", o2, s2);
56
+ let r2 = -1;
55
57
  if (o2) {
56
58
  const t3 = [];
57
59
  for (let l2 = 0; l2 < o2.length; l2++) {