@pubinfo/core 2.0.0-beta.7 → 2.0.0-beta.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.8",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -23,22 +23,22 @@
     "types"
   ],
   "peerDependencies": {
-    "alova": "^3.2.6",
-    "pinia": "^2.3.0",
+    "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.7"
+    "@pubinfo/config": "2.0.0-beta.8"
   },
   "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",
@@ -85,7 +85,7 @@
     "vue": "^3.5.13",
     "vue-i18n": "^10.0.5",
     "vue-router": "^4.5.0",
-    "@pubinfo/config": "2.0.0-beta.7"
+    "@pubinfo/config": "2.0.0-beta.8"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

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();
 
@@ -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

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/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/route/routes.ts

@@ -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/modules/index.ts

@@ -6,8 +6,6 @@ export { default as useKeepAliveStore } from './keepAlive';
 export * from './keepAlive';
 export { default as useMenuStore } from './menu';
 export * from './menu';
-export { default as useNotificationStore } from './notification';
-export * from './notification';
 export { default as useRouteStore } from './route';
 export * from './route';
 export { default as useSettingsStore } from './settings';

package/dist/stores/modules/notification.d.ts

@@ -1,19 +0,0 @@
-import { STORE_NAME } from '../enum';
-declare const useNotificationStore: import('pinia').StoreDefinition<STORE_NAME.NOTIFICATION, Pick<{
-    message: any;
-    todo: any;
-    total: any;
-    init: () => void;
-}, any>, Pick<{
-    message: any;
-    todo: any;
-    total: any;
-    init: () => void;
-}, any>, Pick<{
-    message: any;
-    todo: any;
-    total: any;
-    init: () => void;
-}, any>>;
-export default useNotificationStore;
-export type NotificationStore = ReturnType<typeof useNotificationStore>;

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

@@ -1,152 +0,0 @@
-<script setup lang="ts">
-import { OverlayScrollbarsComponent } from 'overlayscrollbars-vue';
-import FluentMail16Filled from '~icons/fluent/mail-16-filled';
-import RiFileEditFill from '~icons/ri/file-edit-fill';
-import RiServiceFill from '~icons/ri/service-fill';
-import TablerMoodSmile from '~icons/tabler/mood-smile';
-
-defineOptions({
-  name: 'Notification',
-});
-
-const activeName = ref('message');
-</script>
-
-<template>
-  <div class="w-xs dark:bg-[var(--g-container-bg)]">
-    <template v-if="activeName === 'message'">
-      <OverlayScrollbarsComponent :options="{ scrollbars: { autoHide: 'leave', autoHideDelay: 300 } }" defer class="list max-h-300px dark:bg-[var(--g-container-bg)]">
-        <div class="item">
-          <div class="item-icon">
-            <FluentMail16Filled />
-          </div>
-
-          <div class="info">
-            <div class="title">
-              你收到了 8 份日报
-            </div>
-            <div class="date">
-              2020-10-10 10:00:00
-            </div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="item-icon service">
-            <RiServiceFill />
-          </div>
-          <div class="info">
-            <div class="title">
-              你收到了 3 位同事的好友申请，请及时处理
-            </div>
-            <div class="date">
-              2020-10-10 10:00:00
-            </div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="item-icon file-edit">
-            <RiFileEditFill />
-          </div>
-          <div class="info">
-            <div class="title">
-              你有 3 份合同待审批
-            </div>
-            <div class="date">
-              2020-10-10 10:00:00
-            </div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="item-icon">
-            <FluentMail16Filled />
-          </div>
-          <div class="info">
-            <div class="title">
-              你收到了 8 份日报
-            </div>
-            <div class="date">
-              2020-10-10 10:00:00
-            </div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="item-icon service">
-            <RiServiceFill />
-          </div>
-          <div class="info">
-            <div class="title">
-              你收到了 3 位同事的好友申请，请及时处理
-            </div>
-            <div class="date">
-              2020-10-10 10:00:00
-            </div>
-          </div>
-        </div>
-      </OverlayScrollbarsComponent>
-      <RouterLink v-slot="{ navigate }" :to="{ name: 'Notification' }" custom>
-        <div class="cursor-pointer py-4 text-center text-sm text-stone-5" @click="navigate">
-          进入消息列表
-        </div>
-      </RouterLink>
-    </template>
-    <template v-if="activeName === 'todo'">
-      <OverlayScrollbarsComponent :options="{ scrollbars: { autoHide: 'leave', autoHideDelay: 300 } }" defer class="list max-h-300px">
-        <div class="flex flex-col items-center py-6 text-stone-5">
-          <TablerMoodSmile text="40px" />
-          <p m-2 text-base>
-            没有新待办
-          </p>
-        </div>
-      </OverlayScrollbarsComponent>
-      <RouterLink v-slot="{ navigate }" :to="{ name: 'Notification' }" custom>
-        <div class="cursor-pointer py-4 text-center text-sm text-stone-5" @click="navigate">
-          进入待办列表
-        </div>
-      </RouterLink>
-    </template>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-:deep([data-overlayscrollbars-viewport]) {
-  overscroll-behavior: contain;
-}
-
-.list {
-  --at-apply: border-block-width-1 border-block-solid border-block-stone-2 dark:border-block-stone-7;
-
-  .item {
-    --at-apply: flex items-start gap-3 px-3 py-4 cursor-pointer border-b-width-1 last:border-b-width-0 border-b-solid border-b-stone-2 dark:border-b-stone-7 hover:bg-stone-1 dark:hover:bg-dark/50;
-
-    .item-icon {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      --at-apply: w-6 h-6 text-xs rounded-full text-white bg-blue;
-
-      &.service {
-        --at-apply: bg-green;
-      }
-
-      &.file-edit {
-        --at-apply: bg-orange;
-      }
-
-      &.bug {
-        --at-apply: bg-pink;
-      }
-    }
-
-    .info {
-      .title {
-        --at-apply: text-sm line-clamp-2;
-      }
-
-      .date {
-        --at-apply: mt-1 text-xs text-stone-5;
-      }
-    }
-  }
-}
-</style>

