@pubinfo/core 2.0.0-rc.3 → 2.0.0-rc.4

package/src/built-in/layout-component/components/Tools/index.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { DropdownMenuRender } from './interface';
-import { useI18n } from 'vue-i18n';
 import CarbonUserAvatarFilledAlt from '~icons/carbon/user-avatar-filled-alt';
 import MaterialSymbolsExpandMoreRounded from '~icons/material-symbols/expand-more-rounded';
 
@@ -31,9 +30,7 @@ const props = withDefaults(
 );
 
 const router = useRouter();
-const { settingsStore, userStore, generateI18nTitle } = useContext();
-
-const { t } = useI18n();
+const { settingsStore, userStore, generateTitle } = useContext();
 
 const hotkeysIntroRef = ref();
 const preferencesRef = ref();
@@ -42,28 +39,28 @@ const userMenu = computed(() => {
   return {
     Home: {
       key: 'home',
-      label: generateI18nTitle('route.home', settingsStore.settings.home.title),
+      label: generateTitle(settingsStore.settings.home.title),
       icon: 'i-ant-design:home-twotone',
       onClick: () => router.push({ name: 'Home' }),
       hide: !settingsStore.settings.home.enable,
     },
     Preferences: {
       key: 'preferences',
-      label: t('app.preferences'),
+      label: '个人偏好设置',
       icon: 'i-iconamoon-star-duotone',
       onClick: () => preferencesRef.value?.open?.(),
       hide: !settingsStore.settings.app.enableUserPreferences,
     },
     Hotkeys: {
       key: 'hotkeys',
-      label: t('app.hotkeys'),
+      label: '快捷键介绍',
       icon: 'i-iconamoon-lightning-2-duotone',
       onClick: () => hotkeysIntroRef.value?.open?.(),
       hide: settingsStore.mode !== 'pc',
     },
     Org: {
       key: 'org',
-      label: t('app.changeOrg'),
+      label: '切换组织',
       icon: 'i-iconamoon-synchronize-duotone',
       onClick: () => router.push({
         name: 'ChangeOrganization',
@@ -73,13 +70,13 @@ const userMenu = computed(() => {
     },
     Profile: {
       key: 'profile',
-      label: t('route.personal.profile'),
+      label: '个人中心',
       icon: 'i-iconamoon-profile-duotone',
       onClick: () => router.push({ name: 'Profile' }),
     },
     Password: {
       key: 'password',
-      label: t('app.changePassword'),
+      label: '修改密码',
       icon: 'i-iconamoon-lock-duotone',
       onClick: () => router.push({
         name: 'ChangePassword',
@@ -90,7 +87,7 @@ const userMenu = computed(() => {
     },
     Logout: {
       key: 'logout',
-      label: t('app.logout'),
+      label: '退出登录',
       icon: 'i-iconamoon-arrow-left-3-square-duotone',
       onClick: () => userStore.logout(),
     },

package/src/built-in/layout-component/components/Topbar/Tabbar/MoreAction.vue

@@ -2,7 +2,6 @@
 import type { Tabbar } from '#/tabbar';
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-vue';
 import Sortable from 'sortablejs';
-import { useI18n } from 'vue-i18n';
 import EpClose from '~icons/ep/close';
 import EpSearch from '~icons/ep/search';
 import PhArrowLineLeft from '~icons/ph/arrow-line-left';
@@ -22,12 +21,10 @@ defineOptions({
 
 const router = useRouter();
 
-const { settingsStore, tabbarStore, generateI18nTitle } = useContext();
+const { settingsStore, tabbarStore, generateTitle } = useContext();
 
 const tabbar = useTabbar();
 
-const { t } = useI18n();
-
 const activedTabId = computed(() => tabbar.getId());
 
 const dropdownTabContainerRef = ref();
@@ -99,22 +96,22 @@ function iconName(isActive: boolean, icon: Tabbar.recordRaw['icon'], activeIcon:
       <template #dropdown>
         <div class="quick-button">
           <button v-if="settingsStore.settings.navSearch.enable" class="button" @click="actionCommand('search-tabs')">
-            <HTooltip :text="t('app.tabbar.searchTabs')">
+            <HTooltip text="搜索标签页">
               <EpSearch />
             </HTooltip>
           </button>
           <button class="button" :disabled="!tabbar.checkCloseOtherSide()" @click="actionCommand('other-side')">
-            <HTooltip :text="t('app.tabbar.closeOtherSide')">
+            <HTooltip text="关闭其它标签页">
               <EpClose />
             </HTooltip>
           </button>
           <button class="button" :disabled="!tabbar.checkCloseLeftSide()" @click="actionCommand('left-side')">
-            <HTooltip :text="t('app.tabbar.closeLeftSide')">
+            <HTooltip text="关闭左侧标签页">
               <PhArrowLineLeft />
             </HTooltip>
           </button>
           <button class="button" :disabled="!tabbar.checkCloseRightSide()" @click="actionCommand('right-side')">
-            <HTooltip :text="t('app.tabbar.closeRightSide')">
+            <HTooltip text="关闭右侧标签页">
               <PhArrowLineRight />
             </HTooltip>
           </button>
@@ -127,9 +124,9 @@ function iconName(isActive: boolean, icon: Tabbar.recordRaw['icon'], activeIcon:
                 'no-drag': element.isPermanent || element.isPin,
               }"
             >
-              <div :key="element.tabId" class="title" :title="element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateI18nTitle(element.title)" @click="router.push(element.fullPath)">
+              <div :key="element.tabId" class="title" :title="element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateTitle(element.title)" @click="router.push(element.fullPath)">
                 <PubinfoIcon v-if="settingsStore.settings.tabbar.enableIcon && iconName(element.tabId === activedTabId, element.icon, element.activeIcon)" :name="iconName(element.tabId === activedTabId, element.icon, element.activeIcon)!" />
-                {{ element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateI18nTitle(element.i18n, element.title) }}
+                {{ element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateTitle(element.title) }}
               </div>
               <div v-if="!element.isPermanent && element.isPin" class="action-icon" @click.stop="tabbarStore.unPin(element.tabId)">
                 <RiPushpin2Fill />

package/src/built-in/layout-component/components/Topbar/Tabbar/index.vue

@@ -4,7 +4,6 @@ import ContextMenu from '@imengyu/vue3-context-menu';
 import { useMagicKeys } from '@vueuse/core';
 import hotkeys from 'hotkeys-js';
 import Sortable from 'sortablejs';
-import { useI18n } from 'vue-i18n';
 import Message from 'vue-m-message';
 import RiCloseFill from '~icons/ri/close-fill';
 import RiPushpin2Fill from '~icons/ri/pushpin-2-fill';
@@ -23,15 +22,13 @@ defineOptions({
 const route = useRoute();
 const router = useRouter();
 
-const { settingsStore, tabbarStore, generateI18nTitle } = useContext();
+const { settingsStore, tabbarStore, generateTitle } = useContext();
 
 const tabbar = useTabbar();
 const mainPage = useMainPage();
 
 const keys = useMagicKeys({ reactive: true });
 
-const { t } = useI18n();
-
 const activedTabId = computed(() => tabbar.getId());
 const isShowMoreAction = computed(() => tabbarStore.list.length > 1 && (tabbar.checkCloseOtherSide() || tabbar.checkCloseLeftSide() || tabbar.checkCloseRightSide()));
 
@@ -162,13 +159,13 @@ function onTabbarContextmenu(event: MouseEvent, routeItem: Tabbar.recordRaw) {
     customClass: 'tabbar-contextmenu',
     items: [
       {
-        label: t('app.tabbar.reload'),
+        label: '重新加载',
         icon: 'i-ri-refresh-line',
         disabled: routeItem.tabId !== activedTabId.value,
         onClick: () => mainPage.reload(),
       },
       {
-        label: t('app.tabbar.close'),
+        label: '关闭标签页',
         icon: 'i-ri-close-line',
         disabled: tabbarStore.list.length <= 1 || routeItem.isPin || routeItem.isPermanent,
         divided: true,
@@ -177,7 +174,7 @@ function onTabbarContextmenu(event: MouseEvent, routeItem: Tabbar.recordRaw) {
         },
       },
       {
-        label: routeItem.isPin ? t('app.tabbar.unpin') : t('app.tabbar.pin'),
+        label: routeItem.isPin ? '取消固定' : '固定',
         icon: routeItem.isPin ? 'i-lucide-pin-off' : 'i-lucide-pin',
         // 主页不允许被固定，因为如果固定主页且主页未启用，会导致登录时进入路由死循环状态
         disabled: routeItem.fullPath === '/' || routeItem.isPermanent,
@@ -191,7 +188,7 @@ function onTabbarContextmenu(event: MouseEvent, routeItem: Tabbar.recordRaw) {
         },
       },
       {
-        label: t('app.tabbar.maximize'),
+        label: '最大化',
         icon: 'i-ri-picture-in-picture-exit-line',
         onClick: () => {
           if (routeItem.tabId !== activedTabId.value) {
@@ -202,21 +199,21 @@ function onTabbarContextmenu(event: MouseEvent, routeItem: Tabbar.recordRaw) {
         },
       },
       {
-        label: t('app.tabbar.closeOtherSide'),
+        label: '关闭其它标签页',
         disabled: !tabbar.checkCloseOtherSide(routeItem.tabId),
         onClick: () => {
           tabbar.closeOtherSide(routeItem.tabId);
         },
       },
       {
-        label: t('app.tabbar.closeLeftSide'),
+        label: '关闭左侧标签页',
         disabled: !tabbar.checkCloseLeftSide(routeItem.tabId),
         onClick: () => {
           tabbar.closeLeftSide(routeItem.tabId);
         },
       },
       {
-        label: t('app.tabbar.closeRightSide'),
+        label: '关闭右侧标签页',
         disabled: !tabbar.checkCloseRightSide(routeItem.tabId),
         onClick: () => {
           tabbar.closeRightSide(routeItem.tabId);
@@ -319,7 +316,7 @@ onUnmounted(() => {
             'actived': element.tabId === activedTabId,
             'no-drag': element.isPermanent || element.isPin,
           }"
-          :title="element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateI18nTitle(element.i18n, element.title)"
+          :title="element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateTitle(element.title)"
           @click="router.push(element.fullPath)"
           @dblclick="settingsStore.setMainPageMaximize()"
           @contextmenu="onTabbarContextmenu($event, element)"
@@ -333,7 +330,7 @@ onUnmounted(() => {
                 :name="iconName(element.tabId === activedTabId, element.icon, element.activeIcon)!"
                 class="icon"
               />
-              {{ element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateI18nTitle(element.i18n, element.title) }}
+              {{ element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateTitle(element.title) }}
             </div>
             <div v-if="!element.isPermanent && element.isPin" class="action-icon" @click.stop="tabbarStore.unPin(element.tabId)" @dblclick.stop>
               <RiPushpin2Fill text="10px" />

package/src/built-in/layout-component/components/Topbar/Toolbar/Favorites.vue

@@ -2,7 +2,6 @@
 import { isUndefined } from 'lodash-es';
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-vue';
 import Sortable from 'sortablejs';
-import { useI18n } from 'vue-i18n';
 import FluentDelete24Filled from '~icons/fluent/delete-24-filled';
 import FluentStarAdd16Regular from '~icons/fluent/star-add-16-regular';
 import FluentStarDismiss16Regular from '~icons/fluent/star-dismiss-16-regular';
@@ -15,9 +14,7 @@ defineOptions({
 
 const route = useRoute();
 const router = useRouter();
-const { favoritesStore, routeStore, generateI18nTitle } = useContext();
-const { t } = useI18n();
-
+const { favoritesStore, routeStore, generateTitle } = useContext();
 const favoritesContainerRef = ref<HTMLElement | null>(null);
 
 let _favoritesSortable: Sortable | null = null;
@@ -46,7 +43,7 @@ watch(favoritesContainerRef, (newSortableContainer) => {
   <div class="favorites-container w-80 dark:bg-[var(--g-container-bg)]">
     <div class="flex items-center justify-between px-4 py-3">
       <div class="text-sm font-bold">
-        {{ t('app.tabbar.favorites.my-favorites') }}
+        {{ '我的收藏夾' }}
       </div>
       <template v-if="favoritesStore.canAdd(route.fullPath, routeStore.routes)">
         <FluentStarAdd16Regular
@@ -81,13 +78,13 @@ watch(favoritesContainerRef, (newSortableContainer) => {
         <div
           v-for="item in favoritesStore.list"
           :key="item.fullPath"
-          :title="generateI18nTitle(item.i18n, item.title)"
+          :title="generateTitle(item.title)"
           class="draggable-item relative w-[calc(50%-0.25rem)] flex cursor-pointer items-center gap-1 rounded px-2 py-2 ring-1 ring-stone-3 ring-inset hover:bg-stone-1 dark:ring-stone-7 dark:hover:bg-dark/50"
           @click="router.push(item.fullPath)"
         >
           <PubinfoIcon v-if="item.icon" :name="item.icon" :size="18" />
           <div class="name flex-1 truncate pe-4">
-            {{ generateI18nTitle(item.i18n, item.title) }}
+            {{ generateTitle(item.title) }}
           </div>
           <FluentDelete24Filled
             text-12px

package/src/built-in/layout-component/components/Topbar/Toolbar/index.vue

@@ -17,7 +17,7 @@ defineOptions({
 const route = useRoute();
 const router = useRouter();
 
-const { settingsStore, menuStore, generateI18nTitle } = useContext();
+const { settingsStore, menuStore, generateTitle } = useContext();
 
 /**
  * 计算属性：是否启用子菜单折叠按钮
@@ -52,7 +52,7 @@ const breadcrumbIsShow = computed(() =>
 function createHomeBreadcrumb() {
   return {
     path: '/',
-    title: generateI18nTitle('route.home', settingsStore.settings.home.title),
+    title: generateTitle(settingsStore.settings.home.title),
   };
 }
 
@@ -78,7 +78,7 @@ const breadcrumbList = computed(() => {
       breadcrumbList.push({
         path: `__MAIN__${index}`,
         mainIndex: index,
-        title: generateI18nTitle(menuStore.allMenus[index].meta?.i18n, menuStore.allMenus[index].meta?.title),
+        title: generateTitle(menuStore.allMenus[index].meta?.title),
       });
     }
   }
@@ -88,7 +88,7 @@ const breadcrumbList = computed(() => {
       if (item.hide === false) {
         breadcrumbList.push({
           path: item.path,
-          title: generateI18nTitle(item.i18n, item.title),
+          title: generateTitle(item.title),
         });
       }
     });
@@ -155,14 +155,14 @@ function getCurrentBreadcrumb(path: string) {
     const main = menuStore.allMenus[idx];
     if (main) {
       const mapNode = (r: any): any => ({
-        title: generateI18nTitle(r.meta?.i18n, r.meta?.title),
+        title: generateTitle(r.meta?.title),
         path: r.path,
         children: (r.children || [])
           .filter((c: any) => c.meta?.sidebar !== false)
           .map((c: any) => mapNode(c)),
       });
       return {
-        title: generateI18nTitle(main.meta?.i18n, main.meta?.title),
+        title: generateTitle(main.meta?.title),
         path,
         children: (main.children || [])
           .filter(c => c.meta?.sidebar !== false)

package/src/built-in/layout-component/composables/useContext.ts

@@ -22,7 +22,7 @@ interface LayoutContext {
 
   appTitle: string
   isDev: boolean
-  generateI18nTitle: any
+  generateTitle: (titile?: string | (() => any)) => string
 }
 
 const layoutInjectionKey: InjectionKey<LayoutContext> = Symbol('Layout');

package/src/built-in/layout-component/composables/useTitle.ts

@@ -1,9 +1,8 @@
 import type { useSettingsStore } from '@/features/stores';
-import { useI18n } from 'vue-i18n';
 
 export function useTitle(appTitle: string, settingsStore: ReturnType<typeof useSettingsStore>) {
-  const { t, te } = useI18n();
   const routeInfo = useRoute();
+
   watch(
     [
       () => settingsStore.settings.app.enableDynamicTitle,
@@ -13,11 +12,7 @@ export function useTitle(appTitle: string, settingsStore: ReturnType<typeof useS
     () => {
       if (settingsStore.settings.app.enableDynamicTitle && settingsStore.title) {
         const title = settingsStore.customTitleList.find(item => item.fullPath === routeInfo.fullPath)?.title
-          || (
-            routeInfo.meta.breadcrumbNeste?.at(-1)?.i18n
-              ? generateI18nTitle(routeInfo.meta.breadcrumbNeste?.at(-1)?.i18n, settingsStore.title)
-              : generateI18nTitle(routeInfo.meta.i18n, settingsStore.title)
-          );
+          || generateTitle(settingsStore.title);
         document.title = `${title} - ${appTitle}`;
       }
       else {
@@ -27,14 +22,13 @@ export function useTitle(appTitle: string, settingsStore: ReturnType<typeof useS
     {
       deep: true,
     });
-  function generateI18nTitle(key?: string, defaultTitle: string | (() => any) = t('route.undefined')) {
-    return (settingsStore.settings.toolbar.enableI18n && !!key && te(key))
-      ? t(key)
-      : typeof defaultTitle === 'function'
-        ? defaultTitle()
-        : defaultTitle;
+
+  function generateTitle(defaultTitle: string | (() => any) = '[ 无标题 ]') {
+    return typeof defaultTitle === 'function'
+      ? defaultTitle()
+      : defaultTitle;
   }
   return {
-    generateI18nTitle,
+    generateTitle,
   };
 }

package/src/built-in/layout-component/provider.ts

@@ -38,7 +38,7 @@ export const Provider = defineComponent({
     const tabbarStore = useTabbarStore();
     const favoritesStore = useFavoritesStore();
 
-    const { generateI18nTitle } = useTitle(props.appTitle, settingsStore);
+    const { generateTitle } = useTitle(props.appTitle, settingsStore);
 
     createContext({
       settingsStore,
@@ -52,7 +52,7 @@ export const Provider = defineComponent({
 
       appTitle: props.appTitle,
       isDev: props.isDev,
-      generateI18nTitle,
+      generateTitle,
     });
 
     return () => h(

package/src/core/interface.ts

@@ -1,5 +1,5 @@
 import type { AdapterCreateOptions, AlovaAxiosRequestConfig } from '@alova/adapter-axios';
-import type { Alova, AlovaGenerics, AlovaOptions, Method } from 'alova';
+import type { Alova, AlovaGenerics, AlovaOptions, Method, ResponseCompleteHandler, ResponseErrorHandler } from 'alova';
 import type { AxiosResponse, AxiosResponseHeaders } from 'axios';
 import type { Pinia } from 'pinia';
 import type { App, Component } from 'vue';
@@ -77,13 +77,26 @@ export type FalsyModule = false | null | undefined;
 
 export type ModuleOptions = Module | ModuleOptions[] | FalsyModule;
 
-type AG = AlovaGenerics<any, any, AlovaAxiosRequestConfig, AxiosResponse<any, any>, AxiosResponseHeaders, any, any, any>;
+export type AG = AlovaGenerics<any, any, AlovaAxiosRequestConfig, AxiosResponse<any, any>, AxiosResponseHeaders, any, any, any>;
 
-export type RequestOptions = Omit<AlovaOptions<AG>, 'statesHook' | 'requestAdapter'> & { axios?: AdapterCreateOptions };
+export type RequestOptions = Omit<AlovaOptions<AG>, 'statesHook' | 'requestAdapter' | 'beforeRequest' | 'responded'> & {
+  axios?: AdapterCreateOptions
+  beforeRequest?: Hooks['http:request']
+  responded?: Hooks['http:response']
+};
 export type RequestInstance = Alova<AG>;
 export type RequestMethod = Method<AG>;
 
 export interface Hooks {
-  'http:request': AlovaOptions<AG>['beforeRequest']
-  'http:response': AlovaOptions<AG>['responded']
+  'http:request': (method: Method<AG>) => void | Promise<void>
+  'http:response': RespondedHandler<AG> | RespondedHandlerRecord<AG>
+}
+
+// overwrite alova
+type Fn = () => void;
+export type RespondedHandler<AG extends AlovaGenerics> = (response: AG['Response'], methodInstance: Method<AG>, stop: Fn) => any;
+export interface RespondedHandlerRecord<AG extends AlovaGenerics> {
+  onSuccess?: RespondedHandler<AG>
+  onError?: ResponseErrorHandler<AG>
+  onComplete?: ResponseCompleteHandler<AG>
 }

package/src/core/request.ts

@@ -1,8 +1,8 @@
+import type { AxiosResponse } from 'axios';
 import type { RequestOptions } from './interface';
 import { axiosRequestAdapter } from '@alova/adapter-axios';
 import { createAlova } from 'alova';
 import vueHook from 'alova/vue';
-import { createTokenAuthentication } from '@/built-in';
 import { hooks } from './ctx';
 
 function normalizedResponded(handler: RequestOptions['responded']) {
@@ -12,9 +12,13 @@ function normalizedResponded(handler: RequestOptions['responded']) {
   return handler;
 }
 
-export function createRequest(options: RequestOptions) {
-  const { onAuthRequired, onResponseRefreshToken } = createTokenAuthentication();
-  const { axios, beforeRequest, responded: _responded, ...restOptions } = options;
+export function createRequest(options: RequestOptions = {}) {
+  const {
+    axios,
+    beforeRequest,
+    responded: _responded,
+    ...restOptions
+  } = options;
 
   const responded = normalizedResponded(_responded);
 
@@ -25,25 +29,41 @@ export function createRequest(options: RequestOptions) {
     timeout: 60 * 1000,
     ...restOptions,
 
-    beforeRequest: onAuthRequired(async (method) => {
+    beforeRequest: async (method) => {
       await hooks.callHook('http:request', method);
       await beforeRequest?.(method);
-    }),
+    },
 
-    responded: onResponseRefreshToken({
+    responded: {
       onSuccess: async (response, method) => {
-        const res = await hooks.callHook('http:response:onSuccess', response, method) ?? response;
-        return responded?.onSuccess?.(res, method) ?? res;
+        let stopped = false;
+
+        const res = await hooks.callHookWith(
+          async (hookFns, args) => {
+            let _response = args[0];
+            for (const fn of hookFns) {
+              if (stopped) {
+                break;
+              }
+              _response = await fn(_response, method, () => stopped = true);
+            }
+            return _response;
+          },
+          'http:response:onSuccess',
+          response,
+        ) as AxiosResponse<any, any>;
+
+        return stopped ? res : (responded?.onSuccess?.(res, method, () => stopped = true) ?? res);
       },
-      onError: (err, method) => {
-        hooks.callHook('http:response:onError', err, method);
-        responded?.onError?.(err, method);
+      onError: async (err, method) => {
+        await hooks.callHook('http:response:onError', err, method);
+        return responded?.onError?.(err, method);
       },
-      onComplete: (method) => {
-        hooks.callHook('http:response:onComplete', method);
+      onComplete: async (method) => {
+        await hooks.callHook('http:response:onComplete', method);
         responded?.onComplete?.(method);
       },
-    }),
+    },
   });
 
   return instance;

package/src/features/router/systemRoutes.ts

@@ -18,7 +18,6 @@ const systemRoutes: RouteRecordRaw[] = [
         component: () => import('@/features/pages/profile/index.vue'),
         meta: {
           title: '个人中心',
-          i18n: 'route.personal.profile',
           icon: 'i-iconamoon-profile-duotone',
         },
       },

package/src/features/stores/modules/favorites.ts

@@ -113,7 +113,6 @@ const useFavoritesStore = defineStore(
         list.value.push({
           fullPath: route.fullPath,
           title: meta?.title,
-          i18n: meta?.i18n,
           icon: meta?.icon ?? meta?.breadcrumbNeste?.findLast(item => item.icon)?.icon,
         });
       }

package/src/features/stores/modules/route.ts

@@ -40,12 +40,11 @@ const useRouteStore = defineStore(
      * @returns 面包屑对象
      */
     function createBreadcrumb(currentRouter: RouteRecordRaw, baseUrl?: RouteRecordRaw['path']): Route.breadcrumb {
-      const { title, i18n, icon, activeIcon, breadcrumb = true } = defaultTo(currentRouter.meta, {} as RouteMeta);
+      const { title, icon, activeIcon, breadcrumb = true } = defaultTo(currentRouter.meta, {} as RouteMeta);
       const path = defaultTo(baseUrl, currentRouter.path);
       return {
         path,
         title,
-        i18n,
         icon,
         activeIcon,
         hide: !breadcrumb,
@@ -163,7 +162,6 @@ const useRouteStore = defineStore(
 
       if (routesRaw.value.length) {
         routesRaw.value.forEach((item) => {
-          // CLOSE: 开发模式应用的子路由不应该被扁平化到vue-router中
           // 开发模式应用只在TopMode中显示，点击时显示开发状态
           if (get(item, 'meta.isDev', false)) {
             useWarn(`开发模式应用"${item.meta?.title}"的子路由将不会被注册到vue-router中`);
@@ -304,7 +302,6 @@ const useRouteStore = defineStore(
                     component: item.component,
                     meta: {
                       title: item.meta.title,
-                      i18n: item.meta.i18n,
                       sidebar: false,
                       breadcrumb: false,
                     },
@@ -364,7 +361,6 @@ const useRouteStore = defineStore(
           // 将本地应用替换成静态路由
           if (route.type === RESOURCE_TYPE.APP) {
             const foundStaticRoute = staticRoutes.find(staticRoute => staticRoute.meta?.auth === route.code);
-            // CLOSE: 静态应用如果是开发模式，仍然要返回路由对象供TopMode显示
             // 但其子路由不会被注册到vue-router中，这由菜单系统和路由扁平化逻辑处理
             if (foundStaticRoute && get(foundStaticRoute, 'meta.isDev', false)) {
               useWarn(`静态应用"${foundStaticRoute.meta?.title}"处于开发模式，将在TopMode中显示开发状态`);
@@ -374,10 +370,10 @@ const useRouteStore = defineStore(
 
           // 将动态应用数据格式化成路由数据
           if (route.type === RESOURCE_TYPE.DYNAMIC_APP) {
-            // CLOSE: 动态应用如果是开发模式，仍然要返回路由对象供TopMode显示
             if (route.meta?.isDev) {
               useWarn(`动态应用"${route.name}"处于开发模式，将在TopMode中显示开发状态`);
             }
+
             return formatBackRoutes([route])[0] as any;
           }
 
@@ -400,9 +396,6 @@ const useRouteStore = defineStore(
           }
         });
 
-        // FIX-ME routesRaw 最终会被 routes 使用，在 menuStore 中作为生成 allMenus 的数据源。
-        // 为了解决这个问题，我们需要重构一下逻辑，想办法将 路由 和 菜单 分开处理。
-        // 可以考虑直接让 menuStore 的菜单根据 remoteRoutesRaw 生成。
         routesRaw.value = [...remoteRoutes, ...restStaticRoutes];
       }
 

package/src/features/stores/modules/tabbar.ts

@@ -37,7 +37,6 @@ const useTabbarStore = defineStore(
                 routeName: route.name,
                 activeMenu: route.meta.activeMenu,
                 title: typeof route.meta.title === 'function' ? route.meta.title() : route.meta.title,
-                i18n: route.meta.i18n,
                 iframe: route.meta.iframe,
                 icon: route.meta?.icon ?? route.meta?.breadcrumbNeste?.findLast(item => item.icon)?.icon,
                 activeIcon: route.meta?.activeIcon ?? route.meta?.breadcrumbNeste?.findLast(item => item.activeIcon)?.activeIcon,
@@ -95,7 +94,6 @@ const useTabbarStore = defineStore(
             routeName: route.name!,
             activeMenu: meta?.activeMenu,
             title: typeof meta?.title === 'function' ? meta.title() : meta?.title,
-            i18n: meta?.i18n,
             iframe: meta?.iframe,
             icon: meta?.icon ?? meta?.breadcrumbNeste?.findLast(item => item.icon)?.icon,
             activeIcon: meta?.activeIcon ?? meta?.breadcrumbNeste?.findLast(item => item.activeIcon)?.activeIcon,
@@ -121,7 +119,6 @@ const useTabbarStore = defineStore(
             findTab.routeName = route.name!;
             findTab.activeMenu = meta?.activeMenu;
             findTab.title = typeof meta?.title === 'function' ? meta.title() : meta?.title;
-            findTab.i18n = meta?.i18n;
             findTab.iframe = meta?.iframe;
             findTab.icon = meta?.icon ?? meta?.breadcrumbNeste?.findLast(item => item.icon)?.icon;
             findTab.activeIcon = meta?.activeIcon ?? meta?.breadcrumbNeste?.findLast(item => item.activeIcon)?.activeIcon;