|
@@ -63,7 +63,8 @@ const System = () => {
|
|
const [state, setState] = useState({
|
|
const [state, setState] = useState({
|
|
id: '',
|
|
id: '',
|
|
roleStaff: [],
|
|
roleStaff: [],
|
|
- rolePermission: {}
|
|
|
|
|
|
+ rolePermission: {},
|
|
|
|
+ activeKey: ''
|
|
})
|
|
})
|
|
const onSelect = (id: string) => {
|
|
const onSelect = (id: string) => {
|
|
setState({ ...state, id })
|
|
setState({ ...state, id })
|
|
@@ -83,7 +84,9 @@ const System = () => {
|
|
manual: true,
|
|
manual: true,
|
|
onSuccess: (result: API.GetRolePermissionResultModel) => {
|
|
onSuccess: (result: API.GetRolePermissionResultModel) => {
|
|
const values = { ...formatPermission('init', result.permission) }
|
|
const values = { ...formatPermission('init', result.permission) }
|
|
- formRef.current?.setFieldsValue({ ...values })
|
|
|
|
|
|
+ setState({ ...state, rolePermission: values })
|
|
|
|
+
|
|
|
|
+ // formRef.current?.setFieldsValue({ ...values })
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
|
|
@@ -92,10 +95,13 @@ const System = () => {
|
|
tryGetRoleStaffList(state.id)
|
|
tryGetRoleStaffList(state.id)
|
|
tryGetRolePermissions(state.id)
|
|
tryGetRolePermissions(state.id)
|
|
}
|
|
}
|
|
|
|
+ if (state.activeKey === '2') {
|
|
|
|
+ formRef.current?.setFieldsValue({ ...state.rolePermission })
|
|
|
|
+ }
|
|
return () => {
|
|
return () => {
|
|
formRef.current?.resetFields()
|
|
formRef.current?.resetFields()
|
|
}
|
|
}
|
|
- }, [state.id])
|
|
|
|
|
|
+ }, [state.id, state.activeKey])
|
|
|
|
|
|
return (
|
|
return (
|
|
<div className="h-full w-full flex flex-row">
|
|
<div className="h-full w-full flex flex-row">
|
|
@@ -111,7 +117,10 @@ const System = () => {
|
|
/>
|
|
/>
|
|
)}
|
|
)}
|
|
</div>
|
|
</div>
|
|
- <Tabs defaultActiveKey="1" type="card">
|
|
|
|
|
|
+ <Tabs
|
|
|
|
+ defaultActiveKey="1"
|
|
|
|
+ type="card"
|
|
|
|
+ onChange={key => setState({ ...state, activeKey: key })}>
|
|
<TabPane tab="员工列表" key="1">
|
|
<TabPane tab="员工列表" key="1">
|
|
<Table<API.RoleStaffListItem>
|
|
<Table<API.RoleStaffListItem>
|
|
dataSource={state.roleStaff}
|
|
dataSource={state.roleStaff}
|