♻️Refactor: Users Page

web/src/components/UsersTable.js

@@ -2,46 +2,88 @@ import React, { useEffect, useState } from 'react';
 import { API, showError, showSuccess } from '../helpers';
 import {
   Button,
-  Form,
+  Card,
-  Popconfirm,
+  Divider,
+  Dropdown,
+  Input,
+  Modal,
+  Select,
   Space,
   Table,
   Tag,
-  Tooltip,
+  Typography,
 } from '@douyinfe/semi-ui';
+import {
+  IconPlus,
+  IconSearch,
+  IconEdit,
+  IconDelete,
+  IconStop,
+  IconPlay,
+  IconMore,
+  IconUserAdd,
+  IconArrowUp,
+  IconArrowDown,
+} from '@douyinfe/semi-icons';
 import { ITEMS_PER_PAGE } from '../constants';
 import { renderGroup, renderNumber, renderQuota } from '../helpers/render';
 import AddUser from '../pages/User/AddUser';
 import EditUser from '../pages/User/EditUser';
 import { useTranslation } from 'react-i18next';
 
+const { Text } = Typography;
+
 const UsersTable = () => {
   const { t } = useTranslation();
 
   function renderRole(role) {
     switch (role) {
       case 1:
-        return <Tag size='large'>{t('普通用户')}</Tag>;
+        return (
+          <Tag size='large' color='blue' shape='circle'>
+            {t('普通用户')}
+          </Tag>
+        );
       case 10:
         return (
-          <Tag color='yellow' size='large'>
+          <Tag color='yellow' size='large' shape='circle'>
             {t('管理员')}
           </Tag>
         );
       case 100:
         return (
-          <Tag color='orange' size='large'>
+          <Tag color='orange' size='large' shape='circle'>
             {t('超级管理员')}
           </Tag>
         );
       default:
         return (
-          <Tag color='red' size='large'>
+          <Tag color='red' size='large' shape='circle'>
             {t('未知身份')}
           </Tag>
         );
     }
   }
+
+  const renderStatus = (status) => {
+    switch (status) {
+      case 1:
+        return <Tag size='large' color='green' shape='circle'>{t('已激活')}</Tag>;
+      case 2:
+        return (
+          <Tag size='large' color='red' shape='circle'>
+            {t('已封禁')}
+          </Tag>
+        );
+      default:
+        return (
+          <Tag size='large' color='grey' shape='circle'>
+            {t('未知状态')}
+          </Tag>
+        );
+    }
+  };
+
   const columns = [
     {
       title: 'ID',
@@ -65,21 +107,15 @@ const UsersTable = () => {
         return (
           <div>
             <Space spacing={1}>
-              <Tooltip content={t('剩余额度')}>
+              <Tag color='white' size='large' shape='circle' className="!text-xs">
-                <Tag color='white' size='large'>
+                {t('剩余')}: {renderQuota(record.quota)}
-                  {renderQuota(record.quota)}
+              </Tag>
-                </Tag>
+              <Tag color='white' size='large' shape='circle' className="!text-xs">
-              </Tooltip>
+                {t('已用')}: {renderQuota(record.used_quota)}
-              <Tooltip content={t('已用额度')}>
+              </Tag>
-                <Tag color='white' size='large'>
+              <Tag color='white' size='large' shape='circle' className="!text-xs">
-                  {renderQuota(record.used_quota)}
+                {t('调用')}: {renderNumber(record.request_count)}
-                </Tag>
+              </Tag>
-              </Tooltip>
-              <Tooltip content={t('调用次数')}>
-                <Tag color='white' size='large'>
-                  {renderNumber(record.request_count)}
-                </Tag>
-              </Tooltip>
             </Space>
           </div>
         );
@@ -92,27 +128,15 @@ const UsersTable = () => {
         return (
           <div>
             <Space spacing={1}>
-              <Tooltip content={t('邀请人数')}>
+              <Tag color='white' size='large' shape='circle' className="!text-xs">
-                <Tag color='white' size='large'>
+                {t('邀请')}: {renderNumber(record.aff_count)}
-                  {renderNumber(record.aff_count)}
+              </Tag>
-                </Tag>
+              <Tag color='white' size='large' shape='circle' className="!text-xs">
-              </Tooltip>
+                {t('收益')}: {renderQuota(record.aff_history_quota)}
-              <Tooltip content={t('邀请总收益')}>
+              </Tag>
-                <Tag color='white' size='large'>
+              <Tag color='white' size='large' shape='circle' className="!text-xs">
-                  {renderQuota(record.aff_history_quota)}
+                {record.inviter_id === 0 ? t('无邀请人') : `邀请人: ${record.inviter_id}`}
-                </Tag>
+              </Tag>
-              </Tooltip>
-              <Tooltip content={t('邀请人ID')}>
-                {record.inviter_id === 0 ? (
-                  <Tag color='white' size='large'>
-                    {t('无')}
-                  </Tag>
-                ) : (
-                  <Tag color='white' size='large'>
-                    {record.inviter_id}
-                  </Tag>
-                )}
-              </Tooltip>
             </Space>
           </div>
         );
@@ -132,7 +156,7 @@ const UsersTable = () => {
         return (
           <div>
             {record.DeletedAt !== null ? (
-              <Tag color='red'>{t('已注销')}</Tag>
+              <Tag color='red' shape='circle'>{t('已注销')}</Tag>
             ) : (
               renderStatus(text)
             )}
@@ -143,92 +167,117 @@ const UsersTable = () => {
     {
       title: '',
       dataIndex: 'operate',
-      render: (text, record, index) => (
+      render: (text, record, index) => {
-        <div>
+        if (record.DeletedAt !== null) {
-          {record.DeletedAt !== null ? (
+          return <></>;
-            <></>
+        }
-          ) : (
+
-            <>
+        // 创建更多操作的下拉菜单项
-              <Popconfirm
+        const moreMenuItems = [
-                title={t('确定？')}
+          {
-                okType={'warning'}
+            node: 'item',
-                onConfirm={() => {
+            name: t('提升'),
+            icon: <IconArrowUp />,
+            type: 'warning',
+            onClick: () => {
+              Modal.confirm({
+                title: t('确定要提升此用户吗？'),
+                content: t('此操作将提升用户的权限级别'),
+                onOk: () => {
                   manageUser(record.id, 'promote', record);
-                }}
+                },
-              >
+              });
-                <Button theme='light' type='warning' style={{ marginRight: 1 }}>
+            },
-                  {t('提升')}
+          },
-                </Button>
+          {
-              </Popconfirm>
+            node: 'item',
-              <Popconfirm
+            name: t('降级'),
-                title={t('确定？')}
+            icon: <IconArrowDown />,
-                okType={'warning'}
+            type: 'secondary',
-                onConfirm={() => {
+            onClick: () => {
+              Modal.confirm({
+                title: t('确定要降级此用户吗？'),
+                content: t('此操作将降低用户的权限级别'),
+                onOk: () => {
                   manageUser(record.id, 'demote', record);
-                }}
+                },
-              >
+              });
-                <Button
+            },
-                  theme='light'
+          },
-                  type='secondary'
+          {
-                  style={{ marginRight: 1 }}
+            node: 'item',
-                >
+            name: t('注销'),
-                  {t('降级')}
+            icon: <IconDelete />,
-                </Button>
+            type: 'danger',
-              </Popconfirm>
+            onClick: () => {
-              {record.status === 1 ? (
+              Modal.confirm({
-                <Button
+                title: t('确定是否要注销此用户？'),
-                  theme='light'
+                content: t('相当于删除用户，此修改将不可逆'),
-                  type='warning'
+                onOk: () => {
-                  style={{ marginRight: 1 }}
-                  onClick={async () => {
-                    manageUser(record.id, 'disable', record);
-                  }}
-                >
-                  {t('禁用')}
-                </Button>
-              ) : (
-                <Button
-                  theme='light'
-                  type='secondary'
-                  style={{ marginRight: 1 }}
-                  onClick={async () => {
-                    manageUser(record.id, 'enable', record);
-                  }}
-                  disabled={record.status === 3}
-                >
-                  {t('启用')}
-                </Button>
-              )}
-              <Button
-                theme='light'
-                type='tertiary'
-                style={{ marginRight: 1 }}
-                onClick={() => {
-                  setEditingUser(record);
-                  setShowEditUser(true);
-                }}
-              >
-                {t('编辑')}
-              </Button>
-              <Popconfirm
-                title={t('确定是否要注销此用户？')}
-                content={t('相当于删除用户，此修改将不可逆')}
-                okType={'danger'}
-                position={'left'}
-                onConfirm={() => {
                   manageUser(record.id, 'delete', record).then(() => {
                     removeRecord(record.id);
                   });
-                }}
+                },
-              >
+              });
-                <Button theme='light' type='danger' style={{ marginRight: 1 }}>
+            },
-                  {t('注销')}
+          }
-                </Button>
+        ];
-              </Popconfirm>
+
-            </>
+        // 动态添加启用/禁用按钮
-          )}
+        if (record.status === 1) {
-        </div>
+          moreMenuItems.splice(-1, 0, {
-      ),
+            node: 'item',
+            name: t('禁用'),
+            icon: <IconStop />,
+            type: 'warning',
+            onClick: () => {
+              manageUser(record.id, 'disable', record);
+            },
+          });
+        } else {
+          moreMenuItems.splice(-1, 0, {
+            node: 'item',
+            name: t('启用'),
+            icon: <IconPlay />,
+            type: 'secondary',
+            onClick: () => {
+              manageUser(record.id, 'enable', record);
+            },
+            disabled: record.status === 3,
+          });
+        }
+
+        return (
+          <Space>
+            <Button
+              icon={<IconEdit />}
+              theme='light'
+              type='tertiary'
+              size="small"
+              className="!rounded-full"
+              onClick={() => {
+                setEditingUser(record);
+                setShowEditUser(true);
+              }}
+            >
+              {t('编辑')}
+            </Button>
+            <Dropdown
+              trigger='click'
+              position='bottomRight'
+              menu={moreMenuItems}
+            >
+              <Button
+                icon={<IconMore />}
+                theme='light'
+                type='tertiary'
+                size="small"
+                className="!rounded-full"
+              />
+            </Dropdown>
+          </Space>
+        );
+      },
     },
   ];
 
@@ -311,25 +360,6 @@ const UsersTable = () => {
     }
   };
 
-  const renderStatus = (status) => {
-    switch (status) {
-      case 1:
-        return <Tag size='large'>{t('已激活')}</Tag>;
-      case 2:
-        return (
-          <Tag size='large' color='red'>
-            {t('已封禁')}
-          </Tag>
-        );
-      default:
-        return (
-          <Tag size='large' color='grey'>
-            {t('未知状态')}
-          </Tag>
-        );
-    }
-  };
-
   const searchUsers = async (
     startIdx,
     pageSize,
@@ -420,6 +450,83 @@ const UsersTable = () => {
       });
   };
 
+  const handleRow = (record, index) => {
+    if (record.DeletedAt !== null || record.status !== 1) {
+      return {
+        style: {
+          background: 'var(--semi-color-disabled-border)',
+        },
+      };
+    } else {
+      return {};
+    }
+  };
+
+  const renderHeader = () => (
+    <div className="flex flex-col w-full">
+      <div className="mb-2">
+        <div className="flex items-center text-blue-500">
+          <IconUserAdd className="mr-2" />
+          <Text>{t('用户管理页面，可以查看和管理所有注册用户的信息、权限和状态。')}</Text>
+        </div>
+      </div>
+
+      <Divider margin="12px" />
+
+      <div className="flex flex-col md:flex-row justify-between items-center gap-4 w-full">
+        <div className="flex gap-2 w-full md:w-auto order-2 md:order-1">
+          <Button
+            theme='light'
+            type='primary'
+            icon={<IconPlus />}
+            className="!rounded-full w-full md:w-auto"
+            onClick={() => {
+              setShowAddUser(true);
+            }}
+          >
+            {t('添加用户')}
+          </Button>
+        </div>
+
+        <div className="flex flex-col md:flex-row items-center gap-4 w-full md:w-auto order-1 md:order-2">
+          <div className="relative w-full md:w-64">
+            <Input
+              prefix={<IconSearch />}
+              placeholder={t('支持搜索用户的 ID、用户名、显示名称和邮箱地址')}
+              value={searchKeyword}
+              onChange={handleKeywordChange}
+              className="!rounded-full"
+              showClear
+            />
+          </div>
+          <div className="w-full md:w-48">
+            <Select
+              placeholder={t('选择分组')}
+              optionList={groupOptions}
+              value={searchGroup}
+              onChange={(value) => {
+                setSearchGroup(value);
+                searchUsers(activePage, pageSize, searchKeyword, value);
+              }}
+              className="!rounded-full w-full"
+              showClear
+            />
+          </div>
+          <Button
+            type="primary"
+            onClick={() => {
+              searchUsers(activePage, pageSize, searchKeyword, searchGroup);
+            }}
+            loading={searching}
+            className="!rounded-full w-full md:w-auto"
+          >
+            {t('查询')}
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+
   return (
     <>
       <AddUser
@@ -433,81 +540,38 @@ const UsersTable = () => {
         handleClose={closeEditUser}
         editingUser={editingUser}
       ></EditUser>
-      <Form
+
-        onSubmit={() => {
+      <Card
-          searchUsers(activePage, pageSize, searchKeyword, searchGroup);
+        className="!rounded-2xl overflow-hidden"
-        }}
+        title={renderHeader()}
-        labelPosition='left'
+        shadows='hover'
       >
-        <div style={{ display: 'flex' }}>
+        <Table
-          <Space>
+          columns={columns}
-            <Tooltip
+          dataSource={users}
-              content={t('支持搜索用户的 ID、用户名、显示名称和邮箱地址')}
+          pagination={{
-            >
+            formatPageText: (page) =>
-              <Form.Input
+              t('第 {{start}} - {{end}} 条，共 {{total}} 条', {
-                label={t('搜索关键字')}
+                start: page.currentStart,
-                icon='search'
+                end: page.currentEnd,
-                field='keyword'
+                total: userCount,
-                iconPosition='left'
+              }),
-                placeholder={t('搜索关键字')}
+            currentPage: activePage,
-                value={searchKeyword}
+            pageSize: pageSize,
-                loading={searching}
+            total: userCount,
-                onChange={(value) => handleKeywordChange(value)}
+            pageSizeOpts: [10, 20, 50, 100],
-              />
+            showSizeChanger: true,
-            </Tooltip>
+            onPageSizeChange: (size) => {
-
+              handlePageSizeChange(size);
-            <Form.Select
+            },
-              field='group'
+            onPageChange: handlePageChange,
-              label={t('分组')}
+          }}
-              optionList={groupOptions}
+          loading={loading}
-              onChange={(value) => {
+          onRow={handleRow}
-                setSearchGroup(value);
+          className="rounded-xl overflow-hidden"
-                searchUsers(activePage, pageSize, searchKeyword, value);
+          size="middle"
-              }}
+        />
-            />
+      </Card>
-            <Button
-              label={t('查询')}
-              type='primary'
-              htmlType='submit'
-              className='btn-margin-right'
-            >
-              {t('查询')}
-            </Button>
-            <Button
-              theme='light'
-              type='primary'
-              onClick={() => {
-                setShowAddUser(true);
-              }}
-            >
-              {t('添加用户')}
-            </Button>
-          </Space>
-        </div>
-      </Form>
-
-      <Table
-        columns={columns}
-        dataSource={users}
-        pagination={{
-          formatPageText: (page) =>
-            t('第 {{start}} - {{end}} 条，共 {{total}} 条', {
-              start: page.currentStart,
-              end: page.currentEnd,
-              total: users.length,
-            }),
-          currentPage: activePage,
-          pageSize: pageSize,
-          total: userCount,
-          pageSizeOpts: [10, 20, 50, 100],
-          showSizeChanger: true,
-          onPageSizeChange: (size) => {
-            handlePageSizeChange(size);
-          },
-          onPageChange: handlePageChange,
-        }}
-        loading={loading}
-      />
     </>
   );
 };

web/src/i18n/locales/en.json

@@ -1433,5 +1433,13 @@
   "100个": "100 items",
   "Midjourney 任务记录": "Midjourney Task Records",
   "任务记录": "Task Records",
-  "兑换码可以批量生成和分发，适合用于推广活动或批量充值。": "Redemption codes can be batch generated and distributed, suitable for promotion activities or bulk recharge."
+  "兑换码可以批量生成和分发，适合用于推广活动或批量充值。": "Redemption codes can be batch generated and distributed, suitable for promotion activities or bulk recharge.",
+  "剩余": "Remaining",
+  "已用": "Used",
+  "调用": "Calls",
+  "邀请": "Invitations",
+  "收益": "Earnings",
+  "无邀请人": "No Inviter",
+  "邀请人": "Inviter",
+  "用户管理页面，可以查看和管理所有注册用户的信息、权限和状态。": "User management page, you can view and manage all registered user information, permissions, and status."
 }

web/src/pages/User/index.js

@@ -1,20 +1,10 @@
 import React from 'react';
 import UsersTable from '../../components/UsersTable';
-import { Layout } from '@douyinfe/semi-ui';
-import { useTranslation } from 'react-i18next';
 
 const User = () => {
-  const { t } = useTranslation();
   return (
     <>
-      <Layout>
+      <UsersTable />
-        <Layout.Header>
-          <h3>{t('管理用户')}</h3>
-        </Layout.Header>
-        <Layout.Content>
-          <UsersTable />
-        </Layout.Content>
-      </Layout>
     </>
   );
 };