From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/user/index.jsx | 327 ++++++++++++++++++++++++++++++------------------------
1 files changed, 182 insertions(+), 145 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/user/index.jsx b/zy-asrs-flow/src/pages/system/user/index.jsx
index 92bc37e..dd0f2f9 100644
--- a/zy-asrs-flow/src/pages/system/user/index.jsx
+++ b/zy-asrs-flow/src/pages/system/user/index.jsx
@@ -1,4 +1,3 @@
-
import React, { useState, useRef, useEffect } from 'react';
import { Button, message, Modal, Row, Col, Card, Tree, Input, Tag, Skeleton } from 'antd';
import {
@@ -6,102 +5,108 @@
PageContainer,
ProTable,
LightFilter,
+ TableDropdown
} from '@ant-design/pro-components';
+import { FormattedMessage, useIntl } from '@umijs/max';
import { PlusOutlined, ExportOutlined, DownOutlined, DeleteOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
import Http from '@/utils/http';
import Edit from './components/edit'
import Pwd from './components/pwd'
+import AssignRole from './components/assignRole'
import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
import { transformTreeData, getTreeAllKeys } from '@/utils/tree-util'
import { statusMap } from '@/utils/enum-util'
+import { repairBug } from '@/utils/common-util';
-const handleSave = async (val) => {
- const hide = message.loading('姝ｅ湪娣诲姞');
+const TABLE_KEY = "pro-table-user";
+
+const handleSave = async (val, intl) => {
+ const hide = message.loading(intl.formatMessage({ id: 'page.adding', defaultMessage: '姝ｅ湪娣诲姞' }));
try {
const resp = await Http.doPost('api/user/save', val);
if (resp.code === 200) {
- message.success('娣诲姞鎴愬姛');
+ message.success(intl.formatMessage({ id: 'page.add.success', defaultMessage: '娣诲姞鎴愬姛' }));
return true;
} else {
message.error(resp.msg);
return false;
}
} catch (error) {
- message.error('娣诲姞澶辫触璇烽噸璇曪紒');
+ message.error(intl.formatMessage({ id: 'page.add.fail', defaultMessage: '娣诲姞澶辫触璇烽噸璇曪紒' }));
return false;
} finally {
hide();
}
};
-const handleUpdate = async (val) => {
- const hide = message.loading('姝ｅ湪鏇存柊');
+const handleUpdate = async (val, intl) => {
+ const hide = message.loading(intl.formatMessage({ id: 'page.updating', defaultMessage: '姝ｅ湪鏇存柊' }));
try {
const resp = await Http.doPost('api/user/update', val);
if (resp.code === 200) {
- message.success('鏇存柊鎴愬姛');
+ message.success(intl.formatMessage({ id: 'page.update.success', defaultMessage: '鏇存柊鎴愬姛' }));
return true;
} else {
message.error(resp.msg);
return false;
}
} catch (error) {
- message.error('閰嶇疆澶辫触璇烽噸璇曪紒');
+ message.error(intl.formatMessage({ id: 'page.update.fail', defaultMessage: '鏇存柊澶辫触璇烽噸璇曪紒' }));
return false;
} finally {
hide();
}
};
-const handleRemove = async (rows) => {
+const handleRemove = async (rows, intl) => {
if (!rows) return true;
- const hide = message.loading('姝ｅ湪鍒犻櫎');
+ const hide = message.loading(intl.formatMessage({ id: 'page.deleting', defaultMessage: '姝ｅ湪鍒犻櫎' }));
try {
const resp = await Http.doPost('api/user/remove/' + rows.map((row) => row.id).join(','));
if (resp.code === 200) {
- message.success('鍒犻櫎鎴愬姛');
+ message.success(intl.formatMessage({ id: 'page.delete.success', defaultMessage: '鍒犻櫎鎴愬姛' }));
return true;
} else {
message.error(resp.msg);
return false;
}
} catch (error) {
- message.error('鍒犻櫎澶辫触锛岃閲嶈瘯');
+ message.error(intl.formatMessage({ id: 'page.delete.fail', defaultMessage: '鍒犻櫎澶辫触锛岃閲嶈瘯锛�' }));
return false;
} finally {
hide();
}
};
-const handleExport = async () => {
- const hide = message.loading('姝ｅ湪瀵煎嚭');
+const handleExport = async (intl) => {
+ const hide = message.loading(intl.formatMessage({ id: 'page.exporting', defaultMessage: '姝ｅ湪瀵煎嚭' }));
try {
const resp = await Http.doPostBlob('api/user/export');
const blob = new Blob([resp], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
- message.success('瀵煎嚭鎴愬姛');
+ message.success(intl.formatMessage({ id: 'page.export.success', defaultMessage: '瀵煎嚭鎴愬姛' }));
return true;
} catch (error) {
- message.error('瀵煎嚭澶辫触锛岃閲嶈瘯');
+ message.error(intl.formatMessage({ id: 'page.export.fail', defaultMessage: '瀵煎嚭澶辫触锛岃閲嶈瘯' }));
return false;
} finally {
hide();
}
};
-const handlePwd = async (val) => {
- const hide = message.loading('姝ｅ湪閲嶇疆');
+const handlePwd = async (val, intl) => {
+ const hide = message.loading(intl.formatMessage({ id: 'page.resetting', defaultMessage: '姝ｅ湪閲嶇疆' }));
try {
const resp = await Http.doPost('api/user/reset/pwd', val);
if (resp.code === 200) {
- message.success('閲嶇疆鎴愬姛');
+ message.success(intl.formatMessage({ id: 'page.reset.success', defaultMessage: '閲嶇疆鎴愬姛' }));
return true;
} else {
message.error(resp.msg);
return false;
}
} catch (error) {
- message.error('閲嶇疆澶辫触璇烽噸璇曪紒');
+ message.error(intl.formatMessage({ id: 'page.reset.fail', defaultMessage: '閲嶇疆澶辫触璇烽噸璇曪紒' }));
return false;
} finally {
hide();
@@ -110,6 +115,7 @@
const Main = () => {
+ const intl = useIntl();
const formTableRef = useRef();
const actionRef = useRef();
const [selectedRows, setSelectedRows] = useState([]);
@@ -124,6 +130,8 @@
const [pwdModalVisible, setPwdModalVisible] = useState(false);
+ const [assignModalVisible, setAssignModalVisible] = useState(false);
+
const loadDeptTreeData = (param) => {
setDeptTreeLoading(true);
Http.doPostPromise('/api/dept/tree', param, (res) => {
@@ -136,12 +144,13 @@
const treeAllKeys = getTreeAllKeys(treeData);
setDeptExpandedKeys(treeAllKeys);
}).catch((err) => {
+ console.error(err);
setDeptTreeLoading(false);
})
}
useEffect(() => {
- const handleResize = () => setBoxHeight(window.innerHeight - 420);
+ const handleResize = () => setBoxHeight(window.innerHeight - 320);
window.addEventListener('resize', handleResize);
handleResize();
@@ -152,17 +161,19 @@
const columns = [
{
- title: 'No',
+ title: intl.formatMessage({
+ id: 'page.table.no',
+ defaultMessage: 'No'
+ }),
dataIndex: 'index',
valueType: 'indexBorder',
- width: 30,
+ width: 48,
},
{
title: '閮ㄩ棬',
dataIndex: 'deptId$',
valueType: 'text',
hidden: false,
- width: 100,
render: (_, record) => {
if (_ && _ !== '-') {
return <Tag color={""}>{_}</Tag>
@@ -184,7 +195,6 @@
valueType: 'text',
hidden: false,
copyable: true,
- width: 100,
filterDropdown: (props) => <TextFilter
name='username'
{...props}
@@ -200,7 +210,6 @@
dataIndex: 'nickname',
valueType: 'text',
hidden: false,
- width: 100,
filterDropdown: (props) => <TextFilter
name='nickname'
{...props}
@@ -215,8 +224,7 @@
title: '瀵嗙爜',
dataIndex: 'password',
valueType: 'password',
- hidden: true,
- width: 100,
+ hidden: false,
filterDropdown: (props) => <TextFilter
name='password'
{...props}
@@ -228,8 +236,7 @@
title: '澶村儚',
dataIndex: 'avatar',
valueType: 'text',
- hidden: true,
- width: 140,
+ hidden: false,
filterDropdown: (props) => <TextFilter
name='avatar'
{...props}
@@ -241,8 +248,7 @@
title: '宸ュ彿',
dataIndex: 'code',
valueType: 'text',
- hidden: true,
- width: 140,
+ hidden: false,
filterDropdown: (props) => <TextFilter
name='code'
{...props}
@@ -255,7 +261,6 @@
dataIndex: 'sex$',
valueType: 'text',
hidden: false,
- width: 80,
filterDropdown: (props) => <SelectFilter
name='sex'
{...props}
@@ -272,8 +277,7 @@
title: '鎵嬫満鍙�',
dataIndex: 'phone',
valueType: 'text',
- hidden: true,
- width: 100,
+ hidden: false,
filterDropdown: (props) => <TextFilter
name='phone'
{...props}
@@ -285,8 +289,7 @@
title: '閭',
dataIndex: 'email',
valueType: 'text',
- hidden: true,
- width: 140,
+ hidden: false,
filterDropdown: (props) => <TextFilter
name='email'
{...props}
@@ -298,8 +301,7 @@
title: '閭楠岃瘉',
dataIndex: 'emailVerified$',
valueType: 'text',
- hidden: true,
- width: 140,
+ hidden: false,
filterDropdown: (props) => <SelectFilter
name='emailVerified'
{...props}
@@ -311,27 +313,11 @@
]}
/>,
},
- // {
- // title: '瑙掕壊',
- // valueType: 'text',
- // hidden: false,
- // width: 100,
- // render: (_, record) => {
- // if (record.roleIds && record.roleIds.length > 0) {
- // Http.doGetPromise('api/role/list/name/' + record.roleIds.join(','), null, (res) => {
- // return '-'
- // });
- // } else {
- // return '-'
- // }
- // },
- // },
{
title: '鐪熷疄濮撳悕',
dataIndex: 'realName',
valueType: 'text',
- hidden: true,
- width: 140,
+ hidden: false,
filterDropdown: (props) => <TextFilter
name='realName'
{...props}
@@ -343,8 +329,7 @@
title: '韬唤璇佸彿',
dataIndex: 'idCard',
valueType: 'text',
- hidden: true,
- width: 140,
+ hidden: false,
filterDropdown: (props) => <TextFilter
name='idCard'
{...props}
@@ -356,8 +341,7 @@
title: '鍑虹敓鏃ユ湡',
dataIndex: 'birthday',
valueType: 'text',
- hidden: true,
- width: 140,
+ hidden: false,
filterDropdown: (props) => <TextFilter
name='birthday'
{...props}
@@ -369,8 +353,7 @@
title: '涓汉绠�浠�',
dataIndex: 'introduction',
valueType: 'text',
- hidden: true,
- width: 140,
+ hidden: false,
filterDropdown: (props) => <TextFilter
name='introduction'
{...props}
@@ -383,7 +366,6 @@
dataIndex: 'status$',
valueType: 'text',
hidden: false,
- width: 80,
render: (_, record) => {
const status = statusMap[record.status]
return <Tag color={status.color}>{status.text}</Tag>
@@ -403,8 +385,7 @@
title: '娣诲姞鏃堕棿',
dataIndex: 'createTime$',
valueType: 'text',
- hidden: true,
- width: 140,
+ hidden: false,
filterDropdown: (props) => <DatetimeRangeFilter
name='createTime'
{...props}
@@ -416,8 +397,7 @@
title: '淇敼鏃堕棿',
dataIndex: 'updateTime$',
valueType: 'text',
- hidden: true,
- width: 140,
+ hidden: false,
filterDropdown: (props) => <DatetimeRangeFilter
name='updateTime'
{...props}
@@ -429,8 +409,7 @@
title: '淇敼浜哄憳',
dataIndex: 'updateBy$',
valueType: 'text',
- hidden: true,
- width: 140,
+ hidden: false,
filterDropdown: (props) => <LinkFilter
name='updateBy'
major='user'
@@ -443,8 +422,7 @@
title: '澶囨敞',
dataIndex: 'memo',
valueType: 'text',
- hidden: true,
- width: 140,
+ hidden: false,
filterDropdown: (props) => <TextFilter
name='memo'
{...props}
@@ -456,39 +434,42 @@
{
title: '鎿嶄綔',
dataIndex: 'option',
- width: 150,
valueType: 'option',
+ width: 180,
render: (_, record) => [
<Button
type="link"
key="edit"
+ style={{ padding: '2px 3px' }}
onClick={() => {
setModalVisible(true);
setCurrentRow(record);
}}
>
- 缂栬緫
+ <FormattedMessage id='page.edit' defaultMessage='缂栬緫' />
</Button>,
<Button
type="link"
key="pwd"
+ style={{ padding: '2px 2px' }}
onClick={() => {
setPwdModalVisible(true);
setCurrentRow(record);
}}
>
- 閲嶇疆瀵嗙爜
+ <FormattedMessage id='page.reset.pwd' defaultMessage='閲嶇疆瀵嗙爜' />
</Button>,
<Button
type="link"
danger
+ style={{ padding: '4px' }}
key="remove"
onClick={async () => {
Modal.confirm({
- title: '鍒犻櫎',
- content: '纭畾鍒犻櫎璇ラ」鍚楋紵',
+ title: intl.formatMessage({ id: 'page.delete', defaultMessage: '鍒犻櫎' }),
+ content: intl.formatMessage({ id: 'page.delete.confirm', defaultMessage: '纭畾鍒犻櫎璇ラ」鍚楋紵' }),
onOk: async () => {
- const success = await handleRemove([record]);
+ const success = await handleRemove([record], intl);
if (success) {
if (actionRef.current) {
actionRef.current.reload();
@@ -498,8 +479,21 @@
});
}}
>
- 鍒犻櫎
+ <FormattedMessage id='page.delete' defaultMessage='鍒犻櫎' />
</Button>,
+ <TableDropdown
+ key="actionGroup"
+ name="dropdown"
+ onSelect={(key) => {
+ if (key === 'assign') {
+ setAssignModalVisible(true);
+ setCurrentRow(record);
+ }
+ }}
+ menus={[
+ { key: 'assign', name: intl.formatMessage({ id: 'page.assign.role', defaultMessage: '鍒嗛厤瑙掕壊' }) },
+ ]}
+ />,
],
},
];
@@ -512,10 +506,13 @@
>
<Row gutter={[16, 24]}>
<Col lg={6} md={24}>
- <Card title="閮ㄩ棬" style={{ width: '100%', height: 'calc(100vh - 252px)' }}>
+ <Card
+ title={intl.formatMessage({ id: 'system.dept', defaultMessage: '閮ㄩ棬' })}
+ style={{ width: '100%', height: 'calc(100vh - 160px)' }}
+ >
<Input
style={{ marginBottom: 10 }}
- placeholder="璇疯緭鍏�"
+ placeholder={intl.formatMessage({ id: 'commont.enter', defaultMessage: '璇疯緭鍏�' })}
onChange={(e) => {
const { value } = e.target;
loadDeptTreeData({
@@ -523,7 +520,7 @@
})
}}
/>
- <div style={{ height: 'calc(100vh - 402px)', overflowY: 'auto' }}>
+ <div style={{ height: 'calc(100vh - 325px)', overflowY: 'auto' }}>
{deptTreeLoading ? (
<Skeleton active />
) : (
@@ -556,9 +553,10 @@
formRef={formTableRef}
columns={columns}
cardBordered
- scroll={{ y: boxHeight }}
+ size='small'
+ // scroll={{ y: boxHeight }}
dateFormatter="string"
- pagination={{ pageSize: 20 }}
+ pagination={{ pageSize: 12 }}
search={false}
toolbar={{
search: {
@@ -585,11 +583,11 @@
hidden={selectedRows?.length === 0}
onClick={async () => {
Modal.confirm({
- title: '鏄惁纭鍒犻櫎鎵�閫夋暟鎹」?',
+ title: intl.formatMessage({ id: 'page.delete', defaultMessage: '鍒犻櫎' }),
+ content: intl.formatMessage({ id: 'page.delete.confirm', defaultMessage: '纭畾鍒犻櫎璇ラ」鍚楋紵' }),
icon: <ExclamationCircleOutlined />,
- content: '璇疯皑鎱庢搷浣�',
async onOk() {
- const success = await handleRemove(selectedRows);
+ const success = await handleRemove(selectedRows, intl);
if (success) {
setSelectedRows([]);
actionRef.current.reload();
@@ -600,7 +598,7 @@
}}
>
<DeleteOutlined />
- 鍒犻櫎
+ <FormattedMessage id='page.delete' defaultMessage='鍒犻櫎' />
</Button>,
<Button
type="primary"
@@ -610,16 +608,16 @@
}}
>
<PlusOutlined />
- 娣诲姞
+ <FormattedMessage id='page.add' defaultMessage='娣诲姞' />
</Button>,
<Button
key="export"
onClick={async () => {
- handleExport();
+ handleExport(intl);
}}
>
<ExportOutlined />
- 瀵煎嚭
+ <FormattedMessage id='page.export' defaultMessage='瀵煎嚭' />
</Button>,
],
}}
@@ -639,9 +637,23 @@
}
}}
columnsState={{
- persistenceKey: 'pro-table-user',
+ persistenceKey: TABLE_KEY,
persistenceType: 'localStorage',
defaultValue: {
+ password: { show: repairBug(TABLE_KEY, 'password', false) },
+ avatar: { show: repairBug(TABLE_KEY, 'avatar', false) },
+ code: { show: repairBug(TABLE_KEY, 'code', false) },
+ phone: { show: repairBug(TABLE_KEY, 'phone', false) },
+ email: { show: repairBug(TABLE_KEY, 'email', false) },
+ emailVerified$: { show: repairBug(TABLE_KEY, 'emailVerified$', false) },
+ realName: { show: repairBug(TABLE_KEY, 'realName', false) },
+ idCard: { show: repairBug(TABLE_KEY, 'idCard', false) },
+ birthday: { show: repairBug(TABLE_KEY, 'birthday', false) },
+ introduction: { show: repairBug(TABLE_KEY, 'introduction', false) },
+ createTime$: { show: repairBug(TABLE_KEY, 'createTime$', false) },
+ updateTime$: { show: repairBug(TABLE_KEY, 'updateTime$', false) },
+ updateBy$: { show: repairBug(TABLE_KEY, 'updateBy$', false) },
+ memo: { show: repairBug(TABLE_KEY, 'memo', false) },
option: { fixed: 'right', disable: true },
},
onChange(value) {
@@ -649,60 +661,85 @@
}}
/>
</Col>
-
- <Edit
- open={modalVisible}
- values={currentRow || {}}
- treeData={deptTreeData}
- onCancel={
- () => {
- setModalVisible(false);
- setCurrentRow(undefined);
- }
- }
- onSubmit={async (values) => {
- let ok = false;
- if (values.id) {
- ok = await handleUpdate({ ...values })
- } else {
- ok = await handleSave({ ...values })
- }
- if (ok) {
- setModalVisible(false);
- setCurrentRow(undefined);
- if (actionRef.current) {
- actionRef.current.reload();
- }
- }
- }
- }
- />
-
- <Pwd
- open={pwdModalVisible}
- values={currentRow || {}}
- onCancel={
- () => {
- setPwdModalVisible(false);
- setCurrentRow(undefined);
- }
- }
- onSubmit={async (values) => {
- let ok = false;
- if (values.id) {
- ok = await handlePwd({ ...values })
- }
- if (ok) {
- setPwdModalVisible(false);
- setCurrentRow(undefined);
- if (actionRef.current) {
- actionRef.current.reload();
- }
- }
- }
- }
- />
</Row>
+
+ <Edit
+ open={modalVisible}
+ values={currentRow || {}}
+ treeData={deptTreeData}
+ onCancel={
+ () => {
+ setModalVisible(false);
+ setCurrentRow(undefined);
+ }
+ }
+ onSubmit={async (values) => {
+ let ok = false;
+ if (values.id) {
+ ok = await handleUpdate({ ...values }, intl)
+ } else {
+ ok = await handleSave({ ...values }, intl)
+ }
+ if (ok) {
+ setModalVisible(false);
+ setCurrentRow(undefined);
+ if (actionRef.current) {
+ actionRef.current.reload();
+ }
+ }
+ }
+ }
+ />
+
+ <Pwd
+ open={pwdModalVisible}
+ values={currentRow || {}}
+ onCancel={
+ () => {
+ setPwdModalVisible(false);
+ setCurrentRow(undefined);
+ }
+ }
+ onSubmit={async (values) => {
+ let ok = false;
+ if (values.id) {
+ ok = await handlePwd({ ...values }, intl)
+ }
+ if (ok) {
+ setPwdModalVisible(false);
+ setCurrentRow(undefined);
+ if (actionRef.current) {
+ actionRef.current.reload();
+ }
+ }
+ }
+ }
+ />
+
+ <AssignRole
+ open={assignModalVisible}
+ values={currentRow || {}}
+ onCancel={
+ () => {
+ setAssignModalVisible(false);
+ setCurrentRow(undefined);
+ }
+ }
+ onSubmit={async (values) => {
+ let ok = false;
+ if (values.id) {
+ ok = await handleUpdate({ ...values }, intl)
+ }
+ if (ok) {
+ setAssignModalVisible(false);
+ setCurrentRow(undefined);
+ if (actionRef.current) {
+ actionRef.current.reload();
+ }
+ }
+ }}
+ />
+
</PageContainer>
);
};
--
Gitblit v1.9.1