super-page-runtime 2.0.43 → 2.0.44

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

@@ -1,12 +1,12 @@
 import { getValueFromSource, formatVariableValue, setValueForVariableName } from "../page-helper-util.js";
 import { deepCopy } from "../common-util.js";
-import { CommonName, sortDatas, limitDatas } from "./chart-util.js";
+import { CommonName, caculateFormulaValue, sortDatas, limitDatas, executeChartFormula } from "./chart-util.js";
 function updateChartOption(pageContext, configure, chartOption, resultData) {
   if (!resultData || !resultData.result) {
     return;
   }
   const result = resultData && resultData.result ? resultData.result : {};
-  const groupValue = resultData && resultData.groupValue ? resultData.groupValue : [];
+  let groupValue = resultData && resultData.groupValue ? resultData.groupValue : void 0;
   const dataSetField = configure.serviceDataField;
   let datas = null;
   if (dataSetField) {
@@ -27,10 +27,16 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   if (!confGroups) {
     confGroups = [];
   }
+  if (!groupValue || groupValue.length === 0) {
+    groupValue = [];
+    for (const g of confGroups) {
+      groupValue.push(g.group);
+    }
+  }
   const groupMap = {};
   const groupFields = [];
   const realGroupFilds = [];
-  for (let g of confGroups) {
+  for (const g of confGroups) {
     groupMap[g.group] = g.target;
     if (g.target && !groupFields.includes(g.target)) {
       groupFields.push(g.target);
@@ -41,12 +47,12 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   }
   let mulGroupShow = configure.props ? configure.props.mulGroupShow : "";
   mulGroupShow = mulGroupShow == "break" ? "\r\n" : " ";
-  for (let d of datas) {
+  for (const d of datas) {
     if (!d) {
       continue;
     }
     const xValues2 = [];
-    for (let g of groupValue) {
+    for (const g of groupValue) {
       const fieldName = groupMap[g];
       const value = getValueFromSource(d, fieldName, void 0);
       if (value) {
@@ -63,7 +69,12 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   const dynamicValueField = {};
   const allValueFields = [];
   const limitValueFields = [];
-  for (let item of itemConfs) {
+  const accumulateFields = [];
+  const totalValueMap = caculateFormulaValue(itemConfs, datas, accumulateFields);
+  for (const f of accumulateFields) {
+    allValueFields.push(f);
+  }
+  for (const item of itemConfs) {
     const itemProps = item.props ? item.props : {};
     const sourceType = itemProps.yaxisSource;
     const yaxisField = itemProps.yaxisField;
@@ -83,6 +94,25 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
         allValueFields.push(yaxisField);
         limitValueFields.push(yaxisField);
       }
+      if (isCumulative && !accumulateFields.includes(yaxisField)) {
+        accumulateFields.push(yaxisField);
+      }
+    } 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]
+        );
+      }
+      serieValue = {
+        uuid: item.uuid,
+        type: "formula",
+        formula,
+        data: [],
+        dynamicDatas: []
+        //动态系列数据
+      };
     } else {
       serieValue = {
         uuid: item.uuid,
@@ -97,8 +127,7 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
       serieValues.push(serieValue);
       serieValueMap[item.uuid] = serieValue;
     }
-    if (itemProps.dynamicSeriesField && // !groupFields.includes(itemProps.dynamicSeriesField) &&
-    !dynamicFileds.includes(itemProps.dynamicSeriesField) && serieValue && yaxisField) {
+    if (itemProps.dynamicSeriesField && !dynamicFileds.includes(itemProps.dynamicSeriesField) && serieValue) {
       serieValue.dynamicField = itemProps.dynamicSeriesField;
       serieValue.dynamicSeriesTitle = itemProps.dynamicSeriesTitle;
       serieValue.dynamicShowStack = itemProps.dynamicShowStack;
@@ -110,16 +139,16 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   if (dynamicFileds.length > 0) {
     const newDatas = [];
     const dataMap = {};
-    for (let d of datas) {
+    for (const d of datas) {
       if (!d) {
         continue;
       }
-      for (let valueField of allValueFields) {
+      for (const valueField of allValueFields) {
         const groupValue2 = d[CommonName.X_FIELD_NAME];
         let newData = dataMap[groupValue2];
         if (!newData) {
           newData = {};
-          for (let gField of groupFields) {
+          for (const gField of groupFields) {
             newData[gField] = d[gField];
           }
           newData[CommonName.X_FIELD_NAME] = d[CommonName.X_FIELD_NAME];
@@ -136,14 +165,14 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
         }
       }
     }
-    for (let dynamicField of dynamicFileds) {
+    for (const dynamicField of dynamicFileds) {
       const dynamicLabels = [];
-      for (let d of datas) {
+      for (const d of datas) {
         if (!d) {
           continue;
         }
         const groupValue2 = d[CommonName.X_FIELD_NAME];
-        let newData = dataMap[groupValue2];
+        const newData = dataMap[groupValue2];
         if (!newData) {
           continue;
         }
@@ -152,15 +181,18 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
         if (!dynamicLabels.includes(dynamicLabel)) {
           dynamicLabels.push(dynamicLabel);
           limitValueFields.push(dynamicLabel);
+          accumulateFields.push(dynamicLabel);
         }
         const valueField = dynamicValueField[dynamicField];
-        let newValue = getValueFromSource(d, valueField, void 0);
-        if (!isNaN(newValue)) {
-          const hisValue = newData[dynamicLabel];
-          if (!isNaN) {
-            newValue += hisValue;
+        if (valueField !== void 0) {
+          const newValue = getValueFromSource(d, valueField, void 0);
+          let hisValue = newData[dynamicLabel];
+          if (hisValue === void 0) {
+            hisValue = newValue;
+          } else if (!isNaN(newValue)) {
+            hisValue += newValue;
           }
-          newData[dynamicLabel] = newValue;
+          newData[dynamicLabel] = hisValue;
         }
       }
       dynamicLabelMap[dynamicField] = dynamicLabels;
@@ -170,13 +202,26 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   sortDatas(pageContext, configure, datas);
   datas = limitDatas(pageContext, configure, datas, groupFields, limitValueFields);
   const xValues = [];
+  console.log("accumulateFields", accumulateFields);
   const cumulativeMap = {};
-  for (let data of datas) {
+  for (const data of datas) {
     if (!data) {
       continue;
     }
+    for (const cumulativeField of accumulateFields) {
+      const value = getValueFromSource(data, 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;
+    }
     xValues.push(data[CommonName.X_FIELD_NAME]);
-    for (let item of serieValues) {
+    for (const item of serieValues) {
       let serieData = item.data;
       const dynamicDatas = item.dynamicDatas;
       if (item.dynamicField) {
@@ -190,28 +235,21 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
           const fieldName = dynamicLabels[i];
           let value = getValueFromSource(data, fieldName, void 0);
           if (item.isCumulative) {
-            const hisKey = item.uuid + "_" + fieldName;
-            const hisValue = cumulativeMap[hisKey];
-            if (hisValue) {
-              value = hisValue + value;
-            }
-            cumulativeMap[hisKey] = value;
+            value = cumulativeMap[fieldName];
           }
           serieData.push(value);
         }
-      } else if (item.type == "fixed") {
+      } else if (item.type === "fixed") {
         serieData.push(item.field);
-      } else if (item.type == "variable") {
+      } else if (item.type === "variable") {
         let value = getValueFromSource(data, item.field, void 0);
         if (item.isCumulative) {
-          const hisKey = item.uuid + "_field";
-          const hisValue = cumulativeMap[hisKey];
-          if (hisValue) {
-            value = hisValue + value;
-          }
-          cumulativeMap[hisKey] = value;
+          value = cumulativeMap[item.field];
         }
         serieData.push(value);
+      } else if (item.type === "formula") {
+        const value = executeChartFormula(item.formula, cumulativeMap, data, pageContext);
+        serieData.push(value);
       } else {
         serieData.push(void 0);
       }
@@ -220,14 +258,14 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   const defaultSeries = configure.defaultSeries;
   const tempSeries = deepCopy(defaultSeries == null ? [] : defaultSeries);
   const newSeries = [];
-  for (let serie of tempSeries) {
+  for (const serie of tempSeries) {
     const serieValue = serieValueMap[serie.uuid];
     if (serieValue.dynamicField) {
       let dynamicLabels = dynamicLabelMap[serieValue.dynamicField];
       dynamicLabels = dynamicLabels ? dynamicLabels : [];
       const dynamicDatas = serieValue.dynamicDatas ? serieValue.dynamicDatas : [];
       for (let i = 0; i < dynamicLabels.length; i++) {
-        let label = dynamicLabels[i];
+        const label = dynamicLabels[i];
         const newSerie = deepCopy(serie);
         if (serieValue.dynamicSeriesTitle) {
           const dynamicSeriesTitle = serieValue.dynamicSeriesTitle.replace("${name}", label);
@@ -251,7 +289,7 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   const defaultYaxis = configure.defaultYaxis;
   if (chartOption.isBar) {
     if (defaultYaxis) {
-      for (let tempYaxis of defaultYaxis) {
+      for (const tempYaxis of defaultYaxis) {
         tempYaxis.data = xValues;
       }
     }

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

@@ -1,12 +1,12 @@
 import { getValueFromSource, setValueForVariableName } from "../page-helper-util.js";
 import { deepCopy } from "../common-util.js";
-import { CommonName, sortDatas, limitDatas } from "./chart-util.js";
+import { CommonName, caculateFormulaValue, executeChartFormula, sortDatas, limitDatas } from "./chart-util.js";
 function updateChartOption(pageContext, configure, chartOption, resultData) {
   if (!resultData || !resultData.result) {
     return;
   }
   const result = resultData && resultData.result ? resultData.result : {};
-  const groupValue = resultData && resultData.groupValue ? resultData.groupValue : [];
+  let groupValue = resultData && resultData.groupValue ? resultData.groupValue : void 0;
   const dataSetField = configure.serviceDataField;
   let datas = null;
   if (dataSetField) {
@@ -27,10 +27,16 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   if (!confGroups) {
     confGroups = [];
   }
+  if (!groupValue || groupValue.length === 0) {
+    groupValue = [];
+    for (const g of confGroups) {
+      groupValue.push(g.group);
+    }
+  }
   const groupMap = {};
   const groupFields = [];
   const realGroupFilds = [];
-  for (let g of confGroups) {
+  for (const g of confGroups) {
     groupMap[g.group] = g.target;
     if (g.target && !groupFields.includes(g.target)) {
       groupFields.push(g.target);
@@ -41,12 +47,13 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   }
   let mulGroupShow = configure.props ? configure.props.mulGroupShow : "";
   mulGroupShow = mulGroupShow == "break" ? "\r\n" : " ";
-  for (let d of datas) {
+  console.log("groupValue", groupValue);
+  for (const d of datas) {
     if (!d) {
       continue;
     }
     const xValues2 = [];
-    for (let g of groupValue) {
+    for (const g of groupValue) {
       const fieldName = groupMap[g];
       const value = getValueFromSource(d, fieldName, void 0);
       if (value) {
@@ -61,19 +68,58 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
     console.log("饼图的系列为空,操作失败!", configure);
     return;
   }
-  const valueField = configure.props ? configure.props.yaxisField : null;
+  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]
+      );
+    }
+    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 (let data of datas) {
+  for (const data of datas) {
     if (!data) {
       continue;
     }
     xValues.push(data[CommonName.X_FIELD_NAME]);
-    let value = getValueFromSource(data, valueField, void 0);
+    const value = getValueFromSource(data, valueField, void 0);
     yValues.push(value);
   }
   const defaultSeries = configure.defaultSeries;

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

@@ -1,5 +1,6 @@
 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;
@@ -24,7 +25,9 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   const itemConfs = configure.items ? configure.items : [];
   const dataConfs = [];
   const dataValueMap = {};
-  for (let item of itemConfs) {
+  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;
@@ -36,6 +39,20 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
         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,
@@ -55,7 +72,8 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   const maxField = confProps.maxField;
   const maxFixed = confProps.maxFixed;
   const indicators = [];
-  for (let d of datas) {
+  const cumulativeMap = {};
+  for (const d of datas) {
     if (!d) {
       continue;
     }
@@ -70,12 +88,27 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
       text: name,
       max: maxValue
     });
-    for (let item of dataConfs) {
-      let data = item.data;
+    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") {
-        let value = getValueFromSource(d, item.field, void 0);
+        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);
@@ -84,10 +117,9 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   }
   chartOption.radar[0].indicator = indicators;
   const defaultSeries = configure.defaultSeries;
-  console.log("defaultSeries", defaultSeries);
   const tempSeries = deepCopy(defaultSeries);
   const serieDatas = tempSeries[0].data;
-  for (let serieData of serieDatas) {
+  for (const serieData of serieDatas) {
     const dataValue = dataValueMap[serieData.uuid];
     serieData.value = dataValue.data;
   }

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

@@ -1,5 +1,6 @@
 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;
@@ -24,16 +25,17 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   const itemConfs = configure.items ? configure.items : [];
   const dataConfs = [];
   const dataValueMap = {};
-  for (let item of itemConfs) {
+  for (const item of itemConfs) {
     const itemProps = item.props ? item.props : {};
     const itemStyle = item.props ? item.style : {};
-    const xaxisField = itemProps.yaxisField;
-    const yaxisField = itemProps.yaxisField;
+    const xaxisField = itemProps.xaxisField;
     const sizeField = itemProps.sizeField;
-    let dataConf = {
+    const dataConf = {
       uuid: item.uuid,
       xaxisField,
-      yaxisField,
+      yaxisField: itemProps.yaxisField,
+      yaxisSource: itemProps.yaxisSource,
+      formula: itemProps.formula,
       sizeField,
       symbolSize: itemStyle.symbolSize,
       data: []
@@ -41,15 +43,47 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
     dataConfs.push(dataConf);
     dataValueMap[dataConf.uuid] = dataConf;
   }
-  for (let d of datas) {
+  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 (let item of dataConfs) {
-      let data = item.data;
+    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;
       const values = [];
       values.push(getValueFromSource(d, item.xaxisField, void 0));
-      values.push(getValueFromSource(d, item.yaxisField, 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 {
@@ -61,7 +95,7 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   const defaultSeries = configure.defaultSeries;
   console.log("defaultSeries", defaultSeries);
   const tempSeries = deepCopy(defaultSeries);
-  for (let serie of tempSeries) {
+  for (const serie of tempSeries) {
     const dataValue = dataValueMap[serie.uuid];
     serie.data = dataValue.data;
   }

package/dist/es/components/runtime/utils/charts/chart-util.d.ts

@@ -4,7 +4,8 @@ import { PageContext, Component } from '../interfaces/page-design-types';
  * 统计图通用字段名
  */
 export declare enum CommonName {
-    X_FIELD_NAME = "__x"
+    X_FIELD_NAME = "__x",//横坐标字段名
+    Y_TEMP_NAME = "__y"
 }
 /**
  * 获取主题对象
@@ -40,7 +41,16 @@ export declare function initChartOption(configure: Component, chartOption: any):
  * @param chart
  * @param variable
  */
-export declare function monitorChartClickToVariable(pageContext: PageContext, configure: Component, chart: any, variable: string): void;
+export declare function monitorChartClickToVariable(pageContext: PageContext, configure: Component, chart: any): void;
+/**
+ * 清除统计图的选中
+ * @param pageContext
+ * @param configure
+ * @param chart
+ * @returns
+ */
+export declare function clearChartSelected(pageContext: PageContext, configure: Component, chart: any): void;
+export declare function updateClickVariablesForSelected(pageContext: PageContext, configure: Component): void;
 export declare function sortDatas(pageContext: PageContext, configure: Component, datas: Array<any>): void;
 /**
  * 限制显示数量
@@ -49,3 +59,19 @@ export declare function sortDatas(pageContext: PageContext, configure: Component
  * @param limitNum
  */
 export declare function limitDatas(pageContext: PageContext, configure: Component, datas: Array<any>, groupFields: Array<string>, numFields: Array<string>): Array<any>;
+/**
+ * 提前计算公式中用到的汇总变量
+ * @param itemConfs
+ * @param datas
+ * @param accumulateFields 累计计算的字段
+ * @returns
+ */
+export declare function caculateFormulaValue(itemConfs: any, datas: any, accumulateFields: any): any;
+/**
+ * 执行统计图的计算公式
+ * @param formulaStr 计算公式
+ * @param accumulateMap 累计存储
+ * @param rowData 行记录
+ * @param pageContext 页面对象
+ */
+export declare function executeChartFormula(formulaStr: string, accumulateMap: any, rowData: any, pageContext: PageContext): any;