workflow-editor 0.0.46-up → 0.0.46-up-tmp1

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/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "workflow-editor",
3
3
  "private": false,
4
- "version": "0.0.46-up",
4
+ "version": "0.0.46-up-tmp1",
5
5
  "type": "module",
6
6
  "main": "./lib/workflow-editor.js",
7
7
  "scripts": {
@@ -23,7 +23,10 @@ function getLeafPropRule(editField, dataTypeMap) {
23
23
  rule.pattern = new RegExp('^(-?\\d+)(\\.\\d+)?$')
24
24
  rule.message = editField.label + ' ' + getI18n().t('workflowEditorMessage.requiredAndMustBeDecimal')
25
25
  } else if (dataType === 'BOOLEAN') {
26
+ rule.type = 'boolean'
26
27
  rule.message = editField.label + ' ' + getI18n().t('workflowEditorMessage.mustFill')
28
+ // 布尔型校验需要自定义,为了兼容oracle和mysql数据
29
+ packageBooleanRule(rule)
27
30
  } else {
28
31
  // if (entity[editField.name] || entity[editField.name] === 0) {
29
32
  // if (typeof entity[editField.name] === 'number' && dataType === 'TEXT') {
@@ -49,6 +52,29 @@ function getLeafPropRule(editField, dataTypeMap) {
49
52
  return rule
50
53
  }
51
54
 
55
+ /**
56
+ * 布尔型校验需要自定义,为了兼容oracle和mysql数据库
57
+ * @param fieldRule
58
+ */
59
+ function packageBooleanRule(fieldRule) {
60
+ if (fieldRule.type && fieldRule.type === 'boolean') {
61
+ fieldRule.validator = function (rule, value, callback) {
62
+ if (value === undefined || value === null) {
63
+ if (rule.required) {
64
+ return false
65
+ } else {
66
+ return true
67
+ }
68
+ } else if (typeof value === 'number' && (value === 1 || value === 0)) {
69
+ return true
70
+ } else if (typeof value === 'boolean' && (value === true || value === false)) {
71
+ return true
72
+ }
73
+ return false
74
+ }
75
+ }
76
+ }
77
+
52
78
  /**
53
79
  * 获得对象验证规则
54
80
  * @param {*} editField 字段信息