From 0a545b0f4026c0635905afed0f94c4663813f974 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 12 Apr 2023 16:04:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=B0=83=E6=95=B4=20=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=20=E4=BB=A5=E5=8F=8A=E9=9A=90=E8=97=8F=20line=20?=
 =?UTF-8?q?=E7=9A=84=20tooltip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/globalSearch/searchItemInfo.scss    | 8 ++++++++
 .../src/components/common/alert/alertRuleInfo2.vue        | 3 +--
 .../src/components/common/globalSearch/searchItemInfo.vue | 3 +--
 .../src/components/common/project/meta2d/js/meta2dMain.js | 4 ++--
 .../components/common/project/meta2d/meta2dElement.vue    | 8 ++++++--
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss
index 42072090f..3401ad5e1 100644
--- a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss
+++ b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss
@@ -111,3 +111,11 @@
     border-bottom: none;
   }
 }
+.alert-label-value-prioity {
+  display: inline-block;
+  text-align: center;
+  padding: 2px 5px;
+  border-radius: 2px;
+  margin-right: 5px;
+  width: 80px
+}
diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue
index f877ca8cf..4611b63ac 100644
--- a/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue
+++ b/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue
@@ -43,9 +43,8 @@
           <div
             v-for="priority in alertRuleData.condition"
             :key="priority.id"
-            class="search-item-value text-ellipsis"
+            class="search-item-value alert-label-value-prioity text-ellipsis"
             :style="{background:priority.color}"
-            style="display: inline-block;text-align: center;padding: 2px 5px; border-radius: 2px;margin-right: 5px;width: 80px"
             :title="priority.name + (position.operator || '>') + (priority.value || '-')"
           >
             {{priority.name}} {{position.operator || '>'}} {{priority.value || '-'}}
diff --git a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
index 15e0fd33f..d09b3c9eb 100644
--- a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
+++ b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
@@ -70,9 +70,8 @@
             <div
               v-for="priority in alertLabelData.condition"
               :key="priority.id"
-              class="search-item-value text-ellipsis"
+              class="search-item-value alert-label-value-prioity text-ellipsis"
               :style="{background:priority.color}"
-              style="display: inline-block;text-align: center;padding: 2px 5px; border-radius: 2px;margin-right: 5px;width: 80px"
               :title="priority.name + (position.operator || '>') + (priority.value || '-')"
             >
               {{priority.name}} {{position.operator || '>'}} {{priority.value || '-'}}
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 ee7b048fe..9aa23576e 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
@@ -213,7 +213,7 @@ export default {
       pen.visible = pen.visible || true
       pen.isNz = true
       pen.locked = pen.locked || 0
-      pen.isBottom = false
+      pen.isBottom = true
       if (pen.rect) {
         pen.x = pen.rect.x
         pen.y = pen.rect.y
@@ -284,7 +284,7 @@ export default {
       pen.isNz = pen.isNz || true
       pen.visible = pen.visible || true
       pen.locked = pen.locked || 0
-      pen.isBottom = false
+      pen.isBottom = true
       pen.autoPlay = false
     },
     pensActive (pens, e) { // 选中节点
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
index 3b333d3a4..1f20f0eb7 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
@@ -964,7 +964,7 @@
       </transition>
 
       <!--         tooltip -->
-      <div class="form-row-title">
+      <div class="form-row-title" v-if="pen.type !== 1">
         {{$t('project.topology.tooltip')}}
         <span>
               <el-switch
@@ -1014,7 +1014,7 @@
           <div class="form-row-key" style="margin-bottom: 5px">
             {{$t('project.topology.legends')}}
           </div>
-          <div class="form-row-value" style="margin-bottom: 10px;display: flex;justify-content: space-between" v-for="legend in pen.data.tooltip.legends" :key="legend.parent + legend.legend">
+          <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-option v-for="item in queryValues.filter(query => query.type === 'title')" :key="item.id" :value="item.name" :label='item.name'></el-option>
@@ -1030,6 +1030,7 @@
                 <template slot="prepend">Alias</template>
               </el-input>
             </div>
+            <i class="nz-icon nz-icon-minus" @click="removeTooltipLegend(index)" style="line-height: 32px"/>
           </div>
           <div @click="addTooltipLegend" class="thresholds-add">
            <i class="nz-icon nz-icon-add" /> {{$t('overall.addTooltipLegend')}}
@@ -1328,6 +1329,9 @@ export default {
         alias: ''
       })
     },
+    removeTooltipLegend (index) {
+      this.pen.data.tooltip.legends.splice(index, 1)
+    },
     nzColorUpdate () {
       this.refsArr.forEach(item => {
         if (this.$refs[item]) {