@litianxiang/portal-core 0.1.24 → 0.2.1

package/README.md

@@ -16,6 +16,26 @@ pnpm add @litianxiang/portal-core
 npm i @litianxiang/portal-core
 ```
 
+## 升级说明
+
+### 0.2.0（Breaking Change）
+
+- 移除 `createPortalHttpClient`。
+- 统一使用 `createAuthHttpClient`。
+- 业务项目原来通过 `createPortalHttpClient` 传入的 `baseURL: ''`、`timeout: 10000` 可以不再显式传递，`createAuthHttpClient` 内部已提供相同默认值。
+
+迁移示例：
+
+```ts
+import { createAuthHttpClient } from '@litianxiang/portal-core'
+
+const { http, logoutToAuth } = createAuthHttpClient({
+  getUserStore: () => useUserStore(),
+  getLoadingStore: () => useLoadingStore(),
+  onShowError: (msg) => console.error(msg)
+})
+```
+
 ## 快速开始
 
 ### 1) 路由接入
@@ -73,6 +93,8 @@ setupPortalApp({
 ### router
 
 - `createAppRouter(options)`：创建统一路由实例，内置登录态校验、菜单动态挂载、首屏跳转逻辑。
+  - 菜单类别为 `page` 的动态路由会挂载到 `main` 下。
+  - 菜单类别为 `flow-page` 的动态路由会挂载为顶级路由（不进入 `main` 主框架）。
 
 最小示例：
 
@@ -111,13 +133,12 @@ if (shouldRefresh) {
 ### http
 
 - `createAuthHttpClient(options)`：创建带认证拦截器的 HTTP 客户端（Loading、token 注入、401 处理、刷新 token）。
-- `createPortalHttpClient(options)`：业务项目 HTTP 初始化便捷封装，减少重复模板代码。
 
 最小示例：
 
 ```ts
 import axios from 'axios'
