super-page-runtime 2.0.43-beta3 → 2.0.43-beta5

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"
 }
 /**
  * 获取主题对象
@@ -49,3 +50,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;

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

@@ -1,9 +1,12 @@
+import "../../../../node_modules/.pnpm/@jsplumb_browser-ui@6.2.10/node_modules/@jsplumb/browser-ui/js/jsplumb.browser-ui.es.js";
 import theme1 from "../../../../assets/chart-themes/theme1.js";
 import theme2 from "../../../../assets/chart-themes/theme2.js";
 import theme3 from "../../../../assets/chart-themes/theme3.js";
-import { getValueFromSource, setValueForVariableName, formatVariableValue } from "../page-helper-util.js";
+import { getValueFromSource, setValueForVariableName, formatVariableValue, getParamNames, getValueFromVariable } from "../page-helper-util.js";
+import { appendDefaultMethods } from "../events/event-util.js";
 var CommonName = /* @__PURE__ */ ((CommonName2) => {
   CommonName2["X_FIELD_NAME"] = "__x";
+  CommonName2["Y_TEMP_NAME"] = "__y";
   return CommonName2;
 })(CommonName || {});
 const themeMap = {
@@ -82,7 +85,7 @@ function initChartOption(configure, chartOption) {
   if (chartOption.series) {
     const enableDrill = configure.props ? configure.props.enableDrill : null;
     const selGroupVariable = configure.props ? configure.props.selGroupVariable : null;
-    for (let s of chartOption.series) {
+    for (const s of chartOption.series) {
       if (!chartOption.radar) {
         s.data = [];
       }
@@ -100,7 +103,7 @@ function initChartOption(configure, chartOption) {
     }
   }
   if (chartOption.radar) {
-    for (let r of chartOption.radar) {
+    for (const r of chartOption.radar) {
       r.indicator = [];
     }
   }
@@ -113,7 +116,7 @@ function initChartOption(configure, chartOption) {
   configure.defaultXaxis = defaultXaxis;
   const defaultYaxis = chartOption.yAxis;
   if (defaultYaxis) {
-    for (let yAxis of defaultYaxis) {
+    for (const yAxis of defaultYaxis) {
       if (yAxis.data) {
         yAxis.data = [];
       }
@@ -131,7 +134,7 @@ function monitorChartClickToVariable(pageContext, configure, chart, variable) {
     let selGroupValue = null;
     if (highlightInfos) {
       for (let i = 0; i < highlightInfos.length; i++) {
-        let info = highlightInfos[i];
+        const info = highlightInfos[i];
         chart.dispatchAction({
           type: "downplay",
           seriesIndex: info.seriesIndex,
@@ -168,12 +171,12 @@ function monitorChartClickToVariable(pageContext, configure, chart, variable) {
 }
 function sortDatas(pageContext, configure, datas) {
   const itemConfs = configure.items ? configure.items : [];
-  let orderByTarget = configure.props ? configure.props.orderByTarget : "";
+  const orderByTarget = configure.props ? configure.props.orderByTarget : "";
   let orderField = null;
   if (orderByTarget == "x" || orderByTarget == "X") {
     orderField = "__x";
   } else if (orderByTarget) {
-    for (let item of itemConfs) {
+    for (const item of itemConfs) {
       if (item.uuid == orderByTarget) {
         const itemProps = item.props ? item.props : {};
         const sourceType = itemProps.yaxisSource;
@@ -188,18 +191,18 @@ function sortDatas(pageContext, configure, datas) {
   if (!orderField) {
     return;
   }
-  let orderSource = configure.props ? configure.props.orderSource : "";
+  const orderSource = configure.props ? configure.props.orderSource : "";
   let orderValue = configure.props ? configure.props.orderFix : "";
   if (orderSource == "variable") {
-    let orderVariable = configure.props ? configure.props.orderVariable : "";
+    const orderVariable = configure.props ? configure.props.orderVariable : "";
     orderValue = formatVariableValue(pageContext, orderVariable);
   }
   orderValue = orderValue == "desc" || orderValue == "DESC" ? "desc" : "asc";
-  let maxLen = datas.length;
+  const maxLen = datas.length;
   for (let i = 0; i < maxLen - 1; i++) {
-    let vali = getValueFromSource(datas[i], orderField, void 0);
+    const vali = getValueFromSource(datas[i], orderField, void 0);
     for (let j = i + 1; j < maxLen; j++) {
-      let valj = getValueFromSource(datas[j], orderField, void 0);
+      const valj = getValueFromSource(datas[j], orderField, void 0);
       let isSwap = false;
       if ("desc" == orderValue) {
         if (vali < valj) {
@@ -251,7 +254,7 @@ function limitDatas(pageContext, configure, datas, groupFields, numFields) {
     if (!overItemAlias) {
       break;
     }
-    for (let groupField of groupFields) {
+    for (const groupField of groupFields) {
       if (!groupField) {
         continue;
       }
@@ -265,11 +268,11 @@ function limitDatas(pageContext, configure, datas, groupFields, numFields) {
         existValues.push(value);
       }
     }
-    for (let numField of numFields) {
+    for (const numField of numFields) {
       if (!numField) {
         continue;
       }
-      let value = getValueFromSource(data, numField, void 0);
+      const value = getValueFromSource(data, numField, void 0);
       if (isNaN(value)) {
         continue;
       }
@@ -290,8 +293,125 @@ function limitDatas(pageContext, configure, datas, groupFields, numFields) {
   }
   return newDatas;
 }
+function caculateFormulaValue(itemConfs, datas, accumulateFields) {
+  const totalValueMap = {};
+  for (const item of itemConfs) {
+    const itemProps = item.props ? item.props : {};
+    const sourceType = itemProps.yaxisSource;
+    if (sourceType === "formula") {
+      const paramNames = getParamNames(itemProps.formula);
+      for (const paramName of paramNames) {
+        if (paramName in totalValueMap) {
+          continue;
+        }
+        if (paramName.startsWith("${min.")) {
+          totalValueMap[paramName] = getMinValue(
+            datas,
+            paramName.substring(6, paramName.length - 1)
+          );
+        } else if (paramName.startsWith("${max.")) {
+          totalValueMap[paramName] = getMaxValue(
+            datas,
+            paramName.substring(6, paramName.length - 1)
+          );
+        } else if (paramName.startsWith("${sum.")) {
+          totalValueMap[paramName] = getSumValue(
+            datas,
+            paramName.substring(6, paramName.length - 1)
+          );
+        } else if (paramName.startsWith("${avg.")) {
+          totalValueMap[paramName] = getAvgValue(
+            datas,
+            paramName.substring(6, paramName.length - 1)
+          );
+        } else if (paramName.startsWith("${add.")) {
+          const fieldName = paramName.substring(6, paramName.length - 1);
+          accumulateFields.push(fieldName);
+        }
+      }
+    }
+  }
+  return totalValueMap;
+}
+function getMinValue(datas, fieldName) {
+  let minValue = void 0;
+  for (const d of datas) {
+    const value = parseFloat(getValueFromSource(d, fieldName, null));
+    if (minValue === void 0) {
+      minValue = value;
+    } else if (!isNaN(value) && value < minValue) {
+      minValue = value;
+    }
+  }
+  return minValue;
+}
+function getMaxValue(datas, fieldName) {
+  let maxValue = void 0;
+  for (const d of datas) {
+    const value = parseFloat(getValueFromSource(d, fieldName, null));
+    if (maxValue === void 0) {
+      maxValue = value;
+    } else if (!isNaN(value) && value > maxValue) {
+      maxValue = value;
+    }
+  }
+  return maxValue;
+}
+function getSumValue(datas, fieldName) {
+  let sumValue = void 0;
+  for (const d of datas) {
+    const value = parseFloat(getValueFromSource(d, fieldName, null));
+    if (sumValue === void 0) {
+      sumValue = value;
+    } else if (!isNaN(value)) {
+      sumValue += value;
+    }
+  }
+  return sumValue;
+}
+function getAvgValue(datas, fieldName) {
+  const sumValue = getSumValue(datas, fieldName);
+  if (sumValue === void 0 || datas.length === 0) {
+    return sumValue;
+  }
+  return parseFloat((sumValue / datas.length).toFixed(5));
+}
+function executeChartFormula(formulaStr, accumulateMap, rowData, pageContext) {
+  if (!formulaStr) {
+    return void 0;
+  }
+  if (accumulateMap) {
+    for (const accumulateField in accumulateMap) {
+      formulaStr = formulaStr.replace(
+        new RegExp("\\${add." + accumulateField + "}", "g"),
+        accumulateMap[accumulateField]
+      );
+    }
+  }
+  const paramNames = getParamNames(formulaStr);
+  for (const paramName of paramNames) {
+    let value = null;
+    if (paramName.startsWith("${row.")) {
+      value = getValueFromSource(rowData, paramName.substring(6, paramName.length - 1), null);
+    } else {
+      value = getValueFromVariable(pageContext.entity, paramName);
+    }
+    formulaStr = formulaStr.replace(new RegExp(paramName.replace("$", "\\$"), "g"), value);
+  }
+  if (!formulaStr.includes("return ")) {
+    formulaStr = "return " + formulaStr;
+  }
+  const newFunc = new Function("params", formulaStr);
+  appendDefaultMethods(newFunc, pageContext);
+  return newFunc({
+    pageContext,
+    row: rowData
+  });
+}
 export {
   CommonName,
+  caculateFormulaValue,
+  executeChartFormula,
   getCustomTheme,
   getCustomThemeOptions,
   getNumFormatter,

package/dist/es/components/runtime/utils/events/event-util.d.ts

@@ -12,6 +12,12 @@ export declare function initPageEvents(pageDesign: PageDesign, pageContext: Page
  * @returns
  */
 export declare function getCustomFunc(pageContext: PageContext, funcName: any): any;
+/**
+ * 为功能添加默认的方法
+ * @param func 函数
+ * @param pageContext
+ */
+export declare function appendDefaultMethods(func: any, pageContext: PageContext): void;
 /**
  * 页面销毁时，将window上注册的函数移除掉
  * @param pageDesign

package/dist/es/components/runtime/utils/events/event-util.js

@@ -7,6 +7,14 @@ import { analysisCondition } from "agilebuilder-ui/src/utils/util";
 import { getListCode } from "../common-util.js";
 import eventBus from "../eventBus.js";
 import { getValueFromSource } from "../page-helper-util.js";
+const skipValidateEvents = [
+  "downloadTemplate",
+  "back",
+  "exportForm",
+  "exportPDF",
+  "lineEditCreate",
+  "workflowSave"
+];
 function initPageEvents(pageDesign, pageContext) {
   if (pageDesign && pageDesign.customEvents) {
     const customEvents = transferToFunction(pageDesign.customEvents);
@@ -26,48 +34,51 @@ function appendDefaultMethod(pageContext, customEvents) {
   }
   for (const pro in customEvents) {
     const func = customEvents[pro];
-    func.get = function(code) {
-      if (code) {
-        return getComponentRefByCode(pageContext, code);
-      } else {
-        return void 0;
-      }
-    };
-    func.getByUuid = function(uuid) {
-      if (uuid) {
-        return getComponentRef(pageContext, uuid);
-      } else {
-        return void 0;
-      }
-    };
-    func.getPageContext = function() {
-      return pageContext;
-    };
-    func.getContextValue = function(fieldName) {
-      let contextData = pageContext && pageContext.entity ? pageContext.entity.context : null;
-      contextData = contextData ? contextData : {};
-      return getValueFromSource(contextData, fieldName, "context");
-    };
-    func.getContext = function() {
-      return pageContext && pageContext.entity ? pageContext.entity.context : {};
-    };
-    func.getSystem = function() {
-      return pageContext && pageContext.entity ? pageContext.entity.system : {};
-    };
-    func.getTask = function() {
-      return pageContext && pageContext.entity ? pageContext.entity.task : {};
-    };
-    func.getRequest = function() {
-      return pageContext && pageContext.entity ? pageContext.entity.request : {};
-    };
-    func.getPage = function() {
-      return pageContext && pageContext.entity ? pageContext.entity.page : {};
-    };
-    func.getCustomFunc = function(funcName) {
-      return getCustomFunc(pageContext, funcName);
-    };
+    appendDefaultMethods(func, pageContext);
   }
 }
+function appendDefaultMethods(func, pageContext) {
+  func.get = function(code) {
+    if (code) {
+      return getComponentRefByCode(pageContext, code);
+    } else {
+      return void 0;
+    }
+  };
+  func.getByUuid = function(uuid) {
+    if (uuid) {
+      return getComponentRef(pageContext, uuid);
+    } else {
+      return void 0;
+    }
+  };
+  func.getPageContext = function() {
+    return pageContext;
+  };
+  func.getContextValue = function(fieldName) {
+    let contextData = pageContext && pageContext.entity ? pageContext.entity.context : null;
+    contextData = contextData ? contextData : {};
+    return getValueFromSource(contextData, fieldName, "context");
+  };
+  func.getContext = function() {
+    return pageContext && pageContext.entity ? pageContext.entity.context : {};
+  };
+  func.getSystem = function() {
+    return pageContext && pageContext.entity ? pageContext.entity.system : {};
+  };
+  func.getTask = function() {
+    return pageContext && pageContext.entity ? pageContext.entity.task : {};
+  };
+  func.getRequest = function() {
+    return pageContext && pageContext.entity ? pageContext.entity.request : {};
+  };
+  func.getPage = function() {
+    return pageContext && pageContext.entity ? pageContext.entity.page : {};
+  };
+  func.getCustomFunc = function(funcName) {
+    return getCustomFunc(pageContext, funcName);
+  };
+}
 function removeCustomFuncFromWindow(pageDesign) {
   if (pageDesign && pageDesign.customEvents) {
     const customEvents = pageDesign.customEvents;
@@ -116,6 +127,7 @@ function handleEventUtil($event, pageContext, configure, eventType, isExecute, o
     const eventParams = packageEventParams(pageContext, configure, $event, otherParams);
     buttonClickEvent(pageContext, configure, eventParams);
   } else {
+    debugger;
     eventFun = getEventFuncByType(pageContext, events, eventType);
     if (isExecute) {
       const eventParams = packageEventParams(pageContext, configure, $event, otherParams);
@@ -184,13 +196,20 @@ function buttonClickEvent(pageContext, configure, eventParams) {
 }
 function doValidateForm(pageContext, configure, eventParams) {
   const events = configure.runtime && configure.runtime.events ? configure.runtime.events : [];
+  let isEnableRequired = true;
   const clickEventFunObj = getClickEventFuncByType(pageContext, events, "click");
   if (clickEventFunObj) {
     const isStandardEvent = clickEventFunObj.isStandard;
     const event = clickEventFunObj.event;
-    isNotNeedValidateRequired(isStandardEvent, event);
+    const isNotNeedValidate = isNotNeedValidateRequired(isStandardEvent, event);
+    if (isNotNeedValidate) {
+      isEnableRequired = false;
+    }
   }
-  validateDataModelFunc(pageContext, configure, true).then(() => {
+  validateDataModelFunc(pageContext, configure, isEnableRequired).then((validateReslut) => {
+    if (!validateReslut) {
+      return;
+    }
     const beforeClickResult = doBeforeClickEvent(pageContext, configure, eventParams);
     if (!beforeClickResult) {
       return;
@@ -271,7 +290,7 @@ function isNotDoAfterClick(isStandardEvent, clickEvent) {
   return isStandardEvent && (clickEvent.eventName === "exportForm" || clickEvent.eventName === "exportPDF" || clickEvent.eventName === "import" || clickEvent.eventName === "assign" || clickEvent.eventName === "copyTask" || clickEvent.eventName === "addSigner" || clickEvent.eventName === "returnTaskTo" || clickEvent.eventName === "removeSigner");
 }
 function isNotNeedValidateRequired(isStandardEvent, clickEvent) {
-  return isStandardEvent && (clickEvent.eventName === "downloadTemplate" || clickEvent.eventName === "back" || clickEvent.eventName === "exportForm" || clickEvent.eventName === "exportPDF" || clickEvent.eventName === "lineEditCreate");
+  return isStandardEvent && skipValidateEvents.includes(clickEvent.eventName);
 }
 function doAfterClickEvent(pageContext, configure, otherParams) {
   const events = configure.runtime && configure.runtime.events ? configure.runtime.events : [];
@@ -594,6 +613,7 @@ function fileUploadBeforeUpload(params) {
   return getHandleEvent(null, params.pageContext, params.configureObj, "before-upload", params);
 }
 export {
+  appendDefaultMethods,
   canExecuteButton,
   cellClick,
   cellDblClick,

package/dist/es/components/runtime/utils/events/standard-event.js

@@ -598,10 +598,13 @@ function dealAfterWithList(pageContext, configureObj, row, successTip) {
 }
 function refreshFormOrListPage(pageContext, configureObj) {
   let successOperation = configureObj.props.base.successOperation;
-  const buttonForPageType = getPageType(pageContext, configureObj, false);
+  console.log("refreshFormOrListPage22=====successOperation=", successOperation);
+  const buttonForPageType = getPageType(pageContext, configureObj);
+  console.log("refreshFormOrListPage22=====buttonForPageType=", buttonForPageType);
   if (buttonForPageType && buttonForPageType === "list" && !successOperation) {
     successOperation = "refresh";
   }
+  console.log("refreshFormOrListPage33=====successOperation=", successOperation);
   if (successOperation === "refresh") {
     if (buttonForPageType && buttonForPageType === "list") {
       const tableUuid = getTableUuid(pageContext, configureObj);

package/dist/es/components/runtime/utils/events/validator-util.js

@@ -149,16 +149,27 @@ function validateDataModelFunc(pageContext, configureObj, isEnableRequired) {
   const pageModel = pageContext.entity.page;
   const data = { ...pageModel, ...dataModel };
   const rules = pageContext.rules;
+  const isEnableRequiredSetting = configureObj.props.base ? configureObj.props.base.isEnableRequired : null;
+  if (isEnableRequiredSetting !== void 0 && isEnableRequiredSetting !== null) {
+    isEnableRequired = isEnableRequiredSetting;
+  }
+  if (typeof isEnableRequired === "undefined" || isEnableRequired === null) {
+    isEnableRequired = false;
+  }
   return validateDataModel(isEnableRequired, data, rules, pageContext);
 }
 function validateDataModel(isEnableRequired, dataModel, rules, pageContext) {
-  {
+  if (isEnableRequired) {
     const isWorkflow = pageContext.workflowCode ? true : false;
     if (isWorkflow) {
       return validateWorkflowFormDataModel(dataModel, pageContext);
     } else {
       return validateCommonFormDataModel(dataModel, pageContext, rules);
     }
+  } else {
+    return new Promise((resolve, reject) => {
+      resolve(true);
+    });
   }
 }
 function validateWorkflowFormDataModel(dataModel, pageContext) {

package/dist/es/components/runtime/utils/page-helper-util.d.ts

@@ -91,6 +91,12 @@ export declare function setVariableValueWithProp(entity: any, prop: string, newV
  * @param variable
  */
 export declare function formatVariableValue(pageContext: PageContext, variable: string): any;
+/**
+ * 获取参数名
+ * @param variable
+ * @returns
+ */
+export declare function getParamNames(variable: string): any[] | RegExpMatchArray;
 /**
  * 根据类型格式化对象
  * @param value

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

@@ -376,7 +376,8 @@ function getParamNames(variable) {
     return [];
   }
   const reg = /\$\{[^\{|\}]+\}/g;
-  return variable.match(reg);
+  const paramNames = variable.match(reg);
+  return paramNames ? paramNames : [];
 }
 function formatValueByType(value, formatType, formatInfo) {
   if (!formatType || value == "" || value == null || value == void 0) {
@@ -654,6 +655,7 @@ export {
   getComponentOptionConfigs,
   getFormPropName,
   getOptionDatasFromPage,
+  getParamNames,
   getValueFromSource,
   getValueFromVariable,
   getVariableValue,

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

@@ -416,7 +416,7 @@ const standardFuncUrlMap = {
     label: "导出",
     functions: [
       {
-        path: "/commons/export-list-data$POST /commons/export-reports$POST"
+        path: "/commons/export-list-data$POST"
       }
     ]
   },
@@ -498,12 +498,12 @@ function getFunctionInfo(simpleCode) {
   }
   let funcInfo = functionMap[simpleCode];
   if (funcInfo == void 0) {
-    for (let eventName in standardFuncUrlMap) {
+    for (const eventName in standardFuncUrlMap) {
       const functions = standardFuncUrlMap[eventName].functions;
       if (!functions) {
         continue;
       }
-      for (let f of functions) {
+      for (const f of functions) {
         const tempCode = f.code ? f.code : eventName;
         if (simpleCode === tempCode) {
           funcInfo = f;

package/dist/es/components/runtime/views/assemblys/form/date-picker/datepicker-runtime.vue2.js

@@ -134,9 +134,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             onChange: _cache[1] || (_cache[1] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
             onBlur: _cache[2] || (_cache[2] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),
             onFocus: _cache[3] || (_cache[3] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "focus")),
-            onCalendarChange: _cache[4] || (_cache[4] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "calendar-change")),
-            onVisibleChange: _cache[5] || (_cache[5] = ($event) => _ctx.handleEhandleFormEventvent($event, _ctx.pageContext, _ctx.configure, "visible-change")),
-            onPanelChange: _cache[6] || (_cache[6] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "panel-change"))
+            onVisibleChange: _cache[4] || (_cache[4] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "visible-change")),
+            onPanelChange: _cache[5] || (_cache[5] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "panel-change"))
           }, null, 8, ["is-range", "clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "modelValue", "shortcuts", "type"])) : (openBlock(), createBlock(_component_el_date_picker, {
             key: 1,
             clearable: designProperty.value.clearable,
@@ -148,15 +147,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "end-placeholder": designProperty.value.endPlaceholder,
             format: designProperty.value.format,
             modelValue: dynamicModelMethod.value,
-            "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => dynamicModelMethod.value = $event),
+            "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => dynamicModelMethod.value = $event),
             shortcuts: shortcuts.value,
             type: designProperty.value.dateType,
-            onChange: _cache[8] || (_cache[8] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
-            onBlur: _cache[9] || (_cache[9] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),
-            onFocus: _cache[10] || (_cache[10] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "focus")),
-            onCalendarChange: _cache[11] || (_cache[11] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "calendar-change")),
-            onVisibleChange: _cache[12] || (_cache[12] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "visible-change")),
-            onPanelChange: _cache[13] || (_cache[13] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "panel-change"))
+            onChange: _cache[7] || (_cache[7] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
+            onBlur: _cache[8] || (_cache[8] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),
+            onFocus: _cache[9] || (_cache[9] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "focus")),
+            onVisibleChange: _cache[10] || (_cache[10] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "visible-change")),
+            onPanelChange: _cache[11] || (_cache[11] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "panel-change"))
           }, null, 8, ["clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "modelValue", "shortcuts", "type"]))
         ]),
         _: 1

package/dist/es/components/runtime/views/assemblys/form/input-text/inputtext-runtime.vue2.js

@@ -93,12 +93,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             maxlength: designProperty.value.maxLength,
             "show-word-limit": designProperty.value.showInputNum,
             modelValue: dynamicModelMethod.value,
-            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dynamicModelMethod.value = $event),
-            onInput: _cache[1] || (_cache[1] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "input")),
-            onChange: _cache[2] || (_cache[2] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
-            onBlur: _cache[3] || (_cache[3] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),
-            onFocus: _cache[4] || (_cache[4] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "focus")),
-            onClick: _cache[5] || (_cache[5] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "click"))
+            "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => dynamicModelMethod.value = $event),
+            onInput: _cache[5] || (_cache[5] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "input")),
+            onChange: _cache[6] || (_cache[6] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
+            onBlur: _cache[7] || (_cache[7] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),
+            onFocus: _cache[8] || (_cache[8] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "focus")),
+            onClick: _cache[9] || (_cache[9] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "click"))
           }, createSlots({ _: 2 }, [
             designProperty.value.iconPosition != "outer" && (designProperty.value.preIconType && designProperty.value.preIconValue || designProperty.value.preText) ? {
               name: "prefix",
@@ -106,7 +106,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 designProperty.value.preIconType && designProperty.value.preIconValue ? (openBlock(), createBlock(unref(SuperIcon), {
                   key: 0,
                   iconType: designProperty.value.preIconType,
-                  iconValue: designProperty.value.preIconValue
+                  iconValue: designProperty.value.preIconValue,
+                  onClick: _cache[0] || (_cache[0] = ($event) => unref(handleFormEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "prefixClick"))
                 }, null, 8, ["iconType", "iconValue"])) : createCommentVNode("", true),
                 createTextVNode(" " + toDisplayString(designProperty.value.preText), 1)
               ]),
@@ -118,7 +119,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 designProperty.value.preIconType && designProperty.value.preIconValue ? (openBlock(), createBlock(unref(SuperIcon), {
                   key: 0,
                   iconType: designProperty.value.preIconType,
-                  iconValue: designProperty.value.preIconValue
+                  iconValue: designProperty.value.preIconValue,
+                  onClick: _cache[1] || (_cache[1] = ($event) => unref(handleFormEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "prefixClick"))
                 }, null, 8, ["iconType", "iconValue"])) : createCommentVNode("", true),
                 createTextVNode(" " + toDisplayString(designProperty.value.preText), 1)
               ]),
@@ -130,7 +132,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 designProperty.value.sufIconType && designProperty.value.sufIconValue ? (openBlock(), createBlock(unref(SuperIcon), {
                   key: 0,
                   iconType: designProperty.value.sufIconType,
-                  iconValue: designProperty.value.sufIconValue
+                  iconValue: designProperty.value.sufIconValue,
+                  onClick: _cache[2] || (_cache[2] = ($event) => unref(handleFormEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "suffixClick"))
                 }, null, 8, ["iconType", "iconValue"])) : createCommentVNode("", true),
                 createTextVNode(" " + toDisplayString(designProperty.value.sufText), 1)
               ]),
@@ -142,7 +145,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 designProperty.value.sufIconType && designProperty.value.sufIconValue ? (openBlock(), createBlock(unref(SuperIcon), {
                   key: 0,
                   iconType: designProperty.value.sufIconType,
-                  iconValue: designProperty.value.sufIconValue
+                  iconValue: designProperty.value.sufIconValue,
+                  onClick: _cache[3] || (_cache[3] = ($event) => unref(handleFormEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "suffixClick"))
                 }, null, 8, ["iconType", "iconValue"])) : createCommentVNode("", true),
                 createTextVNode(" " + toDisplayString(designProperty.value.sufText), 1)
               ]),

package/dist/es/components/runtime/views/assemblys/workflow/picture-flow/pictureflow-runtime.vue2.js

@@ -1,6 +1,6 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, unref, normalizeStyle } from "vue";
-import "../../../../utils/eventBus.js";
+import { defineComponent, ref, watch, resolveComponent, unref, openBlock, createElementBlock, toDisplayString, createBlock, normalizeStyle } from "vue";
 import { getWorkflowId } from "../../../../utils/common-util.js";
+const _hoisted_1 = { key: 0 };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "pictureflow-runtime",
   props: {
@@ -26,12 +26,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     return (_ctx, _cache) => {
       const _component_workflow_history = resolveComponent("workflow-history");
-      return openBlock(), createBlock(_component_workflow_history, {
+      return !unref(workflowId) ? (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(_ctx.$t("superPageRuntimeMessage.flowNotStart")), 1)) : (openBlock(), createBlock(_component_workflow_history, {
+        key: 1,
         id: unref(workflowId),
         ref_key: "historyGraphRef",
         ref: historyGraphRef,
         style: normalizeStyle({ maxHeight: maxHeight.value + "px" })
-      }, null, 8, ["id", "style"]);
+      }, null, 8, ["id", "style"]));
     };
   }
 });

package/dist/es/components/runtime/views/assemblys/workflow/text-history/textflow-runtime.vue2.js

@@ -1,6 +1,6 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, unref, normalizeStyle } from "vue";
-import "../../../../utils/eventBus.js";
+import { defineComponent, ref, watch, resolveComponent, unref, openBlock, createElementBlock, toDisplayString, createBlock, normalizeStyle } from "vue";
 import { getWorkflowId } from "../../../../utils/common-util.js";
+const _hoisted_1 = { key: 0 };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "textflow-runtime",
   props: {
@@ -29,12 +29,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     return (_ctx, _cache) => {
       const _component_workflow_history_list = resolveComponent("workflow-history-list");
-      return openBlock(), createBlock(_component_workflow_history_list, {
+      return !unref(workflowId) ? (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(_ctx.$t("superPageRuntimeMessage.flowNotStart")), 1)) : (openBlock(), createBlock(_component_workflow_history_list, {
+        key: 1,
         ref_key: "historyList",
         ref: historyList,
         "workflow-id": unref(workflowId),
         style: normalizeStyle({ maxHeight: maxHeight.value + "px" })
-      }, null, 8, ["workflow-id", "style"]);
+      }, null, 8, ["workflow-id", "style"]));
     };
   }
 });

package/dist/es/components/runtime/views/super-page.vue.js

@@ -264,6 +264,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             initPageDesign(pageConf).then(() => {
               sessionCacheDataId();
               isShowPage.value = true;
+              setContextStyle();
             });
           }
         });

package/dist/es/i18n/langs/cn.js

@@ -46,7 +46,8 @@ const cn = {
     required: "{label}必填",
     formatMismatch: "{label}格式不匹配",
     overMaxLength: "{label}最多只能输入{value}字符",
-    limitMinLength: "{label}至少输入{value}字符"
+    limitMinLength: "{label}至少输入{value}字符",
+    flowNotStart: "流程未提交"
   }
 };
 export {

package/dist/es/i18n/langs/en.js

@@ -46,7 +46,8 @@ const en = {
     required: "{label} is required",
     formatMismatch: "{label} Format mismatch",
     overMaxLength: "{label} can only input a maximum of {value} characters",
-    limitMinLength: "Enter at least {value} characters for {label}"
+    limitMinLength: "Enter at least {value} characters for {label}",
+    flowNotStart: "Workflow Not Started"
   }
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.43-beta3",
+  "version": "2.0.43-beta5",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -69,4 +69,4 @@
     "vue-router": "^4.3.0",
     "vuex": "^4.1.0"
   }
-}
+}