package/src/pages/personal/notification.vue

@@ -1,58 +0,0 @@
-<script setup lang="ts">
-import { PageHeader, PageMain, PubinfoIcon } from '@/components';
-import { useNotificationStore } from '@/stores';
-
-defineOptions({
-  name: 'PersonalNotification',
-});
-
-const notificationStore = useNotificationStore();
-
-function messagePlus() {
-  notificationStore.$patch((state) => {
-    state.message += 1;
-  });
-}
-function messageMinus() {
-  notificationStore.$patch((state) => {
-    state.message -= state.message > 0 ? 1 : 0;
-  });
-}
-
-function todoPlus() {
-  notificationStore.$patch((state) => {
-    state.todo += 1;
-  });
-}
-function todoMinus() {
-  notificationStore.$patch((state) => {
-    state.todo -= state.todo > 0 ? 1 : 0;
-  });
-}
-</script>
-
-<template>
-  <div>
-    <PageHeader title="通知中心" content="本页面仅模拟右上角通知数变化，具体业务逻辑请到 /src/store/modules/notification.ts 文件中编写" />
-    <PageMain title="消息">
-      <HButton @click="messagePlus">
-        <PubinfoIcon name="i-ep-plus" />
-        1
-      </HButton>
-      <HButton ml-2 @click="messageMinus">
-        <PubinfoIcon name="i-ep-minus" />
-        1
-      </HButton>
-    </PageMain>
-    <PageMain title="待办">
-      <HButton @click="todoPlus">
-        <PubinfoIcon name="i-ep-plus" />
-        1
-      </HButton>
-      <HButton ml-2 @click="todoMinus">
-        <PubinfoIcon name="i-ep-minus" />
-        1
-      </HButton>
-    </PageMain>
-  </div>
-</template>

package/src/stores/modules/notification.ts

@@ -1,35 +0,0 @@
-import { defineStore } from 'pinia';
-import { STORE_NAME } from '../enum';
-
-const useNotificationStore = defineStore(
-  // 唯一ID
-  STORE_NAME.NOTIFICATION,
-  () => {
-    const message = ref(0);
-    const todo = ref(0);
-    const total = computed(() => message.value + todo.value);
-
-    function init() {
-      getUnreadMessage();
-      getUnreadTodo();
-    }
-    function getUnreadMessage() {
-      // 为方便演示，这里直接写死的未读数
-      message.value = 9;
-    }
-    function getUnreadTodo() {
-      // 为方便演示，这里直接写死的未读数
-      todo.value = 0;
-    }
-
-    return {
-      message,
-      todo,
-      total,
-      init,
-    };
-  },
-);
-
-export default useNotificationStore;
-export type NotificationStore = ReturnType<typeof useNotificationStore>;