workflow-editor 0.0.83-up → 0.0.85-up

package/package.json

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

package/packages/plugins/formValidatorUtil.js

@@ -676,38 +676,47 @@ function formValidator(
   subTablePageInfo,
   isNeedField
 ) {
-  const validateRulesKeys = Object.keys(validateRules)
-  if (
-    validateRulesKeys.indexOf('rules') >= 0 &&
-    validateRulesKeys.indexOf('subRules') >= 0 &&
-    validateRulesKeys.indexOf('totalSubRules') >= 0
-  ) {
-    // 表示是带有子表验证规则的
-    const rules = validateRules.rules
-    const subRules = validateRules.subRules
-    const totalSubRules = validateRules.totalSubRules
-    const dataTypeMap = validateRules.dataTypeMap
-    let validateResult = validator(entity, rules, null, isSql, null, null, isNeedField)
-    if ((!isNeedField && validateResult === true) || (isNeedField && validateResult.msg === true)) {
-      if (subRules || totalSubRules) {
-        validateResult = validateSub(
-          entity,
-          subRules,
-          totalSubRules,
-          isSql,
-          dataTypeMap,
-          additionalParamMap,
-          taskParamMap,
-          contextParameter,
-          subTablePageInfo,
-          isNeedField
-        )
+  // 兼容 workflowRules= { CODE:[{xxxxx}], rules:{},subRules:{}}格式的验证
+  let validateResult = validator(entity, validateRules, null, isSql, null, null, isNeedField)
+  if ((!isNeedField && validateResult === true) || (isNeedField && validateResult.msg === true)) {
+    // 先验证流程编辑器配置的字段必填验证
+    const validateRulesKeys = Object.keys(validateRules)
+    // 脚本控制的验证会走下面的验证代码
+    if (
+      validateRulesKeys.indexOf('rules') >= 0 &&
+      validateRulesKeys.indexOf('subRules') >= 0 &&
+      validateRulesKeys.indexOf('totalSubRules') >= 0
+    ) {
+      // 表示是带有子表验证规则的
+      const rules = validateRules.rules
+      const subRules = validateRules.subRules
+      const totalSubRules = validateRules.totalSubRules
+      const dataTypeMap = validateRules.dataTypeMap
+      validateResult = validator(entity, rules, null, isSql, null, null, isNeedField)
+      if ((!isNeedField && validateResult === true) || (isNeedField && validateResult.msg === true)) {
+        if (subRules || totalSubRules) {
+          validateResult = validateSub(
+            entity,
+            subRules,
+            totalSubRules,
+            isSql,
+            dataTypeMap,
+            additionalParamMap,
+            taskParamMap,
+            contextParameter,
+            subTablePageInfo,
+            isNeedField
+          )
+        }
       }
+      return validateResult
+    } else if(validateRulesKeys.indexOf('rules') >= 0) {
+      // 表示没有子表验证规则
+      const rules = validateRules.rules
+      return validator(entity, rules, null, isSql, null, null, isNeedField)
     }
+  } else{
     return validateResult
-  } else {
-    // 表示没有子表验证规则
-    return validator(entity, validateRules, null, isSql, null, null, isNeedField)
   }
 }
 

package/packages/workflow-editor/src/workflow-editor.vue

@@ -344,6 +344,7 @@ export default {
       if (this.process && this.process.attr) {
         this.setProcessCode(this.process.attr.code)
       }
+      this.checkPageCode()
       // 得到表单字段放到vuex
       this.fetchFormFields()
       this.clearCanvas()
@@ -721,6 +722,22 @@ export default {
           this.$alert(this.$t('workflowEditorMessage.enabledSuccessfully'))
         })
       }
+    },
+    // 检查并更新页面编码
+    checkPageCode() {
+      if (this.pageCode) {
+        if (this.process.properties) {
+          if (this.process.properties.parameterSettings && this.process.properties.parameterSettings.doTask) {
+            const url = this.process.properties.parameterSettings.doTask.url
+            if (url && url.startsWith('page:')) {
+              const existingPageCode = url.substring(5)
+              if (existingPageCode !== this.pageCode) {
+                this.process.properties.parameterSettings.doTask.url = 'page:' + this.pageCode
+              }
+            }
+          }
+        }
+      }
     }
   }
 }