From 1cc1cb1f85370ddb04ec56c946e9c800fd8b06e7 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 13 Apr 2023 11:43:30 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BC=98=E5=8C=96Topology=20?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9legend=E7=9A=84=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/project/meta2d/js/meta2dMain.js         |  3 +++
 .../common/project/meta2d/meta2dElement.vue        | 14 ++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
index 9aa23576e..c7bb97d78 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
@@ -434,6 +434,9 @@ export default {
       }
     },
     beforeEdit () {
+      const endTime = new Date().getTime()
+      const startTime = endTime - 60 * this.params.timeType * 1000
+      this.getQueryValues(this.querysArray, startTime, endTime)
       this.editFlag = true
       this.contextmenu = {
         left: null,
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
index 1f20f0eb7..76cc2f728 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
@@ -767,12 +767,12 @@
               </div>
               <div class="form-row-value">
                 <div style="display: inline-block;width: calc(30% - 3px)">
-                  <el-select v-model="pen.data.parent" size="small">
+                  <el-select v-model="pen.data.parent" size="small" clearable @change="penDataParentChange">
                     <el-option v-for="item in queryValues.filter(query => query.type === 'title')" :key="item.id" :value="item.name" :label='item.name'></el-option>
                   </el-select>
                 </div>
                 <div style="display: inline-block;width: calc(70% - 13px);margin-left: 10px">
-                  <el-select v-model="pen.data.legend" size="small">
+                  <el-select v-model="pen.data.legend" size="small" clearable>
                     <el-option v-for="item in queryValues.filter(query => (query.parent === pen.data.parent) && query.type === 'item')" :key="item.id" :value="item.name" :label='item.name'></el-option>
                   </el-select>
                 </div>
@@ -1016,12 +1016,12 @@
           </div>
           <div class="form-row-value" style="margin-bottom: 10px;display: flex;justify-content: space-between" v-for="(legend, index) in pen.data.tooltip.legends" :key="legend.parent + legend.legend">
             <div style="display: inline-block;width: calc(20% - 10px)">
-              <el-select v-model="legend.parent" size="small" style="width: 100%">
+              <el-select v-model="legend.parent" size="small" style="width: 100%" clearable @change="legendParentChange(legend)">
                 <el-option v-for="item in queryValues.filter(query => query.type === 'title')" :key="item.id" :value="item.name" :label='item.name'></el-option>
               </el-select>
             </div>
             <div style="display: inline-block;width: calc(40% - 10px)">
-              <el-select v-model="legend.legend" size="small" style="width: 100%">
+              <el-select v-model="legend.legend" size="small" style="width: 100%" clearable>
                 <el-option v-for="item in queryValues.filter(query => (query.parent === legend.parent) && query.type === 'item')" :key="item.id" :value="item.name" :label='item.name'></el-option>
               </el-select>
             </div>
@@ -1338,6 +1338,12 @@ export default {
           this.$refs[item].update()
         }
       })
+    },
+    penDataParentChange () {
+      this.pen.data.legend = ''
+    },
+    legendParentChange (legend) {
+      legend.legend = ''
     }
 
   }