refactor: 多租户适配调整

src/views/login/components/Login.vue

@@ -87,7 +87,34 @@
     </div>
 
     <!-- 租户选择对话框 -->
-    <TenantSelectDialog v-model="tenantDialogVisible" @confirm="handleTenantSelected" />
+    <el-dialog
+      v-model="tenantDialogVisible"
+      title="选择登录租户"
+      width="500px"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :show-close="false"
+    >
+      <div class="tenant-select-content">
+        <p class="tenant-select-tip">检测到你的账号属于多个租户，请选择登录租户：</p>
+        <el-radio-group v-model="selectedTenantId" class="tenant-radio-group">
+          <el-radio
+            v-for="tenant in pendingTenants"
+            :key="tenant.id"
+            :label="tenant.id"
+            class="tenant-radio"
+          >
+            {{ tenant.name }}
+          </el-radio>
+        </el-radio-group>
+      </div>
+      <template #footer>
+        <el-button @click="tenantDialogVisible = false">取消</el-button>
+        <el-button type="primary" :disabled="!selectedTenantId" @click="handleTenantSelected">
+          继续
+        </el-button>
+      </template>
+    </el-dialog>
 
     <!-- 第三方登录 -->
     <div class="third-party-login">
@@ -115,13 +142,12 @@
 </template>
 <script setup lang="ts">
 import type { FormInstance } from "element-plus";
-import AuthAPI, { type LoginFormData } from "@/api/auth-api";
+import AuthAPI, { type LoginRequest } from "@/api/auth-api";
 import router from "@/router";
 import { useUserStore } from "@/store";
-import { useTenantStoreHook } from "@/store/modules/tenant-store";
 import CommonWrapper from "@/components/CommonWrapper/index.vue";
 import { AuthStorage } from "@/utils/auth";
-import TenantSelectDialog from "@/components/TenantSelectDialog/index.vue";
+import { ApiCodeEnum } from "@/enums/api/code-enum";
 
 const { t } = useI18n();
 const userStore = useUserStore();
@@ -139,12 +165,12 @@ const captchaBase64 = ref();
 const rememberMe = AuthStorage.getRememberMe();
 // 租户选择对话框
 const tenantDialogVisible = ref(false);
-const tenantStore = useTenantStoreHook();
+const selectedTenantId = ref<number | null>(null);
 
-const loginFormData = ref<LoginFormData>({
+const loginFormData = ref<LoginRequest>({
   username: "admin",
   password: "123456",
-  captchaKey: "",
+  captchaId: "",
   captchaCode: "",
   rememberMe,
 });
@@ -186,12 +212,15 @@ function getCaptcha() {
   codeLoading.value = true;
   AuthAPI.getCaptcha()
     .then((data) => {
-      loginFormData.value.captchaKey = data.captchaKey;
+      loginFormData.value.captchaId = data.captchaId;
       captchaBase64.value = data.captchaBase64;
     })
     .finally(() => (codeLoading.value = false));
 }
 
+// 待选择的租户列表
+const pendingTenants = ref<Array<{ id: number; name: string }>>([]);
+
 /**
  * 登录提交
  */
@@ -204,34 +233,25 @@ async function handleLoginSubmit() {
     loading.value = true;
 
     // 2. 执行登录
-    await userStore.login(loginFormData.value);
-
-    // 3. 登录成功后，检查是否需要选择租户
     try {
-      await tenantStore.fetchTenantList();
-      const tenantList = tenantStore.tenantList;
-
-      // 如果用户有多个租户，且没有当前租户，显示租户选择对话框
-      if (tenantList.length > 1 && !tenantStore.currentTenantId) {
+      await userStore.login(loginFormData.value);
+      // 登录成功，跳转到目标页面
+      const redirectPath = (route.query.redirect as string) || "/";
+      await router.push(decodeURIComponent(redirectPath));
+    } catch (error: any) {
+      // 检查是否是 choose_tenant 响应
+      if (error?.code === ApiCodeEnum.CHOOSE_TENANT && error?.data?.tenants) {
+        // 需要选择租户
+        pendingTenants.value = error.data.tenants;
         tenantDialogVisible.value = true;
         return; // 等待用户选择租户
       }
-
-      // 如果只有一个租户，自动设置
-      if (tenantList.length === 1 && !tenantStore.currentTenantId) {
-        await tenantStore.switchTenant(tenantList[0].id);
-      }
-    } catch (error) {
-      // 如果获取租户列表失败，不影响登录流程（可能是单租户模式）
-      console.warn("获取租户列表失败（可能是单租户模式）:", error);
+      // 其他错误，刷新验证码并显示错误
+      getCaptcha();
+      throw error;
     }
-
-    // 4. 跳转到目标页面
-    const redirectPath = (route.query.redirect as string) || "/";
-    await router.push(decodeURIComponent(redirectPath));
   } catch (error) {
     // 统一错误处理
-    getCaptcha(); // 刷新验证码
     console.error("登录失败:", error);
   } finally {
     loading.value = false;
@@ -242,8 +262,27 @@ async function handleLoginSubmit() {
  * 租户选择确认后的处理
  */
 async function handleTenantSelected() {
-  const redirectPath = (route.query.redirect as string) || "/";
-  await router.push(decodeURIComponent(redirectPath));
+  if (!selectedTenantId.value) {
+    ElMessage.warning("请选择租户");
+    return;
+  }
+
+  try {
+    loading.value = true;
+    // 使用选中的租户ID重新登录（将 tenantId 设置到表单数据中）
+    const loginData = { ...loginFormData.value, tenantId: selectedTenantId.value };
+    await userStore.login(loginData);
+    // 登录成功，关闭对话框并跳转
+    tenantDialogVisible.value = false;
+    const redirectPath = (route.query.redirect as string) || "/";
+    await router.push(decodeURIComponent(redirectPath));
+  } catch (error) {
+    // 登录失败，刷新验证码
+    getCaptcha();
+    console.error("登录失败:", error);
+  } finally {
+    loading.value = false;
+  }
 }
 
 // 检查输入大小写
@@ -293,4 +332,42 @@ function toOtherForm(type: "register" | "resetPwd") {
     }
   }
 }
+
+.tenant-select-content {
+  padding: 20px 0;
+
+  .tenant-select-tip {
+    margin: 0 0 20px;
+    font-size: 14px;
+    color: var(--el-text-color-regular);
+  }
+
+  .tenant-radio-group {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    width: 100%;
+
+    .tenant-radio {
+      display: flex;
+      align-items: center;
+      padding: 12px 16px;
+      border: 1px solid var(--el-border-color);
+      border-radius: 8px;
+      transition: all 0.3s;
+
+      &:hover {
+        background-color: var(--el-color-primary-light-9);
+        border-color: var(--el-color-primary);
+      }
+
+      :deep(.el-radio__input.is-checked) {
+        + .el-radio__label {
+          font-weight: 500;
+          color: var(--el-color-primary);
+        }
+      }
+    }
+  }
+}
 </style>

src/views/login/components/Register.vue

@@ -98,7 +98,7 @@
 import type { FormInstance } from "element-plus";
 import { Lock } from "@element-plus/icons-vue";
 import { useI18n } from "vue-i18n";
-import AuthAPI, { type LoginFormData } from "@/api/auth-api";
+import AuthAPI, { type LoginRequest } from "@/api/auth-api";
 
 const { t } = useI18n();
 
@@ -113,7 +113,7 @@ const isCapsLock = ref(false); // 是否大写锁定
 const captchaBase64 = ref(); // 验证码图片Base64字符串
 const isRead = ref(false);
 
-interface Model extends LoginFormData {
+interface Model extends LoginRequest {
   confirmPassword: string;
 }
 
@@ -121,7 +121,7 @@ const model = ref<Model>({
   username: "admin",
   password: "123456",
   confirmPassword: "",
-  captchaKey: "",
+  captchaId: "",
   captchaCode: "",
   rememberMe: false,
 });
@@ -182,7 +182,7 @@ function getCaptcha() {
   codeLoading.value = true;
   AuthAPI.getCaptcha()
     .then((data) => {
-      model.value.captchaKey = data.captchaKey;
+      model.value.captchaId = data.captchaId;
       captchaBase64.value = data.captchaBase64;
     })
     .finally(() => (codeLoading.value = false));