diff --git a/src/pages/Frame.tsx b/src/pages/Frame.tsx index 76723fc..932763f 100644 --- a/src/pages/Frame.tsx +++ b/src/pages/Frame.tsx @@ -6,7 +6,7 @@ import TankComponent from '../common/component/TankComponent'; import UserLogin from './user/Login'; import UserList from './user/List'; -import UserProfile from './user/Profile'; +import UserDetail from './user/Detail'; import UserEdit from './user/Edit'; import MatterDetail from './matter/Detail'; @@ -165,7 +165,7 @@ class RawFrame extends TankComponent { }/> - + diff --git a/src/pages/user/Profile.less b/src/pages/user/Detail.less similarity index 100% rename from src/pages/user/Profile.less rename to src/pages/user/Detail.less diff --git a/src/pages/user/Profile.tsx b/src/pages/user/Detail.tsx similarity index 93% rename from src/pages/user/Profile.tsx rename to src/pages/user/Detail.tsx index 4314e28..22b3c4d 100644 --- a/src/pages/user/Profile.tsx +++ b/src/pages/user/Detail.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import "./Profile.less" +import "./Detail.less" import TankComponent from "../../common/component/TankComponent"; import {Button} from 'antd'; import InfoCell from "../widget/InfoCell"; @@ -18,7 +18,7 @@ interface IState { } -export default class Profile extends TankComponent { +export default class Detail extends TankComponent { constructor(props: IProps) { super(props) diff --git a/src/pages/user/Edit.tsx b/src/pages/user/Edit.tsx index a6cb852..5d0e1fc 100644 --- a/src/pages/user/Edit.tsx +++ b/src/pages/user/Edit.tsx @@ -96,11 +96,18 @@ export default class Edit extends TankComponent { wrapperCol: {span: 18}, }; + //当前是否为编辑自己的模式。 let editSelf: boolean = false if (!this.createMode && user.uuid === currentUser.uuid) { editSelf = true } + //是否可以编辑角色。 + let roleEditable: boolean = false + if (this.createMode || (user.uuid !== currentUser.uuid && user.role === UserRole.ADMINISTRATOR)) { + roleEditable = true + } + return (
@@ -137,10 +144,9 @@ export default class Edit extends TankComponent { initialValue={currentUser.username} rules={[{required: true, message: '用户名必填!'}]} > - + - { this.createMode && ( { name="role" initialValue={currentUser.role} > - { UserRoleList.filter((item: ColorSelectionOption, index: number) => { return item.value !== UserRole.GUEST