Browse Source

feat: default form validation rules applicable to selector components (#4442)

* fix: hover border style same as antd style when validate error

* fix: hover border style same as antd style when validate error

* feat(@vben-core/form-ui): Default form validation rules applicable to selector components

---------
pull/4443/head
LinaBell 1 year ago
committed by GitHub
parent
commit
fbd23701de
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 6
      apps/web-antd/src/adapter/form.ts
  2. 6
      apps/web-ele/src/adapter/form.ts
  3. 6
      apps/web-naive/src/adapter/form.ts
  4. 6
      packages/@core/ui-kit/form-ui/src/types.ts
  5. 3
      packages/locales/src/langs/en-US.json
  6. 3
      packages/locales/src/langs/zh-CN.json
  7. 6
      playground/src/adapter/form.ts
  8. 17
      playground/src/views/examples/form/rules.vue

6
apps/web-antd/src/adapter/form.ts

@ -103,6 +103,12 @@ setupVbenForm<FormComponentType>({
}
return true;
},
selectRequired: (value, _params, ctx) => {
if (value === undefined || value === null) {
return $t('formRules.selectRequired', [ctx.label]);
}
return true;
},
},
});

6
apps/web-ele/src/adapter/form.ts

@ -78,6 +78,12 @@ setupVbenForm<FormComponentType>({
}
return true;
},
selectRequired: (value, _params, ctx) => {
if (value === undefined || value === null) {
return $t('formRules.selectRequired', [ctx.label]);
}
return true;
},
},
});

6
apps/web-naive/src/adapter/form.ts

@ -87,6 +87,12 @@ setupVbenForm<FormComponentType>({
}
return true;
},
selectRequired: (value, _params, ctx) => {
if (value === undefined || value === null) {
return $t('formRules.selectRequired', [ctx.label]);
}
return true;
},
},
});

6
packages/@core/ui-kit/form-ui/src/types.ts

@ -58,6 +58,7 @@ export type CustomRenderType = (() => Component | string) | string;
export type FormSchemaRuleType =
| 'required'
| 'selectRequired'
| null
| (Record<never, never> & string)
| ZodTypeAny;
@ -323,5 +324,10 @@ export interface VbenFormAdapterOptions<
params: any,
ctx: Record<string, any>,
) => boolean | string;
selectRequired?: (
value: any,
params: any,
ctx: Record<string, any>,
) => boolean | string;
};
}

3
packages/locales/src/langs/en-US.json

@ -55,7 +55,8 @@
}
},
"formRules": {
"required": "Please enter {0}"
"required": "Please enter {0}",
"selectRequired": "Please select {0}"
},
"widgets": {
"document": "Document",

3
packages/locales/src/langs/zh-CN.json

@ -55,7 +55,8 @@
}
},
"formRules": {
"required": "请输入{0}"
"required": "请输入{0}",
"selectRequired": "请选择{0}"
},
"widgets": {
"document": "文档",

6
playground/src/adapter/form.ts

@ -103,6 +103,12 @@ setupVbenForm<FormComponentType>({
}
return true;
},
selectRequired: (value, _params, ctx) => {
if (value === undefined || value === null) {
return $t('formRules.selectRequired', [ctx.label]);
}
return true;
},
},
});

17
playground/src/views/examples/form/rules.vue

@ -102,7 +102,7 @@ const [Form, formApi] = useVbenForm({
defaultValue: undefined,
fieldName: 'options',
label: '下拉选',
rules: 'required',
rules: 'selectRequired',
},
{
component: 'RadioGroup',
@ -120,7 +120,7 @@ const [Form, formApi] = useVbenForm({
},
fieldName: 'radioGroup',
label: '单选组',
rules: 'required',
rules: 'selectRequired',
},
{
component: 'CheckboxGroup',
@ -139,7 +139,7 @@ const [Form, formApi] = useVbenForm({
},
fieldName: 'checkboxGroup',
label: '多选组',
rules: 'required',
rules: 'selectRequired',
},
{
component: 'Checkbox',
@ -150,14 +150,21 @@ const [Form, formApi] = useVbenForm({
default: () => ['我已阅读并同意'],
};
},
rules: 'required',
rules: 'selectRequired',
},
{
component: 'DatePicker',
defaultValue: undefined,
fieldName: 'datePicker',
label: '日期选择框',
rules: 'required',
rules: 'selectRequired',
},
{
component: 'RangePicker',
defaultValue: undefined,
fieldName: 'rangePicker',
label: '区间选择框',
rules: 'selectRequired',
},
],
// 321

Loading…
Cancel
Save