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

package/src/built-in/settings/router.ts

@@ -106,7 +106,11 @@ function hitCache(
   cache?: RouterMetaRawBaseOptions['cache'],
   noCache?: RouterMetaRawBaseOptions['noCache'],
 ) {
-  return cache && matched(name, cache) && !matched(name, noCache);
+  if (typeof cache === 'boolean') {
+    return cache && !matched(name, noCache);
+  }
+
+  return matched(name, cache) && !matched(name, noCache);
 }
 
 function matched(

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;

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) {
@@ -136,6 +167,7 @@ function transformMenuAndIframe(route: BackEndRoute, parent: API.PubResourceTree
   const menuRouteChildren: BackEndRoute[] = [
     {
       path: '',
+      name: route.name,
       component: replaceComponent(route.component, route.meta?.scope),
       meta: {
         ...route.meta,
@@ -155,6 +187,7 @@ function transformMenuAndIframe(route: BackEndRoute, parent: API.PubResourceTree
       menuRoute = {
         ...route,
         path: startsWithSlash(route.path),
+        name: undefined,
         component: setupDefaultLayout(),
         children: menuRouteChildren,
       };
@@ -165,6 +198,7 @@ function transformMenuAndIframe(route: BackEndRoute, parent: API.PubResourceTree
       menuRoute = {
         ...route,
         path: route.path,
+        name: undefined,
         component: undefined,
         children: menuRouteChildren,
       };

package/src/index.ts

@@ -3,7 +3,6 @@ import {
   Authentication,
   Authorization,
   LayoutComponent,
-  Locales,
   NProgress,
   PiniaPlugin,
   PreAccess,
@@ -71,29 +70,27 @@ export function createPubinfo(options: PubinfoOptions) {
       Authorization(),
       LayoutComponent(),
       Settings(),
-      Locales(),
       NProgress(),
       ...(options.modules ?? []),
     ],
   });
 }
 
+export { RESPONSE_CODE } from './built-in/authentication';
 export {
-  BackTop,
   Copyright,
   Layout,
   LayoutContent,
   LayoutHeader,
   LayoutProvider,
+  LayoutSidebar,
+  LayoutTopbar,
   Logo,
-  Menu,
-  RESPONSE_CODE,
-  SettingBar,
-  Sidebar,
+  Tool,
   Tools,
-  Topbar,
-} from './built-in';
-export { eventBus } from './built-in/layout-component/utils';
+} from './built-in/layout-component';
+export type { DropdownMenu, DropdownMenuRender } from './built-in/layout-component';
+export { updateWatermark } from './built-in/layout-component/composables/useWatermark';
 
 export {
   createRequest,
@@ -103,7 +100,6 @@ export {
   getAllRouteModules,
   readProjectModules,
 } from './core';
-
 export * from './core/interface';
 
 export * from './features';

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/layout-component/utils/eventBus.d.ts

@@ -1,5 +0,0 @@
-interface MittTypes {
-    [key: PropertyKey]: any;
-}
-export declare const eventBus: import('mitt').Emitter<MittTypes>;
-export {};