@pubinfo/core 2.0.0-beta.2 → 2.0.0-beta.21

package/package.json

@@ -1,50 +1,44 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.21",
   "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"
+      "types": "./dist/api/index.d.ts",
+      "default": "./dist/request.js"
     },
-    "./style.css": {
-      "import": "./es/style.css",
-      "require": "./lib/style.css"
-    },
-    "./types": "./types/index.d.ts"
+    "./style.css": "./dist/style.css",
+    "./types": "./dist/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.10",
+    "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.2"
+    "@pubinfo/config": "2.0.0-beta.21"
   },
   "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/core": "^13.0.0",
+    "@vueuse/integrations": "^13.0.0",
     "ant-design-vue": "^4.2.6",
     "axios": "^1.8.1",
     "consola": "^3.4.0",
@@ -78,9 +72,9 @@
     "@types/zxcvbn": "^4.4.5",
     "@vitejs/plugin-vue": "^5.2.1",
     "@vitejs/plugin-vue-jsx": "^4.1.1",
-    "alova": "^3.2.9",
+    "alova": "^3.2.10",
     "pinia": "^2.3.1",
-    "sass": "1.77.8",
+    "sass": "1.83.0",
     "type-fest": "^4.36.0",
     "unocss": "^65.5.0",
     "unplugin-auto-import": "^0.18.6",
@@ -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.2"
+    "@pubinfo/config": "2.0.0-beta.21"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

package/src/api/index.ts

@@ -14,6 +14,8 @@ import {
   ReSetTokenAndRefreshToken,
 } from './helper';
 
