workflow-editor 0.0.65-up → 0.0.66-up-rc1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "workflow-editor",
   "private": false,
-  "version": "0.0.65-up",
+  "version": "0.0.66-up-rc1",
   "type": "module",
   "main": "./lib/workflow-editor.js",
   "scripts": {
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.2.3",
-    "agilebuilder-ui": "1.1.39-sit1",
+    "agilebuilder-ui": "1.1.47",
     "axios": "^1.5.1",
     "element-plus": "^2.4.1",
     "font-awesome": "^4.7.0",

package/packages/plugins/formValidatorUtil.js

@@ -357,8 +357,8 @@ function setSubObjectFieldRule(editField, subRules, entity, isSql, dataTypeMap)
   }
 }
 
-function validator(entity, validateRules, rowIndex, isSql, pageNum, pageRowIndex) {
-  return validatorEntity(entity, validateRules, rowIndex, true, isSql, pageNum, pageRowIndex)
+function validator(entity, validateRules, rowIndex, isSql, pageNum, pageRowIndex, isNeedField) {
+  return validatorEntity(entity, validateRules, rowIndex, true, isSql, pageNum, pageRowIndex, isNeedField)
 }
 /**
  *
@@ -368,17 +368,16 @@ function validator(entity, validateRules, rowIndex, isSql, pageNum, pageRowIndex
  * @param {*} isShouldRepeateValdate 是否需要再次验证大写字段名
  * @returns
  */
-function validatorEntity(entity, validateRules, rowIndex, isShouldRepeateValdate, isSql, pageNum, pageRowIndex) {
+function validatorEntity(entity, validateRules, rowIndex, isShouldRepeateValdate, isSql, pageNum, pageRowIndex, isNeedField) {
   let result = false
   const validator = new Validator(validateRules)
-
+  let fieldName
   validator.validate(
     entity,
     {
       first: true
     },
     (errors, fields) => {
-      let fieldName
       if (errors) {
         const message = errors[0]['message']
         fieldName = errors[0]['field']
@@ -425,8 +424,18 @@ function validatorEntity(entity, validateRules, rowIndex, isShouldRepeateValdate
       }
     }
   )
-
-  return result
+  if(isNeedField){
+    let myResult = {msg: result, field: fieldName}
+    if(pageNum !== undefined && pageRowIndex !== undefined){
+      myResult.pageNum = pageNum
+      myResult.rowIndex = pageRowIndex
+    } else {
+      myResult.rowIndex = rowIndex
+    }
+    return myResult
+  } else {
+    return result
+  }
 }
 
 /**
@@ -444,7 +453,8 @@ function validateSub(
   additionalParamMap,
   taskParamMap,
   contextParameter,
-  subTablePageInfo
+  subTablePageInfo,
+  isNeedField
 ) {
   let copyTotalSubRules = {}
   if (totalSubRules) {
@@ -469,7 +479,11 @@ function validateSub(
       const validateResult = validateTotalSubTable(copyTotalSubRules, entity, prop)
       if (validateResult !== true) {
         delete copyTotalSubRules[prop]
-        return validateResult
+        if(isNeedField){
+          return {msg: validateResult, listCode: prop}
+        } else {
+          return validateResult
+        }
       }
       let pageSize
       let hasAuthFields = []
@@ -521,9 +535,12 @@ function validateSub(
             }
           }
         })
-        const validateResult = validator(rowData, rowRule, j, isSql, pageNum, pageRowIndex)
-        if (validateResult !== true) {
+        const validateResult = validator(rowData, rowRule, j, isSql, pageNum, pageRowIndex, isNeedField)
+        if ((!isNeedField && validateResult !== true) || (isNeedField && validateResult.msg !== true)) {
           // 表示验证失败，无需继续验证
+          if(isNeedField){
+            validateResult.listCode = prop
+          }
           return validateResult
         }
       }
@@ -533,10 +550,14 @@ function validateSub(
   for (const subTableName in copyTotalSubRules) {
     const validateResult = validateTotalSubTable(copyTotalSubRules, entity, subTableName)
     if (validateResult !== true) {
-      return validateResult
+      if(isNeedField){
+        return {msg: validateResult, listCode: prop}
+      } else {
+        return validateResult
+      }
     }
   }
-  return true
+  return isNeedField?{msg: true, listCode: prop}: true
 }
 
 function getEntityId(row) {
@@ -620,7 +641,18 @@ function validateTotalSubTable(totalSubRules, entity, subTableName) {
   }
   return true
 }
-
+/**
+ * 
+ * @param {*} entity 
+ * @param {*} validateRules 
+ * @param {*} isSql 
+ * @param {*} additionalParamMap 
+ * @param {*} taskParamMap 
+ * @param {*} contextParameter 
+ * @param {*} subTablePageInfo 
+ * @param {*} isNeedField  如果为true，表示返回的是{}对象，msg: true/提示信息、field：字段名
+ * @returns 
+ */
 function formValidator(
   entity,
   validateRules,
@@ -628,7 +660,8 @@ function formValidator(
   additionalParamMap,
   taskParamMap,
   contextParameter,
-  subTablePageInfo
+  subTablePageInfo,
+  isNeedField
 ) {
   const validateRulesKeys = Object.keys(validateRules)
   if (
@@ -641,8 +674,8 @@ function formValidator(
     const subRules = validateRules.subRules
     const totalSubRules = validateRules.totalSubRules
     const dataTypeMap = validateRules.dataTypeMap
-    let validateResult = validator(entity, rules, null, isSql)
-    if (validateResult === true) {
+    let validateResult = validator(entity, rules, null, isSql, null, null, isNeedField)
+    if ((!isNeedField && validateResult === true) || (isNeedField && validateResult.msg === true)) {
       if (subRules || totalSubRules) {
         validateResult = validateSub(
           entity,
@@ -653,14 +686,15 @@ function formValidator(
           additionalParamMap,
           taskParamMap,
           contextParameter,
-          subTablePageInfo
+          subTablePageInfo,
+          isNeedField
         )
       }
     }
     return validateResult
   } else {
     // 表示没有子表验证规则
-    return validator(entity, validateRules, null, isSql)
+    return validator(entity, validateRules, null, isSql, null, null, isNeedField)
   }
 }