From d6fc5396395fd519cdfbc4483f8de79b3d056cf3 Mon Sep 17 00:00:00 2001
From: Litrix <wbpstn@163.com>
Date: Mon, 13 Jan 2025 09:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E7=8E=B0=E5=9C=A8=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/club/ClubList.vue     |  2 ++
 src/components/game2048/Game2048.vue | 21 +-------------------
 src/router/index.ts                  | 29 ++++++++++++++--------------
 src/stores/user.ts                   | 12 +++++++++---
 src/utils/async-queue.ts             |  2 +-
 src/utils/future.ts                  | 18 +++++++++++++++++
 src/utils/types.d.ts                 |  2 --
 src/views/MainPage.vue               | 16 ++++++++-------
 src/views/club/ClubListPage.vue      |  5 ++++-
 9 files changed, 59 insertions(+), 48 deletions(-)
 create mode 100644 src/utils/future.ts

diff --git a/src/components/club/ClubList.vue b/src/components/club/ClubList.vue
index f42bbdc..bba6d1c 100644
--- a/src/components/club/ClubList.vue
+++ b/src/components/club/ClubList.vue
@@ -5,6 +5,7 @@
     :hide-pager="brief"
     :num="10"
     :handle-request="getClubList"
+    @load-complete="$emit('loadComplete')"
   >
     <template #default="{ data }">
       <div class="flex gap-10px">
@@ -34,5 +35,6 @@ const { click = false, brief = false } = defineProps<{
 }>();
 defineEmits<{
   click: [club: Club];
+  loadComplete: [];
 }>();
 </script>
diff --git a/src/components/game2048/Game2048.vue b/src/components/game2048/Game2048.vue
index 86db125..687a825 100644
--- a/src/components/game2048/Game2048.vue
+++ b/src/components/game2048/Game2048.vue
@@ -189,30 +189,11 @@
   animation: tile-common-appear 0.2s ease both;
 }
 </style>
-<script lang="ts">
-class FutureMap<T = void> extends Map<number, Future<T>> {
-  add(tileId: number) {
-    const future = Promise.withResolvers<T>();
-    this.set(tileId, future);
-    return future.promise;
-  }
-
-  resolve(tileId: number, value: T) {
-    this.get(tileId)?.resolve(value);
-    this.delete(tileId);
-  }
-
-  reject(tileId: number, reason: unknown) {
-    this.get(tileId)?.reject(reason);
-    this.delete(tileId);
-  }
-}
-</script>
 <script lang="ts" setup>
 import { useGame2048Store, type GameState, type Tile } from '@/stores/2048';
 import { chainIterables } from '@/utils';
 import { get2DArrayItem } from '@/utils/array';
-import type { Future } from '@/utils/types';
+import { type Future, FutureMap } from '@/utils/future';
 import { Directions } from '@/views/Game2048Page.vue';
 import { useEventListener } from '@vueuse/core';
 import { ElNotification } from 'element-plus';
diff --git a/src/router/index.ts b/src/router/index.ts
index ae43935..40958a9 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -22,8 +22,12 @@ declare module 'vue-router' {
   interface RouteMeta {
     routeId?: number;
     shouldLogin?: boolean;
-    userPermission?: RoutePermission<UserPermissionId>;
-    clubPermission?: RoutePermission<ClubPermissionId>;
+    permission?:
+      | {
+          user?: RoutePermission<UserPermissionId>;
+          club?: RoutePermission<ClubPermissionId>;
+        }
+      | ((userStore: ReturnType<typeof useUserStore>) => boolean);
     breadcrumb?: string;
   }
 }
@@ -81,7 +85,7 @@ const routes: RouteRecordRaw[] = [
     name: 'ClubInfo',
     component: () => import('@/views/club/ClubInfoPage.vue'),
     meta: {
-      clubPermission: ClubPermissionId.CLUB_PAGE,
+      permission: { club: ClubPermissionId.CLUB_PAGE },
     },
   },
   {
@@ -128,7 +132,7 @@ const routes: RouteRecordRaw[] = [
         name: 'ManageUser',
         component: () => import('@/views/manage/ManageUserPage.vue'),
         meta: {
-          userPermission: UserPermissionId.MANAGE_USER,
+          permission: { user: UserPermissionId.MANAGE_USER },
           breadcrumb: '用户管理',
         },
       },
@@ -162,9 +166,7 @@ const routes: RouteRecordRaw[] = [
           },
         ],
         meta: {
-          userPermission: {
-            id: UserPermissionId.MANAGE_PAGE,
-          },
+          permission: { user: UserPermissionId.MANAGE_PAGE },
           breadcrumb: '社团管理',
         },
       },
