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

package/src/built-in/layout-component/components/Topbar/Tabbar/index.vue

@@ -4,7 +4,6 @@ import ContextMenu from '@imengyu/vue3-context-menu';
 import { useMagicKeys } from '@vueuse/core';
 import hotkeys from 'hotkeys-js';
 import Sortable from 'sortablejs';
-import { useI18n } from 'vue-i18n';
 import Message from 'vue-m-message';
 import RiCloseFill from '~icons/ri/close-fill';
 import RiPushpin2Fill from '~icons/ri/pushpin-2-fill';
@@ -23,15 +22,13 @@ defineOptions({
 const route = useRoute();
 const router = useRouter();
 
-const { settingsStore, tabbarStore, generateI18nTitle } = useContext();
+const { settingsStore, tabbarStore, generateTitle, routeStore } = useContext();
 
 const tabbar = useTabbar();
 const mainPage = useMainPage();
 
 const keys = useMagicKeys({ reactive: true });
 
-const { t } = useI18n();
-
 const activedTabId = computed(() => tabbar.getId());
 const isShowMoreAction = computed(() => tabbarStore.list.length > 1 && (tabbar.checkCloseOtherSide() || tabbar.checkCloseLeftSide() || tabbar.checkCloseRightSide()));
 
@@ -162,13 +159,13 @@ function onTabbarContextmenu(event: MouseEvent, routeItem: Tabbar.recordRaw) {
     customClass: 'tabbar-contextmenu',
     items: [
       {
-        label: t('app.tabbar.reload'),
+        label: '重新加载',
         icon: 'i-ri-refresh-line',
         disabled: routeItem.tabId !== activedTabId.value,
         onClick: () => mainPage.reload(),
       },
       {
-        label: t('app.tabbar.close'),
+        label: '关闭标签页',
         icon: 'i-ri-close-line',
         disabled: tabbarStore.list.length <= 1 || routeItem.isPin || routeItem.isPermanent,
         divided: true,
@@ -177,7 +174,7 @@ function onTabbarContextmenu(event: MouseEvent, routeItem: Tabbar.recordRaw) {
         },
       },
       {
-        label: routeItem.isPin ? t('app.tabbar.unpin') : t('app.tabbar.pin'),
+        label: routeItem.isPin ? '取消固定' : '固定',
         icon: routeItem.isPin ? 'i-lucide-pin-off' : 'i-lucide-pin',
         // 主页不允许被固定，因为如果固定主页且主页未启用，会导致登录时进入路由死循环状态
         disabled: routeItem.fullPath === '/' || routeItem.isPermanent,
@@ -191,7 +188,7 @@ function onTabbarContextmenu(event: MouseEvent, routeItem: Tabbar.recordRaw) {
         },
       },
       {
-        label: t('app.tabbar.maximize'),
+        label: '最大化',
         icon: 'i-ri-picture-in-picture-exit-line',
         onClick: () => {
           if (routeItem.tabId !== activedTabId.value) {
@@ -202,21 +199,21 @@ function onTabbarContextmenu(event: MouseEvent, routeItem: Tabbar.recordRaw) {
         },
       },
       {
-        label: t('app.tabbar.closeOtherSide'),
+        label: '关闭其它标签页',
         disabled: !tabbar.checkCloseOtherSide(routeItem.tabId),
         onClick: () => {
           tabbar.closeOtherSide(routeItem.tabId);
         },
       },
       {
-        label: t('app.tabbar.closeLeftSide'),
+        label: '关闭左侧标签页',
         disabled: !tabbar.checkCloseLeftSide(routeItem.tabId),
         onClick: () => {
           tabbar.closeLeftSide(routeItem.tabId);
         },
       },
       {
-        label: t('app.tabbar.closeRightSide'),
+        label: '关闭右侧标签页',
         disabled: !tabbar.checkCloseRightSide(routeItem.tabId),
         onClick: () => {
           tabbar.closeRightSide(routeItem.tabId);
@@ -244,6 +241,46 @@ function iconName(isActive: boolean, icon: Tabbar.recordRaw['icon'], activeIcon:
   return name;
 }
 
+// 解析 fullPath 的纯路径部分（去掉 query/hash）
+function stripPath(fullPath: string) {
+  return fullPath.split(/[?#]/)[0];
+}
+
+// 查找与 tab 对应的路由记录
+function findRouteRecordByElement(element: Tabbar.recordRaw) {
+  const pathOnly = stripPath(element.fullPath);
+  const all = [...routeStore.flatSystemRoutes, ...routeStore.flatRoutes] as any[];
+  return all.find(r => r.path === pathOnly);
+}
+
+// 解析该 tab 的 iconOptions（优先当前路由，其次面包屑链路上最近的一个）
+function resolveIconOptions(element: Tabbar.recordRaw): undefined | {
+  boxType?: 'square' | 'prism' | 'null'
+  angle?: number | string
+  background?: any
+  radius?: number | string
+  iconColor?: string
+} {
+  const r: any = findRouteRecordByElement(element);
+  let options = (r?.meta as any)?.iconOptions;
+  if (!options && r?.meta?.breadcrumbNeste?.length) {
+    const found = [...r.meta.breadcrumbNeste].reverse().find((it: any) => it?.iconOptions);
+    options = found?.iconOptions;
+  }
+  return options;
+}
+
+// 统一盒子类型：存在 iconOptions 时启用盒子；未指定或为 'null' 时默认 prism
+function computeBoxType(options: ReturnType<typeof resolveIconOptions>) {
+  const bt = (options as any)?.boxType as any;
+  return bt && bt !== 'null' ? bt : 'prism';
+}
+
+// 仅 AntD 图标使用安全颜色；无配置则为 undefined
+function getSafeIconColor(options: ReturnType<typeof resolveIconOptions>): string | undefined {
+  return (options as any)?.iconColor || undefined;
+}
+
 onMounted(() => {
   hotkeys('alt+left,alt+right,alt+w,alt+1,alt+2,alt+3,alt+4,alt+5,alt+6,alt+7,alt+8,alt+9,alt+0', (e, handle) => {
     if (settingsStore.settings.tabbar.enable && settingsStore.settings.tabbar.enableHotkeys) {
@@ -319,7 +356,7 @@ onUnmounted(() => {
             'actived': element.tabId === activedTabId,
             'no-drag': element.isPermanent || element.isPin,
           }"
-          :title="element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateI18nTitle(element.i18n, element.title)"
+          :title="element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateTitle(element.title)"
           @click="router.push(element.fullPath)"
           @dblclick="settingsStore.setMainPageMaximize()"
           @contextmenu="onTabbarContextmenu($event, element)"
@@ -328,12 +365,30 @@ onUnmounted(() => {
           <div class="tab-background" />
           <div class="tab-content">
             <div :key="element.tabId" class="title">
-              <PubinfoIcon
-                v-if="settingsStore.settings.tabbar.enableIcon && iconName(element.tabId === activedTabId, element.icon, element.activeIcon)"
-                :name="iconName(element.tabId === activedTabId, element.icon, element.activeIcon)!"
-                class="icon"
-              />
-              {{ element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateI18nTitle(element.i18n, element.title) }}
+              <template v-if="settingsStore.settings.tabbar.enableIcon && iconName(element.tabId === activedTabId, element.icon, element.activeIcon)">
+                <!-- 有 iconOptions 时启用带边框/渐变的盒子效果，与 Menu 保持一致 -->
+                <PubinfoIcon
+                  v-if="resolveIconOptions(element)"
+                  small
+                  :name="iconName(element.tabId === activedTabId, element.icon, element.activeIcon)!"
+                  :box="computeBoxType(resolveIconOptions(element)) as any"
+                  :size="16"
+                  :angle="resolveIconOptions(element)?.angle"
+                  :background="resolveIconOptions(element)?.background"
+                  :radius="resolveIconOptions(element)?.radius"
+                  :color="(iconName(element.tabId === activedTabId, element.icon, element.activeIcon) || '').startsWith('antd:') ? (getSafeIconColor(resolveIconOptions(element)) || '#ffffff') : undefined"
+                  class="icon"
+                />
+                <!-- 无 iconOptions 时保持原样（纯图标），但若提供图标色也生效 -->
+                <PubinfoIcon
+                  v-else
+                  :name="iconName(element.tabId === activedTabId, element.icon, element.activeIcon)!"
+                  :size="16"
+                  :color="(iconName(element.tabId === activedTabId, element.icon, element.activeIcon) || '').startsWith('antd:') ? getSafeIconColor(resolveIconOptions(element)) : undefined"
+                  class="icon"
+                />
+              </template>
+              {{ element.customTitleList.find(item => item.fullPath === element.fullPath)?.title || generateTitle(element.title) }}
             </div>
             <div v-if="!element.isPermanent && element.isPin" class="action-icon" @click.stop="tabbarStore.unPin(element.tabId)" @dblclick.stop>
               <RiPushpin2Fill text="10px" />

package/src/built-in/layout-component/components/Topbar/Toolbar/Favorites.vue

@@ -2,7 +2,6 @@
 import { isUndefined } from 'lodash-es';
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-vue';
 import Sortable from 'sortablejs';
-import { useI18n } from 'vue-i18n';
 import FluentDelete24Filled from '~icons/fluent/delete-24-filled';
 import FluentStarAdd16Regular from '~icons/fluent/star-add-16-regular';
 import FluentStarDismiss16Regular from '~icons/fluent/star-dismiss-16-regular';
@@ -15,9 +14,7 @@ defineOptions({
 
 const route = useRoute();
 const router = useRouter();
-const { favoritesStore, routeStore, generateI18nTitle } = useContext();
-const { t } = useI18n();
-
+const { favoritesStore, routeStore, generateTitle } = useContext();
 const favoritesContainerRef = ref<HTMLElement | null>(null);
 
 let _favoritesSortable: Sortable | null = null;
@@ -46,7 +43,7 @@ watch(favoritesContainerRef, (newSortableContainer) => {
   <div class="favorites-container w-80 dark:bg-[var(--g-container-bg)]">
     <div class="flex items-center justify-between px-4 py-3">
       <div class="text-sm font-bold">
-        {{ t('app.tabbar.favorites.my-favorites') }}
+        {{ '我的收藏夾' }}
       </div>
       <template v-if="favoritesStore.canAdd(route.fullPath, routeStore.routes)">
         <FluentStarAdd16Regular
@@ -81,13 +78,13 @@ watch(favoritesContainerRef, (newSortableContainer) => {
         <div
           v-for="item in favoritesStore.list"
           :key="item.fullPath"
-          :title="generateI18nTitle(item.i18n, item.title)"
+          :title="generateTitle(item.title)"
           class="draggable-item relative w-[calc(50%-0.25rem)] flex cursor-pointer items-center gap-1 rounded px-2 py-2 ring-1 ring-stone-3 ring-inset hover:bg-stone-1 dark:ring-stone-7 dark:hover:bg-dark/50"
           @click="router.push(item.fullPath)"
         >
           <PubinfoIcon v-if="item.icon" :name="item.icon" :size="18" />
           <div class="name flex-1 truncate pe-4">
-            {{ generateI18nTitle(item.i18n, item.title) }}
+            {{ generateTitle(item.title) }}
           </div>
           <FluentDelete24Filled
             text-12px

package/src/built-in/layout-component/components/Topbar/Toolbar/index.vue

@@ -17,7 +17,7 @@ defineOptions({
 const route = useRoute();
 const router = useRouter();
 
-const { settingsStore, menuStore, generateI18nTitle } = useContext();
+const { settingsStore, menuStore, generateTitle } = useContext();
 
 /**
  * 计算属性：是否启用子菜单折叠按钮
@@ -52,7 +52,7 @@ const breadcrumbIsShow = computed(() =>
 function createHomeBreadcrumb() {
   return {
     path: '/',
-    title: generateI18nTitle('route.home', settingsStore.settings.home.title),
+    title: generateTitle(settingsStore.settings.home.title),
   };
 }
 
@@ -78,7 +78,7 @@ const breadcrumbList = computed(() => {
       breadcrumbList.push({
         path: `__MAIN__${index}`,
         mainIndex: index,
-        title: generateI18nTitle(menuStore.allMenus[index].meta?.i18n, menuStore.allMenus[index].meta?.title),
+        title: generateTitle(menuStore.allMenus[index].meta?.title),
       });
     }
   }
@@ -88,7 +88,7 @@ const breadcrumbList = computed(() => {
       if (item.hide === false) {
         breadcrumbList.push({
           path: item.path,
-          title: generateI18nTitle(item.i18n, item.title),
+          title: generateTitle(item.title),
         });
       }
     });
@@ -155,14 +155,14 @@ function getCurrentBreadcrumb(path: string) {
     const main = menuStore.allMenus[idx];
     if (main) {
       const mapNode = (r: any): any => ({
-        title: generateI18nTitle(r.meta?.i18n, r.meta?.title),
+        title: generateTitle(r.meta?.title),
         path: r.path,
         children: (r.children || [])
           .filter((c: any) => c.meta?.sidebar !== false)
           .map((c: any) => mapNode(c)),
       });
       return {
-        title: generateI18nTitle(main.meta?.i18n, main.meta?.title),
+        title: generateTitle(main.meta?.title),
         path,
         children: (main.children || [])
           .filter(c => c.meta?.sidebar !== false)

package/src/built-in/layout-component/composables/useContext.ts

@@ -22,7 +22,7 @@ interface LayoutContext {
 
   appTitle: string
   isDev: boolean
-  generateI18nTitle: any
+  generateTitle: (titile?: string | (() => any)) => string
 }
 
 const layoutInjectionKey: InjectionKey<LayoutContext> = Symbol('Layout');

package/src/built-in/layout-component/composables/useGlobalSearch.ts

@@ -1,9 +1,44 @@
-import { ref } from 'vue';
+import { ref, shallowRef } from 'vue';
 
 type SearchType = 'menu' | 'tab';
 
 const isShow = ref(false);
 const searchType = ref<SearchType>('menu');
+const panelRegistry = new Map<symbol, number>();
+const activePanelId = shallowRef<symbol | null>(null);
+
+function updateActivePanel() {
+  let candidate: symbol | null = null;
+  let highestPriority = Number.NEGATIVE_INFINITY;
+  panelRegistry.forEach((priority, id) => {
+    if (priority > highestPriority) {
+      highestPriority = priority;
+      candidate = id;
+    }
+  });
+  activePanelId.value = candidate;
+}
+
+function registerPanel(id: symbol, priority = 0) {
+  panelRegistry.set(id, priority);
+  updateActivePanel();
+}
+
+function unregisterPanel(id: symbol) {
+  if (!panelRegistry.has(id)) {
+    return;
+  }
+  panelRegistry.delete(id);
+  updateActivePanel();
+}
+
+function setPanelPriority(id: symbol, priority: number) {
+  if (!panelRegistry.has(id)) {
+    return;
+  }
+  panelRegistry.set(id, priority);
+  updateActivePanel();
+}
 
 function open(type?: SearchType) {
   if (type) {
@@ -39,9 +74,13 @@ export function useGlobalSearch() {
   return {
     isShow,
     searchType,
+    activePanelId,
     open,
     close,
     toggle,
+    registerPanel,
+    unregisterPanel,
+    setPanelPriority,
   };
 }
 

package/src/built-in/layout-component/composables/useTitle.ts

@@ -1,9 +1,8 @@
 import type { useSettingsStore } from '@/features/stores';
-import { useI18n } from 'vue-i18n';
 
 export function useTitle(appTitle: string, settingsStore: ReturnType<typeof useSettingsStore>) {
-  const { t, te } = useI18n();
   const routeInfo = useRoute();
+
   watch(
     [
       () => settingsStore.settings.app.enableDynamicTitle,
@@ -13,11 +12,7 @@ export function useTitle(appTitle: string, settingsStore: ReturnType<typeof useS
     () => {
       if (settingsStore.settings.app.enableDynamicTitle && settingsStore.title) {
         const title = settingsStore.customTitleList.find(item => item.fullPath === routeInfo.fullPath)?.title
-          || (
-            routeInfo.meta.breadcrumbNeste?.at(-1)?.i18n
-              ? generateI18nTitle(routeInfo.meta.breadcrumbNeste?.at(-1)?.i18n, settingsStore.title)
-              : generateI18nTitle(routeInfo.meta.i18n, settingsStore.title)
-          );
+          || generateTitle(settingsStore.title);
         document.title = `${title} - ${appTitle}`;
       }
       else {
@@ -27,14 +22,13 @@ export function useTitle(appTitle: string, settingsStore: ReturnType<typeof useS
     {
       deep: true,
     });
-  function generateI18nTitle(key?: string, defaultTitle: string | (() => any) = t('route.undefined')) {
-    return (settingsStore.settings.toolbar.enableI18n && !!key && te(key))
-      ? t(key)
-      : typeof defaultTitle === 'function'
-        ? defaultTitle()
-        : defaultTitle;
+
+  function generateTitle(defaultTitle: string | (() => any) = '[ 无标题 ]') {
+    return typeof defaultTitle === 'function'
+      ? defaultTitle()
+      : defaultTitle;
   }
   return {
-    generateI18nTitle,
+    generateTitle,
   };
 }

package/src/built-in/layout-component/provider.ts

@@ -38,7 +38,7 @@ export const Provider = defineComponent({
     const tabbarStore = useTabbarStore();
     const favoritesStore = useFavoritesStore();
 
-    const { generateI18nTitle } = useTitle(props.appTitle, settingsStore);
+    const { generateTitle } = useTitle(props.appTitle, settingsStore);
 
     createContext({
       settingsStore,
@@ -52,7 +52,7 @@ export const Provider = defineComponent({
 
       appTitle: props.appTitle,
       isDev: props.isDev,
-      generateI18nTitle,
+      generateTitle,
     });
 
     return () => h(

package/src/built-in/system-info/components/SystemInfo.vue

@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import { useToggle } from '@vueuse/core';
+import hotkeys from 'hotkeys-js';
+import HSlideover from '@/built-in/layout-component/components/ui/HSlideover.vue';
+
+const [visible, toggle] = useToggle(false);
+
+const { pkg, buildTime } = __SYSTEM_INFO__;
+hotkeys('alt+i', () => toggle());
+</script>
+
+<template>
+  <HSlideover v-model="visible" title="系统信息">
+    <div class="px-4">
+      <h2 class="m-0 text-lg font-bold">
+        最后编译时间
+      </h2>
+      <div class="my-4 text-center text-lg font-sans">
+        {{ buildTime }}
+      </div>
+    </div>
+    <div class="px-4">
+      <h2 class="m-0 text-lg font-bold">
+        生产环境依赖
+      </h2>
+      <ul class="list-none pl-0 text-sm">
+        <li v-for="(val, key) in (pkg.dependencies as object)" :key="key" class="flex items-center justify-between rounded px-2 py-1.5 hover:bg-stone-1 dark:hover:bg-stone-9">
+          <div class="font-bold">
+            {{ key }}
+          </div>
+          <div class="font-sans">
+            {{ val }}
+          </div>
+        </li>
+      </ul>
+    </div>
+    <div class="px-4">
+      <h2 class="m-0 text-lg font-bold">
+        开发环境依赖
+      </h2>
+      <ul class="list-none pl-0 text-sm">
+        <li v-for="(val, key) in (pkg.devDependencies as object)" :key="key" class="flex items-center justify-between rounded px-2 py-1.5 hover:bg-stone-1 dark:hover:bg-stone-9">
+          <div class="font-bold">
+            {{ key }}
+          </div>
+          <div class="font-sans">
+            {{ val }}
+          </div>
+        </li>
+      </ul>
+    </div>
+  </HSlideover>
+</template>

package/src/built-in/system-info/index.ts

@@ -0,0 +1,16 @@
+import type { ModuleOptions } from '@/core';
+import SystemInfoComponent from './components/SystemInfo.vue';
+
+/**
+ * 系统信息
+ */
+export function SystemInfo(): ModuleOptions {
+  return {
+    name: 'built-in:system-info',
+    setup() {
+      const container = document.createElement('div');
+      document.body.appendChild(container);
+      createApp(SystemInfoComponent).mount(container);
+    },
+  };
+}

package/src/core/ctx.ts

@@ -1,3 +1,9 @@
 import { createHooks } from 'hookable';
+import { getPubinfoNamespace } from '@/utils';
 
-export const hooks = createHooks();
+const HOOKS_KEY = '__pubinfo_core_hooks__';
+type HookStore = ReturnType<typeof createHooks>;
+
+const namespace = getPubinfoNamespace() as Record<string, HookStore | undefined>;
+
+export const hooks = namespace[HOOKS_KEY] || (namespace[HOOKS_KEY] = createHooks());

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/core/resolver/icon.ts

@@ -1,11 +1,11 @@
 import type { ModuleRecord } from './resolver';
-import { readProjectModules } from './resolver';
+import { getPubinfoNamespace } from '@/utils';
+import { loadProjectModules, readProjectModules } from './resolver';
 
 // 持久化图标模块，支持 HMR 后恢复
-const g = globalThis as any;
-g.__PUBINFO__ = g.__PUBINFO__ || {};
-g.__PUBINFO__.iconModules = g.__PUBINFO__.iconModules || new Map<string, ModuleRecord>();
-const iconModuleMap = g.__PUBINFO__.iconModules as Map<string, ModuleRecord>;
+const namespace = getPubinfoNamespace();
+namespace.iconModules = namespace.iconModules || new Map<string, ModuleRecord>();
+const iconModuleMap = namespace.iconModules as Map<string, ModuleRecord>;
 
 export function defineIconModule(id: string, map: ModuleRecord) {
   if (iconModuleMap.has(id)) {
@@ -31,6 +31,10 @@ export function getAllIconModules(): Map<string, ModuleRecord> {
 }
 
 export async function setupIcon(name: string, id?: string) {
+  if (!readProjectModules()) {
+    await loadProjectModules().catch(() => {});
+  }
+
   const modules = readProjectModules();
   const iconMap = modules?.icons ?? {};
   const moduleMap = id ? (getIconModule(id) ?? {}) : {};