@pubinfo/core 2.0.13 → 2.0.14

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
+    "./runtime": {
+      "types": "./runtime/index.d.ts",
+      "default": "./runtime/index.js"
+    },
     "./style.css": "./dist/style.css",
     "./types": "./dist/index.d.ts"
   },
@@ -15,6 +19,7 @@
   "types": "./dist/index.d.ts",
   "files": [
     "dist",
+    "runtime",
     "src",
     "types"
   ],
@@ -26,9 +31,9 @@
     "pinia": "^3.0.3",
     "vue": "^3.5.17",
     "vue-router": "^4.5.1",
-    "@pubinfo/config": "2.0.13",
-    "@pubinfo/devtools": "2.0.13",
-    "@pubinfo/vite": "2.0.13"
+    "@pubinfo/config": "2.0.14",
+    "@pubinfo/devtools": "2.0.14",
+    "@pubinfo/vite": "2.0.14"
   },
   "dependencies": {
     "@alova/adapter-axios": "^2.0.16",
@@ -36,7 +41,7 @@
     "@ant-design/icons-vue": "^7.0.1",
     "@headlessui/vue": "^1.7.23",
     "@imengyu/vue3-context-menu": "^1.5.1",
-    "@pubinfo/pro-components": "^1.7.3",
+    "@pubinfo/pro-components": "^1.8.0",
     "@unocss/reset": "^66.4.2",
     "@vueuse/core": "^13.7.0",
     "@vueuse/integrations": "^13.5.0",
@@ -65,8 +70,8 @@
     "@alova/mock": "^2.0.17",
     "@iconify/json": "^2.2.354",
     "@iconify/vue": "^5.0.0",
-    "@pubinfo/openapi": "^0.9.0",
-    "@pubinfo/preset-openapi": "^0.9.0",
+    "@pubinfo/openapi": "^0.9.1",
+    "@pubinfo/preset-openapi": "^0.9.1",
     "@types/lodash-es": "^4.17.12",
     "@types/md5": "^2.3.5",
     "@types/nprogress": "^0.2.3",
@@ -87,8 +92,8 @@
     "vite-plugin-dts": "^4.5.4",
     "vue": "^3.5.17",
     "vue-router": "^4.5.1",
-    "@pubinfo/config": "2.0.13",
-    "@pubinfo/vite": "2.0.13"
+    "@pubinfo/config": "2.0.14",
+    "@pubinfo/vite": "2.0.14"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

package/runtime/components/PubinfoDev/index.d.ts

@@ -0,0 +1,18 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// noinspection JSUnusedGlobalSymbols
+// biome-ignore lint: disable
+
+import type { SlotsType, VNode } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{}, () => VNode<import('vue').RendererNode, import('vue').RendererElement, {
+  [key: string]: any
+}>[] | undefined, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, SlotsType<{
+  default?: () => VNode[]
+  /**
+   * If you ever require to have a replacement during production.
+   */
+  fallback?: () => VNode[]
+}>, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
+export default _default;

package/runtime/components/PubinfoDev/index.js

@@ -0,0 +1,15 @@
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+  name: 'PubinfoDev',
+  inheritAttrs: false,
+  ...import.meta.env.DEV && {
+    slots: Object,
+  },
+  setup(_, props) {
+    if (import.meta.env.DEV) {
+      return () => props.slots.default?.();
+    }
+    return () => props.slots.fallback?.();
+  },
+});

package/runtime/components/index.d.ts

@@ -0,0 +1 @@
+export { default as PubinfoDev } from './PubinfoDev/index';

package/runtime/components/index.js

@@ -0,0 +1 @@
+export { default as PubinfoDev } from './PubinfoDev/index';

package/runtime/index.d.ts

@@ -0,0 +1 @@
+export * from './components';

package/runtime/index.js

@@ -0,0 +1 @@
+export * from './components';

package/src/built-in/authorization/router.ts

