super-page-runtime 2.1.22 → 2.1.23

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

@@ -68,7 +68,7 @@ function getCommonFormData(pageContext, id) {
       param["taskId"] = taskId;
     }
     console.log("getCommonFormData---listCodesMap=", pageContext.listCodesMap);
-    if (!pageContext.listCodesMap && pageContext.tableUuids) {
+    if ((!pageContext.listCodesMap || Object.keys(pageContext.listCodesMap).length === 0) && pageContext.tableUuids) {
       const listCodesMap = {};
       pageContext.tableUuids.forEach((tableUuid) => {
         const listCode = getListCode(pageCode, pageVersion, tableUuid);
@@ -292,7 +292,8 @@ function formatAdditionalParamMapIds(ids) {
       ids = ids.split(",");
     } else if (typeof ids === "number") {
       ids = [ids];
-    } else ;
+    } else
+      ;
   }
   return ids;
 }

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

@@ -4,6 +4,7 @@ import eventBus from "../eventBus.js";
 import http from "agilebuilder-ui/src/utils/request";
 import { getAdditionalParamMap } from "../events/standard-event.js";
 import { i18nValidatePropRulesMessage } from "../events/validator-util.js";
+import { getBaseUrl } from "../common-util.js";
 const functions = {
   /**
    * 展示页面中的某个组件元素
@@ -266,6 +267,18 @@ const functions = {
     } else {
       console.error("tableUUid is undefined");
     }
+  },
+  // 根据key获得serverConfig中配置的信息
+  getServerConfigValue(key) {
+    return window["$vueApp"].config.globalProperties[key];
+  },
+  // 获得当前系统的后端访问路径
+  getBackendUrl(pageContext) {
+    return getBaseUrl(pageContext.backendUrl, false);
+  },
+  // 获得平台后端访问路径
+  getPlateBackendUrl() {
+    return window["$vueApp"].config.globalProperties.baseAPI;
   }
 };
 function packageAllFeildsRules(pageContext, item) {

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

@@ -75,10 +75,25 @@ 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);
+  return validatorEntity(entity, rules, columns, rowIndex, true, isSql);
 }
 function sublistVerify(rules) {
   if (!rules) {
@@ -104,7 +119,7 @@ function sublistVerify(rules) {
 function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdate, isSql) {
   let validateRules = sublistVerify(rules);
   if ((!rules || rules === null) && columns) {
-    validateRules = getValidator();
+    validateRules = getValidator(columns);
   }
   if (!validateRules || Object.keys(validateRules).length === 0) {
     entity["validateErrorField"] = "";
@@ -122,6 +137,11 @@ 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,
@@ -134,11 +154,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       }
       if (fieldName && isShouldRepeateValdate === true) {
         const reg1 = /[A-Z]+/;
-        if (reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
+        if (isSql !== void 0 && isSql === true && 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);
+          result = validatorEntity(copyEntity, rules, columns, rowIndex, false, isSql);
         }
       }
     }
@@ -186,7 +206,7 @@ function validateWorkflowFormDataModel(dataModel, pageContext) {
     if (!rules || Object.keys(rules).length === 0) {
       result = true;
     } else {
-      result = validator(handleModels, rules, null, null);
+      result = validator(handleModels, rules, null, null, true);
     }
     if (result === true) {
       const workflowFieldPermissionRules = pageContext.workflowRules;
@@ -250,7 +270,7 @@ function validateCommonFormDataModel(dataModel, pageContext, rules) {
     if (!rules || Object.keys(rules).length === 0) {
       resolve(handleModels);
     } else {
-      const validateEntityResult = validator(handleModels, rules, null, null);
+      const validateEntityResult = validator(handleModels, rules, null, null, true);
       if (validateEntityResult === true) {
         const validateResult = validateSubTables(pageContext);
         if (validateResult === true) {

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

@@ -80,7 +80,8 @@ function getTableQueryInfo(dataOriginInfo, pageContext2) {
           }
         }
       }
-      if (f.propValue) ;
+      if (f.propValue)
+        ;
       searchForm.push(tempObj);
     }
     infoObj.props.searchForm = searchForm;

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

@@ -138,7 +138,8 @@ function getRequestObject(pageRequest) {
       requestObj[paramStrs[0]] = paramStrs.length > 1 ? paramStrs[1] : "";
     }
   }
-  if (requestObj["_t_"]) ;
+  if (requestObj["_t_"])
+    ;
   return requestObj;
 }
 function packageAdditionalMapWithRoute(route, requestObj) {

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";
-/* empty css                         */
+import "./placeholder-runtime.vue3.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const placeholderRuntime = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a0860ff0"]]);
 export {

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

@@ -0,0 +1 @@
+

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

@@ -349,7 +349,8 @@ 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;
@@ -397,14 +398,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             const additionalParamMap = getAdditionalParamMap(pageContext);
             let dataId = eventParams ? eventParams.id : null;
             let ids = eventParams ? eventParams.ids : null;
-            const dataModel = pageContext.value.entity.data;
-            const pageModel = pageContext.value.entity.page;
+            let selections = eventParams ? eventParams.selections : [];
+            console.log("getPopPageSetting---selections=", selections, "parentPageContext.value=", parentPageContext.value);
             let entity = {};
-            if (pageModel) {
-              Object.assign(entity, pageModel);
-            }
-            if (dataModel) {
-              Object.assign(entity, dataModel);
+            if (selections && selections.length > 0) {
+              entity = selections[0];
+            } else {
+              const dataModel = parentPageContext.value.entity.data;
+              const pageModel = parentPageContext.value.entity.page;
+              if (pageModel) {
+                Object.assign(entity, pageModel);
+              }
+              if (dataModel) {
+                Object.assign(entity, dataModel);
+              }
             }
             jumpToPage(myJumpPageSetting, null, dataId, entity, additionalParamMap, ids).then(
               (openPageParams) => {

package/package.json

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