@pubinfo-pr/core 0.200.1 → 0.203.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo-pr/core",
   "type": "module",
-  "version": "0.200.1",
+  "version": "0.203.2",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -27,74 +27,74 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "peerDependencies": {
-    "@pubinfo-pr/config": "0.200.1",
-    "@pubinfo-pr/devtools": "0.200.1",
-    "@pubinfo-pr/vite": "0.200.1",
-    "alova": "^3.3.4",
+    "@pubinfo-pr/config": "0.203.2",
+    "@pubinfo-pr/devtools": "0.203.2",
+    "@pubinfo-pr/vite": "0.203.2",
+    "alova": "^3.5.0",
     "pinia": "^3.0.4",
-    "vue": "^3.5.26",
-    "vue-router": "^4.6.4"
+    "vue": "^3.5.28",
+    "vue-router": "^5.0.2"
   },
   "dependencies": {
-    "@alova/adapter-axios": "^2.0.16",
-    "@alova/shared": "^1.3.1",
+    "@alova/adapter-axios": "^2.0.17",
+    "@alova/shared": "^1.3.2",
     "@ant-design/icons-vue": "^7.0.1",
     "@headlessui/vue": "^1.7.23",
-    "@imengyu/vue3-context-menu": "^1.5.1",
-    "@pubinfo/pro-components": "^1.8.0",
-    "@pubinfo-pr/shared": "0.200.1",
-    "@unocss/reset": "^66.4.2",
-    "@vueuse/core": "^14.1.0",
-    "@vueuse/integrations": "^14.1.0",
+    "@imengyu/vue3-context-menu": "^1.5.4",
+    "@pubinfo/pro-components": "^1.8.2",
+    "@pubinfo-pr/shared": "0.203.2",
+    "@unocss/reset": "^66.6.0",
+    "@vueuse/core": "^14.2.1",
+    "@vueuse/integrations": "^14.2.1",
     "ant-design-vue": "^4.2.6",
-    "axios": "^1.10.0",
+    "axios": "^1.13.5",
     "floating-vue": "5.2.2",
-    "hookable": "^5.5.3",
-    "hotkeys-js": "^3.13.15",
-    "jsencrypt": "^3.3.2",
-    "lodash-es": "^4.17.21",
+    "hookable": "^6.0.1",
+    "hotkeys-js": "^4.0.0",
+    "jsencrypt": "^3.5.4",
+    "lodash-es": "^4.17.23",
     "md5": "^2.3.0",
     "mitt": "^3.0.1",
     "nprogress": "^0.2.0",
-    "overlayscrollbars": "^2.11.4",
+    "overlayscrollbars": "^2.14.0",
     "overlayscrollbars-vue": "^0.5.9",
     "path-browserify": "^1.0.1",
-    "path-to-regexp": "^8.2.0",
+    "path-to-regexp": "^8.3.0",
     "sortablejs": "^1.15.6",
-    "unctx": "^2.4.1",
+    "unctx": "^2.5.0",
     "vue-m-message": "^4.0.2",
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@alova/mock": "^2.0.17",
-    "@iconify/json": "^2.2.354",
+    "@alova/mock": "^2.0.18",
+    "@iconify/json": "^2.2.437",
     "@iconify/vue": "^5.0.0",
-    "@pubinfo-pr/config": "0.200.1",
+    "@pubinfo-pr/config": "0.203.2",
     "@pubinfo/openapi": "^0.9.1",
     "@pubinfo/preset-openapi": "^0.9.1",
-    "@pubinfo-pr/vite": "0.200.1",
+    "@pubinfo-pr/vite": "0.203.2",
     "@types/lodash-es": "^4.17.12",
-    "@types/md5": "^2.3.5",
+    "@types/md5": "^2.3.6",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
-    "@types/sortablejs": "^1.15.8",
+    "@types/sortablejs": "^1.15.9",
     "@types/zxcvbn": "^4.4.5",
-    "@vitejs/plugin-vue": "^6.0.3",
-    "@vitejs/plugin-vue-jsx": "^5.1.2",
-    "alova": "^3.3.4",
+    "@vitejs/plugin-vue": "^6.0.4",
+    "@vitejs/plugin-vue-jsx": "^5.1.4",
+    "alova": "^3.5.0",
     "deep-pick-omit": "^1.2.1",
     "destr": "^2.0.5",
     "pinia": "^3.0.4",
-    "shiki": "^3.20.0",
-    "type-fest": "^4.41.0",
-    "unocss": "^66.4.2",
-    "unplugin-auto-import": "^20.0.0",
-    "unplugin-icons": "^22.2.0",
-    "unplugin-vue-components": "^29.0.0",
-    "vite": "^8.0.0-beta.3",
+    "shiki": "^3.22.0",
+    "type-fest": "^5.4.4",
+    "unocss": "^66.6.0",
+    "unplugin-auto-import": "^21.0.0",
+    "unplugin-icons": "^23.0.1",
+    "unplugin-vue-components": "^31.0.0",
+    "vite": "^8.0.0-beta.13",
     "vite-plugin-dts": "^4.5.4",
-    "vue": "^3.5.26",
-    "vue-router": "^4.6.4"
+    "vue": "^3.5.28",
+    "vue-router": "^5.0.2"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

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

@@ -20,7 +20,7 @@ export function useLayoutVisible(_props?: LayoutProps) {
 
   const show = computed(() => {
     // 应用级 meta.layout 配置
-    const appMetaData: RequiredDeep<RouterMetaRawBaseOptions['layout']> = {
+    const appMetaData: RequiredDeep<NonNullable<RouterMetaRawBaseOptions['layout']>> = {
       header: true,
       sidebar: true,
       tabs: true,

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

@@ -10,74 +10,76 @@ hotkeys('alt+i', () => toggle());
 </script>
 
 <template>
-  <HSlideover v-model="visible" title="系统信息">
-    <div class="text-dark dark:text-light">
-      <div class="px-4">
-        <h2 class="m-0 text-lg font-bold">
-          最后编译时间
-        </h2>
-        <div class="my-4 text-center text-lg font-sans">
-          {{ buildTime }}
+  <Teleport to="body">
+    <HSlideover v-model="visible" title="系统信息">
+      <div class="text-dark dark:text-light">
+        <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>
-      <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>
-      <div v-if="git" class="px-4">
-        <h2 class="m-0 text-lg font-bold">
-          Git 信息
-        </h2>
-        <ul class="list-none pl-0 text-sm">
-          <li 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">
-              编译分支
-            </div>
-            <div class="font-sans">
-              {{ git.branch }}
-            </div>
-          </li>
-          <li 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">
-              最新提交提交哈希
-            </div>
-            <a-tooltip>
-              <template #title>
-                {{ git.commit }}
-              </template>
+        <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">
-                {{ git.commitShort }}
+                {{ val }}
+              </div>
+            </li>
+          </ul>
+        </div>
+        <div v-if="git" class="px-4">
+          <h2 class="m-0 text-lg font-bold">
+            Git 信息
+          </h2>
+          <ul class="list-none pl-0 text-sm">
+            <li 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">
+                编译分支
               </div>
-            </a-tooltip>
-          </li>
-        </ul>
+              <div class="font-sans">
+                {{ git.branch }}
+              </div>
+            </li>
+            <li 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">
+                最新提交提交哈希
+              </div>
+              <a-tooltip>
+                <template #title>
+                  {{ git.commit }}
+                </template>
+                <div class="font-sans">
+                  {{ git.commitShort }}
+                </div>
+              </a-tooltip>
+            </li>
+          </ul>
+        </div>
       </div>
-    </div>
-  </HSlideover>
+    </HSlideover>
+  </Teleport>
 </template>

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

@@ -7,10 +7,10 @@ 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);
+    setup(ctx) {
+      // 使用 Teleport 将组件渲染到 body，而不是创建新的 Vue 应用
+      // 这样可以确保 DevTools 中只显示一个应用
+      ctx.app.component('SystemInfoPanel', SystemInfoComponent);
     },
   };
 }

package/src/core/ctx.ts

@@ -18,7 +18,7 @@ export async function callHookAsync<T>(hookname: string, data: T) {
       return res as T;
     },
     hookname,
-    data,
+    [data],
   );
 }
 
@@ -41,6 +41,6 @@ export function callHookSync<T>(hookname: string, data: T) {
       return res;
     },
     hookname,
-    data,
+    [data],
   );
 }

