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

package/dist/utils/index.d.ts

@@ -1,14 +1,5 @@
-import { Primitive } from 'type-fest';
-type ConditionalExceptType<T extends Record<PropertyKey, any>, Type> = {
-    [P in keyof T]: Exclude<T[P], Type>;
-};
-export declare function resolveRoutePath(basePath?: string, routePath?: string): string;
-export declare function normalizePrimitiveToFunction<T extends Record<PropertyKey, any>>(options: T): ConditionalExceptType<T, Primitive>;
-export declare function objectToPaths(obj: Record<string, any>, prefix?: string): string[];
 export * from './cleanup';
-export * from './crypto';
-export { default as eventBus } from './eventBus';
-export * from './injectionKeys';
-export { default as storage } from './storage';
-export * from './utils';
-export { default as watermark } from './watermark';
+export * from './path';
+export * from './proxy';
+export * from './storage';
+export { createContext } from 'unctx';

package/dist/utils/path.d.ts

@@ -0,0 +1 @@
+export declare function resolveRoutePath(basePath?: string, routePath?: string): string;

package/dist/utils/proxy.d.ts

@@ -0,0 +1 @@
+export declare function wrapProxy<T extends Record<K, any>, K extends keyof T>(fn: () => T, key: K): T[K];

package/dist/utils/storage.d.ts

@@ -1,4 +1,4 @@
-declare const storage: {
+export declare const storage: {
     local: {
         has: (key: string) => boolean;
         get: (key: string) => string | null;
@@ -18,4 +18,3 @@ declare const storage: {
         setItem: (key: string, value: string) => void;
     };
 };
-export default storage;

package/package.json

@@ -1,18 +1,14 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.0.0-beta.9",
+  "version": "2.0.0-rc.1",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./request": {
-      "types": "./dist/api/index.d.ts",
-      "default": "./dist/request.js"
-    },
     "./style.css": "./dist/style.css",
-    "./types": "./types/index.d.ts"
+    "./types": "./dist/index.d.ts"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -23,45 +19,47 @@
     "types"
   ],
   "peerDependencies": {
-    "alova": "^3.2.9",
-    "pinia": "^2.3.1",
-    "vue": "^3.5.13",
-    "vue-i18n": "^10.0.5",
-    "vue-router": "^4.5.0",
-    "@pubinfo/config": "2.0.0-beta.9"
+    "alova": "^3.3.4",
+    "pinia": "^3.0.3",
+    "vue": "^3.5.17",
+    "vue-i18n": "^10.0.7",
+    "vue-router": "^4.5.1",
+    "@pubinfo/config": "2.0.0-rc.1",
+    "@pubinfo/vite": "2.0.0-rc.1"
   },
   "dependencies": {
-    "@alova/adapter-axios": "^2.0.13",
+    "@alova/adapter-axios": "^2.0.16",
     "@ant-design/icons-vue": "^7.0.1",
     "@headlessui/vue": "^1.7.23",
-    "@imengyu/vue3-context-menu": "^1.4.4",
-    "@pubinfo/pro-components": "^1.7.0",
-    "@unocss/reset": "^65.5.0",
-    "@vueuse/core": "^12.7.0",
-    "@vueuse/integrations": "^12.8.2",
+    "@imengyu/vue3-context-menu": "^1.5.1",
+    "@pubinfo/pro-components": "^1.7.1",
+    "@unocss/reset": "^66.4.2",
+    "@vueuse/core": "^13.5.0",
+    "@vueuse/integrations": "^13.5.0",
     "ant-design-vue": "^4.2.6",
-    "axios": "^1.8.1",
-    "consola": "^3.4.0",
+    "axios": "^1.10.0",
+    "consola": "^3.4.2",
     "floating-vue": "5.2.2",
     "hookable": "^5.5.3",
-    "hotkeys-js": "^3.13.9",
+    "hotkeys-js": "^3.13.14",
     "jsencrypt": "^3.3.2",
     "lodash-es": "^4.17.21",
     "md5": "^2.3.0",
     "mitt": "^3.0.1",
     "nprogress": "^0.2.0",
-    "overlayscrollbars": "^2.11.1",
+    "overlayscrollbars": "^2.11.4",
     "overlayscrollbars-vue": "^0.5.9",
     "path-browserify": "^1.0.1",
-    "path-to-regexp": "^6.3.0",
-    "pinia-plugin-persistedstate": "^3.2.3",
+    "path-to-regexp": "^8.2.0",
+    "pinia-plugin-persistedstate": "^4.4.1",
     "sortablejs": "^1.15.6",
+    "unctx": "^2.4.1",
     "vue-m-message": "^4.0.2",
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@iconify/json": "^2.2.312",
-    "@iconify/vue": "^4.3.0",
+    "@iconify/json": "^2.2.354",
+    "@iconify/vue": "^5.0.0",
     "@pubinfo/openapi": "^0.8.4",
     "@pubinfo/preset-openapi": "^0.8.4",
     "@types/lodash-es": "^4.17.12",
@@ -70,25 +68,25 @@
     "@types/path-browserify": "^1.0.3",
     "@types/sortablejs": "^1.15.8",
     "@types/zxcvbn": "^4.4.5",
-    "@vitejs/plugin-vue": "^5.2.1",
-    "@vitejs/plugin-vue-jsx": "^4.1.1",
-    "alova": "^3.2.9",
-    "pinia": "^2.3.1",
-    "sass": "1.77.8",
-    "type-fest": "^4.36.0",
-    "unocss": "^65.5.0",
-    "unplugin-auto-import": "^0.18.6",
-    "unplugin-icons": "^0.22.0",
-    "unplugin-vue-components": "^0.27.5",
-    "vite": "^6.2.0",
-    "vite-plugin-dts": "^4.5.3",
-    "vue": "^3.5.13",
-    "vue-i18n": "^10.0.5",
-    "vue-router": "^4.5.0",
-    "@pubinfo/config": "2.0.0-beta.9"
+    "@vitejs/plugin-vue": "^6.0.0",
+    "@vitejs/plugin-vue-jsx": "^5.0.1",
+    "alova": "^3.3.4",
+    "pinia": "^3.0.3",
+    "type-fest": "^4.41.0",
+    "unocss": "^66.4.2",
+    "unplugin-auto-import": "^20.0.0",
+    "unplugin-icons": "^22.2.0",
+    "unplugin-vue-components": "^29.0.0",
+    "vite": "^7.1.2",
+    "vite-plugin-dts": "^4.5.4",
+    "vue": "^3.5.17",
+    "vue-i18n": "^10.0.7",
+    "vue-router": "^4.5.1",
+    "@pubinfo/config": "2.0.0-rc.1",
+    "@pubinfo/vite": "2.0.0-rc.1"
   },
   "scripts": {
-    "dev": "vite build -w -m watch",
+    "dev": "vite build -w -m watch --sourcemap",
     "build": "vite build",
     "openapi": "pnpx @pubinfo/openapi generate"
   }

