fix: 文件乱码修复，代码生成指定ts类型，登录移除租户选择

2026-01-16 23:19:29 +08:00
parent 23b789badd
commit da2002f6d0
9 changed files with 65 additions and 153 deletions
--- a/src/api/codegen.ts
+++ b/src/api/codegen.ts
@@ -31,11 +31,18 @@ const GeneratorAPI = {
  },

  /** 获取代码生成预览数据 */
-  getPreviewData(tableName: string, pageType?: "classic" | "curd") {
+  getPreviewData(tableName: string, pageType?: "classic" | "curd", type?: "ts" | "js") {
+    const params: Record<string, string> = {};
+    if (pageType) {
+      params.pageType = pageType;
+    }
+    if (type) {
+      params.type = type;
+    }
    return request<any, GeneratorPreviewItem[]>({
      url: `${GENERATOR_BASE_URL}/${tableName}/preview`,
      method: "get",
-      params: pageType ? { pageType } : undefined,
+      params: Object.keys(params).length ? params : undefined,
    });
  },

@@ -52,11 +59,18 @@ const GeneratorAPI = {
   * @param url
   * @param fileName
   */
-  download(tableName: string, pageType?: "classic" | "curd") {
+  download(tableName: string, pageType?: "classic" | "curd", type?: "ts" | "js") {
+    const params: Record<string, string> = {};
+    if (pageType) {
+      params.pageType = pageType;
+    }
+    if (type) {
+      params.type = type;
+    }
    return request({
      url: `${GENERATOR_BASE_URL}/${tableName}/download`,
      method: "get",
-      params: pageType ? { pageType } : undefined,
+      params: Object.keys(params).length ? params : undefined,
      responseType: "blob",
    }).then((response) => {
      const contentDisposition = response?.headers?.["content-disposition"] as string | undefined;
--- a/src/components/DictSelect/index.vue
+++ b/src/components/DictSelect/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
  <el-select
    v-if="type === 'select'"
    v-model="selectedValue"
@@ -90,7 +90,7 @@ const selectedValue = ref<any>(
      : undefined
 );

-// ç›‘å<EFBFBD>¬ modelValue å’?options çš„å<EFBFBD>˜åŒ?
+// 监听 modelValue 和 options 的变化
 watch(
  [() => props.modelValue, () => options.value],
  ([newValue, newOptions]) => {
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
  <template v-if="tagType">
    <el-tag :type="tagType" :size="tagSize">{{ label }}</el-tag>
  </template>
@@ -12,7 +12,7 @@ import { useDictStore } from "@/store";

 const props = defineProps({
  code: String, // 字典编码
-  modelValue: [String, Number], // å—å…¸é¡¹çš„å€?
+  modelValue: [String, Number], // 字典项的值
  size: {
    type: String,
    default: "default", // 标签大小
@@ -26,10 +26,10 @@ const tagSize = ref<"default" | "large" | "small">(props.size as "default" | "la
 const dictStore = useDictStore();

 /**
- * æ ¹æ<EFBFBD>®å—å…¸é¡¹çš„å€¼èŽ·å<EFBFBD>–å¯¹åº”çš„ label å’?tagType
+ * 根据字典项的值获取对应的 label 和 tagType
 * @param dictCode 字典编码
- * @param value å—å…¸é¡¹çš„å€?
- * @returns åŒ…å<EFBFBD>« label å’?tagType çš„å¯¹è±?
+ * @param value 字典项的值
+ * @returns 包含 label 和 tagType 的对象
 */
 const getLabelAndTagByValue = async (dictCode: string, value: any) => {
  // 按需加载字典数据
@@ -45,7 +45,7 @@ const getLabelAndTagByValue = async (dictCode: string, value: any) => {
 };

 /**
- * æ›´æ–° label å’?tagType
+ * 更新 label 和 tagType
 */
 const updateLabelAndTag = async () => {
  if (!props.code || props.modelValue === undefined) return;
--- a/src/layouts/components/LayoutNavbar.vue
+++ b/src/layouts/components/LayoutNavbar.vue
@@ -3,10 +3,10 @@
    <div class="flex-y-center">
      <!-- 菜单折叠按钮 -->
      <Hamburger :is-active="isSidebarOpened" @toggle-click="toggleSideBar" />
-      <!-- é<EFBFBD>¢åŒ…å±‘å¯¼èˆ?-->
+      <!-- 面包屑导行栏-->
      <Breadcrumb />
    </div>
-    <!-- å¯¼èˆªæ <EFBFBD>æ“<EFBFBD>ä½œåŒºåŸ?-->
+    <!-- 导航栏操作区域-->
    <div class="navbar__actions">
      <LayoutToolbar />
    </div>
--- a/src/layouts/components/LayoutSidebar.vue
+++ b/src/layouts/components/LayoutSidebar.vue
@@ -14,7 +14,7 @@
    @open="onMenuOpen"
    @close="onMenuClose"
  >
-    <!-- 闖懷黒鬘?-->
+    <!-- 菜单项 -->
    <LayoutSidebarItem
      v-for="route in data"
      :key="route.path"
@@ -63,10 +63,10 @@ const expandedMenuIndexes = ref<string[]>([]);
 // 获取主题
 const theme = computed(() => settingsStore.theme);

-// 闔ｷ蜿匁ｵ<EFBFBD>牡荳ｻ鬚倅ｸ狗噪萓ｧ霎ｹ譬城<EFBFBD>濶ｲ譁ｹ譯?
+// 获取浅色主题下的侧边栏配色方案
 const sidebarColorScheme = computed(() => settingsStore.sidebarColorScheme);

-// 闖懷黒荳ｻ鬚伜ｱ樊?
+// 菜单主题属性
 const menuThemeProps = computed(() => {
  const isDarkOrClassicBlue =
    theme.value === "dark" || sidebarColorScheme.value === SidebarColor.CLASSIC_BLUE;
@@ -78,11 +78,11 @@ const menuThemeProps = computed(() => {
  };
 });

-// 隶｡邂怜ｽ灘燕豼豢ｻ逧<EFBFBD>除蜊暮｡?
+// 计算当前激活的菜单项
 const activeMenuPath = computed((): string => {
  const { meta, path } = currentRoute;

-  // 螯よ棡霍ｯ逕ｱmeta荳ｭ隶ｾ鄂ｮ莠<EFBFBD>ctiveMenu<EFBFBD>悟<EFBFBD>菴ｿ逕ｨ螳<EFBFBD>ｼ育畑莠主､<EFBFBD>炊荳莠帷音谿頑ュ蜀ｵ<EFBFBD>悟ｦりｯｦ諠<EFBFBD>｡ｵ<EFBFBD>?
+  // 如果路由 meta 中设置了 activeMenu，则使用它（用于处理一些特殊情况，如详情页等）
  if (meta?.activeMenu && typeof meta.activeMenu === "string") {
    return meta.activeMenu;
  }
@@ -94,8 +94,8 @@ const activeMenuPath = computed((): string => {
 /**
 * 获取完整路径
 *
- * @param routePath 蠖灘燕霍ｯ逕ｱ逧<EFBFBD>嶌蟇ｹ霍ｯ蠕? /user
- * @returns 螳梧紛逧<EFBFBD>ｻ晏ｯｹ霍ｯ蠕?D://vue3-element-admin/system/user
+ * @param routePath 当前路由的相对路径 /user
+ * @returns 完整的绝对路径 D://vue3-element-admin/system/user
 */
 function resolveFullPath(routePath: string) {
  if (isExternal(routePath)) {
@@ -143,8 +143,8 @@ watch(
 );

 /**
- * 逶大成闖懷黒讓｡蠑丞序蛹厄ｼ壼ｽ楢除蜊墓ｨ｡蠑丞<EFBFBD>謐｢荳ｺ豌ｴ蟷ｳ讓｡蠑乗慮<EFBFBD>悟<EFBFBD>髣ｭ謇譛牙ｱ募ｼ逧<EFBFBD>除蜊暮｡ｹ<EFBFBD>?
- * 驕ｿ蜈榊惠豌ｴ蟷ｳ讓｡蠑丈ｸ玖除蜊暮｡ｹ譏ｾ遉ｺ髞吩ｽ阪?
+ * 监听菜单模式变化：当菜单模式切换为水平模式时，关闭所有展开的菜单项
+ * 避免在水平模式下菜单项显示错位
 */
 watch(
  () => props.menuMode,
@@ -156,7 +156,7 @@ watch(
 );

 /**
- * 逶大成豼豢ｻ闖懷黒蜿伜喧<EFBFBD>御ｸｺ蛹<EFBFBD>性豼豢ｻ蟄占除蜊慕噪辷ｶ闖懷黒豺ｻ蜉<EFBFBD>譬ｷ蠑冗ｱ?
+ * 监听激活菜单变化，为包含激活子菜单的父菜单添加样式
 */
 watch(
  () => activeMenuPath.value,
@@ -169,7 +169,7 @@ watch(
 );

 /**
- * 逶大成霍ｯ逕ｱ蜿伜喧<EFBFBD>檎｡ｮ菫晁除蜊戊<EFBFBD>髫週agsView蛻<EFBFBD>困閠梧ｭ｣遑ｮ豼豢?
+ * 监听路由变化，确保菜单能随 TagsView 切换而正确激活
 */
 watch(
  () => currentRoute.path,
@@ -181,7 +181,7 @@ watch(
 );

 /**
- * 譖ｴ譁ｰ辷ｶ闖懷黒譬ｷ蠑?- 荳ｺ蛹<EFBDBA>性豼豢ｻ蟄占除蜊慕噪辷ｶ闖懷黒豺ｻ蜉<EFBDBB> has-active-child 邀?
+ * 更新父菜单样式 - 为包含激活子菜单的父菜单添加 has-active-child 类
 */
 function updateParentMenuStyles() {
  if (!menuRef.value?.$el) return;
@@ -191,13 +191,13 @@ function updateParentMenuStyles() {
      const menuEl = menuRef.value?.$el as HTMLElement;
      if (!menuEl) return;

-      // 遘ｻ髯､謇譛臥鴫譛臥噪 has-active-child 邀?
+      // 移除所有现有的 has-active-child 类
      const allSubMenus = menuEl.querySelectorAll(".el-sub-menu");
      allSubMenus.forEach((subMenu) => {
        subMenu.classList.remove("has-active-child");
      });

-      // 譟･謇ｾ蠖灘燕豼豢ｻ逧<EFBFBD>除蜊暮｡?
+      // 查找当前激活的菜单项
      const activeMenuItem = menuEl.querySelector(".el-menu-item.is-active");

      if (activeMenuItem) {
@@ -210,12 +210,12 @@ function updateParentMenuStyles() {
          parent = parent.parentElement;
        }
      } else {
-        // 豌ｴ蟷ｳ讓｡蠑丈ｸ句庄閭ｽ髴隕∫音谿雁､<EFBFBD><EFBFBD>?
+        // 水平模式下可能需要特殊处理
        if (props.menuMode === "horizontal") {
-          // 蟇ｹ莠取ｰｴ蟷ｳ闖懷黒<EFBFBD>御ｽｿ逕ｨ霍ｯ蠕<EFBFBD>源驟肴擂謇ｾ蛻ｰ辷ｶ闖懷<EFBFBD>?
+          // 对于水平菜单，使用路径匹配来找到父菜单
          const currentPath = activeMenuPath.value;

-          // 譟･謇ｾ謇譛臥宛闖懷黒鬘ｹ<EFBFBD>梧｣譟･蜩ｪ荳ｪ蛹<EFBFBD>性蠖灘燕霍ｯ蠕?
+          // 查找所有父菜单项，检查哪个包含当前路径
          allSubMenus.forEach((subMenu) => {
            const subMenuEl = subMenu as HTMLElement;
            const subMenuPath =
@@ -239,7 +239,7 @@ function updateParentMenuStyles() {
 * 组件挂载后立即更新父菜单样式
 */
 onMounted(() => {
-  // 遑ｮ菫晏惠扈<EFBFBD>ｻｶ謖りｽｽ蜷取峩譁ｰ譬ｷ蠑擾ｼ御ｸ堺ｾ晁ｵ紋ｺ主ｼよｭ･謫堺ｽ?
+  // 确保在组件挂载后更新样式，不依赖于异步操作
  updateParentMenuStyles();
 });
 </script>
--- a/src/layouts/components/LayoutToolbar.vue
+++ b/src/layouts/components/LayoutToolbar.vue
@@ -94,18 +94,18 @@ const router = useRouter();
 // 是否为桌面设备
 const isDesktop = computed(() => appStore.device === DeviceEnum.DESKTOP);

-// 是否显示租户选择（如果用户有多个租户，则显示租户选择器）
-// 最小侵入：只有在多租户模式下（租户列表长度 > 1）才显示
+const isPlatformUser = computed(() => {
+  return (userStore.userInfo?.tenantScope || "").toUpperCase() === "PLATFORM";
+});
+
+// 是否显示租户选择（仅平台用户可显式切换租户）
 const showTenantSelect = computed(() => {
-  // 如果租户列表为空，不显示
-  if (tenantStore.tenantList.length === 0) {
+  if (!isPlatformUser.value) {
    return false;
  }
-  // 如果只有一个租户，也不显示（单租户模式，用户无感知）
-  if (tenantStore.tenantList.length === 1) {
+  if (tenantStore.tenantList.length <= 1) {
    return false;
  }
-  // 多个租户时才显示
  return true;
 });

--- a/src/types/api/user.ts
+++ b/src/types/api/user.ts
@@ -14,6 +14,8 @@ export interface UserInfo {
  nickname?: string;
  /** 头像URL */
  avatar?: string;
+  /** 租户身份标识(PLATFORM/TENANT) */
+  tenantScope?: string;
  /** 角色集合 */
  roles: string[];
  /** 权限集合 */
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -540,6 +540,7 @@ const treeData = ref<TreeNode[]>([]);
 const previewScope = ref<"all" | "frontend" | "backend">("all");
 const previewTypeOptions = ["ts", "vue", "java", "xml"];
 const previewTypes = ref<string[]>([...previewTypeOptions]);
+const frontendType = "ts";

 const filteredTreeData = computed<TreeNode[]>(() => {
  if (!treeData.value.length) return [];
@@ -808,7 +809,11 @@ function handleNextClick() {
        return;
      }
      if (outputMode.value === "zip" || !supportsFSAccess) {
-        GeneratorAPI.download(tableName, (genConfigFormData.value.pageType as any) || "classic");
+        GeneratorAPI.download(
+          tableName,
+          (genConfigFormData.value.pageType as any) || "classic",
+          frontendType
+        );
      }
    }
  }
@@ -904,7 +909,8 @@ async function handlePreview(tableName: string) {
  try {
    const data = await GeneratorAPI.getPreviewData(
      tableName,
-      (genConfigFormData.value.pageType as any) || "classic"
+      (genConfigFormData.value.pageType as any) || "classic",
+      frontendType
    );
    dialog.title = `代码生成 ${tableName}`;
    const tree = buildTree(data);
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -91,30 +91,6 @@
      </el-link>
    </div>

-    <!-- 租户选择对话框 -->
-    <el-dialog
-      v-model="tenantDialogVisible"
-      title="选择登录租户"
-      :width="isSmallScreen ? '92vw' : '500px'"
-      :fullscreen="isSmallScreen"
-      append-to-body
-      :teleported="true"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :show-close="false"
-    >
-      <div class="tenant-select-content" :style="tenantDialogBodyStyle">
-        <p class="tenant-select-tip">检测到你的账号属于多个租户，请选择登录租户：</p>
-        <TenantSwitcher @change="handleTenantSwitcherChange" />
-      </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">
      <div class="divider-container">
@@ -145,14 +121,10 @@ import AuthAPI from "@/api/auth";
 import type { LoginRequest } from "@/types/api";
 import router from "@/router";
 import { useUserStore } from "@/store";
-import { useTenantStoreHook } from "@/store/modules/tenant";
-import TenantSwitcher from "@/components/TenantSwitcher/index.vue";
 import { AuthStorage } from "@/utils/auth";
-import { ApiCodeEnum } from "@/enums";

 const { t } = useI18n();
 const userStore = useUserStore();
-const tenantStore = useTenantStoreHook();
 const route = useRoute();

 onMounted(() => getCaptcha());
@@ -161,35 +133,10 @@ const loginFormRef = ref<FormInstance>();
 const loading = ref(false);
 // 是否大写锁定
 const isCapsLock = ref(false);
-const isSmallScreen = useMediaQuery("(max-width: 768px)");
 // 验证码图片 Base64
 const captchaBase64 = ref();
 // 记住我
 const rememberMe = AuthStorage.getRememberMe();
-// 租户选择对话框
-const tenantDialogVisible = ref(false);
-const selectedTenantId = ref<number | null>(null);
-
-function handleTenantSwitcherChange(id: number) {
-  selectedTenantId.value = id;
-  tenantStore.currentTenantId = id;
-  const matched = tenantStore.tenantList?.find((t) => t.id === id) || null;
-  tenantStore.currentTenant = matched;
-}
-
-const tenantDialogBodyStyle = computed(() => {
-  if (isSmallScreen.value) {
-    return {
-      maxHeight: "calc(100vh - 160px)",
-      overflow: "auto",
-    };
-  }
-  return {
-    maxHeight: "60vh",
-    overflow: "auto",
-  };
-});
-
 const loginFormData = ref<LoginRequest>({
  username: "admin",
  password: "123456",
@@ -258,25 +205,8 @@ async function handleLoginSubmit() {
      // 登录成功，跳转到目标页面
      const redirectPath = (route.query.redirect as string) || "/";
      await router.push(decodeURIComponent(redirectPath));
-    } catch (error: any) {
-      // 检查是否是 choose_tenant 响应
-      if (
-        error?.code === ApiCodeEnum.CHOOSE_TENANT &&
-        Array.isArray(error?.data) &&
-        error.data.length > 0
-      ) {
-        // 需要选择租户
-        tenantStore.setTenantList(error.data);
-        selectedTenantId.value = error.data[0]?.id || null;
-        if (selectedTenantId.value) {
-          tenantStore.currentTenantId = selectedTenantId.value;
-          tenantStore.currentTenant =
-            error.data.find((t: any) => t.id === selectedTenantId.value) || null;
-        }
-        tenantDialogVisible.value = true;
-        return; // 等待用户选择租户
-      }
-      // 其他错误，刷新验证码
+    } catch (error) {
+      // 登录失败，刷新验证码
      getCaptcha();
      throw error;
    }
@@ -288,36 +218,6 @@ async function handleLoginSubmit() {
  }
 }

-/**
- * 租户选择确认后的处理
- */
-async function handleTenantSelected() {
-  if (!selectedTenantId.value) {
-    ElMessage.warning("请选择租户");
-    return;
-  }
-
-  try {
-    loading.value = true;
-    // 使用选中的租户ID重新登录
-    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;
-  }
-}
-
 // 检查输入大小写
 function checkCapsLock(event: KeyboardEvent) {
  // 防止浏览器密码自动填充时报错
@@ -389,14 +289,4 @@ 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);
-  }
-}
 </style>