workflow-editor 0.0.84-up → 0.0.85-up
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/{401-b7e48e35.js → 401-6d8d823d.js} +1 -1
- package/lib/{404-5cc6c62f.js → 404-71e6f04b.js} +1 -1
- package/lib/{iframe-page-b1c44766.js → iframe-page-f6d03745.js} +1 -1
- package/lib/{index-d9654a7a.js → index-acd72790.js} +852 -827
- package/lib/{tab-content-iframe-index-76ce0dc2.js → tab-content-iframe-index-a109cac2.js} +1 -1
- package/lib/{tab-content-index-dd617101.js → tab-content-index-f39a83c1.js} +1 -1
- package/lib/{tache-subprocess-history-16a4e565.js → tache-subprocess-history-8ec86536.js} +1 -1
- package/lib/workflow-editor.js +1 -1
- package/lib/workflow-editor.umd.cjs +3 -3
- package/package.json +2 -2
- package/packages/plugins/formValidatorUtil.js +38 -29
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "workflow-editor",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.85-up",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/workflow-editor.js",
|
|
7
7
|
"scripts": {
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@vitejs/plugin-vue": "^4.2.3",
|
|
19
|
-
"agilebuilder-ui": "1.1.
|
|
19
|
+
"agilebuilder-ui": "1.1.83",
|
|
20
20
|
"axios": "^1.5.1",
|
|
21
21
|
"element-plus": "^2.4.1",
|
|
22
22
|
"font-awesome": "^4.7.0",
|
|
@@ -676,38 +676,47 @@ function formValidator(
|
|
|
676
676
|
subTablePageInfo,
|
|
677
677
|
isNeedField
|
|
678
678
|
) {
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
validateRulesKeys.
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
679
|
+
// 兼容 workflowRules= { CODE:[{xxxxx}], rules:{},subRules:{}}格式的验证
|
|
680
|
+
let validateResult = validator(entity, validateRules, null, isSql, null, null, isNeedField)
|
|
681
|
+
if ((!isNeedField && validateResult === true) || (isNeedField && validateResult.msg === true)) {
|
|
682
|
+
// 先验证流程编辑器配置的字段必填验证
|
|
683
|
+
const validateRulesKeys = Object.keys(validateRules)
|
|
684
|
+
// 脚本控制的验证会走下面的验证代码
|
|
685
|
+
if (
|
|
686
|
+
validateRulesKeys.indexOf('rules') >= 0 &&
|
|
687
|
+
validateRulesKeys.indexOf('subRules') >= 0 &&
|
|
688
|
+
validateRulesKeys.indexOf('totalSubRules') >= 0
|
|
689
|
+
) {
|
|
690
|
+
// 表示是带有子表验证规则的
|
|
691
|
+
const rules = validateRules.rules
|
|
692
|
+
const subRules = validateRules.subRules
|
|
693
|
+
const totalSubRules = validateRules.totalSubRules
|
|
694
|
+
const dataTypeMap = validateRules.dataTypeMap
|
|
695
|
+
validateResult = validator(entity, rules, null, isSql, null, null, isNeedField)
|
|
696
|
+
if ((!isNeedField && validateResult === true) || (isNeedField && validateResult.msg === true)) {
|
|
697
|
+
if (subRules || totalSubRules) {
|
|
698
|
+
validateResult = validateSub(
|
|
699
|
+
entity,
|
|
700
|
+
subRules,
|
|
701
|
+
totalSubRules,
|
|
702
|
+
isSql,
|
|
703
|
+
dataTypeMap,
|
|
704
|
+
additionalParamMap,
|
|
705
|
+
taskParamMap,
|
|
706
|
+
contextParameter,
|
|
707
|
+
subTablePageInfo,
|
|
708
|
+
isNeedField
|
|
709
|
+
)
|
|
710
|
+
}
|
|
705
711
|
}
|
|
712
|
+
return validateResult
|
|
713
|
+
} else if(validateRulesKeys.indexOf('rules') >= 0) {
|
|
714
|
+
// 表示没有子表验证规则
|
|
715
|
+
const rules = validateRules.rules
|
|
716
|
+
return validator(entity, rules, null, isSql, null, null, isNeedField)
|
|
706
717
|
}
|
|
718
|
+
} else{
|
|
707
719
|
return validateResult
|
|
708
|
-
} else {
|
|
709
|
-
// 表示没有子表验证规则
|
|
710
|
-
return validator(entity, validateRules, null, isSql, null, null, isNeedField)
|
|
711
720
|
}
|
|
712
721
|
}
|
|
713
722
|
|