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 |  574 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 376 insertions(+), 198 deletions(-)

diff --git a/zy-asrs-flow/src/pages/system/user/index.jsx b/zy-asrs-flow/src/pages/system/user/index.jsx
index 56fc45c..dd0f2f9 100644
--- a/zy-asrs-flow/src/pages/system/user/index.jsx
+++ b/zy-asrs-flow/src/pages/system/user/index.jsx
@@ -1,85 +1,112 @@
-
 import React, { useState, useRef, useEffect } from 'react';
-import { Button, message, Modal } from 'antd';
+import { Button, message, Modal, Row, Col, Card, Tree, Input, Tag, Skeleton } from 'antd';
 import {
     FooterToolbar,
     PageContainer,
     ProTable,
     LightFilter,
+    TableDropdown
 } from '@ant-design/pro-components';
-import { PlusOutlined, ExportOutlined } from '@ant-design/icons';
+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('姝e湪娣诲姞');
+const TABLE_KEY = "pro-table-user";
+
+const handleSave = async (val, intl) => {
+    const hide = message.loading(intl.formatMessage({ id: 'page.adding', defaultMessage: '姝e湪娣诲姞' }));
     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('姝e湪鏇存柊');
+const handleUpdate = async (val, intl) => {
+    const hide = message.loading(intl.formatMessage({ id: 'page.updating', defaultMessage: '姝e湪鏇存柊' }));
     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('姝e湪鍒犻櫎');
+    const hide = message.loading(intl.formatMessage({ id: 'page.deleting', defaultMessage: '姝e湪鍒犻櫎' }));
     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('姝e湪瀵煎嚭');
+const handleExport = async (intl) => {
+    const hide = message.loading(intl.formatMessage({ id: 'page.exporting', defaultMessage: '姝e湪瀵煎嚭' }));
     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, intl) => {
+    const hide = message.loading(intl.formatMessage({ id: 'page.resetting', defaultMessage: '姝e湪閲嶇疆' }));
+    try {
+        const resp = await Http.doPost('api/user/reset/pwd', val);
+        if (resp.code === 200) {
+            message.success(intl.formatMessage({ id: 'page.reset.success', defaultMessage: '閲嶇疆鎴愬姛' }));
+            return true;
+        } else {
+            message.error(resp.msg);
+            return false;
+        }
+    } catch (error) {
+        message.error(intl.formatMessage({ id: 'page.reset.fail', defaultMessage: '閲嶇疆澶辫触璇烽噸璇曪紒' }));
         return false;
     } finally {
         hide();
@@ -88,6 +115,7 @@
 
 
 const Main = () => {
+    const intl = useIntl();
     const formTableRef = useRef();
     const actionRef = useRef();
     const [selectedRows, setSelectedRows] = useState([]);
@@ -95,52 +123,110 @@
     const [currentRow, setCurrentRow] = useState();
     const [searchParam, setSearchParam] = useState({});
 
-    useEffect(() => {
+    const [boxHeight, setBoxHeight] = useState();
+    const [deptTreeLoading, setDeptTreeLoading] = useState(false);
+    const [deptTreeData, setDeptTreeData] = useState([]);
+    const [deptExpandedKeys, setDeptExpandedKeys] = useState([]);
 
+    const [pwdModalVisible, setPwdModalVisible] = useState(false);
+
+    const [assignModalVisible, setAssignModalVisible] = useState(false);
+
+    const loadDeptTreeData = (param) => {
+        setDeptTreeLoading(true);
+        Http.doPostPromise('/api/dept/tree', param, (res) => {
+            setDeptTreeLoading(false);
+            const rootMenu = { id: 0, name: '鍏ㄩ儴', value: 0, children: [] };
+            rootMenu.children = res.data;
+            // const treeData = transformTreeData([rootMenu]);
+            const treeData = transformTreeData(res.data);
+            setDeptTreeData(treeData);
+            const treeAllKeys = getTreeAllKeys(treeData);
+            setDeptExpandedKeys(treeAllKeys);
+        }).catch((err) => {
+            console.error(err);
+            setDeptTreeLoading(false);
+        })
+    }
+
+    useEffect(() => {
+        const handleResize = () => setBoxHeight(window.innerHeight - 320);
+        window.addEventListener('resize', handleResize);
+        handleResize();
+
+        loadDeptTreeData();
+
+        return () => window.removeEventListener('resize', handleResize);
     }, []);
 
     const columns = [
         {
-            title: 'No',
+            title: intl.formatMessage({
+                id: 'page.table.no',
+                defaultMessage: 'No'
+            }),
             dataIndex: 'index',
             valueType: 'indexBorder',
             width: 48,
         },
         {
-            title: '璐﹀彿',
+            title: '閮ㄩ棬',
+            dataIndex: 'deptId$',
+            valueType: 'text',
+            hidden: false,
+            render: (_, record) => {
+                if (_ && _ !== '-') {
+                    return <Tag color={""}>{_}</Tag>
+                } else {
+                    return '-'
+                }
+            },
+            // filterDropdown: (props) => <LinkFilter
+            //     name='deptId'
+            //     major='dept'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            // />,
+        },
+        {
+            title: '鐧诲綍璐﹀彿',
             dataIndex: 'username',
             valueType: 'text',
             hidden: false,
-            width: 140,
+            copyable: true,
             filterDropdown: (props) => <TextFilter
                 name='username'
                 {...props}
                 actionRef={actionRef}
                 setSearchParam={setSearchParam}
             />,
+            render: (_, record) => {
+                return <span style={{ fontWeight: "bold" }}>{_}</span>
+            }
+        },
+        {
+            title: '鍚嶇О',
+            dataIndex: 'nickname',
+            valueType: 'text',
+            hidden: false,
+            filterDropdown: (props) => <TextFilter
+                name='nickname'
+                {...props}
+                actionRef={actionRef}
+                setSearchParam={setSearchParam}
+            />,
+            render: (_, record) => {
+                return <span style={{ fontWeight: "bold" }}>{_}</span>
+            }
         },
         {
             title: '瀵嗙爜',
             dataIndex: 'password',
             valueType: 'password',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <TextFilter
                 name='password'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
-        },
-        {
-            title: '鏄电О',
-            dataIndex: 'nickname',
-            valueType: 'text',
-            hidden: false,
-            width: 140,
-            copyable: true,
-            filterDropdown: (props) => <TextFilter
-                name='nickname'
                 {...props}
                 actionRef={actionRef}
                 setSearchParam={setSearchParam}
@@ -151,7 +237,6 @@
             dataIndex: 'avatar',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <TextFilter
                 name='avatar'
                 {...props}
@@ -164,7 +249,6 @@
             dataIndex: 'code',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <TextFilter
                 name='code'
                 {...props}
@@ -177,7 +261,6 @@
             dataIndex: 'sex$',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <SelectFilter
                 name='sex'
                 {...props}
@@ -195,7 +278,6 @@
             dataIndex: 'phone',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <TextFilter
                 name='phone'
                 {...props}
@@ -208,7 +290,6 @@
             dataIndex: 'email',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <TextFilter
                 name='email'
                 {...props}
@@ -221,7 +302,6 @@
             dataIndex: 'emailVerified$',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <SelectFilter
                 name='emailVerified'
                 {...props}
@@ -234,25 +314,10 @@
             />,
         },
         {
-            title: '鎵�灞為儴闂�',
-            dataIndex: 'deptId$',
-            valueType: 'text',
-            hidden: false,
-            width: 140,
-            filterDropdown: (props) => <LinkFilter
-                name='deptId'
-                major='dept'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
-        },
-        {
             title: '鐪熷疄濮撳悕',
             dataIndex: 'realName',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <TextFilter
                 name='realName'
                 {...props}
@@ -265,7 +330,6 @@
             dataIndex: 'idCard',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <TextFilter
                 name='idCard'
                 {...props}
@@ -278,7 +342,6 @@
             dataIndex: 'birthday',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <TextFilter
                 name='birthday'
                 {...props}
@@ -291,7 +354,6 @@
             dataIndex: 'introduction',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <TextFilter
                 name='introduction'
                 {...props}
@@ -304,7 +366,10 @@
             dataIndex: 'status$',
             valueType: 'text',
             hidden: false,
-            width: 140,
+            render: (_, record) => {
+                const status = statusMap[record.status]
+                return <Tag color={status.color}>{status.text}</Tag>
+            },
             filterDropdown: (props) => <SelectFilter
                 name='status'
                 {...props}
@@ -321,23 +386,8 @@
             dataIndex: 'createTime$',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <DatetimeRangeFilter
                 name='createTime'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
-        },
-        {
-            title: '娣诲姞浜哄憳',
-            dataIndex: 'createBy$',
-            valueType: 'text',
-            hidden: false,
-            width: 140,
-            filterDropdown: (props) => <LinkFilter
-                name='createBy'
-                major='user'
                 {...props}
                 actionRef={actionRef}
                 setSearchParam={setSearchParam}
@@ -348,7 +398,6 @@
             dataIndex: 'updateTime$',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <DatetimeRangeFilter
                 name='updateTime'
                 {...props}
@@ -361,7 +410,6 @@
             dataIndex: 'updateBy$',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <LinkFilter
                 name='updateBy'
                 major='user'
@@ -375,7 +423,6 @@
             dataIndex: 'memo',
             valueType: 'text',
             hidden: false,
-            width: 140,
             filterDropdown: (props) => <TextFilter
                 name='memo'
                 {...props}
@@ -387,29 +434,42 @@
         {
             title: '鎿嶄綔',
             dataIndex: 'option',
-            width: 140,
             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
-                    key="batchRemove"
+                    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();
@@ -419,126 +479,194 @@
                         });
                     }}
                 >
-                    鍒犻櫎
+                    <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: '鍒嗛厤瑙掕壊' }) },
+                    ]}
+                />,
             ],
         },
     ];
 
     return (
-        <PageContainer>
-            <div style={{ width: '100%', float: 'right' }}>
-                <ProTable
-                    key="user"
-                    rowKey="id"
-                    actionRef={actionRef}
-                    formRef={formTableRef}
-                    columns={columns}
-                    cardBordered
-                    scroll={{ x: 1300 }}
-                    dateFormatter="string"
-                    pagination={{ pageSize: 20 }}
-                    search={false}
-                    toolbar={{
-                        search: {
-                            onSearch: (value) => {
-                                setSearchParam(prevState => ({
-                                    ...prevState,
-                                    condition: value
-                                }));
-                                actionRef.current?.reload();
-                            },
-                        },
-                        filter: (
-                            <LightFilter
-                                onValuesChange={(val) => {
-                                }}
-                            >
-                            </LightFilter>
-                        ),
-                        actions: [
-                            <Button
-                                type="primary"
-                                key="save"
-                                onClick={async () => {
-                                    setModalVisible(true)
-                                }}
-                            >
-                                <PlusOutlined />
-                                娣诲姞
-                            </Button>,
-                            <Button
-                                key="export"
-                                onClick={async () => {
-                                    handleExport();
-                                }}
-                            >
-                                <ExportOutlined />
-                                瀵煎嚭
-                            </Button>,
-                        ],
-                    }}
-                    request={(params, sorter, filter) =>
-                        Http.doPostPromise('/api/user/page', { ...params, ...searchParam }, (res) => {
-                            return {
-                                data: res.data.records,
-                                total: res.data.total,
-                                success: true,
-                            }
-                        })
-                    }
-                    rowSelection={{
-                        onChange: (ids, rows) => {
-                            setSelectedRows(rows);
-                        }
-                    }}
-                    columnsState={{
-                        persistenceKey: 'pro-table-user',
-                        persistenceType: 'localStorage',
-                        defaultValue: {
-                            option: { fixed: 'right', disable: true },
-                        },
-                        onChange(value) {
-                        },
-                    }}
-                />
-            </div>
-
-            {selectedRows?.length > 0 && (
-                <FooterToolbar
-                    extra={
-                        <div>
-                            宸查�夋嫨
-                            <a style={{ fontWeight: 600 }}>{selectedRows.length}</a>
-                            椤�
-                        </div>
-                    }
-                >
-                    <Button
-                        key="remove"
-                        danger
-                        onClick={async () => {
-                            Modal.confirm({
-                                title: '鍒犻櫎',
-                                content: '纭畾鍒犻櫎璇ラ」鍚楋紵',
-                                onOk: async () => {
-                                    const success = await handleRemove(selectedRows);
-                                    if (success) {
-                                        setSelectedRows([]);
-                                        actionRef.current?.reloadAndRest?.();
-                                    }
-                                },
-                            });
-                        }}
+        <PageContainer
+            header={{
+                breadcrumb: {},
+            }}
+        >
+            <Row gutter={[16, 24]}>
+                <Col lg={6} md={24}>
+                    <Card
+                        title={intl.formatMessage({ id: 'system.dept', defaultMessage: '閮ㄩ棬' })}
+                        style={{ width: '100%', height: 'calc(100vh - 160px)' }}
                     >
-                        鎵归噺鍒犻櫎
-                    </Button>
-                </FooterToolbar>
-            )}
+                        <Input
+                            style={{ marginBottom: 10 }}
+                            placeholder={intl.formatMessage({ id: 'commont.enter', defaultMessage: '璇疯緭鍏�' })}
+                            onChange={(e) => {
+                                const { value } = e.target;
+                                loadDeptTreeData({
+                                    condition: value
+                                })
+                            }}
+                        />
+                        <div style={{ height: 'calc(100vh - 325px)', overflowY: 'auto' }}>
+                            {deptTreeLoading ? (
+                                <Skeleton active />
+                            ) : (
+                                <Tree
+                                    showLine
+                                    blockNode
+                                    defaultExpandAll    // 寮傛鍔犺浇澶辨晥
+                                    expandedKeys={deptExpandedKeys}
+                                    onExpand={setDeptExpandedKeys}
+                                    treeData={deptTreeData}
+                                    switcherIcon={<DownOutlined />}
+                                    onSelect={(selectedKeys, info) => {
+                                        const deptId = selectedKeys[0];
+                                        setSearchParam(prevState => ({
+                                            ...prevState,
+                                            deptId: deptId
+                                        }));
+                                        actionRef.current?.reload();
+                                    }}
+                                />
+                            )}
+                        </div>
+                    </Card>
+                </Col>
+                <Col lg={18} md={24}>
+                    <ProTable
+                        key="user"
+                        rowKey="id"
+                        actionRef={actionRef}
+                        formRef={formTableRef}
+                        columns={columns}
+                        cardBordered
+                        size='small'
+                        // scroll={{ y: boxHeight }}
+                        dateFormatter="string"
+                        pagination={{ pageSize: 12 }}
+                        search={false}
+                        toolbar={{
+                            search: {
+                                onSearch: (value) => {
+                                    setSearchParam(prevState => ({
+                                        ...prevState,
+                                        condition: value
+                                    }));
+                                    actionRef.current?.reload();
+                                },
+                            },
+                            filter: (
+                                <LightFilter
+                                    onValuesChange={(val) => {
+                                    }}
+                                >
+                                </LightFilter>
+                            ),
+                            actions: [
+                                <Button
+                                    type="primary"
+                                    danger
+                                    key="removeBatch"
+                                    hidden={selectedRows?.length === 0}
+                                    onClick={async () => {
+                                        Modal.confirm({
+                                            title: intl.formatMessage({ id: 'page.delete', defaultMessage: '鍒犻櫎' }),
+                                            content: intl.formatMessage({ id: 'page.delete.confirm', defaultMessage: '纭畾鍒犻櫎璇ラ」鍚楋紵' }),
+                                            icon: <ExclamationCircleOutlined />,
+                                            async onOk() {
+                                                const success = await handleRemove(selectedRows, intl);
+                                                if (success) {
+                                                    setSelectedRows([]);
+                                                    actionRef.current.reload();
+                                                }
+                                            },
+                                            onCancel() { },
+                                        });
+                                    }}
+                                >
+                                    <DeleteOutlined />
+                                    <FormattedMessage id='page.delete' defaultMessage='鍒犻櫎' />
+                                </Button>,
+                                <Button
+                                    type="primary"
+                                    key="save"
+                                    onClick={async () => {
+                                        setModalVisible(true)
+                                    }}
+                                >
+                                    <PlusOutlined />
+                                    <FormattedMessage id='page.add' defaultMessage='娣诲姞' />
+                                </Button>,
+                                <Button
+                                    key="export"
+                                    onClick={async () => {
+                                        handleExport(intl);
+                                    }}
+                                >
+                                    <ExportOutlined />
+                                    <FormattedMessage id='page.export' defaultMessage='瀵煎嚭' />
+                                </Button>,
+                            ],
+                        }}
+                        request={(params, sorter, filter) =>
+                            Http.doPostPromise('/api/user/page1', { ...params, ...searchParam }, (res) => {
+                                return {
+                                    data: res.data.records,
+                                    total: res.data.total,
+                                    success: true,
+                                }
+                            })
+                        }
+                        tableAlertRender={false}
+                        rowSelection={{
+                            onChange: (ids, rows) => {
+                                setSelectedRows(rows);
+                            }
+                        }}
+                        columnsState={{
+                            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) {
+                            },
+                        }}
+                    />
+                </Col>
+            </Row>
 
             <Edit
                 open={modalVisible}
                 values={currentRow || {}}
+                treeData={deptTreeData}
                 onCancel={
                     () => {
                         setModalVisible(false);
@@ -548,9 +676,9 @@
                 onSubmit={async (values) => {
                     let ok = false;
                     if (values.id) {
-                        ok = await handleUpdate({ ...values })
+                        ok = await handleUpdate({ ...values }, intl)
                     } else {
-                        ok = await handleSave({ ...values })
+                        ok = await handleSave({ ...values }, intl)
                     }
                     if (ok) {
                         setModalVisible(false);
@@ -562,6 +690,56 @@
                 }
                 }
             />
+
+            <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