From e4801202f714b279ea28f89b9626e8b13ea68633 Mon Sep 17 00:00:00 2001
From: lq1405 <2769838458@qq.com>
Date: Wed, 30 Oct 2024 15:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=EF=BC=8C=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=AF=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=92=8C=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/User/ModifyUser/index.tsx     | 25 +++++++++++++-------
 src/pages/User/UserManagement/index.tsx | 31 +++++++++++++++++++++----
 src/services/typing/user.d.ts           |  3 ++-
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/src/pages/User/ModifyUser/index.tsx b/src/pages/User/ModifyUser/index.tsx
index b3fda5c..32107cf 100644
--- a/src/pages/User/ModifyUser/index.tsx
+++ b/src/pages/User/ModifyUser/index.tsx
@@ -113,7 +113,7 @@ const ModifyUser: React.FC<ModifyUserProps> = ({ userId, setFormRef, open }) =>
               <Form.Item
                 label="用户名称"
                 name="userName"
-                rules={[{ required: true, message: 'Please input your username!' }]}
+                rules={[{ required: true, message: '请填写用户名称！' }]}
               >
                 <Input />
               </Form.Item>
@@ -123,7 +123,7 @@ const ModifyUser: React.FC<ModifyUserProps> = ({ userId, setFormRef, open }) =>
               <Form.Item
                 label="用户昵称"
                 name="nickName"
-                rules={[{ required: true, message: 'Please input your username!' }]}
+                rules={[{ required: true, message: '请填写用户昵称！' }]}
               >
                 <Input />
               </Form.Item>
@@ -132,7 +132,7 @@ const ModifyUser: React.FC<ModifyUserProps> = ({ userId, setFormRef, open }) =>
               <Form.Item
                 label="邮箱"
                 name="email"
-                rules={[{ required: true, message: 'Please input your username!' }]}
+                rules={[{ required: true, message: '请填写邮箱！' }]}
               >
                 <Input />
               </Form.Item>
@@ -149,7 +149,7 @@ const ModifyUser: React.FC<ModifyUserProps> = ({ userId, setFormRef, open }) =>
               <Form.Item
                 label="角色名称"
                 name="roleNames"
-                rules={[{ required: true, message: 'Please input your username!' }]}
+                rules={[{ required: true, message: '请选择角色名称！' }]}
               >
                 <Select
                   mode="multiple"
@@ -165,7 +165,7 @@ const ModifyUser: React.FC<ModifyUserProps> = ({ userId, setFormRef, open }) =>
               <Form.Item
                 label="可激活设备"
                 name="allDeviceCount"
-                rules={[{ required: true, message: 'Please input your username!' }]}
+                rules={[{ required: true, message: '请设置可激活设置！' }]}
               >
                 <InputNumber min={0} step="1" />
               </Form.Item>
@@ -174,7 +174,7 @@ const ModifyUser: React.FC<ModifyUserProps> = ({ userId, setFormRef, open }) =>
               <Form.Item
                 label="代理分成"
                 name="agentPercent"
-                rules={[{ required: true, message: 'Please input your username!' }]}
+                rules={[{ required: true, message: '请设置代理分成！' }]}
               >
                 <InputNumber min={0.1} max={0.7} step="0.01" />
               </Form.Item>
@@ -183,7 +183,7 @@ const ModifyUser: React.FC<ModifyUserProps> = ({ userId, setFormRef, open }) =>
               <Form.Item
                 label="免费换绑次数"
                 name="freeCount"
-                rules={[{ required: true, message: 'Please input your username!' }]}
+                rules={[{ required: true, message: '请设置免费换绑次数！' }]}
               >
                 <InputNumber min={1} max={10} step="1" />
               </Form.Item>
@@ -192,11 +192,20 @@ const ModifyUser: React.FC<ModifyUserProps> = ({ userId, setFormRef, open }) =>
               <Form.Item
                 label="注册时间"
                 name="createdDate"
-                rules={[{ required: true, message: 'Please input your username!' }]}
+                rules={[{ required: true, message: '请选择注册时间！' }]}
               >
                 <Input disabled={true} />
               </Form.Item>
             </Col>
+            <Col span={12}>
+              <Form.Item
+                label="备注"
+                name="remark"
+                rules={[{ required: true, message: '请输入备注！' }]}
+              >
+                <Input />
+              </Form.Item>
+            </Col>
           </Row>
 
           <Form.Item wrapperCol={{ offset: 4, span: 3 }}>
diff --git a/src/pages/User/UserManagement/index.tsx b/src/pages/User/UserManagement/index.tsx
index 6bdb9e8..71586bd 100644
--- a/src/pages/User/UserManagement/index.tsx
+++ b/src/pages/User/UserManagement/index.tsx
@@ -4,7 +4,7 @@ import { QueryRoleOption } from "@/services/services/role";
 import { QueryUserList } from "@/services/services/user";
 import { FormatDate } from "@/util/time";
 import { useAccess, useModel } from "@umijs/max";
-import { Button, Form, Input, InputNumber, message, Modal, Select, SelectProps, Table, Tag } from "antd";
+import { Button, Form, Input, InputNumber, message, Modal, Select, SelectProps, Table, Tag, Tooltip } from "antd";
 import { ColumnsType, TablePaginationConfig } from "antd/es/table";
 import { FilterValue, SorterResult, TableCurrentDataSource } from "antd/es/table/interface";
 import { useEffect, useState } from "react";
@@ -172,18 +172,31 @@ const UserManagement: React.FC = () => {
       title: '创建时间',
       dataIndex: 'createdDate',
       render: (text, record) => FormatDate(record.createdDate),
-      width: '200px',
+      width: '160px',
     },
     {
       title: '上次登录时间',
       dataIndex: 'lastLoginDate',
       render: (text, record) => FormatDate(record.lastLoginDate),
-      width: '200px',
+      width: '160px',
     },
     {
       title: '上次登录IP',
       dataIndex: 'lastLoginIp',
-      width: '200px',
+      width: '120px',
+    },
+    {
+      title: '备注',
+      dataIndex: 'remark',
+      hidden: !access.isAdminOrSuperAdmin,
+      ellipsis: {
+        showTitle: false,
+      },
+      render: (remark) => (
+        <Tooltip placement="topLeft" title={remark}>
+          {remark}
+        </Tooltip>
+      ),
     },
     {
       title: '操作',
@@ -243,6 +256,16 @@ const UserManagement: React.FC = () => {
               </Form.Item> :
               null
 
+          }
+          <Form.Item>
+          </Form.Item>
+          {
+            access.isAdminOrSuperAdmin ?
+              <Form.Item label="备注" name='remark' style={{ marginBottom: 5 }}>
+                <Input placeholder="请输入备注" />
+              </Form.Item> :
+              null
+
           }
           <Form.Item>
             <Button type="primary" htmlType='submit'>查询</Button>
diff --git a/src/services/typing/user.d.ts b/src/services/typing/user.d.ts
index c1ba9be..a5d12b7 100644
--- a/src/services/typing/user.d.ts
+++ b/src/services/typing/user.d.ts
@@ -43,7 +43,8 @@ declare namespace UserModel {
     freeCount: number;
     affiliateCode: string;
     createdDate: Date;
-    options: userOptions
+    options: userOptions;
+    remark?: string;
   }
 
   type userOptions = {