cosey 0.10.9 → 0.10.10

package/components/editor/hooks/useHistoryColor.js

@@ -1,10 +1,9 @@
 import { ref } from 'vue';
-import { usePersist } from '../../../hooks/usePersist.js';
+import { persist } from '../../../persist/index.js';
 
 const historyColorKey = "Cosey:historyColor";
 let historyColors = null;
 function useHistoryColor() {
-  const persist = usePersist();
   if (!historyColors) {
     historyColors = ref(persist.get(historyColorKey) || []);
   }

package/components/upload/upload.api.js

@@ -34,7 +34,7 @@ const uploadProps = {
     default: "large"
   },
   request: {
-    type: Function
+    type: [Function, null]
   },
   requestConfig: {
     type: Object

package/config/api.d.ts

@@ -7,23 +7,23 @@ export declare const defaultApiConfig: {
     /**
      * 文件上传
      */
-    upload: (() => (data: Blob, config?: AxiosRequestConfig) => Promise<string>) | null;
+    upload: ((data: Blob, config?: AxiosRequestConfig, extra?: Record<PropertyKey, any>) => Promise<string>) | null;
     /**
      * 登录
      */
-    login: (() => (data: any, config?: AxiosRequestConfig) => Promise<string>) | null;
+    login: ((data: any, config?: AxiosRequestConfig) => Promise<string>) | null;
     /**
      * 获取用户详情
      */
-    getUserInfo: (() => (config?: AxiosRequestConfig) => Promise<any>) | null;
+    getUserInfo: ((config?: AxiosRequestConfig) => Promise<any>) | null;
     /**
      * 修改密码
      */
-    changePassword: (() => (data: any, config?: AxiosRequestConfig) => Promise<any>) | null;
+    changePassword: ((data: any, config?: AxiosRequestConfig) => Promise<any>) | null;
     /**
      * 退出
      */
-    logout: (() => (config?: AxiosRequestConfig) => Promise<any>) | null;
+    logout: ((config?: AxiosRequestConfig) => Promise<any>) | null;
 };
 export type ApiConfig = DeepPartial<typeof defaultApiConfig>;
 export type RequiredApiConfig = typeof defaultApiConfig;

package/config/index.d.ts

@@ -5,7 +5,7 @@ import { type SiteConfig, type RequiredSiteConfig } from './site';
 import { type HttpConfig, type RequiredHttpConfig } from './http';
 import { type ApiConfig, type RequiredApiConfig } from './api';
 import { type PersistConfig } from './persist';
-import { I18nConfig } from './i18n';
+import { type I18nConfig } from './i18n';
 import { type RouteRecordRaw } from 'vue-router';
 import { type CoseyRouterOptions } from '../router';
 export interface LayoutComponents {
@@ -51,19 +51,15 @@ type FilterRouteHandler = (route: RouteRecordRaw) => RouteRecordRaw | void | boo
 type DefineAuthorityHandler = (userInfo: Record<any, any>) => void | Promise<void>;
 export type CoseyOptions = {
     router?: CoseyRouterOptions & RouterConfig;
-    persist?: PersistConfig;
     http?: HttpConfig;
     layout?: LayoutConfig;
     site?: SiteConfig;
     api?: ApiConfig;
-    filterRoute?: {
-        hook: () => FilterRouteHandler;
-    } | FilterRouteHandler;
-    defineAuthority?: {
-        hook: () => DefineAuthorityHandler;
-    } | DefineAuthorityHandler;
+    filterRoute?: FilterRouteHandler;
+    defineAuthority?: DefineAuthorityHandler;
     components?: LayoutComponents;
     slots?: LayoutSlots;
+    persist?: PersistConfig;
     i18n?: I18nConfig;
 };
 export interface GlobalConfig {
@@ -77,21 +73,7 @@ export interface GlobalConfig {
     components: NonNullable<CoseyOptions['components']>;
     slots: NonNullable<CoseyOptions['slots']>;
 }
-export declare function provideGlobalConfig(app: App, options: CoseyOptions): {
-    router: any;
-    http: any;
-    layout: any;
-    site: any;
-    api: any;
-    filterRoute: FilterRouteHandler | {
-        hook: () => FilterRouteHandler;
-    };
-    defineAuthority: DefineAuthorityHandler | {
-        hook: () => DefineAuthorityHandler;
-    };
-    components: LayoutComponents;
-    slots: LayoutSlots;
-    persist: import("@gunny/persist").default;
-};
+export declare let globalConfig: GlobalConfig;
+export declare function launchGlobalConfig(app: App, options: CoseyOptions): void;
 export declare function useGlobalConfig(): GlobalConfig;
 export {};

package/config/index.js

@@ -5,15 +5,14 @@ import { defaultLayoutConfig } from './layout.js';
 import { defaultSiteConfig } from './site.js';
 import { defaultHttpConfig } from './http.js';
 import { defaultApiConfig } from './api.js';
-import { defaultPersistConfig } from './persist.js';
-import { setupLocale } from '../locale/index.js';
-import { createPersist, persistContextKey } from '../hooks/usePersist.js';
+import { launchLocale } from '../locale/index.js';
+import { launchPersist } from '../persist/index.js';
 
 const globalConfigContextKey = Symbol("globalConfigContext");
-function provideGlobalConfig(app, options) {
+let globalConfig;
+function launchGlobalConfig(app, options) {
   const {
     router: { homePath, loginPath, changePasswordPath } = {},
-    persist = {},
     http = {},
     layout = {},
     site = {},
@@ -22,13 +21,10 @@ function provideGlobalConfig(app, options) {
     defineAuthority = () => void 0,
     components = {},
     slots = {},
+    persist = {},
     i18n = {}
   } = options;
-  const persistConfig = defaultsDeep(persist, defaultPersistConfig);
-  const persistIns = createPersist(persistConfig.name, persistConfig.type);
-  setupLocale(app, i18n, persistIns);
-  app.provide(persistContextKey, persistIns);
-  const globalConfig = {
+  globalConfig = {
     router: defaultsDeep({ homePath, loginPath, changePasswordPath }, defaultRouterConfig),
     http: defaultsDeep(http, defaultHttpConfig),
     layout: defaultsDeep(layout, defaultLayoutConfig),
@@ -37,14 +33,14 @@ function provideGlobalConfig(app, options) {
     filterRoute,
     defineAuthority,
     components,
-    slots,
-    persist: persistIns
+    slots
   };
   app.provide(globalConfigContextKey, globalConfig);
-  return globalConfig;
+  launchPersist(persist);
+  launchLocale(app, i18n);
 }
 function useGlobalConfig() {
   return inject(globalConfigContextKey, {});
 }
 
-export { provideGlobalConfig, useGlobalConfig };
+export { globalConfig, launchGlobalConfig, useGlobalConfig };

package/config/root-config-provider.js

@@ -32,7 +32,7 @@ var stdin_default = defineComponent({
     const coseyLocale = useCoseyLocale();
     const apiConfig = useGlobalConfig()?.api;
     if (apiConfig) {
-      const uploadApi = apiConfig.upload?.();
+      const uploadApi = apiConfig.upload;
       provideUploadConfig({
         request: uploadApi
       });
@@ -52,7 +52,7 @@ var stdin_default = defineComponent({
     return () => {
       return createVNode(_ConfigProvider, mergedConfigProviderProps.value, {
         default: () => [createVNode(ElConfigProvider, {
-          "locale": props.locale
+          "locale": coseyLocale.value
         }, slots)]
       });
     };

package/config/upload.d.ts

@@ -1,6 +1,6 @@
 import type { AxiosRequestConfig } from 'axios';
 export interface UploadContext {
-    request?: (data: Blob, config?: AxiosRequestConfig, extra?: Record<PropertyKey, any>) => Promise<string>;
+    request?: ((data: Blob, config?: AxiosRequestConfig, extra?: Record<PropertyKey, any>) => Promise<string>) | null;
 }
 export declare const provideUploadConfig: (context: UploadContext) => void;
 export declare const injectUploadConfig: () => UploadContext | null;

package/hooks/index.d.ts

@@ -14,7 +14,6 @@ export * from './useTwoWayBinding';
 export * from './useUpsert';
 export * from './useVisible';
 export * from './useWindowResize';
-export * from './usePersist';
 export * from './useRectObserver';
 export * from './useTreeCheck';
 export * from './useOptionalComponent';

package/hooks/index.js

@@ -14,7 +14,6 @@ export { useTwoWayBinding } from './useTwoWayBinding.js';
 export { useOuterUpsert, useUpsert } from './useUpsert.js';
 export { useVisible } from './useVisible.js';
 export { useWindowResize } from './useWindowResize.js';
-export { createPersist, persistContextKey, usePersist } from './usePersist.js';
 export { useRectObserver } from './useRectObserver.js';
 export { treeCheckContextKey, useTreeCheck, useTreeCheckInject } from './useTreeCheck.js';
 export { useOptionalComponent } from './useOptionalComponent.js';

package/hooks/useColorScheme.js

@@ -1,5 +1,5 @@
 import { inject, ref, computed, onMounted, onBeforeUnmount, watch, provide } from 'vue';
-import { usePersist } from './usePersist.js';
+import { persist } from '../persist/index.js';
 import { isClient } from '../utils/env.js';
 
 const colorSchemeContextSymbol = Symbol("colorScheme");
@@ -10,7 +10,6 @@ const colorSchemeOptions = [
   { label: "co.colorScheme.dark", icon: "co:moon", value: "dark" }
 ];
 function useColorSchemeProvide() {
-  const persist = usePersist();
   const defaultColorScheme = persist.get(colorSchemeKey) || "auto";
   const colorScheme = ref(defaultColorScheme);
   const appliedColorScheme = ref("light");

package/index.d.ts

@@ -1,17 +1,13 @@
 import { type App } from 'vue';
 import { type CoseyOptions } from './config';
-export * from './request';
-export * from './layout';
-export * from './router';
+export { Http, createHttp, http } from './request';
+export * from './layout/layout';
+export * from './layout/merged';
+export { defineRoute, defineRoutes, mergeRouteModules, router } from './router';
+export { pinia, useUserStore, useOuterUserStore, useLayoutStore, useOuterLayoutStore, } from './store';
+export { type CoseyOptions, type LayoutComponents, type LayoutSlots } from './config';
+export { persist } from './persist';
 export { i18n } from './locale';
-export { useUserStore, useAppearanceStore, useLayoutStore } from './store';
-export * from './config';
 export * from './config/root-config-provider.api';
 export { default as RootConfigProvider } from './config/root-config-provider';
-export interface CoseyApp<HostElement> extends App<HostElement> {
-}
-export declare const createCosey: (options?: CoseyOptions) => {
-    install(app: App): void;
-    pinia: import("pinia").Pinia;
-    router: import("vue-router").Router;
-};
+export declare function launch(app: App, options?: CoseyOptions): void;

package/index.js

@@ -1,19 +1,19 @@
-import { createCoseyRouter } from './router/index.js';
-export { getAllDynamicRoutes, getAllStaticRoutes } from './router/index.js';
-import { registerRouterGuard } from './router/guard/index.js';
-import { provideGlobalConfig } from './config/index.js';
-export { useGlobalConfig } from './config/index.js';
-import { registerGlobalComponents } from './layout/index.js';
-import { createPiniaStore } from './store/index.js';
+import { launchRouter } from './router/index.js';
+export { router } from './router/index.js';
+import { launchGlobalConfig } from './config/index.js';
+import { launchGlobalComponents } from './layout/index.js';
+import { launchStore } from './store/pinia.js';
+export { pinia } from './store/pinia.js';
+export { useLayoutStore, useOuterLayoutStore } from './store/layout.js';
+export { useOuterUserStore, useUserStore } from './store/user.js';
+export { createHttp, http } from './request/index.js';
+export { persist } from './persist/index.js';
 export { i18n } from './locale/index.js';
 export { getAlgorithm, rootConfigProviderProps } from './config/root-config-provider.api.js';
 export { default as RootConfigProvider } from './config/root-config-provider.js';
-export { useAppearanceStore } from './store/appearance.js';
-export { useLayoutStore } from './store/layout.js';
-export { useUserStore } from './store/user.js';
-import { isClient } from './utils/env.js';
 export { Http } from './request/Http.js';
-export { useRequest } from './request/useRequest.js';
+export { defineRoute, defineRoutes, mergeRouteModules } from './router/utils.js';
+import { isClient } from './utils/env.js';
 export { default as LayoutAside } from './layout/layout-aside/layout-aside.vue.js';
 export { default as LayoutAuth } from './layout/layout-auth/layout-auth.vue.js';
 export { default as LayoutBase } from './layout/layout-base/layout-base.vue.js';
@@ -73,27 +73,14 @@ export { default as MergedLayoutToggle } from './layout/merged/layout-toggle.js'
 export { default as MergedLayoutTopSnugMenu } from './layout/merged/layout-top-snug-menu.js';
 export { default as MergedLayoutTopbar } from './layout/merged/layout-topbar.js';
 export { default as MergedLayoutUserMenu } from './layout/merged/layout-user-menu.js';
-export { defineRoute, defineRoutes, mergeRouteModules } from './router/utils.js';
-export { getBreadcrumbRoutes, getMenuPathKeys, getMenus, getMenusMap } from './router/menus/index.js';
 
-const createCosey = (options = {}) => {
-  const pinia = createPiniaStore();
-  const router = createCoseyRouter(options.router);
-  return {
-    install(app) {
-      if (isClient()) {
-        provideGlobalConfig(app, options);
-      }
-      app.use(router);
-      if (router.listening) {
-        registerRouterGuard(router);
-      }
-      app.use(pinia);
-      registerGlobalComponents(app);
-    },
-    pinia,
-    router
-  };
-};
+function launch(app, options = {}) {
+  launchRouter(app, options.router);
+  launchStore(app);
+  launchGlobalComponents(app);
+  if (isClient()) {
+    launchGlobalConfig(app, options);
+  }
+}
 
-export { createCosey, createCoseyRouter, provideGlobalConfig, registerGlobalComponents };
+export { launch };

package/layout/index.d.ts

@@ -1,4 +1,2 @@
 import { type App } from 'vue';
-export declare function registerGlobalComponents(app: App): void;
-export * from './layout';
-export * from './merged';
+export declare function launchGlobalComponents(app: App): void;

package/layout/index.js

@@ -1,68 +1,9 @@
 import ElementPlus from 'element-plus';
 import stdin_default from '../components/index.js';
-export { default as LayoutAside } from './layout-aside/layout-aside.vue.js';
-export { default as LayoutAuth } from './layout-auth/layout-auth.vue.js';
-export { default as LayoutBase } from './layout-base/layout-base.vue.js';
-export { default as LayoutBrand } from './layout-brand/layout-brand.vue.js';
-export { default as LayoutBreadcrumb } from './layout-breadcrumb/layout-breadcrumb.vue.js';
-export { default as LayoutChangePassword } from './layout-change-password/layout-change-password.vue.js';
-export { default as LayoutColorScheme } from './layout-color-scheme/layout-color-scheme.vue.js';
-export { default as LayoutContent } from './layout-content/layout-content.vue.js';
-export { default as LayoutEmpty } from './layout-empty/layout-empty.vue.js';
-export { default as LayoutException } from './layout-exception/layout-exception.vue.js';
-export { default as LayoutForbidden } from './layout-forbidden/layout-forbidden.vue.js';
-export { default as LayoutHeader } from './layout-header/layout-header.vue.js';
-export { default as LayoutIframe } from './layout-iframe/layout-iframe.vue.js';
-export { default as LayoutInternalServerError } from './layout-internal-server-error/layout-internal-server-error.vue.js';
-export { default as LayoutLogin } from './layout-login/layout-login.vue.js';
-export { default as LayoutMain } from './layout-main/layout-main.vue.js';
-export { default as LayoutMask } from './layout-mask/layout-mask.vue.js';
-export { default as LayoutMenu } from './layout-menu/layout-menu.vue.js';
-export { default as LayoutNotFound } from './layout-not-found/layout-not-found.vue.js';
-export { default as LayoutSearch } from './layout-search/layout-search.vue.js';
-export { default as LayoutSidebar } from './layout-sidebar/layout-sidebar.vue.js';
-export { default as LayoutSnugAside } from './layout-snug-aside/layout-snug-aside.vue.js';
-export { default as LayoutSnugMenu } from './layout-snug-menu/layout-snug-menu.vue.js';
-export { default as LayoutSwitchEffect } from './layout-switch-effect/layout-switch-effect.vue.js';
-export { default as LayoutTabbar } from './layout-tabbar/layout-tabbar.vue.js';
-export { default as LayoutToggle } from './layout-toggle/layout-toggle.vue.js';
-export { default as LayoutTopSnugMenu } from './layout-top-snug-menu/layout-top-snug-menu.vue.js';
-export { default as LayoutTopbar } from './layout-topbar/layout-topbar.vue.js';
-export { default as LayoutUserMenu } from './layout-user-menu/layout-user-menu.vue.js';
-export { default as MergedLayoutAside } from './merged/layout-aside.js';
-export { default as MergedLayoutAuth } from './merged/layout-auth.js';
-export { default as MergedLayoutBase } from './merged/layout-base.js';
-export { default as MergedLayoutBrand } from './merged/layout-brand.js';
-export { default as MergedLayoutBreadcrumb } from './merged/layout-breadcrumb.js';
-export { default as MergedLayoutChangePassword } from './merged/layout-change-password.js';
-export { default as MergedLayoutColorScheme } from './merged/layout-color-scheme.js';
-export { default as MergedLayoutContent } from './merged/layout-content.js';
-export { default as MergedLayoutEmpty } from './merged/layout-empty.js';
-export { default as MergedLayoutException } from './merged/layout-exception.js';
-export { default as MergedLayoutForbidden } from './merged/layout-forbidden.js';
-export { default as MergedLayoutHeader } from './merged/layout-header.js';
-export { default as MergedLayoutIframe } from './merged/layout-iframe.js';
-export { default as MergedLayoutInternalServerError } from './merged/layout-internal-server-error.js';
-export { default as MergedLayoutLocale } from './merged/layout-locale.js';
-export { default as MergedLayoutLogin } from './merged/layout-login.js';
-export { default as MergedLayoutMain } from './merged/layout-main.js';
-export { default as MergedLayoutMask } from './merged/layout-mask.js';
-export { default as MergedLayoutMenu } from './merged/layout-menu.js';
-export { default as MergedLayoutNotFound } from './merged/layout-not-found.js';
-export { default as MergedLayoutSearch } from './merged/layout-search.js';
-export { default as MergedLayoutSidebar } from './merged/layout-sidebar.js';
-export { default as MergedLayoutSnugAside } from './merged/layout-snug-aside.js';
-export { default as MergedLayoutSnugMenu } from './merged/layout-snug-menu.js';
-export { default as MergedLayoutSwitchEffect } from './merged/layout-switch-effect.js';
-export { default as MergedLayoutTabbar } from './merged/layout-tabbar.js';
-export { default as MergedLayoutToggle } from './merged/layout-toggle.js';
-export { default as MergedLayoutTopSnugMenu } from './merged/layout-top-snug-menu.js';
-export { default as MergedLayoutTopbar } from './merged/layout-topbar.js';
-export { default as MergedLayoutUserMenu } from './merged/layout-user-menu.js';
 
-function registerGlobalComponents(app) {
+function launchGlobalComponents(app) {
   app.use(ElementPlus);
   app.use(stdin_default);
 }
 
-export { registerGlobalComponents };
+export { launchGlobalComponents };

package/locale/index.d.ts

@@ -1,6 +1,6 @@
 import { type App } from 'vue';
+import { type I18n } from 'vue-i18n';
 import { type I18nConfig } from '../config/i18n';
-import Persist from '@gunny/persist';
 export type TranslatePair = {
     [key: string]: string | string[] | TranslatePair;
 };
@@ -9,8 +9,8 @@ export type Language = {
     el: TranslatePair;
     co: TranslatePair;
 };
-export declare let i18n: import("vue-i18n").I18n<{}, {}, {}, string, false>;
-export declare function setupLocale(app: App, config: I18nConfig | undefined, persist: Persist): void;
+export declare let i18n: I18n;
+export declare function launchLocale(app: App, config?: I18nConfig): void;
 export declare function useCoseyLocale(): Record<string, any>;
 export declare function useLocaleMessages(): {
     value: string;

package/locale/index.js

@@ -1,8 +1,9 @@
-import { inject, shallowRef, watch } from 'vue';
+import { inject, shallowRef, watch, toValue } from 'vue';
 import { createI18n } from 'vue-i18n';
 import { defaultsDeep } from 'lodash-es';
 import dayjs from 'dayjs';
 import { defaultI18nConfig } from '../config/i18n.js';
+import { persist } from '../persist/index.js';
 
 const langKey = "Cosey:lang";
 const rtlLangs = ["ar"];
@@ -15,10 +16,8 @@ function getMessages(config, type) {
 }
 const coseyLocaleKey = Symbol("coseyLocale");
 const localeMessagesKey = Symbol("localeMessages");
-let i18n = createI18n({
-  legacy: false
-});
-function setupLocale(app, config = {}, persist) {
+let i18n;
+function launchLocale(app, config = {}) {
   const mergedConfig = defaultsDeep(config, defaultI18nConfig);
   const appMessages = getMessages(mergedConfig, "app");
   const coesyMessages = getMessages(mergedConfig, "cosey");
@@ -36,7 +35,7 @@ function setupLocale(app, config = {}, persist) {
     fallbackWarn: false
   });
   watch(
-    i18n.global.locale,
+    () => toValue(i18n.global.locale),
     (locale2) => {
       coseyLocale.value = coesyMessages[locale2];
       dayjs.locale(dayjsMessages[locale2]);
@@ -58,4 +57,4 @@ function useLocaleMessages() {
   return inject(localeMessagesKey, []);
 }
 
-export { i18n, setupLocale, useCoseyLocale, useLocaleMessages };
+export { i18n, launchLocale, useCoseyLocale, useLocaleMessages };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosey",
-  "version": "0.10.9",
+  "version": "0.10.10",
   "description": "基于 Vue3 + vite 的后台管理系统框架",
   "type": "module",
   "main": "index.js",
@@ -15,7 +15,7 @@
     "@emotion/hash": "^0.9.2",
     "@emotion/unitless": "^0.10.0",
     "@floating-ui/dom": "^1.6.13",
-    "@gunny/persist": "^1.0.2",
+    "@gunny/persist": "^1.0.3",
     "@iconify/types": "^2.0.0",
     "@types/is-hotkey": "^0.1.10",
     "@types/nprogress": "^0.2.3",

package/persist/index.d.ts

@@ -0,0 +1,4 @@
+import Persist from '@gunny/persist';
+import { PersistConfig } from '../config/persist';
+export declare let persist: Persist;
+export declare function launchPersist(config: PersistConfig): void;

package/persist/index.js

@@ -0,0 +1,11 @@
+import Persist from '@gunny/persist';
+import { defaultPersistConfig } from '../config/persist.js';
+import { defaultsDeep } from 'lodash-es';
+
+let persist;
+function launchPersist(config) {
+  const { name, type } = defaultsDeep(config, defaultPersistConfig);
+  persist = new Persist(name, { type });
+}
+
+export { launchPersist, persist };

package/request/Http.d.ts

@@ -7,7 +7,9 @@ export declare class Http {
     config: AxiosRequestConfig | null;
     constructor(axiosFactory: (httpConfig?: HttpConfig) => AxiosInstance);
     abort(): void;
-    _request<T = any, D = any>(config: AxiosRequestConfig<D>, httpConfig?: HttpConfig): Promise<T>;
+    _request<T = any, D = any>(config: AxiosRequestConfig<D> & {
+        coseyHttpConfig?: HttpConfig;
+    }, httpConfig?: HttpConfig): Promise<T>;
     request<T = any, D = any>(config: AxiosRequestConfig<D>, httpConfig?: HttpConfig): Promise<T>;
     get<T = any, D = any>(url: string, config?: AxiosRequestConfig<D>, httpConfig?: HttpConfig): Promise<T>;
     delete<T = any, D = any>(url: string, config?: AxiosRequestConfig<D>, httpConfig?: HttpConfig): Promise<T>;

package/request/Http.js

@@ -19,6 +19,7 @@ class Http {
     if (!this.axiosIns) {
       this.axiosIns = this.axiosFactory(httpConfig);
     }
+    config.coseyHttpConfig = httpConfig;
     return this.axiosIns.request(config);
   }
   request(config, httpConfig) {

package/request/index.d.ts

@@ -1,3 +1,6 @@
+import { type CreateAxiosDefaults } from 'axios';
 import { Http } from './Http';
-import { useRequest } from './useRequest';
-export { useRequest, Http };
+import { type HttpConfig } from '../config/http';
+export { Http } from './Http';
+export declare function createHttp(axiosConfig?: CreateAxiosDefaults, createCfg?: HttpConfig): Http;
+export declare const http: Http;

package/request/index.js

@@ -1,2 +1,97 @@
-export { Http } from './Http.js';
-export { useRequest } from './useRequest.js';
+import axios, { AxiosError } from 'axios';
+import { ElMessage } from 'element-plus';
+import { merge, pick, get } from 'lodash-es';
+import { useOuterUserStore } from '../store/user.js';
+import { TOKEN_NAME, ROUTER_TO } from '../constant.js';
+import { Http } from './Http.js';
+import { persist } from '../persist/index.js';
+import { globalConfig } from '../config/index.js';
+import { router } from '../router/index.js';
+import { isObject } from '../utils/is.js';
+
+function createHttp(axiosConfig = {}, createCfg = {}) {
+  function createAxios() {
+    const { http: globalCfg, router: routerConfig } = globalConfig;
+    const createdMergedCfg = merge({}, globalCfg, createCfg);
+    const userStore = useOuterUserStore();
+    const handleError = (resData, mergedCfg) => {
+      const httpPath = mergedCfg.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 !== mergedCfg.code.success) {
+        ElMessage.error({
+          message,
+          duration: mergedCfg.errorDuration
+        });
+        if (code === mergedCfg.code.forbidden) {
+          router.push(routerConfig.homePath);
+        } else if (code === mergedCfg.code.unauthorized) {
+          if (persist.get(TOKEN_NAME)) {
+            userStore.logout(persist.get(ROUTER_TO) || router.currentRoute.value.fullPath);
+          }
+        }
+        return Promise.reject(new Error(message));
+      }
+      if (mergedCfg.originalData) {
+        return resData;
+      }
+      return data;
+    };
+    const axiosIns = axios.create(
+      merge({}, pick(createdMergedCfg, ["baseURL", "timeout", "headers"]), axiosConfig)
+    );
+    function getMergedCfg(target) {
+      return target?.config?.coseyMergedCfg || createdMergedCfg;
+    }
+    axiosIns.interceptors.request.use(
+      (config) => {
+        const mergedCfg = config.coseyMergedCfg = merge(
+          {},
+          createdMergedCfg,
+          config.coseyHttpConfig
+        );
+        const token = persist.get(TOKEN_NAME);
+        if (token) {
+          config.headers[mergedCfg.authHeaderKey] = mergedCfg.authScheme ? `${mergedCfg.authScheme} ${token}` : token;
+        }
+        return config;
+      },
+      (error) => {
+        const mergedCfg = getMergedCfg(error);
+        ElMessage.error({
+          message: error.message,
+          duration: mergedCfg.errorDuration
+        });
+        return Promise.reject(error);
+      }
+    );
+    axiosIns.interceptors.response.use(
+      (response) => {
+        const mergedCfg = getMergedCfg(response);
+        if (mergedCfg.originalResponse) {
+          return response;
+        }
+        const { data: resData } = response;
+        return handleError(resData, mergedCfg);
+      },
+      (error) => {
+        const mergedCfg = getMergedCfg(error);
+        if (error instanceof AxiosError && error.response && isObject(error.response.data) && get(error.response.data, mergedCfg.path.code)) {
+          return handleError(error.response.data, mergedCfg);
+        } else {
+          ElMessage.error({
+            message: error.message,
+            duration: mergedCfg.errorDuration
+          });
+          return Promise.reject(error);
+        }
+      }
+    );
+    return axiosIns;
+  }
+  return new Http(createAxios);
+}
+const http = createHttp();
+
+export { Http, createHttp, http };

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 !== "/") {