package/src/core/request.ts

@@ -49,7 +49,7 @@ export function createRequest(options: RequestOptions = {}) {
             return _response;
           },
           'http:response:onSuccess',
-          response,
+          [response],
         ) as AxiosResponse<any, any>;
 
         return stopped ? res : (responded?.onSuccess?.(res, method, () => stopped = true) ?? res);

package/src/features/api/modules/auth/renzhengfuwu.ts

@@ -1,5 +1,41 @@
 import { auth as request } from '@/features/api/request';
 
+/**
+ * @description 双因素认证-二次认证准备
+ * @url /auth/2fa/prepare
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postAuth2FaPrepare<
+  R = API.ResponseDataString,
+  T = API.ResponseDataString,
+>(body: API.Prepare2faDto, options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/auth/2fa/prepare', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
+/**
+ * @description 双因素认证-二次认证验证
+ * @url /auth/2fa/verify
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postAuth2FaVerify<
+  R = API.ResponseDataLoginTokenVo,
+  T = API.ResponseDataLoginTokenVo,
+>(body: API.Verify2faDto, options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/auth/2fa/verify', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
 /**
  * @description 验证码-前端校验 需要校验的验证码类型：blockPuzzle、clickWord
  * @url /auth/captcha/check

package/src/features/api/modules/auth/typings.d.ts

@@ -40,9 +40,9 @@ declare namespace API {
   };
 
   type IResponseCode = {
-    msg?: string;
     code?: number;
     hint?: string;
+    msg?: string;
   };
 
   type LoginByPwdCaptchaDto = {
@@ -79,6 +79,8 @@ declare namespace API {
     /** 访问令牌 */
     accessToken?: string;
     loginResponse?: IResponseCode;
