Commit ccd098e1 authored by 邓超's avatar 邓超

fix: 主管图标及交互修改,编辑跟修改密码合并改为双击修改

parent e6eba6d4
Pipeline #65367 waiting for manual action with stages
...@@ -285,14 +285,14 @@ const UserManage = () => { ...@@ -285,14 +285,14 @@ const UserManage = () => {
}} }}
> >
<UserOutlined <UserOutlined
style={{ fontSize: '20px', color: record.isManager ? '#FAAD14' : '#1890FF' }} style={{ fontSize: '16px', color: record.isManager ? '#FAAD14' : '#1890FF' }}
/> />
</Popconfirm> </Popconfirm>
</Tooltip> </Tooltip>
<Tooltip title="关联权限"> <Tooltip title="关联权限">
<IdcardOutlined <IdcardOutlined
onClick={() => relateRole(record)} onClick={() => relateRole(record)}
style={{ fontSize: '20px', color: '#1890FF' }} style={{ fontSize: '16px', color: '#1890FF' }}
/> />
</Tooltip> </Tooltip>
<Tooltip title="更改机构"> <Tooltip title="更改机构">
...@@ -301,15 +301,15 @@ const UserManage = () => { ...@@ -301,15 +301,15 @@ const UserManage = () => {
style={{ fontSize: '16px', color: '#1890FF' }} style={{ fontSize: '16px', color: '#1890FF' }}
/> />
</Tooltip> </Tooltip>
<Tooltip title="修改密码"> {/* <Tooltip title="修改密码">
<UnlockOutlined <UnlockOutlined
onClick={() => changePassword(record)} onClick={() => changePassword(record)}
style={{ fontSize: '16px', color: '#1890FF' }} style={{ fontSize: '16px', color: '#1890FF' }}
/> />
</Tooltip> </Tooltip> */}
<Tooltip title="编辑用户"> {/* <Tooltip title="编辑用户">
<EditTwoTone onClick={() => editUser(record)} style={{ fontSize: '16px' }} /> <EditTwoTone onClick={() => editUser(record)} style={{ fontSize: '16px' }} />
</Tooltip> </Tooltip> */}
{(record.state == 0 || record.state == null) && ( {(record.state == 0 || record.state == null) && (
<> <>
{record.loginName == 'panda' || record.loginName == 'admin' ? ( {record.loginName == 'panda' || record.loginName == 'admin' ? (
...@@ -329,7 +329,7 @@ const UserManage = () => { ...@@ -329,7 +329,7 @@ const UserManage = () => {
cancelText="取消" cancelText="取消"
onConfirm={() => freezeUser(record)} onConfirm={() => freezeUser(record)}
> >
<StopOutlined style={{ fontSize: '16px', color: '#e86060' }} /> <StopOutlined style={{ fontSize: '16px', color: '#1890ff' }} />
</Popconfirm> </Popconfirm>
</Tooltip> </Tooltip>
)} )}
...@@ -343,7 +343,7 @@ const UserManage = () => { ...@@ -343,7 +343,7 @@ const UserManage = () => {
placement="bottomRight" placement="bottomRight"
title={ title={
<p> <p>
即将解冻用户{' '} 即将解冻用户
<span className={styles.redText}>{voca.stripTags(record.loginName)}</span> <span className={styles.redText}>{voca.stripTags(record.loginName)}</span>
,是否确认解冻? ,是否确认解冻?
</p> </p>
...@@ -352,7 +352,7 @@ const UserManage = () => { ...@@ -352,7 +352,7 @@ const UserManage = () => {
cancelText="取消" cancelText="取消"
onConfirm={() => freezeUser(record)} onConfirm={() => freezeUser(record)}
> >
<UserOutlined style={{ fontSize: '16px', color: '#1890ff' }} /> <StopOutlined style={{ fontSize: '16px', color: '#e86060' }} />
</Popconfirm> </Popconfirm>
</Tooltip> </Tooltip>
</> </>
...@@ -1690,6 +1690,11 @@ const UserManage = () => { ...@@ -1690,6 +1690,11 @@ const UserManage = () => {
showQuickJumper: true, showQuickJumper: true,
showSizeChanger: true, showSizeChanger: true,
}} }}
onRow={record => ({
onDoubleClick: () => {
editUser(record);
},
})}
onChange={onChangeInput} onChange={onChangeInput}
/> />
)} )}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment