@lcap/nasl 2.18.0-beta.1 → 2.18.0-beta.2
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.
|
@@ -13,8 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
exports.ValidationRule = void 0;
|
|
14
14
|
const translator_1 = require("../translator");
|
|
15
15
|
const getFunctions_1 = require("../server/getFunctions");
|
|
16
|
-
|
|
17
|
-
const defaultErrorMessage_json_1 = __importDefault(require("../../../../src/views/designer/app/views/logic/jflow-designer/components/logic-node/config/defaultErrorMessage.json"));
|
|
16
|
+
const defaultErrorMessage = require("../service/defaultErrorMessage.json");
|
|
18
17
|
const decorators_1 = require("../decorators");
|
|
19
18
|
const classMap_1 = __importDefault(require("../common/classMap"));
|
|
20
19
|
const Argument__1 = __importDefault(require("./Argument__"));
|
|
@@ -114,7 +113,7 @@ let ValidationRule = ValidationRule_1 = class ValidationRule extends LogicItem__
|
|
|
114
113
|
return node;
|
|
115
114
|
}
|
|
116
115
|
removeArgumentInArguments(options) {
|
|
117
|
-
|
|
116
|
+
const argument = options;
|
|
118
117
|
return argument.delete();
|
|
119
118
|
}
|
|
120
119
|
removeErrorMessage(options) {
|
|
@@ -186,14 +185,13 @@ let ValidationRule = ValidationRule_1 = class ValidationRule extends LogicItem__
|
|
|
186
185
|
code += `message: ${this.errorMessage?.toVue(options)},`;
|
|
187
186
|
}
|
|
188
187
|
else {
|
|
189
|
-
let defaultError =
|
|
188
|
+
let defaultError = defaultErrorMessage[this.calleeName];
|
|
190
189
|
let index = 0;
|
|
191
190
|
while (defaultError && defaultError.indexOf(`{args}`) !== -1) {
|
|
192
191
|
defaultError = defaultError.replace(`{args}`, `\${${this.arguments[index]?.toVue(options)}}`);
|
|
193
192
|
index++;
|
|
194
193
|
}
|
|
195
|
-
|
|
196
|
-
const itemTitle = this?.parentNode?.parentNode?.bindAttrs?.find(item => item.name === 'label');
|
|
194
|
+
const itemTitle = this?.parentNode?.parentNode?.bindAttrs?.find((item) => item.name === 'label');
|
|
197
195
|
let labelName;
|
|
198
196
|
if (itemTitle?.expression?.toVue()) {
|
|
199
197
|
labelName = `\${${itemTitle?.expression?.toVue()}}`;
|
|
@@ -279,7 +277,7 @@ let ValidationRule = ValidationRule_1 = class ValidationRule extends LogicItem__
|
|
|
279
277
|
return code;
|
|
280
278
|
}
|
|
281
279
|
toBrief() {
|
|
282
|
-
return this.arguments.map(a => a.toBrief()).join('<br />');
|
|
280
|
+
return this.arguments.map((a) => a.toBrief()).join('<br />');
|
|
283
281
|
}
|
|
284
282
|
get calleeKey() {
|
|
285
283
|
return `${this.calleeNamespace}.${this.calleeName}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationRule__.js","sourceRoot":"","sources":["../../src/concepts/ValidationRule__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAAmF;AAGnF,yDAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"ValidationRule__.js","sourceRoot":"","sources":["../../src/concepts/ValidationRule__.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
{
|
|
2
|
+
"required": "{label}不得为空",
|
|
3
|
+
"filled": "{label}不得为空",
|
|
4
|
+
"notEmpty": "{label}不得为空",
|
|
5
|
+
"empty": "{label}必须为空",
|
|
6
|
+
"minLength": "不得少于{args}个字符",
|
|
7
|
+
"maxLength": "不得超过{args}个字符",
|
|
8
|
+
"rangeLength": "请输入{args}-{args}个字符",
|
|
9
|
+
"min": "不能小于{args}",
|
|
10
|
+
"max": "不能大于{args}",
|
|
11
|
+
"range": "范围在{args}-{args}之间",
|
|
12
|
+
"pattern": "{label}格式不正确",
|
|
13
|
+
"is": "必须与{args}相同",
|
|
14
|
+
"isNot": "必须与{args}不同",
|
|
15
|
+
"equals": "必须等于{args}",
|
|
16
|
+
"notEquals": "必须不等于{args}",
|
|
17
|
+
"confirmed": "两次输入的密码不一致",
|
|
18
|
+
"includes": "必须包含{args}",
|
|
19
|
+
"excludes": "不能包含{args}",
|
|
20
|
+
"included": "必须为{args}中的值",
|
|
21
|
+
"excluded": "不能为{args}中的值",
|
|
22
|
+
"unique": "该{label}已经存在",
|
|
23
|
+
"noDuplicates": "不能出现重复项",
|
|
24
|
+
"string": "请输入字符串",
|
|
25
|
+
"number": "请输入数字",
|
|
26
|
+
"numeric": "请输入数字",
|
|
27
|
+
"integer": "请输入整数",
|
|
28
|
+
"decimal": "请输入正确格式的小数",
|
|
29
|
+
"boolean": "必须为布尔类型",
|
|
30
|
+
"function": "必须为函数",
|
|
31
|
+
"object": "必须为对象",
|
|
32
|
+
"plainObject": "必须为简单对象",
|
|
33
|
+
"array": "必须为数组",
|
|
34
|
+
"alpha": "请输入字母",
|
|
35
|
+
"alphaNum": "请输入字母或数字",
|
|
36
|
+
"alphaDash": "请输入字母或下划线",
|
|
37
|
+
"alphaNumDash": "请输入字母、数字或下划线",
|
|
38
|
+
"alphaSpaces": "以字母或空格组成",
|
|
39
|
+
"lowerCase": "不能出现大写字母",
|
|
40
|
+
"upperCase": "不能出现小写字母",
|
|
41
|
+
"^az": "以小写字母开头",
|
|
42
|
+
"^az09": "以小写字母或数字开头",
|
|
43
|
+
"^az09_": "以小写字母、数字或下划线开头",
|
|
44
|
+
"^azAZ": "以字母开头",
|
|
45
|
+
"^azAZ09": "以字母或数字开头",
|
|
46
|
+
"^azAZ09_": "以字母、数字或下划线开头",
|
|
47
|
+
"az09$": "以小写字母或数字结尾",
|
|
48
|
+
"azAZ09$": "以字母或数字结尾",
|
|
49
|
+
"^09$": "以数字组成",
|
|
50
|
+
"^az09$": "以小写字母或数字组成",
|
|
51
|
+
"^az09-$": "以小写字母、数字或中划线组成",
|
|
52
|
+
"^az09-.$": "以小写字母、数字、'-'或'.'组成",
|
|
53
|
+
"^azAZ09$": "以字母或数字组成",
|
|
54
|
+
"^azAZ09-$": "以字母、数字或'-'组成",
|
|
55
|
+
"^azAZ09_$": "以字母、数字或'_'组成",
|
|
56
|
+
"^azAZ09-_$": "以字母、数字、'-'或'_'组成",
|
|
57
|
+
"without--": "不能连续出现中划线",
|
|
58
|
+
"without__": "不能连续出现下划线",
|
|
59
|
+
"email": "请输入正确的邮箱",
|
|
60
|
+
"ip": "请输入正确的 IP",
|
|
61
|
+
"ipRange": "请输入正确的 IP 段",
|
|
62
|
+
"port": "请输入正确的端口",
|
|
63
|
+
"url": "请输入正确的 URL",
|
|
64
|
+
"macAddress": "请输入正确的 MAC 地址",
|
|
65
|
+
"md5": "请输入正确的 MD5",
|
|
66
|
+
"ascii": "必须为 ASCII",
|
|
67
|
+
"base32": "必须为 base32 编码",
|
|
68
|
+
"base64": "必须为 base64 编码",
|
|
69
|
+
"byteLength": "字节长度不在指定范围内",
|
|
70
|
+
"dataURI": "必须为 DataURI 编码",
|
|
71
|
+
"magnetURI": "必须为 MagnetURI 编码",
|
|
72
|
+
"divisibleBy": "必须被{args}整除",
|
|
73
|
+
"fullWidth": "必须输入全角字符",
|
|
74
|
+
"halfWidth": "必须输入半角字符",
|
|
75
|
+
"hash": "哈希编码不符合{args}算法",
|
|
76
|
+
"hexColor": "请输入合法的十六进制颜色值",
|
|
77
|
+
"hex": "请输入十六进制数",
|
|
78
|
+
"identityCard": "请输入合法的身份证号码",
|
|
79
|
+
"creditCard": "请输入合法的信用卡号",
|
|
80
|
+
"fqdn": "请输入合法的全限定域名",
|
|
81
|
+
"ipOrFQDN": "请输入一个合法 IP 或全限定域名",
|
|
82
|
+
"isbn": "必须为合法的国际标准书号",
|
|
83
|
+
"issn": "必须为合法的国际标准连续出版物编号",
|
|
84
|
+
"isin": "必须为合法的国际证券识别码",
|
|
85
|
+
"iso8601": "必须为合法的 ISO8601 日期格式",
|
|
86
|
+
"rfc3339": "必须为合法的 RFC3339 日期格式",
|
|
87
|
+
"iso31661Alpha2": "必须为合法的 ISO 3166-1 Alpha-2 国家代码",
|
|
88
|
+
"iso31661Alpha3": "必须为合法的 ISO 3166-1 Alpha-3 国家代码",
|
|
89
|
+
"json": "必须为 JSON 格式字符串",
|
|
90
|
+
"jwt": "必须为合法的 JSON Web Token",
|
|
91
|
+
"latLong": "请输入合法的经纬度坐标，如 (-17.738223, 85.605469)",
|
|
92
|
+
"mobile": "请输入合法的手机号码",
|
|
93
|
+
"mongoId": "请输入合法的 MongoDB 对象 ID",
|
|
94
|
+
"postalCode": "请输入合法的邮政编码",
|
|
95
|
+
"uuid": "请输入合法的 UUID",
|
|
96
|
+
"chinese": "请输入中文内容"
|
|
97
|
+
}
|
package/package.json
CHANGED
|
@@ -2,8 +2,7 @@ import { TranslatorState, shiftState, withSourceMap, indent } from '../translato
|
|
|
2
2
|
import Function from './Function__';
|
|
3
3
|
import { ElementToVueOptions } from './ViewElement__';
|
|
4
4
|
import { getValidationInFunction } from '../server/getFunctions';
|
|
5
|
-
|
|
6
|
-
import defaultErrorMessage from '../../../../src/views/designer/app/views/logic/jflow-designer/components/logic-node/config/defaultErrorMessage.json'
|
|
5
|
+
import defaultErrorMessage = require('../service/defaultErrorMessage.json');
|
|
7
6
|
|
|
8
7
|
//================================================================================
|
|
9
8
|
// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
|
|
@@ -18,6 +17,7 @@ import BaseNode from '../common/BaseNode';
|
|
|
18
17
|
import classMap from '../common/classMap';
|
|
19
18
|
import Argument from './Argument__';
|
|
20
19
|
import LogicItem from './LogicItem__';
|
|
20
|
+
import BindAttribute from './BindAttribute__';
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
23
|
* 验证规则
|
|
@@ -60,8 +60,6 @@ export class ValidationRule extends LogicItem {
|
|
|
60
60
|
@property('LogicItem')
|
|
61
61
|
errorMessage: LogicItem = undefined;
|
|
62
62
|
|
|
63
|
-
|
|
64
|
-
|
|
65
63
|
/**
|
|
66
64
|
* @param source 需要合并的部分参数
|
|
67
65
|
*/
|
|
@@ -75,7 +73,6 @@ export class ValidationRule extends LogicItem {
|
|
|
75
73
|
return super.from(source, parentNode, parentKey) as ValidationRule;
|
|
76
74
|
}
|
|
77
75
|
|
|
78
|
-
|
|
79
76
|
/**
|
|
80
77
|
* 设置错误信息
|
|
81
78
|
*/
|
|
@@ -91,10 +88,6 @@ export class ValidationRule extends LogicItem {
|
|
|
91
88
|
});
|
|
92
89
|
}
|
|
93
90
|
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
91
|
/**
|
|
99
92
|
* 插入实际参数
|
|
100
93
|
* @internal
|
|
@@ -127,8 +120,6 @@ export class ValidationRule extends LogicItem {
|
|
|
127
120
|
return argument;
|
|
128
121
|
}
|
|
129
122
|
|
|
130
|
-
|
|
131
|
-
|
|
132
123
|
/**
|
|
133
124
|
* 插入实际参数
|
|
134
125
|
* @param argumentOptions 实际参数参数
|
|
@@ -151,8 +142,6 @@ export class ValidationRule extends LogicItem {
|
|
|
151
142
|
return node;
|
|
152
143
|
}
|
|
153
144
|
|
|
154
|
-
|
|
155
|
-
|
|
156
145
|
/**
|
|
157
146
|
* 添加实际参数
|
|
158
147
|
* @internal
|
|
@@ -172,8 +161,6 @@ export class ValidationRule extends LogicItem {
|
|
|
172
161
|
return this._insertArgumentAt(options as any, index);
|
|
173
162
|
}
|
|
174
163
|
|
|
175
|
-
|
|
176
|
-
|
|
177
164
|
/**
|
|
178
165
|
* 添加实际参数
|
|
179
166
|
* @param argumentOptions 实际参数参数
|
|
@@ -197,9 +184,6 @@ export class ValidationRule extends LogicItem {
|
|
|
197
184
|
return node;
|
|
198
185
|
}
|
|
199
186
|
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
187
|
/**
|
|
204
188
|
* 删除实际参数
|
|
205
189
|
* @param argument 已有的实际参数实例
|
|
@@ -207,12 +191,10 @@ export class ValidationRule extends LogicItem {
|
|
|
207
191
|
removeArgumentInArguments(argument: Argument): void;
|
|
208
192
|
|
|
209
193
|
removeArgumentInArguments(options: Argument) {
|
|
210
|
-
|
|
194
|
+
const argument: Argument = options;
|
|
211
195
|
return argument.delete();
|
|
212
196
|
}
|
|
213
197
|
|
|
214
|
-
|
|
215
|
-
|
|
216
198
|
/**
|
|
217
199
|
* 删除逻辑项
|
|
218
200
|
* @param name 逻辑项名称
|
|
@@ -268,7 +250,7 @@ export class ValidationRule extends LogicItem {
|
|
|
268
250
|
toVue(options?: ElementToVueOptions) {
|
|
269
251
|
let code = '{';
|
|
270
252
|
// 兼容就得简写模式
|
|
271
|
-
if (this.calleeName && this.calleeName.includes('(')){
|
|
253
|
+
if (this.calleeName && this.calleeName.includes('(')) {
|
|
272
254
|
return `'${this.calleeName}'`;
|
|
273
255
|
} else if (this.calleeName === 'unique') {
|
|
274
256
|
code += `validate: 'excluded',`;
|
|
@@ -279,39 +261,38 @@ export class ValidationRule extends LogicItem {
|
|
|
279
261
|
}
|
|
280
262
|
if (this.arguments.length) {
|
|
281
263
|
let args = '[';
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
code += `args: ${args}
|
|
264
|
+
this.arguments?.forEach((arg, index) => {
|
|
265
|
+
args += arg?.toVue(options);
|
|
266
|
+
if (index !== this.arguments?.length - 1)
|
|
267
|
+
args += ', ';
|
|
268
|
+
});
|
|
269
|
+
args += ']';
|
|
270
|
+
code += `args: ${args} ,`;
|
|
289
271
|
}
|
|
290
272
|
if (this.errorMessage) {
|
|
291
273
|
code += `message: ${this.errorMessage?.toVue(options)},`;
|
|
292
274
|
} else {
|
|
293
|
-
let defaultError = defaultErrorMessage[this.calleeName];
|
|
275
|
+
let defaultError = (defaultErrorMessage as Record<string, string>)[this.calleeName];
|
|
294
276
|
let index = 0;
|
|
295
277
|
while (defaultError && defaultError.indexOf(`{args}`) !== -1) {
|
|
296
278
|
defaultError = defaultError.replace(`{args}`, `\${${this.arguments[index]?.toVue(options)}}`);
|
|
297
279
|
index++;
|
|
298
280
|
}
|
|
299
|
-
|
|
300
|
-
const itemTitle = (this?.parentNode as any)?.parentNode?.bindAttrs?.find(item=>item.name === 'label');
|
|
281
|
+
const itemTitle = (this?.parentNode as any)?.parentNode?.bindAttrs?.find((item: BindAttribute) => item.name === 'label');
|
|
301
282
|
let labelName;
|
|
302
283
|
if (itemTitle?.expression?.toVue()) {
|
|
303
|
-
labelName =
|
|
284
|
+
labelName = `\${${itemTitle?.expression?.toVue()}}`;
|
|
304
285
|
} else {
|
|
305
286
|
labelName = itemTitle?.value || '表单项';
|
|
306
287
|
}
|
|
307
|
-
defaultError = defaultError && defaultError.replace(`{label}`,
|
|
288
|
+
defaultError = defaultError && defaultError.replace(`{label}`, labelName);
|
|
308
289
|
code += `message: \`${defaultError}\`,`;
|
|
309
290
|
}
|
|
310
291
|
code += `trigger: 'input+blur'`;
|
|
311
292
|
if (['required', 'filled', 'notEmpty'].includes(this.calleeName)) {
|
|
312
|
-
code += ',required: true'
|
|
293
|
+
code += ',required: true';
|
|
313
294
|
}
|
|
314
|
-
code += '}'
|
|
295
|
+
code += '}';
|
|
315
296
|
return code;
|
|
316
297
|
}
|
|
317
298
|
|
|
@@ -340,11 +321,11 @@ export class ValidationRule extends LogicItem {
|
|
|
340
321
|
args += ', ';
|
|
341
322
|
});
|
|
342
323
|
args += ']';
|
|
343
|
-
code += `args: ${args}
|
|
324
|
+
code += `args: ${args},`;
|
|
344
325
|
}
|
|
345
|
-
code += `trigger: 'input+blur'
|
|
326
|
+
code += `trigger: 'input+blur',`;
|
|
346
327
|
code += `message: ${this.errorMessage?.toJS(shiftState(state, code))}`;
|
|
347
|
-
code += '}'
|
|
328
|
+
code += '}';
|
|
348
329
|
return code;
|
|
349
330
|
}
|
|
350
331
|
|
|
@@ -385,7 +366,7 @@ export class ValidationRule extends LogicItem {
|
|
|
385
366
|
}
|
|
386
367
|
|
|
387
368
|
toBrief(): string {
|
|
388
|
-
return this.arguments.map(a => a.toBrief()).join('<br />')
|
|
369
|
+
return this.arguments.map((a) => a.toBrief()).join('<br />');
|
|
389
370
|
}
|
|
390
371
|
|
|
391
372
|
get calleeKey(): string {
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
{
|
|
2
|
+
"required": "{label}不得为空",
|
|
3
|
+
"filled": "{label}不得为空",
|
|
4
|
+
"notEmpty": "{label}不得为空",
|
|
5
|
+
"empty": "{label}必须为空",
|
|
6
|
+
"minLength": "不得少于{args}个字符",
|
|
7
|
+
"maxLength": "不得超过{args}个字符",
|
|
8
|
+
"rangeLength": "请输入{args}-{args}个字符",
|
|
9
|
+
"min": "不能小于{args}",
|
|
10
|
+
"max": "不能大于{args}",
|
|
11
|
+
"range": "范围在{args}-{args}之间",
|
|
12
|
+
"pattern": "{label}格式不正确",
|
|
13
|
+
"is": "必须与{args}相同",
|
|
14
|
+
"isNot": "必须与{args}不同",
|
|
15
|
+
"equals": "必须等于{args}",
|
|
16
|
+
"notEquals": "必须不等于{args}",
|
|
17
|
+
"confirmed": "两次输入的密码不一致",
|
|
18
|
+
"includes": "必须包含{args}",
|
|
19
|
+
"excludes": "不能包含{args}",
|
|
20
|
+
"included": "必须为{args}中的值",
|
|
21
|
+
"excluded": "不能为{args}中的值",
|
|
22
|
+
"unique": "该{label}已经存在",
|
|
23
|
+
"noDuplicates": "不能出现重复项",
|
|
24
|
+
"string": "请输入字符串",
|
|
25
|
+
"number": "请输入数字",
|
|
26
|
+
"numeric": "请输入数字",
|
|
27
|
+
"integer": "请输入整数",
|
|
28
|
+
"decimal": "请输入正确格式的小数",
|
|
29
|
+
"boolean": "必须为布尔类型",
|
|
30
|
+
"function": "必须为函数",
|
|
31
|
+
"object": "必须为对象",
|
|
32
|
+
"plainObject": "必须为简单对象",
|
|
33
|
+
"array": "必须为数组",
|
|
34
|
+
"alpha": "请输入字母",
|
|
35
|
+
"alphaNum": "请输入字母或数字",
|
|
36
|
+
"alphaDash": "请输入字母或下划线",
|
|
37
|
+
"alphaNumDash": "请输入字母、数字或下划线",
|
|
38
|
+
"alphaSpaces": "以字母或空格组成",
|
|
39
|
+
"lowerCase": "不能出现大写字母",
|
|
40
|
+
"upperCase": "不能出现小写字母",
|
|
41
|
+
"^az": "以小写字母开头",
|
|
42
|
+
"^az09": "以小写字母或数字开头",
|
|
43
|
+
"^az09_": "以小写字母、数字或下划线开头",
|
|
44
|
+
"^azAZ": "以字母开头",
|
|
45
|
+
"^azAZ09": "以字母或数字开头",
|
|
46
|
+
"^azAZ09_": "以字母、数字或下划线开头",
|
|
47
|
+
"az09$": "以小写字母或数字结尾",
|
|
48
|
+
"azAZ09$": "以字母或数字结尾",
|
|
49
|
+
"^09$": "以数字组成",
|
|
50
|
+
"^az09$": "以小写字母或数字组成",
|
|
51
|
+
"^az09-$": "以小写字母、数字或中划线组成",
|
|
52
|
+
"^az09-.$": "以小写字母、数字、'-'或'.'组成",
|
|
53
|
+
"^azAZ09$": "以字母或数字组成",
|
|
54
|
+
"^azAZ09-$": "以字母、数字或'-'组成",
|
|
55
|
+
"^azAZ09_$": "以字母、数字或'_'组成",
|
|
56
|
+
"^azAZ09-_$": "以字母、数字、'-'或'_'组成",
|
|
57
|
+
"without--": "不能连续出现中划线",
|
|
58
|
+
"without__": "不能连续出现下划线",
|
|
59
|
+
"email": "请输入正确的邮箱",
|
|
60
|
+
"ip": "请输入正确的 IP",
|
|
61
|
+
"ipRange": "请输入正确的 IP 段",
|
|
62
|
+
"port": "请输入正确的端口",
|
|
63
|
+
"url": "请输入正确的 URL",
|
|
64
|
+
"macAddress": "请输入正确的 MAC 地址",
|
|
65
|
+
"md5": "请输入正确的 MD5",
|
|
66
|
+
"ascii": "必须为 ASCII",
|
|
67
|
+
"base32": "必须为 base32 编码",
|
|
68
|
+
"base64": "必须为 base64 编码",
|
|
69
|
+
"byteLength": "字节长度不在指定范围内",
|
|
70
|
+
"dataURI": "必须为 DataURI 编码",
|
|
71
|
+
"magnetURI": "必须为 MagnetURI 编码",
|
|
72
|
+
"divisibleBy": "必须被{args}整除",
|
|
73
|
+
"fullWidth": "必须输入全角字符",
|
|
74
|
+
"halfWidth": "必须输入半角字符",
|
|
75
|
+
"hash": "哈希编码不符合{args}算法",
|
|
76
|
+
"hexColor": "请输入合法的十六进制颜色值",
|
|
77
|
+
"hex": "请输入十六进制数",
|
|
78
|
+
"identityCard": "请输入合法的身份证号码",
|
|
79
|
+
"creditCard": "请输入合法的信用卡号",
|
|
80
|
+
"fqdn": "请输入合法的全限定域名",
|
|
81
|
+
"ipOrFQDN": "请输入一个合法 IP 或全限定域名",
|
|
82
|
+
"isbn": "必须为合法的国际标准书号",
|
|
83
|
+
"issn": "必须为合法的国际标准连续出版物编号",
|
|
84
|
+
"isin": "必须为合法的国际证券识别码",
|
|
85
|
+
"iso8601": "必须为合法的 ISO8601 日期格式",
|
|
86
|
+
"rfc3339": "必须为合法的 RFC3339 日期格式",
|
|
87
|
+
"iso31661Alpha2": "必须为合法的 ISO 3166-1 Alpha-2 国家代码",
|
|
88
|
+
"iso31661Alpha3": "必须为合法的 ISO 3166-1 Alpha-3 国家代码",
|
|
89
|
+
"json": "必须为 JSON 格式字符串",
|
|
90
|
+
"jwt": "必须为合法的 JSON Web Token",
|
|
91
|
+
"latLong": "请输入合法的经纬度坐标，如 (-17.738223, 85.605469)",
|
|
92
|
+
"mobile": "请输入合法的手机号码",
|
|
93
|
+
"mongoId": "请输入合法的 MongoDB 对象 ID",
|
|
94
|
+
"postalCode": "请输入合法的邮政编码",
|
|
95
|
+
"uuid": "请输入合法的 UUID",
|
|
96
|
+
"chinese": "请输入中文内容"
|
|
97
|
+
}
|