From 831a2c35d0dc0d1a6bd78e7c9d612ef6bb8a1ca2 Mon Sep 17 00:00:00 2001
From: wangziqi <wangziqi@gongxue100.com>
Date: Sun, 5 Jul 2026 21:26:05 +0800
Subject: [PATCH] fix: remove nested button pattern in Rooms page (Popconfirm
 outside PermissionButton)

---
 apps/admin/src/pages/Rooms/index.tsx | 71 ++++++++++++----------------
 1 file changed, 31 insertions(+), 40 deletions(-)

diff --git a/apps/admin/src/pages/Rooms/index.tsx b/apps/admin/src/pages/Rooms/index.tsx
index 1b77d31..0e1288b 100644
--- a/apps/admin/src/pages/Rooms/index.tsx
+++ b/apps/admin/src/pages/Rooms/index.tsx
@@ -222,18 +222,16 @@ const RoomsPage: React.FC = () => {
       render: (_: any, record: any) => (
         <Space>
           {record.status === 'archived' ? (
-            <PermissionButton permission="room:edit">
-              <Popconfirm
-                title="确定恢复此宿舍？恢复后将重新出现在宿舍总览中。"
-                onConfirm={() => handleRestore(record.id)}
-                okText="恢复"
-                cancelText="取消"
-              >
-                <Button size="small" icon={<UndoOutlined />} type="link">
-                  恢复
-                </Button>
-              </Popconfirm>
-            </PermissionButton>
+            <Popconfirm
+              title="确定恢复此宿舍？恢复后将重新出现在宿舍总览中。"
+              onConfirm={() => handleRestore(record.id)}
+              okText="恢复"
+              cancelText="取消"
+            >
+              <PermissionButton permission="room:edit" size="small" icon={<UndoOutlined />} type="link">
+                恢复
+              </PermissionButton>
+            </Popconfirm>
           ) : (
             <>
               <PermissionButton
@@ -255,19 +253,16 @@ const RoomsPage: React.FC = () => {
               >
                 编辑
               </PermissionButton>
-              <PermissionButton permission="room:delete">
-                <Popconfirm
-                  title="归档后不会删除数据，可随时恢复。有在住人员将无法归档。"
-                  onConfirm={() => handleArchive(record.id)}
-                  okText="归档"
-                  cancelText="取消"
-                >
-                  <Button size="small" icon={<InboxOutlined />}>
-                    归档
-                  </Button>
-                </Popconfirm>
-              </PermissionButton>
-            </>
+              <Popconfirm
+                title="归档后不会删除数据，可随时恢复。有在住人员将无法归档。"
+                onConfirm={() => handleArchive(record.id)}
+                okText="归档"
+                cancelText="取消"
+              >
+                <PermissionButton permission="room:delete" size="small" icon={<InboxOutlined />}>
+                  归档
+                </PermissionButton>
+              </Popconfirm>
           )}
         </Space>
       ),
@@ -311,19 +306,17 @@ const RoomsPage: React.FC = () => {
           </Button>
         </Space>
         <Space wrap>
-          <PermissionButton permission="room:delete">
-            <Popconfirm
-              title={`确定批量归档选中的 ${selectedRowKeys.length} 间宿舍？（有在住人员的会跳过）`}
-              onConfirm={handleBatchDelete}
-              okText="归档"
-              cancelText="取消"
-              disabled={selectedRowKeys.length === 0}
-            >
-              <Button danger icon={<DeleteOutlined />} disabled={selectedRowKeys.length === 0}>
-                批量归档
-              </Button>
-            </Popconfirm>
-          </PermissionButton>
+          <Popconfirm
+            title={`确定批量归档选中的 ${selectedRowKeys.length} 间宿舍？（有在住人员的会跳过）`}
+            onConfirm={handleBatchDelete}
+            okText="归档"
+            cancelText="取消"
+            disabled={selectedRowKeys.length === 0}
+          >
+            <PermissionButton permission="room:delete" danger icon={<DeleteOutlined />} disabled={selectedRowKeys.length === 0}>
+              批量归档
+            </PermissionButton>
+          </Popconfirm>
           <PermissionButton
             permission="room:create"
             type="primary"
@@ -341,8 +334,6 @@ const RoomsPage: React.FC = () => {
               accept=".xlsx,.xls"
               showUploadList={false}
               customRequest={async ({ file, onSuccess, onError }: any) => {
-                const formData = new FormData();
-                formData.append('file', file);
                 try {
                   const res: any = await api.post('/rooms/import', formData, {
                     headers: { 'Content-Type': 'multipart/form-data' },