package/src/built-in/authentication/helper.ts

@@ -0,0 +1,55 @@
+import type { axiosRequestAdapter } from '@alova/adapter-axios';
+import type VueHook from 'alova/vue';
+import type { AxiosResponse } from 'axios';
+import type { RequestResult } from './interface';
+import { createServerTokenAuthentication } from 'alova/client';
+import { postAuthTokenRefresh } from '@/features/api/modules/auth';
+import { useUserStore } from '@/features/stores';
+import { RESPONSE_CODE } from './enum';
+
+export function createTokenAuthentication() {
+  return createServerTokenAuthentication<typeof VueHook, typeof axiosRequestAdapter>({
+    /**
+     * 给权限接口添加Authorization
+     */
+    assignToken: (method) => {
+      const userStore = useUserStore();
+
+      // 根据用户登录状态，可能设置请求头中的令牌。
+      if (userStore.isLogin) {
+        method.config.headers.Authorization = userStore.user.token;
+      }
+    },
+
+    /**
+     * 鉴权处理
+     */
+    refreshTokenOnSuccess: {
+      /**
+       * 检测token是否过期
+       * @returns 是否token过期
+       */
+      isExpired: (response: AxiosResponse<RequestResult>) => {
+        // 检查提供的代码是否表示过期的访问令牌。
+        return response.data.code === RESPONSE_CODE.ACCESS_TOKEN_INVALID;
+      },
+
+      /**
+       * 当token过期时触发，在此函数中触发刷新token
+       */
+      handler: async () => {
+        const userStore = useUserStore();
+
+        // 刷新token
+        const res = await postAuthTokenRefresh(
+          { refreshToken: userStore.user.refreshToken },
+          { meta: { authRole: 'refreshToken' } },
+        );
+        const { accessToken, refreshToken } = res.data as Required<API.LoginTokenVo>;
+
+        // 设置访问令牌和刷新令牌到本地存储和用户存储中。
+        userStore.setToken(accessToken, refreshToken);
+      },
+    },
+  });
+}

