super-page-runtime 2.2.29-tmp1 → 2.2.29-tmp2

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

@@ -1,81 +1,164 @@
-import { getValueFromSource as o, setValueForVariableName as e } from "../page-helper-util.js";
-import { deepCopy as s } from "../common-util.js";
-import { CommonName as r, caculateFormulaValue as t, executeChartFormula as l, sortDatas as n, limitDatas as p } from "./chart-util.js";
-function i(i2, u, c, a) {
-  if (!a || !a.result) return;
-  const f = a && a.result ? a.result : {};
-  let g = a && a.groupValue ? a.groupValue : void 0;
-  const m = u.serviceDataField;
-  let h = null;
-  m ? h = f[m] : f && (h = Array.isArray(f) ? f : [f]), h || (h = []);
-  let d = u.props ? u.props.groups : null;
-  if (d || (d = []), !g || 0 === g.length) {
-    g = [];
-    for (const o2 of d) g.push(o2.group);
+import { getValueFromSource, setValueForVariableName } from "../page-helper-util.js";
+import { deepCopy } from "../common-util.js";
+import { CommonName, caculateFormulaValue, executeChartFormula, sortDatas, limitDatas } from "./chart-util.js";
+function updateChartOption(pageContext, configure, chartOption, resultData) {
+  if (!resultData || !resultData.result) {
+    return;
   }
-  const y = {}, v = [], x = [];
-  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));
-  let F = u.props ? u.props.mulGroupShow : "";
-  F = "break" == F ? "\r\n" : " ", console.log("groupValue", g);
-  for (const e2 of h) {
-    if (!e2) continue;
-    const s2 = [];
-    for (const r2 of g) {
-      const t3 = y[r2], l2 = o(e2, t3, void 0);
-      l2 && s2.push(l2);
+  const result = resultData && resultData.result ? resultData.result : {};
+  let groupValue = resultData && resultData.groupValue ? resultData.groupValue : void 0;
+  const dataSetField = configure.serviceDataField;
+  let datas = null;
+  if (dataSetField) {
+    datas = result[dataSetField];
+  } else {
+    if (result) {
+      if (Array.isArray(result)) {
+        datas = result;
+      } else {
+        datas = [result];
+      }
+    }
+  }
+  if (!datas) {
+    datas = [];
+  }
+  let confGroups = configure.props ? configure.props.groups : null;
+  if (!confGroups) {
+    confGroups = [];
+  }
+  if (!groupValue || groupValue.length === 0) {
+    groupValue = [];
+    for (const g of confGroups) {
+      groupValue.push(g.group);
     }
-    const t2 = s2.join(F);
-    e2[r.X_FIELD_NAME] = t2;
   }
-  const E = u.items ? u.items : [];
-  if (0 == E.length) return void console.log("饼图的系列为空,操作失败!", u);
-  const S = u.props ? u.props : {};
-  let _ = S.yaxisField;
-  if (console.log("valueField", _), E[0].props.yaxisField = _, E[0].props.yaxisSource = S.yaxisSource, E[0].props.formula = S.formula, "formula" === S.yaxisSource) {
-    const e2 = [], s2 = t(E, h, e2);
-    let n2 = S.formula ? S.formula : "";
-    for (const o2 in s2) n2 = n2.replace(new RegExp(o2.replace("$", "\\$"), "g"), s2[o2]);
-    _ = r.Y_TEMP_NAME;
-    const p2 = {};
-    for (const s3 of h) {
-      if (!s3) continue;
-      for (const r3 of e2) {
-        const e3 = o(s3, r3, void 0);
-        let t2 = p2[r3];
-        void 0 === e3 || isNaN(e3) || (void 0 === t2 ? t2 = e3 : t2 += e3), p2[r3] = t2;
+  const groupMap = {};
+  const groupFields = [];
+  const realGroupFilds = [];
+  for (const g of confGroups) {
+    groupMap[g.group] = g.target;
+    if (g.target && !groupFields.includes(g.target)) {
+      groupFields.push(g.target);
+      if (groupValue.includes(g.group)) {
+        realGroupFilds.push(g.target);
       }
-      console.log("formula", n2);
-      const r2 = l(n2, p2, s3, i2);
-      console.log("formula-result", r2), s3[_] = r2;
     }
   }
-  E[0].props.yaxisField = _, E[0].props.yaxisSource = "", n(i2, u, h), h = p(i2, u, h, v, [_]);
-  const A = [], D = [];
-  for (const e2 of h) {
-    if (!e2) continue;
-    A.push(e2[r.X_FIELD_NAME]);
-    const s2 = o(e2, _, void 0);
-    D.push(s2);
+  let mulGroupShow = configure.props ? configure.props.mulGroupShow : "";
+  mulGroupShow = mulGroupShow == "break" ? "\r\n" : " ";
+  console.log("groupValue", groupValue);
+  for (const d of datas) {
+    if (!d) {
+      continue;
+    }
+    const xValues2 = [];
+    for (const g of groupValue) {
+      const fieldName = groupMap[g];
+      const value = getValueFromSource(d, fieldName, void 0);
+      if (value) {
+        xValues2.push(value);
+      }
+    }
+    const xValue = xValues2.join(mulGroupShow);
+    d[CommonName.X_FIELD_NAME] = xValue;
   }
-  const M = u.defaultSeries;
-  let N = M[0].pieColors;
-  N = N || [];
-  let j = M[0].pieColorMap;
-  j = j || {};
-  const V = [];
-  for (let o2 = 0; o2 < A.length && o2 < D.length; o2++) {
-    const e2 = { value: D[o2], name: A[o2] };
-    if (o2 < N.length || j[e2.name]) {
-      let s2 = j[e2.name];
-      s2 || (s2 = N[o2]), s2 && (e2.itemStyle = { color: s2 });
+  const itemConfs = configure.items ? configure.items : [];
+  if (itemConfs.length == 0) {
+    console.log("饼图的系列为空,操作失败!", configure);
+    return;
+  }
+  const confProps = configure.props ? configure.props : {};
+  let valueField = confProps.yaxisField;
+  console.log("valueField", valueField);
+  itemConfs[0].props.yaxisField = valueField;
+  itemConfs[0].props.yaxisSource = confProps.yaxisSource;
+  itemConfs[0].props.formula = confProps.formula;
+  if (confProps.yaxisSource === "formula") {
+    const accumulateFields = [];
+    const totalValueMap = caculateFormulaValue(itemConfs, datas, accumulateFields);
+    let formula = confProps.formula ? confProps.formula : "";
+    for (const paramName in totalValueMap) {
+      formula = formula.replace(
+        new RegExp(paramName.replace("$", "\\$"), "g"),
+        totalValueMap[paramName]
+      );
     }
-    V.push(e2);
+    valueField = CommonName.Y_TEMP_NAME;
+    const cumulativeMap = {};
+    for (const data of datas) {
+      if (!data) {
+        continue;
+      }
+      for (const cumulativeField of accumulateFields) {
+        const value2 = getValueFromSource(data, cumulativeField, void 0);
+        let hisValue = cumulativeMap[cumulativeField];
+        if (value2 !== void 0 && !isNaN(value2)) {
+          if (hisValue === void 0) {
+            hisValue = value2;
+          } else {
+            hisValue = hisValue + value2;
+          }
+        }
+        cumulativeMap[cumulativeField] = hisValue;
+      }
+      console.log("formula", formula);
+      const value = executeChartFormula(formula, cumulativeMap, data, pageContext);
+      console.log("formula-result", value);
+      data[valueField] = value;
+    }
+  }
+  itemConfs[0].props.yaxisField = valueField;
+  itemConfs[0].props.yaxisSource = "";
+  sortDatas(pageContext, configure, datas);
+  datas = limitDatas(pageContext, configure, datas, groupFields, [valueField]);
+  const xValues = [];
+  const yValues = [];
+  for (const data of datas) {
+    if (!data) {
+      continue;
+    }
+    xValues.push(data[CommonName.X_FIELD_NAME]);
+    const value = getValueFromSource(data, valueField, void 0);
+    yValues.push(value);
+  }
+  const defaultSeries = configure.defaultSeries;
+  let pieColors = defaultSeries[0].pieColors;
+  pieColors = pieColors ? pieColors : [];
+  let pieColorMap = defaultSeries[0].pieColorMap;
+  pieColorMap = pieColorMap ? pieColorMap : {};
+  const pieDatas = [];
+  for (let index = 0; index < xValues.length && index < yValues.length; index++) {
+    const data = {
+      value: yValues[index],
+      name: xValues[index]
+    };
+    if (index < pieColors.length || pieColorMap[data.name]) {
+      let color = pieColorMap[data.name];
+      if (!color) {
+        color = pieColors[index];
+      }
+      if (color) {
+        data.itemStyle = {
+          color
+        };
+      }
+    }
+    pieDatas.push(data);
+  }
+  const tempSeries = deepCopy(defaultSeries);
+  tempSeries[0].data = pieDatas;
+  chartOption.series = [tempSeries[0]];
+  const selGroupVariable = configure.props ? configure.props.selGroupVariable : null;
+  const enableDrill = configure.props ? configure.props.enableDrill : null;
+  if (!enableDrill && selGroupVariable) {
+    configure.highlightInfos = [];
+    setValueForVariableName(pageContext.entity, selGroupVariable, null);
   }
-  const b = s(M);
-  b[0].data = V, c.series = [b[0]];
-  const w = u.props ? u.props.selGroupVariable : null;
-  !(u.props ? u.props.enableDrill : null) && w && (u.highlightInfos = [], e(i2.entity, w, null)), u.groupFields = x, u.cacheDatas = h, u.rawResult = a;
+  configure.groupFields = realGroupFilds;
+  configure.cacheDatas = datas;
+  configure.rawResult = resultData;
 }
 export {
-  i as updateChartOption
+  updateChartOption
 };

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

@@ -1,54 +1,132 @@
-import { getValueFromSource as e } from "../page-helper-util.js";
-import { deepCopy as o } from "../common-util.js";
-import { caculateFormulaValue as i, executeChartFormula as t } from "./chart-util.js";
-function a(a2, s, r, l) {
-  if (!l || !l.result) return;
-  const u = l && l.result ? l.result : {}, f = s.serviceDataField;
-  let d = null;
-  f ? d = u[f] : u && (d = Array.isArray(u) ? u : [u]), d || (d = []);
-  const n = s.items ? s.items : [], c = [], p = {}, m = [], x = i(n, d, m);
-  for (const e2 of n) {
-    const o2 = e2.props ? e2.props : {}, i2 = o2.yaxisSource, t2 = o2.yaxisField;
-    let a3 = null;
-    if (!t2 || i2 && "variable" != i2) if ("formula" == i2) {
-      let i3 = o2.formula ? o2.formula : "";
-      for (const e3 in x) i3 = i3.replace(new RegExp(e3.replace("$", "\\$"), "g"), x[e3]);
-      a3 = { uuid: e2.uuid, type: "formula", formula: i3, data: [] };
-    } else a3 = { uuid: e2.uuid, type: "fixed", field: o2.yaxisFix, data: [] };
-    else a3 = { uuid: e2.uuid, type: "variable", field: t2, data: [] };
-    a3 && (c.push(a3), p[a3.uuid] = a3);
+import { getValueFromSource } from "../page-helper-util.js";
+import { deepCopy } from "../common-util.js";
+import { caculateFormulaValue, executeChartFormula } from "./chart-util.js";
+function updateChartOption(pageContext, configure, chartOption, resultData) {
+  if (!resultData || !resultData.result) {
+    return;
   }
-  const v = s.props ? s.props : {}, y = v.nameField, h = v.maxSource, F = v.maxField, b = v.maxFixed, g = [], j = {};
-  for (const o2 of d) {
-    if (!o2) continue;
-    const i2 = e(o2, y, void 0);
-    let s2 = null;
-    s2 = h && "variable" != h ? b : e(o2, F, void 0), g.push({ text: i2, max: s2 });
-    for (const i3 of m) {
-      const t2 = e(o2, i3, void 0);
-      let a3 = j[i3];
-      void 0 === t2 || isNaN(t2) || (void 0 === a3 ? a3 = t2 : a3 += t2), j[i3] = a3;
+  const result = resultData && resultData.result ? resultData.result : {};
+  const dataSetField = configure.serviceDataField;
+  let datas = null;
+  if (dataSetField) {
+    datas = result[dataSetField];
+  } else {
+    if (result) {
+      if (Array.isArray(result)) {
+        datas = result;
+      } else {
+        datas = [result];
+      }
     }
-    for (const i3 of c) {
-      const s3 = i3.data;
-      if ("fixed" == i3.type) s3.push(i3.field);
-      else if ("variable" == i3.type) {
-        const t2 = e(o2, i3.field, void 0);
-        s3.push(t2);
-      } else if ("formula" == i3.type) {
-        const e2 = t(i3.formula, j, o2, a2);
-        s3.push(e2);
-      } else s3.push(void 0);
+  }
+  if (!datas) {
+    datas = [];
+  }
+  const itemConfs = configure.items ? configure.items : [];
+  const dataConfs = [];
+  const dataValueMap = {};
+  const accumulateFields = [];
+  const totalValueMap = caculateFormulaValue(itemConfs, datas, accumulateFields);
+  for (const item of itemConfs) {
+    const itemProps = item.props ? item.props : {};
+    const sourceType = itemProps.yaxisSource;
+    const yaxisField = itemProps.yaxisField;
+    let dataConf = null;
+    if (yaxisField && (!sourceType || sourceType == "variable")) {
+      dataConf = {
+        uuid: item.uuid,
+        type: "variable",
+        field: yaxisField,
+        data: []
+      };
+    } else if (sourceType == "formula") {
+      let formula = itemProps.formula ? itemProps.formula : "";
+      for (const paramName in totalValueMap) {
+        formula = formula.replace(
+          new RegExp(paramName.replace("$", "\\$"), "g"),
+          totalValueMap[paramName]
+        );
+      }
+      dataConf = {
+        uuid: item.uuid,
+        type: "formula",
+        formula,
+        data: []
+      };
+    } else {
+      dataConf = {
+        uuid: item.uuid,
+        type: "fixed",
+        field: itemProps.yaxisFix,
+        data: []
+      };
+    }
+    if (dataConf) {
+      dataConfs.push(dataConf);
+      dataValueMap[dataConf.uuid] = dataConf;
+    }
+  }
+  const confProps = configure.props ? configure.props : {};
+  const nameField = confProps.nameField;
+  const maxSource = confProps.maxSource;
+  const maxField = confProps.maxField;
+  const maxFixed = confProps.maxFixed;
+  const indicators = [];
+  const cumulativeMap = {};
+  for (const d of datas) {
+    if (!d) {
+      continue;
+    }
+    const name = getValueFromSource(d, nameField, void 0);
+    let maxValue = null;
+    if (!maxSource || maxSource == "variable") {
+      maxValue = getValueFromSource(d, maxField, void 0);
+    } else {
+      maxValue = maxFixed;
+    }
+    indicators.push({
+      text: name,
+      max: maxValue
+    });
+    for (const cumulativeField of accumulateFields) {
+      const value = getValueFromSource(d, cumulativeField, void 0);
+      let hisValue = cumulativeMap[cumulativeField];
+      if (value !== void 0 && !isNaN(value)) {
+        if (hisValue === void 0) {
+          hisValue = value;
+        } else {
+          hisValue = hisValue + value;
+        }
+      }
+      cumulativeMap[cumulativeField] = hisValue;
+    }
+    for (const item of dataConfs) {
+      const data = item.data;
+      if (item.type == "fixed") {
+        data.push(item.field);
+      } else if (item.type == "variable") {
+        const value = getValueFromSource(d, item.field, void 0);
+        data.push(value);
+      } else if (item.type == "formula") {
+        const value = executeChartFormula(item.formula, cumulativeMap, d, pageContext);
+        data.push(value);
+      } else {
+        data.push(void 0);
+      }
     }
   }
-  r.radar[0].indicator = g;
-  const S = s.defaultSeries, w = o(S), A = w[0].data;
-  for (const e2 of A) {
-    const o2 = p[e2.uuid];
-    e2.value = o2.data;
+  chartOption.radar[0].indicator = indicators;
+  const defaultSeries = configure.defaultSeries;
+  const tempSeries = deepCopy(defaultSeries);
+  const serieDatas = tempSeries[0].data;
+  for (const serieData of serieDatas) {
+    const dataValue = dataValueMap[serieData.uuid];
+    serieData.value = dataValue.data;
   }
-  r.series = w, s.cacheDatas = d, s.rawResult = l;
+  chartOption.series = tempSeries;
+  configure.cacheDatas = datas;
+  configure.rawResult = resultData;
 }
 export {
-  a as updateChartOption
+  updateChartOption
 };

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

@@ -1,47 +1,108 @@
-import { getValueFromSource as o } from "../page-helper-util.js";
-import { deepCopy as s } from "../common-util.js";
-import { caculateFormulaValue as i, executeChartFormula as e } from "./chart-util.js";
-function r(r2, t, l, a) {
-  if (!a || !a.result) return;
-  const u = a && a.result ? a.result : {}, c = t.serviceDataField;
-  let f = null;
-  c ? f = u[c] : u && (f = Array.isArray(u) ? u : [u]), f || (f = []);
-  const d = t.items ? t.items : [], n = [], p = {};
-  for (const o2 of d) {
-    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: [] };
-    n.push(t2), p[t2.uuid] = t2;
+import { getValueFromSource } from "../page-helper-util.js";
+import { deepCopy } from "../common-util.js";
+import { caculateFormulaValue, executeChartFormula } from "./chart-util.js";
+function updateChartOption(pageContext, configure, chartOption, resultData) {
+  if (!resultData || !resultData.result) {
+    return;
   }
-  const m = [], x = i(d, f, m);
-  for (const o2 of n) if ("formula" === o2.yaxisSource) {
-    let s2 = o2.formula ? o2.formula : "";
-    for (const o3 in x) s2 = s2.replace(new RegExp(o3.replace("$", "\\$"), "g"), x[o3]);
-    o2.formula = s2;
+  const result = resultData && resultData.result ? resultData.result : {};
+  const dataSetField = configure.serviceDataField;
+  let datas = null;
+  if (dataSetField) {
+    datas = result[dataSetField];
+  } else {
+    if (result) {
+      if (Array.isArray(result)) {
+        datas = result;
+      } else {
+        datas = [result];
+      }
+    }
+  }
+  if (!datas) {
+    datas = [];
+  }
+  const itemConfs = configure.items ? configure.items : [];
+  const dataConfs = [];
+  const dataValueMap = {};
+  for (const item of itemConfs) {
+    const itemProps = item.props ? item.props : {};
+    const itemStyle = item.props ? item.style : {};
+    const xaxisField = itemProps.xaxisField;
+    const sizeField = itemProps.sizeField;
+    const dataConf = {
+      uuid: item.uuid,
+      xaxisField,
+      yaxisField: itemProps.yaxisField,
+      yaxisSource: itemProps.yaxisSource,
+      formula: itemProps.formula,
+      sizeField,
+      symbolSize: itemStyle.symbolSize,
+      data: []
+    };
+    dataConfs.push(dataConf);
+    dataValueMap[dataConf.uuid] = dataConf;
   }
-  const y = {};
-  for (const s2 of f) if (s2) {
-    for (const i2 of m) {
-      const e2 = o(s2, i2, void 0);
-      let r3 = y[i2];
-      void 0 === e2 || isNaN(e2) || (void 0 === r3 ? r3 = e2 : r3 += e2), y[i2] = r3;
+  const accumulateFields = [];
+  const totalValueMap = caculateFormulaValue(itemConfs, datas, accumulateFields);
+  for (const dataConf of dataConfs) {
+    if (dataConf.yaxisSource === "formula") {
+      let formula = dataConf.formula ? dataConf.formula : "";
+      for (const paramName in totalValueMap) {
+        formula = formula.replace(
+          new RegExp(paramName.replace("$", "\\$"), "g"),
+          totalValueMap[paramName]
+        );
+      }
+      dataConf.formula = formula;
+    }
+  }
+  const cumulativeMap = {};
+  for (const d of datas) {
+    if (!d) {
+      continue;
+    }
+    for (const cumulativeField of accumulateFields) {
+      const value = getValueFromSource(d, cumulativeField, void 0);
+      let hisValue = cumulativeMap[cumulativeField];
+      if (value !== void 0 && !isNaN(value)) {
+        if (hisValue === void 0) {
+          hisValue = value;
+        } else {
+          hisValue = hisValue + value;
+        }
+      }
+      cumulativeMap[cumulativeField] = hisValue;
     }
-    for (const i2 of n) {
-      const t2 = i2.data, l2 = [];
-      if (l2.push(o(s2, i2.xaxisField, void 0)), "formula" === i2.yaxisSource) {
-        const o2 = e(i2.formula, y, s2, r2);
-        l2.push(o2);
-      } else l2.push(o(s2, i2.yaxisField, void 0));
-      i2.sizeField ? l2.push(o(s2, i2.xaxisField, void 0)) : l2.push(i2.symbolSize), t2.push(l2);
+    for (const item of dataConfs) {
+      const data = item.data;
+      const values = [];
+      values.push(getValueFromSource(d, item.xaxisField, void 0));
+      if (item.yaxisSource === "formula") {
+        const value = executeChartFormula(item.formula, cumulativeMap, d, pageContext);
+        values.push(value);
+      } else {
+        values.push(getValueFromSource(d, item.yaxisField, void 0));
+      }
+      if (item.sizeField) {
+        values.push(getValueFromSource(d, item.xaxisField, void 0));
+      } else {
+        values.push(item.symbolSize);
+      }
+      data.push(values);
     }
   }
-  const F = t.defaultSeries;
-  console.log("defaultSeries", F);
-  const h = s(F);
-  for (const o2 of h) {
-    const s2 = p[o2.uuid];
-    o2.data = s2.data;
+  const defaultSeries = configure.defaultSeries;
+  console.log("defaultSeries", defaultSeries);
+  const tempSeries = deepCopy(defaultSeries);
+  for (const serie of tempSeries) {
+    const dataValue = dataValueMap[serie.uuid];
+    serie.data = dataValue.data;
   }
-  l.series = h, t.cacheDatas = f, t.rawResult = a;
+  chartOption.series = tempSeries;
+  configure.cacheDatas = datas;
+  configure.rawResult = resultData;
 }
 export {
-  r as updateChartOption
+  updateChartOption
 };