fix: 修改名称和传入的类型

src/pages/Permission/Role/components/SetPermission/index.tsx

@@ -5,16 +5,11 @@ import { setRolePermission } from '@/services/permission'
 import { useRequest } from 'umi'
 const { TabPane } = Tabs
 
-const SetPermission = ({ ID, roleType = 'system', activeKey, menuRoles }) => {
+const PermTabs = ({ setPermission: { ID, roleType = 'system', activeKey }, menuRoles }) => {
   const [state, setState] = useState({
     frontPermission: [], // 前台权限
     backstagePermission: [] // 后台权限
   })
-  console.log(menuRoles)
-  menuRoles.map(item => {
-    item.frontPermission
-  })
-
   const { run: trySetRolePermission } = useRequest(
     (params: API.SetRolePermissionParams) => setRolePermission(params),
     {
@@ -405,4 +400,4 @@ const SetPermission = ({ ID, roleType = 'system', activeKey, menuRoles }) => {
   )
 }
 
-export default SetPermission
+export default PermTabs

src/pages/Permission/Role/index.tsx

@@ -12,16 +12,19 @@ import React, { useState } from 'react'
 import { useRequest } from 'umi'
 import ConnectModal from './components/ConnectModal'
 import RoleLeftMenu from './components/RoleLeftMenu'
-import SetPermission from './components/SetPermission'
+import PermTabs from './components/PermTabs'
 const { TabPane } = Tabs
 
 const Role = () => {
   const [state, setState] = useState({
     currentRoleID: '',
     roleType: '',
+    frontPermission: [],
     roleStaff: [],
     activeKey: ''
   })
+  console.log(state.frontPermission)
+
   const [menuRoles, setMenuRoles] = useState<API.MenuRoleItem[]>([])
   const { run: tryGetRoleStaffList } = useRequest(
     (roleID: string) => fetchRoleListByRoleId({ roleID }),
@@ -43,8 +46,8 @@ const Role = () => {
     }
   )
 
-  const onSelect = (currentRoleID: string, roleType: string) => {
-    setState({ ...state, currentRoleID, roleType })
+  const onSelect = (currentRoleID: string, roleType: string, frontPermission: []) => {
+    setState({ ...state, currentRoleID, roleType, frontPermission })
     tryGetRoleStaffList(currentRoleID)
   }
 
@@ -56,7 +59,7 @@ const Role = () => {
           key: item.ID,
           title: item.name,
           roleType: item.roleType,
-          frontPermission: item.frontPermission
+          frontPermission: item?.frontPermission
         }))
       )
       result?.length && onSelect?.(result[0]?.ID)
@@ -114,25 +117,26 @@ const Role = () => {
               />
             )}
           </div>
-          <div>
-            <Tabs>
-              <TabPane tab="用户列表" key="1">
-                <Table<API.MenuByRoleIdItem>
-                  columns={columns}
-                  dataSource={state.roleStaff}
-                  rowKey={row => row.id}
-                />
-              </TabPane>
-              <TabPane tab="功能权限" key="2">
-                <SetPermission
-                  ID={state.currentRoleID}
-                  roleType={state.roleType}
-                  menuRoles={menuRoles}
-                  activeKey={state.activeKey}
-                />
-              </TabPane>
-            </Tabs>
-          </div>
+          <Tabs>
+            <TabPane tab="用户列表" key="1">
+              <Table<API.MenuByRoleIdItem>
+                columns={columns}
+                dataSource={state.roleStaff}
+                rowKey={row => row.id}
+              />
+            </TabPane>
+            <TabPane tab="功能权限" key="2">
+              <PermTabs
+                setPermission={state}
+                // ID={state.currentRoleID}
+                // roleType={state.roleType}
+                // activeKey={state.activeKey}
+                menuRoles={menuRoles.map(item => {
+                  item.frontPermission
+                })}
+              />
+            </TabPane>
+          </Tabs>
         </div>
       </div>
     </PageContainer>