From f3bdeb25bc9e30ce1ba27b7fc2922002e160ab53 Mon Sep 17 00:00:00 2001
From: Litrix <wbpstn@163.com>
Date: Tue, 14 Jan 2025 17:32:01 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BA=94=E5=AD=90?=
 =?UTF-8?q?=E6=A3=8B=E6=88=BF=E9=97=B4=E8=A1=A8=E6=A0=BC=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/club/ClubChangeAuthDialog.vue |  4 +-
 src/views/GobangListPage.vue                 | 41 +++++++++-----------
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/components/club/ClubChangeAuthDialog.vue b/src/components/club/ClubChangeAuthDialog.vue
index 6f25581..a9c1fbd 100644
--- a/src/components/club/ClubChangeAuthDialog.vue
+++ b/src/components/club/ClubChangeAuthDialog.vue
@@ -56,11 +56,11 @@ async function submit() {
   if (!(await formRef.value!.validate())) return;
   submitting.value = true;
   const res = await patchRequest(formData, originalFormData.value, {
-    clubAuthId: () =>
+    clubAuthId: (clubAuthId) =>
       changeUserClubAuth({
         userId: user.id,
         clubId: club.id,
-        newAuthId: formData.clubAuthId!,
+        newAuthId: clubAuthId!,
       }),
   });
   try {
diff --git a/src/views/GobangListPage.vue b/src/views/GobangListPage.vue
index 1c4aff0..65b7a6a 100644
--- a/src/views/GobangListPage.vue
+++ b/src/views/GobangListPage.vue
@@ -21,34 +21,28 @@
             <div class="gobang-list-page-main__no-rooms-title">没有房间</div>
             <el-button type="primary" :loading="loading" @click="refresh">刷新</el-button>
           </template>
-          <data-table v-else :rows="rooms"></data-table>
-          <el-table :data="rooms">
+          <data-table v-else :rows="rooms" :custom-cols="{ key: 'action', label: '操作' }">
             <el-table-column prop="briefId" label="房间ID" />
             <el-table-column prop="briefId" :formatter="getPlayerCount" label="房间人数" />
-            <el-table-column label="操作">
-              <template #default="{ row }">
-                <el-button
-                  type="success"
-                  :disabled="
+            <template #action="{ row }">
+              <el-button
+                type="success"
+                :disabled="
+                  arrayIncludes([RoomState.GAMING, RoomState.FINISHED], (row as RoomRender).state)
+                "
+                @click="onJoinButtonClick(row)"
+              >
+                <template
+                  v-if="
                     arrayIncludes([RoomState.GAMING, RoomState.FINISHED], (row as RoomRender).state)
                   "
-                  @click="onJoinButtonClick(row)"
                 >
-                  <template
-                    v-if="
-                      arrayIncludes(
-                        [RoomState.GAMING, RoomState.FINISHED],
-                        (row as RoomRender).state,
-                      )
-                    "
-                  >
-                    已满
-                  </template>
-                  <template v-else>加入</template>
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
+                  已满
+                </template>
+                <template v-else>加入</template>
+              </el-button>
+            </template>
+          </data-table>
         </template>
       </el-main>
     </el-container>
@@ -166,6 +160,7 @@ const playerCountMap: Record<RoomState, string> = {
 <script lang="ts" setup>
 import CreateGobangRoomDialog from '@/components/gobang/CreateGobangRoomDialog.vue';
 import GobangHeader from '@/components/gobang/GobangHeader.vue';
+import DataTable from '@/components/table/DataTable.vue';
 import { WEBSOCKET_BASE_URL } from '@/env';
 import router from '@/router';
 import type { UserInfo } from '@/schemas/response';