+export { RESPONSE_CODE } from './enum/code';
+
 export function createTokenAuthentication() {
   return createServerTokenAuthentication<typeof VueHook, typeof axiosRequestAdapter>({
     /**
@@ -72,4 +74,4 @@ export function createRequest(options: RequestOptions) {
   return instance;
 }
 
-export { RESPONSE_CODE } from './enum/code';
+export * from './interface';

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/context.ts

@@ -1,7 +1,6 @@
 import type { Context } from './interface';
 import { createHooks } from 'hookable';
 import { auth, basic } from 'pubinfo:project/api/request';
-import layout from 'pubinfo:project/layouts/index.vue';
 
 export const hooks = createHooks();
 
@@ -24,7 +23,7 @@ export function usePubinfoContext() {
  */
 export function readProject() {
   return {
-    layout,
+    layout: () => import('pubinfo:project/layouts/index.vue'),
     request: { auth, basic },
   };
 }

package/src/index.ts

@@ -1,4 +1,5 @@
 import './assets/styles';
+import '../types/index.d.ts';
 
 export * from './components';
 export * from './composables';

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/Header/TopMode/index.vue

@@ -31,8 +31,6 @@ const menuRef = ref<HTMLElement | null>();
 const { width } = useElementSize(menuRef);
 const menuHideIndex = ref(0);
 
-watchMenuItem();
-
 const moreApple = computed(() => {
   return menuHideIndex.value === menuStore.allMenus.length - 1;
 });
@@ -42,19 +40,6 @@ function moreApplyClick(index: number, item: Menu.recordMainRaw) {
   switchTo(menuIndex, item);
 }
 
-function watchMenuItem() {
-  onMounted(() => {
-    watch(
-      width,
-      () => {
-        menuHideIndex.value = fitMenus();
-      },
-      {
-        immediate: true,
-      });
-  });
-}
-
 // 计算顶部菜单宽度
 function fitMenus() {
   const containerRoot = menuRef.value!;
@@ -89,6 +74,17 @@ function fitMenus() {
 
   return restrictedIndex;
 }
+
+onMounted(() => {
+  watch(
+    width,
+    () => {
+      menuHideIndex.value = fitMenus();
+    },
+    {
+      immediate: true,
+    });
+});
 </script>
 
 <template>
@@ -99,7 +95,7 @@ function fitMenus() {
         [`menu-active-${settingsStore.settings.menu.menuActiveStyle}`]: settingsStore.settings.menu.menuActiveStyle !== '',
       }"
     >
-      <template v-for="(item, index) in menuStore.allMenus" :key="index">
+      <template v-for="(item, index) in menuStore.allMenus" :key="item?.meta?.title || index">
         <div
           class="menu-item relative transition-all"
           invisible

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

@@ -37,6 +37,8 @@ const [open, setOpen] = useToggle(false);
 </template>
 
 <style lang="scss" scoped>
+@use "sass:color";
+
 .app-setting-warp {
   position: relative;
   position: fixed;
@@ -92,7 +94,7 @@ const [open, setOpen] = useToggle(false);
   .divider {
     width: 10px;
     height: 1px;
-    background-color: darken($color: #fff, $amount: 30%);
+    background-color: color.scale($color: #fff, $lightness: -30%)
   }
 
   .icon {

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();
 
@@ -43,6 +39,7 @@ const userMenu = computed(() => [
   [
     {
       label: generateI18nTitle('route.home', settingsStore.settings.home.title),
+      icon: 'i-ant-design:home-twotone',
       handle: () => router.push({ name: 'Home' }),
       hide: !settingsStore.settings.home.enable,
     },
@@ -67,9 +64,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 +130,7 @@ function toggleColorScheme(event: MouseEvent) {
 
 const avatarError = ref(false);
 
-watch(() => userStore.avatar, () => {
+watch(() => userStore.user.avatar, () => {
   if (avatarError.value) {
     avatarError.value = false;
   }
@@ -175,20 +172,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 +194,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 +206,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/index.ts

@@ -7,6 +7,5 @@ export function setupRouterGuard({ router }: { router: Router }) {
   createSettingGuard(router);
 }
 
-export * from './async';
 export * from './guard';
 export * from './routes';

package/src/route/routes.ts

@@ -1,9 +1,75 @@
-// 内置路由
+import type { Route } from '#/vue-router';
 import type { RouteRecordRaw } from 'vue-router';
 import { readProject } from '@/context';
 import { useSettingsStore, useUserStore } from '@/stores';
 import { isUndefined } from 'lodash-es';
 
+let asyncRoutes: Route.recordMainRaw[] = [];
+
+/**
+ * 定义并注册动态路由
+ */
+export function defineAsyncRoutes(routes: Route.recordMainRaw[]) {
+  asyncRoutes = [...asyncRoutes, ...routes];
+  return routes;
+}
+
+/**
+ * 读取注册的动态路由
+ */
+export function getAsyncRoutes() {
+  return asyncRoutes;
+}
+
+const systemRoutes: RouteRecordRaw[] = [
+  {
+    path: '/',
+    component: readProject().layout,
+    meta: {
+      title: () => useSettingsStore().settings.home.title,
+      breadcrumb: false,
+    },
+    children: [
+      {
+        path: 'reload',
+        name: 'Reload',
+        component: () => import('@/pages/system/reload.vue'),
+        meta: {
+          title: '重新加载',
+          breadcrumb: false,
+        },
+      },
+      {
+        path: 'personal/profile',
+        name: 'Profile',
+        component: () => import('@/pages/personal/profile/index.vue'),
+        meta: {
+          title: '个人中心',
+          i18n: 'route.personal.profile',
+          icon: 'i-iconamoon-profile-duotone',
+        },
+      },
+    ],
+  },
+];
+
+/**
+ * 定义并注册系统路由（含Layout）
+ */
+export function defineSystemRoutes(routes: RouteRecordRaw[]) {
+  systemRoutes[0].children = [...(systemRoutes?.[0]?.children ?? []), ...routes];
+}
+
+/**
+ * 读取注册的系统路由
+ */
+export function getSystemRoutes() {
+  return systemRoutes;
+}
+
+/**
+ * 内置静态路由
+ */
 export const constantRoutes: RouteRecordRaw[] = [
   {
     path: '/change-password/:changePassWordToken',
@@ -27,8 +93,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;
@@ -56,55 +122,3 @@ export const constantRoutes: RouteRecordRaw[] = [
     },
   },
 ];
-
-export const systemRoutes: RouteRecordRaw[] = [
-  {
-    path: '/',
-    component: readProject().layout,
-    meta: {
-      title: () => useSettingsStore().settings.home.title,
-      breadcrumb: false,
-    },
-    children: [
-      {
-        path: '',
-        name: 'Home',
-        component: () => import('@/pages/system/index.vue'),
-        meta: {
-          title: () => useSettingsStore().settings.home.title,
-          i18n: 'route.home',
-          icon: 'i-ant-design:home-twotone',
-          breadcrumb: false,
-        },
-      },
-      {
-        path: 'reload',
-        name: 'Reload',
-        component: () => import('@/pages/system/reload.vue'),
-        meta: {
-          title: '重新加载',
-          breadcrumb: false,
-        },
-      },
-      {
-        path: 'personal/profile',
-        name: 'Profile',
-        component: () => import('@/pages/personal/profile/index.vue'),
-        meta: {
-          title: '个人中心',
-          i18n: 'route.personal.profile',
-          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>;