+    /** 2FA登录码 不为空表示开启了2FA登录 */
+    login2faCode?: string;
   };
 
   type postAuthChangeLoginOrgParams = {
@@ -103,6 +105,13 @@ declare namespace API {
     refreshToken: string;
   };
 
+  type Prepare2faDto = {
+    /** login2faCode */
+    login2faCode: string;
+    /** 二次认证方式 默认支持sms */
+    fa2Type: string;
+  };
+
   type PubLoginTokenVo = {
     /** id */
     id?: string;
@@ -174,4 +183,13 @@ declare namespace API {
     key?: string;
     plaintext?: string;
   };
+
+  type Verify2faDto = {
+    /** login2faCode */
+    login2faCode: string;
+    /** 二次认证方式 默认支持sms */
+    fa2Type: string;
+    /** 认证码 */
+    verifyCode: string;
+  };
 }

package/src/features/components/PartyLogin/steps/One.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { HTTPMethod, HTTPParamsValue, ParamItem } from '../type';
 import { DeleteOutlined, PlusOutlined, SendOutlined } from '@ant-design/icons-vue';
-import { codeToHtml } from 'shiki';
+import { highlightCode } from '../../../../utils/shikiHighlighter';
 import MethodSelect from '../MethodSelect.vue';
 import HttpParamsItem from '../ParamsItem.vue';
 import HttpParamsPanel from '../ParamsPanel.vue';
@@ -104,25 +104,12 @@ const formattedHtml = ref<string>('');
 // Watch data changes and update formatted HTML
 watch(() => props.data, async (newData) => {
   if (newData != null) {
-    try {
-      // Convert data to formatted JSON string
-      const jsonString = typeof newData === 'string'
-        ? newData
-        : JSON.stringify(newData, null, 2);
-
-      formattedHtml.value = await codeToHtml(jsonString, {
-        lang: 'json',
-        themes: {
-          light: 'vitesse-light',
-          dark: 'vitesse-dark',
-        },
-      });
-    }
-    catch (error) {
-      console.error('Failed to format data:', error);
-      // Fallback to plain text display
-      formattedHtml.value = `<pre>${String(newData)}</pre>`;
-    }
+    // Convert data to formatted JSON string
+    const jsonString = typeof newData === 'string'
+      ? newData
+      : JSON.stringify(newData, null, 2);
+
+    formattedHtml.value = await highlightCode(jsonString, { lang: 'json' });
   }
   else {
     formattedHtml.value = '';

package/src/features/components/PubinfoApp/index.vue

@@ -6,4 +6,5 @@ defineOptions({
 
 <template>
   <RouterView />
+  <SystemInfoPanel />
 </template>

package/src/utils/shikiHighlighter.ts

@@ -0,0 +1,80 @@
+import type { HighlighterCore } from 'shiki';
+
+// 缓存 highlighter 实例，全局单例模式
+let highlighterPromise: Promise<HighlighterCore> | null = null;
+
+/**
+ * 获取 Shiki 高亮器实例（单例模式）
+ * 支持的语言：json
+ * 支持的主题：vitesse-dark, vitesse-light
+ *
+ * 所有 shiki 相关模块均采用动态导入，避免主 bundle 体积过大
+ */
+export function getShikiHighlighter(): Promise<HighlighterCore> {
+  if (!highlighterPromise) {
+    highlighterPromise = (async () => {
+      // 动态导入 shiki 核心模块
+      const [
+        { createHighlighterCore },
+        { createOnigurumaEngine },
+      ] = await Promise.all([
+        import('shiki/core'),
+        import('shiki/engine/oniguruma'),
+      ]);
+
+      return createHighlighterCore({
+        themes: [
+          import('shiki/themes/vitesse-light.mjs'),
+          import('shiki/themes/vitesse-dark.mjs'),
+        ],
+        langs: [
+          import('shiki/langs/json.mjs'),
+        ],
+        engine: createOnigurumaEngine(import('shiki/wasm')),
+      });
+    })();
+  }
+  return highlighterPromise;
+}
+
+export interface HighlightCodeOptions {
+  /** 代码语言，默认 json */
+  lang?: string
+  /** 亮色主题，默认 vitesse-light */
+  lightTheme?: string
+  /** 暗色主题，默认 vitesse-dark */
+  darkTheme?: string
+}
+
+/**
+ * 使用 Shiki 高亮代码
+ * @param code 要高亮的代码
+ * @param options 高亮选项
+ * @returns 高亮后的 HTML 字符串
+ */
+export async function highlightCode(
+  code: string,
+  options: HighlightCodeOptions = {},
+): Promise<string> {
+  const {
+    lang = 'json',
+    lightTheme = 'vitesse-light',
+    darkTheme = 'vitesse-dark',
+  } = options;
+
+  try {
+    const highlighter = await getShikiHighlighter();
+
+    return highlighter.codeToHtml(code, {
+      lang,
+      themes: {
+        light: lightTheme,
+        dark: darkTheme,
+      },
+    });
+  }
+  catch (error) {
+    console.error('Failed to highlight code:', error);
+    return `<pre><code>${code}</code></pre>`;
+  }
+}