超级管理员角色引入以及控制

src/components/admin/userManagement.jsx

@@ -47,14 +47,14 @@ class UserManagement extends React.Component {
         const moreOperatingMenu = (
             <Menu className='operationmenu' visible={true}>
                 <Menu.Item
-                    disabled={currentUser.code === newOne.code}
+                    disabled={currentUser.code === newOne.code || newOne.role === 'superAdmin'}
                     onClick={() => {
                         dispatch({ type: 'user/remoteModify', fields: {
                             role: newOne.role === 'admin' ? 'normal' : 'admin'
                         } });
                     }}
                 >
-                    <Icon type="key" />{ newOne.role === 'admin' ? '取消管理员' : '设为管理员'}
+                    <Icon type="key" />{ newOne.role === 'admin' ? '取消管理员' : ( newOne.role === 'superAdmin' ? '超级管理员' : '设为管理员')}
                 </Menu.Item>
             </Menu>
         );
@@ -84,14 +84,14 @@ class UserManagement extends React.Component {
             title: '角色',
             dataIndex: 'role',
             width: 100,
-            render: text => text === 'admin' ? '管理员' : '普通用户'
+            render: text => text === 'admin' ? '管理员' : ( text === 'superAdmin' ? '超级管理员' : '普通用户')
         }, {
             title: '操作',
-            render: (text, record, index) => (
-                <Dropdown code={record.code} overlay={moreOperatingMenu} trigger={['click']} >
+            render: (text, record, index) => {
+                return record.role === 'superAdmin' ? null : <Dropdown code={record.code} overlay={moreOperatingMenu} trigger={['click']} >
                     <Icon type="setting" />
                 </Dropdown>
-            ),
+            },
             width: 50
         }];
 

src/components/chartDesigner/sections/style/index.jsx

@@ -1,17 +1,17 @@
 // import TableStyle from './table'
-// import BarStyle from './bar'
+import BarStyle from './bar'
 
 export default ({ viewType }) => {
     let styleForm = <div>无可用样式配置</div>;
-    // const formItemLayout = {
-    //     labelCol: { span: 8 },
-    //     wrapperCol: { span: 16 },
-    // };
+    const formItemLayout = {
+        labelCol: { span: 8 },
+        wrapperCol: { span: 16 },
+    };
 
     if(viewType === 'dataView') {
         // styleForm = <TableStyle formItemLayout={formItemLayout}/>
     }else if(viewType === 'bar') {
-        // styleForm = <BarStyle formItemLayout={formItemLayout}/>
+        styleForm = <BarStyle formItemLayout={formItemLayout}/>
     }
     return styleForm;
 }

src/components/common/navigator.jsx

@@ -47,7 +47,7 @@ class Navigator extends React.Component {
                 <div className='logo'></div>
             </div>
             <div className='navigator-content'>
-                {currentUser.role === 'admin' && <Menu
+                {(currentUser.role === 'admin' || currentUser.role === 'superAdmin') && <Menu
                     className='navigator-menu'
                     selectedKeys={[page]}
                     mode="horizontal"

src/components/common/selectUserBox/selectUserBox.jsx

@@ -42,7 +42,7 @@ class AddGroupMemberBox extends React.Component {
                         name: d.name,
                         account: d.userName + '',
                         password: d.passWord,
-                        role: d.role === 'admin' ? 'admin' : 'default',
+                        role: d.role === 'admin' ? 'admin' : (d.role === 'superAdmin' ? 'superAdmin' : 'normal'),
                         department: d.department,
                         post: d.post,
                     })),

src/components/dataSource/list.jsx

@@ -414,7 +414,7 @@ class DataSource extends React.Component {
                                             dispatch({ type: 'dataSource/setNewModelField', name: 'type', value: type });
                                             dispatch({type: 'main/redirect', path: {pathname: '/workshop/datasource/'+ type +'/create/base'}});
                                         }}>
-                                            { currentUser.role === 'admin' && <Menu.Item key='database'>来自数据库</Menu.Item>}
+                                            { (currentUser.role === 'admin' || currentUser.role === 'superAdmin') && <Menu.Item key='database'>来自数据库</Menu.Item>}
                                             <Menu.Item disabled key='file'>来自文件</Menu.Item>
                                         </Menu>
                                     )} trigger={['click']}>

src/components/user/userInfo.jsx

@@ -58,6 +58,7 @@ const UserInfo = ({ main, dispatch }) => {
                     >
                         <Select disabled defaultValue={role}>
                             <Select.Option value='admin'>管理员</Select.Option>
+                            <Select.Option value='superAdmin'>超级管理员</Select.Option>
                             <Select.Option value='normal'>普通用户</Select.Option>
                         </Select>
                     </FormItem>

src/constants/url.js

@@ -1,6 +1,6 @@
 // const BASE_URL = 'http://10.1.1.168:8081/BI/';
 // const BASE_URL = 'http://10.1.81.2:24000/BI_DEV/';
-// const BASE_URL = 'http://10.1.80.78:8097/BI_DEV/';
+// const BASE_URL = 'http://10.1.80.78:8012/BI_DEV/';
 const BASE_URL = ''
 
 /**后台接口地址 */

src/models/main.js

@@ -127,7 +127,7 @@ export default {
                         phone: user.phone,
                         password: autoLogin ? password : '',
                         name: user.name,
-                        role: user.role || 'default',
+                        role: user.role || 'normal',
                         department: user.department,
                         job: user.post,
                     };