super-page-runtime 2.1.54 → 2.1.57

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

@@ -210,7 +210,6 @@ 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 (const data of datas) {
     if (!data) {

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

@@ -67,6 +67,30 @@ export declare function limitDatas(pageContext: PageContext, configure: Componen
  * @returns
  */
 export declare function caculateFormulaValue(itemConfs: any, datas: any, accumulateFields: any): any;
+/**
+ * 获取数据源中的最小值
+ * @param datas 数据源
+ * @param fieldName 字段名
+ */
+export declare function getMinValue(datas: any, fieldName: string): any;
+/**
+ * 获取数据源中的最大值
+ * @param datas 数据源
+ * @param fieldName 字段名
+ */
+export declare function getMaxValue(datas: any, fieldName: string): any;
+/**
+ * 获取数据源中的汇总值
+ * @param datas 数据源
+ * @param fieldName 字段名
+ */
+export declare function getSumValue(datas: any, fieldName: string): any;
+/**
+ * 获取平均值
+ * @param datas 数据源
+ * @param fieldName 字段名
+ */
+export declare function getAvgValue(datas: any, fieldName: string): any;
 /**
  * 执行统计图的计算公式
  * @param formulaStr 计算公式

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

@@ -14,7 +14,6 @@ const themeMap = {
   theme3
 };
 function getCustomTheme(themeName) {
-  console.log("getdd", themeName);
   return themeMap[themeName];
 }
 function getCustomThemeOptions() {
@@ -510,9 +509,13 @@ export {
   clearChartSelected,
   executeChartFormula,
   exportCommonChart,
+  getAvgValue,
   getCustomTheme,
   getCustomThemeOptions,
+  getMaxValue,
+  getMinValue,
   getNumFormatter,
+  getSumValue,
   initChartOption,
   limitDatas,
   monitorChartClickToVariable,

package/dist/es/components/runtime/utils/common-util.js

@@ -133,11 +133,8 @@ function isNumber(numStr) {
   }
 }
 function isWorkflowPage(pageContext) {
-  var _a;
-  let isWorkflow = false;
-  if ((_a = pageContext.props) == null ? void 0 : _a.activeWorkflow) {
-    isWorkflow = pageContext.workflowCode ? true : false;
-  }
+  const isWorkflow = pageContext.isWorkflowEntity ? true : pageContext.workflowCode ? true : false;
+  console.log("isWorkflowPage----isWorkflow=", isWorkflow, "pageContext.isWorkflowEntity=", pageContext.isWorkflowEntity, "pageContext.workflowCode=", pageContext.workflowCode);
   return isWorkflow;
 }
 function refreshMobileDialogType(jumpPageSetting, isMobile) {

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

@@ -121,8 +121,8 @@ function handleEventUtil($event, pageContext, configure, eventType, isExecute, o
     const tableUuid = getTableUuid(pageContext, configure);
     if (tableUuid) {
       const gridRef = getComponentRef(pageContext, tableUuid);
-      const selections = gridRef.getSelections();
-      const selectionIds = gridRef.getSelectionIds();
+      const selections = gridRef ? gridRef.getSelections() : null;
+      const selectionIds = gridRef ? gridRef.getSelectionIds() : null;
       if (!otherParams) {
         otherParams = {};
       }
@@ -134,7 +134,7 @@ function handleEventUtil($event, pageContext, configure, eventType, isExecute, o
         otherParams["id"] = selectionIds && selectionIds.length > 0 ? selectionIds[0] : null;
         otherParams["ids"] = selectionIds;
       }
-      const tableConfigure = gridRef.getTableConfigure();
+      const tableConfigure = gridRef ? gridRef.getTableConfigure() : null;
       otherParams["tableConfigure"] = tableConfigure;
     }
     const eventParams = packageEventParams(pageContext, configure, $event, otherParams);

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

@@ -57,7 +57,7 @@ export declare function getSaveFormRequest(pageContext: PageContext, configureOb
  */
 export declare function dealAfterOperate(pageContext: any, configureObj: any, data: any, successTip: any, isListButton?: boolean): void;
 export declare function updateValuesWhenCloseDialog(parentPageContext: any, parentConfigureObj: any, sourceModel: any, sourceTableName: any): void;
-export declare function refreshFormOrListPage(pageContext: any, configureObj: any): void;
+export declare function refreshFormOrListPage(pageContext: any, configureObj: any, isRefreshWhenClosePopup: any): void;
 export declare function doImportFinally(params: any, fileObj: any): void;
 export declare function judgeDataNumber(buttonConfigureObj: any, ids: any): boolean;
 export declare function dealCompleteTaskParam(commonEntity: any, isInit: any, pageContext: any, params?: any, operationResult?: any): boolean;

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

@@ -743,9 +743,9 @@ function dealAfterWithList(pageContext, configureObj, row, successTip) {
     });
   }
 }
