cosey 0.10.8 → 0.10.10

package/router/guard/auth.js

@@ -1,13 +1,12 @@
-import { useGlobalConfig } from '../../config/index.js';
+import { globalConfig } from '../../config/index.js';
 import { useUserStore } from '../../store/user.js';
 import { TOKEN_NAME, ROUTER_TO } from '../../constant.js';
-import { usePersist } from '../../hooks/usePersist.js';
+import { persist } from '../../persist/index.js';
 
 function registerAuthGuard(router) {
   let firstTimeAddRoutes = false;
   router.beforeEach(async (to) => {
-    const persist = usePersist();
-    const routerConfig = useGlobalConfig().router;
+    const { router: routerConfig } = globalConfig;
     const token = persist.get(TOKEN_NAME);
     const userStore = useUserStore();
     if (to.path === "/" && routerConfig.homePath !== "/") {

package/router/guard/pageTitle.js

@@ -1,8 +1,8 @@
-import { useGlobalConfig } from '../../config/index.js';
+import { globalConfig } from '../../config/index.js';
 
 function registerPageTitleGuard(router) {
   router.afterEach((to) => {
-    const siteConfig = useGlobalConfig().site;
+    const { site: siteConfig } = globalConfig;
     const title = to.meta.title ? to.meta.title + " - " + siteConfig.name : siteConfig.name;
     document.title = title;
   });

package/router/index.d.ts

@@ -1,7 +1,9 @@
-import { type RouteRecordRaw, type RouterOptions, type RouterHistory } from 'vue-router';
+import { type RouteRecordRaw, type RouterOptions, type RouterHistory, Router } from 'vue-router';
 import type { AnyAbility } from '@casl/ability';
+import { App } from 'vue';
 export { type MenuItem, type MenuNode, getMenus, getMenusMap, getMenuPathKeys, getBreadcrumbRoutes, } from './menus';
 export { defineRoute, defineRoutes, mergeRouteModules } from './utils';
+export declare let router: Router;
 export interface CoseyRouterOptions extends Omit<RouterOptions, 'routes' | 'history'> {
     history?: RouterHistory;
     dynamic?: RouteRecordRaw[];
@@ -10,7 +12,7 @@ export interface CoseyRouterOptions extends Omit<RouterOptions, 'routes' | 'hist
 }
 export declare const getAllDynamicRoutes: () => RouteRecordRaw[];
 export declare const getAllStaticRoutes: () => RouteRecordRaw[];
-export declare function createCoseyRouter(options?: CoseyRouterOptions): import("vue-router").Router;
+export declare function launchRouter(app: App, options?: CoseyRouterOptions): void;
 declare module 'vue-router' {
     interface RouteMeta {
         title?: string;

package/router/index.js

@@ -1,9 +1,11 @@
 import { createWebHashHistory, createRouter } from 'vue-router';
 import { staticRoutes } from './routes/index.js';
 import { cloneDeep } from 'lodash-es';
+import { registerRouterGuard } from './guard/index.js';
 export { getBreadcrumbRoutes, getMenuPathKeys, getMenus, getMenusMap } from './menus/index.js';
 export { defineRoute, defineRoutes, mergeRouteModules } from './utils.js';
 
+let router;
 let customDynamicRoutes = [];
 let customStaticRoutes = [];
 const getAllDynamicRoutes = () => {
@@ -12,7 +14,7 @@ const getAllDynamicRoutes = () => {
 const getAllStaticRoutes = () => {
   return [...staticRoutes, ...customStaticRoutes];
 };
-function createCoseyRouter(options = {}) {
+function launchRouter(app, options = {}) {
   const { static: static$ = [], dynamic = [], listening = true, ...restOptions } = options;
   customStaticRoutes = static$;
   customDynamicRoutes = dynamic;
@@ -27,9 +29,12 @@ function createCoseyRouter(options = {}) {
       history: restOptions.history || createWebHashHistory()
     }
   );
-  const router = createRouter(mergedOptions);
+  router = createRouter(mergedOptions);
   router.listening = listening;
-  return router;
+  if (listening) {
+    registerRouterGuard(router);
+  }
+  app.use(router);
 }
 
-export { createCoseyRouter, getAllDynamicRoutes, getAllStaticRoutes };
+export { getAllDynamicRoutes, getAllStaticRoutes, launchRouter, router };

package/store/index.d.ts

@@ -1,5 +1,4 @@
-import { useLayoutStore } from './layout';
-import { useUserStore } from './user';
-import { useAppearanceStore } from './appearance';
-export declare function createPiniaStore(): import("pinia").Pinia;
-export { useUserStore, useAppearanceStore, useLayoutStore };
+import { pinia, launchStore } from './pinia';
+import { useLayoutStore, useOuterLayoutStore } from './layout';
+import { useUserStore, useOuterUserStore } from './user';
+export { pinia, launchStore, useUserStore, useOuterUserStore, useLayoutStore, useOuterLayoutStore };

package/store/index.js

@@ -1,13 +1,3 @@
-import { createPinia } from 'pinia';
-export { useLayoutStore } from './layout.js';
-export { useUserStore } from './user.js';
-export { useAppearanceStore } from './appearance.js';
-import { piniaPluginPersist } from './plugin.js';
-
-function createPiniaStore() {
-  const pinia = createPinia();
-  pinia.use(piniaPluginPersist);
-  return pinia;
-}
-
-export { createPiniaStore };
+export { launchStore, pinia } from './pinia.js';
+export { useLayoutStore, useOuterLayoutStore } from './layout.js';
+export { useOuterUserStore, useUserStore } from './user.js';

package/store/layout.d.ts

@@ -1,4 +1,5 @@
-import { RouteMeta } from 'vue-router';
+import { type RouteMeta } from 'vue-router';
+import { type StoreGeneric } from 'pinia';
 export type LayoutMenuType = 'vertical' | 'biserial' | 'horizontal' | 'horizontal-vertical' | 'horizontal-biserial';
 export interface LayoutTab {
     name: string;
@@ -15,18 +16,18 @@ export declare const useLayoutStore: import("pinia").StoreDefinition<"cosey-layo
     isHorizontal: import("vue").ComputedRef<boolean>;
     isHorizontalVertical: import("vue").ComputedRef<boolean>;
     isHorizontalBiserial: import("vue").ComputedRef<boolean>;
-    menus: import("vue").ComputedRef<import("..").MenuItem[]>;
-    menusMap: import("vue").ComputedRef<Record<string | number, import("..").MenuNode>>;
-    firstLevelMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    menus: import("vue").ComputedRef<import("../router").MenuItem[]>;
+    menusMap: import("vue").ComputedRef<Record<string | number, import("../router").MenuNode>>;
+    firstLevelMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     firstLevelActive: import("vue").Ref<string, string>;
-    secondLevelMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    secondLevelMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     secondLevelActive: import("vue").Ref<string, string>;
-    thirdLevelMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
-    topMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    thirdLevelMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
+    topMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     topActive: import("vue").Ref<string, string>;
-    snugMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    snugMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     snugActive: import("vue").WritableComputedRef<string, string>;
-    defaultMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    defaultMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     tabbarVisible: import("vue").Ref<boolean, boolean>;
     activeTab: import("vue").Ref<string, string>;
     refreshing: import("vue").Ref<boolean, boolean>;
@@ -95,18 +96,18 @@ export declare const useLayoutStore: import("pinia").StoreDefinition<"cosey-layo
     isHorizontal: import("vue").ComputedRef<boolean>;
     isHorizontalVertical: import("vue").ComputedRef<boolean>;
     isHorizontalBiserial: import("vue").ComputedRef<boolean>;
-    menus: import("vue").ComputedRef<import("..").MenuItem[]>;
-    menusMap: import("vue").ComputedRef<Record<string | number, import("..").MenuNode>>;
-    firstLevelMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    menus: import("vue").ComputedRef<import("../router").MenuItem[]>;
+    menusMap: import("vue").ComputedRef<Record<string | number, import("../router").MenuNode>>;
+    firstLevelMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     firstLevelActive: import("vue").Ref<string, string>;
-    secondLevelMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    secondLevelMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     secondLevelActive: import("vue").Ref<string, string>;
-    thirdLevelMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
-    topMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    thirdLevelMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
+    topMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     topActive: import("vue").Ref<string, string>;
-    snugMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    snugMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     snugActive: import("vue").WritableComputedRef<string, string>;
-    defaultMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    defaultMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     tabbarVisible: import("vue").Ref<boolean, boolean>;
     activeTab: import("vue").Ref<string, string>;
     refreshing: import("vue").Ref<boolean, boolean>;
@@ -175,18 +176,18 @@ export declare const useLayoutStore: import("pinia").StoreDefinition<"cosey-layo
     isHorizontal: import("vue").ComputedRef<boolean>;
     isHorizontalVertical: import("vue").ComputedRef<boolean>;
     isHorizontalBiserial: import("vue").ComputedRef<boolean>;
-    menus: import("vue").ComputedRef<import("..").MenuItem[]>;
-    menusMap: import("vue").ComputedRef<Record<string | number, import("..").MenuNode>>;
-    firstLevelMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    menus: import("vue").ComputedRef<import("../router").MenuItem[]>;
+    menusMap: import("vue").ComputedRef<Record<string | number, import("../router").MenuNode>>;
+    firstLevelMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     firstLevelActive: import("vue").Ref<string, string>;
-    secondLevelMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    secondLevelMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     secondLevelActive: import("vue").Ref<string, string>;
-    thirdLevelMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
-    topMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    thirdLevelMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
+    topMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     topActive: import("vue").Ref<string, string>;
-    snugMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    snugMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     snugActive: import("vue").WritableComputedRef<string, string>;
-    defaultMenus: import("vue").ComputedRef<import("..").MenuItem[]>;
+    defaultMenus: import("vue").ComputedRef<import("../router").MenuItem[]>;
     tabbarVisible: import("vue").Ref<boolean, boolean>;
     activeTab: import("vue").Ref<string, string>;
     refreshing: import("vue").Ref<boolean, boolean>;
@@ -245,3 +246,34 @@ export declare const useLayoutStore: import("pinia").StoreDefinition<"cosey-layo
     tabbarHeight: import("vue").Ref<number, number>;
     headerHeight: import("vue").ComputedRef<number>;
 }, "reload" | "updateKeepAliveInclude">>;
+export declare const useOuterLayoutStore: (hot?: StoreGeneric) => import("pinia").Store<"cosey-user", Pick<{
+    dynamicRoutes: import("vue").ShallowRef<any[], any[]>;
+    userInfo: import("vue").Ref<import("./user").UserInfo | undefined, import("./user").UserInfo | undefined>;
+    requestedUserInfo: import("vue").Ref<boolean, boolean>;
+    login: (data: any) => Promise<void>;
+    getUserInfo: () => Promise<import("./user").UserInfo | undefined>;
+    changePassword: (data: any) => Promise<void>;
+    setAuthorization: () => Promise<void>;
+    addDynamicRoutes: () => Promise<void>;
+    logout: (lastPath?: string) => Promise<void>;
+}, "dynamicRoutes" | "userInfo" | "requestedUserInfo">, Pick<{
+    dynamicRoutes: import("vue").ShallowRef<any[], any[]>;
+    userInfo: import("vue").Ref<import("./user").UserInfo | undefined, import("./user").UserInfo | undefined>;
+    requestedUserInfo: import("vue").Ref<boolean, boolean>;
+    login: (data: any) => Promise<void>;
+    getUserInfo: () => Promise<import("./user").UserInfo | undefined>;
+    changePassword: (data: any) => Promise<void>;
+    setAuthorization: () => Promise<void>;
+    addDynamicRoutes: () => Promise<void>;
+    logout: (lastPath?: string) => Promise<void>;
+}, never>, Pick<{
+    dynamicRoutes: import("vue").ShallowRef<any[], any[]>;
+    userInfo: import("vue").Ref<import("./user").UserInfo | undefined, import("./user").UserInfo | undefined>;
+    requestedUserInfo: import("vue").Ref<boolean, boolean>;
+    login: (data: any) => Promise<void>;
+    getUserInfo: () => Promise<import("./user").UserInfo | undefined>;
+    changePassword: (data: any) => Promise<void>;
+    setAuthorization: () => Promise<void>;
+    addDynamicRoutes: () => Promise<void>;
+    logout: (lastPath?: string) => Promise<void>;
+}, "changePassword" | "login" | "logout" | "getUserInfo" | "setAuthorization" | "addDynamicRoutes">>;

package/store/layout.js

@@ -1,18 +1,18 @@
-import { defineStore } from 'pinia';
-import { useRoute } from 'vue-router';
-import { getAllStaticRoutes } from '../router/index.js';
-import { useGlobalConfig } from '../config/index.js';
 import { ref, watch, computed, nextTick } from 'vue';
-import { useUserStore } from './user.js';
+import { defineStore } from 'pinia';
+import { router, getAllStaticRoutes } from '../router/index.js';
+import { useOuterUserStore, useUserStore } from './user.js';
+import { pinia } from './pinia.js';
+import { globalConfig } from '../config/index.js';
 import { useWindowResize } from '../hooks/useWindowResize.js';
 import { getMenus, getMenusMap, getBreadcrumbRoutes } from '../router/menus/index.js';
 
 const useLayoutStore = defineStore(
   "cosey-layout",
   () => {
-    const { layout: layoutConfig } = useGlobalConfig();
-    const route = useRoute();
-    const userStore = useUserStore();
+    const { layout: layoutConfig } = globalConfig;
+    const currentRoute = router.currentRoute;
+    const userStore = useOuterUserStore();
     const sidebarVisible = ref(layoutConfig.sidebarVisible);
     const collapse = ref(layoutConfig.collapse);
     const isMobile = ref(false);
@@ -82,8 +82,8 @@ const useLayoutStore = defineStore(
       }
       return menuType.value === "biserial" || menuType.value === "horizontal-vertical" ? secondLevelMenus.value : menuType.value === "horizontal-biserial" ? thirdLevelMenus.value : firstLevelMenus.value;
     });
-    watch([() => route.name, menus], () => {
-      const node = menusMap.value[route.name];
+    watch([() => currentRoute.value.name, menus], () => {
+      const node = menusMap.value[currentRoute.value.name];
       if (node) {
         const nodes = getBreadcrumbRoutes(node);
         topActive.value = nodes[0].name;
@@ -125,12 +125,14 @@ const useLayoutStore = defineStore(
     );
     const reload = () => {
       refreshing.value = true;
-      if (keepAliveInclude.value.includes(route.name)) {
-        keepAliveInclude.value = keepAliveInclude.value.filter((item) => item !== route.name);
+      if (keepAliveInclude.value.includes(currentRoute.value.name)) {
+        keepAliveInclude.value = keepAliveInclude.value.filter(
+          (item) => item !== currentRoute.value.name
+        );
       }
       nextTick(() => {
         refreshing.value = false;
-        keepAliveInclude.value = [...keepAliveInclude.value, route.name];
+        keepAliveInclude.value = [...keepAliveInclude.value, currentRoute.value.name];
       });
     };
     const asideWidth = ref(layoutConfig.asideWidth);
@@ -229,5 +231,8 @@ const useLayoutStore = defineStore(
     }
   }
 );
+const useOuterLayoutStore = (hot) => {
+  return useUserStore(pinia, hot);
+};
 
-export { useLayoutStore };
+export { useLayoutStore, useOuterLayoutStore };

package/store/pinia.d.ts

@@ -0,0 +1,4 @@
+import { createPinia } from 'pinia';
+import { App } from 'vue';
+export declare let pinia: ReturnType<typeof createPinia>;
+export declare function launchStore(app: App): void;

package/store/pinia.js

@@ -0,0 +1,11 @@
+import { createPinia } from 'pinia';
+import { piniaPluginPersist } from './plugin.js';
+
+let pinia;
+function launchStore(app) {
+  pinia = createPinia();
+  pinia.use(piniaPluginPersist);
+  app.use(pinia);
+}
+
+export { launchStore, pinia };

package/store/plugin.js

@@ -1,20 +1,19 @@
 import { watch } from 'vue';
-import { usePersist } from '../hooks/usePersist.js';
+import { persist } from '../persist/index.js';
 
 function piniaPluginPersist(context) {
   const {
     store,
-    options: { persist }
+    options: { persist: persistConfig }
   } = context;
-  const pickKeys = persist?.pick || [];
-  const persistIns = usePersist();
+  const pickKeys = persistConfig?.pick || [];
   const persistKey = `Cosey:pinia:${store.$id}`;
-  const localData = persistIns.get(persistKey) || {};
+  const localData = persist.get(persistKey) || {};
   store.$patch(localData);
   watch(
     pickKeys.map((key) => () => store[key]),
     () => {
-      persistIns.set(persistKey, Object.fromEntries(pickKeys.map((key) => [key, store[key]])));
+      persist.set(persistKey, Object.fromEntries(pickKeys.map((key) => [key, store[key]])));
     }
   );
 }

package/store/user.d.ts

@@ -1,4 +1,5 @@
-interface UserInfo {
+import { type StoreGeneric } from 'pinia';
+export interface UserInfo {
     id?: number;
     username?: string;
     nickname: string;
@@ -36,4 +37,34 @@ export declare const useUserStore: import("pinia").StoreDefinition<"cosey-user",
     addDynamicRoutes: () => Promise<void>;
     logout: (lastPath?: string) => Promise<void>;
 }, "changePassword" | "login" | "logout" | "getUserInfo" | "setAuthorization" | "addDynamicRoutes">>;
-export {};
+export declare const useOuterUserStore: (hot?: StoreGeneric) => import("pinia").Store<"cosey-user", Pick<{
+    dynamicRoutes: import("vue").ShallowRef<any[], any[]>;
+    userInfo: import("vue").Ref<UserInfo | undefined, UserInfo | undefined>;
+    requestedUserInfo: import("vue").Ref<boolean, boolean>;
+    login: (data: any) => Promise<void>;
+    getUserInfo: () => Promise<UserInfo | undefined>;
+    changePassword: (data: any) => Promise<void>;
+    setAuthorization: () => Promise<void>;
+    addDynamicRoutes: () => Promise<void>;
+    logout: (lastPath?: string) => Promise<void>;
+}, "dynamicRoutes" | "userInfo" | "requestedUserInfo">, Pick<{
+    dynamicRoutes: import("vue").ShallowRef<any[], any[]>;
+    userInfo: import("vue").Ref<UserInfo | undefined, UserInfo | undefined>;
+    requestedUserInfo: import("vue").Ref<boolean, boolean>;
+    login: (data: any) => Promise<void>;
+    getUserInfo: () => Promise<UserInfo | undefined>;
+    changePassword: (data: any) => Promise<void>;
+    setAuthorization: () => Promise<void>;
+    addDynamicRoutes: () => Promise<void>;
+    logout: (lastPath?: string) => Promise<void>;
+}, never>, Pick<{
+    dynamicRoutes: import("vue").ShallowRef<any[], any[]>;
+    userInfo: import("vue").Ref<UserInfo | undefined, UserInfo | undefined>;
+    requestedUserInfo: import("vue").Ref<boolean, boolean>;
+    login: (data: any) => Promise<void>;
+    getUserInfo: () => Promise<UserInfo | undefined>;
+    changePassword: (data: any) => Promise<void>;
+    setAuthorization: () => Promise<void>;
+    addDynamicRoutes: () => Promise<void>;
+    logout: (lastPath?: string) => Promise<void>;
+}, "changePassword" | "login" | "logout" | "getUserInfo" | "setAuthorization" | "addDynamicRoutes">>;

package/store/user.js

@@ -1,43 +1,32 @@
 import { shallowRef, ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
 import { defineStore } from 'pinia';
-import { getAllDynamicRoutes } from '../router/index.js';
+import { getAllDynamicRoutes, router } from '../router/index.js';
 import { TOKEN_NAME } from '../constant.js';
-import { useGlobalConfig } from '../config/index.js';
 import { NOT_FOUND_ROUTE_NAME, NotFoundRoute } from '../router/not-found.js';
-import { usePersist } from '../hooks/usePersist.js';
-import { isFunction } from '../utils/is.js';
+import { persist } from '../persist/index.js';
+import { pinia } from './pinia.js';
+import { globalConfig } from '../config/index.js';
 import { warningOnce } from '../utils/warning.js';
 
 const useUserStore = defineStore("cosey-user", () => {
-  const route = useRoute();
-  const router = useRouter();
-  const persist = usePersist();
-  const {
-    router: routerConfig,
-    api: apiConfig,
-    filterRoute,
-    defineAuthority
-  } = useGlobalConfig() || {};
-  const filterRouteHandler = isFunction(filterRoute) ? filterRoute : filterRoute.hook();
-  const defineAuthorityHandler = isFunction(defineAuthority) ? defineAuthority : defineAuthority.hook();
+  const { router: routerConfig, api: apiConfig, filterRoute, defineAuthority } = globalConfig;
   if (!apiConfig?.login) {
     warningOnce(!!apiConfig?.login, 'The "login" api is required.');
   }
   if (!apiConfig?.getUserInfo) {
     warningOnce(!!apiConfig?.getUserInfo, 'The "getUserInfo" api is required.');
   }
-  const loginApi = apiConfig?.login?.();
-  const getUserInfoApi = apiConfig?.getUserInfo?.();
-  const changePasswordApi = apiConfig?.changePassword?.();
-  const logoutApi = apiConfig?.logout?.();
+  const loginApi = apiConfig?.login;
+  const getUserInfoApi = apiConfig?.getUserInfo;
+  const changePasswordApi = apiConfig?.changePassword;
+  const logoutApi = apiConfig?.logout;
   const dynamicRoutes = shallowRef([]);
   const userInfo = ref();
   const requestedUserInfo = ref(false);
   const login = async (data) => {
     await loginApi?.(data).then((token) => {
       persist.set(TOKEN_NAME, token);
-      router.push(route.query.redirect || routerConfig.homePath);
+      router.push(router.currentRoute.value.query.redirect || routerConfig.homePath);
     });
   };
   const getUserInfo = async () => {
@@ -58,12 +47,12 @@ const useUserStore = defineStore("cosey-user", () => {
     });
   };
   const setAuthorization = async () => {
-    return defineAuthorityHandler(userInfo.value);
+    return defineAuthority(userInfo.value);
   };
   const mapRoute = (routes) => {
-    return routes.map((route2) => {
-      const result = filterRouteHandler(route2);
-      const node = result === true ? route2 : result;
+    return routes.map((route) => {
+      const result = filterRoute(route);
+      const node = result === true ? route : result;
       if (node && node.children && node.children.length) {
         node.children = mapRoute(node.children);
       }
@@ -76,8 +65,8 @@ const useUserStore = defineStore("cosey-user", () => {
   const addDynamicRoutes = async () => {
     const filteredRoutes = filterRoutes(getAllDynamicRoutes());
     router.removeRoute(NOT_FOUND_ROUTE_NAME);
-    filteredRoutes.forEach((route2) => {
-      router.addRoute(route2);
+    filteredRoutes.forEach((route) => {
+      router.addRoute(route);
     });
     router.addRoute("Exception", NotFoundRoute);
     dynamicRoutes.value = filteredRoutes;
@@ -92,8 +81,8 @@ const useUserStore = defineStore("cosey-user", () => {
         redirect: lastPath
       }
     });
-    dynamicRoutes.value.forEach((route2) => {
-      router.removeRoute(route2.name);
+    dynamicRoutes.value.forEach((route) => {
+      router.removeRoute(route.name);
     });
     dynamicRoutes.value = [];
   };
@@ -113,5 +102,8 @@ const useUserStore = defineStore("cosey-user", () => {
     logout
   };
 });
+const useOuterUserStore = (hot) => {
+  return useUserStore(pinia, hot);
+};
 
-export { useUserStore };
+export { useOuterUserStore, useUserStore };

package/hooks/usePersist.d.ts

@@ -1,9 +0,0 @@
-import Persist from '@gunny/persist';
-import { type InjectionKey } from 'vue';
-export declare const persistContextKey: InjectionKey<Persist>;
-export declare const createPersist: (name: string, type: "local" | "session") => Persist;
-/**
- * 持久化数据，保存在硬盘里而不是在内存中，刷新页面后还能读取到数据。
- * https://github.com/sutras/persist#readme
- */
-export declare function usePersist(): Persist;

package/hooks/usePersist.js

@@ -1,17 +0,0 @@
-import Persist from '@gunny/persist';
-import { inject } from 'vue';
-
-const persistContextKey = Symbol("persistContext");
-const createPersist = (name, type) => {
-  return new Persist(name, { type });
-};
-let defaultPersist;
-function usePersist() {
-  let persist = inject(persistContextKey, defaultPersist);
-  if (!persist) {
-    persist = defaultPersist = createPersist("CoseyAdmin", "local");
-  }
-  return persist;
-}
-
-export { createPersist, persistContextKey, usePersist };

package/request/useRequest.d.ts

@@ -1,13 +0,0 @@
-import { type CreateAxiosDefaults } from 'axios';
-import { Http } from './Http';
-import { type HttpConfig } from '../config/http';
-export declare function useRequest(config?: CreateAxiosDefaults, useHttpConfig?: HttpConfig): {
-    fn: <T extends (http: Http) => (...args: any[]) => any, R = {
-        (...args: Parameters<ReturnType<T>>): ReturnType<ReturnType<T>>;
-        abort: () => void;
-    }>(handler: T) => R;
-    map: <T extends Record<string, (http: Http) => (...args: any[]) => any>, R = { [K in keyof T]: {
-        (...args: Parameters<ReturnType<T[K]>>): ReturnType<ReturnType<T[K]>>;
-        abort: () => void;
-    }; }>(object: T) => R;
-};

package/request/useRequest.js

@@ -1,109 +0,0 @@
-import { useRouter, useRoute } from 'vue-router';
-import axios, { AxiosError } from 'axios';
-import { ElMessage } from 'element-plus';
-import { merge, defaults, pick, get } from 'lodash-es';
-import { useUserStore } from '../store/user.js';
-import { TOKEN_NAME, ROUTER_TO } from '../constant.js';
-import { Http } from './Http.js';
-import { useGlobalConfig } from '../config/index.js';
-import { usePersist } from '../hooks/usePersist.js';
-import { isObject } from '../utils/is.js';
-
-function useRequest(config = {}, useHttpConfig) {
-  const persist = usePersist();
-  const userStore = useUserStore();
-  const router = useRouter();
-  const route = useRoute();
-  const { http: httpConfig, router: routerConfig } = useGlobalConfig();
-  const handleError = (resData, mergedHttpConfig) => {
-    const httpPath = mergedHttpConfig.path;
-    const code = get(resData, httpPath.code);
-    const message = get(resData, httpPath.message) || "Error";
-    const data = httpPath.data ? get(resData, httpPath.data) : resData;
-    if (code !== mergedHttpConfig.code.success) {
-      ElMessage.error({
-        message,
-        duration: mergedHttpConfig.errorDuration
-      });
-      if (code === mergedHttpConfig.code.forbidden) {
-        router.push(routerConfig.homePath);
-      } else if (code === mergedHttpConfig.code.unauthorized) {
-        if (persist.get(TOKEN_NAME)) {
-          userStore.logout(persist.get(ROUTER_TO) || route.fullPath);
-        }
-      }
-      return Promise.reject(new Error(message));
-    }
-    if (mergedHttpConfig.originalData) {
-      return resData;
-    }
-    return data;
-  };
-  const createAxios = (createHttpConfig) => {
-    const mergedHttpConfig = merge({}, httpConfig, useHttpConfig, createHttpConfig);
-    const axiosIns = axios.create(
-      defaults(config, pick(mergedHttpConfig, ["baseURL", "timeout", "headers"]))
-    );
-    axiosIns.interceptors.request.use(
-      (config2) => {
-        Object.assign(config2, mergedHttpConfig.headers);
-        const token = persist.get(TOKEN_NAME);
-        if (token) {
-          config2.headers[mergedHttpConfig.authHeaderKey] = mergedHttpConfig.authScheme ? `${mergedHttpConfig.authScheme} ${token}` : token;
-        }
-        return config2;
-      },
-      (error) => {
-        ElMessage.error({
-          message: error,
-          duration: mergedHttpConfig.errorDuration
-        });
-        return Promise.reject(error);
-      }
-    );
-    axiosIns.interceptors.response.use(
-      (response) => {
-        if (mergedHttpConfig.originalResponse) {
-          return response;
-        }
-        const { data: resData } = response;
-        return handleError(resData, mergedHttpConfig);
-      },
-      (error) => {
-        if (error instanceof AxiosError && error.response && isObject(error.response.data) && get(error.response.data, mergedHttpConfig.path.code)) {
-          return handleError(error.response.data, mergedHttpConfig);
-        } else {
-          ElMessage.error({
-            message: error.message,
-            duration: mergedHttpConfig.errorDuration
-          });
-          return Promise.reject(error);
-        }
-      }
-    );
-    return axiosIns;
-  };
-  const fn = (handler) => {
-    const http = new Http(createAxios);
-    const wrappedFn = (...args) => {
-      return handler(http)(...args);
-    };
-    wrappedFn.abort = () => {
-      http.abort();
-    };
-    return wrappedFn;
-  };
-  const map = (object) => {
-    const result = {};
-    for (const [key, handler] of Object.entries(object)) {
-      result[key] = fn(handler);
-    }
-    return result;
-  };
-  return {
-    fn,
-    map
-  };
-}
-
-export { useRequest };