From ff640575f851fb7dae246f470e5b1244d48e6cc2 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 19 Apr 2024 15:17:05 +0800
Subject: [PATCH] =?UTF-8?q?CN-1592=20fix:=20tag=E9=A1=B5=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0isbuiltin=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/tag/TagTable.vue |  2 +-
 src/utils/constants.js                | 11 +++++
 src/views/tag/Tag.vue                 | 70 +++++++++++++++++++++------
 3 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/src/components/table/tag/TagTable.vue b/src/components/table/tag/TagTable.vue
index 87e4811e..25da5bc2 100644
--- a/src/components/table/tag/TagTable.vue
+++ b/src/components/table/tag/TagTable.vue
@@ -155,7 +155,7 @@ export default {
           label: this.$t('tag.category'),
           prop: 'category',
           show: true,
-          width: 100
+          width: 150
         }, {
           label: this.$t('tag.entityType'),
           prop: 'indicatorType',
diff --git a/src/utils/constants.js b/src/utils/constants.js
index cd1975e2..2cce8ec3 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -362,6 +362,17 @@ export const tagCategoryOptions = [
   }
 ]
 
+export const tagSourceOptions = [
+  {
+    value: 1,
+    label: 'tag.builtInTag'
+  },
+  {
+    value: 0,
+    label: 'tag.userDefined'
+  }
+]
+
 export const metricType = {
   Bits: 'Bits/s',
   Packets: 'Packets/s',
diff --git a/src/views/tag/Tag.vue b/src/views/tag/Tag.vue
index 27a544b8..f426eb6f 100644
--- a/src/views/tag/Tag.vue
+++ b/src/views/tag/Tag.vue
@@ -26,25 +26,11 @@
             <i class="cn-icon-delete cn-icon"></i>
             <span>{{$t('overall.delete')}}</span>
           </button>
-          <el-select
-                  key="intentSelect"
-                  v-model="intent"
-                  :teleported="false"
-                  style="width: 160px; margin-right:10px;"
-                  clearable
-                  placeholder="All"
-                  @change="intentChange"
-          >
-            <template #prefix>
-              <span class="select-prefix">{{$t('tag.intent')}}:</span>
-            </template>
-            <el-option v-for="item in tagIntentOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
-          </el-select>
           <el-select
                   key="categorySelect"
                   v-model="category"
                   :teleported="false"
-                  style="width: 190px; margin-right:10px;"
+                  style="width: 210px; margin-right:10px;"
                   clearable
                   placeholder="All"
                   @change="categoryChange"
@@ -54,6 +40,34 @@
             </template>
             <el-option v-for="item in tagCategoryOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
           </el-select>
+          <el-select
+              key="intentSelect"
+              v-model="intent"
+              :teleported="false"
+              style="width: 180px; margin-right:10px;"
+              clearable
+              placeholder="All"
+              @change="intentChange"
+          >
+            <template #prefix>
+              <span class="select-prefix">{{$t('tag.intention')}}:</span>
+            </template>
+            <el-option v-for="item in tagIntentOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
+          </el-select>
+          <el-select
+                  key="sourceSelect"
+                  v-model="source"
+                  :teleported="false"
+                  style="width: 190px; margin-right:10px;"
+                  clearable
+                  placeholder="All"
+                  @change="sourceChange"
+          >
+            <template #prefix>
+              <span class="select-prefix">{{$t('tag.source')}}:</span>
+            </template>
+            <el-option v-for="item in tagSourceOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
+          </el-select>
         </template>
         <template #default>
           <loading :loading="loading"></loading>
@@ -86,7 +100,7 @@ import TagTable from '@/components/table/tag/TagTable'
 import cnDataList from '@/components/table/CnDataList'
 import dataListMixin from '@/mixins/data-list'
 import { api } from '@/utils/api'
-import { tagIntentOptions, tagCategoryOptions } from '@/utils/constants'
+import { tagIntentOptions, tagCategoryOptions, tagSourceOptions } from '@/utils/constants'
 import { urlParamsHandler, overwriteUrl } from '@/utils/tools'
 import Loading from '@/components/common/Loading'
 import { ref } from 'vue'
@@ -100,11 +114,13 @@ export default {
       url: api.tagList,
       tagIntentOptions,
       tagCategoryOptions,
+      tagSourceOptions,
       tableId: 'tagTable',
       builtinLeftLoading: false,
       isInit: true,
       intent: '',
       category: '',
+      source: '',
       name: ''
     }
   },
@@ -144,6 +160,9 @@ export default {
       if (this.name) {
         params = { ...params, name: this.name }
       }
+      if (this.source || this.source === 0) {
+        params = { ...params, name: this.source }
+      }
       this.getTableData(params)
     },
     categoryChange (value) {
@@ -157,6 +176,25 @@ export default {
       if (this.name) {
         params = { ...params, name: this.name }
       }
+      if (this.source || this.source === 0) {
+        params = { ...params, name: this.source }
+      }
+      this.getTableData(params)
+    },
+    sourceChange (value) {
+      let params = {}
+      if (value || value === 0) {
+        params = { isBuiltIn: value }
+      }
+      if (this.category) {
+        params = { ...params, category: this.category }
+      }
+      if (this.intent) {
+        params = { ...params, intent: this.intent }
+      }
+      if (this.name) {
+        params = { ...params, name: this.name }
+      }
       this.getTableData(params)
     },
     search (params) {