@pubinfo/core 2.0.0-beta.9 → 2.0.0-rc.2

package/src/core/interface.ts

@@ -0,0 +1,89 @@
+import type { AdapterCreateOptions, AlovaAxiosRequestConfig } from '@alova/adapter-axios';
+import type { Alova, AlovaGenerics, AlovaOptions, Method } from 'alova';
+import type { AxiosResponse, AxiosResponseHeaders } from 'axios';
+import type { Pinia } from 'pinia';
+import type { App, Component } from 'vue';
+import type { Router, RouterOptions as VueRouterOptions } from 'vue-router';
+
+type PartialKeys<T, Keys extends keyof T> = Omit<T, Keys> & Partial<Pick<T, Keys>>;
+
+export type RouterOptions = PartialKeys<VueRouterOptions, 'history'> & { base?: string };
+
+export interface Options {
+  /**
+   * 根组件
+   */
+  app: Component
+
+  /**
+   * vue-router 配置
+   */
+  router: RouterOptions
+
+  /**
+   * 初始化函数
+   */
+  setup?: Setup
+
+  /**
+   * 根节点
+   * @default "#app"
+   */
+  rootContainer?: string | Element
+
+  /**
+   * 立即执行
+   * @default true
+   */
+  immediate?: boolean
+
+  /** 模块插件注册 */
+  modules?: ModuleOptions[]
+
+  /** 生命周期 */
+  hooks?: Partial<Hooks>
+}
+
+export interface Context {
+  app: App<Element>
+  store: Pinia
+  router: Router
+}
+
+export type Setup = (ctx: Pick<Context, 'app' | 'router' | 'store'>) => Promise<void> | void;
+
+export interface Module {
+  /** 唯一值 */
+  name: string
+
+  /** 初始化内容 */
+  setup?: Setup
+
+  /**
+   * 插件调用顺序:
+   * - `enforce: pre` 插件
+   * - 内置核心插件（即路由守卫、状态管理等）
+   * - 普通插件
+   * - 初始化函数（即setup）
+   * - `enforce: post` 插件
+   */
+  enforce?: 'pre' | 'post'
+
+  /** 钩子函数 */
+  hooks?: Partial<Hooks>
+}
+
+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 RequestOptions = Omit<AlovaOptions<AG>, 'statesHook' | 'requestAdapter'> & { axios?: AdapterCreateOptions };
+export type RequestInstance = Alova<AG>;
+export type RequestMethod = Method<AG>;
+
+export interface Hooks {
+  'http:request': AlovaOptions<AG>['beforeRequest']
+  'http:response': AlovaOptions<AG>['responded']
+}

package/src/{modules.ts → core/modules.ts}

@@ -1,15 +1,20 @@
 import type { Context, FalsyModule, Module, ModuleOptions } from './interface';
-import { hooks } from './context';
+import { hooks } from './ctx';
 import { asyncFlatten } from './utils';
 
+/**
+ * 注册所有模块插件的setup
+ */
 export async function resolveModules(modules: ModuleOptions[] = [], context: Context) {
   const filterModules = (m: Module | FalsyModule): m is Module => Boolean(m);
 
   const rawModules = (await asyncFlatten(modules)).filter(filterModules);
-  rawModules.forEach((m) => {
-    m?.setup?.(context);
-    hooks.addHooks(m.hooks ?? {});
-  });
+
+  for (const m of rawModules) {
+    if (m.setup) {
+      await m.setup(context);
+    }
+  }
 }
 
 /**
@@ -47,3 +52,12 @@ export function extractModules(modules: ModuleOptions[] = []) {
   modules?.forEach(traverse);
   return result;
 }
+
+/**
+ * 注册所有模块插件的hook
+ */
+export function resolveHooks(modules: { hooks?: Module['hooks'] }[]) {
+  modules.forEach((m) => {
+    hooks.addHooks(m?.hooks ?? {});
+  });
+}

package/src/core/request.ts

