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

package/src/features/stores/utils/routerHelper.ts

@@ -1,6 +1,6 @@
 import type { RouterMetaRawBaseOptions } from '#/vue-router';
 import type { RequireExactlyOne } from 'type-fest';
-import { cloneDeep, isUndefined, omitBy } from 'lodash-es';
+import { cloneDeep, isEmpty, isUndefined, omitBy } from 'lodash-es';
 import { setupDefaultLayout, setupPage } from '@/core';
 import { RESOURCE_TYPE } from '@/features/enum';
 
@@ -26,7 +26,7 @@ export function formatBackRoutes(
 ): BackEndRoute[] {
   const backEndRoutes = filterRoutes(routes, [RESOURCE_TYPE.BUTTON]);
 
-  return backEndRoutes.map((route: API.PubResourceTreeBo) => {
+  const formatRoutes = backEndRoutes.map((route: API.PubResourceTreeBo) => {
     const children = route?.children && route.children.length > 0
       ? formatBackRoutes(route.children, route)
       : [];
@@ -37,7 +37,6 @@ export function formatBackRoutes(
       icon: route?.icon,
       ...route?.meta,
 
-      // CLOSE: 根据资源类型设置正确的显示属性
       // 应用和动态应用不需要在侧边栏和标签栏显示，因为它们通过TopMode渲染
       ...(route.type === RESOURCE_TYPE.APP || route.type === RESOURCE_TYPE.DYNAMIC_APP
         ? {
@@ -56,7 +55,6 @@ export function formatBackRoutes(
         : {}),
     }, isUndefined) as BackEndRoute['meta'];
 
-    // TODO: 这里的逻辑可能需要根据实际情况调整
     const finalRoute = cloneDeep(omitBy<BackEndRoute>({
       name: route?.meta?.routeName ?? undefined,
       path: route?.meta?.url ?? undefined,
@@ -87,6 +85,8 @@ export function formatBackRoutes(
         return finalRoute;
     }
   });
+
+  return isEmpty(parent) ? filterEmptyComponentRoutes(formatRoutes) : formatRoutes;
 }
 
 /** 过滤指定类型的路由 */
@@ -99,6 +99,37 @@ function filterRoutes(routes: API.PubResourceTreeBo[] = [], excludes: string[])
   });
 }
 
+/** 过滤找不到SFC组件的路由 */
+function filterEmptyComponentRoutes(routes: BackEndRoute[], minDepth = 3): BackEndRoute[] {
+  function recurse(route: BackEndRoute): BackEndRoute | null {
+    const children = route.children?.map(recurse).filter(Boolean) as BackEndRoute[] | undefined;
+
+    if (children && children.length > 0) {
+      return { ...route, children };
+    }
+
+    if (children?.length === 0 && route.component) {
+      // 叶子且有 component
+      const { children, ...rest } = route;
+      return { ...rest, children: [] };
+    }
+
+    return null;
+  }
+
+  function maxDepth(route: BackEndRoute): number {
+    if (!route.children || route.children.length === 0) {
+      return 1;
+    }
+    return 1 + Math.max(...route.children.map(maxDepth));
+  }
+
+  return routes
+    .map(recurse)
+    .filter((r): r is BackEndRoute => !!r)
+    .filter(r => maxDepth(r) >= minDepth);
+}
+
 /** 转换目录 */
 function transformIndex(route: BackEndRoute, parent: API.PubResourceTreeBo = {}): BackEndRoute {
   switch (parent.type) {

package/src/index.ts

@@ -3,7 +3,6 @@ import {
   Authentication,
   Authorization,
   LayoutComponent,
-  Locales,
   NProgress,
   PiniaPlugin,
   PreAccess,
@@ -71,7 +70,6 @@ export function createPubinfo(options: PubinfoOptions) {
       Authorization(),
       LayoutComponent(),
       Settings(),
-      Locales(),
       NProgress(),
       ...(options.modules ?? []),
     ],

package/types/vue-router.d.ts

@@ -4,7 +4,6 @@ import type { User } from './user';
 
 export interface RouterMetaRawBaseOptions {
   title: string | (() => string)
-  i18n: string
   icon: string
   activeIcon: string
   defaultOpened: boolean
@@ -36,7 +35,6 @@ export declare namespace Route {
 
   type mainMeta
     = | 'title'
-      | 'i18n'
       | 'icon'
       | 'activeIcon'
       | 'auth'
@@ -60,7 +58,6 @@ export declare namespace Route {
   interface breadcrumb {
     path: string
     title?: string | (() => string)
-    i18n?: string
     icon?: string
     activeIcon?: string
     hide: boolean

package/dist/built-in/locales/helpler.d.ts

@@ -1,594 +0,0 @@
-import { RequestMethod } from '../../core';
-export declare function createI18n(): import('vue-i18n').I18n<{
-    en: {
-        app: {
-            account: string;
-            captcha: string;
-            changeOrg: string;
-            changePassword: string;
-            check: string;
-            goLogin: string;
-            hotkeys: string;
-            login: string;
-            logout: string;
-            newPassword: string;
-            password: string;
-            preferences: string;
-            search: {
-                enter: string;
-                esc: string;
-                input: string;
-                text: string;
-                type: {
-                    menu: string;
-                    tab: string;
-                };
-                up_down: string;
-            };
-            sendCaptcha: string;
-            tabbar: {
-                close: string;
-                closeLeftSide: string;
-                closeOtherSide: string;
-                closeRightSide: string;
-                favorites: {
-                    add: string;
-                    "my-favorites": string;
-                    remove: string;
-                };
-                maximize: string;
-                pin: string;
-                reload: string;
-                searchTabs: string;
-                unpin: string;
-            };
-        };
-        route: {
-            demo: string;
-            home: string;
-            login: string;
-            multimenu: {
-                level2: {
-                    level3: {
-                        page1: string;
-                        page2: string;
-                        root: string;
-                    };
-                    page: string;
-                    root: string;
-                };
-                page: string;
-                root: string;
-            };
-            personal: {
-                notification: string;
-                profile: string;
-            };
-            rbac: {
-                dictionary: string;
-                organization: string;
-                permission: string;
-                resource: string;
-                role: string;
-                dataPermission: string;
-                title: string;
-                blacklist: string;
-                whitelist: string;
-                user: string;
-                tenant: string;
-                position: string;
-                group: string;
-                region: string;
-                layoutSetting: string;
-                themeSetting: string;
-                pageSizeSetting: string;
-                pageAnimationSetting: string;
-                menuSetting: string;
-                tabbarSetting: string;
-                toolbarSetting: string;
-                breadcrumbSetting: string;
-                watermarkSetting: string;
-                otherSetting: string;
-                loginHistory: string;
-                operateHistory: string;
-                safeSetting: string;
-            };
-            undefined: string;
-        };
-    };
-    'zh-cn': {
-        app: {
-            account: string;
-            captcha: string;
-            check: string;
-            goLogin: string;
-            hotkeys: string;
-            login: string;
-            logout: string;
-            newPassword: string;
-            changePassword: string;
-            password: string;
-            preferences: string;
-            changeOrg: string;
-            search: {
-                enter: string;
-                esc: string;
-                input: string;
-                text: string;
-                type: {
-                    menu: string;
-                    tab: string;
-                };
-                up_down: string;
-            };
-            sendCaptcha: string;
-            tabbar: {
-                close: string;
-                closeLeftSide: string;
-                closeOtherSide: string;
-                closeRightSide: string;
-                favorites: {
-                    add: string;
-                    "my-favorites": string;
-                    remove: string;
-                };
-                maximize: string;
-                pin: string;
-                reload: string;
-                searchTabs: string;
-                unpin: string;
-            };
-        };
-        route: {
-            demo: string;
-            home: string;
-            login: string;
-            multimenu: {
-                level2: {
-                    level3: {
-                        page1: string;
-                        page2: string;
-                        root: string;
-                    };
-                    page: string;
-                    root: string;
-                };
-                page: string;
-                root: string;
-            };
-            personal: {
-                notification: string;
-                profile: string;
-            };
-            rbac: {
-                dictionary: string;
-                organization: string;
-                permission: string;
-                resource: string;
-                role: string;
-                roleGroup: string;
-                dataPermission: string;
-                title: string;
-                blacklist: string;
-                whitelist: string;
-                user: string;
-                tenant: string;
-                position: string;
-                group: string;
-                region: string;
-                layoutSetting: string;
-                themeSetting: string;
-                pageSizeSetting: string;
-                pageAnimationSetting: string;
-                menuSetting: string;
-                tabbarSetting: string;
-                toolbarSetting: string;
-                breadcrumbSetting: string;
-                watermarkSetting: string;
-                otherSetting: string;
-                loginHistory: string;
-                operateHistory: string;
-                safeSetting: string;
-            };
-            undefined: string;
-        };
-    };
-    'zh-tw': {
-        app: {
-            account: string;
-            captcha: string;
-            changeOrg: string;
-            changePassword: string;
-            check: string;
-            goLogin: string;
-            hotkeys: string;
-            login: string;
-            logout: string;
-            newPassword: string;
-            password: string;
-            preferences: string;
-            search: {
-                enter: string;
-                esc: string;
-                input: string;
-                text: string;
-                type: {
-                    menu: string;
-                    tab: string;
-                };
-                up_down: string;
-            };
-            sendCaptcha: string;
-            tabbar: {
-                close: string;
-                closeLeftSide: string;
-                closeOtherSide: string;
-                closeRightSide: string;
-                favorites: {
-                    add: string;
-                    "my-favorites": string;
-                    remove: string;
-                };
-                maximize: string;
-                pin: string;
-                reload: string;
-                searchTabs: string;
-                unpin: string;
-            };
-        };
-        route: {
-            demo: string;
-            home: string;
-            login: string;
-            multimenu: {
-                level2: {
-                    level3: {
-                        page1: string;
-                        page2: string;
-                        root: string;
-                    };
-                    page: string;
-                    root: string;
-                };
-                page: string;
-                root: string;
-            };
-            personal: {
-                notification: string;
-                profile: string;
-            };
-            rbac: {
-                dictionary: string;
-                organization: string;
-                permission: string;
-                resource: string;
-                role: string;
-                roleGroup: string;
-                dataPermission: string;
-                title: string;
-                blacklist: string;
-                whitelist: string;
-                user: string;
-                tenant: string;
-                position: string;
-                group: string;
-                region: string;
-                layoutSetting: string;
-                themeSetting: string;
-                pageSizeSetting: string;
-                pageAnimationSetting: string;
-                menuSetting: string;
-                tabbarSetting: string;
-                toolbarSetting: string;
-                breadcrumbSetting: string;
-                watermarkSetting: string;
-                otherSetting: string;
-                loginHistory: string;
-                operateHistory: string;
-                safeSetting: string;
-            };
-            undefined: string;
-        };
-    };
-}, {}, {}, any, false>;
-export declare function getLocales(): {
-    en: {
-        app: {
-            account: string;
-            captcha: string;
-            changeOrg: string;
-            changePassword: string;
-            check: string;
-            goLogin: string;
-            hotkeys: string;
-            login: string;
-            logout: string;
-            newPassword: string;
-            password: string;
-            preferences: string;
-            search: {
-                enter: string;
-                esc: string;
-                input: string;
-                text: string;
-                type: {
-                    menu: string;
-                    tab: string;
-                };
-                up_down: string;
-            };
-            sendCaptcha: string;
-            tabbar: {
-                close: string;
-                closeLeftSide: string;
-                closeOtherSide: string;
-                closeRightSide: string;
-                favorites: {
-                    add: string;
-                    "my-favorites": string;
-                    remove: string;
-                };
-                maximize: string;
-                pin: string;
-                reload: string;
-                searchTabs: string;
-                unpin: string;
-            };
-        };
-        route: {
-            demo: string;
-            home: string;
-            login: string;
-            multimenu: {
-                level2: {
-                    level3: {
-                        page1: string;
-                        page2: string;
-                        root: string;
-                    };
-                    page: string;
-                    root: string;
-                };
-                page: string;
-                root: string;
-            };
-            personal: {
-                notification: string;
-                profile: string;
-            };
-            rbac: {
-                dictionary: string;
-                organization: string;
-                permission: string;
-                resource: string;
-                role: string;
-                dataPermission: string;
-                title: string;
-                blacklist: string;
-                whitelist: string;
-                user: string;
-                tenant: string;
-                position: string;
-                group: string;
-                region: string;
-                layoutSetting: string;
-                themeSetting: string;
-                pageSizeSetting: string;
-                pageAnimationSetting: string;
-                menuSetting: string;
-                tabbarSetting: string;
-                toolbarSetting: string;
-                breadcrumbSetting: string;
-                watermarkSetting: string;
-                otherSetting: string;
-                loginHistory: string;
-                operateHistory: string;
-                safeSetting: string;
-            };
-            undefined: string;
-        };
-    };
-    'zh-cn': {
-        app: {
-            account: string;
-            captcha: string;
-            check: string;
-            goLogin: string;
-            hotkeys: string;
-            login: string;
-            logout: string;
-            newPassword: string;
-            changePassword: string;
-            password: string;
-            preferences: string;
-            changeOrg: string;
-            search: {
-                enter: string;
-                esc: string;
-                input: string;
-                text: string;
-                type: {
-                    menu: string;
-                    tab: string;
-                };
-                up_down: string;
-            };
-            sendCaptcha: string;
-            tabbar: {
-                close: string;
-                closeLeftSide: string;
-                closeOtherSide: string;
-                closeRightSide: string;
-                favorites: {
-                    add: string;
-                    "my-favorites": string;
-                    remove: string;
-                };
-                maximize: string;
-                pin: string;
-                reload: string;
-                searchTabs: string;
-                unpin: string;
-            };
-        };
-        route: {
-            demo: string;
-            home: string;
-            login: string;
-            multimenu: {
-                level2: {
-                    level3: {
-                        page1: string;
-                        page2: string;
-                        root: string;
-                    };
-                    page: string;
-                    root: string;
-                };
-                page: string;
-                root: string;
-            };
-            personal: {
-                notification: string;
-                profile: string;
-            };
-            rbac: {
-                dictionary: string;
-                organization: string;
-                permission: string;
-                resource: string;
-                role: string;
-                roleGroup: string;
-                dataPermission: string;
-                title: string;
-                blacklist: string;
-                whitelist: string;
-                user: string;
-                tenant: string;
-                position: string;
-                group: string;
-                region: string;
-                layoutSetting: string;
-                themeSetting: string;
-                pageSizeSetting: string;
-                pageAnimationSetting: string;
-                menuSetting: string;
-                tabbarSetting: string;
-                toolbarSetting: string;
-                breadcrumbSetting: string;
-                watermarkSetting: string;
-                otherSetting: string;
-                loginHistory: string;
-                operateHistory: string;
-                safeSetting: string;
-            };
-            undefined: string;
-        };
-    };
-    'zh-tw': {
-        app: {
-            account: string;
-            captcha: string;
-            changeOrg: string;
-            changePassword: string;
-            check: string;
-            goLogin: string;
-            hotkeys: string;
-            login: string;
-            logout: string;
-            newPassword: string;
-            password: string;
-            preferences: string;
-            search: {
-                enter: string;
-                esc: string;
-                input: string;
-                text: string;
-                type: {
-                    menu: string;
-                    tab: string;
-                };
-                up_down: string;
-            };
-            sendCaptcha: string;
-            tabbar: {
-                close: string;
-                closeLeftSide: string;
-                closeOtherSide: string;
-                closeRightSide: string;
-                favorites: {
-                    add: string;
-                    "my-favorites": string;
-                    remove: string;
-                };
-                maximize: string;
-                pin: string;
-                reload: string;
-                searchTabs: string;
-                unpin: string;
-            };
-        };
-        route: {
-            demo: string;
-            home: string;
-            login: string;
-            multimenu: {
-                level2: {
-                    level3: {
-                        page1: string;
-                        page2: string;
-                        root: string;
-                    };
-                    page: string;
-                    root: string;
-                };
-                page: string;
-                root: string;
-            };
-            personal: {
-                notification: string;
-                profile: string;
-            };
-            rbac: {
-                dictionary: string;
-                organization: string;
-                permission: string;
-                resource: string;
-                role: string;
-                roleGroup: string;
-                dataPermission: string;
-                title: string;
-                blacklist: string;
-                whitelist: string;
-                user: string;
-                tenant: string;
-                position: string;
-                group: string;
-                region: string;
-                layoutSetting: string;
-                themeSetting: string;
-                pageSizeSetting: string;
-                pageAnimationSetting: string;
-                menuSetting: string;
-                tabbarSetting: string;
-                toolbarSetting: string;
-                breadcrumbSetting: string;
-                watermarkSetting: string;
-                otherSetting: string;
-                loginHistory: string;
-                operateHistory: string;
-                safeSetting: string;
-            };
-            undefined: string;
-        };
-    };
-};
-export declare function getUILocales(): {
-    [key: string]: any;
-};
-export declare function $t(key: string): string;
-/**
- * 根据请求方法设置语言。
- * @param method 请求方法
- */
-export declare function maybeSetLanguage(method: RequestMethod): void;

package/dist/built-in/locales/index.d.ts

@@ -1,5 +0,0 @@
-import { ModuleOptions } from '../../core';
-/**
- * 国际化多语言
- */
-export declare function Locales(): ModuleOptions;