store增加setting

src/store/getters.js

@@ -3,32 +3,32 @@ export default {
   userId: state =>
     state.ibps.user.info && state.ibps.user.info.user
       ? state.ibps.user.info.user.id
-      : "", // 用户ID
+      : '', // 用户ID
   userName: state =>
     state.ibps.user.info && state.ibps.user.info.employee
       ? state.ibps.user.info.employee.name
-      : "", // 姓名
+      : '', // 姓名
   status: state =>
     state.ibps.user.info && state.ibps.user.info.employee
       ? state.ibps.user.info.employee.status
-      : "", // 用户状态
+      : '', // 用户状态
   role: state => (state.ibps.user.info ? state.ibps.user.info.role : []), // 用户信息
   position: state =>
     state.ibps.user.info && state.ibps.user.info.employee
       ? state.ibps.user.info.employee.positions
-      : "", // 用户部门信息
+      : '', // 用户部门信息
   mainPosition: state =>
     state.ibps.user.info && state.ibps.user.info.employee
       ? state.ibps.user.info.mainPosition
       : {}, // 用户部门信息
   isSuper: state =>
     state.ibps.user.info && state.ibps.user.info.user
-      ? state.ibps.user.info.user.isSuper === "Y"
+      ? state.ibps.user.info.user.isSuper === 'Y'
       : false, // 是否超级管理员
   account: state =>
     state.ibps.user.info && state.ibps.user.info.user
       ? state.ibps.user.info.user.account
-      : "", // 用户名
+      : '', // 用户名
 
   regOpen: state => state.ibps.user.regOpen, // 注册状态
 
@@ -64,5 +64,8 @@ export default {
       : [],
   // 获取用户最高层级
   level: state =>
-    state.ibps.param && state.ibps.param.level ? state.ibps.param.level : []
-};
+    state.ibps.param && state.ibps.param.level ? state.ibps.param.level : [],
+  // 获取配置信息
+  setting: (state) =>
+    state.ibps.param && state.ibps.param.setting ? state.ibps.param.setting : {}
+}

src/store/modules/ibps/modules/param.js

@@ -2,7 +2,7 @@ export default {
   namespaced: true,
   state: {
     // 所有菜单
-    myform: "",
+    myform: '',
     roleList: [],
     // 所有用户信息
     userList: [],
@@ -12,51 +12,59 @@ export default {
     flowList: [],
     // 当前用户层级
     level: {
-      first: "",
-      second: ""
-    }
+      first: '',
+      second: ''
+    },
+    // 配置信息
+    setting: {}
   },
   mutations: {
     myformSet(state, myform) {
-      state.myform = myform.myform || "";
+      state.myform = myform.myform || ''
     },
     roleList(state, data) {
-      state.roleList = data.length ? data : [];
+      state.roleList = data.length ? data : []
     },
     userList(state, data) {
-      state.userList = data.length ? data : [];
+      state.userList = data.length ? data : []
     },
     deptList(state, data) {
-      state.deptList = data.length ? data : [];
+      state.deptList = data.length ? data : []
     },
     pitchDept(state, data) {
-      state.pitchDept = data.length ? data : [];
+      state.pitchDept = data.length ? data : []
     },
     flowList(state, data) {
-      state.flowList = data.length ? data : [];
+      state.flowList = data.length ? data : []
     },
     level(state, data) {
-      state.level = data || { first: "", second: "" };
+      state.level = data || { first: '', second: '' }
+    },
+    setting(state, data) {
+      state.setting = data || {}
     }
   },
   actions: {
     setRoleList({ commit }, data) {
-      commit("roleList", data);
+      commit('roleList', data)
     },
     setUserList({ commit }, data) {
-      commit("userList", data);
+      commit('userList', data)
     },
     setDeptList({ commit }, data) {
-      commit("deptList", data);
+      commit('deptList', data)
     },
     setpitchDept({ commit }, data) {
-      commit("pitchDept", data);
+      commit('pitchDept', data)
     },
     setLevel({ commit }, data) {
-      commit("level", data);
+      commit('level', data)
+    },
+    setSetting({ commit }, data) {
+      commit('setting', data)
     },
     setflowList({ commit }, data) {
-      commit("flowList", data);
+      commit('flowList', data)
     }
   }
-};
+}

src/store/modules/ibps/modules/user.js

@@ -1,6 +1,8 @@
 import { getUserInfo } from '@/api/oauth2/user'
 import common from '@/utils/common'
 import { dbSqlConfig } from '@/constant'
+import { getSetting } from '@/utils/query'
+import Utils from '@/utils/util'
 
 export default {
   namespaced: true,
@@ -97,6 +99,10 @@ export default {
                 root: true
               })
             }
+            // 获取所有配置信息
+            await dispatch('ibps/param/setSetting', await getSetting(), {
+              root: true
+            })
             // 获取所有用户信息
             await dispatch('getRoleList', level)
             // 获取所有用户信息
@@ -109,6 +115,9 @@ export default {
             // await dispatch('ibps/system/loadSystem', null, {
             //   root: true
             // })
+            // 尝试从配置数据中获取 否则使用默认
+            const highRoles = await getSetting('system', 'highRoles')
+            Utils.isNotEmpty(highRoles) && (info.highRoles = highRoles)
             resolve(info)
           })
           .catch(error => {