mali-applet-ui 1.0.108 → 1.0.110
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.
|
@@ -130,13 +130,37 @@ export default {
|
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
132
|
if (rule.required) {
|
|
133
|
-
if (
|
|
133
|
+
if (XEUtils.eqNull(itemValue) || itemValue === '') {
|
|
134
134
|
errRule = rule
|
|
135
135
|
break
|
|
136
136
|
}
|
|
137
|
-
if (rule.type === '
|
|
138
|
-
|
|
139
|
-
|
|
137
|
+
if (rule.type === 'integer' || rule.type === 'number') {
|
|
138
|
+
if (rule.type === 'integer') {
|
|
139
|
+
if (!/^\d+$/.test(itemValue)) {
|
|
140
|
+
errRule = rule
|
|
141
|
+
break
|
|
142
|
+
}
|
|
143
|
+
} else if (rule.type === 'number') {
|
|
144
|
+
if (!/^[-+]?\d+(.\d+)?$/.test(itemValue)) {
|
|
145
|
+
errRule = rule
|
|
146
|
+
break
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
const numValue = XEUtils.toNumber(itemValue)
|
|
150
|
+
if (XEUtils.isNumber(rule.min) && numValue < rule.min) {
|
|
151
|
+
errRule = rule
|
|
152
|
+
break
|
|
153
|
+
}
|
|
154
|
+
if (XEUtils.isNumber(rule.max) && numValue > rule.max) {
|
|
155
|
+
errRule = rule
|
|
156
|
+
break
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
if (rule.type === 'array') {
|
|
160
|
+
if (!itemValue.length) {
|
|
161
|
+
errRule = rule
|
|
162
|
+
break
|
|
163
|
+
}
|
|
140
164
|
}
|
|
141
165
|
if (rule.pattern && !new RegExp(rule.pattern).test(itemValue)) {
|
|
142
166
|
errRule = rule
|