@pubinfo/core 2.0.12 → 2.0.13

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

@@ -1,9 +1,10 @@
 import type { Route } from '#/vue-router';
-import type { RouteMeta, RouteRecordRaw } from 'vue-router';
+import type { RouteLocationNormalizedLoaded, RouteMeta, RouteRecordRaw } from 'vue-router';
 
 import { cloneDeep, defaultTo, get, has, isArray, isString, isUndefined, merge, omit } from 'lodash-es';
 import { defineStore } from 'pinia';
 import { setupDefaultLayout } from '@/core';
+import { callHookAsync } from '@/core/ctx';
 import { postRbacResourceMineOrAllResourceTree } from '@/features/api/modules/rbac';
 import { useWarn } from '@/features/composables';
 import { RESOURCE_TYPE } from '@/features/enum';
@@ -15,6 +16,8 @@ import useSettingsStore from './settings';
 import useTabbarStore from './tabbar';
 import useUserStore from './user';
 
+export type RouteData = Route.recordMainRaw;
+
 const useRouteStore = defineStore(
   STORE_NAME.ROUTE,
   () => {
@@ -25,7 +28,7 @@ const useRouteStore = defineStore(
     const tabbarStore = useTabbarStore();
 
     const isGenerate = ref(false);
-    const routesRaw = ref<Route.recordMainRaw[]>([]);
+    const routesRaw = ref<RouteData[]>([]);
     const remoteRoutesRaw = ref<API.PubResourceTreeBo[]>([]);
     const filesystemRoutesRaw = ref<RouteRecordRaw[]>([]);
     const currentRemoveRoutes = ref<Array<{
@@ -121,7 +124,8 @@ const useRouteStore = defineStore(
       rawRoutes: RouteRecordRaw[],
       breadcrumb: Route.breadcrumb[] = [],
       baseUrl = '',
-      baseAuth: RouteMeta['auth']): RouteRecordRaw[] {
+      baseAuth: RouteMeta['auth'],
+    ): RouteRecordRaw[] {
       return toRaw(rawRoutes).reduce<RouteRecordRaw[]>((flatRoute, rawRoute) => {
         const childrenBaseUrl = resolveRoutePath(baseUrl, rawRoute.path);
         const childrenBaseAuth = defaultTo(rawRoute.meta?.auth, baseAuth);
@@ -216,7 +220,7 @@ const useRouteStore = defineStore(
      * @param route - 要检查权限的路由。
      * @returns 一个布尔值，指示用户是否有权限。
      */
-    function hasPermission(permissions: string[], route: Route.recordMainRaw | RouteRecordRaw) {
+    function hasPermission(permissions: string[], route: RouteData | RouteRecordRaw) {
       if (isUndefined(route.meta?.auth)) {
         return true;
       }
@@ -247,8 +251,8 @@ const useRouteStore = defineStore(
      * @param {string[]} permissions - 要检查的权限。
      * @returns {T} - 过滤后的路由数组。
      */
-    function filterAsyncRoutes<T extends Array<Route.recordMainRaw | RouteRecordRaw>>(routes: T, permissions: string[]): T {
-      const res: Array<Route.recordMainRaw | RouteRecordRaw> = [];
+    function filterAsyncRoutes<T extends Array<RouteData | RouteRecordRaw>>(routes: T, permissions: string[]): T {
+      const res: Array<RouteData | RouteRecordRaw> = [];
       routes.forEach((route) => {
         if (hasPermission(permissions, route)) {
           const tmpRoute = cloneDeep(route);
@@ -275,21 +279,16 @@ const useRouteStore = defineStore(
      * 如果权限功能已启用，则对路由进行筛选。
      * 否则，原样返回路由。
      *
-     * @returns {Route.recordMainRaw[]} 筛选后的路由。
+     * @returns {RouteData[]} 筛选后的路由。
      */
-    const routes = computed(() => {
-      let returnRoutes: Route.recordMainRaw[];
-      if (needFilterRoutes.value) {
-        returnRoutes = filterAsyncRoutes(routesRaw.value, userStore.user.permissions);
-      }
-      else {
-        returnRoutes = cloneDeep(routesRaw.value);
-      }
-      return returnRoutes;
+    const routes = computed<RouteData[]>(() => {
+      return needFilterRoutes.value
+        ? filterAsyncRoutes(routesRaw.value, userStore.user.permissions)
+        : cloneDeep(routesRaw.value);
     });
 
     // 将设置 meta.singleMenu 的一级路由转换成二级路由
-    function convertSingleRoutes<T extends Route.recordMainRaw[]>(routes: T) {
+    function convertSingleRoutes<T extends RouteData[]>(routes: T) {
       const Layout = setupDefaultLayout();
 
       routes.map((route) => {
@@ -323,7 +322,7 @@ const useRouteStore = defineStore(
             // 给一级路由设置 provider
             if (route.meta?.provider) {
               (item.meta as any) = {
-                ...(item.meta ?? {}),
+                ...item.meta,
                 provider: route.meta.provider,
               };
             }
@@ -338,7 +337,7 @@ const useRouteStore = defineStore(
      * 过滤不启用的路由
      * @param routes
      */
-    function filterEnabledRoutes(routes: Route.recordMainRaw[]) {
+    function filterEnabledRoutes(routes: RouteData[]) {
       if (!routes.length) {
         return [];
       }
@@ -382,36 +381,36 @@ const useRouteStore = defineStore(
             return formatBackRoutes([route])[0] as any;
           }
 
-          // 将微应用数据格式化成路由数据
-          if (route.type === RESOURCE_TYPE.MICRO_APP) {
-            return formatBackRoutes([route])[0];
-          }
-
           return false;
         }).filter(route => !!route) ?? [];
 
         // 未出现在后端路由树中的静态路由
         const restStaticRoutes = staticRoutes.filter((staticRoute) => {
           const { auth } = staticRoute.meta ?? {};
+
           if (isString(auth)) {
             return !res.data?.map(route => route.code).includes(auth);
           }
-          else {
-            return true;
-          }
+
+          return true;
         });
 
         // 对后端路由和本地路由进行排序
-        routesRaw.value = sortRoutesByRemoteOrder(
+        const sortedRoutes = sortRoutesByRemoteOrder(
           [...remoteRoutes, ...restStaticRoutes],
           res.data ?? [],
         );
+
+        // 对路由进行转换
+        routesRaw.value = await callHookAsync<RouteData[]>('route:transform', sortedRoutes);
       }
 
       if (settingsStore.settings.app.enablePermission) {
         await userStore.getPermissions();
       }
+
       isGenerate.value = true;
+
       // 加载常驻标签页
       if (settingsStore.settings.tabbar.enable) {
         tabbarStore.initPermanentTab();
@@ -419,13 +418,13 @@ const useRouteStore = defineStore(
     }
 
     function sortRoutesByRemoteOrder(
-      routesRaw: Route.recordMainRaw[],
-      remoteRoutesRaw: API.PubResourceTreeBo[],
-    ): Route.recordMainRaw[] {
-      const orderMap = new Map(remoteRoutesRaw.map((r, i) => [r.code, i]));
+      _routesRaw: RouteData[],
+      _remoteRoutesRaw: API.PubResourceTreeBo[],
+    ): RouteData[] {
+      const orderMap = new Map(_remoteRoutesRaw.map((r, i) => [r.code, i]));
 
-      const matched = routesRaw.filter(r => orderMap.has(r.meta?.auth as string));
-      const unmatched = routesRaw.filter(r => !orderMap.has(r.meta?.auth as string));
+      const matched = _routesRaw.filter(r => orderMap.has(r.meta?.auth as string));
+      const unmatched = _routesRaw.filter(r => !orderMap.has(r.meta?.auth as string));
 
       matched.sort((a, b) => {
         const orderA = orderMap.get(a.meta.auth! as string) ?? Infinity;
@@ -454,12 +453,112 @@ const useRouteStore = defineStore(
       isGenerate.value = false;
       routesRaw.value = [];
       filesystemRoutesRaw.value = [];
-      currentRemoveRoutes.value.forEach((removeRoute) => {
-        if (!isRefresh) {
-          removeRoute();
+
+      if (isRefresh) {
+        currentRemoveRoutes.value = currentRemoveRoutes.value.filter(fn => fn.system);
+      }
+      else {
+        currentRemoveRoutes.value.forEach(removeRoute => removeRoute());
+        currentRemoveRoutes.value = [];
+      }
+    }
+
+    /**
+     * 根据路由的 meta.id 从远程路由原始数据中查找对应的资源
+     * @param route - 路由对象,如果不传则从当前路由获取
+     * @returns {API.PubResourceTreeBo | undefined} 找到的远程路由数据,未找到则返回 undefined
+     */
+    function getRemoteRouteById(route?: RouteData | RouteRecordRaw | RouteLocationNormalizedLoaded): API.PubResourceTreeBo | undefined {
+      // 如果没有传入 route,则尝试从 vue-router 获取当前路由
+      const targetRoute = route ?? (typeof useRoute === 'function' ? useRoute() : undefined);
+
+      if (!targetRoute) {
+        useWarn('getRemoteRouteById: 无法获取路由对象');
+        return undefined;
+      }
+
+      const id = targetRoute.meta?.id;
+
+      if (!id) {
+        useWarn('getRemoteRouteById: 路由 meta 中未找到 id');
+        return undefined;
+      }
+
+      /**
+       * 递归搜索路由树
+       * @param routes - 路由数组
+       * @returns 找到的路由数据
+       */
+      function searchInTree(routes: API.PubResourceTreeBo[]): API.PubResourceTreeBo | undefined {
+        for (const route of routes) {
+          if (route.id === id) {
+            return route;
+          }
+          if (route.children && route.children.length > 0) {
+            const found = searchInTree(route.children);
+            if (found) {
+              return found;
+            }
+          }
         }
-      });
-      currentRemoveRoutes.value = isRefresh ? currentRemoveRoutes.value.filter(fn => fn.system) : [];
+        return undefined;
+      }
+
+      return searchInTree(remoteRoutesRaw.value);
+    }
+
+    /**
+     * 获取当前路由所属的顶层应用(APP)的远程路由原始数据
+     * @param route - 路由对象,如果不传则从当前路由获取
+     * @returns {API.PubResourceTreeBo | undefined} 找到的顶层应用远程路由数据,未找到则返回 undefined
+     */
+    function getRemoteAppRouteById(route?: RouteData | RouteRecordRaw | RouteLocationNormalizedLoaded): API.PubResourceTreeBo | undefined {
+      // 如果没有传入 route,则尝试从 vue-router 获取当前路由
+      const targetRoute = route ?? (typeof useRoute === 'function' ? useRoute() : undefined);
+
+      if (!targetRoute) {
+        useWarn('getRemoteAppRouteById: 无法获取路由对象');
+        return undefined;
+      }
+
+      const id = targetRoute.meta?.id;
+
+      if (!id) {
+        useWarn('getRemoteAppRouteById: 路由 meta 中未找到 id');
+        return undefined;
+      }
+
+      /**
+       * 递归搜索路由树,返回找到的节点的顶层应用
+       * @param routes - 路由数组
+       * @param parentApp - 当前的顶层应用
+       * @returns 找到的顶层应用
+       */
+      function searchInTree(
+        routes: API.PubResourceTreeBo[],
+        parentApp?: API.PubResourceTreeBo,
+      ): API.PubResourceTreeBo | undefined {
+        for (const route of routes) {
+          // 记录当前的顶层应用(type 为 APP 或 DYNAMIC_APP)
+          const currentApp = route.type === RESOURCE_TYPE.APP || route.type === RESOURCE_TYPE.DYNAMIC_APP
+            ? route
+            : parentApp;
+
+          if (route.id === id) {
+            return currentApp;
+          }
+
+          if (route.children && route.children.length > 0) {
+            const found = searchInTree(route.children, currentApp);
+            if (found) {
+              return found;
+            }
+          }
+        }
+        return undefined;
+      }
+
+      return searchInTree(remoteRoutesRaw.value);
     }
 
     return {
@@ -472,6 +571,8 @@ const useRouteStore = defineStore(
       generateRoutes,
       setCurrentRemoveRoutes,
       removeRoutes,
+      getRemoteRouteById,
+      getRemoteAppRouteById,
     };
   },
 );

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, isEmpty, isUndefined, omitBy } from 'lodash-es';
+import { cloneDeep, isUndefined, omitBy } from 'lodash-es';
 import { setupDefaultLayout, setupPage } from '@/core';
 import { RESOURCE_TYPE } from '@/features/enum';
 
@@ -12,8 +12,6 @@ export interface BackEndRoute {
   meta: RequireExactlyOne<Partial<RouterMetaRawBaseOptions>, 'title'> & Record<string, any>
 };
 
-export const MicroAppContainer = () => import('@/features/components/MicroAppContainer/index.vue');
-
 /**
  * 格式化后端返回的路由数据
  * @param routes 路由数据
@@ -32,6 +30,7 @@ export function formatBackRoutes(
       : [];
 
     const meta = omitBy<BackEndRoute['meta']>({
+      id: route?.id,
       title: route?.name ?? '',
       auth: route?.code,
       icon: route?.icon,
@@ -65,7 +64,6 @@ export function formatBackRoutes(
 
     switch (route.type) {
       case RESOURCE_TYPE.DYNAMIC_APP:
-      case RESOURCE_TYPE.MICRO_APP:
         return finalRoute;
 
       case RESOURCE_TYPE.INDEX:
@@ -73,20 +71,18 @@ export function formatBackRoutes(
 
       case RESOURCE_TYPE.MENU:
       case RESOURCE_TYPE.IFRAME:
+      case RESOURCE_TYPE.LINK:
         return transformMenuAndIframe(finalRoute, parent);
 
       case RESOURCE_TYPE.NON_MENU:
         return transformNonMenu(finalRoute, parent);
 
-      case RESOURCE_TYPE.LINK:
-        return finalRoute;
-
       default:
         return finalRoute;
     }
   });
 
-  return isEmpty(parent) ? filterEmptyComponentRoutes(formatRoutes) : formatRoutes;
+  return formatRoutes;
 }
 
 /** 过滤指定类型的路由 */
@@ -100,7 +96,7 @@ function filterRoutes(routes: API.PubResourceTreeBo[] = [], excludes: string[])
 }
 
 /** 过滤找不到SFC组件的路由 */
-function filterEmptyComponentRoutes(routes: BackEndRoute[], minDepth = 3): BackEndRoute[] {
+export function filterEmptyComponentRoutes(routes: BackEndRoute[], minDepth = 3): BackEndRoute[] {
   function recurse(route: BackEndRoute): BackEndRoute | null {
     const children = route.children?.map(recurse).filter(Boolean) as BackEndRoute[] | undefined;
 
@@ -108,9 +104,9 @@ function filterEmptyComponentRoutes(routes: BackEndRoute[], minDepth = 3): BackE
       return { ...route, children };
     }
 
+    // 叶子且有 component
     if (children?.length === 0 && route.component) {
-      // 叶子且有 component
-      const { children, ...rest } = route;
+      const { children: _, ...rest } = route;
       return { ...rest, children: [] };
     }
 
@@ -135,7 +131,6 @@ function transformIndex(route: BackEndRoute, parent: API.PubResourceTreeBo = {})
   switch (parent.type) {
     // 父级是应用
     case RESOURCE_TYPE.DYNAMIC_APP:
-    case RESOURCE_TYPE.MICRO_APP:
       return {
         ...route,
         path: startsWithSlash(route.path),
@@ -157,7 +152,7 @@ function transformIndex(route: BackEndRoute, parent: API.PubResourceTreeBo = {})
 
 /** 转换菜单和内嵌 */
 function transformMenuAndIframe(route: BackEndRoute, parent: API.PubResourceTreeBo = {}): BackEndRoute {
-  if (!route?.component && !route?.meta?.iframe) {
+  if (!route?.component && !route?.meta?.iframe && !route?.meta?.link) {
     console.warn(`[PUBINFO] 资源"${route.meta.title}"的component字段不存在, 将会导致未知错误!`);
   }
 
@@ -183,7 +178,6 @@ function transformMenuAndIframe(route: BackEndRoute, parent: API.PubResourceTree
   switch (parent.type) {
     // 父级是应用
     case RESOURCE_TYPE.DYNAMIC_APP:
-    case RESOURCE_TYPE.MICRO_APP:
       menuRoute = {
         ...route,
         path: startsWithSlash(route.path),
@@ -240,15 +234,6 @@ function startsWithSlash(str?: string) {
   return str.startsWith('/') ? str : `/${str}`;
 }
 
-/** 开头去掉 / */
-function startsWithNoSlash(str?: string) {
-  if (!str) {
-    return '';
-  }
-
-  return str.startsWith('/') ? str.replace('/', '') : str;
-}
-
 /** 替换 component 为实际组件 */
 function replaceComponent(component: any, id?: string) {
   return setupPage(component, id);

package/types/components.d.ts

@@ -11,11 +11,22 @@ declare module 'vue' {
     AAlert: typeof import('ant-design-vue/es')['Alert']
     AButton: typeof import('ant-design-vue/es')['Button']
     ACard: typeof import('ant-design-vue/es')['Card']
+    ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
     ADivider: typeof import('ant-design-vue/es')['Divider']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']
+    AInput: typeof import('ant-design-vue/es')['Input']
+    AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
     AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
+    AModal: typeof import('ant-design-vue/es')['Modal']
+    ARadioButton: typeof import('ant-design-vue/es')['RadioButton']
+    ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
+    ASelect: typeof import('ant-design-vue/es')['Select']
+    ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     ATag: typeof import('ant-design-vue/es')['Tag']
+    ATooltip: typeof import('ant-design-vue/es')['Tooltip']
+    ATreeSelect: typeof import('ant-design-vue/es')['TreeSelect']
+    DeleteOutlined: typeof import('@ant-design/icons-vue')['DeleteOutlined']
     HBadge: typeof import('./../src/built-in/layout-component/components/ui/HBadge.vue')['default']
     HButton: typeof import('./../src/built-in/layout-component/components/ui/HButton.vue')['default']
     HCheckList: typeof import('./../src/built-in/layout-component/components/ui/HCheckList.vue')['default']

package/types/menu.d.ts

@@ -13,6 +13,7 @@ export declare namespace Menu {
       badge?: boolean | string | number | (() => boolean | string | number)
       link?: string
       isDev?: boolean
+      partyLogin?: any[]
     }
     children?: recordRaw[]
   }
@@ -32,6 +33,7 @@ export declare namespace Menu {
         }
         boxType?: 'square' | 'prism' | 'null'
         iconColor?: string
+        iconSize?: number | string
         radius?: number | string
       }
       sidebar?: boolean

package/types/settings.d.ts

@@ -75,12 +75,6 @@ declare namespace Settings {
 
     storagePrefix?: string
 
-    /**
-     * 是否在非开发环境开启错误日志功能，具体业务代码在 ./utils/error.log.ts
-     * @默认值 `false`
-     */
-    enableErrorLog?: boolean
-
     /**
      * 是否开启用户偏好设置
      *

package/types/vue-router.d.ts

@@ -1,5 +1,6 @@
 import type { Merge, RequireExactlyOne } from 'type-fest';
 import type { RouteRecordRaw } from 'vue-router';
+import type { PartyLoginStepConfig } from '../src/features/components/PartyLogin/type';
 import type { User } from './user';
 
 export interface RouterMetaRawBaseOptions {
@@ -27,6 +28,8 @@ export interface RouterMetaRawBaseOptions {
   provider?: any
   pin?: boolean
   routeName?: string
+  id?: string | number
+  partyLogin?: PartyLoginStepConfig[]
 }
 
 type RouterMetaRaw = RequireExactlyOne<Partial<RouterMetaRawBaseOptions>, 'title'>;
@@ -34,7 +37,8 @@ type RouterMetaRaw = RequireExactlyOne<Partial<RouterMetaRawBaseOptions>, 'title
 export declare namespace Route {
 
   type mainMeta
-    = | 'title'
+    = 'id'
+      | 'title'
       | 'icon'
       | 'activeIcon'
       | 'auth'

package/dist/HeaderThinMenu-CzAyTOhQ.js

@@ -1,4 +0,0 @@
-import { bH as f } from "./index-Q4dgy_3e.js";
-export {
-  f as default
-};

package/dist/colors-CIY2S0v0.js

@@ -1,25 +0,0 @@
-import { e as t } from "./index-Q4dgy_3e.js";
-const n = ["blue", "purple", "cyan", "green", "magenta", "pink", "red", "orange", "yellow", "volcano", "geekblue", "lime", "gold"];
-function C(e, s) {
-  return n.reduce((o, r) => {
-    const u = e[`${r}-1`], l = e[`${r}-3`], i = e[`${r}-6`], a = e[`${r}-7`];
-    return t(t({}, o), s(r, {
-      lightColor: u,
-      lightBorderColor: l,
-      darkColor: i,
-      textColor: a
-    }));
-  }, {});
-}
-const c = n.map((e) => `${e}-inverse`), g = ["success", "processing", "error", "default", "warning"];
-function m(e) {
-  return (arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !0) ? [...c, ...n].includes(e) : n.includes(e);
-}
-function p(e) {
-  return g.includes(e);
-}
-export {
-  p as a,
-  C as g,
-  m as i
-};

package/dist/features/components/MicroAppContainer/index.vue.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, HTMLDivElement>;
-export default _default;