@@ -172,9 +174,11 @@ const routes: RouteRecordRaw[] = [
     redirect: { name: 'ManageMain' },
     meta: {
       breadcrumb: '系统首页',
-      userPermission: {
-        id: [UserPermissionId.MANAGE_PAGE, UserPermissionId.MANAGE_USER],
-        relation: 'OR',
+      permission: {
+        user: {
+          id: [UserPermissionId.MANAGE_PAGE, UserPermissionId.MANAGE_USER],
+          relation: 'OR',
+        },
       },
     },
   },
@@ -201,11 +205,7 @@ router.beforeEach(async (to) => {
   pageStore.setNewRouteId(to);
   if (!userStore.userInfo) {
     const succeed = await userStore.updateSelfUserInfo();
-    const { userPermission, clubPermission } = to.meta;
     if (!succeed) {
-      if (userPermission === undefined && clubPermission === undefined) {
-        return true;
-      }
       return pageStore.createTempErrorRoute(
         {
           type: PageErrorType.NETWORK_ERROR,
@@ -214,6 +214,7 @@ router.beforeEach(async (to) => {
       );
     }
   }
+
   const type = userStore.isRouteAccessible(to.fullPath);
   if (type !== true) {
     return pageStore.createTempErrorRoute({ type }, to);
diff --git a/src/stores/user.ts b/src/stores/user.ts
index e4d043e..ffcf3f9 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -12,6 +12,7 @@ import { computed, ref, watch } from 'vue';
 import type { RouteLocationAsRelativeGeneric, RouteMeta } from 'vue-router';
 import { z } from 'zod';
 import { PageErrorType } from '../views/ErrorPage.vue';
+import type { ClubPermissionId, UserPermissionId } from '@/router/permissions';
 type Permission = z.infer<typeof idAndNameSchema>;
 function hasPermission(
   permissionMap: Map<number, Permission>,
@@ -54,17 +55,22 @@ export const useUserStore = defineStore('user', () => {
         ]),
       ),
   );
-  const hasUserPermission = (userPermission: RouteMeta['userPermission']) =>
+  const hasUserPermission = (userPermission: RoutePermission<UserPermissionId> | undefined) =>
     userPermission === undefined || hasPermission(userPermissions.value, userPermission);
-  const hasClubPermission = (clubPermission: RouteMeta['clubPermission']) =>
+  const hasClubPermission = (clubPermission: RoutePermission<ClubPermissionId> | undefined) =>
     clubPermission === undefined || hasPermission(clubPermissions.value, clubPermission);
   function isRouteAccessible(to: string | RouteLocationAsRelativeGeneric): true | PageErrorType {
     const {
-      meta: { shouldLogin, userPermission, clubPermission },
+      meta: { shouldLogin, permission },
     } = router.resolve(to);
     if (shouldLogin && !logined.value) {
       return PageErrorType.NOT_LOGIN;
     }
+    if (!permission) return true;
+    if (typeof permission === 'function') {
+      return permission(useUserStore()) ? true : PageErrorType.NO_PERMISSION;
+    }
+    const { user: userPermission, club: clubPermission } = permission;
     if (!hasUserPermission(userPermission) || !hasClubPermission(clubPermission)) {
       return PageErrorType.NO_PERMISSION;
     }
diff --git a/src/utils/async-queue.ts b/src/utils/async-queue.ts
index 4e90b6f..e496fb7 100644
--- a/src/utils/async-queue.ts
+++ b/src/utils/async-queue.ts
@@ -1,5 +1,5 @@
 import { DoubleQueue } from './double-queue';
-import type { Future } from './types';
+import type { Future } from './future';
 export class AsyncQueue<T> {
   protected _queue: DoubleQueue<T>;
   protected _getters = new DoubleQueue<Future<T>>();
diff --git a/src/utils/future.ts b/src/utils/future.ts
new file mode 100644
index 0000000..aa10c72
--- /dev/null
+++ b/src/utils/future.ts
@@ -0,0 +1,18 @@
+export type Future<T = void> = PromiseWithResolvers<T>;
+export class FutureMap<T = void> extends Map<number, Future<T>> {
+  add(tileId: number) {
+    const future = Promise.withResolvers<T>();
+    this.set(tileId, future);
+    return future.promise;
+  }
+
+  resolve(tileId: number, value: T) {
+    this.get(tileId)?.resolve(value);
+    this.delete(tileId);
+  }
+
+  reject(tileId: number, reason: unknown) {
+    this.get(tileId)?.reject(reason);
+    this.delete(tileId);
+  }
+}
diff --git a/src/utils/types.d.ts b/src/utils/types.d.ts
index 8dce26f..558ec32 100644
--- a/src/utils/types.d.ts
+++ b/src/utils/types.d.ts
@@ -1,8 +1,6 @@
 import type { Primitive } from 'zod';
-
 export type MaybePromise<T> = T | Promise<T>;
 export type MaybeArray<T, R extends boolean = false> = T | (R extends false ? T[] : readonly T[]);
-export type Future<T = void> = PromiseWithResolvers<T>;
 export type ValueOf<T extends object> = T[keyof T];
 export type Override<T extends object, R extends Partial<T> = {}, O extends keyof T = never> = Omit<
   T,
diff --git a/src/views/MainPage.vue b/src/views/MainPage.vue
index b04c439..c5b9908 100644
--- a/src/views/MainPage.vue
+++ b/src/views/MainPage.vue
@@ -1,9 +1,5 @@
 <template>
-  <el-main
-    v-loading="loading"
-    element-loading-text="正在加载"
-    class="keep-padding flex justify-center bg-white"
-  >
+  <el-main class="keep-padding flex justify-center bg-white">
     <div class="w-1200px flex flex-col gap-10px">
       <el-carousel class="rounded-10px" height="300px">
         <el-carousel-item v-for="g of gallery" class="slider-item" :key="g.id">
@@ -14,7 +10,13 @@
         <main-card class="max-lg-col-span-2" title="社团资讯" to="/club/press"></main-card>
         <main-card class="max-lg-col-span-2" title="社团活动" to="/club"></main-card>
         <main-card class="col-span-2" title="社团列表" to="/club">
-          <club-list brief />
+          <club-list
+            class="min-h-100px"
+            v-loading="loadingClubList"
+            element-loading-text="正在加载"
+            brief
+            @load-complete="loadingClubList = false"
+          />
         </main-card>
       </div>
     </div>
@@ -36,7 +38,7 @@ import { Neusoft } from '@/schemas/neusoft';
 import { useUserStore } from '@/stores/user.js';
 import { ref } from 'vue';
 const userStore = useUserStore();
-const loading = ref(false);
+const loadingClubList = ref(true);
 const gallery = ref<Neusoft.SmartParty.Gallery[]>();
 requestRaw<Neusoft.SmartParty.GalleryResp>({
   url: `${Neusoft.SMART_PARTY_BASE_URL}/system/rotation/list`,
diff --git a/src/views/club/ClubListPage.vue b/src/views/club/ClubListPage.vue
index 3cf4a88..0df44ef 100644
--- a/src/views/club/ClubListPage.vue
+++ b/src/views/club/ClubListPage.vue
@@ -5,7 +5,9 @@
         <template #header>
           <b>社团列表</b>
         </template>
-        <club-list click @click="onClubClick" />
+        <div v-loading="loading" element-loading-text="正在加载" class="min-h-100px">
+          <club-list click @click="onClubClick" @load-complete="loading = false" />
+        </div>
       </el-card>
     </div>
     <club-detail-dialog v-model="showClubDialog" :club="showingClub" />
@@ -21,6 +23,7 @@ import ClubDetailDialog from '@/components/club/ClubDetailDialog.vue';
 import ClubList from '@/components/club/ClubList.vue';
 import type { Club } from '@/schemas/response';
 import { ref } from 'vue';
+const loading = ref(true);
 const showingClub = ref<Club>();
 const showClubDialog = ref(false);
 function onClubClick(club: Club) {