github/tmagic-editor
1
0
Fork 0
mirror of https://github.com/Tencent/tmagic-editor.git synced 2026-08-01 19:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(form): text 类型校验允许数字值，兼容数据源字段配置

Browse Source
This commit is contained in:
roymondchen 2026-07-23 19:04:04 +08:00
parent fe9e754b50
commit 1f389ff9fd
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/form/src/utils/typeMatch.ts
View File

@ -558,6 +558,11 @@ const validateBuiltinTypeMatch = (
return undefined; return undefined;
} }
// text 常与数字（如 id、数量）绑定，值允许为数字；错误建议仍按字符串给出
if (fieldType === 'text' && isNumberValue(value)) {
return undefined;
}
if (typeof value !== 'string') { if (typeof value !== 'string') {
return defaultMessage( return defaultMessage(
message, message,

21
packages/form/tests/unit/utils/typeMatch.spec.ts
View File

@ -91,12 +91,17 @@ describe('validateTypeMatch', () => {
expect(validateTypeMatch({ a: 1 }, mForm, propsOf({ type: 'hidden' }))).toBeUndefined(); expect(validateTypeMatch({ a: 1 }, mForm, propsOf({ type: 'hidden' }))).toBeUndefined();
}); });
test('text 期望 string', () => { test('text 期望 string，允许 number', () => {
expect(validateTypeMatch('ok', mForm, propsOf({ type: 'text' }))).toBeUndefined(); expect(validateTypeMatch('ok', mForm, propsOf({ type: 'text' }))).toBeUndefined();
expect(validateTypeMatch(1, mForm, propsOf({ type: 'text' }))).toBe( expect(validateTypeMatch(1, mForm, propsOf({ type: 'text' }))).toBeUndefined();
'1 类型应为字符串\n\n请参考以下示例值："文本内容"', expect(validateTypeMatch(0, mForm, propsOf({ type: 'text' }))).toBeUndefined();
expect(validateTypeMatch(NaN, mForm, propsOf({ type: 'text' }))).toBe(
'NaN 类型应为字符串\n\n请参考以下示例值："文本内容"',
); );
expect(validateTypeMatch(1, mForm, propsOf({ type: 'text' }), '自定义错误')).toBe('自定义错误'); expect(validateTypeMatch({ a: 1 }, mForm, propsOf({ type: 'text' }))).toBe(
'[object Object] 类型应为字符串\n\n请参考以下示例值："文本内容"',
);
expect(validateTypeMatch(true, mForm, propsOf({ type: 'text' }), '自定义错误')).toBe('自定义错误');
}); });
test('text filter=number 时期望 number', () => { test('text filter=number 时期望 number', () => {
@ -526,8 +531,8 @@ describe('validateTypeMatch', () => {
expect(validateTypeMatch('1', mForm, propsOf({ type: 'number', defaultValue: () => Promise.resolve(123) }))).toBe( expect(validateTypeMatch('1', mForm, propsOf({ type: 'number', defaultValue: () => Promise.resolve(123) }))).toBe(
'1 类型应为数字\n\n请参考以下示例值：123', '1 类型应为数字\n\n请参考以下示例值：123',
); );
expect(validateTypeMatch(1, mForm, propsOf({ type: 'text', defaultValue: async () => '示例' }))).toBe( expect(validateTypeMatch({ a: 1 }, mForm, propsOf({ type: 'text', defaultValue: async () => '示例' }))).toBe(
'1 类型应为字符串\n\n请参考以下示例值："文本内容"', '[object Object] 类型应为字符串\n\n请参考以下示例值："文本内容"',
); );
}); });
}); });
@ -545,7 +550,7 @@ describe('getRules typeMatch', () => {
const rules: any = [{ typeMatch: true, message: '类型错误' }]; const rules: any = [{ typeMatch: true, message: '类型错误' }];
const newRules: any = getRules(mForm, rules, propsOf({ type: 'text' })); const newRules: any = getRules(mForm, rules, propsOf({ type: 'text' }));
const callback = vi.fn(); const callback = vi.fn();
newRules[0].validator({}, 123, callback); newRules[0].validator({}, { a: 1 }, callback);
expect(callback).toHaveBeenCalledWith(expect.any(Error)); expect(callback).toHaveBeenCalledWith(expect.any(Error));
expect(callback.mock.calls[0][0].message).toBe('类型错误'); expect(callback.mock.calls[0][0].message).toBe('类型错误');
}); });
@ -590,7 +595,7 @@ describe('getRules tdesign validator', () => {
const rules: any = [{ typeMatch: true, message: '类型错误' }]; const rules: any = [{ typeMatch: true, message: '类型错误' }];
const newRules: any = getRules(mForm, rules, propsOf({ type: 'text' })); const newRules: any = getRules(mForm, rules, propsOf({ type: 'text' }));
// TDesign 调用签名：validator(val) // TDesign 调用签名：validator(val)
await expect(newRules[0].validator(123)).resolves.toEqual({ await expect(newRules[0].validator({ a: 1 })).resolves.toEqual({
result: false, result: false,
message: '类型错误', message: '类型错误',
}); });