From d215942a44246306dfde78e9b11bc8c0c04d5010 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 5 Jun 2020 17:56:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataZTree/components/ZTree/index.vue      |  1 -
 src/layout/components/NavBar/Organization.vue | 60 +------------------
 .../components/NavHeader/AccountDropdown.vue  | 47 ++++++++++-----
 src/permission.js                             |  2 +-
 src/store/getters.js                          |  3 +-
 src/store/modules/users.js                    | 16 +----
 src/utils/org.js                              | 60 +++++++++++++++++++
 src/utils/startup.js                          | 17 ++++++
 8 files changed, 114 insertions(+), 92 deletions(-)
 create mode 100644 src/utils/org.js

diff --git a/src/components/DataZTree/components/ZTree/index.vue b/src/components/DataZTree/components/ZTree/index.vue
index 5d41f7795..4e2d620ec 100644
--- a/src/components/DataZTree/components/ZTree/index.vue
+++ b/src/components/DataZTree/components/ZTree/index.vue
@@ -58,7 +58,6 @@ export default {
             name: this.$t('common.tree.Empty')
           })
         }
-        console.log(this.treeSetting)
         this.zTree = $.fn.zTree.init($('#ztree'), this.treeSetting, res)
         if (this.treeSetting.showRefresh) {
           this.rootNodeAddDom(
diff --git a/src/layout/components/NavBar/Organization.vue b/src/layout/components/NavBar/Organization.vue
index 28ba53368..3f8be89f2 100644
--- a/src/layout/components/NavBar/Organization.vue
+++ b/src/layout/components/NavBar/Organization.vue
@@ -25,8 +25,8 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import { hasUUID } from '@/utils/common'
 import rolec from '@/utils/role'
+import orgUtil from '@/utils/org'
 export default {
   props: {
     isCollapse: {
@@ -44,70 +44,14 @@ export default {
     ]),
     inAdminPage() {
       return (this.currentRole & rolec.PERM_USE) !== rolec.PERM_USE
-    },
-    orgIdMapper() {
-      const mapper = {}
-      this.userAdminOrgList.forEach((v) => {
-        mapper[v.id] = v
-      })
-      return mapper
-    }
-  },
-  mounted() {
-    if (this.inAdminPage) {
-      this.checkCurrentOrgIsNeedChange()
     }
   },
   methods: {
     needShow() {
       return !this.isCollapse && this.userAdminOrgList.length > 1 && this.inAdminPage
     },
-    checkCurrentOrgIsNeedChange() {
-      if (!this.currentOrg || typeof this.currentOrg !== 'object') {
-        this.$log.debug('Not has current org')
-        this.change2PropOrg()
-        return
-      }
-      if (!this.hasCurrentOrgPermission()) {
-        this.$log.debug('Not has current org permission')
-        this.change2PropOrg()
-      }
-    },
-    getPropOrg() {
-      let defaultOrg = this.userAdminOrgList.find((item) => item.id === '')
-      if (defaultOrg) {
-        return defaultOrg
-      }
-      defaultOrg = this.userAdminOrgList.find((item) => item.id === 'DEFAULT')
-      if (defaultOrg) {
-        return defaultOrg
-      }
-      return this.userAdminOrgList[0]
-    },
-    change2PropOrg() {
-      const org = this.getPropOrg()
-      setTimeout(() => this.changeOrg(org.id), 100)
-    },
-    hasCurrentOrgPermission() {
-      const currentOrgId = this.currentOrg.id
-      const orgInList = this.userAdminOrgList.find((item) => item.id === currentOrgId)
-      return orgInList
-    },
     changeOrg(orgId) {
-      const org = this.orgIdMapper[orgId]
-      if (!org) {
-        this.$log.debug('Error: org not found')
-      } else {
-        this.$log.debug('Change to org: ', org)
-      }
-      this.$store.dispatch('users/setCurrentOrg', org).then(() => {
-        this.$log.debug('Set current org to: ', org)
-        if (hasUUID(location.href)) {
-          location.href = process.env.VUE_APP_PUBLIC_PATH
-        } else {
-          window.location.reload(true)
-        }
-      })
+      orgUtil.changeOrg(orgId)
     }
   }
 }
diff --git a/src/layout/components/NavHeader/AccountDropdown.vue b/src/layout/components/NavHeader/AccountDropdown.vue
index e5b59bdd4..a6354e80a 100644
--- a/src/layout/components/NavHeader/AccountDropdown.vue
+++ b/src/layout/components/NavHeader/AccountDropdown.vue
@@ -8,7 +8,7 @@
       </span>
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item icon="el-icon-user" command="profile">{{ $t('common.nav.Profile') }}</el-dropdown-item>
-        <div v-if="currentOrgRoles.length > 1|| hasAdminOrg ">
+        <div v-if="currentOrgRoles.length > 1 || hasAdminOrg ">
           <el-dropdown-item v-if="isInAdminRole " icon="el-icon-guide" command="userPage">
             {{ $t('common.nav.UserPage') }}
           </el-dropdown-item>
@@ -28,6 +28,7 @@
 import { mapGetters } from 'vuex'
 import ApiKey from './ApiKey'
 import rolec from '@/utils/role'
+import orgUtil from '@/utils/org'
 
 export default {
   name: 'AccountDropdown',
@@ -41,23 +42,31 @@ export default {
     }
   },
   computed: {
+    ...mapGetters([
+      'currentUser',
+      'currentRole',
+      'currentOrgRoles',
+      'userAdminOrgList',
+      'currentOrgPerms'
+    ]),
     isInAdminRole() {
-      const inAdmin = rolec.hasPerm(this.currentRole, rolec.PERM_ADMIN)
-      this.$log.debug('Current in admin role: ', inAdmin)
+      const inAdmin = (this.currentRole & this.adminPageRequirePerm) !== 0
       return inAdmin
     },
     hasAdminOrg() {
       return this.userAdminOrgList.length > 0
     },
-    hasAdminRole() {
-      return this.currentOrgRoles.includes('Admin')
+    adminPageRequirePerm() {
+      return rolec.PERM_SUPER | rolec.PERM_ADMIN | rolec.PERM_AUDIT
     },
-    ...mapGetters([
-      'currentUser',
-      'currentRole',
-      'currentOrgRoles',
-      'userAdminOrgList'
-    ])
+    currentOrgAdminPagePerm() {
+      // 只有有一个权限就可以
+      return this.adminPageRequirePerm & this.currentOrgPerms
+    },
+    currentOrgUsePagePerm() {
+      const userPageRequireRole = rolec.PERM_USE
+      return userPageRequireRole & this.currentOrgPerms
+    }
   },
   methods: {
     handleClick(val) {
@@ -66,13 +75,19 @@ export default {
           this.$router.push({ name: 'UserProfile' })
           break
         case 'adminPage':
-          this.$store.dispatch('users/setCurrentRole', this.currentOrgRoles[0])
-          window.location.href = `/ui/`
+          this.$store.dispatch('users/setCurrentRole', this.currentOrgAdminPagePerm)
+          if (this.currentOrgAdminPagePerm) {
+            window.location.href = `/ui/`
+          } else {
+            orgUtil.change2PropOrg()
+          }
           break
         case 'userPage':
-          this.$store.dispatch('users/setCurrentRole', this.currentOrgRoles[1])
-          console.log('Switch to: ', this.currentOrgRoles[1])
-          window.location.href = `/ui/`
+          if (this.currentOrgUsePagePerm) {
+            this.$store.dispatch('users/setCurrentRole', rolec.USER)
+            console.log('Switch to: ', rolec.USER)
+            window.location.href = `/ui/`
+          }
           break
         case 'logout':
           window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
diff --git a/src/permission.js b/src/permission.js
index 31985863c..6895ee700 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -16,7 +16,7 @@ router.beforeEach(async(to, from, next) => {
     next()
   } catch (e) {
     const msg = 'Start service error: ' + e
-    console.log(msg)
+    console.log(e)
   }
 })
 
diff --git a/src/store/getters.js b/src/store/getters.js
index 623625c08..e82ec5cd7 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -11,6 +11,7 @@ const getters = {
   cachedViews: state => state.tagsView.cachedViews,
   publicSettings: state => state.settings.publicSettings,
   customSettings: state => state.settings.customSettings,
-  currentOrgRoles: state => state.users.roles
+  currentOrgRoles: state => state.users.roles,
+  currentOrgPerms: state => state.users.perms
 }
 export default getters
diff --git a/src/store/modules/users.js b/src/store/modules/users.js
index c207caa2e..65c0eaed4 100644
--- a/src/store/modules/users.js
+++ b/src/store/modules/users.js
@@ -96,6 +96,7 @@ const actions = {
         const { current_org_roles: currentOrgRoles, role } = profile
         const roles = rolec.parseUserRoles(currentOrgRoles, role)
         commit('SET_ROLES', roles)
+        commit('SET_PERMS', rolec.sumPerms(roles))
         resolve(roles)
       }).catch((e) => {
         reject(e)
@@ -114,21 +115,6 @@ const actions = {
       }).catch((e) => reject(e))
     })
   },
-  getTotalPerms({ commit, dispatch, state }, refresh) {
-    return new Promise((resolve, reject) => {
-      if (!refresh && state.perms && state.perms !== 0) {
-        return resolve(state.perms)
-      }
-      dispatch('getRoles').then(roles => {
-        let perms = 0b00000000
-        for (const role of roles) {
-          perms |= role
-        }
-        commit('SET_PERMS', perms)
-        resolve(perms)
-      }).catch((e) => reject(e))
-    })
-  },
   // user logout
   logout({ commit, state }) {
     return new Promise((resolve, reject) => {
diff --git a/src/utils/org.js b/src/utils/org.js
new file mode 100644
index 000000000..fcd0b0fba
--- /dev/null
+++ b/src/utils/org.js
@@ -0,0 +1,60 @@
+import { hasUUID } from '@/utils/common'
+import store from '@/store'
+
+function getPropOrg() {
+  const userAdminOrgList = store.getters.userAdminOrgList
+  let defaultOrg = userAdminOrgList.find((item) => item.id === '')
+  if (defaultOrg) {
+    return defaultOrg
+  }
+  defaultOrg = userAdminOrgList.find((item) => item.id === 'DEFAULT')
+  if (defaultOrg) {
+    return defaultOrg
+  }
+  return userAdminOrgList[0]
+}
+
+function change2PropOrg() {
+  const org = getPropOrg()
+  setTimeout(() => changeOrg(org.id), 100)
+}
+
+function getOrgIdMapper() {
+  const mapper = {}
+  const userAdminOrgList = store.getters.userAdminOrgList
+  userAdminOrgList.forEach((v) => {
+    mapper[v.id] = v
+  })
+  return mapper
+}
+
+function hasCurrentOrgPermission() {
+  const currentOrg = store.getters.currentOrg
+  const currentOrgId = currentOrg.id
+  const userAdminOrgList = store.getters.userAdminOrgList
+  const orgInList = userAdminOrgList.find((item) => item.id === currentOrgId)
+  return orgInList
+}
+
+function changeOrg(orgId) {
+  const org = getOrgIdMapper()[orgId]
+  if (!org) {
+    console.debug('Error: org not found')
+  } else {
+    console.debug('Change to org: ', org)
+  }
+  store.dispatch('users/setCurrentOrg', org).then(() => {
+    console.log('Set current org to: ', org)
+    if (hasUUID(location.href)) {
+      location.href = process.env.VUE_APP_PUBLIC_PATH
+    } else {
+      window.location.reload(true)
+    }
+  })
+}
+
+export default {
+  hasCurrentOrgPermission,
+  changeOrg,
+  change2PropOrg
+}
diff --git a/src/utils/startup.js b/src/utils/startup.js
index b30b07f7f..86cf8d5b5 100644
--- a/src/utils/startup.js
+++ b/src/utils/startup.js
@@ -5,6 +5,7 @@ import { Message } from 'element-ui'
 import 'nprogress/nprogress.css' // progress bar style
 import { getTokenFromCookie } from '@/utils/auth'
 import rolec from '@/utils/role'
+import orgUtil from '@/utils/org'
 
 const whiteList = ['/login', process.env.VUE_APP_LOGIN_PATH] // no redirect whitelist
 let initial = false
@@ -48,6 +49,21 @@ async function getPublicSetting({ to, from, next }) {
   }
 }
 
+async function changeCurrentOrgIsNeed({ to, from, next }) {
+  const currentOrg = store.getters.currentOrg
+
+  if (!currentOrg || typeof currentOrg !== 'object') {
+    console.log('Not has current org')
+    orgUtil.change2PropOrg()
+    return reject('change prop org')
+  }
+  if (!orgUtil.hasCurrentOrgPermission()) {
+    this.$log.debug('Not has current org permission')
+    orgUtil.change2PropOrg()
+    return reject('change prop org')
+  }
+}
+
 export async function getUserRoleAndSetRoutes({ to, from, next }) {
   // determine whether the user has obtained his permission roles through getProfile
 
@@ -96,6 +112,7 @@ export async function startup({ to, from, next }) {
   await checkLogin({ to, from, next })
   await store.dispatch('users/getInOrgs')
   await store.dispatch('users/getRoles')
+  await changeCurrentOrgIsNeed({ to, from, next })
   await getPublicSetting({ to, from, next })
   await getUserRoleAndSetRoutes({ to, from, next })
   await checkUserFirstLogin({ to, from, next })