From c6d594216e6ce489ac53e8c7cdfbfe2bf9f2d2d3 Mon Sep 17 00:00:00 2001
From: guofei <guofeichu@gmail.com>
Date: Mon, 24 Jun 2024 18:56:56 +0800
Subject: [PATCH] feat: edit show

---
 src/pages/User/index.tsx             | 103 ++++++++++++++-------------
 src/services/system/user/typing.d.ts |   1 +
 2 files changed, 56 insertions(+), 48 deletions(-)

diff --git a/src/pages/User/index.tsx b/src/pages/User/index.tsx
index 3a5ecde..15b753b 100644
--- a/src/pages/User/index.tsx
+++ b/src/pages/User/index.tsx
@@ -61,16 +61,20 @@ const Page = () => {
       align: 'center',
       hideInSearch: true,
       render: (_, record: User.UserItem) => {
+        const isExpired = Reflect.has(record, 'isExpired') && record.isExpired === true;
         return (
-          <Button
-            type="link"
-            onClick={() => {
-              setEditRow(record);
-              setUserDetailsVisible(true);
-            }}
-          >
-            {record.email}
-          </Button>
+          <>
+            <Button
+              type="link"
+              className={`${isExpired ? 'text-[red] font-bold' : ''} `}
+              onClick={() => {
+                setEditRow(record);
+                setUserDetailsVisible(true);
+              }}
+            >
+              {record.email} {isExpired && <span>（套餐过期）</span>}
+            </Button>
+          </>
         );
       },
     },
@@ -204,51 +208,54 @@ const Page = () => {
       dataIndex: 'option',
       valueType: 'option',
       align: 'center',
-      render: (_: React.ReactNode, record: User.UserItem) => (
-        <div className="space-x-4">
-          {!record.packageId && (
+      render: (_: React.ReactNode, record: User.UserItem) => {
+        const isExpired = !record.packageId || (Reflect.has(record, 'isExpired') && record.isExpired === true);
+        return (
+          <div className="space-x-4">
+            {isExpired && (
+              <Button
+                key={'openPackage'}
+                type="primary"
+                onClick={() => {
+                  setEditRow(record);
+                  setOpenPackageVisible(true);
+                }}
+              >
+                开通套餐
+              </Button>
+            )}
             <Button
-              key={'openPackage'}
+              className="app-btn warning"
+              key={'changeStatus'}
               type="primary"
               onClick={() => {
-                setEditRow(record);
-                setOpenPackageVisible(true);
+                handleChangeUserStatus(record);
               }}
             >
-              开通套餐
+              {record.enabled ? '禁用' : '启用'}
             </Button>
-          )}
-          <Button
-            className="app-btn warning"
-            key={'changeStatus'}
-            type="primary"
-            onClick={() => {
-              handleChangeUserStatus(record);
-            }}
-          >
-            {record.enabled ? '禁用' : '启用'}
-          </Button>
-          <Button
-            type="primary"
-            danger
-            key={'delUser'}
-            onClick={() => {
-              modal.confirm({
-                title: '提示',
-                content: '确定要删除该用户？',
-                async onOk() {
-                  const flag = await delUxUserAPI(record.id);
-                  if (flag.code === 200) {
-                    tableRef.current?.reload();
-                  }
-                },
-              });
-            }}
-          >
-            删除用户
-          </Button>
-        </div>
-      ),
+            <Button
+              type="primary"
+              danger
+              key={'delUser'}
+              onClick={() => {
+                modal.confirm({
+                  title: '提示',
+                  content: '确定要删除该用户？',
+                  async onOk() {
+                    const flag = await delUxUserAPI(record.id);
+                    if (flag.code === 200) {
+                      tableRef.current?.reload();
+                    }
+                  },
+                });
+              }}
+            >
+              删除用户
+            </Button>
+          </div>
+        );
+      },
     },
   ];
 
diff --git a/src/services/system/user/typing.d.ts b/src/services/system/user/typing.d.ts
index a229cb3..5e1f506 100644
--- a/src/services/system/user/typing.d.ts
+++ b/src/services/system/user/typing.d.ts
@@ -15,6 +15,7 @@ declare namespace User {
     packageId?: string;
 
     expired?: string;
+    isExpired?: boolean | null;
     // 用户来源 1. ux 注册 2. 后台创建
     userSource?: number;
     // 用户总空间