super-page-runtime 2.0.53 → 2.0.57

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

@@ -12,6 +12,7 @@ import { refreshPage } from "../api/api-util.js";
 import { getPermissionCodes, getModelFields } from "../page-init-util.js";
 import { updateChartDatasources, getVariableValue, setVariableValue } from "../page-helper-util.js";
 import printLabelUtil from "./print-label.js";
+import { getTableNameByTableUuid } from "../table-utils.js";
 const standardEvents = {
   // 表单标准事件保存save
   save: function(params) {
@@ -750,10 +751,11 @@ function deleteFunc(params) {
     ).then(() => {
       const pageContext = params.pageContext;
       const configureObj = params.configureObj;
-      const tableName = pageContext.tableName;
       const configureBase = configureObj.props.base;
       const systemCode = pageContext.systemCode;
       const backendUrl = pageContext.backendUrl;
+      let tableUuid = configureObj.props.base.tableUuid;
+      const tableName = getTableNameByTableUuid(pageContext, tableUuid);
       const baseUrl = getBaseUrl(backendUrl, pageContext.isTest);
       let path = baseUrl + "/dsc/commons/" + tableName;
       path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
@@ -792,7 +794,6 @@ function deleteFunc(params) {
       http.delete(path, {
         data: param
       }).then((data) => {
-        const tableUuid = configureObj.props.base.tableUuid;
         const gridRef = getComponentRef(pageContext, tableUuid);
         if (gridRef) {
           gridRef.isDeleteChange(true);

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

@@ -74,10 +74,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) {
@@ -103,7 +118,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"] = "";
@@ -121,6 +136,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,
@@ -133,11 +153,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);
         }
       }
     }
@@ -185,7 +205,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;
@@ -249,7 +269,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

@@ -77,7 +77,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

@@ -119,7 +119,8 @@ function getRequestObject(pageRequest) {
       }
     }
   }
-  if (requestObj["_t_"]) ;
+  if (requestObj["_t_"])
+    ;
   return requestObj;
 }
 function getModelFields(pageContext, formItemConfigure, prop) {

package/dist/es/components/runtime/utils/table-utils.d.ts

@@ -0,0 +1,3 @@
+export declare function getDataTypeMapRequest(backendUrl: any, tableName: any, isTest?: boolean): any;
+export declare function popupToPage(params: any): void;
+export declare function getTableNameByTableUuid(pageContext: any, tableUuid: any): any;

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

@@ -10,7 +10,19 @@ function popupToPage(params) {
   console.log("弹框显示页面--popupToPage====params=", params);
   eventBus.$emit(pageCode + "_open-dialog", params);
 }
+function getTableNameByTableUuid(pageContext, tableUuid) {
+  let tableName = pageContext.tableName;
+  if (!tableUuid && tableName) {
+    return tableName;
+  }
+  let tableConfigure;
+  if (pageContext.tableRuntimes && tableUuid && pageContext.tableRuntimes[tableUuid]) {
+    tableConfigure = JSON.parse(pageContext.tableRuntimes[tableUuid].configure);
+  }
+  return tableConfigure && tableConfigure.props && tableConfigure.props.dataOrigin ? tableConfigure.props.dataOrigin.tableName : null;
+}
 export {
   getDataTypeMapRequest,
+  getTableNameByTableUuid,
   popupToPage
 };

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

@@ -334,7 +334,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;

package/package.json

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