diff --git a/src/mock/user.js b/src/mock/user.js index 21f7d08..0400d9b 100644 --- a/src/mock/user.js +++ b/src/mock/user.js @@ -25,15 +25,22 @@ let usersListData = Mock.mock({ let database = usersListData.data +const EnumRoleType = { + ADMIN: 'admin', + DEFAULT: 'admin', + DEVELOPER: 'developer', +} + const userPermission = { DEFAULT: { visit: ['1', '2', '21', '7', '5', '51', '52', '53'], + role: EnumRoleType.DEFAULT, }, ADMIN: { - visit: ['1', '2', '7', '21', '3', '4', '41', '42', '43', '44', '45', '46', '5', '51', '52', '53', '6', '61', '62', '621', '622'], + role: EnumRoleType.ADMIN, }, DEVELOPER: { - visit: ['1', '2', '7', '21', '3', '4', '41', '42', '43', '44', '45', '46', '5', '51', '52', '53', '6', '61', '62', '621', '622'], + role: EnumRoleType.DEVELOPER, }, } diff --git a/src/models/app.js b/src/models/app.js index 5be1afe..f1891ac 100644 --- a/src/models/app.js +++ b/src/models/app.js @@ -2,8 +2,8 @@ import { query, logout } from '../services/app' import * as menusService from '../services/menus' import { routerRedux } from 'dva/router' import { parse } from 'qs' -import { config } from 'utils' -const { prefix } = config +import { prefix } from 'config' +import { EnumRoleType } from 'enums' export default { namespace: 'app', @@ -55,6 +55,9 @@ export default { user, permissions, menu: list.filter(item => { + if (permissions.role === EnumRoleType.ADMIN || permissions.role === EnumRoleType.DEVELOPER) { + return true + } const cases = [ permissions.visit.includes(item.id), item.mpid ? permissions.visit.includes(item.mpid) || item.mpid === '-1' : true, diff --git a/src/utils/enums.js b/src/utils/enums.js new file mode 100644 index 0000000..69840fe --- /dev/null +++ b/src/utils/enums.js @@ -0,0 +1,9 @@ +const EnumRoleType = { + ADMIN: 'admin', + DEFAULT: 'admin', + DEVELOPER: 'developer', +} + +module.exports = { + EnumRoleType, +} diff --git a/webpack.config.js b/webpack.config.js index ebf868b..820fdd1 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -29,6 +29,7 @@ module.exports = (webpackConfig) => { components: `${__dirname}/src/components`, utils: `${__dirname}/src/utils`, config: `${__dirname}/src/utils/config`, + enums: `${__dirname}/src/utils/enums`, } return webpackConfig