From dd4aed9cf4d30ac7a9e43fb6fb54bc7a187752bf Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 18 Mar 2021 20:37:43 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=B8=AD=E8=A7=92=E8=89=B2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/User/UserCreateUpdate.vue | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue
index 4287060e3..cd9900408 100644
--- a/src/views/users/User/UserCreateUpdate.vue
+++ b/src/views/users/User/UserCreateUpdate.vue
@@ -9,7 +9,6 @@
 import { GenericCreateUpdatePage } from '@/layout/components'
 import UserPassword from '@/components/UserPassword'
 import RoleCheckbox from '@/views/users/User/components/RoleCheckbox'
-import { mapGetters } from 'vuex'
 import rules from '@/components/DataForm/rules'
 
 export default {
@@ -82,7 +81,7 @@ export default {
         role: {
           label: this.$t('users.SuperRole'),
           hidden: () => {
-            return !this.currentOrgIsRoot && this.publicSettings.role === 'Admin'
+            return !this.$store.getters.currentUserIsSuperAdmin
           }
         },
         org_roles: {
@@ -90,10 +89,10 @@ export default {
           label: this.$t('users.OrgRole'),
           component: RoleCheckbox,
           hidden: () => {
-            return !this.publicSettings.XPACK_LICENSE_IS_VALID
+            return !this.$store.getters.hasValidLicense
           },
           el: {
-            disabled: false,
+            disabled: this.$store.getters.currentOrgIsRoot,
             rule: []
           },
           helpText: this.$t('users.HelpText.OrgRoleHelpText')
@@ -110,14 +109,6 @@ export default {
       }
     }
   },
-  computed: {
-    ...mapGetters(['publicSettings', 'currentOrgIsRoot'])
-  },
-  mounted() {
-    if (this.currentOrgIsRoot) {
-      this.fieldsMeta.org_roles.el.disabled = true
-    }
-  },
   methods: {
     cleanFormValue(value) {
       const method = this.getMethod()