@@ -0,0 +1,52 @@
+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']) {
+  if (typeof handler === 'function') {
+    return { onSuccess: handler };
+  }
+  return handler;
+}
+
+export function createRequest(options: RequestOptions) {
+  const { onAuthRequired, onResponseRefreshToken } = createTokenAuthentication();
+  const { axios, beforeRequest, responded: _responded, ...restOptions } = options;
+
+  const responded = normalizedResponded(_responded);
+
+  const instance = createAlova({
+    statesHook: vueHook,
+    requestAdapter: axiosRequestAdapter(axios),
+    cacheFor: null,
+    timeout: 60 * 1000,
+    ...restOptions,
+
+    beforeRequest: onAuthRequired(async (method) => {
+      await hooks.callHook('http:request', method);
+      await beforeRequest?.(method);
+    }),
+
+    responded: onResponseRefreshToken({
+      onSuccess: async (response, method) => {
+        const res = await hooks.callHook('http:response:onSuccess', response, method) ?? response;
+        return responded?.onSuccess?.(res, method) ?? res;
+      },
+      onError: (err, method) => {
+        hooks.callHook('http:response:onError', err, method);
+        responded?.onError?.(err, method);
+      },
+      onComplete: (method) => {
+        hooks.callHook('http:response:onComplete', method);
+        responded?.onComplete?.(method);
+      },
+    }),
+  });
+
+  return instance;
+}
+
+export * from './interface';

package/src/core/resolver/icon.ts