@@ -28,7 +28,7 @@ export function setupRouterGuard(router: Router) {
 
   let isRouteAdded = false;
 
-  router.beforeEach(async (to, from) => {
+  router.beforeEach(async (to) => {
     const isAuthenticated = userStore.isLogin;
 
     if (!isRouteAdded) {

package/src/built-in/layout-component/components/Content/IframeView.vue

@@ -13,8 +13,9 @@ const { settingsStore, iframeStore } = useContext();
 
 const iframeRef = ref();
 
-// 处理 partyLogin 配置
-const partyLoginUrl = ref<string>('');
+// 第三方登录后的实际地址（仅首次初始化）
+// key: route.fullPath, value: 登录后实际跳转的 url
+const partyLoginUrlMap = reactive(new Map<string, string>());
 
 watch(() => route.fullPath, async (val) => {
   nextTick(() => {
@@ -31,25 +32,29 @@ watch(() => route.fullPath, async (val) => {
   const partyLogin = route.meta?.partyLogin as PartyLoginConfig | undefined;
   const iframeUrl = route.meta?.iframe as string | undefined;
 
+  // 如果已经初始化过该路由的 URL，直接使用（避免重复触发第三方登录）
+  if (partyLoginUrlMap.has(val)) {
+    return;
+  }
+
+  // 第一次进入：处理第三方登录
   if (partyLogin && Array.isArray(partyLogin) && partyLogin.length > 0 && iframeUrl) {
     const { url } = await usePartyLogin(partyLogin, iframeUrl);
     watch(url, (newUrl) => {
-      if (newUrl) {
-        partyLoginUrl.value = newUrl;
+      if (newUrl && !partyLoginUrlMap.has(val)) {
+        // 仅初始化一次，后续不再变更
+        partyLoginUrlMap.set(val, newUrl);
       }
     }, { immediate: true });
   }
-  else {
-    partyLoginUrl.value = '';
-  }
 },
 {
   immediate: true,
 });
 
-// 计算 iframe 的实际 src
-function getIframeSrc(itemSrc: string): string {
-  return partyLoginUrl.value || itemSrc;
+// 计算 iframe 的实际 src（仅返回初始地址或第三方登录后的地址）
+function getIframeSrc(itemSrc: string, path: string): string {
+  return partyLoginUrlMap.get(path) || itemSrc;
 }
 </script>
 
@@ -66,7 +71,7 @@ function getIframeSrc(itemSrc: string): string {
           v-show="route.fullPath === item.path"
           ref="iframeRef"
           :data-path="item.path"
-          :src="getIframeSrc(item.src)"
+          :src="getIframeSrc(item.src, item.path)"
           frameborder="0"
           class="h-full w-full flex-1"
         />

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

@@ -69,7 +69,8 @@ watch(
         mode="out-in" appear
       >
         <KeepAlive :include="keepAliveStore.list">
-          <component :is="Component" v-show="!(isIframe || isLink)" :key="route.fullPath" class="page-container" />
+          <!-- 为了解决 micro-app 的问题，key 只能为 route.name -->
+          <component :is="Component" v-show="!(isIframe || isLink)" :key="route.name" class="page-container" />
         </KeepAlive>
       </Transition>
     </component>

package/src/built-in/settings/router.ts

@@ -90,11 +90,22 @@ export function createRouterGuard(router: Router) {
     }
 
     if (from.meta.iframe) {
-      const isCache = hitCache(to.name as string, from.meta.cache, from.meta.noCache);
-      const toReload = to.name === 'Reload';
+      // 判断是否启用 iframe 缓存（保留 DOM 实例）
+      const shouldCacheIframe = from.meta.iframeCache === true;
 
-      if (!isCache || toReload) {
-        iframeStore.close(from.fullPath);
+      if (shouldCacheIframe) {
+        // 启用缓存：不销毁 iframe，仅标记为非激活（保留 DOM）
+        // 不调用 close，让 iframe 保持在 openedList 中
+      }
+      else {
+        // 未启用缓存：根据常规缓存规则判断是否销毁
+        const isCache = hitCache(to.name as string, from.meta.cache, from.meta.noCache);
+        const toReload = to.name === 'Reload';
+
+        if (!isCache || toReload) {
+          // 真正销毁 iframe（destroy = true）
+          iframeStore.close(from.fullPath, true);
+        }
       }
     }
   });

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

@@ -5,49 +5,79 @@ import HSlideover from '@/built-in/layout-component/components/ui/HSlideover.vue
 
 const [visible, toggle] = useToggle(false);
 
-const { pkg, buildTime } = __SYSTEM_INFO__;
+const { pkg, buildTime, git } = __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 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 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="font-sans">
+                {{ git.commitShort }}
+              </div>
+            </a-tooltip>
+          </li>
+        </ul>
       </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/core/resolver/layout.ts

@@ -2,12 +2,22 @@ import type { ProjectModules } from './resolver';
 import { readProjectModules } from './resolver';
 
 /** 选择默认的布局组件 */
-function selectDefaultLayout(layouts: ProjectModules['layouts']): (() => Promise<any>) | null {
+function selectDefaultLayout(layouts: ProjectModules['layouts'], name?: string): (() => Promise<any>) | null {
   const entries = Object.entries(layouts ?? {});
   if (entries.length === 0) {
     return null;
   }
 
+  if (name) {
+    const match = entries.find(([path]) => {
+      const filename = path.split('/').pop()?.replace(/\.vue$/, '');
+      return filename === name;
+    });
+    if (match) {
+      return match[1];
+    }
+  }
+
   if (entries.length === 1) {
     return entries[0][1];
   }
@@ -17,7 +27,7 @@ function selectDefaultLayout(layouts: ProjectModules['layouts']): (() => Promise
 }
 
 /** 设置默认布局组件 */
-export function setupDefaultLayout() {
+export function setupDefaultLayout(name?: string) {
   const modules = readProjectModules();
-  return selectDefaultLayout(modules?.layouts);
+  return selectDefaultLayout(modules?.layouts, name);
 }

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

@@ -1,3 +1 @@
-// API 更新时间：
-// API 唯一标识：
 export * from './renzhengfuwu';

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

@@ -1,5 +1,44 @@
 import { auth as request } from '@/features/api/request';
 
+/**
+ * @description 验证码-前端校验 需要校验的验证码类型：blockPuzzle、clickWord
+ * @url /auth/captcha/check
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postAuthCaptchaCheck<
+  R = API.ResponseDataValidCodeVo,
+  T = API.ResponseDataValidCodeVo,
+>(
+  body: API.CaptchaCheckDto,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  return request.Post<R, T>('/auth/captcha/check', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
+/**
+ * @description 验证码-获取验证码图片
+ * @url /auth/captcha/get
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postAuthCaptchaGet<
+  R = API.ResponseDataValidCodeVo,
+  T = API.ResponseDataValidCodeVo,
+>(body: API.CaptchaGetDto, options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/auth/captcha/get', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
 /**
  * @description 切换登录组织
  * @url /auth/changeLoginOrg
@@ -46,6 +85,27 @@ export function getAuthCheckCacheToken<
   });
 }
 
+/**
+ * @description 根据用户id获取用户token列表
+ * @url /auth/getTokenListByUserId
+ * @method GET
+ * @author @pubinfo/openapi
+ */
+export function getAuthGetTokenListByUserId<
+  R = API.ResponseDataListPubLoginTokenVo,
+  T = API.ResponseDataListPubLoginTokenVo,
+>(
+  params: API.getAuthGetTokenListByUserIdParams,
+  options?: Parameters<typeof request.Get<R, T>>[1],
+) {
+  return request.Get<R, T>('/auth/getTokenListByUserId', {
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}
+
 /**
  * @description 密码登录
  * @url /auth/login
@@ -101,7 +161,28 @@ export function getAuthLoginValidCode<
 }
 
 /**
- * @description 登出
+ * @description 验证码-密码登录
+ * @url /auth/loginNew
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postAuthLoginNew<
+  R = API.ResponseDataLoginTokenVo,
+  T = API.ResponseDataLoginTokenVo,
+>(
+  body: API.LoginByPwdCaptchaDto,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  return request.Post<R, T>('/auth/loginNew', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
+/**
+ * @description 当前用户登出
  * @url /auth/loginOut
  * @method POST
  * @author @pubinfo/openapi
@@ -119,6 +200,56 @@ export function postAuthLoginOut<
   );
 }
 
+/**
+ * @description 用户id登出
+ * @url /auth/loginOutByUserId
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postAuthLoginOutByUserId<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(
+  params: API.postAuthLoginOutByUserIdParams,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  return request.Post<R, T>(
+    '/auth/loginOutByUserId',
+    {},
+    {
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    },
+  );
+}
+
+/**
+ * @description 用户id和设备类型登出
+ * @url /auth/loginOutByUserIdAndDevType
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postAuthLoginOutByUserIdAndDevType<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(
+  params: API.postAuthLoginOutByUserIdAndDevTypeParams,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  return request.Post<R, T>(
+    '/auth/loginOutByUserIdAndDevType',
+    {},
+    {
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    },
+  );
+}
+
 /**
  * @description 单点免密登录接口
  * @url /auth/ssoLogin

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

@@ -1,8 +1,34 @@
 /* eslint-disable */
 // @ts-nocheck
 declare namespace API {
+  type CaptchaCheckDto = {
+    /** 类型 clickWord：文字、blockPuzzle：滑块 */
+    captchaType: string;
+    /** 加密坐标 */
+    pointJson: string;
+    /** token */
+    token: string;
+  };
+
+  type CaptchaGetDto = {
+    /** 类型 clickWord：文字、blockPuzzle：滑块、imageCode：图片 */
+    captchaType?: string;
+    /** 客户端UI组件id */
+    clientUid?: string;
+    /** 时间戳 1751542686180 */
+    ts?: string;
+    /** 尺寸(长x宽)，例：150x50表示长为150宽为50，不填默认150x50,最大尺寸:长500，宽200 */
+    size?: string;
+    /** 验证码长度，不填默认4位 */
+    length?: string;
+  };
+
   type getAuthCheckCacheTokenParams = {
     accessToken: string;
+  };
+
+  type getAuthGetTokenListByUserIdParams = {
+    /** 用户id */
     userId: string;
   };
 
@@ -14,11 +40,26 @@ declare namespace API {
   };
 
   type IResponseCode = {
-    code?: number;
     msg?: string;
+    code?: number;
     hint?: string;
   };
 
+  type LoginByPwdCaptchaDto = {
+    /** 登录类型 */
+    loginType: string;
+    /** 登录名 */
+    loginName: string;
+    /** 密码 */
+    loginPwd: string;
+    /** imageCode：验证码hash/其他：加密后的token，AES.encode(token+"---"+pointListStr, key) */
+    codeHash: string;
+    /** 验证码 imageCode类型必填 */
+    code?: string;
+    /** 验证码类型，clickWord：文字、blockPuzzle：滑块、imageCode(默认)：图片 */
+    captchaType?: string;
+  };
+
   type LoginByPwdDto = {
     /** 登录类型 */
     loginType: string;
@@ -45,11 +86,36 @@ declare namespace API {
     orgId: string;
   };
 
+  type postAuthLoginOutByUserIdAndDevTypeParams = {
+    /** 用户id */
+    userId: string;
+    /** 设备类型 */
+    devType: string;
+  };
+
+  type postAuthLoginOutByUserIdParams = {
+    /** 用户id */
+    userId: string;
+  };
+
   type postAuthTokenRefreshParams = {
     /** 刷新令牌 */
     refreshToken: string;
   };
 
+  type PubLoginTokenVo = {
+    /** id */
+    id?: string;
+    /** 服务名称 */
+    appName?: string;
+    /** 用户id */
+    userId?: string;
+    /** 创建时间 */
+    createTime?: string;
+    /** 设备dev */
+    devType?: string;
+  };
+
   type ResponseDataBoolean = {
     code?: number;
     msg?: string;
@@ -58,6 +124,14 @@ declare namespace API {
     success?: boolean;
   };
 
+  type ResponseDataListPubLoginTokenVo = {
+    code?: number;
+    msg?: string;
+    hint?: string;
+    data?: PubLoginTokenVo[];
+    success?: boolean;
+  };
+
   type ResponseDataLoginTokenVo = {
     code?: number;
     msg?: string;

package/src/features/api/modules/configData/heibaimingdanfuwu.ts

@@ -38,6 +38,7 @@ export function getBlackWhiteListDeleteById<
   return request.Get<R, T>(`/blackWhiteList/delete/${param0}`, {
     params: { ...queryParams },
     ...(options || {}),
+    meta: { ...(options?.meta ?? {}), pathParams: [param0] },
   });
 }
 
@@ -58,6 +59,7 @@ export function getBlackWhiteListGetBlackWhiteListById<
   return request.Get<R, T>(`/blackWhiteList/getBlackWhiteList/${param0}`, {
     params: { ...queryParams },
     ...(options || {}),
+    meta: { ...(options?.meta ?? {}), pathParams: [param0] },
   });
 }
 

package/src/features/api/modules/configData/index.ts

@@ -1,5 +1,3 @@
 export * from './heibaimingdanfuwu';
-// API 更新时间：
-// API 唯一标识：
 export * from './xitongpeizhifuwu';
 export * from './zidifuwu';