super-page-runtime 2.1.95 → 2.1.97

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 (3) hide show
  1. package/dist/es/components/runtime/utils/charts/chart-columnline-util.js +64 -65
  2. package/dist/es/components/runtime/utils/page-helper-util.js +7 -2
  3. package/package.json +1 -1
package/dist/es/components/runtime/utils/charts/chart-columnline-util.js CHANGED
@@ -1,9 +1,8 @@
1
- import { setValueForVariableName as e, getValueFromSource as t, formatVariableValue as i } from "../page-helper-util.js";
1
+ import { getValueFromSource as e, formatVariableValue as i, setValueForVariableName as t } from "../page-helper-util.js";
2
2
  import { deepCopy as s } from "../common-util.js";
3
3
  import { CommonName as o, caculateFormulaValue as a, sortDatas as l, limitDatas as n, executeChartFormula as u } from "./chart-util.js";
4
4
  import { handleChartEvent as r } from "../events/event-util.js";
5
5
  function c(c2, d, f, p) {
6
- var _a;
7
6
  if (!p || !p.result)
8
7
  return;
9
8
  r(c2, d, "beforeUpdateChart", f, { resultData: p });
@@ -11,118 +10,118 @@ function c(c2, d, f, p) {
11
10
  let h = p && p.groupValue ? p.groupValue : void 0;
12
11
  const y = d.serviceDataField;
13
12
  let g = null;
14
- y ? g = m[y] : m && (g = Array.isArray(m) ? m : [m]), g || (g = []), ((_a = d.runtime.dataConfig) == null ? void 0 : _a.resultSet) && e(c2.entity, d.runtime.dataConfig.resultSet, g), d.runtime.dataConfig.runtimeData = g;
13
+ y ? g = m[y] : m && (g = Array.isArray(m) ? m : [m]), g || (g = []), d.runtime.dataConfig.runtimeData = g;
15
14
  let v = d.props ? d.props.groups : null;
16
15
  if (v || (v = []), !h || 0 === h.length) {
17
16
  h = [];
18
17
  for (const e2 of v)
19
18
  h.push(e2.group);
20
19
  }
21
- const F = {}, S = [], D = [];
20
+ const F = {}, D = [], S = [];
22
21
  for (const e2 of v)
23
- F[e2.group] = e2.target, e2.target && !S.includes(e2.target) && (S.push(e2.target), h.includes(e2.group) && D.push(e2.target));
22
+ F[e2.group] = e2.target, e2.target && !D.includes(e2.target) && (D.push(e2.target), h.includes(e2.group) && S.push(e2.target));
24
23
  let x = d.props ? d.props.mulGroupShow : "";
25
24
  x = "break" == x ? "\r\n" : " ";
26
- for (const e2 of g) {
27
- if (!e2)
25
+ for (const i2 of g) {
26
+ if (!i2)
28
27
  continue;
29
- const i2 = [];
28
+ const t2 = [];
30
29
  for (const s3 of h) {
31
- const o2 = F[s3], a2 = t(e2, o2, void 0);
32
- a2 && i2.push(a2);
30
+ const o2 = F[s3], a2 = e(i2, o2, void 0);
31
+ a2 && t2.push(a2);
33
32
  }
34
- const s2 = i2.join(x);
35
- e2[o.X_FIELD_NAME] = s2;
33
+ const s2 = t2.join(x);
34
+ i2[o.X_FIELD_NAME] = s2;
36
35
  }
37
- const N = d.items ? d.items : [], E = [], A = {}, _ = [], C = {}, b = [], I = [], X = [], w = a(N, g, X);
36
+ const N = d.items ? d.items : [], E = [], A = {}, _ = [], b = {}, C = [], I = [], X = [], w = a(N, g, X);
38
37
  for (const e2 of X)
39
- b.push(e2);
38
+ C.push(e2);
40
39
  for (const e2 of N) {
41
- const t2 = e2.props ? e2.props : {}, i2 = t2.yaxisSource, s2 = t2.yaxisField, o2 = t2.isCumulative;
40
+ const i2 = e2.props ? e2.props : {}, t2 = i2.yaxisSource, s2 = i2.yaxisField, o2 = i2.isCumulative;
42
41
  let a2 = null;
43
- if (!s2 || i2 && "variable" != i2)
44
- if ("formula" == i2) {
45
- let i3 = t2.formula ? t2.formula : "";
42
+ if (!s2 || t2 && "variable" != t2)
43
+ if ("formula" == t2) {
44
+ let t3 = i2.formula ? i2.formula : "";
46
45
  for (const e3 in w)
47
- i3 = i3.replace(new RegExp(e3.replace("$", "\\$"), "g"), w[e3]);
48
- a2 = { uuid: e2.uuid, type: "formula", formula: i3, data: [], dynamicDatas: [] };
46
+ t3 = t3.replace(new RegExp(e3.replace("$", "\\$"), "g"), w[e3]);
47
+ a2 = { uuid: e2.uuid, type: "formula", formula: t3, data: [], dynamicDatas: [] };
49
48
  } else
50
- a2 = { uuid: e2.uuid, type: "fixed", field: t2.yaxisFix, data: [], dynamicDatas: [] };
49
+ a2 = { uuid: e2.uuid, type: "fixed", field: i2.yaxisFix, data: [], dynamicDatas: [] };
51
50
  else
52
- a2 = { uuid: e2.uuid, type: "variable", field: s2, isCumulative: o2, data: [], dynamicDatas: [] }, s2 && !b.includes(s2) && (b.push(s2), I.push(s2)), o2 && !X.includes(s2) && X.push(s2);
53
- null != a2 && (E.push(a2), A[e2.uuid] = a2), t2.dynamicSeriesField && !_.includes(t2.dynamicSeriesField) && a2 && (a2.dynamicField = t2.dynamicSeriesField, a2.dynamicSeriesTitle = t2.dynamicSeriesTitle, a2.dynamicShowStack = t2.dynamicShowStack, _.push(t2.dynamicSeriesField), C[t2.dynamicSeriesField] = s2);
51
+ a2 = { uuid: e2.uuid, type: "variable", field: s2, isCumulative: o2, data: [], dynamicDatas: [] }, s2 && !C.includes(s2) && (C.push(s2), I.push(s2)), o2 && !X.includes(s2) && X.push(s2);
52
+ null != a2 && (E.push(a2), A[e2.uuid] = a2), i2.dynamicSeriesField && !_.includes(i2.dynamicSeriesField) && a2 && (a2.dynamicField = i2.dynamicSeriesField, a2.dynamicSeriesTitle = i2.dynamicSeriesTitle, a2.dynamicShowStack = i2.dynamicShowStack, _.push(i2.dynamicSeriesField), b[i2.dynamicSeriesField] = s2);
54
53
  }
55
54
  const L = {};
56
55
  if (_.length > 0) {
57
- const e2 = [], i2 = {};
56
+ const i2 = [], t2 = {};
58
57
  for (const s2 of g)
59
58
  if (s2)
60
- for (const a2 of b) {
59
+ for (const a2 of C) {
61
60
  const l2 = s2[o.X_FIELD_NAME];
62
- let n2 = i2[l2];
61
+ let n2 = t2[l2];
63
62
  if (!n2) {
64
63
  n2 = {};
65
- for (const e3 of S)
66
- n2[e3] = s2[e3];
67
- n2[o.X_FIELD_NAME] = s2[o.X_FIELD_NAME], i2[l2] = n2, e2.push(n2);
64
+ for (const e2 of D)
65
+ n2[e2] = s2[e2];
66
+ n2[o.X_FIELD_NAME] = s2[o.X_FIELD_NAME], t2[l2] = n2, i2.push(n2);
68
67
  }
69
- let u2 = t(s2, a2, void 0);
68
+ let u2 = e(s2, a2, void 0);
70
69
  if (!isNaN(u2)) {
71
- const e3 = n2[a2];
72
- isNaN || (u2 += e3), n2[a2] = u2;
70
+ const e2 = n2[a2];
71
+ isNaN || (u2 += e2), n2[a2] = u2;
73
72
  }
74
73
  }
75
- for (const e3 of _) {
74
+ for (const i3 of _) {
76
75
  const s2 = [];
77
76
  for (const a2 of g) {
78
77
  if (!a2)
79
78
  continue;
80
- const l2 = i2[a2[o.X_FIELD_NAME]];
79
+ const l2 = t2[a2[o.X_FIELD_NAME]];
81
80
  if (!l2)
82
81
  continue;
83
- let n2 = t(a2, e3, void 0);
82
+ let n2 = e(a2, i3, void 0);
84
83
  n2 = null == n2 || null == n2 ? "" : n2, s2.includes(n2) || (s2.push(n2), I.push(n2), X.push(n2));
85
- const u2 = C[e3];
84
+ const u2 = b[i3];
86
85
  if (void 0 !== u2) {
87
- const e4 = t(a2, u2, void 0);
88
- let i3 = l2[n2];
89
- void 0 === i3 ? i3 = e4 : isNaN(e4) || (i3 += e4), l2[n2] = i3;
86
+ const i4 = e(a2, u2, void 0);
87
+ let t3 = l2[n2];
88
+ void 0 === t3 ? t3 = i4 : isNaN(i4) || (t3 += i4), l2[n2] = t3;
90
89
  }
91
90
  }
92
- L[e3] = s2;
91
+ L[i3] = s2;
93
92
  }
94
- g = e2;
93
+ g = i2;
95
94
  }
96
- l(c2, d, g), g = n(c2, d, g, S, I);
95
+ l(c2, d, g), g = n(c2, d, g, D, I);
97
96
  const M = [], j = {};
98
- for (const e2 of g)
99
- if (e2) {
100
- for (const i2 of X) {
101
- const s2 = t(e2, i2, void 0);
102
- let o2 = j[i2];
103
- void 0 === s2 || isNaN(s2) || (void 0 === o2 ? o2 = s2 : o2 += s2), j[i2] = o2;
97
+ for (const i2 of g)
98
+ if (i2) {
99
+ for (const t2 of X) {
100
+ const s2 = e(i2, t2, void 0);
101
+ let o2 = j[t2];
102
+ void 0 === s2 || isNaN(s2) || (void 0 === o2 ? o2 = s2 : o2 += s2), j[t2] = o2;
104
103
  }
105
- M.push(e2[o.X_FIELD_NAME]);
106
- for (const i2 of E) {
107
- let s2 = i2.data;
108
- const o2 = i2.dynamicDatas;
109
- if (i2.dynamicField) {
110
- let a2 = L[i2.dynamicField];
104
+ M.push(i2[o.X_FIELD_NAME]);
105
+ for (const t2 of E) {
106
+ let s2 = t2.data;
107
+ const o2 = t2.dynamicDatas;
108
+ if (t2.dynamicField) {
109
+ let a2 = L[t2.dynamicField];
111
110
  a2 = a2 || [];
112
111
  for (let l2 = 0; l2 < a2.length; l2++) {
113
112
  l2 >= o2.length && o2.push([]), s2 = o2[l2];
114
113
  const n2 = a2[l2];
115
- let u2 = t(e2, n2, void 0);
116
- i2.isCumulative && (u2 = j[n2]), s2.push(u2);
114
+ let u2 = e(i2, n2, void 0);
115
+ t2.isCumulative && (u2 = j[n2]), s2.push(u2);
117
116
  }
118
- } else if ("fixed" === i2.type)
119
- s2.push(i2.field);
120
- else if ("variable" === i2.type) {
121
- let o3 = t(e2, i2.field, void 0);
122
- i2.isCumulative && (o3 = j[i2.field]), s2.push(o3);
123
- } else if ("formula" === i2.type) {
124
- const t2 = u(i2.formula, j, e2, c2);
125
- s2.push(t2);
117
+ } else if ("fixed" === t2.type)
118
+ s2.push(t2.field);
119
+ else if ("variable" === t2.type) {
120
+ let o3 = e(i2, t2.field, void 0);
121
+ t2.isCumulative && (o3 = j[t2.field]), s2.push(o3);
122
+ } else if ("formula" === t2.type) {
123
+ const e2 = u(t2.formula, j, i2, c2);
124
+ s2.push(e2);
126
125
  } else
127
126
  s2.push(void 0);
128
127
  }
@@ -156,7 +155,7 @@ function c(c2, d, f, p) {
156
155
  } else
157
156
  $ && $.length > 0 && ($[0].data = M), f.xAxis = $, f.yAxis = G;
158
157
  const R = d.props ? d.props.selGroupVariable : null;
159
- !(d.props ? d.props.enableDrill : null) && R && (d.highlightInfos = [], e(c2.entity, R, null)), r(c2, d, "afterUpdateChart", f, { resultData: p }), d.groupFields = D, d.cacheDatas = g, d.rawResult = p;
158
+ !(d.props ? d.props.enableDrill : null) && R && (d.highlightInfos = [], t(c2.entity, R, null)), r(c2, d, "afterUpdateChart", f, { resultData: p }), d.groupFields = S, d.cacheDatas = g, d.rawResult = p;
160
159
  }
161
160
  export {
162
161
  c as updateChartOption
package/dist/es/components/runtime/utils/page-helper-util.js CHANGED
@@ -95,13 +95,18 @@ function updateChartDatasources(t, e, o, n) {
95
95
  i.task && Object.assign(l, i.task);
96
96
  const c = { entityMap: i.data, additionalParamMap: u, taskMap: l, dataSourceList: s, systemCode: t.systemCode, pageCode: t.code }, p = t.backendUrl, f = getBaseUrl(p, t.isTest) + "/common/common-data/find-chart-datas";
97
97
  http.post(f, c).then((e2) => {
98
+ var _a, _b;
98
99
  t.chartDataSourceMap || (t.chartDataSourceMap = {});
99
100
  for (const o2 in e2) {
100
101
  t.chartDataSourceMap[o2] = e2[o2];
101
102
  const a2 = getComponentRef(t, o2);
102
103
  if (a2) {
103
- const t2 = a2.getConfigure();
104
- (!n || t2 && t2.initializationQuery) && a2.updateChartDatas && a2.updateChartDatas(e2[o2]);
104
+ const r2 = a2.getConfigure();
105
+ if ((!n || r2 && r2.initializationQuery) && a2.updateChartDatas && (a2.updateChartDatas(e2[o2]), (_b = (_a = r2.runtime) == null ? void 0 : _a.dataConfig) == null ? void 0 : _b.resultSet)) {
106
+ const n2 = e2[o2] && e2[o2].length > 0 ? e2[o2][0] : {}, a3 = n2 && n2.result ? n2.result : {};
107
+ let s2 = null;
108
+ r2.serviceDataField ? s2 = a3[r2.serviceDataField] : a3 && (s2 = Array.isArray(a3) ? a3 : [a3]), s2 || (s2 = []), setValueForVariableName(t.entity, r2.runtime.dataConfig.resultSet, s2);
109
+ }
105
110
  }
106
111
  }
107
112
  a(e2);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "super-page-runtime",
3
- "version": "2.1.95",
3
+ "version": "2.1.97",
4
4
  "description": "AgileBuilder super page runtime",
5
5
  "license": "ISC",
6
6
  "main": "dist/es/index.js",