@@ -0,0 +1,75 @@
+import type { ModuleRecord } from './resolver';
+import { 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>;
+
+export function defineIconModule(id: string, map: ModuleRecord) {
+  if (iconModuleMap.has(id)) {
+    console.warn(`[PUBINFO] 图标模块 ${id} 已经被定义。`);
+    return;
+  }
+  iconModuleMap.set(id, map);
+}
+
+export function getIconModule(id: string) {
+  return iconModuleMap.get(id);
+}
+
+export function getAllIconModules(): Map<string, ModuleRecord> {
+  const merged = new Map<string, ModuleRecord>(iconModuleMap);
+  const projectIcons = readProjectModules()?.icons;
+  if (projectIcons && Object.keys(projectIcons).length) {
+    if (!merged.has('local')) {
+      merged.set('local', projectIcons);
+    }
+  }
+  return merged;
+}
+
+export async function setupIcon(name: string, id?: string) {
+  const modules = readProjectModules();
+  const iconMap = modules?.icons ?? {};
+  const moduleMap = id ? (getIconModule(id) ?? {}) : {};
+
+  let result = await findFile(moduleMap, name);
+  if (result) {
+    return result;
+  }
+
+  result = await findFile(iconMap, name);
+  if (result) {
+    return result;
+  }
+
+  const allModules = getAllIconModules();
+  for (const [moduleId, modulePages] of allModules) {
+    // 跳过已经搜索过的模块
+    if (moduleId === id) {
+      continue;
+    }
+
+    result = await findFile(modulePages, name);
+    if (result) {
+      return result;
+    }
+  }
+
+  return undefined;
+}
+
+async function findFile(map: ModuleRecord, component: string) {
+  const entries = Object.entries(map);
+  const icon = entries.find(([path]) => path.endsWith(component));
+
+  if (icon?.[1]) {
+    // 执行函数并等待 Promise 解析
+    const result = await icon[1]();
+    return result.default;
+  }
+
+  return undefined;
+}

package/src/core/resolver/index.ts

@@ -0,0 +1,4 @@
+export * from './icon';
+export * from './layout';
+export * from './page';
+export * from './resolver';

package/src/core/resolver/layout.ts

@@ -0,0 +1,23 @@
+import type { ProjectModules } from './resolver';
+import { readProjectModules } from './resolver';
+
+/** 选择默认的布局组件 */
+function selectDefaultLayout(layouts: ProjectModules['layouts']): (() => Promise<any>) | null {
+  const entries = Object.entries(layouts ?? {});
+  if (entries.length === 0) {
+    return null;
+  }
+
+  if (entries.length === 1) {
+    return entries[0][1];
+  }
+
+  const indexEntry = entries.find(([path]) => path.endsWith('/index.vue'));
+  return indexEntry?.[1] || entries[0][1];
+}
+
+/** 设置默认布局组件 */
+export function setupDefaultLayout() {
+  const modules = readProjectModules();
+  return selectDefaultLayout(modules?.layouts);
+}

package/src/core/resolver/page.ts

@@ -0,0 +1,89 @@
+import type { ModuleRecord } from './resolver';
+import { readProjectModules } from './resolver';
+
+// #region --- 文件模块路由
+const routeModuleMap = new Map<string, ModuleRecord>();
+
+export function defineRouteModule(id: string, map: ModuleRecord) {
+  if (routeModuleMap.has(id)) {
+    console.warn(`[PUBINFO] 路由模块 ${id} 已经被定义。`);
+    return;
+  }
+  routeModuleMap.set(id, map);
+}
+
+export function getRouteModule(id: string) {
+  return routeModuleMap.get(id);
+}
+
+export function getAllRouteModules(): Map<string, ModuleRecord> {
+  return routeModuleMap;
+}
+
+export interface ModulePageInfo {
+  path: string
+  component: () => Promise<any>
+  moduleName: string
+}
+
+export function getAllRouteModulesPages(): ModulePageInfo[] {
+  const allPages: ModulePageInfo[] = [];
+  for (const [id, moduleMap] of routeModuleMap) {
+    Object.entries(moduleMap).forEach(([path, component]) => {
+      allPages.push({
+        path,
+        component,
+        moduleName: id,
+      });
+    });
+  }
+  return allPages;
+}
+
+/**
+ * 设置页面组件
+ * @param component 组件路径
+ * @param id 路由模块 ID
+ * @returns 页面组件
+ */
+export function setupPage(component: string, id?: string) {
+  const modules = readProjectModules();
+  const pageMap = modules?.pages ?? {};
+  const moduleMap = id ? (getRouteModule(id) ?? {}) : {};
+
+  // 1. 首先在指定的路由模块中查找
+  let result = findPageFile(moduleMap, component);
+  if (result) {
+    return result;
+  }
+
+  // 2. 然后在主项目的 pages 中查找
+  result = findPageFile(pageMap, component);
+  if (result) {
+    return result;
+  }
+
+  // 3. 最后在所有其他模块中查找
+  const allModules = getAllRouteModules();
+  for (const [moduleId, modulePages] of allModules) {
+    // 跳过已经搜索过的模块
+    if (moduleId === id) {
+      continue;
+    }
+
+    result = findPageFile(modulePages, component);
+    if (result) {
+      return result;
+    }
+  }
+
+  return undefined;
+}
+
+function findPageFile(map: ModuleRecord, component: string) {
+  const entries = Object.entries(map);
+  const page = entries.find(([path]) => path.endsWith(component));
+
+  return page?.[1];
+}
+// #endregion

package/src/core/resolver/resolver.ts

@@ -0,0 +1,25 @@
+export type ModuleRecord = Record<string, () => Promise<any>>;
+
+export interface ProjectModules {
+  icons?: ModuleRecord
+  layouts?: ModuleRecord
+  pages?: ModuleRecord
+}
+
+let modules: ProjectModules | undefined;
+
+/** 加载项目中的约定式目录结构 */
+export async function loadProjectModules() {
+  try {
+    modules = (await import('virtual:pubinfo-resolver')).default as ProjectModules;
+  }
+  catch (err) {
+    console.warn('[PUBINFO] virtual:pubinfo-resolver not available.');
+    modules = {};
+  }
+}
+
+/** 读取项目中的约定式目录结构 */
+export function readProjectModules() {
+  return modules;
+}

package/src/{api → features/api}/modules/auth/renzhengfuwu.ts

@@ -1,4 +1,4 @@
-import { auth as request } from '@/api/request';
+import { auth as request } from '@/features/api/request';
 
 /**
  * @description 切换登录组织
@@ -9,7 +9,10 @@ import { auth as request } from '@/api/request';
 export function postAuthChangeLoginOrg<
   R = API.ResponseDataLoginTokenVo,
   T = API.ResponseDataLoginTokenVo,
->(params: API.postAuthChangeLoginOrgParams, options?: Parameters<typeof request.Post<R, T>>[2]) {
+>(
+  params: API.postAuthChangeLoginOrgParams,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
   return request.Post<R, T>(
     '/auth/changeLoginOrg',
     {},
@@ -28,7 +31,10 @@ export function postAuthChangeLoginOrg<
  * @method GET
  * @author @pubinfo/openapi
  */
-export function getAuthCheckCacheToken<R = API.ResponseDataBoolean, T = API.ResponseDataBoolean>(
+export function getAuthCheckCacheToken<
+  R = API.ResponseDataBoolean,
+  T = API.ResponseDataBoolean,
+>(
   params: API.getAuthCheckCacheTokenParams,
   options?: Parameters<typeof request.Get<R, T>>[1],
 ) {
@@ -46,10 +52,10 @@ export function getAuthCheckCacheToken<R = API.ResponseDataBoolean, T = API.Resp
  * @method POST
  * @author @pubinfo/openapi
  */
-export function postAuthLogin<R = API.ResponseDataLoginTokenVo, T = API.ResponseDataLoginTokenVo>(
-  body: API.LoginByPwdDto,
-  options?: Parameters<typeof request.Post<R, T>>[2],
-) {
+export function postAuthLogin<
+  R = API.ResponseDataLoginTokenVo,
+  T = API.ResponseDataLoginTokenVo,
+>(body: API.LoginByPwdDto, options?: Parameters<typeof request.Post<R, T>>[2]) {
   return request.Post<R, T>('/auth/login', body, {
     headers: {
       'Content-Type': 'application/json',
@@ -64,9 +70,10 @@ export function postAuthLogin<R = API.ResponseDataLoginTokenVo, T = API.Response
  * @method GET
  * @author @pubinfo/openapi
  */
-export function getAuthLoginKey<R = API.ResponseDataString, T = API.ResponseDataString>(
-  options?: Parameters<typeof request.Get<R, T>>[1],
-) {
+export function getAuthLoginKey<
+  R = API.ResponseDataString,
+  T = API.ResponseDataString,
+>(options?: Parameters<typeof request.Get<R, T>>[1]) {
   return request.Get<R, T>('/auth/login/key', {
     ...(options || {}),
   });
@@ -81,7 +88,10 @@ export function getAuthLoginKey<R = API.ResponseDataString, T = API.ResponseData
 export function getAuthLoginValidCode<
   R = API.ResponseDataValidCodeVo,
   T = API.ResponseDataValidCodeVo,
->(params: API.getAuthLoginValidCodeParams, options?: Parameters<typeof request.Get<R, T>>[1]) {
+>(
+  params: API.getAuthLoginValidCodeParams,
+  options?: Parameters<typeof request.Get<R, T>>[1],
+) {
   return request.Get<R, T>('/auth/login/validCode', {
     params: {
       ...params,
@@ -96,9 +106,10 @@ export function getAuthLoginValidCode<
  * @method POST
  * @author @pubinfo/openapi
  */
-export function postAuthLoginOut<R = API.ResponseDataVoid, T = API.ResponseDataVoid>(
-  options?: Parameters<typeof request.Post<R, T>>[2],
-) {
+export function postAuthLoginOut<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(options?: Parameters<typeof request.Post<R, T>>[2]) {
   return request.Post<R, T>(
     '/auth/loginOut',
     {},
@@ -108,6 +119,24 @@ export function postAuthLoginOut<R = API.ResponseDataVoid, T = API.ResponseDataV
   );
 }
 
+/**
+ * @description 单点免密登录接口
+ * @url /auth/ssoLogin
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postAuthSsoLogin<
+  R = API.ResponseDataLoginTokenVo,
+  T = API.ResponseDataLoginTokenVo,
+>(body: API.SsoLoginDto, options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/auth/ssoLogin', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
 /**
  * @description 刷新访问令牌
  * @url /auth/token/refresh
@@ -117,7 +146,10 @@ export function postAuthLoginOut<R = API.ResponseDataVoid, T = API.ResponseDataV
 export function postAuthTokenRefresh<
   R = API.ResponseDataLoginTokenVo,
   T = API.ResponseDataLoginTokenVo,
->(params: API.postAuthTokenRefreshParams, options?: Parameters<typeof request.Post<R, T>>[2]) {
+>(
+  params: API.postAuthTokenRefreshParams,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
   return request.Post<R, T>(
     '/auth/token/refresh',
     {},

package/src/{api → features/api}/modules/auth/typings.d.ts

@@ -1,25 +1,25 @@
 /* eslint-disable */
 // @ts-nocheck
 declare namespace API {
-  interface getAuthCheckCacheTokenParams {
+  type getAuthCheckCacheTokenParams = {
     accessToken: string;
     userId: string;
-  }
+  };
 
-  interface getAuthLoginValidCodeParams {
-    /** 尺寸(长x宽)，例：150x50表示长为150宽为50，不填默认150x50 */
+  type getAuthLoginValidCodeParams = {
+    /** 尺寸(长x宽)，例：150x50表示长为150宽为50，不填默认150x50,最大尺寸:长500，宽200 */
     size?: string;
     /** 验证码长度，不填默认4位 */
     length?: number;
-  }
+  };
 
-  interface IResponseCode {
-    msg?: string;
+  type IResponseCode = {
     code?: number;
+    msg?: string;
     hint?: string;
-  }
+  };
 
-  interface LoginByPwdDto {
+  type LoginByPwdDto = {
     /** 登录类型 */
     loginType: string;
     /** 登录名 */
@@ -30,68 +30,74 @@ declare namespace API {
     codeHash: string;
     /** 验证码 */
     code: string;
-  }
+  };
 
-  interface LoginTokenVo {
+  type LoginTokenVo = {
     /** 刷新令牌 */
     refreshToken?: string;
     /** 访问令牌 */
     accessToken?: string;
     loginResponse?: IResponseCode;
-  }
+  };
 
-  interface postAuthChangeLoginOrgParams {
+  type postAuthChangeLoginOrgParams = {
     /** 新组织id */
     orgId: string;
-  }
+  };
 
-  interface postAuthTokenRefreshParams {
+  type postAuthTokenRefreshParams = {
     /** 刷新令牌 */
     refreshToken: string;
-  }
+  };
 
-  interface ResponseDataBoolean {
+  type ResponseDataBoolean = {
     code?: number;
     msg?: string;
     hint?: string;
     data?: boolean;
     success?: boolean;
-  }
+  };
 
-  interface ResponseDataLoginTokenVo {
+  type ResponseDataLoginTokenVo = {
     code?: number;
     msg?: string;
     hint?: string;
     data?: LoginTokenVo;
     success?: boolean;
-  }
+  };
 
-  interface ResponseDataString {
+  type ResponseDataString = {
     code?: number;
     msg?: string;
     hint?: string;
     data?: string;
     success?: boolean;
-  }
+  };
 
-  interface ResponseDataValidCodeVo {
+  type ResponseDataValidCodeVo = {
     code?: number;
     msg?: string;
     hint?: string;
     data?: ValidCodeVo;
     success?: boolean;
-  }
+  };
 
-  interface ResponseDataVoid {
+  type ResponseDataVoid = {
     code?: number;
     msg?: string;
     hint?: string;
     data?: Record<string, any>;
     success?: boolean;
-  }
+  };
+
+  type SsoLoginDto = {
+    /** 登录类型 */
+    loginType: string;
+    code?: string;
+  };
 
-  interface ValidCodeVo {
+  type ValidCodeVo = {
     key?: string;
     plaintext?: string;
-  }
+  };
 }

package/src/{api → features/api}/modules/configData/heibaimingdanfuwu.ts

@@ -1,4 +1,4 @@
-import { basic as request } from '@/api/request';
+import { basic as request } from '@/features/api/request';
 
 /**
  * @description 新增黑白名单
@@ -9,7 +9,10 @@ import { basic as request } from '@/api/request';
 export function postBlackWhiteListAddBlackWhiteList<
   R = API.ResponseDataBoolean,
   T = API.ResponseDataBoolean,
->(body: API.BlackWhiteListAddDto, options?: Parameters<typeof request.Post<R, T>>[2]) {
+>(
+  body: API.BlackWhiteListAddDto,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
   return request.Post<R, T>('/blackWhiteList/addBlackWhiteList', body, {
     headers: {
       'Content-Type': 'application/json',
@@ -67,7 +70,10 @@ export function getBlackWhiteListGetBlackWhiteListById<
 export function postBlackWhiteListGetBlackWhiteListPageList<
   R = API.ResponseDataIPagePubBlackWhiteList,
   T = API.ResponseDataIPagePubBlackWhiteList,
->(body: API.BlackWhiteListQueryDto, options?: Parameters<typeof request.Post<R, T>>[2]) {
+>(
+  body: API.BlackWhiteListQueryDto,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
   return request.Post<R, T>('/blackWhiteList/getBlackWhiteListPageList', body, {
     headers: {
       'Content-Type': 'application/json',
@@ -85,7 +91,10 @@ export function postBlackWhiteListGetBlackWhiteListPageList<
 export function postBlackWhiteListUpdateBlackWhiteList<
   R = API.ResponseDataBoolean,
   T = API.ResponseDataBoolean,
->(body: API.BlackWhiteListUpdateDto, options?: Parameters<typeof request.Post<R, T>>[2]) {
+>(
+  body: API.BlackWhiteListUpdateDto,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
   return request.Post<R, T>('/blackWhiteList/updateBlackWhiteList', body, {
     headers: {
       'Content-Type': 'application/json',