From 8ac0e8ed2c2f72d9b2813827a7f595de7214bb0f Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 22 Feb 2022 18:27:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20filter=20?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2system=20=E6=9C=AA=E5=88=A0=E9=99=A4=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BB=A5=E5=8F=8A=20=E4=B8=8D=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81class=E8=AF=AD=E6=B3=95=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/filterSearch/filterSearch.vue      | 32 +++++++++++++------
 .../rightBox/chart/systemChartConfig.vue      |  4 ++-
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue
index 01420d51d..bc12681ed 100644
--- a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue
+++ b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue
@@ -63,13 +63,12 @@
         </div>
       </template>
     </div>
-    <div class="tag-search__add cursor-pointer" @click="addCondition">{{$t('project.topology.add')}}</div>
+    <div class="tag-search__add cursor-pointer" @click="addCondition()">{{$t('project.topology.add')}}</div>
   </div>
 </template>
 
 <script>
-import _ from 'lodash'
-import Meta, { connection, condition } from './filterSearch.js'
+import { connection, condition } from './filterSearch.js'
 export default {
   name: 'filterSearch',
   props: {
@@ -82,34 +81,47 @@ export default {
       connection,
       compareList: [],
       metaList: [],
-      rule: []
+      rule: [],
+      meta: {
+        meta: condition,
+        name: '',
+        nameIsEditing: false,
+        oper: '',
+        operIsEditing: false,
+        value: '',
+        valueIsEditing: false
+      }
     }
   },
   mounted () {
     this.metaList = this.valueList.map(item => {
-      const obj = Object.assign(new Meta(condition), item)
-      return obj
+      return item
     })
   },
   methods: {
     // 新增条件
     addCondition (meta) {
       this.metaList.forEach(m => {
-        m.cancelEditing()
+        this.nameIsEditing = false
+        this.operIsEditing = false
+        this.valueIsEditing = false
       })
       // 先判断上一个condition是否已填写完整，没有则删除；之后将当前所有meta的内容的isEditing置为false
       if (this.metaList.length > 0) {
         const prevMeta = this.metaList[this.metaList.length - 1]
-        if (!prevMeta.isCompleteCondition()) {
+        if (!(prevMeta.name && prevMeta.oper && prevMeta.value)) {
           this.metaList.splice(this.metaList.length - 1, 1)
         }
       }
       // 不是首个condition时，先增加一个connection，再增加一个新condition
-      if (meta instanceof Meta) {
+      console.log(meta)
+      if (meta) {
         this.metaList.push(meta)
         this.$emit('metaList')
       } else {
-        const newCondition = new Meta(condition)
+        let self = this
+        const newCondition = Object.assign({}, self.meta)
+        console.log(newCondition)
         newCondition.nameIsEditing = true
         this.metaList.push(newCondition)
         this.$forceUpdate()
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index 96e2f8006..3418e19cf 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -100,6 +100,7 @@
                     prop="param.filter"
                   >
                   <filterSearch
+                    ref="filterSearch"
                     :valueList.sync="item.filter"
                     @change="change"
                     :keyList="keyList"
@@ -589,7 +590,7 @@
 import publicConfig from '@/components/common/rightBox/chart/publicConfig'
 import chartTypeShow from '@/components/common/rightBox/chart/chartTypeShow'
 import nezhaColor from '@/components/common/nezhaColor'
-import filterSearch from '@/components/common/filterSearch/filterSearch'
+import filterSearch, { condition } from '@/components/common/filterSearch/filterSearch'
 import VueTagsInput from '@johmun/vue-tags-input'
 import { isGauge } from '@/components/chart/chart/tools'
 
@@ -770,6 +771,7 @@ export default {
       this.chartConfig.param.datasource[0].group = ''
       this.chartConfig.param.datasource[0].select = ''
       this.chartConfig.param.datasource[0].filter = []
+      this.$refs.filterSearch[0].metaList = []
       this.groupList = item.group
       this.selectList = JSON.parse(JSON.stringify(item.select))
       this.keyList = JSON.parse(JSON.stringify(item.filter))