package/src/built-in/authentication/index.ts

@@ -0,0 +1,42 @@
+import type { ModuleOptions } from '@/core';
+// import { createTokenAuthentication } from './helper';
+import { createRouterGuard } from './router';
+
+/**
+ * 身份认证 (用户级拦截)
+ *
+ * 双 token 校验，确认用户身份，注册修改密码和切换组织页面
+ */
+export function Authentication(): ModuleOptions {
+  // TODO 以 hooks 的形式注册 alova 的 Token 认证拦截器，
+  // Token 过期时的请求，在刷新完 Token 后虽然会重新请求，但是过期请求还是会继续抛出错误。
+  // 若是用如下形式注册，则没有问题：
+  // const alova = createAlova({
+  //   beforeRequest: onAuthRequired(method => {
+  //   }),
+  //   responded: onResponseRefreshToken({
+  //     onSuccess(response, method) {
+  //     },
+  //     onError(error, method) {
+  //     },
+  //   })
+  // });
+
+  // const { onAuthRequired, onResponseRefreshToken } = createTokenAuthentication();
+
+  return {
+    name: 'built-in:authentication',
+    setup(ctx) {
+      const { router } = ctx;
+      createRouterGuard(router);
+    },
+    // hooks: {
+    //   'http:request': onAuthRequired(),
+    //   'http:response': onResponseRefreshToken(),
+    // },
+  };
+}
+
+export { RESPONSE_CODE } from './enum';
+export { createTokenAuthentication } from './helper';
+export * from './interface';

package/src/built-in/authentication/interface.ts

@@ -0,0 +1,7 @@
+export interface RequestResult<T = any> {
+  code: number
+  msg: string
+  hint: string
+  data: T
+  success: boolean
+}

package/src/{pages/system → built-in/authentication/pages}/change-organization/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { PubinfoIcon } from '@/components';
-import { useUserStore } from '@/stores';
 import { message } from 'ant-design-vue';
