From df397ba648b344601fadfbb4108a409328382bf3 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Mon, 29 Sep 2025 09:05:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除登录页面的租户选择下拉框
- 移除租户切换组件及其相关逻辑
---
 apps/web-antd/src/layouts/basic.vue           |  5 +-
 .../src/views/_core/authentication/login.vue  | 55 +++++++++----------
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue
index d56f497..1060a69 100644
--- a/apps/web-antd/src/layouts/basic.vue
+++ b/apps/web-antd/src/layouts/basic.vue
@@ -16,7 +16,6 @@ import { useAccessStore, useUserStore } from '@vben/stores';
 
 import { message } from 'ant-design-vue';
 
-import { TenantToggle } from '#/components/tenant-toggle';
 import { $t } from '#/locales';
 import { resetRoutes } from '#/router';
 import { useAuthStore, useNotifyStore } from '#/store';
@@ -127,9 +126,9 @@ watch(
 
 <template>
   <BasicLayout @clear-preferences-and-logout="handleLogout">
-    <template #header-right-1>
+    <!-- <template #header-right-1>
       <TenantToggle />
-    </template>
+    </template> -->
     <template #user-dropdown>
       <UserDropdown
         :avatar
diff --git a/apps/web-antd/src/views/_core/authentication/login.vue b/apps/web-antd/src/views/_core/authentication/login.vue
index 75f19b3..c356b42 100644
--- a/apps/web-antd/src/views/_core/authentication/login.vue
+++ b/apps/web-antd/src/views/_core/authentication/login.vue
@@ -7,7 +7,6 @@ import type { CaptchaResponse } from '#/api/core/captcha';
 import { computed, onMounted, ref, useTemplateRef } from 'vue';
 
 import { AuthenticationLogin, z } from '@vben/common-ui';
-import { DEFAULT_TENANT_ID } from '@vben/constants';
 import { $t } from '@vben/locales';
 
 import { omit } from 'lodash-es';
@@ -16,7 +15,7 @@ import { tenantList } from '#/api';
 import { captchaImage } from '#/api/core/captcha';
 import { useAuthStore } from '#/store';
 
-import { useLoginTenantId } from '../oauth-common';
+// import { useLoginTenantId } from '../oauth-common';
 import OAuthLogin from './oauth-login.vue';
 
 defineOptions({ name: 'Login' });
@@ -68,35 +67,35 @@ onMounted(async () => {
   await Promise.all([loadCaptcha(), loadTenant()]);
 });
 
-const { loginTenantId } = useLoginTenantId();
+// const { loginTenantId } = useLoginTenantId();
 
 const formSchema = computed((): VbenFormSchema[] => {
   return [
-    {
-      component: 'VbenSelect',
-      componentProps: {
-        class: 'bg-background h-[40px] focus:border-primary',
-        contentClass: 'max-h-[256px] overflow-y-auto',
-        options: tenantInfo.value.voList?.map((item) => ({
-          label: item.companyName,
-          value: item.tenantId,
-        })),
-        placeholder: $t('authentication.selectAccount'),
-      },
-      defaultValue: DEFAULT_TENANT_ID,
-      dependencies: {
-        if: () => tenantInfo.value.tenantEnabled,
-        // 可以把这里当做watch
-        trigger: (model) => {
-          // 给oauth登录使用
-          loginTenantId.value = model?.tenantId ?? DEFAULT_TENANT_ID;
-        },
-        triggerFields: ['', 'tenantId'],
-      },
-      fieldName: 'tenantId',
-      label: $t('authentication.selectAccount'),
-      rules: z.string().min(1, { message: $t('authentication.selectAccount') }),
-    },
+    // {
+    //   component: 'VbenSelect',
+    //   componentProps: {
+    //     class: 'bg-background h-[40px] focus:border-primary',
+    //     contentClass: 'max-h-[256px] overflow-y-auto',
+    //     options: tenantInfo.value.voList?.map((item) => ({
+    //       label: item.companyName,
+    //       value: item.tenantId,
+    //     })),
+    //     placeholder: $t('authentication.selectAccount'),
+    //   },
+    //   defaultValue: DEFAULT_TENANT_ID,
+    //   dependencies: {
+    //     if: () => tenantInfo.value.tenantEnabled,
+    //     // 可以把这里当做watch
+    //     trigger: (model) => {
+    //       // 给oauth登录使用
+    //       loginTenantId.value = model?.tenantId ?? DEFAULT_TENANT_ID;
+    //     },
+    //     triggerFields: ['', 'tenantId'],
+    //   },
+    //   fieldName: 'tenantId',
+    //   label: $t('authentication.selectAccount'),
+    //   rules: z.string().min(1, { message: $t('authentication.selectAccount') }),
+    // },
     {
       component: 'VbenInput',
       componentProps: {