@pubinfo/core 2.0.0-beta.1 → 2.0.0-beta.12

package/package.json

@@ -1,50 +1,44 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.12",
   "exports": {
     ".": {
-      "types": "./es/index.d.ts",
-      "import": "./es/index.js",
-      "require": "./lib/index.cjs"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     },
     "./request": {
-      "types": "./es/api/index.d.ts",
-      "import": "./es/request.js",
-      "require": "./lib/request.cjs"
-    },
-    "./style.css": {
-      "import": "./es/style.css",
-      "require": "./lib/style.css"
+      "types": "./dist/api/index.d.ts",
+      "default": "./dist/request.js"
     },
+    "./style.css": "./dist/style.css",
     "./types": "./types/index.d.ts"
   },
-  "main": "./lib/index.js",
-  "module": "./es/index.js",
-  "types": "./es/index.d.ts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "files": [
-    "es",
-    "lib",
+    "dist",
     "src",
     "types"
   ],
   "peerDependencies": {
-    "alova": "^3.2.6",
-    "pinia": "^2.3.0",
+    "alova": "^3.2.9",
+    "pinia": "^2.3.1",
     "vue": "^3.5.13",
-    "vue-i18n": "^9.14.0",
+    "vue-i18n": "^10.0.5",
     "vue-router": "^4.5.0",
-    "@pubinfo/config": "2.0.0-beta.1"
+    "@pubinfo/config": "2.0.0-beta.12"
   },
   "dependencies": {
     "@alova/adapter-axios": "^2.0.13",
     "@ant-design/icons-vue": "^7.0.1",
     "@headlessui/vue": "^1.7.23",
     "@imengyu/vue3-context-menu": "^1.4.4",
-    "@pubinfo/pro-components": "^1.6.1",
+    "@pubinfo/pro-components": "^1.7.0",
     "@unocss/reset": "^65.5.0",
     "@vueuse/core": "^12.7.0",
-    "@vueuse/integrations": "^12.7.0",
+    "@vueuse/integrations": "^12.8.2",
     "ant-design-vue": "^4.2.6",
     "axios": "^1.8.1",
     "consola": "^3.4.0",
@@ -89,9 +83,9 @@
     "vite": "^6.2.0",
     "vite-plugin-dts": "^4.5.3",
     "vue": "^3.5.13",
-    "vue-i18n": "^9.14.2",
+    "vue-i18n": "^10.0.5",
     "vue-router": "^4.5.0",
-    "@pubinfo/config": "2.0.0-beta.1"
+    "@pubinfo/config": "2.0.0-beta.12"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

package/src/components/PubinfoProvider/index.ts

@@ -1,3 +1,5 @@
+import type { InjectionKey } from 'vue';
+
 interface PubinfoProviderProps {
   loadIcon?: (name?: string) => any
 }

package/src/composables/auth.ts

@@ -14,7 +14,7 @@ export function useAuth() {
     const settingsStore = useSettingsStore();
     const userStore = useUserStore();
     if (settingsStore.settings.app.enablePermission) {
-      return userStore.permissions.includes(permission);
+      return userStore.user.permissions.includes(permission);
     }
     else {
       return true;

package/src/interface.ts

@@ -20,9 +20,20 @@ export interface Options {
 }
 
 export interface Module {
+  /** 唯一值 */
   name: string
+  /** 初始化内容 */
   setup?: (ctx: Context) => void
+  /**
+   * 插件调用顺序:
+   * - `enforce: pre` 插件
+   * - 腾龙核心功能（即内置的各类路由守卫、状态管理等）
+   * - 普通插件
+   * - 项目初始化函数（即 `createPubinfo` 第三个参数）
+   * - `enforce: post` 插件
+   */
   enforce?: 'pre' | 'post'
+  /** 钩子函数 */
   hooks?: Partial<Hooks>
 }
 

package/src/layout/components/Tools/index.vue

@@ -2,7 +2,6 @@
 import { useFullscreen } from '@vueuse/core';
 import { useI18n } from 'vue-i18n';
 import CarbonUserAvatarFilledAlt from '~icons/carbon/user-avatar-filled-alt';
-// import FluentAlert12Regular from '~icons/fluent/alert-12-regular';
 import FluentArrowSync16Filled from '~icons/fluent/arrow-sync-16-filled';
 import FluentFullScreenMaximize16Filled from '~icons/fluent/full-screen-maximize-16-filled';
 import FluentFullScreenMinimize16Filled from '~icons/fluent/full-screen-minimize-16-filled';
@@ -17,7 +16,6 @@ import useViewTransition from '../../composables/useViewTransition';
 import DayNightSwitch from './DayNightSwitch.vue';
 import HotkeysIntro from './HotkeysIntro.vue';
 // import I18nSelector from './I18nSelector.vue';
-// import Notification from './Notification.vue';
 import Preferences from './Preferences/index.vue';
 import Search from './Search.vue';
 
@@ -26,9 +24,7 @@ defineOptions({
 });
 
 const router = useRouter();
-const { settingsStore, userStore, notificationStore, generateI18nTitle } = useContext();
-
-notificationStore.init();
+const { settingsStore, userStore, generateI18nTitle } = useContext();
 
 const { t } = useI18n();
 
@@ -67,9 +63,9 @@ const userMenu = computed(() => [
       icon: 'i-iconamoon-synchronize-duotone',
       handle: () => router.push({
         name: 'ChangeOrganization',
-        params: { orgId: userStore.orgId },
+        params: { orgId: userStore.user.orgId },
       }),
-      hide: userStore.orgList.length <= 1,
+      hide: userStore.user.orgList.length <= 1,
     },
     {
       label: t('route.personal.profile'),
@@ -133,7 +129,7 @@ function toggleColorScheme(event: MouseEvent) {
 
 const avatarError = ref(false);
 
-watch(() => userStore.avatar, () => {
+watch(() => userStore.user.avatar, () => {
   if (avatarError.value) {
     avatarError.value = false;
   }
@@ -175,20 +171,7 @@ const searchComponentsClass = computed(() => {
       >
         <IconamoonSearch text="14px" />
       </span>
-      <!-- <HDropdown
-        v-if="settingsStore.settings.toolbar.enableNotification"
-        class="item"
-      >
-        <HBadge
-          :value="notificationStore.total"
-        >
-          <FluentAlert12Regular text="15px" />
-        </HBadge>
-        <template #dropdown>
-          <Notification />
-        </template>
-      </HDropdown>
-      <I18nSelector class="item">
+      <!-- <I18nSelector class="item">
         <RiTranslate text="15px" />
       </I18nSelector> -->
       <span
@@ -210,8 +193,8 @@ const searchComponentsClass = computed(() => {
     </div>
     <div flex-center cursor-pointer gap-1>
       <img
-        v-if="userStore.avatar && !avatarError"
-        :src="userStore.avatar"
+        v-if="userStore.user.avatar && !avatarError"
+        :src="userStore.user.avatar"
         :onerror="() => (avatarError = true)"
         class="h-[24px] w-[24px] rounded-full"
       >
@@ -222,7 +205,7 @@ const searchComponentsClass = computed(() => {
       <PhLineVerticalThin />
       <HDropdownMenu :items="userMenu">
         <div flex-center cursor-pointer gap-1>
-          {{ userStore.account }}
+          {{ userStore.user.account }}
           <MaterialSymbolsExpandMoreRounded ml="5px" mr="10px" />
         </div>
       </HDropdownMenu>

package/src/layout/composables/useContext.ts

@@ -3,7 +3,6 @@ import type {
   useIframeStore,
   useKeepAliveStore,
   useMenuStore,
-  useNotificationStore,
   useRouteStore,
   useSettingsStore,
   useTabbarStore,
@@ -16,7 +15,6 @@ interface LayoutContext {
   keepAliveStore: ReturnType<typeof useKeepAliveStore>
   iframeStore: ReturnType<typeof useIframeStore>
   userStore: ReturnType<typeof useUserStore>
-  notificationStore: ReturnType<typeof useNotificationStore>
   menuStore: ReturnType<typeof useMenuStore>
   routeStore: ReturnType<typeof useRouteStore>
   tabbarStore: ReturnType<typeof useTabbarStore>

package/src/layout/composables/useWatermark.ts

@@ -27,11 +27,11 @@ export default function useWatermark() {
     const type = settingsStore.settings.watermark.text;
     switch (type) {
       case 'U':
-        return `${userStore.account}`;
+        return `${userStore.user.account}`;
       case 'O':
         return `${userStore.userOrgName}`;
       case 'OU':
-        return `${userStore.userOrgName}  ${userStore.account}`;
+        return `${userStore.userOrgName}  ${userStore.user.account}`;
       default:
         return type;
     }

package/src/layout/provider.ts

@@ -3,7 +3,6 @@ import {
   useIframeStore,
   useKeepAliveStore,
   useMenuStore,
-  useNotificationStore,
   useRouteStore,
   useSettingsStore,
   useTabbarStore,
@@ -33,7 +32,6 @@ export const Provider = defineComponent({
     const keepAliveStore = useKeepAliveStore();
     const iframeStore = useIframeStore();
     const userStore = useUserStore();
-    const notificationStore = useNotificationStore();
     const routeStore = useRouteStore();
     const tabbarStore = useTabbarStore();
     const favoritesStore = useFavoritesStore();
@@ -46,7 +44,6 @@ export const Provider = defineComponent({
       keepAliveStore,
       iframeStore,
       userStore,
-      notificationStore,
       routeStore,
       tabbarStore,
       favoritesStore,

package/src/layout/ui-kit/HDialog.vue

@@ -23,7 +23,10 @@ const emit = defineEmits<{
   'close': []
 }>();
 
-const slots = useSlots();
+const slots = defineSlots<{
+  default: any
+  footer: any
+}>();
 
 const overlayTransitionClass = ref({
   enter: 'ease-in-out duration-500',

package/src/layout/ui-kit/HSlideover.vue

@@ -26,7 +26,10 @@ const emit = defineEmits<{
   'close': []
 }>();
 
-const slots = useSlots();
+const slots = defineSlots<{
+  default: any
+  footer: any
+}>();
 
 const overlayTransitionClass = ref({
   enter: 'ease-in-out duration-500',

package/src/pages/system/change-organization/index.vue

@@ -11,7 +11,7 @@ const userStore = useUserStore();
 const router = useRouter();
 
 // 切断响应式，否则组织清楚后会导致页面闪烁
-const rawOrganization = toRaw(userStore.orgList);
+const rawOrganization = toRaw(userStore.user.orgList);
 const orgList = computed(() => {
   const org = rawOrganization.map((item) => {
     return {
@@ -37,7 +37,7 @@ async function changeOrganization() {
   const org = orgList.value[activeIndex.value];
   const orgId = org?.orgId;
   if (orgId) {
-    if (orgId === userStore.orgId) {
+    if (orgId === userStore.user.orgId) {
       message.error('请避免切换到当前已选组织');
     }
     else {
@@ -83,7 +83,7 @@ async function changeOrganization() {
                   <span mr-10px>
                     {{ item.label }}
                   </span>
-                  <a-tag v-if="userStore.orgId === item.orgId" color="blue">
+                  <a-tag v-if="userStore.user.orgId === item.orgId" color="blue">
                     当前使用组织
                   </a-tag>
                   <a-tag v-if="item.main" color="red">

package/src/route/routes.ts

@@ -27,8 +27,8 @@ export const constantRoutes: RouteRecordRaw[] = [
     name: 'ChangeOrganization',
     component: () => import('@/pages/system/change-organization/index.vue'),
     beforeEnter: (to) => {
-      const user = useUserStore();
-      if (isUndefined(to.params.orgId) || to.params.orgId !== user.orgId) {
+      const userStore = useUserStore();
+      if (isUndefined(to.params.orgId) || to.params.orgId !== userStore.user.orgId) {
         return { name: 'Login' };
       }
       return true;
@@ -96,15 +96,6 @@ export const systemRoutes: RouteRecordRaw[] = [
           icon: 'i-iconamoon-profile-duotone',
         },
       },
-      // {
-      //   path: 'personal/notification',
-      //   name: 'Notification',
-      //   component: () => import('@/pages/personal/notification.vue'),
-      //   meta: {
-      //     title: '通知中心',
-      //     i18n: 'route.personal.notification',
-      //   },
-      // },
     ],
   },
 ];

package/src/stores/helper.ts

@@ -13,8 +13,8 @@ export function getfavoritesMemoryKey() {
 
 function getUserPrefix() {
   const userStore = useUserStore();
-  const userId = userStore.userId;
-  const orgId = userStore.orgId;
+  const userId = userStore.user.userId;
+  const orgId = userStore.user.orgId;
   return getHash(`${orgId}${userId}`);
 }
 

package/src/stores/modules/favorites.ts

@@ -150,3 +150,4 @@ const useFavoritesStore = defineStore(
 );
 
 export default useFavoritesStore;
+export type FavoritesStore = ReturnType<typeof useFavoritesStore>;

package/src/stores/modules/iframe.ts

@@ -112,3 +112,4 @@ const useIframeStore = defineStore(
 );
 
 export default useIframeStore;
+export type IframeStore = ReturnType<typeof useIframeStore>;

package/src/stores/modules/index.ts

@@ -1,9 +1,16 @@
 export { default as useFavoritesStore } from './favorites';
+export * from './favorites';
 export { default as useIframeStore } from './iframe';
+export * from './iframe';
 export { default as useKeepAliveStore } from './keepAlive';
+export * from './keepAlive';
 export { default as useMenuStore } from './menu';
-export { default as useNotificationStore } from './notification';
+export * from './menu';
 export { default as useRouteStore } from './route';
+export * from './route';
 export { default as useSettingsStore } from './settings';
+export * from './settings';
 export { default as useTabbarStore } from './tabbar';
+export * from './tabbar';
 export { default as useUserStore } from './user';
+export * from './user';

package/src/stores/modules/keepAlive.ts

@@ -66,3 +66,4 @@ const useKeepAliveStore = defineStore(
 );
 
 export default useKeepAliveStore;
+export type KeepAliveStore = ReturnType<typeof useKeepAliveStore>;

package/src/stores/modules/menu.ts

@@ -205,3 +205,4 @@ const useMenuStore = defineStore(
 );
 
 export default useMenuStore;
+export type MenuStore = ReturnType<typeof useMenuStore>;

package/src/stores/modules/route.ts

@@ -266,7 +266,7 @@ const useRouteStore = defineStore(
       let returnRoutes: Route.recordMainRaw[];
       // 如果权限功能开启，则需要对路由数据进行筛选过滤
       if (settingsStore.settings.app.enablePermission) {
-        returnRoutes = filterAsyncRoutes(routesRaw.value, userStore.permissions);
+        returnRoutes = filterAsyncRoutes(routesRaw.value, userStore.user.permissions);
       }
       else {
         returnRoutes = cloneDeep(routesRaw.value);
@@ -433,3 +433,4 @@ const useRouteStore = defineStore(
 );
 
 export default useRouteStore;
+export type RouteStore = ReturnType<typeof useRouteStore>;

package/src/stores/modules/settings.ts

@@ -369,3 +369,4 @@ const useSettingsStore = defineStore(
 );
 
 export default useSettingsStore;
+export type SettingsStore = ReturnType<typeof useSettingsStore>;

package/src/stores/modules/tabbar.ts

@@ -336,3 +336,4 @@ const useTabbarStore = defineStore(
 );
 
 export default useTabbarStore;
+export type TabbarStore = ReturnType<typeof useTabbarStore>;

package/src/stores/modules/user.ts

@@ -1,5 +1,5 @@
 import type { AxiosRequestHeaders } from 'axios';
-import type { LocationQueryValue } from 'vue-router';
+import type { ComputedRef } from 'vue';
 import { postAuthChangeLoginOrg, postAuthLogin } from '@/api/modules/auth';
 import { getRbacResourceGrantedResources, getRbacUserUserEntireInfo, putRbacUserChangePassword } from '@/api/modules/rbac';
 import { usePubinfoContext } from '@/context';
@@ -8,7 +8,50 @@ import { find } from 'lodash-es';
 import { defineStore } from 'pinia';
 import { STORE_NAME } from '../enum';
 
-const useUserStore = defineStore(
+export interface UserStore {
+  /** 用户信息 */
+  user: User
+
+  /** 用户组织名称 */
+  userOrgName: ComputedRef<string>
+
+  /** 是否登录 */
+  isLogin: ComputedRef<boolean>
+
+  /** 获取用户信息 */
+  getUserInfo: () => Promise<API.ResponseDataPubUserBo>
+
+  /** 获取用户权限码 */
+  getPermissions: () => Promise<string[]>
+
+  /** 登录 */
+  login: (data: {
+    account: string
+    password: string
+    captchas: string
+    captchaHash: string
+    loginType?: 'password' | string
+  }) => Promise<void>
+
+  /** 登出 */
+  logout: () => void
+
+  /** 修改密码 */
+  changeUserPassword: (form: API.putRbacUserChangePasswordParams & {
+    token?: string | string[]
+  }) => Promise<API.ResponseDataVoid>
+
+  /** 切换组织 */
+  changeOrg: (changeOrgId: string) => Promise<void>
+
+  /** 设置TOKEN */
+  setToken: (accessToken: string, refreshToken: string) => void
+
+  /** 清空用户信息 */
+  clean: () => void
+}
+
+const useUserStore = defineStore<STORE_NAME.USER, UserStore>(
   STORE_NAME.USER,
   () => {
     const { router } = usePubinfoContext();
@@ -65,7 +108,7 @@ const useUserStore = defineStore(
       password: string
       captchas: string
       captchaHash: string
-      loginType?: 'password'
+      loginType?: 'password' | string
     }) {
       const {
         account: loginName,
@@ -83,14 +126,13 @@ const useUserStore = defineStore(
         code,
       });
       const { accessToken, refreshToken } = result.data as Required<API.LoginTokenVo>;
-      await setToken(accessToken, refreshToken);
+      setToken(accessToken, refreshToken);
     }
 
     /**
      * 执行用户注销操作，并跳转到登录页面。
-     * @param _redirect - 注销后的重定向路径，默认为当前页面的完整路径。
      */
-    async function logout(_redirect = router?.currentRoute.value.fullPath) {
+    function logout() {
       router?.push({
         name: 'Login',
       });
@@ -123,6 +165,7 @@ const useUserStore = defineStore(
       if (userData.userOrgList?.length && !user.orgId) {
         user.orgId = find(userData.userOrgList, ['main', true])!.orgId!;
       }
+      return res;
     }
 
     /**
@@ -130,7 +173,7 @@ const useUserStore = defineStore(
      * @param form - 包含要修改的密码和令牌的表单数据
      * @returns 修改密码的结果
      */
-    async function changeUserPassword(form: API.putRbacUserChangePasswordParams & { token?: LocationQueryValue | LocationQueryValue[] }) {
+    async function changeUserPassword(form: API.putRbacUserChangePasswordParams & { token?: string | string[] }) {
       const headers = {} as AxiosRequestHeaders;
       if (form.token) {
         headers.authorization = form.token;
@@ -151,7 +194,7 @@ const useUserStore = defineStore(
      * @param accessToken 访问令牌
      * @param refreshToken 刷新令牌数据
      */
-    async function setToken(accessToken: string, refreshToken: string) {
+    function setToken(accessToken: string, refreshToken: string) {
       user.token = accessToken;
       user.refreshToken = refreshToken;
     }
@@ -173,33 +216,25 @@ const useUserStore = defineStore(
     async function changeOrg(changeOrgId: string) {
       const res = await postAuthChangeLoginOrg({ orgId: changeOrgId });
       const { accessToken, refreshToken } = res.data as Required<API.LoginTokenVo>;
-      await setToken(accessToken, refreshToken);
+      setToken(accessToken, refreshToken);
       user.orgId = changeOrgId;
       router?.push({
         path: '/',
       });
     }
 
-    async function phoneLogin(phone: string, verify: string) {
-      // message.success(`${phone}登录成功`);
-      // await setToken(accessToken, refreshTokenData);
-      // await getUserInfo();
-    }
-
     return {
       user,
+      userOrgName,
       isLogin,
+      getUserInfo,
+      getPermissions,
       login,
       logout,
-      phoneLogin,
-      getPermissions,
       changeUserPassword,
-      userOrgName,
       changeOrg,
       setToken,
-      getUserInfo,
       clean,
-      ...toRefs(user),
     };
   },
   {

package/src/stores/plugin/sideEffect/favoritesStorage.ts

@@ -13,7 +13,7 @@ import useUserStore from '../../modules/user';
 export function createFavoritesStoragePlugin({ store }: PiniaPluginContext) {
   if (store.$id === STORE_NAME.FAVORITES) {
     const favoritesStore = store as ReturnType<typeof useFavoritesStore>;
-    const favoritesId = computed(() => useUserStore().account);
+    const favoritesId = computed(() => useUserStore().user.account);
     const settingsStore = useSettingsStore();
 
     // list 变化时更新存储

package/src/stores/plugin/sideEffect/tabbarStorage.ts

@@ -14,7 +14,7 @@ import useUserStore from '../../modules/user';
 export function createTabbarStoragePlugin({ store }: PiniaPluginContext) {
   if (store.$id === STORE_NAME.TABBAR) {
     const tabbarStore = store as ReturnType<typeof useTabbarStore>;
-    const tabbarId = computed(() => useUserStore().account);
+    const tabbarId = computed(() => useUserStore().user.account);
     const settingsStore = useSettingsStore();
 
     // list 变化时更新存储

package/es/components/PubinfoProvider/index.d.ts

@@ -1,8 +0,0 @@
-interface PubinfoProviderProps {
-    loadIcon?: (name?: string) => any;
-}
-export declare const pubinfoInjectionKey: InjectionKey<PubinfoProviderProps>;
-export declare function createPubinfoProvider(props: PubinfoProviderProps): void;
-export declare function useProvider(): any;
-declare const _default: any;
-export default _default;

package/es/composables/auth.d.ts

@@ -1,8 +0,0 @@
-/**
- * 处理身份验证和权限检查的自定义钩子。
- * @returns 包含 auth 和 authAll 函数的对象。
- */
-export declare function useAuth(): {
-    auth: (value: string | string[]) => any;
-    authAll: (value: string[]) => boolean;
-};

package/es/interface.d.ts

@@ -1,29 +0,0 @@
-import { Pinia } from 'pinia';
-import { App } from 'vue';
-import { 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 Context {
-    app: App<Element>;
-    store: Pinia;
-    router: Router;
-}
-export interface Options {
-    rootContainer?: string | Element;
-    immediate?: boolean;
-    modules?: ModuleOptions[];
-    hooks?: Partial<Hooks>;
-}
-export interface Module {
-    name: string;
-    setup?: (ctx: Context) => void;
-    enforce?: 'pre' | 'post';
-    hooks?: Partial<Hooks>;
-}
-export type FalsyModule = false | null | undefined;
-export type ModuleOptions = Module | ModuleOptions[] | FalsyModule;
-export interface Hooks {
-}
-export {};