super-page-runtime 2.1.77 → 2.1.80

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

@@ -104,7 +104,7 @@ export declare function executeChartFormula(formulaStr: string, accumulateMap: a
  * @param chartDom
  * @returns
  */
-export declare function exportCommonChart(chartDom: any): {
+export declare function exportCommonChart(chartRef: any): {
     isTable: boolean;
     fileContent: any;
     fileSize: string;

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

@@ -495,11 +495,19 @@ function executeChartFormula(formulaStr, accumulateMap, rowData, pageContext) {
     row: rowData
   });
 }
-function exportCommonChart(chartDom) {
-  const fileSize = chartDom.getAttribute("width") + ":" + chartDom.getAttribute("height");
+function exportCommonChart(chartRef) {
+  if (!chartRef || !chartRef.$el) {
+    return;
+  }
+  const canvasDoms = chartRef.$el.getElementsByTagName("canvas");
+  if (!canvasDoms || canvasDoms.length === 0) {
+    return;
+  }
+  const canvasDom = canvasDoms[0];
+  const fileSize = canvasDom.width + ":" + canvasDom.height;
   return {
     isTable: false,
-    fileContent: chartDom.getAttribute("base64Url"),
+    fileContent: canvasDom.toDataURL(),
     fileSize
   };
 }

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

@@ -4,7 +4,7 @@ import { validateDataModelFunc } from "./validator-util.js";
 import { getComponentRef, getComponentRefByCode } from "../global-refs.js";
 import { ElMessage } from "element-plus";
 import { analysisCondition } from "agilebuilder-ui/src/utils/util";
-import { getListCode } from "../common-util.js";
+import { getListCode, deepCopy } from "../common-util.js";
 import eventBus from "../eventBus.js";
 import { getValueFromSource } from "../page-helper-util.js";
 import { expressJump } from "../table-utils.js";
@@ -378,6 +378,7 @@ function doAfterClickFunc(pageContext, configure, eventParams, isStandardEvent,
   }
 }
 function doClickEvent(pageContext, configure, clickEventFunObj, eventParams) {
+  let configureObj = configure;
   let linkPage = configure.props.linkPage;
   if (linkPage && linkPage instanceof Array) {
     const row = getRowData(eventParams);
@@ -388,11 +389,15 @@ function doClickEvent(pageContext, configure, clickEventFunObj, eventParams) {
       show = result.show;
       toLinkPage = show ? result.toPage : null;
     }
-    linkPage = toLinkPage;
+    linkPage = toLinkPage ? toLinkPage.linkPage : null;
+    if (linkPage) {
+      configureObj = deepCopy(configure);
+      configureObj.props.linkPage = linkPage;
+    }
   }
   if (linkPage && linkPage.jumpPageUrl) {
     pageContext.canClick = true;
-    doClickJumpPageEvent(pageContext, configure, eventParams);
+    doClickJumpPageEvent(pageContext, configureObj, eventParams);
   } else {
     doClickCustomEvent(pageContext, configure, clickEventFunObj, eventParams);
   }

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

@@ -2233,8 +2233,7 @@ function formatAdditionalParamMapIds(ids2) {
       ids2 = ids2.split(",");
     } else if (typeof ids2 === "number") {
       ids2 = [ids2];
-    } else
-      ;
+    } else ;
   }
   return ids2;
 }

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

@@ -18,7 +18,7 @@ export declare function disabledAllFields(pageContext: PageContext): void;
 export declare function dynamicControlTableEdit(pageContext: PageContext, customRules: any[], tableCode?: any): void;
 export declare function updateComponentDisplayState(ref: any, item: any): void;
 /**
- * 布尔型校验需要自定义，为了兼容oracle和mysql数据库
+ * 布尔型和日期校验需要自定义，为了兼容oracle和mysql数据库
  * @param fieldRule
  */
-export declare function packageBooleanRule(fieldRule: any): void;
+export declare function packageCustomValidator(fieldRule: any): void;

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

