diff --git a/src/hooks/common/form.ts b/src/hooks/common/form.ts index 54ee5e63..0a760d7a 100644 --- a/src/hooks/common/form.ts +++ b/src/hooks/common/form.ts @@ -51,12 +51,7 @@ export function useFormRules() { return { required: true, trigger: ['change', 'blur'], - validator: (_rule: any, value: any) => { - if (value === null || value === undefined || value === '') { - return new Error(message); - } - return true; - } + message }; } diff --git a/src/views/system/tenant/modules/tenant-operate-drawer.vue b/src/views/system/tenant/modules/tenant-operate-drawer.vue index ad57c644..254aecda 100644 --- a/src/views/system/tenant/modules/tenant-operate-drawer.vue +++ b/src/views/system/tenant/modules/tenant-operate-drawer.vue @@ -245,6 +245,7 @@ watch(visible, () => { (); const appStore = useAppStore(); -const { defaultRequiredRule } = useFormRules(); +const { defaultRequiredRule, createNumberRequiredRule } = useFormRules(); const { loading, startLoading, endLoading } = useLoading(); const genTableInfo = ref(); @@ -73,7 +73,7 @@ const infoRules: Record = { moduleName: defaultRequiredRule, businessName: defaultRequiredRule, functionName: defaultRequiredRule, - parentMenuId: defaultRequiredRule, + parentMenuId: createNumberRequiredRule('上级菜单不能为空'), genType: defaultRequiredRule, genPath: defaultRequiredRule };