-import { createAuthHttpClient, createPortalHttpClient } from '@litianxiang/portal-core'
+import { createAuthHttpClient } from '@litianxiang/portal-core'
 
 const { http } = createAuthHttpClient({
   axios,
@@ -126,13 +147,6 @@ const { http } = createAuthHttpClient({
 })
 
 await http.post('/api/demo', {})
-
-// 业务项目推荐直接使用便捷封装
-const { http: portalHttp } = createPortalHttpClient({
-  axios,
-  getUserStore: () => useUserStore(),
-  getLoadingStore: () => useLoadingStore()
-})
 ```
 
 ### config

package/dist/index.d.ts

@@ -69,30 +69,6 @@ interface CreateAuthHttpClientOptions {
     inactiveBufferMs?: number;
     onShowError?: (msg: string) => void;
 }
-interface CreatePortalHttpClientOptions {
-    axios?: any;
-    baseURL?: string;
-    timeout?: number;
-    getUserStore: () => any;
-    getLoadingStore: () => any;
-    authLoginUrl?: string;
-    ssoStorageKey?: string;
-    refreshUrl?: string;
-    inactiveExpireMs?: number;
-    inactiveBufferMs?: number;
-    onShowError?: (msg: string) => void;
-}
-/**
- * 创建业务项目通用 HTTP 客户端（createAuthHttpClient 的便捷封装）。
- *
- * 作用：
- * - 统一管理端项目中的标准 HTTP 初始化写法
- * - 复用 portal-core 认证拦截器能力
- */
-declare function createPortalHttpClient(options: CreatePortalHttpClientOptions): {
-    http: any;
-    logoutToAuth: () => void;
-};
 declare function createAuthHttpClient(options: CreateAuthHttpClientOptions): {
     http: any;
     logoutToAuth: () => void;
@@ -551,4 +527,4 @@ interface CreateI18nOptions {
  */
 declare function createPortalI18n(options: CreateI18nOptions): vue_i18n.I18n<Record<string, any>, {}, {}, string, false>;
 
-export { AUTH_CONFIG, type AppRouterOptions, type AuthConfig, type BaseUserStoreLike, type BreadcrumbItem, type CoreMenuItem, type CoreMenuUserState, type CoreUserStoreLike, type CreateAuthHttpClientOptions, type CreateBaseUserActionsOptions, type CreateI18nOptions, type CreateMenuUserActionsOptions, type CreatePortalHttpClientOptions, DEFAULT_AUTH_LOGIN_ENV_KEY, DEFAULT_AUTH_LOGIN_PATH, DEFAULT_HOME_PATH, DEFAULT_SSO_STORAGE_KEY, type FetchUserMenuForStoreOptions, type FontSize, type InactivityConfig, type InactivityResult, type LoadingState, type LogoutToAuthOptions, type MenuHelper, type MenuHelperOptions, type PermissionHelper, type PermissionHelperOptions, type PresetRangeKey, type SetupPortalAppOptions, type SidebarMenuFilterOptions, type SyncFromAuthStoreOptions, type TabItem, type ThemeConfig, type ThemeMode, type TimeInput, type TimeRange, type TransformMenuOptions, addTab, applyTheme, buildAllMenuTree, buildPageMenuList, calcInactivityAction, closeAll, closeLeft, closeOthers, closeRight, createAppRouter, createAuthHttpClient, createBaseUserActions, createBaseUserGetters, createBaseUserState, createLoadingStoreOptions, createLogoutToAuth, createMenuHelper, createMenuUserActions, createMenuUserGetters, createMenuUserState, createPermissionHelper, createPortalHttpClient, createPortalI18n, createRange, createTabStoreOptions, fetchUserMenuForStore, filterSidebarMenu, findFirstPagePath, formatRange, formatTime, formatToMonthDay, formatToWanShou, formatToYi, formatWanYuanToYi, getDefaultAuthLoginUrl, getPresetRange, humanizeTime, initTheme, isInRange, removeTab, setupPortalApp, syncFromAuthStoreToStore, timeDiff, transformMenuTree, useThemeWatcher, useTime };
+export { AUTH_CONFIG, type AppRouterOptions, type AuthConfig, type BaseUserStoreLike, type BreadcrumbItem, type CoreMenuItem, type CoreMenuUserState, type CoreUserStoreLike, type CreateAuthHttpClientOptions, type CreateBaseUserActionsOptions, type CreateI18nOptions, type CreateMenuUserActionsOptions, DEFAULT_AUTH_LOGIN_ENV_KEY, DEFAULT_AUTH_LOGIN_PATH, DEFAULT_HOME_PATH, DEFAULT_SSO_STORAGE_KEY, type FetchUserMenuForStoreOptions, type FontSize, type InactivityConfig, type InactivityResult, type LoadingState, type LogoutToAuthOptions, type MenuHelper, type MenuHelperOptions, type PermissionHelper, type PermissionHelperOptions, type PresetRangeKey, type SetupPortalAppOptions, type SidebarMenuFilterOptions, type SyncFromAuthStoreOptions, type TabItem, type ThemeConfig, type ThemeMode, type TimeInput, type TimeRange, type TransformMenuOptions, addTab, applyTheme, buildAllMenuTree, buildPageMenuList, calcInactivityAction, closeAll, closeLeft, closeOthers, closeRight, createAppRouter, createAuthHttpClient, createBaseUserActions, createBaseUserGetters, createBaseUserState, createLoadingStoreOptions, createLogoutToAuth, createMenuHelper, createMenuUserActions, createMenuUserGetters, createMenuUserState, createPermissionHelper, createPortalI18n, createRange, createTabStoreOptions, fetchUserMenuForStore, filterSidebarMenu, findFirstPagePath, formatRange, formatTime, formatToMonthDay, formatToWanShou, formatToYi, formatWanYuanToYi, getDefaultAuthLoginUrl, getPresetRange, humanizeTime, initTheme, isInRange, removeTab, setupPortalApp, syncFromAuthStoreToStore, timeDiff, transformMenuTree, useThemeWatcher, useTime };

package/dist/index.js

@@ -212,7 +212,8 @@ function createAppRouter(options) {
   const resolveRouteAndView = (item) => {
     const [rawPath] = (item.path || "").split("?");
     const normalizedPath = rawPath.startsWith("/") ? rawPath : `/${rawPath}`;
-    const routePath = normalizedPath.slice(1);
+    const childPath = normalizedPath.slice(1);
+    const rootPath = normalizedPath;
     const candidates = [
       `/main${normalizedPath}`,
       // /views/main/system/user.vue
@@ -231,40 +232,44 @@ function createAppRouter(options) {
       const fallbackPath = `/main${normalizedPath}`;
       viewKey = `/src/views${fallbackPath}.vue`;
     }
-    return { routePath, viewKey };
+    return { childPath, rootPath, viewKey };
   };
-  const transformRoutes = (menuItems) => {
+  const collectDynamicRoutes = (menuItems) => {
     const routes = [];
-    for (const item of menuItems) {
-      if (item.category === "button") continue;
-      const { routePath, viewKey } = resolveRouteAndView(item);
-      const isPage = item.category === "page" || item.category === "flow-page";
-      if (!registeredPaths.has(routePath)) {
-        registeredPaths.add(routePath);
-        routes.push({
-          path: routePath,
-          name: `menu_${item.id}`,
-          component: isPage ? modules[viewKey] : void 0,
-          meta: {
-            id: item.id,
-            parent_id: item.parent_id,
-            icon: item.icon,
-            category: item.category,
-            keepAlive: true,
-            title: item.name,
-            fullPath: item.path
-          },
-          children: item.children ? transformRoutes(item.children) : []
-        });
-      } else if (item.children?.length) {
-        routes.push(...transformRoutes(item.children));
+    for (const item of menuItems || []) {
+      if (item?.children?.length) {
+        routes.push(...collectDynamicRoutes(item.children));
       }
+      const isDynamicPage = item?.category === "page" || item?.category === "flow-page";
+      if (!isDynamicPage) continue;
+      const { childPath, rootPath, viewKey } = resolveRouteAndView(item);
+      const routePath = item?.category === "flow-page" ? rootPath : childPath;
+      if (registeredPaths.has(routePath)) continue;
+      registeredPaths.add(routePath);
+      routes.push({
+        path: routePath,
+        name: `menu_${item.id}`,
+        component: modules[viewKey],
+        meta: {
+          id: item.id,
+          parent_id: item.parent_id,
+          icon: item.icon,
+          category: item.category,
+          keepAlive: true,
+          title: item.name,
+          fullPath: item.path
+        }
+      });
     }
     return routes;
   };
   const addDynamicRoutes = (menuData) => {
-    const dynamicRoutes = transformRoutes(menuData);
+    const dynamicRoutes = collectDynamicRoutes(menuData);
     dynamicRoutes.forEach((route) => {
+      if (route.meta?.category === "flow-page") {
+        router.addRoute(route);
+        return;
+      }
       router.addRoute("main", route);
     });
   };
@@ -458,13 +463,6 @@ function calcInactivityAction(lastActiveTime, now, config = {}) {
 
 // src/http/http.ts
 import axiosLib from "axios";
-function createPortalHttpClient(options) {
-  return createAuthHttpClient({
-    baseURL: "",
-    timeout: 1e4,
-    ...options
-  });
-}
 function createAuthHttpClient(options) {
   const {
     axios,
@@ -1207,7 +1205,6 @@ export {
   createMenuUserGetters,
   createMenuUserState,
   createPermissionHelper,
-  createPortalHttpClient,
   createPortalI18n,
   createRange,
   createTabStoreOptions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@litianxiang/portal-core",
-  "version": "0.1.24",
+  "version": "0.2.1",
   "private": false,
   "type": "module",
   "main": "dist/index.js",