@@ -76,25 +76,10 @@ function getEndObjectRule(rule, props, currentProp) {
 }
 function getValidator(columns) {
   const rules = {};
-  if (columns) {
-    columns.forEach((editField) => {
-      const prop = editField.model;
-      if (prop && editField.validations) {
-        const validations = editField.validations;
-        if (prop.indexOf(".") > 0) {
-          setObjectPropRule(editField.prop, rules, validations);
-        } else {
-          if (validations && validations.length > 0) {
-            rules[prop] = [...validations];
-          }
-        }
-      }
-    });
-  }
   return rules;
 }
 function validator(entity, rules, columns, rowIndex, isSql) {
-  return validatorEntity(entity, rules, columns, rowIndex, true, isSql);
+  return validatorEntity(entity, rules, columns, rowIndex, true);
 }
 function sublistVerify(rules) {
   if (!rules) {
@@ -120,7 +105,7 @@ function sublistVerify(rules) {
 function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdate, isSql) {
   let validateRules = sublistVerify(rules);
   if ((!rules || rules === null) && columns) {
-    validateRules = getValidator(columns);
+    validateRules = getValidator();
   }
   if (!validateRules || Object.keys(validateRules).length === 0) {
     entity["validateErrorField"] = "";
@@ -138,11 +123,6 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       if (errors) {
         result = errors[0].message;
         fieldName = errors[0]["field"];
-        if (typeof rowIndex !== "undefined" && rowIndex !== null) {
-          result = getI18n().t("superPageRuntimeMessage.recordLine", {
-            row: rowIndex + 1
-          }) + "，" + result;
-        }
         ElMessage({
           message: result,
           showClose: true,
@@ -155,11 +135,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       }
       if (fieldName && isShouldRepeateValdate === true) {
         const reg1 = /[A-Z]+/;
-        if (isSql !== void 0 && isSql === true && reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
+        if (reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
           const copyEntity = JSON.parse(JSON.stringify(entity));
           copyEntity[fieldName.toUpperCase()] = entity[fieldName.toLowerCase()];
           delete copyEntity[fieldName.toLowerCase()];
-          result = validatorEntity(copyEntity, rules, columns, rowIndex, false, isSql);
+          result = validatorEntity(copyEntity, rules, columns, rowIndex, false);
         }
       }
     }
@@ -272,7 +252,7 @@ function validateCommon(dataModel, pageContext, rules) {
     if (!rules || Object.keys(rules).length === 0) {
       resolve(true);
     } else {
-      const validateEntityResult = validator(handleModels, rules, null, null, true);
+      const validateEntityResult = validator(handleModels, rules, null, null);
       if (validateEntityResult === true) {
         const validateResult = validateSubTables(pageContext);
         if (validateResult === true) {
@@ -346,7 +326,7 @@ function packageCustomRules(orgCustomRules, orgRules) {
         }
       });
     } else {
-      packageBooleanRule(customRules[key]);
+      packageCustomValidator(customRules[key]);
       orgRules[key] = customRules[key];
     }
   });
@@ -548,8 +528,8 @@ function updateComponentDisplayState(ref, item) {
     }
   }
 }
-function packageBooleanRule(fieldRule) {
-  if (fieldRule.type && fieldRule.type === "boolean") {
+function packageCustomValidator(fieldRule) {
+  if (fieldRule && fieldRule.type && fieldRule.type === "boolean") {
     fieldRule.validator = function(rule, value, callback) {
       if (value === void 0 || value === null) {
         if (rule.required) {
@@ -564,6 +544,19 @@ function packageBooleanRule(fieldRule) {
       }
       return false;
     };
+  } else if (fieldRule && fieldRule.type && fieldRule.type === "date") {
+    fieldRule.validator = function(rule, value, callback) {
+      if (value === void 0 || value === null) {
+        if (rule.required) {
+          return false;
+        } else {
+          return true;
+        }
+      } else {
+        const date = new Date(value);
+        return !isNaN(date.getTime());
+      }
+    };
   }
 }
 export {
@@ -572,8 +565,8 @@ export {
   getWorkflowRules,
   i18nValidatePropRulesMessage,
   i18nValidateRulesMessage,
-  packageBooleanRule,
   packageCustomRules,
+  packageCustomValidator,
   setObjectPropRule,
   updateComponentDisplayState,
   updateFormItemEditState,

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

@@ -3,6 +3,7 @@ import dayjs from "dayjs";
 import { executeExpression } from "agilebuilder-ui/src/utils/calculator/calculator-util";
 import { getComponentRef } from "./global-refs.js";
 import { watch } from "vue";
+import { deepCopy } from "./common-util.js";
 function getComponentOptionConfigs(component, pageContext2) {
   if (!component.props || !component.props.dataOrigin) {
     return;
@@ -80,8 +81,7 @@ function getTableQueryInfo(dataOriginInfo, pageContext2) {
           }
         }
       }
-      if (f.propValue)
-        ;
+      if (f.propValue) ;
       searchForm.push(tempObj);
     }
     infoObj.props.searchForm = searchForm;
@@ -136,6 +136,24 @@ function updateChartDatasources(pageContext2, dataSourceConfs, appendParams, isI
       reject(new Error("无需查询的统计图配置!"));
       return;
     }
+    const dataSourceConfsCopy = deepCopy(dataSourceConfs);
+    dataSourceConfsCopy.forEach((item) => {
+      var _a;
+      const configureUuid = item.uuid;
+      const componentRef = getComponentRef(pageContext2, configureUuid);
+      if (componentRef) {
+        const configure = componentRef.getConfigure();
+        const serviceInputs = (_a = configure == null ? void 0 : configure.props.dataOrigin) == null ? void 0 : _a.serviceInputs;
+        if (serviceInputs) {
+          serviceInputs.forEach((inParam) => {
+            const paramName = inParam.name;
+            const paramValue = inParam.value;
+            item.serviceInParams = {};
+            item.serviceInParams[paramName] = getValueFromVariable(pageContext2.entity, paramValue);
+          });
+        }
+      }
+    });
     const entityData2 = pageContext2.entity ? pageContext2.entity : {};
     const additionalParamMap = {};
     if (entityData2.request) {
@@ -155,7 +173,7 @@ function updateChartDatasources(pageContext2, dataSourceConfs, appendParams, isI
       entityMap: entityData2.data,
       additionalParamMap,
       taskMap,
-      dataSourceList: dataSourceConfs,
+      dataSourceList: dataSourceConfsCopy,
       systemCode: pageContext2.systemCode,
       pageCode: pageContext2.code
     };

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

@@ -5,7 +5,7 @@ import { setVariableValue, formatVariableValue, getFormPropName } from "./page-h
 import { getSessionCache } from "agilebuilder-ui/src/utils/auth";
 import { functions } from "./api/page-expose-util.js";
 import { isWorkflowPage, deepCopy } from "./common-util.js";
-import { packageBooleanRule } from "./events/validator-util.js";
+import { packageCustomValidator } from "./events/validator-util.js";
 function queryPageDesignByCode(pageCode) {
   return http.get(
     window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + pageCode
@@ -145,8 +145,7 @@ function getRequestObject(pageRequest) {
       requestObj[paramStrs[0]] = paramStrs.length > 1 ? paramStrs[1] : "";
     }
   }
-  if (requestObj["_t_"])
-    ;
+  if (requestObj["_t_"]) ;
   return requestObj;
 }
 function packageAdditionalMapWithRoute(route, requestObj) {
@@ -319,7 +318,7 @@ function packageFormRules(pageContext, configure) {
         pageContext.rules[propName] = [];
       }
       configure.props.rules.forEach((fieldRule) => {
-        packageBooleanRule(fieldRule);
+        packageCustomValidator(fieldRule);
       });
       pageContext.rules[propName] = configure.props.rules;
     }

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

@@ -75,5 +75,5 @@ export declare function getIndexColumn(): {
         tittleClass: string;
     };
 };
-export declare function computeFormula(itemConfs: any, datas: any): void;
+export declare function computeFormula(itemConfs: any, datas: any, entity: any): void;
 export {};

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

@@ -478,7 +478,7 @@ function getIndexColumn() {
     }
   };
 }
-function computeFormula(itemConfs, datas) {
+function computeFormula(itemConfs, datas, entity) {
   Object.keys(itemConfs).forEach((key) => {
     const paramNames = getParamNames(itemConfs[key]);
     datas.forEach((data, index) => {
@@ -505,8 +505,8 @@ function computeFormula(itemConfs, datas) {
             currentRowValue = 0;
           }
           totalValueMap[paramName] = currentRowValue;
-        } else if (paramName.startsWith("${row.")) {
-          totalValueMap[paramName] = data[getFieldName(paramName)];
+        } else if (paramName.startsWith("${page.") || paramName.startsWith("${data.") || paramName.startsWith("${row.") || paramName.startsWith("${request.") || paramName.startsWith("${context.") || paramName.startsWith("${system.") || paramName.startsWith("${fixed.")) {
+          totalValueMap[paramName] = getValueFromVariable(entity, paramName, data);
         }
       }
       let expr = itemConfs[key];

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

@@ -5,6 +5,8 @@ import "agilebuilder-ui/src/utils/request";
 import "dayjs";
 import "agilebuilder-ui/src/utils/calculator/calculator-util";
 import "../../../../utils/global-refs.js";
+import "agilebuilder-ui/src/utils/common-util";
+import "agilebuilder-ui/src/utils/util";
 import { expressJump } from "../../../../utils/table-utils.js";
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { key: 1 };

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

@@ -181,7 +181,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
       if (Object.keys(dataFormulaMapping.value).length > 0 && tmpTableData2 && tmpTableData2.length > 0) {
-        computeFormula(dataFormulaMapping.value, tmpTableData2);
+        computeFormula(dataFormulaMapping.value, tmpTableData2, props.pageContext.entity);
       }
       if ((_a2 = props.configure.pageination) == null ? void 0 : _a2.enable) {
         tableDataPageination(resultData);
@@ -248,8 +248,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         }
       } else {
-        if (highOrder && highOrder.mergeColumn)
-          ;
+        if (highOrder && highOrder.mergeColumn) ;
         if (highOrder && highOrder.mergeRow && highOrder.mergeRow.includes(property)) {
           if (rowIndex === 0) {
             return {

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

@@ -4,6 +4,8 @@ import "agilebuilder-ui/src/utils/request";
 import "dayjs";
 import "agilebuilder-ui/src/utils/calculator/calculator-util";
 import "../../../../utils/global-refs.js";
+import "agilebuilder-ui/src/utils/common-util";
+import "agilebuilder-ui/src/utils/util";
 import _sfc_main$1 from "./sub-table-runtime.vue.js";
 import _sfc_main$2 from "./main-table-runtime.vue.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({

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

@@ -71,8 +71,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       menuTree.value.filter(val);
     });
     const filterNode = (value, data) => {
-      if (!value)
-        return true;
+      if (!value) return true;
       return data.name.includes(value);
     };
     function handleNodeClick(data, node, nodeTree) {

package/dist/es/components/runtime/views/assemblys/form/dept-tree/depttree-runtime.vue2.js

@@ -7,6 +7,8 @@ import "agilebuilder-ui/src/utils/request";
 import "dayjs";
 import "agilebuilder-ui/src/utils/calculator/calculator-util";
 import "../../../../utils/global-refs.js";
+import "agilebuilder-ui/src/utils/common-util";
+import "agilebuilder-ui/src/utils/util";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "depttree-runtime",
   props: {

package/dist/es/components/runtime/views/assemblys/form/placeholder/placeholder-runtime.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./placeholder-runtime.vue2.js";
-import "./placeholder-runtime.vue3.js";
+/* empty css                         */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const placeholderRuntime = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-96fc65d8"]]);
 export {

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

@@ -361,8 +361,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (!_selectFile_.value) {
           return;
         }
-        if (_selectFile_.value.value === "" || _selectFile_.value.value === null)
-          return;
+        if (_selectFile_.value.value === "" || _selectFile_.value.value === null) return;
         const fileObj = _selectFile_.value.files[0];
         if (fileObj) {
           _selectFile_.value.value = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.1.77",
+  "version": "2.1.80",
   "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.93",
+    "agilebuilder-ui": "1.0.94",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",

package/dist/es/components/runtime/views/assemblys/form/placeholder/placeholder-runtime.vue3.js

@@ -1 +0,0 @@
-