From 18cbe578f008c701900cdd51dd52d44eac1ab725 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Tue, 8 Sep 2020 20:09:09 +0800
Subject: [PATCH 01/37] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0Submodule?=
 =?UTF-8?q?=E6=8C=87=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/xpack b/src/views/xpack
index e69841681..75cfab2b8 160000
--- a/src/views/xpack
+++ b/src/views/xpack
@@ -1 +1 @@
-Subproject commit e69841681e3cbc0cc66b2b26fa1170858154d673
+Subproject commit 75cfab2b8797df560956845dadbdda1493458323

From bbe54eae48219151496764cc43f2005ccc0ac65a Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Fri, 18 Sep 2020 11:23:11 +0800
Subject: [PATCH 02/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DBuild=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xpack/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/views/xpack/.gitkeep

diff --git a/src/views/xpack/.gitkeep b/src/views/xpack/.gitkeep
new file mode 100644
index 000000000..e69de29bb

From 266d107ffd6aaa6c39cd3243527ea19e5a78e25b Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 18 Nov 2020 10:26:42 +0800
Subject: [PATCH 03/37] =?UTF-8?q?fix(clone):=20=E4=BF=AE=E5=A4=8D=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D=E9=A1=B5=E9=9D=A2=E4=BA=A7=E7=94=9F=E7=9A=84clone?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ListTable/index.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/ListTable/index.vue b/src/components/ListTable/index.vue
index 4f07e6d59..b6c46c8ce 100644
--- a/src/components/ListTable/index.vue
+++ b/src/components/ListTable/index.vue
@@ -46,10 +46,8 @@ export default {
     },
     iTableConfig() {
       const config = deepmerge(this.tableConfig, { extraQuery: this.extraQuery })
-      let hasClone = _.get(config, 'columnsMeta.actions.formatterArgs.hasClone')
-      if (this.headerActions.hasCreate && hasClone == null) {
-        hasClone = true
-      }
+      let hasClone = _.get(config, 'columnsMeta.actions.formatterArgs.hasClone', null)
+      hasClone = !!(this.headerActions.hasCreate && hasClone == null)
       _.set(config, 'columnsMeta.actions.formatterArgs.hasClone', hasClone)
       this.$log.debug('ListTable: iTableConfig change', config)
       return config

From c093e7d621c108d5fe54d60a35b1a10c154ff9a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E6=80=80=E7=A3=8A=E2=80=9D?= <2280131253@qq.com>
Date: Thu, 17 Feb 2022 11:28:36 +0800
Subject: [PATCH 04/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E6=8E=88=E6=9D=83=E5=88=9B=E5=BB=BA=E6=97=B6=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E4=BA=86=E7=82=B9=E5=87=BB=E7=9A=84?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=92=8C=E8=8A=82=E7=82=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改为指保留最后一次选中的资产或者节点
---
 src/components/AutoDataZTree/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue
index f0ff204b4..4e531f998 100644
--- a/src/components/AutoDataZTree/index.vue
+++ b/src/components/AutoDataZTree/index.vue
@@ -110,9 +110,11 @@ export default {
         this.currentNode = treeNode
         this.currentNodeId = treeNode.meta.data.id
         query['node'] = this.currentNodeId
+        query['asset'] = ''
         url = `${this.setting.url}${combinator}node_id=${treeNode.meta.data.id}&show_current_asset=${show_current_asset}`
       } else if (treeNode.meta.type === 'asset') {
         query['asset'] = treeNode.meta.data.id
+        query['node'] = ''
         url = `${this.setting.url}${combinator}asset_id=${treeNode.meta.data.id}&show_current_asset=${show_current_asset}`
       }
       this.$router.push({ query })

From f804b13b73b748513bcfa1e20a0db145f401cb80 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 12:35:40 +0800
Subject: [PATCH 05/37] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E8=BF=87=E6=BB=A4=E5=99=A8=E6=B7=BB=E5=8A=A0=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7=E5=8D=8F=E8=AE=AE=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue b/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue
index c08db6fdf..ece3a0fe2 100644
--- a/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue
+++ b/src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue
@@ -31,7 +31,7 @@ export default {
         icon: 'fa-info',
         title: this.$t('perms.addSystemUserToThisPermission'),
         objectsAjax: {
-          url: '/api/v1/assets/system-users/',
+          url: `/api/v1/assets/system-users/?protocol__in=ssh,telnet,mysql,postgresql,mariadb,oracle,sqlserver,k8s`,
           transformOption: (item) => {
             const username = item.username || '*'
             return { label: item.name + '(' + username + ')', value: item.id }

From 5f516f1fd1a4cc1bf6acfc872000add6bc8924ff Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 14:18:06 +0800
Subject: [PATCH 06/37] =?UTF-8?q?fix:=20=E4=BA=91=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E8=AF=A6=E6=83=85404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Cloud/Account/AccountDetail/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/assets/Cloud/Account/AccountDetail/index.vue b/src/views/assets/Cloud/Account/AccountDetail/index.vue
index 71e14edb5..4b138fca1 100644
--- a/src/views/assets/Cloud/Account/AccountDetail/index.vue
+++ b/src/views/assets/Cloud/Account/AccountDetail/index.vue
@@ -23,6 +23,7 @@ export default {
         name: '', provider: '', provider_display: '', validity_display: '', comment: '', date_created: '', created_by: ''
       },
       config: {
+        url: `/api/v1/xpack/cloud/accounts`,
         activeMenu: 'AccountDetail',
         submenu: [
           {

From d0504e8970f3409b5a3b39c30fb89ee8389f5089 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 14:41:45 +0800
Subject: [PATCH 07/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E8=A7=92=E8=89=B2=E6=88=90=E5=8A=9F=E5=90=8E=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E8=AF=A6=E6=83=85=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/Role/RoleCreateUpdate.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/users/Role/RoleCreateUpdate.vue b/src/views/users/Role/RoleCreateUpdate.vue
index 6a7693bca..e826d4492 100644
--- a/src/views/users/Role/RoleCreateUpdate.vue
+++ b/src/views/users/Role/RoleCreateUpdate.vue
@@ -18,6 +18,7 @@ export default {
       scopeRole: scope + 'role',
       config: {
         url: `/api/v1/rbac/${scope}-roles/`,
+        objectDetailRoute: { name: 'RoleDetail', query: { scope: scope }},
         initial: {
           scope: scope
         },

From 408e4d10e81a769f6a11a87493d90a0b800c555a Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 14:49:51 +0800
Subject: [PATCH 08/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E8=AF=A6=E6=83=85=E6=9B=B4=E6=96=B0=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/Role/RoleDetail/index.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/users/Role/RoleDetail/index.vue b/src/views/users/Role/RoleDetail/index.vue
index 49852febd..0e78ccc09 100644
--- a/src/views/users/Role/RoleDetail/index.vue
+++ b/src/views/users/Role/RoleDetail/index.vue
@@ -40,6 +40,11 @@ export default {
           },
           canUpdate: () => {
             return vm.hasPermNotBuiltinNotRootOrg(this.role, `rbac.change_${scopeRole}`)
+          },
+          updateRoute: {
+            name: this.$route.name.replace('Detail', 'Update'),
+            params: {},
+            query: { scope: scope }
           }
         },
         submenu: [

From 802084a350d4b8832d823d5f0a12313e036efeac Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Tue, 15 Mar 2022 14:27:33 +0800
Subject: [PATCH 09/37] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E6=8E=88=E6=9D=83=E5=88=B7=E6=96=B0=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetPermission/AssetPermissionList.vue   | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/views/perms/AssetPermission/AssetPermissionList.vue b/src/views/perms/AssetPermission/AssetPermissionList.vue
index 202df38b9..a2de7718b 100644
--- a/src/views/perms/AssetPermission/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionList.vue
@@ -185,28 +185,11 @@ export default {
             }
           ]
         },
-        hasBulkUpdate: false,
-        extraMoreActions: [
-          {
-            name: 'RefreshPermissionCache',
-            title: this.$t('perms.refreshPermissionCache'),
-            type: 'primary',
-            has: true,
-            callback: this.HandleRefreshPermissionCache
-          }
-        ]
+        hasBulkUpdate: false
       }
     }
   },
   methods: {
-    HandleRefreshPermissionCache() {
-      const url = '/api/v1/perms/asset-permissions/cache/refresh/'
-      this.$axios.get(url).then(res => {
-        this.$message.success(this.$t('perms.refreshSuccess'))
-      }).catch(err => {
-        this.$message.error(this.$t('perms.refreshFail') + ':' + err)
-      })
-    }
   }
 }
 </script>

From 666dbce88a6ae0cdcc28e24db93246f3473cc5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 15 Mar 2022 15:23:31 +0800
Subject: [PATCH 10/37] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96tabmenu=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/TabPage/index.vue | 31 +++++++++++--------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue
index a0f4414b6..ecaf79e13 100644
--- a/src/layout/components/TabPage/index.vue
+++ b/src/layout/components/TabPage/index.vue
@@ -9,15 +9,14 @@
 
     <div>
       <el-tabs
-        v-if="submenu.length > 0"
+        v-if="tabIndices.length > 0"
         slot="submenu"
         v-model="iActiveMenu"
         class="page-submenu"
         @tab-click="handleTabClick"
       >
-        <template v-for="item in submenu">
+        <template v-for="item in tabIndices">
           <el-tab-pane
-            v-if="checkShow(item)"
             :key="item.name"
             :label-content="item.labelContent"
             :name="item.name"
@@ -69,9 +68,12 @@ export default {
       }
     },
     tabIndices() {
-      const map = {}
-      this.submenu.forEach((v, i) => {
-        map[v.name] = i
+      const map = []
+      this.submenu.forEach((v) => {
+        const hidden = typeof v.hidden === 'function' ? v.hidden() : v.hidden
+        if (!hidden) {
+          map.push(v)
+        }
       })
       return map
     }
@@ -80,13 +82,6 @@ export default {
     this.iActiveMenu = this.getPropActiveTab()
   },
   methods: {
-    checkShow(item) {
-      let hidden = item.hidden
-      if (typeof hidden === 'function') {
-        hidden = hidden()
-      }
-      return !hidden
-    },
     handleTabClick(tab) {
       this.$emit('tab-click', tab)
       this.$emit('update:activeMenu', tab.name)
@@ -108,14 +103,16 @@ export default {
       ]
 
       for (const preTab of preActiveTabs) {
-        for (const tabName in this.tabIndices) {
-          if (preTab && tabName && preTab.toLowerCase() === tabName.toLowerCase()) {
-            return tabName
+        const currentTab = typeof preTab === 'object' ? preTab.name : preTab
+        for (const tabName of this.tabIndices) {
+          const currentTabName = tabName?.name || ''
+          if (currentTab && currentTabName && currentTab.toLowerCase() === currentTabName.toLowerCase()) {
+            return currentTabName
           }
         }
       }
 
-      activeTab = this.submenu[0].name
+      activeTab = this.tabIndices[0].name
       return activeTab
     }
   }

From 9e55e1145b3dee556a438132558b1c1911ef944a Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 15:41:23 +0800
Subject: [PATCH 11/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BD=95?=
 =?UTF-8?q?=E5=83=8F=E3=80=81=E5=91=BD=E4=BB=A4=E5=AD=98=E5=82=A8=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settings/Terminal/Storage/CommandStorage.vue | 6 ++++--
 src/views/settings/Terminal/Storage/ReplayStorage.vue  | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/settings/Terminal/Storage/CommandStorage.vue b/src/views/settings/Terminal/Storage/CommandStorage.vue
index f65be70c7..3d8f6a68f 100644
--- a/src/views/settings/Terminal/Storage/CommandStorage.vue
+++ b/src/views/settings/Terminal/Storage/CommandStorage.vue
@@ -68,13 +68,13 @@ export default {
             prop: 'id',
             formatterArgs: {
               canUpdate: function({ row }) {
-                return (row.name !== 'default' && row.name !== 'null')
+                return (row.name !== 'default' && row.name !== 'null' && vm.$hasPerm('terminal.change_commandstorage'))
               },
               onUpdate: function({ row }) {
                 this.$router.push({ name: 'CommandStorageUpdate', params: { id: row.id }})
               },
               canDelete: function({ row }) {
-                return (row.name !== 'default' && row.name !== 'null')
+                return (row.name !== 'default' && row.name !== 'null' && vm.$hasPerm('terminal.delete_commandstorage'))
               },
               hasClone: false,
               extraActions: [
@@ -82,6 +82,7 @@ export default {
                   name: 'test',
                   title: this.$t('sessions.test'),
                   type: 'primary',
+                  can: vm.$hasPerm('terminal.change_commandstorage'),
                   callback: function({ row, col, cellValue, reload }) {
                     TestCommandStorage(row.id).then(data => {
                       if (!data['is_valid']) {
@@ -96,6 +97,7 @@ export default {
                   name: 'set_to_default',
                   title: this.$t('sessions.SetToDefault'),
                   type: 'primary',
+                  can: vm.$hasPerm('terminal.change_commandstorage'),
                   callback: function({ row, col, cellValue, reload }) {
                     SetToDefaultCommandStorage(row.id).then(data => {
                       vm.$refs.ListTable.reloadTable()
diff --git a/src/views/settings/Terminal/Storage/ReplayStorage.vue b/src/views/settings/Terminal/Storage/ReplayStorage.vue
index b628fe0c4..89b2eef19 100644
--- a/src/views/settings/Terminal/Storage/ReplayStorage.vue
+++ b/src/views/settings/Terminal/Storage/ReplayStorage.vue
@@ -29,6 +29,7 @@ export default {
       replayTableConfig: {
         url: '/api/v1/terminal/replay-storages/',
         permissions: {
+          app: 'terminal',
           resource: 'replaystorage'
         },
         columns: ['name', 'type', 'comment', 'is_default', 'actions'],
@@ -60,16 +61,19 @@ export default {
                 this.$router.push({ name: 'ReplayStorageUpdate', params: { id: row.id }, query: { type: row.type }})
               },
               canUpdate: function({ row }) {
-                return (row.name !== 'default' && row.name !== 'null')
+                return (
+                  row.name !== 'default' && row.name !== 'null' && vm.$hasPerm('terminal.change_replaystorage')
+                )
               },
               canDelete: function({ row }) {
-                return (row.name !== 'default' && row.name !== 'null')
+                return (row.name !== 'default' && row.name !== 'null' && vm.$hasPerm('terminal.delete_replaystorage'))
               },
               hasClone: false,
               extraActions: [
                 {
                   name: 'test',
                   title: this.$t('sessions.test'),
+                  can: vm.$hasPerm('terminal.change_replaystorage'),
                   type: 'primary',
                   callback: function({ row, col, cellValue, reload }) {
                     TestReplayStorage(row.id).then(data => {
@@ -84,6 +88,7 @@ export default {
                 {
                   name: 'set_to_default',
                   title: this.$t('sessions.SetToDefault'),
+                  can: this.$hasPerm('terminal.change_replaystorage'),
                   type: 'primary',
                   callback: function({ row, col, cellValue, reload }) {
                     SetToDefaultReplayStorage(row.id).then(data => {

From d92528ca7c6e16cc22377b089e0ac06e8f9ee308 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Tue, 15 Mar 2022 16:22:30 +0800
Subject: [PATCH 12/37] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=EF=BC=8C=E7=AB=99=E5=86=85=E4=BF=A1=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=20(#1491)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf: 修改订阅，站内信显示禁用

* perf: 修改一些 bug

Co-authored-by: ibuler <ibuler@qq.com>
---
 src/router/profile/index.js                  |  1 +
 src/views/settings/MessageSub/index.vue      | 61 +++++++++++---------
 src/views/users/Role/RoleDetail/RoleInfo.vue | 14 +++--
 3 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/src/router/profile/index.js b/src/router/profile/index.js
index bb0080158..208fded28 100644
--- a/src/router/profile/index.js
+++ b/src/router/profile/index.js
@@ -11,6 +11,7 @@ export default {
     view: 'profile',
     type: 'view',
     showNavSwitcher: false,
+    showOrganization: false,
     permissions: []
   },
   children: [
diff --git a/src/views/settings/MessageSub/index.vue b/src/views/settings/MessageSub/index.vue
index 28c622edd..00473a9a3 100644
--- a/src/views/settings/MessageSub/index.vue
+++ b/src/views/settings/MessageSub/index.vue
@@ -16,7 +16,12 @@
         </el-table-column>
         <el-table-column v-for="header in receiveBackends" :key="header.id" :label="header.name_display" width="120">
           <template #default="scope">
-            <el-checkbox v-if="!scope.row.children" v-model="scope.row.receive_backends[header.name]" @change="onCheckReceiveBackend(scope.row)" />
+            <el-checkbox
+              v-if="!scope.row.children"
+              v-model="scope.row.receiveBackends[header.name]"
+              :disabled="header.name === 'site_msg'"
+              @change="onCheckReceiveBackend(scope.row)"
+            />
           </template>
         </el-table-column>
         <el-table-column :label="$t('notifications.Receivers')" show-overflow-tooltip>
@@ -26,7 +31,9 @@
         </el-table-column>
         <el-table-column :label="$t('common.Actions')" width="200">
           <template #default="scope">
-            <el-button v-if="!scope.row.children" type="small" @click="onOpenDialog(scope.row)">{{ $t('notifications.ChangeReceiver') }}</el-button>
+            <el-button v-if="!scope.row.children" type="small" @click="onOpenDialog(scope.row)">
+              {{ $t('notifications.ChangeReceiver') }}
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -69,13 +76,13 @@ export default {
   methods: {
     onCheckReceiveBackend(sub) {
       const backends = []
-      for (const [name, checked] of Object.entries(sub.receive_backends)) {
+      for (const [name, checked] of Object.entries(sub.receiveBackends)) {
         if (checked) { backends.push(name) }
       }
 
       this.$axios.patch(
         `/api/v1/notifications/system-msg-subscription/${sub.id}/`,
-        { receive_backends: backends }
+        { receiveBackends: backends }
       ).catch(err => {
         this.$log.error(err)
       })
@@ -100,45 +107,43 @@ export default {
       this.dialogVisible = true
     },
     async initBackends() {
-      const backends = await this.$axios.get('/api/v1/notifications/backends/')
-      backends.forEach(backend => {
-        if (backend.name !== 'site_msg') {
-          this.receiveBackends.push(backend)
-        }
+      let backends = []
+      backends = await this.$axios.get('/api/v1/notifications/backends/')
+      this.receiveBackends = backends.filter(backend => {
+        return backend.name // !== 'site_msg'
       })
     },
     async initSubscriptions() {
       const subscriptions = await this.$axios.get('/api/v1/notifications/system-msg-subscription/')
-
-      const trans_subscriptions = []
+      const subCategory = []
 
       for (const category of subscriptions) {
-        const children = []
-        trans_subscriptions.push({
-          id: category.category,
-          value: category.category_label,
-          children: children
-        })
+        const subItems = []
+        const item = {
+          id: category['category'],
+          value: category['category_label'],
+          children: subItems
+        }
 
-        for (const sub of category.children) {
+        for (const item of category['children']) {
           const backendsChecked = {}
           this.receiveBackends.forEach(backend => {
-            backendsChecked[backend.name] = sub.receive_backends.indexOf(backend.name) > -1
+            backendsChecked[backend.name] = item['receive_backends'].indexOf(backend.name) > -1
           })
 
-          const trans_sub = {
-            id: sub.message_type,
-            value: sub.message_type_label,
-            receivers: sub.receivers,
-            receive_backends: backendsChecked
+          const subItem = {
+            id: item['message_type'],
+            value: item['message_type_label'],
+            receivers: item.receivers,
+            receiveBackends: backendsChecked
           }
-          children.push(trans_sub)
+          subItems.push(subItem)
 
-          this.idMessageTypeMapper[trans_sub.id] = trans_sub
+          this.idMessageTypeMapper[subItem.id] = subItems
         }
+        subCategory.push(item)
       }
-
-      this.tableData = trans_subscriptions
+      this.tableData = subCategory
     }
   }
 }
diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue
index cb67c2f80..0bf0c647a 100644
--- a/src/views/users/Role/RoleDetail/RoleInfo.vue
+++ b/src/views/users/Role/RoleDetail/RoleInfo.vue
@@ -62,9 +62,7 @@ export default {
         callback: {
           onCheck: _.debounce((event, treeId, treeNode) => {
             // 选择后，更新按钮可用
-            vm.$nextTick(() => {
-              vm.isDisabled = false
-            })
+            vm.setUpdateBtn()
             vm.checkActionDeps(treeNode)
             vm.checkSpecDeps()
           }, 200),
@@ -120,6 +118,9 @@ export default {
     ztree() {
       return this.$refs.tree.zTree
     },
+    scope() {
+      return this.object.scope
+    },
     detailItems() {
       return [
         {
@@ -160,6 +161,12 @@ export default {
     })
   },
   methods: {
+    setUpdateBtn() {
+      const permRequired = `rbac.change_${this.object.scope}role`
+      if (this.$hasPerm(permRequired)) {
+        this.isDisabled = false
+      }
+    },
     parsePerm(perm) {
       if (!perm) {
         this.$log.debug('No app code: ', perm)
@@ -241,7 +248,6 @@ export default {
         this.ztree.checkNode(depNode, true)
       }
     },
-
     updatePermissions() {
       const ztree = this.$refs.tree.zTree
       const checkedNodes = ztree.getCheckedNodes()

From d14cdcf05dc112c37395cdfaebec5970e22ed565 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 16:29:21 +0800
Subject: [PATCH 13/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=BE=E7=BD=AE=E7=BB=88=E7=AB=AF=E5=BD=95=E5=83=8F?=
 =?UTF-8?q?/=E5=91=BD=E4=BB=A4=E5=AD=98=E5=82=A8=E5=88=9B=E5=BB=BA/?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=90=E5=8A=9F=E5=90=8E=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/GenericCreateUpdateForm/index.vue        | 2 +-
 src/router/settings/index.js                                   | 2 +-
 src/views/settings/Terminal/Base.vue                           | 2 +-
 .../settings/Terminal/Storage/CommandStorageCreateUpdate.vue   | 3 +--
 .../settings/Terminal/Storage/ReplayStorageCreateUpdate.vue    | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/layout/components/GenericCreateUpdateForm/index.vue b/src/layout/components/GenericCreateUpdateForm/index.vue
index 4a4746faf..5fb7ab90a 100644
--- a/src/layout/components/GenericCreateUpdateForm/index.vue
+++ b/src/layout/components/GenericCreateUpdateForm/index.vue
@@ -181,7 +181,7 @@ export default {
       default(res, method, vm, addContinue) {
         const route = this.getNextRoute(res, method)
         if (!(route.params && route.params.id)) {
-          route['params'] = { 'id': res.id }
+          route['params'] = Object.assign(route['params'] || {}, { 'id': res.id })
         }
         this.$emit('submitSuccess', res)
 
diff --git a/src/router/settings/index.js b/src/router/settings/index.js
index 6856197e3..08de96f4e 100644
--- a/src/router/settings/index.js
+++ b/src/router/settings/index.js
@@ -81,7 +81,7 @@ export default {
       children: [
         {
           path: '',
-          name: 'TerminalList',
+          name: 'TerminalSetting',
           component: () => import('@/views/settings/Terminal'),
           meta: {
             title: i18n.t('setting.Terminal'),
diff --git a/src/views/settings/Terminal/Base.vue b/src/views/settings/Terminal/Base.vue
index bcef4ff96..504dbfc12 100644
--- a/src/views/settings/Terminal/Base.vue
+++ b/src/views/settings/Terminal/Base.vue
@@ -49,7 +49,7 @@ export default {
           }
         }
       },
-      url: '/api/v1/settings/setting/?category=terminal',
+      getUrl: () => '/api/v1/settings/setting/?category=terminal',
       hasDetailInMsg: false,
       submitMethod() {
         return 'put'
diff --git a/src/views/settings/Terminal/Storage/CommandStorageCreateUpdate.vue b/src/views/settings/Terminal/Storage/CommandStorageCreateUpdate.vue
index e8d429bd3..afe76e067 100644
--- a/src/views/settings/Terminal/Storage/CommandStorageCreateUpdate.vue
+++ b/src/views/settings/Terminal/Storage/CommandStorageCreateUpdate.vue
@@ -17,8 +17,7 @@ export default {
   data() {
     const commandType = this.$route.query.type || 'es'
     return {
-      successUrl: { name: 'Storage', params: { activeMenu: 'CommandStorage' }},
-
+      successUrl: { name: 'TerminalSetting', params: { activeMenu: 'CommandStorage' }},
       initial: { type: commandType, doc_type: 'command' },
       fields: [
         [this.$t('common.Basic'), ['name', 'type', 'meta', 'is_default', 'comment']]
diff --git a/src/views/settings/Terminal/Storage/ReplayStorageCreateUpdate.vue b/src/views/settings/Terminal/Storage/ReplayStorageCreateUpdate.vue
index 5f716de25..ed2542521 100644
--- a/src/views/settings/Terminal/Storage/ReplayStorageCreateUpdate.vue
+++ b/src/views/settings/Terminal/Storage/ReplayStorageCreateUpdate.vue
@@ -21,7 +21,7 @@ export default {
     const storageType = this.$route.query.type || 's3'
     const storageTypeMeta = STORAGE_TYPE_META_MAP[storageType]
     return {
-      successUrl: { name: 'Storage', params: { activeMenu: 'RelayStorage' }},
+      successUrl: { name: 'TerminalSetting', params: { activeMenu: 'RelayStorage' }},
       url: `/api/v1/terminal/replay-storages/`,
       initial: {
         type: storageType,

From 3ea1fc192a2950dca838d391df82a4edbf879ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 15 Mar 2022 16:37:51 +0800
Subject: [PATCH 14/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D=E8=AE=B0=E5=BD=95=E8=BF=9B=E5=85=A5=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/audit/sessions.js                  | 2 ++
 src/views/sessions/SessionList/OnlineList.vue | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/router/audit/sessions.js b/src/router/audit/sessions.js
index f9cffc724..c84ae812f 100644
--- a/src/router/audit/sessions.js
+++ b/src/router/audit/sessions.js
@@ -8,6 +8,8 @@ export default [
     component: empty,
     meta: {
       title: i18n.t('route.Sessions'),
+      app: 'terminal',
+      resource: 'session',
       permissions: ['terminal.view_session']
     },
     children: [
diff --git a/src/views/sessions/SessionList/OnlineList.vue b/src/views/sessions/SessionList/OnlineList.vue
index 4a3266521..3554e322f 100644
--- a/src/views/sessions/SessionList/OnlineList.vue
+++ b/src/views/sessions/SessionList/OnlineList.vue
@@ -19,9 +19,7 @@ export default {
           name: 'terminate',
           title: this.$t('sessions.terminate'),
           type: 'danger',
-          can: ({ row, cellValue }) => {
-            return row['can_terminate'] && this.$hasPerm('terminal.terminate_session')
-          },
+          can: ({ row }) => row['can_terminate'] && vm.$hasPerm('terminal.terminate_session'),
           callback: function({ reload, row }) {
             // 终断 session reload
             const data = [row.id]

From f6588a28d94eb527224fe2727cde78b01379e74d Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 15 Mar 2022 16:44:35 +0800
Subject: [PATCH 15/37] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20tickets=20?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/NavHeader/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue
index 10d5297f4..0c3a37d4d 100644
--- a/src/layout/components/NavHeader/index.vue
+++ b/src/layout/components/NavHeader/index.vue
@@ -16,7 +16,7 @@
           <SystemSetting />
         </el-tooltip>
       </li>
-      <li v-if="$hasLicense()" v-perms="'tickets.view_ticket'" class="header-item header-hover">
+      <li v-if="this.$hasLicense() && this.$hasPerm('tickets.view_ticket')" class="header-item header-hover">
         <Tickets />
       </li>
       <li class="header-item">

From 5bb3e95e230047c7fb6035d540255ea1f365c770 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 18:18:19 +0800
Subject: [PATCH 16/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=BE=E7=BD=AE=E7=BB=88=E7=AB=AF=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/settings/index.js                   | 6 ++++--
 src/views/settings/Terminal/TerminalList.vue   | 7 +++++--
 src/views/settings/Terminal/TerminalUpdate.vue | 9 ++++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/router/settings/index.js b/src/router/settings/index.js
index 08de96f4e..bb0edff74 100644
--- a/src/router/settings/index.js
+++ b/src/router/settings/index.js
@@ -94,7 +94,8 @@ export default {
           name: 'TerminalDetail',
           component: () => import('@/views/settings/Terminal/TerminalDetail'),
           meta: {
-            title: i18n.t('route.Terminal')
+            title: i18n.t('route.Terminal'),
+            permissions: ['terminal.view_terminal']
           },
           hidden: true
         },
@@ -103,7 +104,8 @@ export default {
           name: 'TerminalUpdate',
           component: () => import('@/views/settings/Terminal/TerminalUpdate'),
           meta: {
-            title: i18n.t('route.Terminal')
+            title: i18n.t('route.Terminal'),
+            permissions: ['terminal.change_terminal']
           },
           hidden: true
         },
diff --git a/src/views/settings/Terminal/TerminalList.vue b/src/views/settings/Terminal/TerminalList.vue
index 178219e09..3ef4d454b 100644
--- a/src/views/settings/Terminal/TerminalList.vue
+++ b/src/views/settings/Terminal/TerminalList.vue
@@ -112,7 +112,10 @@ export default {
         ],
         columnsMeta: {
           name: {
-            sortable: 'custom'
+            sortable: 'custom',
+            formatterArgs: {
+              route: 'TerminalDetail'
+            }
           },
           'stat.cpu_load': {
             label: this.$t('sessions.systemCpuLoad'),
@@ -161,7 +164,7 @@ export default {
           actions: {
             formatterArgs: {
               hasClone: false,
-              canUpdate: true
+              updateRoute: { name: 'TerminalUpdate' }
             }
           }
         }
diff --git a/src/views/settings/Terminal/TerminalUpdate.vue b/src/views/settings/Terminal/TerminalUpdate.vue
index 24e161e2a..43e7fa022 100644
--- a/src/views/settings/Terminal/TerminalUpdate.vue
+++ b/src/views/settings/Terminal/TerminalUpdate.vue
@@ -1,5 +1,11 @@
 <template>
-  <GenericCreateUpdatePage :fields="fields" :url="url" :fields-meta="fieldsMeta" />
+  <GenericCreateUpdatePage
+    :fields="fields"
+    :url="url"
+    :update-success-next-route="successUrl"
+    :create-success-next-route="successUrl"
+    :fields-meta="fieldsMeta"
+  />
 </template>
 
 <script>
@@ -13,6 +19,7 @@ export default {
   },
   data() {
     return {
+      successUrl: { name: 'TerminalSetting', params: { activeMenu: 'TerminalList' }},
       url: '/api/v1/terminal/terminals/',
       fields: [
         [this.$t('sessions.info'), ['name', 'remote_addr', 'command_storage', 'replay_storage']],

From 1de931ce2a684f15fea27ae5bdb6fa5577ad49d4 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Tue, 15 Mar 2022 18:26:32 +0800
Subject: [PATCH 17/37] perf: ticket flow perf

---
 src/views/tickets/TicketFlow/FlowCreateUpdate.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/tickets/TicketFlow/FlowCreateUpdate.vue b/src/views/tickets/TicketFlow/FlowCreateUpdate.vue
index 5b73ee98d..1a109be5e 100644
--- a/src/views/tickets/TicketFlow/FlowCreateUpdate.vue
+++ b/src/views/tickets/TicketFlow/FlowCreateUpdate.vue
@@ -46,8 +46,8 @@ export default {
       },
       onPerformError() {
       },
-      updateSuccessNextRoute: { name: 'TicketList' },
-      createSuccessNextRoute: { name: 'TicketList' }
+      updateSuccessNextRoute: { name: 'TicketFlow' },
+      createSuccessNextRoute: { name: 'TicketFlow' }
     }
   },
   computed: {

From 87410fd653119070b837c68a422487fb199232a0 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 18:29:56 +0800
Subject: [PATCH 18/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=BE=E7=BD=AE=E7=BB=88=E7=AB=AF=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/Role/RoleDetail/RoleInfo.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue
index 0bf0c647a..9d539a546 100644
--- a/src/views/users/Role/RoleDetail/RoleInfo.vue
+++ b/src/views/users/Role/RoleDetail/RoleInfo.vue
@@ -102,6 +102,8 @@ export default {
           'users.view_user', 'users.view_usergroup'
         ],
         'settings.change_systemmsgsubscription': ['users.view_user'],
+        'terminal.add_terminal': ['terminal.view_commandstorage', 'terminal.view_replaystorage'],
+        'terminal.change_terminal': ['terminal.view_commandstorage', 'terminal.view_replaystorage'],
         'xpack.add_syncinstancetask': [
           'assets.view_asset', 'assets.view_node', 'assets.view_systemuser',
           'xpack.view_account'

From f5c25fde7485277bba6e9c4340ee03130c6f462d Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 15 Mar 2022 18:40:10 +0800
Subject: [PATCH 19/37] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20perm=20tree?=
 =?UTF-8?q?=20icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/ztree.css                         | 70 ++++++++------------
 src/views/users/Role/RoleDetail/RoleInfo.vue |  5 +-
 2 files changed, 30 insertions(+), 45 deletions(-)

diff --git a/src/styles/ztree.css b/src/styles/ztree.css
index 286a7bfbd..1191e6913 100644
--- a/src/styles/ztree.css
+++ b/src/styles/ztree.css
@@ -262,6 +262,7 @@ website:    http://code.google.com/p/jquerytree/
 .ztree li span.button.root_docu {
   background: none;
 }
+
 .ztree li span.button.roots_docu::before {
   content: "\f114";
   padding-left: 2px;
@@ -283,78 +284,59 @@ website:    http://code.google.com/p/jquerytree/
 .ztree li span.button.noline_docu {
   background: none;
 }
-.ztree li span.button.ico_open::before {
-  content: "\f07c";
-  font-family: FontAwesome;
+.ztree li span[treenode_ico].button::before {
   padding-top: 10px;
   padding-left: 2px;
   display: inline-block;
   color: #676a6c;
 }
+.ztree li span.button.ico_open::before {
+  content: "\f07c";
+}
 .ztree li span.button.ico_close::before {
   content: "\f07b";
-  font-family: FontAwesome;
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #676a6c;
 }
 .ztree li span.button.ico_docu::before {
   content: "\f07b";
-  font-family: FontAwesome;
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #676a6c;
 }
 .ztree li span.button.file_ico_docu::before {
   content: "\f022";
-  font-family: FontAwesome;
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #676a6c;
 }
 .ztree li span.button.linux_ico_docu::before {
   content: "\f17c";
-  font-family: FontAwesome;
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #676a6c;
 }
 .ztree li span.button.chrome_ico_docu::before {
   content: "\f268";
-  font-family: FontAwesome;
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #676a6c;
 }
 .ztree li span.button.database_ico_docu::before {
   content: "\f1c0";
-  font-family: FontAwesome;
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #676a6c;
 }
 .ztree li span.button.cloud_ico_docu::before {
   content: "\f0c2";
-  font-family: FontAwesome;
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #676a6c;
 }
-
 .ztree li span.button.windows_ico_docu::before {
   content: "\f17a";
-  font-family: FontAwesome;
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #676a6c;
+}
+.ztree li span.button.add_ico_docu::before {
+  content: "\f196";
+}
+.ztree li span.button.change_ico_docu::before {
+  content: "\f044";
+}
+.ztree li span.button.view_ico_docu::before {
+  content: "\f06e";
+}
+.ztree li span.button.delete_ico_docu::before {
+  content: "\f147";
+}
+.ztree li span.button.remove_ico_docu::before {
+  content: "\f068";
+}
+.ztree li span.button.invite_ico_docu::before {
+  content: "\f007";
+}
+.ztree li span.button.match_ico_docu::before {
+  content: "\f002";
 }
 .ztree li span.button.edit {
   margin-left: 4px;
diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue
index 9d539a546..32b6fac9e 100644
--- a/src/views/users/Role/RoleDetail/RoleInfo.vue
+++ b/src/views/users/Role/RoleDetail/RoleInfo.vue
@@ -68,7 +68,10 @@ export default {
           }, 200),
           beforeCheck: (treeId, treeNode) => {
             return true
-          }
+          },
+          onClick: _.debounce((event, treeId, treeNode) => {
+            vm.ztree.expandNode(treeNode)
+          }, 100)
         }
       },
       nodesDeps: {

From db6e51d07788dea72ec55a8ba4ed598b4e9a1591 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 18:44:42 +0800
Subject: [PATCH 20/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sessions/CommandList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index f1cd58e3e..4ac56736e 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -115,6 +115,7 @@ export default {
       headerActions: {
         hasLeftActions: false,
         hasImport: false,
+        hasExport: this.$hasPerm('terminal.view_command'),
         hasDatePicker: true,
         canExportSelected: true,
         exportOptions: {

From 90f63c4c456b7595cfaae500f1d55e2527cd6296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 15 Mar 2022 18:36:20 +0800
Subject: [PATCH 21/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E8=AE=A1=E5=88=92-=E4=BB=BB=E5=8A=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=B7=B3=E8=BD=AC=E8=B5=84=E4=BA=A7=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChangeAuthPlanExecutionTaskList.vue       | 19 +++++++++++++++----
 .../ChangeAuthPlanExecutionList.vue           |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
index fb09d72b4..d65bb1757 100644
--- a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
+++ b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
@@ -4,6 +4,7 @@
 
 <script>
 import GenericListTable from '@/layout/components/GenericListTable'
+import { DetailFormatter } from '@/components/TableFormatters'
 
 export default {
   name: 'ChangeAuthPlanExecutionTaskList',
@@ -18,6 +19,7 @@ export default {
     }
   },
   data() {
+    const vm = this
     return {
       tableConfig: {
         url: `/api/v1/xpack/change-auth-plan/plan-execution-subtask/?plan_execution_id=${this.object.id}`,
@@ -27,9 +29,18 @@ export default {
         columnsMeta: {
           asset: {
             label: this.$t('xpack.ChangeAuthPlan.Asset'),
-            formatter: function(row, column, cellValue, index) {
-              const url = `/assets/assets/${cellValue}`
-              return <router-link to={ url } >{ row.asset_info.hostname }</router-link>
+            formatter: DetailFormatter,
+            formatterArgs: {
+              can: this.$hasPerm('assets.view_asset'),
+              getTitle({ row }) {
+                return row.asset_info.hostname
+              },
+              getRoute({ row }) {
+                return {
+                  name: 'AssetDetail',
+                  params: { id: row.asset }
+                }
+              }
             }
           },
           is_success: {
@@ -54,8 +65,8 @@ export default {
                 {
                   name: 'retry',
                   type: 'info',
-                  can: this.$hasPerm('xpack.change_changeauthplantask'),
                   title: this.$t('xpack.ChangeAuthPlan.Retry'),
+                  can: vm.$hasPerm('xpack.change_changeauthplantask'),
                   callback: function({ row, tableData }) {
                     this.$axios.put(
                       `/api/v1/xpack/change-auth-plan/plan-execution-subtask/${row.id}/`,
diff --git a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
index 918fb0351..49cb569ac 100644
--- a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
+++ b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
@@ -83,6 +83,7 @@ export default {
                   name: 'detail',
                   title: this.$t('xpack.ChangeAuthPlan.Detail'),
                   type: 'info',
+                  can: this.$hasPerm('xpack.view_changeauthplantask'),
                   callback: function({ row }) {
                     return this.$router.push({ name: 'ChangeAuthPlanExecutionDetail', params: { id: row.id }})
                   }

From 15a0bf61fa17cfefd6cc36d6fc6045f167ba5ed9 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 19:26:57 +0800
Subject: [PATCH 22/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=88?=
 =?UTF-8?q?=E7=AB=AF=E8=AE=BE=E7=BD=AE=E6=9D=83=E9=99=90=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/Role/RoleDetail/RoleInfo.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue
index 32b6fac9e..322d659b6 100644
--- a/src/views/users/Role/RoleDetail/RoleInfo.vue
+++ b/src/views/users/Role/RoleDetail/RoleInfo.vue
@@ -107,6 +107,11 @@ export default {
         'settings.change_systemmsgsubscription': ['users.view_user'],
         'terminal.add_terminal': ['terminal.view_commandstorage', 'terminal.view_replaystorage'],
         'terminal.change_terminal': ['terminal.view_commandstorage', 'terminal.view_replaystorage'],
+        'terminal.view_commandstroage': ['settings.change_terminal'],
+        'terminal.view_replaystorage': ['settings.change_terminal'],
+        'terminal.view_status': ['settings.change_terminal'],
+        'terminal.view_task': ['settings.change_terminal'],
+        'terminal.view_terminal': ['settings.change_terminal'],
         'xpack.add_syncinstancetask': [
           'assets.view_asset', 'assets.view_node', 'assets.view_systemuser',
           'xpack.view_account'

From a696048ce8b444c5c950105aea2a3a7cfbbca407 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 19:35:08 +0800
Subject: [PATCH 23/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E6=B5=8B=E8=AF=95=E6=9D=83=E9=99=90=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settings/Terminal/Storage/CommandStorage.vue | 2 +-
 src/views/settings/Terminal/Storage/ReplayStorage.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/settings/Terminal/Storage/CommandStorage.vue b/src/views/settings/Terminal/Storage/CommandStorage.vue
index 3d8f6a68f..484316f63 100644
--- a/src/views/settings/Terminal/Storage/CommandStorage.vue
+++ b/src/views/settings/Terminal/Storage/CommandStorage.vue
@@ -82,7 +82,7 @@ export default {
                   name: 'test',
                   title: this.$t('sessions.test'),
                   type: 'primary',
-                  can: vm.$hasPerm('terminal.change_commandstorage'),
+                  can: vm.$hasPerm('terminal.view_commandstorage'),
                   callback: function({ row, col, cellValue, reload }) {
                     TestCommandStorage(row.id).then(data => {
                       if (!data['is_valid']) {
diff --git a/src/views/settings/Terminal/Storage/ReplayStorage.vue b/src/views/settings/Terminal/Storage/ReplayStorage.vue
index 89b2eef19..dcd511d95 100644
--- a/src/views/settings/Terminal/Storage/ReplayStorage.vue
+++ b/src/views/settings/Terminal/Storage/ReplayStorage.vue
@@ -73,7 +73,7 @@ export default {
                 {
                   name: 'test',
                   title: this.$t('sessions.test'),
-                  can: vm.$hasPerm('terminal.change_replaystorage'),
+                  can: vm.$hasPerm('terminal.view_replaystorage'),
                   type: 'primary',
                   callback: function({ row, col, cellValue, reload }) {
                     TestReplayStorage(row.id).then(data => {

From f3011a01394b076eecf75db25a188af632355adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 15 Mar 2022 19:35:43 +0800
Subject: [PATCH 24/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8-=E6=8E=88=E6=9D=83=E7=9A=84?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=AF=A6=E6=83=85=E4=B8=8D=E8=83=BD=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=B7=B3=E8=BD=AC=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/UserDetail/UserGrantedApplications.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/users/User/UserDetail/UserGrantedApplications.vue b/src/views/users/User/UserDetail/UserGrantedApplications.vue
index 8eb771e68..bf7f349e0 100644
--- a/src/views/users/User/UserDetail/UserGrantedApplications.vue
+++ b/src/views/users/User/UserDetail/UserGrantedApplications.vue
@@ -23,6 +23,7 @@ export default {
         columnsMeta: {
           name: {
             formatterArgs: {
+              can: this.$hasPerm('applications.view_application'),
               route: 'RemoteAppDetail'
             }
           },

From daa7de217b9326fbd607506877727187a49731ad Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Tue, 15 Mar 2022 19:44:55 +0800
Subject: [PATCH 25/37] =?UTF-8?q?fix:=20=E7=BB=84=E7=BB=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E8=AF=A6=E6=83=85bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settings/Org/OrganizationDetail/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/settings/Org/OrganizationDetail/index.vue b/src/views/settings/Org/OrganizationDetail/index.vue
index bfb9f9ee3..9a4ba9935 100644
--- a/src/views/settings/Org/OrganizationDetail/index.vue
+++ b/src/views/settings/Org/OrganizationDetail/index.vue
@@ -9,9 +9,8 @@
 <script>
 import { GenericDetailPage, TabPage } from '@/layout/components'
 import OrganizationDetail from './OrganizationDetail'
-import { getApiPath } from '@/utils/common'
 const performDelete = function() {
-  const url = getApiPath(this)
+  const url = `${this.url}/${this.$route.params.id}/`
   return this.$axios.delete(url)
 }
 export default {
@@ -33,6 +32,9 @@ export default {
           }
         ],
         actions: {
+          deleteApiUrl: `${this.url}/${this.$route.params.id}/`,
+          canUpdate: this.$hasPerm('orgs.change_organization'),
+          canDelete: this.$hasPerm('orgs.delete_organization'),
           deleteCallback: function() {
             const msg = this.$t('xpack.Organization.DeleteOrgMsg')
             const title = this.$t('xpack.Organization.DeleteOrgTitle')

From 7ed866c61ff13087ee8182232e23d08d6d6e17ea Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 20:06:17 +0800
Subject: [PATCH 26/37] =?UTF-8?q?fix:=20=E8=B5=84=E4=BA=A7=E6=A0=91?=
 =?UTF-8?q?=E5=8F=B3=E5=87=BB=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Asset/AssetList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index d637d37a6..57c35da32 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -2,21 +2,21 @@
   <div>
     <GenericTreeListPage ref="TreeList" :table-config="tableConfig" :help-message="helpMessage" :header-actions="headerActions" :tree-setting="treeSetting">
       <div slot="rMenu">
-        <li class="divider" />
+        <!--        <li class="divider" />-->
         <li id="m_add_asset_to_node" v-perms="'assets.add_assettonode'" class="rmenu" tabindex="-1" @click="rMenuAddAssetToNode">
           <i class="fa fa-clone" />  {{ this.$t('tree.AddAssetToNode') }}
         </li>
         <li id="m_move_asset_to_node" v-perms="'assets.move_assettonode'" class="rmenu" tabindex="-1" @click="rMenuMoveAssetToNode">
           <i class="fa fa-scissors" />  {{ this.$t('tree.MoveAssetToNode') }}
         </li>
-        <li class="divider" />
+        <li v-if="$hasPerm('assets.move_assettonode') || $hasPerm('assets.add_assettonode')" class="divider" />
         <li id="m_update_node_asset_hardware_info" v-perms="'assets.refresh_assethardwareinfo'" class="rmenu" tabindex="-1" @click="rMenuUpdateNodeAssetHardwareInfo">
           <i class="fa fa-refresh" />  {{ this.$t('tree.UpdateNodeAssetHardwareInfo') }}
         </li>
         <li id="m_test_node_asset_connectivity" v-perms="'assets.test_assetconnectivity'" class="rmenu" tabindex="-1" @click="rMenuTestNodeAssetConnectivity">
           <i class="fa fa-link" />  {{ this.$t('tree.TestNodeAssetConnectivity') }}
         </li>
-        <li class="divider" />
+        <li v-if="$hasPerm('assets.add_assettonode') || $hasPerm('assets.test_assetconnectivity')" class="divider" />
         <li id="m_show_asset_only_current_node" class="rmenu" tabindex="-1" @click="rMenuShowAssetOnlyCurrentNode">
           <i class="fa fa-indent" />  {{ this.$t('tree.ShowAssetOnlyCurrentNode') }}
         </li>

From 484b71cbc9e1c001ec7010c1b751168299397ff6 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 15 Mar 2022 20:00:13 +0800
Subject: [PATCH 27/37] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=A0=91=EF=BC=8C=E7=BB=9F=E4=B8=80=20dropdown?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataTable/index.vue        |  12 +-
 .../applications/RemoteApp/RemoteAppList.vue  |   7 +-
 src/views/applications/const.js               | 161 +++++++++++++++++
 .../SystemUserList/CommonUserList.vue         |  79 +--------
 src/views/assets/const.js                     |  30 ++++
 .../ApplicationPermissionList.vue             |   9 +-
 src/views/perms/const.js                      | 163 ------------------
 src/views/users/User/UserList.vue             |   6 +-
 8 files changed, 223 insertions(+), 244 deletions(-)
 create mode 100644 src/views/applications/const.js
 create mode 100644 src/views/assets/const.js

diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue
index 17358990e..85c6a05f4 100644
--- a/src/components/AutoDataTable/index.vue
+++ b/src/components/AutoDataTable/index.vue
@@ -64,7 +64,6 @@ export default {
     }
   },
   computed: {
-
   },
   watch: {
     config: {
@@ -211,7 +210,7 @@ export default {
     },
     generateTotalColumns() {
       const config = _.cloneDeep(this.config)
-      const columns = []
+      let columns = []
       for (let col of config.columns) {
         if (typeof col === 'object') {
           columns.push(col)
@@ -220,6 +219,15 @@ export default {
           columns.push(col)
         }
       }
+      columns = columns.filter(item => {
+        let has = item.has
+        if (has === undefined) {
+          has = true
+        } else if (typeof has === 'function') {
+          has = has()
+        }
+        return has
+      })
       // 第一次初始化时记录 totalColumns
       this.totalColumns = columns
       config.columns = columns
diff --git a/src/views/applications/RemoteApp/RemoteAppList.vue b/src/views/applications/RemoteApp/RemoteAppList.vue
index 9d3733c25..4d2466a96 100644
--- a/src/views/applications/RemoteApp/RemoteAppList.vue
+++ b/src/views/applications/RemoteApp/RemoteAppList.vue
@@ -33,7 +33,12 @@ export default {
             showOverflowTooltip: true,
             formatter: function(row, column, cellValue, index) {
               const route = { to: { name: 'AssetDetail', params: { id: cellValue }}}
-              return <router-link{...{ attrs: route }} >{ row.attrs.asset_info.hostname }</router-link>
+              const hostname = row.attrs['asset_info'].hostname
+              if (vm.$hasPerm('assets.view_asset')) {
+                return <router-link{...{ attrs: route }} >{ hostname }</router-link>
+              } else {
+                return hostname
+              }
             }
           },
           actions: {
diff --git a/src/views/applications/const.js b/src/views/applications/const.js
new file mode 100644
index 000000000..a1ad65145
--- /dev/null
+++ b/src/views/applications/const.js
@@ -0,0 +1,161 @@
+import i18n from '@/i18n/i18n'
+import store from '@/store'
+export const CHROME = 'chrome'
+export const MYSQL_WORKBENCH = 'mysql_workbench'
+export const VMWARE_CLIENT = 'vmware_client'
+export const CUSTOM = 'custom'
+export const REMOTEAPP_CATEGORY = 'remote_app'
+
+function hasLicence() {
+  return store.getters.hasValidLicense
+}
+
+export const REMOTE_APP = [
+  {
+    name: CHROME,
+    title: i18n.t(`applications.applicationsType.${CHROME}`),
+    type: 'primary',
+    group: i18n.t('applications.RemoteApp'),
+    category: REMOTEAPP_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: MYSQL_WORKBENCH,
+    title: i18n.t(`applications.applicationsType.${MYSQL_WORKBENCH}`),
+    type: 'primary',
+    category: REMOTEAPP_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: VMWARE_CLIENT,
+    title: i18n.t(`applications.applicationsType.${VMWARE_CLIENT}`),
+    type: 'primary',
+    category: REMOTEAPP_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: CUSTOM,
+    title: i18n.t(`applications.applicationsType.${CUSTOM}`),
+    type: 'primary',
+    category: REMOTEAPP_CATEGORY,
+    has: hasLicence
+  }
+]
+
+export const MYSQL = 'mysql'
+export const ORACLE = 'oracle'
+export const POSTGRESQL = 'postgresql'
+export const MARIADB = 'mariadb'
+export const DATABASE_CATEGORY = 'db'
+export const SQLSERVER = 'sqlserver'
+export const REDIS = 'redis'
+export const MONGODB = 'mongodb'
+
+export const DATABASE = [
+  {
+    name: MYSQL,
+    title: i18n.t(`applications.applicationsType.${MYSQL}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: true,
+    group: i18n.t('applications.RDBProtocol')
+  },
+  {
+    name: MARIADB,
+    title: i18n.t(`applications.applicationsType.${MARIADB}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: true
+  },
+  {
+    name: ORACLE,
+    title: i18n.t(`applications.applicationsType.${ORACLE}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: POSTGRESQL,
+    title: i18n.t(`applications.applicationsType.${POSTGRESQL}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: SQLSERVER,
+    title: i18n.t(`applications.applicationsType.${SQLSERVER}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: REDIS,
+    title: i18n.t(`applications.applicationsType.${REDIS}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: true,
+    group: i18n.t('applications.NoSQLProtocol')
+  },
+  {
+    name: MONGODB,
+    title: i18n.t(`applications.applicationsType.${MONGODB}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY
+  }
+]
+
+export const AppPlanDatabase = [
+  {
+    name: MYSQL,
+    title: i18n.t(`applications.applicationsType.${MYSQL}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: true,
+    group: i18n.t('applications.RDBProtocol')
+  },
+  {
+    name: ORACLE,
+    title: i18n.t(`applications.applicationsType.${ORACLE}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: POSTGRESQL,
+    title: i18n.t(`applications.applicationsType.${POSTGRESQL}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: MARIADB,
+    title: i18n.t(`applications.applicationsType.${MARIADB}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY
+  },
+  {
+    name: SQLSERVER,
+    title: i18n.t(`applications.applicationsType.${SQLSERVER}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  }
+]
+
+export const KUBERNETES = 'k8s'
+export const CLOUD_CATEGORY = 'cloud'
+
+export const CLOUD = [
+  {
+    name: KUBERNETES,
+    title: i18n.t(`applications.applicationsType.${KUBERNETES}`),
+    group: i18n.t('applications.Cloud'),
+    type: 'primary',
+    category: CLOUD_CATEGORY,
+    has: true
+  }
+]
+
+export const ApplicationTypes = [
+  ...REMOTE_APP, ...DATABASE, ...CLOUD
+]
diff --git a/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue b/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue
index ddc8cd1dd..4461835d1 100644
--- a/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue
+++ b/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue
@@ -9,6 +9,8 @@
 
 <script>
 import { GenericListTable } from '@/layout/components'
+import { ApplicationTypes } from '@/views/applications/const'
+import { AssetProtocols } from '@/views/assets/const'
 
 export default {
   components: {
@@ -75,81 +77,8 @@ export default {
             vm.$router.push({ name: 'SystemUserCreate', query: { protocol: option.title.toLowerCase() }})
           },
           dropdown: [
-            {
-              title: 'SSH',
-              name: 'SSH',
-              type: 'primary',
-              group: this.$t('assets.HostProtocol'),
-              has: true
-            },
-            {
-              title: 'RDP',
-              name: 'RDP',
-              type: 'primary',
-              has: true
-            },
-            {
-              title: 'VNC',
-              name: 'VNC',
-              type: 'primary',
-              has: true
-            },
-            {
-              title: 'Telnet',
-              name: 'Telnet',
-              type: 'primary',
-              has: true
-            },
-            {
-              name: 'MySQL',
-              title: 'MySQL',
-              type: 'primary',
-              has: true,
-              group: this.$t('assets.RDBProtocol')
-            },
-            {
-              name: 'MariaDB',
-              title: 'MariaDB',
-              type: 'primary',
-              has: true
-            },
-            {
-              name: 'PostgreSQL',
-              title: 'PostgreSQL',
-              type: 'primary',
-              has: this.$store.getters.hasValidLicense
-            },
-            {
-              name: 'Oracle',
-              title: 'Oracle',
-              type: 'primary',
-              has: this.$store.getters.hasValidLicense
-            },
-            {
-              name: 'SQLServer',
-              title: 'SQLServer',
-              type: 'primary',
-              has: this.$store.getters.hasValidLicense
-            },
-            {
-              name: 'Redis',
-              title: 'Redis',
-              type: 'primary',
-              has: true,
-              group: this.$t('assets.NoSQLProtocol')
-            },
-            {
-              name: 'MongoDB',
-              title: 'MongoDB',
-              type: 'primary',
-              has: this.$store.getters.hasValidLicense
-            },
-            {
-              name: 'K8S',
-              title: 'K8S',
-              type: 'primary',
-              group: this.$t('assets.OtherProtocol')
-            }
+            ...AssetProtocols,
+            ...ApplicationTypes
           ]
         }
       },
diff --git a/src/views/assets/const.js b/src/views/assets/const.js
new file mode 100644
index 000000000..ff5bb4339
--- /dev/null
+++ b/src/views/assets/const.js
@@ -0,0 +1,30 @@
+import i18n from '@/i18n/i18n'
+
+export const AssetProtocols = [
+  {
+    title: 'SSH',
+    name: 'SSH',
+    type: 'primary',
+    group: i18n.t('assets.HostProtocol'),
+    has: true
+  },
+  {
+    title: 'RDP',
+    name: 'RDP',
+    type: 'primary',
+    has: true
+  },
+  {
+    title: 'VNC',
+    name: 'VNC',
+    type: 'primary',
+    has: true
+  },
+  {
+    title: 'Telnet',
+    name: 'Telnet',
+    type: 'primary',
+    has: true
+  }
+]
+
diff --git a/src/views/perms/ApplicationPermission/ApplicationPermissionList.vue b/src/views/perms/ApplicationPermission/ApplicationPermissionList.vue
index 3f2667184..846fd10a3 100644
--- a/src/views/perms/ApplicationPermission/ApplicationPermissionList.vue
+++ b/src/views/perms/ApplicationPermission/ApplicationPermissionList.vue
@@ -1,12 +1,17 @@
 <template>
-  <GenericTreeListPage ref="TreeTablePage" :tree-setting="treeSetting" :header-actions="headerActions" :table-config="tableConfig" />
+  <GenericTreeListPage
+    ref="TreeTablePage"
+    :tree-setting="treeSetting"
+    :header-actions="headerActions"
+    :table-config="tableConfig"
+  />
 </template>
 
 <script>
 import GenericTreeListPage from '@/layout/components/GenericTreeListPage'
 import { setUrlParam } from '@/utils/common'
 import { DetailFormatter } from '@/components/TableFormatters'
-import { ApplicationTypes } from '@/views/perms/const'
+import { ApplicationTypes } from '@/views/applications/const'
 
 export default {
   name: 'AssetAccountList',
diff --git a/src/views/perms/const.js b/src/views/perms/const.js
index 81fd94365..e69de29bb 100644
--- a/src/views/perms/const.js
+++ b/src/views/perms/const.js
@@ -1,163 +0,0 @@
-import i18n from '@/i18n/i18n'
-import store from '@/store'
-export const CHROME = 'chrome'
-export const MYSQL_WORKBENCH = 'mysql_workbench'
-export const VMWARE_CLIENT = 'vmware_client'
-export const CUSTOM = 'custom'
-export const REMOTEAPP_CATEGORY = 'remote_app'
-
-function hasLicence() {
-  return store.getters.hasValidLicense
-}
-
-export const REMOTE_APP = [
-  {
-    name: CHROME,
-    title: i18n.t(`applications.applicationsType.${CHROME}`),
-    type: 'primary',
-    group: i18n.t('applications.RemoteApp'),
-    category: REMOTEAPP_CATEGORY,
-    has: hasLicence
-  },
-  {
-    name: MYSQL_WORKBENCH,
-    title: i18n.t(`applications.applicationsType.${MYSQL_WORKBENCH}`),
-    type: 'primary',
-    category: REMOTEAPP_CATEGORY,
-    has: hasLicence
-  },
-  {
-    name: VMWARE_CLIENT,
-    title: i18n.t(`applications.applicationsType.${VMWARE_CLIENT}`),
-    type: 'primary',
-    category: REMOTEAPP_CATEGORY,
-    has: hasLicence
-  },
-  {
-    name: CUSTOM,
-    title: i18n.t(`applications.applicationsType.${CUSTOM}`),
-    type: 'primary',
-    category: REMOTEAPP_CATEGORY,
-    has: hasLicence
-  }
-]
-
-export const MYSQL = 'mysql'
-export const ORACLE = 'oracle'
-export const POSTGRESQL = 'postgresql'
-export const MARIADB = 'mariadb'
-export const DATABASE_CATEGORY = 'db'
-export const SQLSERVER = 'sqlserver'
-export const REDIS = 'redis'
-export const MONGODB = 'mongodb'
-
-export const DATABASE = [
-  {
-    name: MYSQL,
-    title: i18n.t(`applications.applicationsType.${MYSQL}`),
-    type: 'primary',
-    category: DATABASE_CATEGORY,
-    has: true,
-    group: i18n.t('applications.RDBProtocol')
-  },
-  {
-    name: MARIADB,
-    title: i18n.t(`applications.applicationsType.${MARIADB}`),
-    type: 'primary',
-    category: DATABASE_CATEGORY,
-    has: true
-  },
-  {
-    name: ORACLE,
-    title: i18n.t(`applications.applicationsType.${ORACLE}`),
-    type: 'primary',
-    category: DATABASE_CATEGORY,
-    has: hasLicence
-  },
-  {
-    name: POSTGRESQL,
-    title: i18n.t(`applications.applicationsType.${POSTGRESQL}`),
-    type: 'primary',
-    category: DATABASE_CATEGORY,
-    has: hasLicence
-  },
-  {
-    name: SQLSERVER,
-    title: i18n.t(`applications.applicationsType.${SQLSERVER}`),
-    type: 'primary',
-    category: DATABASE_CATEGORY,
-    has: hasLicence
-  },
-  {
-    name: REDIS,
-    title: i18n.t(`applications.applicationsType.${REDIS}`),
-    type: 'primary',
-    category: DATABASE_CATEGORY,
-    has: true,
-    group: i18n.t('applications.NoSQLProtocol')
-  },
-  {
-    name: MONGODB,
-    title: i18n.t(`applications.applicationsType.${MONGODB}`),
-    type: 'primary',
-    category: DATABASE_CATEGORY,
-    has: hasLicence
-  }
-]
-
-export const AppPlanDatabase = [
-  {
-    name: MYSQL,
-    title: i18n.t(`applications.applicationsType.${MYSQL}`),
-    type: 'primary',
-    category: DATABASE_CATEGORY,
-    has: true,
-    group: i18n.t('applications.RDBProtocol')
-  },
-  {
-    name: ORACLE,
-    title: i18n.t(`applications.applicationsType.${ORACLE}`),
-    type: 'primary',
-    category: DATABASE_CATEGORY,
-    has: hasLicence
-  },
-  {
-    name: POSTGRESQL,
-    title: i18n.t(`applications.applicationsType.${POSTGRESQL}`),
-    type: 'primary',
-    category: DATABASE_CATEGORY,
-    has: hasLicence
-  },
-  {
-    name: MARIADB,
-    title: i18n.t(`applications.applicationsType.${MARIADB}`),
-    type: 'primary',
-    category: DATABASE_CATEGORY,
-    has: hasLicence
-  },
-  {
-    name: SQLSERVER,
-    title: i18n.t(`applications.applicationsType.${SQLSERVER}`),
-    type: 'primary',
-    category: DATABASE_CATEGORY,
-    has: hasLicence
-  }
-]
-
-export const KUBERNETES = 'k8s'
-export const CLOUD_CATEGORY = 'cloud'
-
-export const CLOUD = [
-  {
-    name: KUBERNETES,
-    title: i18n.t(`applications.applicationsType.${KUBERNETES}`),
-    group: i18n.t('applications.Cloud'),
-    type: 'primary',
-    category: CLOUD_CATEGORY,
-    has: true
-  }
-]
-
-export const ApplicationTypes = [
-  ...REMOTE_APP, ...DATABASE, ...CLOUD
-]
diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue
index b50304a93..1ab7f8e9e 100644
--- a/src/views/users/User/UserList.vue
+++ b/src/views/users/User/UserList.vue
@@ -87,7 +87,10 @@ export default {
               return row['org_roles_display']
             },
             filters: [],
-            columnKey: 'org_roles'
+            columnKey: 'org_roles',
+            has: () => {
+              return this.$store.getters.hasValidLicense
+            }
           },
           mfa_enabled: {
             label: 'MFA',
@@ -127,6 +130,7 @@ export default {
       },
       headerActions: {
         hasBulkDelete: hasDelete,
+        canCreate: this.$hasPerm('users.add_user'),
         extraActions: [
           {
             name: this.$t('users.InviteUser'),

From e11e2bfb46bd0ead6016d9a46e97a2aed7e6a241 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 15 Mar 2022 20:07:46 +0800
Subject: [PATCH 28/37] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20terminal=20?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settings/Terminal/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/settings/Terminal/index.vue b/src/views/settings/Terminal/index.vue
index c028b8f58..78837316f 100644
--- a/src/views/settings/Terminal/index.vue
+++ b/src/views/settings/Terminal/index.vue
@@ -50,7 +50,9 @@ export default {
         {
           title: this.$t('xpack.ComponentMonitor'),
           name: 'Monitor',
-          hidden: () => !this.$hasPerm('terminal.view_terminal')
+          hidden: () => {
+            return !this.$hasPerm('terminal.view_terminal') && this.$store.getters.hasValidLicense
+          }
         }
       ]
     }

From 5f1d6bf7f90e8f2a4f459799762233849c960d27 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 20:16:32 +0800
Subject: [PATCH 29/37] =?UTF-8?q?fix:=20=E6=97=A5=E5=BF=97=E5=AE=A1?=
 =?UTF-8?q?=E8=AE=A1=E6=89=B9=E9=87=8F=E6=97=A5=E5=BF=97=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audits/CommandExecutionList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/audits/CommandExecutionList.vue b/src/views/audits/CommandExecutionList.vue
index 8d1337d19..82434ac9e 100644
--- a/src/views/audits/CommandExecutionList.vue
+++ b/src/views/audits/CommandExecutionList.vue
@@ -96,7 +96,7 @@ export default {
             options: [
               {
                 label: this.$t('audits.Hosts'),
-                value: 'asset_display'
+                value: 'asset__hostname'
               }
             ]
           },

From 3a5f4278912d1392efe5b4f6d1d6c353b39e6020 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 20:22:54 +0800
Subject: [PATCH 30/37] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4change=5Fsetting?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/Role/RoleDetail/RoleInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue
index 322d659b6..524570185 100644
--- a/src/views/users/Role/RoleDetail/RoleInfo.vue
+++ b/src/views/users/Role/RoleDetail/RoleInfo.vue
@@ -78,7 +78,7 @@ export default {
         'view_console': ['rbac.view_console'],
         'view_audit': ['rbac.view_audit'],
         'view_workspace': ['rbac.view_workspace'],
-        'view_setting': ['settings.view_setting', 'settings.change_setting'],
+        'view_setting': ['settings.view_setting'],
         'cloud_import': ['assets.view_asset'],
         'terminal_node': ['settings.change_terminal'],
         'rbac.orgrolebinding': ['rbac.view_orgrole'],

From 6b54fa8363b4dbdd2422c7752c209b4d65d50967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 15 Mar 2022 20:18:56 +0800
Subject: [PATCH 31/37] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E7=94=A8=E6=88=B7=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/accounts/GatheredUser/GatheredUserList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/accounts/GatheredUser/GatheredUserList.vue b/src/views/accounts/GatheredUser/GatheredUserList.vue
index 4fe1b1375..36c6e73e6 100644
--- a/src/views/accounts/GatheredUser/GatheredUserList.vue
+++ b/src/views/accounts/GatheredUser/GatheredUserList.vue
@@ -48,7 +48,7 @@ export default {
         hasLeftActions: false,
         hasImport: false,
         searchConfig: {
-          exclude: ['asset'],
+          exclude: ['asset', 'present'],
           options: [
             {
               label: this.$t('assets.Hostname'),

From b43328cceb036c826e8832a59609a1e7c98cd5a7 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Tue, 15 Mar 2022 20:43:13 +0800
Subject: [PATCH 32/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=94=B9=E5=AF=86=E8=AE=A1=E5=88=92=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

---
 .../ChangeAuthPlanExecutionList.vue                      | 2 ++
 .../AppChangeAuthPlan/ChangeAuthPlanDetail/index.vue     | 9 ++++++---
 .../ChangeAuthPlanExecutionList.vue                      | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/AppChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/AppChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
index ee1ee57b6..6006a1a04 100644
--- a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/AppChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
+++ b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/AppChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
@@ -82,6 +82,7 @@ export default {
                 {
                   name: 'log',
                   type: 'primary',
+                  can: 'xpack.view_applicationchangeauthplanexecution',
                   title: this.$t('xpack.ChangeAuthPlan.Log'),
                   callback: function({ row }) {
                     window.open(`/#/ops/celery/task/${row.id}/log/`, '_blank', 'toolbar=yes, width=900, height=600')
@@ -91,6 +92,7 @@ export default {
                   name: 'detail',
                   title: this.$t('xpack.ChangeAuthPlan.Detail'),
                   type: 'info',
+                  can: 'xpack.view_applicationchangeauthplantask',
                   callback: function({ row }) {
                     return this.$router.push({ name: 'AppChangeAuthPlanExecutionDetail', params: { id: row.id }})
                   }
diff --git a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/index.vue b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/index.vue
index e451c98a0..4a981c10f 100644
--- a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/index.vue
+++ b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/index.vue
@@ -29,15 +29,18 @@ export default {
         submenu: [
           {
             title: this.$t('common.BasicInfo'),
-            name: 'AppChangeAuthPlanInfo'
+            name: 'AppChangeAuthPlanInfo',
+            hidden: !this.$hasPerm('xpack.view_applicationchangeauthplan')
           },
           {
             title: this.$t('xpack.ChangeAuthPlan.SystemUser'),
-            name: 'ChangeAuthPlanDatabase'
+            name: 'ChangeAuthPlanDatabase',
+            hidden: !this.$hasPerm('xpack.change_applicationchangeauthplan')
           },
           {
             title: this.$t('xpack.ChangeAuthPlan.ExecutionList'),
-            name: 'AppChangeAuthPlanExecutionList'
+            name: 'AppChangeAuthPlanExecutionList',
+            hidden: !this.$hasPerm('xpack.view_applicationchangeauthplanexecution')
           }
         ],
         actions: {
diff --git a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
index 49cb569ac..336cee49e 100644
--- a/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
+++ b/src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
@@ -74,6 +74,7 @@ export default {
                 {
                   name: 'log',
                   type: 'primary',
+                  can: 'xpack.view_changeauthplanexecution',
                   title: this.$t('xpack.ChangeAuthPlan.Log'),
                   callback: function({ row }) {
                     window.open(`/#/ops/celery/task/${row.id}/log/`, '_blank', 'toolbar=yes, width=900, height=600')

From b75abba2c13f0c2268f00b63ebd18db36bfeba5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 15 Mar 2022 20:30:46 +0800
Subject: [PATCH 33/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E7=AE=A1=E7=90=86-=E5=B9=B3=E5=8F=B0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=83=E9=99=90=E4=BD=8D=E4=B8=8D=E5=87=86=E7=A1=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Platform/PlatformList.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/views/assets/Platform/PlatformList.vue b/src/views/assets/Platform/PlatformList.vue
index 9190260fa..3d1bdb538 100644
--- a/src/views/assets/Platform/PlatformList.vue
+++ b/src/views/assets/Platform/PlatformList.vue
@@ -9,6 +9,7 @@ export default {
     GenericListPage
   },
   data() {
+    const vm = this
     return {
       tableConfig: {
         url: '/api/v1/assets/platforms/',
@@ -22,13 +23,9 @@ export default {
           },
           actions: {
             formatterArgs: {
-              canClone: true,
-              canDelete: ({ row }) => {
-                return !row.internal
-              },
-              canUpdate: ({ row }) => {
-                return !row.internal
-              }
+              canClone: vm.$hasPerm('assets.add_platform'),
+              canUpdate: ({ row }) => !row.internal && vm.$hasPerm('assets.change_platform'),
+              canDelete: ({ row }) => !row.internal && vm.$hasPerm('assets.delete_platform')
             }
           }
         }
@@ -37,7 +34,6 @@ export default {
         hasRightActions: true,
         hasMoreActions: false,
         hasBulkDelete: false,
-        canCreate: true,
         createRoute: 'PlatformCreate'
       }
     }

From 68999da21fd1a7a712eeee9117e028ff60b2768c Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Tue, 15 Mar 2022 20:45:48 +0800
Subject: [PATCH 34/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BD=91?=
 =?UTF-8?q?=E7=AE=A1=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Domain/DomainDetail/GatewayList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/assets/Domain/DomainDetail/GatewayList.vue b/src/views/assets/Domain/DomainDetail/GatewayList.vue
index b89ad63f6..dfd02acc2 100644
--- a/src/views/assets/Domain/DomainDetail/GatewayList.vue
+++ b/src/views/assets/Domain/DomainDetail/GatewayList.vue
@@ -102,6 +102,7 @@ export default {
         }
       },
       headerActions: {
+        hasBulkUpdate: false,
         hasSearch: true,
         createRoute: {
           name: 'GatewayCreate',

From 4ae2f63a88567088c9c221d4b7682606b27eb9e5 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 15 Mar 2022 20:52:15 +0800
Subject: [PATCH 35/37] =?UTF-8?q?perf:=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ListTable/TableAction/ImportDialog.vue       | 16 ++++++++++++++--
 src/i18n/langs/cn.json                           |  1 +
 src/i18n/langs/en.json                           |  1 +
 src/views/accounts/GatheredUser/TaskList.vue     |  5 +++--
 src/views/assets/Asset/AssetList.vue             | 10 +++++-----
 src/views/users/Role/RoleList/BaseRoleList.vue   |  3 +++
 6 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/components/ListTable/TableAction/ImportDialog.vue b/src/components/ListTable/TableAction/ImportDialog.vue
index c24976ac9..67fe24e3b 100644
--- a/src/components/ListTable/TableAction/ImportDialog.vue
+++ b/src/components/ListTable/TableAction/ImportDialog.vue
@@ -13,8 +13,12 @@
   >
     <el-form v-if="!showTable" label-position="left" style="padding-left: 50px">
       <el-form-item :label="$t('common.Import' )" :label-width="'100px'">
-        <el-radio v-model="importOption" class="export-item" label="create">{{ this.$t('common.Create') }}</el-radio>
-        <el-radio v-model="importOption" class="export-item" label="update">{{ this.$t('common.Update') }}</el-radio>
+        <el-radio v-if="canImportCreate" v-model="importOption" class="export-item" label="create">
+          {{ this.$t('common.Create') }}
+        </el-radio>
+        <el-radio v-if="canImportUpdate" v-model="importOption" class="export-item" label="update">
+          {{ this.$t('common.Update') }}
+        </el-radio>
         <div style="line-height: 1.5">
           <span class="el-upload__tip">
             {{ downloadTemplateTitle }}
@@ -77,6 +81,14 @@ export default {
     url: {
       type: String,
       default: () => ''
+    },
+    canImportCreate: {
+      type: Boolean,
+      default: true
+    },
+    canImportUpdate: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 186f901fc..232259091 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -455,6 +455,7 @@
       "Loading": "加载中"
     },
     "updateErrorMsg": "更新失败",
+    "ErrorMsg": "错误",
     "updateSelected": "更新所选",
     "updateSuccessMsg": "更新成功",
     "SelectProperties": "选择属性",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index a97c2707f..bef067614 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -443,6 +443,7 @@
       "Loading": "Loading"
     },
     "updateErrorMsg": "Update failed",
+    "ErrorMsg": "Error",
     "updateSelected": "Update selected",
     "updateSuccessMsg": "Update success",
     "SelectProperties": "Select properties",
diff --git a/src/views/accounts/GatheredUser/TaskList.vue b/src/views/accounts/GatheredUser/TaskList.vue
index 9f7f1da30..365e483a1 100644
--- a/src/views/accounts/GatheredUser/TaskList.vue
+++ b/src/views/accounts/GatheredUser/TaskList.vue
@@ -23,7 +23,8 @@ export default {
           resource: 'gatherusertask'
         },
         columns: [
-          'name', 'nodes', 'is_periodic', 'periodic_display', 'executed_times', 'actions'
+          'name', 'nodes', 'is_periodic', 'periodic_display',
+          'executed_times', 'actions'
         ],
         columnsShow: {
           min: ['name', 'nodes', 'is_periodic', 'periodic_display', 'executed_times', 'actions']
@@ -74,7 +75,7 @@ export default {
                   title: vm.$t('xpack.Execute'),
                   name: 'execute',
                   type: 'info',
-                  can: vm.$hasPerm('xpack.change_gatherusertask'),
+                  can: vm.$hasPerm('xpack.add_gatherusertaskexecution'),
                   callback: function(data) {
                     this.$axios.post(
                       `/api/v1/xpack/gathered-user/task-executions/`,
diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index 57c35da32..367a5a156 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -9,14 +9,14 @@
         <li id="m_move_asset_to_node" v-perms="'assets.move_assettonode'" class="rmenu" tabindex="-1" @click="rMenuMoveAssetToNode">
           <i class="fa fa-scissors" />  {{ this.$t('tree.MoveAssetToNode') }}
         </li>
-        <li v-if="$hasPerm('assets.move_assettonode') || $hasPerm('assets.add_assettonode')" class="divider" />
+        <li v-if="$hasPerm('assets.move_assettonode | assets.add_assettonode')" class="divider" />
         <li id="m_update_node_asset_hardware_info" v-perms="'assets.refresh_assethardwareinfo'" class="rmenu" tabindex="-1" @click="rMenuUpdateNodeAssetHardwareInfo">
           <i class="fa fa-refresh" />  {{ this.$t('tree.UpdateNodeAssetHardwareInfo') }}
         </li>
         <li id="m_test_node_asset_connectivity" v-perms="'assets.test_assetconnectivity'" class="rmenu" tabindex="-1" @click="rMenuTestNodeAssetConnectivity">
           <i class="fa fa-link" />  {{ this.$t('tree.TestNodeAssetConnectivity') }}
         </li>
-        <li v-if="$hasPerm('assets.add_assettonode') || $hasPerm('assets.test_assetconnectivity')" class="divider" />
+        <li v-if="$hasPerm('assets.add_assettonode | assets.test_assetconnectivity')" class="divider" />
         <li id="m_show_asset_only_current_node" class="rmenu" tabindex="-1" @click="rMenuShowAssetOnlyCurrentNode">
           <i class="fa fa-indent" />  {{ this.$t('tree.ShowAssetOnlyCurrentNode') }}
         </li>
@@ -24,7 +24,7 @@
           <i class="fa fa-align-justify" />  {{ this.$t('tree.ShowAssetAllChildrenNode') }}
         </li>
         <li class="divider" />
-        <li id="m_check_assets_amount" class="rmenu" tabindex="-1" @click="rCheckAssetsAmount">
+        <li id="m_check_assets_amount" v-perms="'assets.change_node'" class="rmenu" tabindex="-1" @click="rCheckAssetsAmount">
           <i class="fa fa-clone" />  {{ this.$t('tree.CheckAssetsAmount') }}
         </li>
         <li id="m_show_node_info" class="rmenu" tabindex="-1" @click="rMenuShowNodeInfo">
@@ -385,7 +385,7 @@ export default {
           { key: 'fullName', label: this.$t('assets.FullName'), value: res.full_value }
         ]
       }).catch(error => {
-        this.$message.error(this.$t('common.getErrorMsg' + ' ' + error))
+        this.$message.error(this.$t('common.ErrorMsg' + ' ' + error))
       })
     },
     rCheckAssetsAmount: function() {
@@ -394,7 +394,7 @@ export default {
       ).then(res => {
         openTaskPage(res['task'])
       }).catch(error => {
-        this.$message.error(this.$t('common.getErrorMsg' + ' ' + error))
+        this.$message.error(this.$t('common.updateErrorMsg' + ' ' + error))
       })
     }
   }
diff --git a/src/views/users/Role/RoleList/BaseRoleList.vue b/src/views/users/Role/RoleList/BaseRoleList.vue
index 576377220..f017776b0 100644
--- a/src/views/users/Role/RoleList/BaseRoleList.vue
+++ b/src/views/users/Role/RoleList/BaseRoleList.vue
@@ -97,6 +97,9 @@ export default {
         hasMoreActions: false,
         canCreate: () => {
           return this.$hasPerm(`rbac.add_${this.scopeRole}`)
+        },
+        importOptions: {
+          canImportUpdate: false
         }
       }
     }

From b1ea8a0b4be6d7545f900f0d97098dedeb765d35 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Wed, 16 Mar 2022 20:59:56 +0800
Subject: [PATCH 36/37] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/Role/RoleDetail/RoleInfo.vue | 103 -------------------
 1 file changed, 103 deletions(-)

diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue
index 54602a1d7..01bcf3b8b 100644
--- a/src/views/users/Role/RoleDetail/RoleInfo.vue
+++ b/src/views/users/Role/RoleDetail/RoleInfo.vue
@@ -63,109 +63,6 @@ export default {
   mounted() {
   },
   methods: {
-    setUpdateBtn() {
-      const permRequired = `rbac.change_${this.object.scope}role`
-      if (this.$hasPerm(permRequired)) {
-        this.isDisabled = false
-      }
-    },
-    parsePerm(perm) {
-      if (!perm) {
-        this.$log.debug('No app code: ', perm)
-        return
-      }
-      const [app, code] = perm.split('.')
-      if (!app || !code) {
-        this.$log.debug('App or code not found')
-        return
-      }
-      const [action, resource] = code.split('_')
-      if (!action || !resource) {
-        return
-      }
-      return { action, resource, app }
-    },
-    checkActionDeps(node) {
-      if (node.isParent) {
-        this.$log.debug('Is parent')
-        return
-      }
-      const data = this.parsePerm(node.title)
-      if (!data) {
-        this.$log.error('Parse perm error: ', node.title)
-        return
-      }
-
-      const { app, action, resource } = data
-      const ztree = this.$refs.tree.zTree
-      const viewId = `${app}.view_${resource}`
-      const viewNode = ztree.getNodeByParam('title', viewId)
-      if (!viewNode) {
-        return
-      }
-
-      const viewIgnoreAction = ['match']
-      const checked = node.checked
-      if (action === 'view') {
-        // 选中 view node 不需要处理, 不选中的话去掉 兄弟节点选中
-        if (checked) {
-          return
-        }
-        const parent = viewNode.getParentNode()
-        const actionNodes = parent.children
-        for (const node of actionNodes) {
-          const d = this.parsePerm(node.title)
-          if (!d) {
-            continue
-          }
-          const { action: act, resource: res } = d
-          // 忽略的 action 不用处理, resource 不相同的不用处理
-          this.$log.debug('Action: ', act, d)
-          if (act === 'view' || viewIgnoreAction.indexOf(act) > -1 || res !== resource) {
-            continue
-          }
-          ztree.checkNode(node, false)
-        }
-      } else if (viewIgnoreAction.indexOf(action) > -1) {
-        this.$log.debug('Action is ignore: ', action)
-      } else {
-        if (!checked) {
-          return
-        }
-        this.$log.debug('Select view node: ', viewNode)
-        ztree.checkNode(viewNode, true)
-      }
-    },
-    checkSpecDeps() {
-      const ztree = this.$refs.tree.zTree
-      const depsId = ztree.getCheckedNodes().filter(i => {
-        return !!this.nodesDeps[i.title]
-      }).reduce((result, v) => {
-        return [...result, ...this.nodesDeps[v.title]]
-      }, [])
-      this.$log.debug('Select nodes should try: ', depsId)
-
-      for (const i of depsId) {
-        const depNode = this.ztree.getNodeByParam('title', i)
-        this.ztree.checkNode(depNode, true)
-      }
-    },
-    updatePermissions() {
-      const ztree = this.$refs.tree.zTree
-      const checkedNodes = ztree.getCheckedNodes()
-      const permNodes = checkedNodes.filter(node => !node.isParent)
-      const permIds = permNodes.map(node => node.id)
-      const roleDetailUrl = `/api/v1/rbac/${this.object.scope}-roles/${this.object.id}/`
-      const data = {
-        permissions: permIds
-      }
-      this.$axios.patch(roleDetailUrl, data).then(() => {
-        this.$message.success(this.$t('common.updateSuccessMsg'))
-      }).catch(error => {
-        this.$message.error(this.$t('common.updateErrorMsg') + error)
-        this.$log.error(error)
-      })
-    }
   }
 }
 </script>

From 111d3d56e25a5477a3ce21e406e1d6b444bb54b1 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Thu, 16 Jun 2022 18:17:19 +0800
Subject: [PATCH 37/37] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96confirm=20?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UserConfirmDialog/index.vue | 2 +-
 src/i18n/langs/en.json                     | 3 ++-
 src/i18n/langs/ja.json                     | 3 ++-
 src/i18n/langs/zh.json                     | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/UserConfirmDialog/index.vue b/src/components/UserConfirmDialog/index.vue
index 31a59f2be..2473cf45d 100644
--- a/src/components/UserConfirmDialog/index.vue
+++ b/src/components/UserConfirmDialog/index.vue
@@ -68,7 +68,7 @@ export default {
       this.ConfirmType = backends[0].name
       if (this.ConfirmType === 'relogin') {
         this.visible = false
-        return this.$message.error(this.$t('auth.ReLogin'))
+        return this.$message.error(this.$t('auth.ReLoginErr'))
       }
 
       if (this.ConfirmType === 'mfa') {
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index f93196b63..10716a097 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -246,7 +246,8 @@
   },
   "auth": {
     "LoginRequiredMsg": "You account has logout, Please login again",
-    "ReLogin": "Re-Login"
+    "ReLogin": "Re-Login",
+    "ReLoginErr": "Login time has exceeded 5 minutes, please login again"
   },
   "common": {
     "ChangeViewHelpText": "Click to change view",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 352947760..299b1884e 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -251,7 +251,8 @@
   },
   "auth": {
     "LoginRequiredMsg": "アカウントが終了しました。ログインし直してください",
-    "ReLogin": "再ログイン"
+    "ReLogin": "再ログイン",
+    "ReLoginErr": "ログイン時間が 5 分を超えました。もう一度ログインしてください"
   },
   "common": {
     "ChangeViewHelpText": "クリックしてさまざまなビューにアクセス",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index d487e4ce4..4d1382b0b 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -251,7 +251,8 @@
   },
   "auth": {
     "LoginRequiredMsg": "账号已退出，请重新登录",
-    "ReLogin": "重新登录"
+    "ReLogin": "重新登录",
+    "ReLoginErr": "登录时长已超过 5 分钟，请重新登录"
   },
   "common": {
     "ChangeViewHelpText": "点击切换不同视图",