outaozhen 3 lat temu
rodzic
commit
c57066717e

+ 12 - 2
src/pages/Permission/Role/components/PermTabs/index.tsx

@@ -5,7 +5,14 @@ import { setRolePermission } from '@/services/permission'
 import { useRequest } from 'umi'
 const { TabPane } = Tabs
 
-const PermTabs = ({ setPermission: { ID, roleType = 'system', activeKey }, menuRoles }) => {
+const PermTabs = ({
+  passPermissionValue: {
+    currentRoleID: ID,
+    roleType = 'system',
+    activeKey,
+    frontPermission: rolesPermission
+  }
+}) => {
   const [state, setState] = useState({
     frontPermission: [], // 前台权限
     backstagePermission: [] // 后台权限
@@ -45,7 +52,10 @@ const PermTabs = ({ setPermission: { ID, roleType = 'system', activeKey }, menuR
   }
   useEffect(() => {
     if (activeKey === '2') {
-      setState({ ...state, frontPermission: [] })
+      setState({
+        ...state,
+        frontPermission: rolesPermission?.toString()
+      })
     }
   }, [activeKey])
   return (

+ 3 - 1
src/pages/Permission/Role/components/RoleLeftMenu/index.tsx

@@ -122,7 +122,9 @@ const RoleLeftMenu = ({ onSelect, menuRoles, onReloadStaff }) => {
           {menuRoles.length ? (
             <DirectoryTree
               defaultSelectedKeys={[menuRoles[0]?.key]}
-              onSelect={(keys, node) => onSelect(keys[0], node.node.roleType)}
+              onSelect={(keys, node) =>
+                onSelect(keys[0], node.node.roleType, node.node.frontPermission)
+              }
               // onSelect={(keys, node) => console.log(keys)}
               showIcon={false}
               treeData={renderTreeNode(menuRoles)}

+ 1 - 5
src/pages/Permission/Role/index.tsx

@@ -23,7 +23,6 @@ const Role = () => {
     roleStaff: [],
     activeKey: ''
   })
-  console.log(state.frontPermission)
 
   const [menuRoles, setMenuRoles] = useState<API.MenuRoleItem[]>([])
   const { run: tryGetRoleStaffList } = useRequest(
@@ -127,13 +126,10 @@ const Role = () => {
             </TabPane>
             <TabPane tab="功能权限" key="2">
               <PermTabs
-                setPermission={state}
+                passPermissionValue={state}
                 // ID={state.currentRoleID}
                 // roleType={state.roleType}
                 // activeKey={state.activeKey}
-                menuRoles={menuRoles.map(item => {
-                  item.frontPermission
-                })}
               />
             </TabPane>
           </Tabs>