From 90adcaf8437f64a83a95486bebf4ac8d0fbecdeb Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Thu, 9 Dec 2021 17:19:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=91=BD=E4=BB=A4=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=99=A8=E6=94=AF=E6=8C=81=E5=A4=9A=E7=BB=B4=E5=BA=A6=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                        |  1 +
 src/i18n/langs/en.json                        |  1 +
 .../CommandFilterCreateUpdate.vue             | 60 ++++++++++++++++++-
 .../CommandFilterDetail/Rules.vue             |  2 +-
 .../CommandFilter/CommandFilterList.vue       | 24 +++++++-
 .../SystemUser/SystemUserDetail/Detail.vue    |  1 -
 6 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 4e9f74cc3..c6318947b 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -243,6 +243,7 @@
     "ReLogin": "重新登录"
   },
   "common": {
+    "Correlation": "关联",
     "UserLoginLimit": "用户登录限制",
     "IPLoginLimit": "IP 登录限制",
     "Setting": "设置",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index e58bfb5ef..28522c550 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -237,6 +237,7 @@
     "ReLogin": "Re-Login"
   },
   "common": {
+    "Correlation": "Correlation",
     "UserLoginLimit": "User login limit",
     "IPLoginLimit": "IP login limit",
     "Setting": "Setting",
diff --git a/src/views/assets/CommandFilter/CommandFilterCreateUpdate.vue b/src/views/assets/CommandFilter/CommandFilterCreateUpdate.vue
index 96916b03c..0b5dda092 100644
--- a/src/views/assets/CommandFilter/CommandFilterCreateUpdate.vue
+++ b/src/views/assets/CommandFilter/CommandFilterCreateUpdate.vue
@@ -4,6 +4,7 @@
 
 <script>
 import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
+import AssetSelect from '@/components/AssetSelect/index'
 export default {
   name: 'CommandFilterCreateUpdate',
   components: { GenericCreateUpdatePage },
@@ -13,9 +14,66 @@ export default {
 
       },
       fields: [
-        [this.$t('common.Basic'), ['name', 'comment']]
+        [this.$t('common.Basic'), ['name']],
+        [this.$t('common.Correlation'), ['users', 'user_groups', 'assets', 'applications', 'system_users']],
+        [this.$t('common.Other'), ['is_active', 'comment']]
       ],
       fieldsMeta: {
+        users: {
+          el: {
+            value: [],
+            ajax: {
+              url: '/api/v1/users/users/?fields_size=mini',
+              transformOption: (item) => {
+                return { label: item.name + '(' + item.username + ')', value: item.id }
+              }
+            }
+          }
+        },
+        user_groups: {
+          el: {
+            value: [],
+            url: '/api/v1/users/groups/'
+          }
+        },
+        assets: {
+          type: 'assetSelect',
+          component: AssetSelect,
+          label: this.$t('perms.Asset'),
+          rules: [{
+            required: false
+          }],
+          el: {
+            value: []
+          }
+        },
+        applications: {
+          label: this.$t('assets.Applications'),
+          el: {
+            value: [],
+            ajax: {
+              url: `/api/v1/applications/applications/?category=db`,
+              transformOption: (item) => {
+                return { label: item.name + ' (' + item.type_display + ')', value: item.id }
+              }
+            }
+          }
+        },
+        system_users: {
+          el: {
+            value: [],
+            ajax: {
+              url: `/api/v1/assets/system-users/?protocol__in=ssh,telnet,mysql,postgresql,mariadb,oracle,sqlserver,k8s`,
+              transformOption: (item) => {
+                if (this.$route.query.type === 'k8s') {
+                  return { label: item.name, value: item.id }
+                }
+                const username = item.username || '*'
+                return { label: item.name + '(' + username + ')', value: item.id }
+              }
+            }
+          }
+        }
 
       },
       url: '/api/v1/assets/cmd-filters/'
diff --git a/src/views/assets/CommandFilter/CommandFilterDetail/Rules.vue b/src/views/assets/CommandFilter/CommandFilterDetail/Rules.vue
index 8e6528fb2..4c2c750b8 100644
--- a/src/views/assets/CommandFilter/CommandFilterDetail/Rules.vue
+++ b/src/views/assets/CommandFilter/CommandFilterDetail/Rules.vue
@@ -20,7 +20,7 @@ export default {
     return {
       tableConfig: {
         url: `/api/v1/assets/cmd-filters/${this.object.id}/rules/`,
-        columns: ['type', 'content', 'priority', 'action', 'comment', 'actions'],
+        columns: ['type', 'content', 'priority', 'action', 'comment', 'pattern', 'actions'],
         columnsMeta: {
           type: {
             width: '100px'
diff --git a/src/views/assets/CommandFilter/CommandFilterList.vue b/src/views/assets/CommandFilter/CommandFilterList.vue
index 6a56d613c..b97176c45 100644
--- a/src/views/assets/CommandFilter/CommandFilterList.vue
+++ b/src/views/assets/CommandFilter/CommandFilterList.vue
@@ -15,12 +15,12 @@ export default {
       tableConfig: {
         url: '/api/v1/assets/cmd-filters/',
         columns: [
-          'name', 'rules', 'system_users', 'is_active',
+          'name', 'rules', 'users', 'user_groups', 'assets', 'applications', 'system_users', 'is_active',
           'created_by', 'date_created', 'comment', 'org_name', 'actions'
         ],
         columnsShow: {
           min: ['name', 'actions'],
-          default: ['name', 'rules', 'system_users', 'comment', 'actions']
+          default: ['name', 'rules', 'comment', 'actions']
         },
         columnsMeta: {
           rules: {
@@ -38,6 +38,26 @@ export default {
           date_created: {
             label: this.$t('users.DateJoined')
           },
+          users: {
+            formatter: function(row, col, cell) {
+              return cell.length
+            }
+          },
+          user_groups: {
+            formatter: function(row, col, cell) {
+              return cell.length
+            }
+          },
+          assets: {
+            formatter: function(row, col, cell) {
+              return cell.length
+            }
+          },
+          applications: {
+            formatter: function(row, col, cell) {
+              return cell.length
+            }
+          },
           system_users: {
             label: this.$t('assets.SystemUsers'),
             formatter: DetailFormatter,
diff --git a/src/views/assets/SystemUser/SystemUserDetail/Detail.vue b/src/views/assets/SystemUser/SystemUserDetail/Detail.vue
index b77050f2b..c2b5e0710 100644
--- a/src/views/assets/SystemUser/SystemUserDetail/Detail.vue
+++ b/src/views/assets/SystemUser/SystemUserDetail/Detail.vue
@@ -6,7 +6,6 @@
     <el-col :span="10">
       <QuickActions type="primary" :actions="quickActions" />
       <RelationCard
-        v-if="object.protocol === 'ssh'"
         ref="RelationCard"
         v-bind="nodeRelationConfig"
         type="info"