From 17ed80c875f6c8c803981f9006b77ca18b30bb08 Mon Sep 17 00:00:00 2001
From: ANHE <1983933789@qq.com>
Date: Wed, 12 Mar 2025 15:11:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/common/form.ts                                  | 7 +------
 src/views/system/tenant/modules/tenant-operate-drawer.vue | 1 +
 src/views/tool/gen/modules/gen-table-operate-drawer.vue   | 4 ++--
 3 files changed, 4 insertions(+), 8 deletions(-)

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, () => {
         <NFormItem label="租户套餐" path="packageId">
           <NSelect
             v-model:value="model.packageId"
+            clearable
             :disabled="props.operateType === 'edit'"
             placeholder="请选择租户套餐"
             :options="packageOptions"
diff --git a/src/views/tool/gen/modules/gen-table-operate-drawer.vue b/src/views/tool/gen/modules/gen-table-operate-drawer.vue
index 28ed735b..817b9537 100644
--- a/src/views/tool/gen/modules/gen-table-operate-drawer.vue
+++ b/src/views/tool/gen/modules/gen-table-operate-drawer.vue
@@ -39,7 +39,7 @@ interface Emits {
 const emit = defineEmits<Emits>();
 
 const appStore = useAppStore();
-const { defaultRequiredRule } = useFormRules();
+const { defaultRequiredRule, createNumberRequiredRule } = useFormRules();
 const { loading, startLoading, endLoading } = useLoading();
 const genTableInfo = ref<Api.Tool.GenTableInfo>();
 
@@ -73,7 +73,7 @@ const infoRules: Record<InfoRuleKey, App.Global.FormRule> = {
   moduleName: defaultRequiredRule,
   businessName: defaultRequiredRule,
   functionName: defaultRequiredRule,
-  parentMenuId: defaultRequiredRule,
+  parentMenuId: createNumberRequiredRule('上级菜单不能为空'),
   genType: defaultRequiredRule,
   genPath: defaultRequiredRule
 };