-function refreshFormOrListPage(pageContext, configureObj) {
-  let successOperation = configureObj.props.base.successOperation;
-  console.log("refreshFormOrListPage22=====successOperation=", successOperation);
+function refreshFormOrListPage(pageContext, configureObj, isRefreshWhenClosePopup) {
+  let successOperation = isRefreshWhenClosePopup ? "refresh" : configureObj.props.base.successOperation;
+  console.log("refreshFormOrListPage22=====successOperation=", successOperation, "isRefreshWhenClosePopup=", isRefreshWhenClosePopup);
   const buttonForPageType = getPageType(pageContext, configureObj);
   console.log("refreshFormOrListPage22=====buttonForPageType=", buttonForPageType);
   if (buttonForPageType && buttonForPageType === "list" && !successOperation) {

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

@@ -4,6 +4,7 @@ import { getComponentRef, getComponentRefByCode, getAllComponentRefs } from "../
 import { getI18n } from "agilebuilder-ui/src/utils/util";
 import { getAdditionalParamMap } from "./standard-event.js";
 import { isPromise } from "agilebuilder-ui/src/utils/common-util";
+import { isWorkflowPage } from "../common-util.js";
 function setObjectPropRule(prop, rules, leafRule) {
   const rule = {};
   if (!rules) {
@@ -181,7 +182,7 @@ function validateDataModelFunc(pageContext, configureObj, isEnableRequired) {
 }
 function validateDataModel(isEnableRequired, dataModel, rules, pageContext) {
   if (isEnableRequired) {
-    const isWorkflow = pageContext.workflowCode ? true : false;
+    const isWorkflow = isWorkflowPage(pageContext);
     if (isWorkflow) {
       return validateWorkflowFormDataModel(dataModel, pageContext, rules);
     } else {

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

@@ -487,7 +487,6 @@ function getValueFromSource(valueSource, paramName, paramType) {
     return getValueFromSource(childValue, newParamName, paramType);
   } else {
     if (paramType == "context") {
-      console.log("newDate", paramName);
       if (paramName == "currentDate" || paramName == "currentTime") {
         return /* @__PURE__ */ new Date();
       } else if (paramName.startsWith("currentDate") && paramName.length > 11) {

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

@@ -4,7 +4,7 @@ import { PageDimensions } from "./interfaces/page-design-types.js";
 import { setVariableValue, formatVariableValue, getFormPropName } from "./page-helper-util.js";
 import { getSessionCache } from "agilebuilder-ui/src/utils/auth";
 import { functions } from "./api/page-expose-util.js";
-import { deepCopy } from "./common-util.js";
+import { isWorkflowPage, deepCopy } from "./common-util.js";
 function queryPageDesignByCode(pageCode) {
   return http.get(
     window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + pageCode
@@ -49,6 +49,10 @@ function convertToPageContext(pageDesign, pageRequest) {
     refercePropMap: (_a = pageDesign.runtime) == null ? void 0 : _a.refercePropMap,
     //当前表单页面中引用字段信息集合,get请求时需要使用，格式为{tableName:[字段名,.. ... ], tableName:[字段名,.. ... ]}
     subTableWatchProps: pageDesign.subTableWatchProps,
+    dataTypeMaps: pageDesign.dataTypeMaps,
+    // 列表页面时后台会传该属性到前端
+    isWorkflowEntity: pageDesign.isWorkflowEntity,
+    // 列表页面时后台会传该属性到前端。列表删除时会用到该属性。
     entity: {
       data: {},
       task: {},
@@ -279,17 +283,15 @@ function queryPageSuperGrids(pageDesign, pageContext, publishVersion) {
       tableRuntimes,
       additionalParamMapJson,
       pageCode,
-      publishVersion
+      publishVersion,
+      pageType: pageDesign.pageType
     }
   );
 }
 function packageFormRules(pageContext, configure) {
-  var _a, _b, _c;
+  var _a, _b;
   const prop = configure.props && configure.props.base ? configure.props.base.prop : null;
-  let isWorkflow = false;
-  if ((_a = pageContext.props) == null ? void 0 : _a.activeWorkflow) {
-    isWorkflow = pageContext.workflowCode ? true : false;
-  }
+  let isWorkflow = isWorkflowPage(pageContext);
   let allFieldsDisabled = false;
   if (isWorkflow) {
     console.log(
@@ -300,7 +302,7 @@ function packageFormRules(pageContext, configure) {
     );
     if (configure.name !== "button-detail" && pageContext.fieldPermissionMap) {
       const allFields = pageContext.fieldPermissionMap.get("all_fields");
-      if ((allFields == null ? void 0 : allFields["canEdit"]) === false && ((_b = configure.runtime) == null ? void 0 : _b.props)) {
+      if ((allFields == null ? void 0 : allFields["canEdit"]) === false && ((_a = configure.runtime) == null ? void 0 : _a.props)) {
         configure.runtime.props.state = "disabled";
         allFieldsDisabled = true;
       }
@@ -340,7 +342,7 @@ function packageFormRules(pageContext, configure) {
         configure.runtime.props.state = "";
       }
     }
-    if ((_c = configure.props) == null ? void 0 : _c.customRuleEvents) {
+    if ((_b = configure.props) == null ? void 0 : _b.customRuleEvents) {
       if (!pageContext.customRuleEvents) {
         pageContext.customRuleEvents = [];
       }

package/dist/es/components/runtime/utils/table-utils.js

@@ -1,10 +1,7 @@
-import { getBaseUrl } from "./common-util.js";
-import http from "agilebuilder-ui/src/utils/request";
+import "agilebuilder-ui/src/utils/common-util";
+import "agilebuilder-ui/src/utils/util";
+import "agilebuilder-ui/src/utils/request";
 import eventBus from "./eventBus.js";
-function getDataTypeMapRequest(backendUrl, tableName, isTest) {
-  const baseUrl = getBaseUrl(backendUrl, isTest);
-  return http.get(baseUrl + "/dsc/commons/tables/" + tableName + "/data-types");
-}
 function popupToPage(params) {
   const pageCode = params.pageContext && params.pageContext.code;
   console.log("弹框显示页面--popupToPage====params=", params);
@@ -22,7 +19,6 @@ function getTableNameByTableUuid(pageContext, tableUuid) {
   return tableConfigure && tableConfigure.props && tableConfigure.props.dataOrigin ? tableConfigure.props.dataOrigin.tableName : null;
 }
 export {
-  getDataTypeMapRequest,
   getTableNameByTableUuid,
   popupToPage
 };

package/dist/es/components/runtime/views/assemblys/button/button/button-runtime.vue2.js

@@ -22,7 +22,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return props.pageContext.canClick !== void 0 && props.pageContext.clickUuid !== void 0 ? !props.pageContext.canClick && props.pageContext.clickUuid === props.configure.uuid : false;
     }
     onMounted(() => {
-      console.log("button-----onMounted");
     });
     return (_ctx, _cache) => {
       const _component_el_button = resolveComponent("el-button");

package/dist/es/components/runtime/views/assemblys/chart/table/chart-table-util.js

@@ -1,20 +1,22 @@
-import { getValueFromVariable } from "../../../../utils/page-helper-util.js";
+import { getParamNames, getValueFromVariable } from "../../../../utils/page-helper-util.js";
 import { getCustomFunc } from "../../../../utils/events/event-util.js";
+import { getMinValue, getMaxValue, getSumValue, getAvgValue } from "../../../../utils/charts/chart-util.js";
+import "element-plus/es/locale/index.mjs";
 class ExpressionEvaluator {
-  static evaluate(pageContext, conditions, data) {
+  static evaluate(pageContext, conditions, data2) {
     const expressions = conditions.map(
-      (condition) => this.createExpression(pageContext, condition, data)
+      (condition) => this.createExpression(pageContext, condition, data2)
     );
     const joinedExpression = expressions.join(" ");
     return this.evaluateExpression(joinedExpression);
   }
-  static createExpression(pageContext, condition, data) {
+  static createExpression(pageContext, condition, data2) {
     const { propName, operator, propValue, leftBracket, rightBracket, joinSign, dataType } = condition;
     if (!propName || propName === "") {
       return "";
     }
-    const value = getValueFromVariable(pageContext.entity, propName, data);
-    let expression2 = `${leftBracket} ${this.getComparisonExpression(value, operator, getValueFromVariable(pageContext.entity, propValue, data), dataType)} ${rightBracket}`;
+    const value = getValueFromVariable(pageContext.entity, propName, data2);
+    let expression2 = `${leftBracket} ${this.getComparisonExpression(value, operator, getValueFromVariable(pageContext.entity, propValue, data2), dataType)} ${rightBracket}`;
     if (joinSign) {
       if (joinSign === "and" || joinSign === "AND") {
         expression2 += "&&";
@@ -91,8 +93,9 @@ class ExpressionEvaluator {
   }
 }
 function getSummaryTitleColumn(configure) {
+  var _a;
   const result = {};
-  if (configure.props.summaries.titleColumn && configure.props.summaries.titleColumn.length > 0) {
+  if (((_a = configure.props.summaries) == null ? void 0 : _a.titleColumn) && configure.props.summaries.titleColumn.length > 0) {
     configure.props.summaries.titleColumn.forEach((item) => {
       result[item.prop] = item;
     });
@@ -100,11 +103,12 @@ function getSummaryTitleColumn(configure) {
   return result;
 }
 function getSummaryDataColumn(configure, type) {
+  var _a;
   const result = {};
-  if (configure.props.summaries.dataColumn && configure.props.summaries.dataColumn.length > 0) {
+  if (((_a = configure.props.summaries) == null ? void 0 : _a.dataColumn) && configure.props.summaries.dataColumn.length > 0) {
     configure.props.summaries.dataColumn.forEach((item) => {
-      var _a;
-      const columnConfigs = (_a = configure.items) == null ? void 0 : _a.find(
+      var _a2;
+      const columnConfigs = (_a2 = configure.items) == null ? void 0 : _a2.find(
         (columnItem) => item.prop === columnItem.props.base.prop
       );
       if (columnConfigs) {
@@ -118,15 +122,15 @@ function getSummaryDataColumn(configure, type) {
   }
   return result;
 }
-function summaryStatistics(summaryColumn, data, prop, pageContext) {
+function summaryStatistics(summaryColumn, data2, prop, pageContext) {
   let sumsIndex = "";
   const summaryMode = summaryColumn.summaryMode;
-  const values = data.map((item) => Number(item[prop])).filter((value) => !Number.isNaN(value));
+  const values = data2.map((item) => Number(item[prop])).filter((value) => !Number.isNaN(value));
   if (values.length > 0) {
     if (summaryMode === "custom") {
       const func = getCustomFunc(pageContext, summaryColumn.customFunc);
       if (func) {
-        const resultValue = func.apply(func, [{ data, prop }]);
+        const resultValue = func.apply(func, [{ data: data2, prop }]);
         if (resultValue) {
           sumsIndex = ` ${resultValue}`;
         } else {
@@ -158,23 +162,23 @@ function summaryStatistics(summaryColumn, data, prop, pageContext) {
   }
   return sumsIndex;
 }
-function replacePlaceholders(template, data) {
+function replacePlaceholders(template, data2) {
   if (template) {
     return template.replace(/\$\{row\.(\w+)\}/g, (match, p1) => {
-      return Object.prototype.hasOwnProperty.call(data, p1) ? data[p1] : "";
+      return Object.prototype.hasOwnProperty.call(data2, p1) ? data2[p1] : "";
     });
   }
 }
-function getHeaderCellStyleUtil(data, runtimeStyle, props) {
+function getHeaderCellStyleUtil(data2, runtimeStyle, props) {
   var _a;
   const headerStyle = {};
-  if (data.column.property) {
+  if (data2.column.property) {
     (_a = runtimeStyle.titleStyle) == null ? void 0 : _a.forEach((item) => {
-      if (item.field && item.field.includes(data.column.property)) {
+      if (item.field && item.field.includes(data2.column.property)) {
         if (item.scopeFunc) {
           const func = getCustomFunc(props.pageContext, item.scopeFunc);
           if (func) {
-            const funcResult = func.apply(func, [{ item, data }]);
+            const funcResult = func.apply(func, [{ item, data: data2 }]);
             if (funcResult !== false) {
               copyStyle(headerStyle, item);
             }
@@ -185,21 +189,22 @@ function getHeaderCellStyleUtil(data, runtimeStyle, props) {
       }
     });
   }
-  const cellTitleStytle = getCellStyleUtil(data, runtimeStyle.cellTitleStyle, props);
+  const cellTitleStytle = getCellStyleUtil(data2, runtimeStyle.cellTitleStyle, props);
   if (cellTitleStytle) {
     Object.assign(headerStyle, cellTitleStytle);
   }
   return headerStyle;
 }
-function getRowStyleUtil(data, groupSummaryDataRowIndex, props) {
+function getRowStyleUtil(data2, groupSummaryDataRowIndex, props) {
   const returnStyle = {};
+  console.log("getRowStyleUtil---props.configure---", props.configure);
   if (props.configure.style.rowStyle) {
     for (let i = 0; i < props.configure.style.rowStyle.length; i++) {
       const rowStyle = props.configure.style.rowStyle[i];
       if (rowStyle.scopeFunc) {
         const func = getCustomFunc(props.pageContext, rowStyle.scopeFunc);
         if (func) {
-          const funcResult = func.apply(func, [{ data }]);
+          const funcResult = func.apply(func, [{ data: data2 }]);
           if (funcResult !== void 0 && funcResult !== null && funcResult !== false) {
             copyStyle(returnStyle, rowStyle);
           }
@@ -208,17 +213,19 @@ function getRowStyleUtil(data, groupSummaryDataRowIndex, props) {
         const result = ExpressionEvaluator.evaluate(
           props.pageContext,
           rowStyle.matchingCondition,
-          data.row
+          data2.row
         );
         if (result || result === void 0) {
           copyStyle(returnStyle, rowStyle);
         }
       } else {
+        console.log("getRowStyleUtil---rowStyle---", rowStyle);
         copyStyle(returnStyle, rowStyle);
       }
     }
   }
-  if (groupSummaryDataRowIndex && groupSummaryDataRowIndex.length > 0 && groupSummaryDataRowIndex.indexOf(data.rowIndex) !== -1) {
+  if (groupSummaryDataRowIndex && groupSummaryDataRowIndex.length > 0 && groupSummaryDataRowIndex.indexOf(data2.rowIndex) !== -1) {
+    console.log("getRowStyleUtil---groupSummaryDataRowIndex---", groupSummaryDataRowIndex);
     const result = {};
     if (props.configure.style.collectStyle && props.configure.style.collectStyle.length > 0) {
       for (let i = 0; i < props.configure.style.collectStyle.length; i++) {
@@ -231,9 +238,10 @@ function getRowStyleUtil(data, groupSummaryDataRowIndex, props) {
     }
     return result;
   }
+  console.log("getRowStyleUtil---returnStyle---", returnStyle);
   return returnStyle;
 }
-function getCellStyleUtil(data, cellStyles, props) {
+function getCellStyleUtil(data2, cellStyles, props) {
   const cellStyle = {};
   if (cellStyles) {
     for (let i = 0; i < cellStyles.length; i++) {
@@ -241,7 +249,7 @@ function getCellStyleUtil(data, cellStyles, props) {
       if (columnsStyleSetting.scopeFunc) {
         const func = getCustomFunc(props.pageContext, columnsStyleSetting.scopeFunc);
         if (func) {
-          const funcResult = func.apply(func, [{ data }]);
+          const funcResult = func.apply(func, [{ data: data2 }]);
           if (funcResult !== false) {
             copyStyle(cellStyle, columnsStyleSetting);
           }
@@ -250,7 +258,7 @@ function getCellStyleUtil(data, cellStyles, props) {
         const result = ExpressionEvaluator.evaluate(
           props.pageContext,
           columnsStyleSetting.matchingCondition,
-          data.row
+          data2.row
         );
         if (result || result === void 0) {
           copyStyle(cellStyle, columnsStyleSetting);
@@ -268,39 +276,39 @@ function copyStyle(target, source) {
     Object.assign(target, JSON.parse(source.customStyle));
   }
 }
-function rowDataToColumn(data, configure) {
+function rowDataToColumn(data2, configure) {
   const groupByFields = configure.props.dataOrigin.groupField;
   const titleColumns = configure.props.dataOrigin.rowToColumn.titleColumns;
   const dataColumns = configure.props.dataOrigin.rowToColumn.dataColumns;
   const result = [];
   const groupedData = {};
-  data.forEach((item) => {
-    const key = groupByFields.map((field) => item[field]).join("|");
-    if (!groupedData[key]) {
+  data2.forEach((item) => {
+    const key2 = groupByFields.map((field) => item[field]).join("|");
+    if (!groupedData[key2]) {
       const group = {};
       groupByFields.forEach((field) => group[field] = item[field]);
-      groupedData[key] = group;
+      groupedData[key2] = group;
       result.push(group);
     }
     dataColumns.forEach((valueField) => {
       const columnNameParts = titleColumns.map((field) => item[field]);
       const columnName = `${columnNameParts.join("")}${valueField}`;
-      groupedData[key][columnName] = item[valueField];
+      groupedData[key2][columnName] = item[valueField];
     });
   });
   return result;
 }
-function colDataToRow(data, configure) {
+function colDataToRow(data2, configure) {
   const groupByFields = configure.props.dataOrigin.groupField;
   const titleColumns = configure.props.dataOrigin.columnToRow.titleColumns;
   const dataColumns = configure.props.dataOrigin.columnToRow.dataColumns;
   const transColumns = configure.props.dataOrigin.columnToRow.transColumns;
   const dataColumnsMapping = configure.props.dataOrigin.columnToRow.dataColumnsMapping;
-  if (data.length === 0) {
-    return data;
+  if (data2.length === 0) {
+    return data2;
   }
   const result = [];
-  const newData = groupBy(data, groupByFields);
+  const newData = groupBy(data2, groupByFields);
   const dataColumnsConfig = dataColumns.reduce((max, current) => {
     return current.columns.length > max.columns.length ? current : max;
   }, dataColumns[0]);
@@ -410,22 +418,22 @@ function getColumnToRowTableConfig(configure) {
   });
   return newTableColumns;
 }
-function groupBy(data, groupFields) {
+function groupBy(data2, groupFields) {
   const grouped = {};
-  data.forEach((item) => {
-    const key = groupFields.map((field) => item[field]).join("|");
-    if (!grouped[key]) {
-      grouped[key] = {
+  data2.forEach((item) => {
+    const key2 = groupFields.map((field) => item[field]).join("|");
+    if (!grouped[key2]) {
+      grouped[key2] = {
         ...item,
         // 复制所有字段
         records: []
         // 初始化记录数组
       };
-      groupFields.forEach((field, index) => {
-        grouped[key][field] = item[field];
+      groupFields.forEach((field, index2) => {
+        grouped[key2][field] = item[field];
       });
     }
-    grouped[key].records.push(item);
+    grouped[key2].records.push(item);
   });
   return Object.values(grouped).map((group) => ({
     ...group,
@@ -463,16 +471,59 @@ function getIndexColumn() {
     }
   };
 }
-function computeFormula(row, formula) {
-  try {
-    return new Function(
-      "row",
-      `return ${formula.replace(/\$\{row\.(\w+)\}/g, (_, key) => `row.${key}`)}`
-    )(row);
-  } catch (error) {
-    console.error("数据公式解析错误:", error);
-    return 0;
-  }
+function computeFormula(itemConfs, datas) {
+  Object.keys(itemConfs).forEach((key) => {
+    const paramNames = getParamNames(itemConfs[key]);
+    datas.forEach((data, index) => {
+      const totalValueMap = {};
+      for (const paramName of paramNames) {
+        if (paramName.startsWith("${min.")) {
+          totalValueMap[paramName] = getMinValue(datas, getFieldName(paramName));
+        } else if (paramName.startsWith("${max.")) {
+          totalValueMap[paramName] = getMaxValue(datas, getFieldName(paramName));
+        } else if (paramName.startsWith("${sum.")) {
+          totalValueMap[paramName] = getSumValue(datas, getFieldName(paramName));
+        } else if (paramName.startsWith("${avg.")) {
+          totalValueMap[paramName] = getAvgValue(datas, getFieldName(paramName));
+        } else if (paramName.startsWith("${add.")) {
+          const fieldName = getFieldName(paramName);
+          let currentRowValue = 0;
+          try {
+            currentRowValue = Number(data[fieldName]);
+            datas.slice(0, index).forEach((item) => {
+              currentRowValue += Number(item[fieldName]);
+            });
+          } catch (e) {
+            console.error("计算错误:", e);
+            currentRowValue = 0;
+          }
+          totalValueMap[paramName] = currentRowValue;
+        } else if (paramName.startsWith("${row.")) {
+          totalValueMap[paramName] = data[getFieldName(paramName)];
+        }
+      }
+      let expr = itemConfs[key];
+      Object.keys(totalValueMap).forEach((exprParam) => {
+        if (expr.indexOf(exprParam) > -1) {
+          expr = expr.replaceAll(exprParam, totalValueMap[exprParam]);
+        }
+      });
+      for (const paramName of paramNames) {
+        if (expr.indexOf(paramName) > -1) {
+          expr = expr.replaceAll(paramName, 0);
+        }
+      }
+      try {
+        data[key] = eval(expr);
+      } catch (e) {
+        console.error(itemConfs[key] + " 计算错误, 替换后表达式为：" + expr, e);
+        data[key] = 0;
+      }
+    });
+  });
+}
+function getFieldName(paramName) {
+  return paramName.substring(6, paramName.length - 1);
 }
 export {
   ExpressionEvaluator,

package/dist/es/components/runtime/views/assemblys/chart/table/normal-column.vue.js

@@ -36,7 +36,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       resloveLinkText.value = true;
     }
     function formatter(row, column, cellValue, index) {
-      console.log("formatter", row);
     }
     function showLink(row) {
       var _a;
@@ -91,7 +90,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function formatContent(row, format) {
-      console.log("formatContent", row, format);
       const value = row[props.column.props.base.prop];
       switch (format.type) {
         case "number":

package/dist/es/components/runtime/views/assemblys/chart/table/table-runtime.vue2.js

@@ -1,6 +1,6 @@
-import { defineComponent, ref, onMounted, resolveComponent, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, withDirectives, createVNode, vShow, withCtx, Fragment, renderList, createBlock, createCommentVNode, watch, h } from "vue";
+import { defineComponent, ref, onMounted, watch, resolveComponent, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, withDirectives, createVNode, vShow, withCtx, Fragment, renderList, createBlock, createCommentVNode, h } from "vue";
 import _sfc_main$1 from "../common/common-chart-header.vue.js";
-import { getChartDatasFromPage, isPromise, getValueFromVariable, setValueForVariableName, updateChartDatasourcesByComponent } from "../../../../utils/page-helper-util.js";
+import { getChartDatasFromPage, getValueFromVariable, isPromise, setValueForVariableName, updateChartDatasourcesByComponent } from "../../../../utils/page-helper-util.js";
 import { getCustomFunc } from "../../../../utils/events/event-util.js";
 import _sfc_main$2 from "./group-column.vue.js";
 import _sfc_main$3 from "./normal-column.vue.js";
@@ -78,6 +78,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const resultData = getChartDatasFromPage(props.pageContext, props.configure);
       if (resultData) {
         updateChartDatas(resultData);
+      } else {
+        if (props.configure.props.dataOrigin.dataSource === "variable") {
+          watchVariableDataChange();
+          const tmpTableData2 = getValueFromVariable(
+            props.pageContext.entity,
+            props.configure.props.dataOrigin.variable
+          );
+          if (tmpTableData2) {
+            loadTable(tmpTableData2, resultData);
+          }
+        }
       }
     });
     function watchVariableDataChange() {
@@ -169,12 +180,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
       if (Object.keys(dataFormulaMapping.value).length > 0 && tmpTableData2 && tmpTableData2.length > 0) {
-        tmpTableData2.forEach((item) => {
-          Object.keys(dataFormulaMapping.value).forEach((key) => {
-            const formula = dataFormulaMapping.value[key];
-            item[key] = computeFormula(item, formula);
-          });
-        });
+        computeFormula(dataFormulaMapping.value, tmpTableData2);
       }
       if ((_a2 = props.configure.pageination) == null ? void 0 : _a2.enable) {
         tableDataPageination(resultData);

package/dist/es/components/runtime/views/assemblys/container/tools/tools-runtime.vue2.js

@@ -15,11 +15,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = ref(runtimeInfo.style ? runtimeInfo.style : {});
     const runtimeClass = runtimeInfo.class;
     onMounted(() => {
-      console.log("tools-runtime.vue-onMounted");
       if (thisRef.value && thisRef.value.parentNode) {
         const resizeObserver2 = new ResizeObserver((entries) => {
-          for (let entry of entries) {
-          }
           caculatePositionStyle();
         });
         resizeObserver2.observe(thisRef.value.parentNode);

package/dist/es/components/runtime/views/assemblys/data/table/main-table-runtime.vue.js

@@ -1,22 +1,21 @@
 import { defineComponent, ref, onMounted, watch, onUnmounted, resolveComponent, openBlock, createElementBlock, createVNode, unref } from "vue";
-import "agilebuilder-ui";
 import { setTableEvents, canExecuteButton, doAfterClickEvent, getEventNameByType, doBeforeClickEvent, getHandleEvent, gridSelectRecord, gridSelectAllRecords, gridSelectionChange, cellClick, cellDblClick, rowClick, rowDblClick, headerClick } from "../../../../utils/events/event-util.js";
-import { getBaseUrl, getListCode, getRealRestApiPath, isVariableInvalidValue } from "../../../../utils/common-util.js";
+import { getBaseUrl, getListCode, getRealRestApiPath, isWorkflowPage, isVariableInvalidValue } from "../../../../utils/common-util.js";
 import { getAdditionalParamMap, getSaveFormRequestWithRow, standardEvents } from "../../../../utils/events/standard-event.js";
 import { isPromise } from "agilebuilder-ui/src/utils/common-util";
-import { getDataTypeMapRequest, popupToPage } from "../../../../utils/table-utils.js";
+import { popupToPage } from "../../../../utils/table-utils.js";
 import eventBus from "../../../../utils/eventBus.js";
 import { getPermissionCodes, getDefaultValue } from "../../../../utils/page-init-util.js";
 import { decomposeVariable, getSizeConfig } from "../../../../utils/page-helper-util.js";
 import { getRowStyleUtil, getCellStyleUtil, getHeaderCellStyleUtil } from "../../chart/table/chart-table-util.js";
-import "../../../../utils/global-refs.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "main-table-runtime",
   props: {
     pageContext: {},
     configure: {}
   },
-  setup(__props, { expose: __expose }) {
+  emits: ["setSafeDeleteTableCode"],
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const pageContext = props.pageContext;
     let configure = props.configure;
@@ -39,6 +38,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       baseURL = window["$vueApp"].config.globalProperties.baseURL;
     }
     const operationButtonObj = ref({});
+    const linkageVariable = [];
     const listOptions = ref({});
     listOptions.value = getOptions();
     const gridRef = ref();
@@ -53,7 +53,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const superGridSetting = superGridItems ? superGridItems[configure.uuid] : null;
     console.log("superGridSetting1111===", superGridItems, superGridSetting);
     const isCanShowMobileSearch = ref(false);
-    const linkageVariable = [];
+    const $emit = __emit;
     onMounted(() => {
       window.addEventListener("message", recieveMessage);
       eventBus.$on(
@@ -78,6 +78,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         gridRef.value.scanDone(data);
       });
       listOptions.value["formSetMaxHeight"] = getComponentHeight();
+      if (listOptions.value && listOptions.value.configureObj.props.base && listOptions.value.configureObj.props.base.isSafeDelete) {
+        $emit("setSafeDeleteTableCode", listOptions.value.extraParam.tableName);
+      }
     });
     watch(
       () => props.pageContext.searchFormData,
@@ -144,7 +147,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         // 是否启用回车事件
         isWithDataPermission: configure.props && configure.props.otherSettings && configure.props.otherSettings.isWithDataPermission ? configure.props.otherSettings.isWithDataPermission : false,
         pageDevMode: false,
-        isWorkflowEntity: pageContext.workflowCode ? true : false,
+        isWorkflowEntity: isWorkflowPage(pageContext),
         tableClass: runtimeClass,
         tableStyle: runtimeStyle,
         pageContext,
@@ -156,21 +159,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       };
       setOperationButtons(options);
       setSortInfo(options);
-      const getDataTypeMap = myGetDataTypeMap();
-      if (getDataTypeMap) {
-        getDataTypeMap.then(() => {
-          if (configure.props.linkages && configure.props.linkages.length > 0) {
-            configure.props.linkages.forEach((linkage) => {
-              const variablePath = decomposeVariable(linkage.fieldName);
-              if (variablePath && variablePath.length > 1) {
-                linkageVariable.push(variablePath[1]);
-              }
-            });
-            if (linkageVariable.length > 0) {
-              addLinkageWatch();
-            }
+      if (configure.props.linkages && configure.props.linkages.length > 0) {
+        configure.props.linkages.forEach((linkage) => {
+          const variablePath = decomposeVariable(linkage.fieldName);
+          if (variablePath && variablePath.length > 1) {
+            linkageVariable.push(variablePath[1]);
           }
         });
+        if (linkageVariable.length > 0) {
+          addLinkageWatch();
+        }
       }
       setTreeSetting(options);
       setGridEvents(options);
@@ -188,17 +186,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       }
     }
-    function myGetDataTypeMap(options) {
-      if (!backendUrl && !tableName) {
-        return;
-      }
-      return getDataTypeMapRequest(backendUrl, tableName, pageContext.isTest).then((result) => {
-        if (!pageContext["dataTypeMaps"]) {
-          pageContext["dataTypeMaps"] = {};
-        }
-        pageContext["dataTypeMaps"][tableName] = result["dataTypeMap"];
-      });
-    }
     function setOperationButtons(options) {
       const showOperation = configure.props && configure.props.base ? configure.props.base.showOperation : false;
       const operationButtonSettings = configure.btnList;
@@ -500,11 +487,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function searchGridData(data) {
-      if (!pageContext["dataTypeMaps"] || !pageContext["dataTypeMaps"][tableName]) {
+      if (!pageContext["dataTypeMaps"]) {
         console.log("!pageContext['dataTypeMaps'] || !pageContext['dataTypeMaps'][tableName]");
         return;
       }
-      const dataTypeObj = pageContext["dataTypeMaps"][tableName];
+      const dataTypeObj = pageContext["dataTypeMaps"];
       let toolbarFieldParam = [];
       if (data) {
         for (var key in data) {
@@ -707,7 +694,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         gridRef.value.showMobileSearch();
       }
     }
-    function canShowMobileSearch(listCode2) {
+    function canShowMobileSearchFunc(listCode2) {
       isCanShowMobileSearch.value = true;
     }
     function getRowStyle(data) {
@@ -830,7 +817,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           onHeaderClick: headerClickEvent,
           onRefresh: clearSelections,
           onNewOpenGridDialog: unref(popupToPage),
-          onCanShowMobileSearch: canShowMobileSearch
+          onCanShowMobileSearch: canShowMobileSearchFunc
         }, null, 8, ["url", "options", "code", "settings", "search-form-info", "list-toolbar-form-data", "onNewOpenGridDialog"])
       ]);
     };

package/dist/es/components/runtime/views/assemblys/data/table/sub-table-runtime.vue.js

@@ -1,6 +1,6 @@
 import { defineComponent, ref, onMounted, onUnmounted, resolveComponent, openBlock, createElementBlock, createBlock, unref, createCommentVNode } from "vue";
 import { setTableEvents, gridSelectRecord, gridSelectAllRecords, gridSelectionChange, cellClick, cellDblClick, rowClick, rowDblClick, headerClick } from "../../../../utils/events/event-util.js";
-import { getSizeConfig, getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
+import { setVariableValue, getVariableValue, getSizeConfig } from "../../../../utils/page-helper-util.js";
 import { getModelFields, getDefaultValue } from "../../../../utils/page-init-util.js";
 import eventBus from "../../../../utils/eventBus.js";
 import { popupToPage } from "../../../../utils/table-utils.js";
@@ -13,7 +13,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     pageContext: {},
     configure: {}
   },
-  setup(__props, { expose: __expose }) {
+  emits: ["setSafeDeleteTableCode"],
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const pageContext = props.pageContext;
     const configure = props.configure;
@@ -56,6 +57,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       rowStyleRender: getRowStyle,
       titleStyleRender: getTitleStyle
     });
+    const $emit = __emit;
     if (runtimeStyle) {
       listViewOptions.value["tableStyle"] = runtimeStyle;
     }
@@ -80,15 +82,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (subTableWatchProps && subTableWatchProps[tableUuid] && subTableWatchProps[tableUuid].length > 0) {
           const mainFormProps = subTableWatchProps[tableUuid];
           if (mainFormProps.indexOf(propName) >= 0) {
-            if (gridRef.value) {
-              changeInitializationSubTable();
-            }
+            reloadSubTableData();
           }
         }
       });
       eventBus.$on("_refreshSubTableHandle_" + tableUuid, (params) => {
         console.log("-_refreshSubTableHandle_--tableUuid=", tableUuid, "params=", params);
-        changeInitializationSubTable();
+        reloadSubTableData();
       });
       eventBus.$on(
         "_refreshChildData_" + tableUuid,
@@ -105,7 +105,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         console.log("superPage5555---listCode---scanDone--listCode=", listCode, "data=", data);
         gridRef.value.scanDone(data);
       });
+      if (listViewOptions.value && listViewOptions.value.configureObj.props.base && listViewOptions.value.configureObj.props.base.isSafeDelete) {
+        $emit("setSafeDeleteTableCode", listViewOptions.value.extraParam.tableName);
+      }
     });
+    function reloadSubTableData() {
+      if (gridRef.value) {
+        listViewOptions.value["subTableData"] = null;
+        gridRef.value.reloadSubTableData(listCode);
+      }
+    }
     onUnmounted(() => {
       const tableUuid = configure.uuid;
       eventBus.$off("_refreshSubTable_" + tableUuid);
@@ -497,7 +506,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, 10);
     }
     function getRowStyle(data) {
-      return getRowStyleUtil(data, null, props);
+      const style = getRowStyleUtil(data, null, props);
+      console.log("getRowStyle----style=", style);
+      return style;
     }
     function getCellStyle(data) {
       return getCellStyleUtil(data, data.cellStyle, props);

package/dist/es/components/runtime/views/assemblys/data/table/table-runtime.vue2.js

@@ -29,6 +29,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return gridRef.value.validatorSunTableListData();
       }
     }
+    function setSafeDeleteTableCode(code) {
+      if (props.pageContext.entity.data._SAFE_DELETE_TABLE_NAMES) {
+        props.pageContext.entity.data._SAFE_DELETE_TABLE_NAMES.push(code);
+      } else {
+        props.pageContext.entity.data._SAFE_DELETE_TABLE_NAMES = [code];
+      }
+    }
     function clearSelections() {
       return gridRef.value.clearSelections();
     }
@@ -81,13 +88,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref_key: "gridRef",
           ref: gridRef,
           pageContext: _ctx.pageContext,
-          configure: tableConfigure.value
+          configure: tableConfigure.value,
+          onSetSafeDeleteTableCode: setSafeDeleteTableCode
         }, null, 8, ["pageContext", "configure"])) : (openBlock(), createBlock(_sfc_main$2, {
           key: 1,
           ref_key: "gridRef",
           ref: gridRef,
           pageContext: _ctx.pageContext,
-          configure: tableConfigure.value
+          configure: tableConfigure.value,
+          onSetSafeDeleteTableCode: setSafeDeleteTableCode
         }, null, 8, ["pageContext", "configure"]))
       ]);
     };

package/dist/es/components/runtime/views/assemblys/form/checkbox/checkbox-runtime.vue2.js

@@ -16,7 +16,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const dynamicModelMethod = computed({
       get() {
         let val = getVariableValue(entity, dynamicFields);
-        if (val) {
+        if (val && typeof val === "string") {
           val = val.split(",");
         }
         return val;

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

@@ -45,8 +45,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return value;
       }
       if (formatStr) {
-        console.log("formatStr", formatStr);
-        console.log("before", value);
         try {
           const convertValue = dayjs(value);
           let value2 = null;
@@ -55,7 +53,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           } else {
             value2 = dayjs(value).format(formatStr);
           }
-          console.log("after", value2);
           return value2;
         } catch (e) {
           console.error("日期值格式化错误", e);

package/dist/es/components/runtime/views/assemblys/form/file-upload/fileupload-runtime.vue2.js

@@ -24,9 +24,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const pathFields = getFieldsByVariable(propsBase.prop);
     const nameFields = getFieldsByVariable(propsBase.propName);
     const pageCode = props.pageContext.code;
-    console.log("pathFields-----", pathFields, "pageCode=", pageCode, "propsBase.prop=", propsBase.prop);
     const componentId = ref(pathFields ? pageCode + "__" + pathFields.join("__") : null);
-    console.log("componentId-----", componentId.value);
     const initPaths = getVariableValue(entity, pathFields);
     const fileUploadRef = ref(null);
     const fileList = ref([]);

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

@@ -21,18 +21,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let dynamicFields = getFormModelFields(props.pageContext, props.configure);
     const isMobile = ref(isMobileBrowser());
     const pageCode = props.pageContext.code;
-    console.log(
-      "pathFields-----",
-      dynamicFields,
-      "pageCode=",
-      pageCode,
-      "props.configure=",
-      props.configure
-    );
     const componentId = ref(
       dynamicFields && dynamicFields.length > 0 ? pageCode + "__" + dynamicFields.join("__") : null
     );
-    console.log("componentId-----", componentId.value);
     const dynamicModelMethod = computed({
       get() {
         return getVariableValue(entity, dynamicFields);
@@ -66,11 +57,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     } else {
       userAgent = "browser";
     }
-    console.log("window.location.protocol---", window.location.protocol);
+    const isApk = isMobile.value && userAgent && userAgent === "app" ? true : false;
     const isShowScanIcon = ref(
-      isMobile.value && scanEnable.value && window.location.protocol === "https:" ? true : false
+      isApk && scanEnable.value || isMobile.value && scanEnable.value && window.location.protocol === "https:" ? true : false
     );
-    const isApk = isMobile.value && userAgent && userAgent === "app" ? true : false;
     let scanRuleSets = {};
     if (((_b = designProperty.value.scan) == null ? void 0 : _b.enable) && ((_c = designProperty.value.scan.ruleList) == null ? void 0 : _c.length) > 0) {
       setScanRuleSets();

package/dist/es/components/runtime/views/assemblys/form/select/select-runtime.vue2.js

@@ -25,7 +25,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const dynamicModelMethod = computed({
       get() {
         let val = getVariableValue(entity, dynamicFields);
-        console.log("select组件----dynamicModelMethod---get-111-val", val);
         if (val !== void 0 && val !== null) {
           val = val + "";
         }
@@ -34,7 +33,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             val = val.split(",");
           }
         }
-        console.log("select组件----dynamicModelMethod---get222--val", val);
         return val;
       },
       set(value) {
@@ -43,7 +41,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             value = value.join(",");
           }
         }
-        console.log("select组件----dynamicModelMethod---set--value", value);
         setVariableValue(entity, dynamicFields, value);
       }
     });
@@ -52,7 +49,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     if (cacheOptions.length > 0) {
       listOptions.value = cacheOptions;
     }
-    console.log("select组件----listOptions.value=", listOptions.value);
     const queryLoadingFlag = ref(false);
     const dataOrigin = props.configure.props && props.configure.props.dataOrigin ? props.configure.props.dataOrigin : {};
     const valueType = dataOrigin.optionValueSetType;
@@ -163,10 +159,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function updateOptions(newOptions) {
       listOptions.value = newOptions ? newOptions : [];
-      console.log("updateOptions", newOptions);
     }
     onMounted(() => {
-      console.log("select-----onMounted");
     });
     __expose({
       updateOptions

package/dist/es/components/runtime/views/assemblys/object-render.vue.js

@@ -14,13 +14,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     configure: {}
   },
   setup(__props) {
-    var _a;
+    var _a, _b;
     const props = __props;
     if (props.configure.style == void 0) {
       props.configure.style = {};
     }
     const permissionCodes = getPermissionCodes(props.configure, props.pageContext);
-    console.log("Object-Render---permissionCodes=", permissionCodes);
     if (props.configure && props.configure.props && props.configure.props.base) {
       props.configure.props.base.functionCode = permissionCodes;
     }
@@ -51,13 +50,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }
           }
         }
-        console.log("obj-render-dynamicShowFlag", dynamicShowFlag);
         return dynamicShowFlag;
       });
       const propConfigure = props.configure;
       propConfigure._dynamicShowFlag = showFlag;
-      if (props.configure.props.editConditions) {
-        const editConditions = props.configure.props.editConditions;
+      if ((_b = props.configure.props.base) == null ? void 0 : _b.editConditions) {
+        const editConditions = props.configure.props.base.editConditions;
         if (editConditions.length > 0) {
           const runtime = props.configure.runtime ? props.configure.runtime : {};
           const property = runtime.props ? runtime.props : {};

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

@@ -3,7 +3,7 @@ import _sfc_main$1 from "./assemblys/object-render.vue.js";
 import { updateOptionDatasources, updateChartDatasources } from "../utils/page-helper-util.js";
 import { queryPageSuperGrids, queryPageDesignByCode, convertToPageContext, packageAdditionalMapWithRoute } from "../utils/page-init-util.js";
 import { addComponentRef, removePageAllRef, initComponentRefState } from "../utils/global-refs.js";
-import { removeCustomFuncFromWindow, handleEvent, initPageEvents } from "../utils/events/event-util.js";
+import { removeCustomFuncFromWindow, handleEvent, initPageEvents, getCustomFunc } from "../utils/events/event-util.js";
 import _sfc_main$2 from "./assemblys/common/export-form-report-dialog.vue.js";
 import _sfc_main$3 from "./assemblys/common/task-informition-dialog.vue.js";
 import _sfc_main$4 from "./assemblys/common/remove-signer-dialog.vue.js";
@@ -17,10 +17,11 @@ import { i18nValidateRulesMessage } from "../utils/events/validator-util.js";
 import _sfc_main$5 from "./super-page-dialog.vue.js";
 import { useRoute, useRouter } from "vue-router";
 import { jumpToPage } from "agilebuilder-ui/src/utils/jump-page-utils";
-import { setSessionCache } from "agilebuilder-ui/src/utils/auth";
+import { setSessionCache, getUsername } from "agilebuilder-ui/src/utils/auth";
 import { deepCopy, isNumber, refreshMobileDialogType } from "../utils/common-util.js";
 import { isMobileBrowser } from "agilebuilder-ui/src/utils/common-util";
 import { usePageContextStore } from "../utils/page-store.js";
+import imatrixUiStore from "agilebuilder-ui/src/store";
 const _hoisted_1 = { class: "app-container" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "super-page",
@@ -236,7 +237,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       pageContext2.initChartData = {};
       pageContext2.initChartData.data = deepCopy(pageContext2.entity.data);
       pageContext2.initChartData.page = deepCopy(pageContext2.entity.page);
-      console.log("pageContext.chartConfigs:", chartConfigs);
       if (chartConfigs && chartConfigs.length > 0) {
         updateChartDatasources(pageContext2, chartConfigs, null, true);
       }
@@ -271,8 +271,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         setTimeout(() => {
           initPageDesign(props.pageDesign).then(() => {
             if (props.pageDesign.tableRuntimes && Object.keys(props.pageDesign.tableRuntimes).length > 0) {
-              queryPageSuperGrids(props.pageDesign, pageContext.value, props.publishVersion).then((superGridItems) => {
-                pageContext.value.superGridItems = superGridItems;
+              queryPageSuperGrids(props.pageDesign, pageContext.value, props.publishVersion).then((result) => {
+                pageContext.value.isWorkflowEntity = result.isWorkflowEntity;
+                pageContext.value.dataTypeMaps = result.dataTypeMaps;
+                pageContext.value.superGridItems = result.superGrids;
               }).catch((error) => {
                 console.log("queryPageSuperGrids error", error);
               }).finally(() => {
@@ -443,6 +445,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     }
+    function getCurrentUserPermissionsWhenPopPageDiff(popPageSetting, jumpMode) {
+      const loginName = getUsername();
+      return new Promise((resolve, reject) => {
+        if (loginName) {
+          debugger;
+          if ((jumpMode === "popup" || isMobile) && parentPageContext.value.systemCode !== popPageSetting.customSystem) {
+            const systemCode = popPageSetting.customSystem;
+            imatrixUiStore.dispatch("getCurrentUserPermissions", { loginName, systemCode }).then(() => {
+              resolve(true);
+            }).catch(() => {
+              console.log("获得用户权限失败");
+              resolve(true);
+            });
+          } else {
+            resolve(true);
+          }
+        } else {
+          resolve(true);
+        }
+      });
+    }
     const router = useRouter();
     function openDialog(configureObj, eventParams, myJumpPageSetting) {
       getPopPageSetting(configureObj, eventParams, myJumpPageSetting).then((openPageParams) => {
@@ -469,31 +492,32 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           popPageSetting.isNewPage = true;
           if (jumpMode === "popup" || jumpMode === "refresh") {
             const linkType = popPageSetting.linkType;
-            if (isMobile && (parentPageContext.value.systemCode !== popPageSetting.customSystem || linkType && linkType === "url")) {
-              popPageSetting._isIframe = true;
-              if (jumpMode === "refresh") {
-                popPageSetting.dialogType = "drawer";
-                popPageSetting.jumpPageWidth = "100%";
-              }
-              jumpPageSetting.value = popPageSetting;
-              isShowDialog.value = true;
-            } else {
-              popPageSetting._isIframe = false;
-              if (jumpMode === "popup" || isMobile && jumpMode === "refresh") {
+            getCurrentUserPermissionsWhenPopPageDiff(popPageSetting, jumpMode).then(() => {
+              if (isMobile && (parentPageContext.value.systemCode !== popPageSetting.customSystem || linkType && linkType === "url")) {
+                popPageSetting._isIframe = true;
                 if (jumpMode === "refresh") {
                   popPageSetting.dialogType = "drawer";
                   popPageSetting.jumpPageWidth = "100%";
                 }
-                debugger;
                 jumpPageSetting.value = popPageSetting;
                 isShowDialog.value = true;
-              } else if (jumpMode === "refresh") {
-                router.push({
-                  path: "/dsc/page",
-                  query: popPageSetting
-                });
+              } else {
+                popPageSetting._isIframe = false;
+                if (jumpMode === "popup" || isMobile && jumpMode === "refresh") {
+                  if (jumpMode === "refresh") {
+                    popPageSetting.dialogType = "drawer";
+                    popPageSetting.jumpPageWidth = "100%";
+                  }
+                  jumpPageSetting.value = popPageSetting;
+                  isShowDialog.value = true;
+                } else if (jumpMode === "refresh") {
+                  router.push({
+                    path: "/dsc/page",
+                    query: popPageSetting
+                  });
+                }
               }
-            }
+            });
             eventBus.$on(eventPageInfo.value + "close-dialog", (params) => {
               closeFunc(params);
             });
@@ -504,6 +528,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     }
     function closeFunc(params) {
+      debugger;
       const jumpMode = params.jumpMode;
       if (jumpMode && jumpMode === "popup" || isMobile && jumpMode === "refresh") {
         closeDialog(params);
@@ -512,6 +537,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function closeDialog(params) {
+      debugger;
+      const closeEventName = jumpPageSetting.value.closeEvent;
+      const isRefreshWhenClosePopup = jumpPageSetting.value.isRefreshWhenClosePopup;
       let dataModel;
       let sourceTableName;
       if (params) {
@@ -528,20 +556,54 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
       const targetTableName = parentPageContext.value.tableName;
-      handleEvent(null, parentPageContext.value, parentConfigureObj.value, "closePopup", {
+      let currentParentConfigureObj;
+      const columnProp = parentEventParams.value.columnProp ? parentEventParams.value.columnProp : null;
+      if (columnProp) {
+        const columnConfigures = parentConfigureObj.value.items.filter(
+          (column) => {
+            var _a, _b, _c, _d;
+            return ((_b = (_a = column.props) == null ? void 0 : _a.base) == null ? void 0 : _b.prop) && ((_d = (_c = column.props) == null ? void 0 : _c.base) == null ? void 0 : _d.prop) === columnProp;
+          }
+        );
+        currentParentConfigureObj = columnConfigures && columnConfigures.length > 0 ? columnConfigures[0] : null;
+      } else {
+        currentParentConfigureObj = parentConfigureObj.value;
+      }
+      handleEvent(null, parentPageContext.value, currentParentConfigureObj, "closePopup", {
         sourceModel: dataModel,
         sourceTableName,
         jumpPageSetting,
         entity: parentPageContext.value.entity.data,
-        targetTableName
+        targetTableName,
+        pageContext: pageContext.value,
+        parentPageContext: parentPageContext.value,
+        parentConfigureObj: currentParentConfigureObj,
+        columnProp
       });
-      refreshFormOrListPage(parentPageContext.value, parentConfigureObj.value);
+      handleCloseDialogEvent(closeEventName, columnProp, currentParentConfigureObj);
+      refreshFormOrListPage(parentPageContext.value, parentConfigureObj.value, isRefreshWhenClosePopup);
       parentPageContext.value = null;
       parentConfigureObj.value = null;
       parentEventParams.value = null;
       eventBus.$off(eventPageInfo.value + "close-dialog");
       isShowDialog.value = false;
     }
+    function handleCloseDialogEvent(closeEventName, columnProp, currentParentConfigureObj) {
+      if (closeEventName) {
+        const func = getCustomFunc(parentPageContext.value, closeEventName);
+        if (func) {
+          func.apply(func, [
+            {
+              pageContext: pageContext.value,
+              parentPageContext: parentPageContext.value,
+              parentConfigureObj: currentParentConfigureObj,
+              jumpPageSetting,
+              columnProp
+            }
+          ]);
+        }
+      }
+    }
     function pickFileDone(data) {
       let componentId = data.componentId;
       let listCode = data.listCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.1.54",
+  "version": "2.1.57",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -48,7 +48,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/test-utils": "^2.4.4",
-    "agilebuilder-ui": "1.0.87",
+    "agilebuilder-ui": "1.0.89",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",