@pubinfo/core 2.0.15 → 2.1.1

package/src/features/context/index.ts

@@ -1,7 +1,7 @@
 import type { Router } from 'vue-router';
 import type { RequestInstance } from '@/core';
 
-import { createContext } from '@/utils';
+import { createContext } from '../../core/utils';
 
 interface InternalContext {
   router: Router

package/src/features/stores/modules/keepAlive.ts

@@ -22,14 +22,13 @@ const useKeepAliveStore = defineStore(
       if (isString(name)) {
         return !list.value.includes(name) && list.value.push(name);
       }
-      else if (isArray(name)) {
-        name.forEach((_name) => {
-          add(_name);
-        });
-      }
-      else {
-        useWarn(`KeepAlive 需要接受一个字符串或者字符串数组作为参数, 但是接受到了 ${typeof name} 类型`);
+
+      if (isArray(name)) {
+        name.forEach(_name => add(_name));
+        return;
       }
+
+      useWarn(`KeepAlive 需要接受一个字符串或者字符串数组作为参数, 但是接受到了 ${typeof name} 类型`);
     }
 
     /**
@@ -39,14 +38,11 @@ const useKeepAliveStore = defineStore(
      */
     function remove(name: string | string[]) {
       if (isString(name)) {
-        list.value = list.value.filter((v) => {
-          return v !== name;
-        });
+        list.value = list.value.filter(v => v !== name);
       }
-      else if (isArray(name)) {
-        list.value = list.value.filter((v) => {
-          return !name.includes(v);
-        });
+
+      if (isArray(name)) {
+        list.value = list.value.filter(v => !name.includes(v));
       }
     }
 

package/src/features/stores/modules/settings.ts

@@ -1,6 +1,6 @@
 import type { RouteLocationNormalized, RouteMeta } from 'vue-router';
 import { FrownOutlined } from '@ant-design/icons-vue';
-import { usePreferredDark } from '@vueuse/core';
+import { usePreferredDark, useToggle } from '@vueuse/core';
 import { Modal } from 'ant-design-vue';
 import { cloneDeep, defaultsDeep, get, isArray, isEmpty, isObject, reduce, set } from 'lodash-es';
 import { defineStore } from 'pinia';
@@ -243,13 +243,8 @@ const useSettingsStore = defineStore(
       settings.value.app.colorScheme = color;
     }
 
-    // 主页面是否最大化
-    const mainPageMaximizeStatus = ref(false);
-
     // 切换当前主页面最大化
-    function setMainPageMaximize(value?: boolean) {
-      mainPageMaximizeStatus.value = value ?? !mainPageMaximizeStatus.value;
-    }
+    const [mainPageMaximizeStatus, setMainPageMaximize] = useToggle(false);
 
     /**
      * 更新配置

package/src/features/stores/modules/user.ts

@@ -2,7 +2,7 @@ import type { AxiosRequestHeaders } from 'axios';
 import type { ComputedRef } from 'vue';
 import { find } from 'lodash-es';
 import { defineStore } from 'pinia';
-import { postAuthChangeLoginOrg, postAuthLogin } from '@/features/api/modules/auth';
+import { postAuthChangeLoginOrg, postAuthLogin, postAuthLoginNew } from '@/features/api/modules/auth';
 import { getRbacResourceGrantedResources, getRbacUserUserEntireInfo, putRbacUserChangePassword } from '@/features/api/modules/rbac';
 import { usePubinfoContext } from '@/features/context';
 import { publicKeyEncryption } from '@/utils';
@@ -24,7 +24,10 @@ export interface UserStore {
   /** 获取用户权限码 */
   getPermissions: () => Promise<string[]>
 
-  /** 登录 */
+  /**
+   * 登录
+   * @deprecated 请使用 `signIn` 方法替代
+   */
   login: (data: {
     account: string
     password: string
@@ -33,6 +36,16 @@ export interface UserStore {
     loginType?: 'password' | string
   }) => Promise<API.ResponseDataLoginTokenVo>
 
+  /** 登录 */
+  signIn: (data: {
+    account: string
+    password: string
+    captchas: string
+    captchaHash: string
+    loginType?: 'password' | string
+    captchaType?: string
+  }) => Promise<API.ResponseDataLoginTokenVo>
+
   /** 登出 */
   logout: () => void
 
@@ -96,6 +109,7 @@ const useUserStore = defineStore<STORE_NAME.USER, UserStore>(
 
     /**
      * 用户登录函数
+     * @deprecated 请使用 `signIn` 方法替代
      * @param data 登录所需的数据
      * @param data.account 账号
      * @param data.password 密码
@@ -130,6 +144,46 @@ const useUserStore = defineStore<STORE_NAME.USER, UserStore>(
       return result;
     }
 
+    /**
+     * 用户登录函数
+     * @param data 登录所需的数据
+     * @param data.account 账号
+     * @param data.password 密码
+     * @param data.captchas 验证码
+     * @param data.captchaHash 验证码哈希值
+     * @param data.loginType 登录类型，默认为 'password'
+     * @param data.captchaType 验证类型
+     */
+    async function signIn(data: {
+      account: string
+      password: string
+      captchas: string
+      captchaHash: string
+      loginType?: 'password' | string
+      captchaType?: string
+    }) {
+      const {
+        account: loginName,
+        password,
+        captchaHash: codeHash,
+        captchas: code,
+        loginType = 'password',
+        captchaType,
+      } = data;
+      const loginPwd = await publicKeyEncryption(password);
+      const result = await postAuthLoginNew({
+        loginType,
+        loginName,
+        loginPwd,
+        codeHash,
+        code,
+        captchaType,
+      });
+      const { accessToken, refreshToken } = result.data as Required<API.LoginTokenVo>;
+      setToken(accessToken, refreshToken);
+      return result;
+    }
+
     /**
      * 执行用户注销操作，并跳转到登录页面。
      */
@@ -231,6 +285,7 @@ const useUserStore = defineStore<STORE_NAME.USER, UserStore>(
       getUserInfo,
       getPermissions,
       login,
+      signIn,
       logout,
       changePassword,
       changeOrg,

package/src/index.ts

@@ -2,6 +2,7 @@ import type { Options, RequestInstance } from './core';
 import {
   Authentication,
   Authorization,
+  Devtools,
   LayoutComponent,
   NProgress,
   PiniaPlugin,
@@ -75,6 +76,7 @@ export function createPubinfo(options: PubinfoOptions) {
       NProgress(),
       SystemInfo(),
       ...(options.modules ?? []),
+      Devtools(),
     ],
   });
 }
@@ -105,19 +107,21 @@ export {
   readProjectModules,
 } from './core';
 export * from './core/interface';
+export {
+  clearPersistedState,
+  createContext,
+  getPersistedState,
+  getPubinfoNamespace,
+  setPersistedState,
+} from './core/utils';
 
 export * from './features';
 
 export {
   cleanup,
   cleanupWithoutUser,
-  clearPersistedState,
-  createContext,
   createRawContext,
-  getPersistedState,
-  getPubinfoNamespace,
   publicKeyEncryption,
-  setPersistedState,
   storage,
   wrapProxy,
 } from './utils';

package/src/utils/index.ts

@@ -1,5 +1,4 @@
 export * from './cleanup';
-export * from './global';
 export * from './path';
 export * from './proxy';
 export * from './publicKey';

package/src/utils/proxy.ts

@@ -1,4 +1,4 @@
-import { getPersistedState } from './global';
+import { getPersistedState } from '../core/utils';
 
 export function wrapProxy<T extends Record<K, any>, K extends keyof T>(
   fn: () => T,

package/types/index.d.ts

@@ -2,6 +2,7 @@ import './favorites.d.ts';
 import './iframe.d.ts';
 import './menu.d.ts';
 import './module.d.ts';
+import './pinia.d.ts';
 import './settings.d.ts';
 import './tabbar.d.ts';
 import './user.d.ts';

package/types/pinia.d.ts

@@ -0,0 +1,94 @@
+import type { StateTree } from 'pinia';
+
+/**
+ * 持久化选项类型
+ */
+export type PersistenceOptions<State extends StateTree = StateTree> = Partial<{
+  /** 自定义存储键名 */
+  key: string
+  /** 存储实例 */
+  storage: {
+    getItem: (key: string) => string | null
+    setItem: (key: string, value: string) => void
+  }
+  /** 序列化器 */
+  serializer: {
+    serialize: (data: StateTree) => string
+    deserialize: (data: string) => StateTree
+  }
+  /** 是否开启调试模式 */
+  debug: boolean
+  /** 恢复数据前的钩子 */
+  beforeHydrate: (context: any) => void
+  /** 恢复数据后的钩子 */
+  afterHydrate: (context: any) => void
+  /** 要持久化的状态字段（白名单） */
+  pick: string[]
+  /** 不需要持久化的状态字段（黑名单） */
+  omit: string[]
+  /** 存储区域类型 */
+  storageArea: 'local' | 'session'
+}>;
+
+/**
+ * 扩展 Pinia 的 Store 类型定义
+ */
+declare module 'pinia' {
+  /**
+   * 扩展 Store 实例，添加持久化相关方法
+   */
+  export interface Store<Id extends string = string, S extends StateTree = StateTree, G = Record<string, unknown>, A = Record<string, unknown>> {
+    /**
+     * 手动持久化当前状态到存储
+     */
+    $persist?: () => void
+
+    /**
+     * 手动从存储恢复状态
+     * @param options - 恢复选项
+     */
+    $hydrate?: (options?: { runHooks?: boolean }) => void
+  }
+
+  /**
+   * 扩展 DefineStoreOptionsInPlugin，添加 persist 选项支持
+   * 适用于 Options API 风格和插件系统
+   */
+  export interface DefineStoreOptionsInPlugin<Id extends string, S extends StateTree, G, A> {
+    /**
+     * 持久化配置
+     * - `true`: 启用默认持久化
+     * - `object`: 单个持久化配置
+     * - `array`: 多个持久化配置（可以将不同字段保存到不同存储）
+     */
+    persist?: boolean | PersistenceOptions<S> | PersistenceOptions<S>[]
+  }
+
+  /**
+   * 扩展 DefineSetupStoreOptions，添加 persist 选项支持
+   * 适用于 Setup 函数风格（defineStore 的第三个参数）
+   */
+  export interface DefineSetupStoreOptions<Id extends string, S extends StateTree, G, A> {
+    /**
+     * 持久化配置
+     * - `true`: 启用默认持久化
+     * - `object`: 单个持久化配置
+     * - `array`: 多个持久化配置（可以将不同字段保存到不同存储）
+     */
+    persist?: boolean | PersistenceOptions<S> | PersistenceOptions<S>[]
+  }
+
+  /**
+   * 扩展 DefineStoreOptions，添加 persist 选项支持
+   * 适用于 Options API 风格（defineStore 的第二个参数）
+   */
+  export interface DefineStoreOptions<Id extends string, S extends StateTree, G, A> {
+    /**
+     * 持久化配置
+     * - `true`: 启用默认持久化
+     * - `object`: 单个持久化配置
+     * - `array`: 多个持久化配置（可以将不同字段保存到不同存储）
+     */
+    persist?: boolean | PersistenceOptions<S> | PersistenceOptions<S>[]
+  }
+}

package/types/vue-router.d.ts

@@ -29,7 +29,14 @@ export interface RouterMetaRawBaseOptions {
   pin?: boolean
   routeName?: string
   id?: string | number
+  layout?: {
+    header?: boolean
+    sidebar?: boolean
+    tabs?: boolean
+    toolbar?: boolean
+  }
   partyLogin?: PartyLoginStepConfig[]
+  custom?: any
 }
 
 type RouterMetaRaw = RequireExactlyOne<Partial<RouterMetaRawBaseOptions>, 'title'>;

package/dist/HeaderThinMenu-Bu4X2-vs.js

@@ -1,4 +0,0 @@
-import { cE as f } from "./index-Ctu3_aXu.js";
-export {
-  f as default
-};

package/dist/index-ondkWqUz.js

@@ -1,4 +0,0 @@
-import { cD as f } from "./index-Ctu3_aXu.js";
-export {
-  f as default
-};