+import { PubinfoIcon } from '@/features/components';
+import { useUserStore } from '@/features/stores';
 
 defineOptions({
   name: 'ChangeOrganization',
@@ -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 {
@@ -72,7 +72,7 @@ async function changeOrganization() {
         <div v-for="(item, index) in orgList" :key="index" @click="setActive(index)">
           <div class="org-item" :class="{ active: index === activeIndex }">
             <div flex="~" h-full>
-              <PubinfoIcon name="change-org" size="48px" />
+              <img src="./assets/change-org.svg" class="size-[48px]" alt="">
               <div
                 flex="~ col"
                 h-full
@@ -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">
@@ -125,50 +125,36 @@ async function changeOrganization() {
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .change-org {
-  width: 100%;
-  height: 100%;
-  background: url("@/assets/images/login-small.png") no-repeat 50%;
+  --at-apply: size-full;
+  background: url("./assets/login-small.png") no-repeat 50%;
   background-size: cover;
+}
 
-  .org-item {
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    width: 100%;
-    height: 91px;
-    padding: 22px 32px;
-    margin-bottom: 15px;
-    overflow: hidden;
-    color: #86909c;
-    cursor: pointer;
-    background: #fff;
-    border: 1px solid #f2f3f5;
-    border-radius: 8px;
+.change-org .org-item {
+  --at-apply: box-border flex items-center justify-between w-full h-[91px]
+  overflow-hidden text-[#86909c] cursor-pointer border mb-[15px] px-8
+  py-[22px] rounded-lg border-solid border-[#f2f3f5];
+  background: #fff;
+}
 
-    &.active {
-      background-color: rgb(22 119 255 / 10%);
-      border-color: #1677ff;
-    }
-  }
+.change-org .org-item.active {
+  --at-apply: bg-[#1677FF] bg-op-10 border-[#1677ff];
 }
 
-[data-theme="dark"] {
-  .change-org {
-    background: url("@/assets/images/login-small_dark.webp") no-repeat 50%;
-    background-size: cover;
-  }
+[data-theme="dark"] .change-org {
+  background: url("./assets/login-small_dark.webp") no-repeat 50%;
+  background-size: cover;
+}
 
-  .org-item {
-    background: #2c2c2c;
-    border: 1px solid #2c2c2c;
+[data-theme="dark"] .org-item {
+  background: #2c2c2c;
+  border: 1px solid #2c2c2c;
+}
 
-    &.active {
-      background: rgb(20 20 20 / 60%);
-      border-color: #1668dc;
-    }
-  }
+[data-theme="dark"] .org-item.active {
+  background: rgb(20 20 20 / 60%);
+  border-color: #1668dc;
 }
 </style>

package/src/{pages/system → built-in/authentication/pages}/change-password/components/ChangePasswordForm/index.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import type { FormInstance, Rule } from 'ant-design-vue/es/form';
 import type { RouteParamValue } from 'vue-router';
-import { useUserStore } from '@/stores';
 import { message } from 'ant-design-vue';
 import { delay } from 'lodash-es';
+import { useUserStore } from '@/features/stores';
 
 defineOptions({
   name: 'ChangePasswordForm',

package/src/{pages/system → built-in/authentication/pages}/change-password/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { PassStrengthValidator, PubinfoIcon } from '@/components';
+import { PassStrengthValidator } from '@/features/components';
 import ChangePasswordForm from './components/ChangePasswordForm/index.vue';
 
 defineOptions({
@@ -45,11 +45,7 @@ const isValidate = ref(false);
               rounded="50%"
               mb-15px
             >
-              <PubinfoIcon
-                name="mima"
-                color="transparent"
-                :size="88"
-              />
+              <img src="./assets/mima.svg" class="size-[88px]" alt="">
             </div>
             <span text="18px" font="bold">
               更改密码
@@ -62,41 +58,28 @@ const isValidate = ref(false);
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .password-bg {
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  padding: 25px;
-  background: url("@/assets/images/login-small.png") no-repeat 50%;
+  --at-apply: box-border flex flex-col size-full p-[25px];
+  background: url("./assets/login-small.png") no-repeat 50%;
   background-size: cover;
+}
+
+.change-password-form {
+  --at-apply: flex flex-col w-[560px] min-h-[680px] overflow-hidden backdrop-blur-[7.5px]
+  pt-16 pb-[34px] px-20 rounded-lg border-2 border-solid border-white;
 
-  .change-password-form {
-    display: flex;
-    flex-direction: column;
-    width: 560px;
-    min-height: 680px;
-    padding: 64px 80px 34px;
-    overflow: hidden;
-    background: linear-gradient(180deg, hsl(0deg 0% 100% / 90%), hsl(0deg 0% 100% / 75%));
-    backdrop-filter: blur(7.5px);
-    border: 2px solid #fff;
-    border-radius: 8px;
-    box-shadow: 0 20px 50px rgb(29 42 165 / 5%);
-  }
+  box-shadow: 0 20px 50px rgb(29 42 165 / 5%);
+  background: linear-gradient(180deg, hsl(0deg 0% 100% / 90%), hsl(0deg 0% 100% / 75%));
 }
 
-[data-theme="dark"] {
-  .password-bg {
-    background: url("@/assets/images/login-small_dark.webp") no-repeat 50%;
-    background-size: cover;
-  }
+:deep([data-theme="dark"]) .password-bg {
+  background: url("./assets/login-small_dark.webp") no-repeat 50%;
+  background-size: cover;
+}
 
-  .change-password-form {
-    background: #0f1e3b;
-    border-color: #0f1e3b;
-  }
+:deep([data-theme="dark"]) .change-password-form {
+  background: #0f1e3b;
+  border-color: #0f1e3b;
 }
 </style>

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

@@ -0,0 +1,57 @@
+import type { Router, RouteRecordRaw } from 'vue-router';
+import { isUndefined } from 'lodash-es';
+import { useUserStore } from '@/features';
+
+const routes: RouteRecordRaw[] = [
+  {
+    path: '/change-password/:changePassWordToken',
+    name: 'ChangePassword',
+    component: () => import('./pages/change-password/index.vue'),
+    // 特殊处理changelog-password路由，不允许直接访问
+    // 其实应该移入到鉴权组路由,但是会导致需要频繁挂载销毁路由
+    beforeEnter: (to) => {
+      if (isUndefined(to.params.changePassWordToken)) {
+        return { name: 'Login' };
+      }
+      return true;
+    },
+    meta: {
+      whiteList: true,
+      title: '修改密码',
+    },
+  },
+  {
+    path: '/change-organization/:orgId',
+    name: 'ChangeOrganization',
+    component: () => import('./pages/change-organization/index.vue'),
+    beforeEnter: (to) => {
+      const userStore = useUserStore();
+      if (isUndefined(to.params.orgId) || to.params.orgId !== userStore.user.orgId) {
+        return { name: 'Login' };
+      }
+      return true;
+    },
+    meta: {
+      whiteList: true,
+      title: '切换组织',
+    },
+  },
+];
+
+export function createRouterGuard(router: Router) {
+  let isRouteAdded = false;
+
+  router.beforeEach((to) => {
+    if (!isRouteAdded) {
+      routes.forEach((route) => {
+        if (!router.hasRoute(route.name!)) {
+          router.addRoute(route);
+        }
+      });
+
+      isRouteAdded = true;
+
+      return { ...to, replace: true };
+    }
+  });
+}

package/src/{directives/plugins/permission.ts → built-in/authorization/directives.ts}

@@ -1,13 +1,11 @@
 import type { App } from 'vue';
+import { useAuth } from '@/features/composables';
 
-/**
- * 设置权限指令
- * @param app 应用程序实例
- */
-export function setupPermissionDirective(app: App) {
+export function setupDirectives(app: App) {
   app.directive('auth', {
     mounted: (el, binding) => {
-      if (!useAuth().auth(binding.value)) {
+      const { auth } = useAuth();
+      if (!auth(binding.value)) {
         el.remove();
       }
     },
@@ -15,7 +13,8 @@ export function setupPermissionDirective(app: App) {
 
   app.directive('auth-all', {
     mounted: (el, binding) => {
-      if (!useAuth().authAll(binding.value)) {
+      const { authAll } = useAuth();
+      if (!authAll(binding.value)) {
         el.remove();
       }
     },

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

@@ -0,0 +1,11 @@
+import type { RequestMethod } from '@/core';
+import { useSettingsStore } from '@/features/stores';
+
+/**
+ * 数据权限标识
+ * @param method 请求方法
+ */
+export function maybeSetAuthData(method: RequestMethod) {
+  const settingsStore = useSettingsStore();
+  method.config.headers['X-ResourceMark'] = method.config.headers['X-ResourceMark'] || settingsStore.auth;
+}

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

@@ -0,0 +1,25 @@
+import type { ModuleOptions } from '@/core';
+import { setupDirectives } from './directives';
+import { maybeSetAuthData } from './helper';
+import { setupRouterGuard } from './router';
+
+/**
+ * 权限授权 (资源级拦截)
+ *
+ * 用户是否有访问某个页面/按钮的权限
+ */
+export function Authorization(): ModuleOptions {
+  return {
+    name: 'built-in:authorization',
+    setup(ctx) {
+      const { app, router } = ctx;
+      setupDirectives(app);
+      setupRouterGuard(router);
+    },
+    hooks: {
+      'http:request': (method) => {
+        maybeSetAuthData(method);
+      },
+    },
+  };
+}

package/src/{pages/system → built-in/authorization/pages}/not-permission/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useUserStore } from '@/stores';
+import { useUserStore } from '@/features/stores';
 
 defineOptions({
   name: 'NotPermission',
@@ -31,11 +31,9 @@ onMounted(() => {
   }, 1000);
 });
 
-async function goBack() {
-  await userStore.logout();
-  router.push({
-    name: 'login',
-  });
+function goBack() {
+  userStore.logout();
+  router.push('/login');
 }
 </script>
 
@@ -58,16 +56,14 @@ async function goBack() {
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .noPermissionIcon {
-  background: url("@/assets/icons/403.svg") no-repeat;
+  background: url("./403.svg") no-repeat;
   background-size: 100% 100%;
 }
 
-[data-theme="dark"] {
-  .noPermissionIcon {
-    background: url("@/assets/icons/403_dark.svg") no-repeat;
-    background-size: 100% 100%;
-  }
+[data-theme="dark"] .noPermissionIcon {
+  background: url("./403_dark.svg") no-repeat;
+  background-size: 100% 100%;
 }
 </style>