zhuth 6 anni fa
parent
commit
a980239405

+ 2 - 2
src/components/common/navigator.jsx

@@ -62,9 +62,9 @@ class Navigator extends React.Component {
                     <Menu.Item className='nav-page' key="workshop">
                         <Link to={lastWorkshopPage}>报表制作</Link>
                     </Menu.Item>
-                    <Menu.Item className='nav-page' key="setting">
+                    {currentUser.role === 'superAdmin' && <Menu.Item className='nav-page' key="setting">
                         <Link to={lastSettingPage}>系统管理</Link>
-                    </Menu.Item>
+                    </Menu.Item>}
                 </Menu>}
             </div>
             <div className='navigator-right'>

+ 5 - 4
src/components/dashboard/layout.jsx

@@ -10,8 +10,9 @@ const { Sider, Content } = Layout
 class DashboardLayout extends React.Component {
 
     render() {
-        const { siderLoading, dashboard, dispatch } = this.props;
+        const { main, siderLoading, dashboard, dispatch } = this.props;
         const { currentMenu, currentMenuParents } = dashboard;
+        const { currentUser } = main;
         return <Layout
             className='layout-dashboard'
         >
@@ -19,7 +20,7 @@ class DashboardLayout extends React.Component {
                 <Loading visible={siderLoading} />
                 <DashboardMenu
                     model={dashboard}
-                    editable={true}
+                    editable={currentUser.role === 'superAdmin'}
                     searchMenu={true}
                     onlyMenu={true}
                     hideEmptyMenu={false}
@@ -101,7 +102,7 @@ class DashboardLayout extends React.Component {
         </Layout>
     }
 }
-function mapStateToProps({ present: { loading, dashboard }}) {
+function mapStateToProps({ present: { main, loading, dashboard }}) {
     let effectsArr = ['dashboard/remoteMenuTree', 'dashboard/remoteAddMenu', 'dashboard/remoteDeleteMenu'];
     let flag = false;
     for(let i = 0; i < effectsArr.length; i++) {
@@ -111,6 +112,6 @@ function mapStateToProps({ present: { loading, dashboard }}) {
         }
     }
 
-    return { siderLoading: flag, dashboard }
+    return { main, siderLoading: flag, dashboard }
 }
 export default connect(mapStateToProps)(DashboardLayout)