From cffce397320d822559a740b252ea1e9b5d9f9139 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 13 Apr 2023 16:03:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20project=20topo=20=20=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81gif=20=E4=BB=A5=E5=8F=8A=20=E9=A2=84=E8=A7=88tooltip?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/project/meta2d/js/meta2dMain.js    |  2 ++
 .../common/project/meta2d/meta2dElement.vue   |  3 +++
 .../project/meta2d/meta2dSelectImage.vue      | 19 +++++++++++++------
 .../page/monitor/project/project.vue          |  1 +
 4 files changed, 19 insertions(+), 6 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 c7bb97d78..6b1e62937 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
@@ -411,10 +411,12 @@ export default {
       }
       if (key === 'image') {
         obj.imageId = pen[key]
+        obj.name = pen.name
         obj.icon = ''
       }
       if (key === 'icon') {
         obj.imageId = pen[key]
+        obj.name = pen.name
         obj.image = ''
       }
       getTopology(this.meta2dId).setValue(obj) // 更新pen
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
index 83e16962b..ca8bef26f 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
@@ -1226,16 +1226,19 @@ export default {
       this.pen.imageId = image.id
       if (image.image) {
         this.pen.image = image.image
+        this.pen.name = image.type || 'png'
         this.pen.icon = ''
         this.change('image')
       }
       if (image.icon) {
         this.pen.icon = image.icon
+        this.pen.name = ''
         this.pen.image = ''
         this.change('icon')
       }
       if (!image.id) {
         this.pen.image = image.image
+        this.pen.name = ''
         this.pen.icon = ''
         this.change('image')
       }
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue
index 4d9b1efc2..2485131ed 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue
@@ -35,7 +35,7 @@
               </div>
               <transition name="el-zoom-in-top">
                 <div v-show="item.show" class="nz-collapse-body">
-                  <div v-for="(btn, i) in item.children" :key="'info2'+'-'+index+'-'+i" class="buttons image-box-item" :class="btn.id === selectImgId ? 'is-select':''">
+                  <div v-for="(btn, i) in item.children" :key="'info2'+'-'+index+'-'+i" class="buttons image-box-item" :class="btn.id == selectImgId ? 'is-select':''">
                     <img :src="baseUrl + btn.image" v-if="btn.image" class="image-src" @click.stop="selectImageChange(btn)">
                     <i v-if="btn.nzClassName" class="nz-icon image-src" :class="btn.nzClassName" style="font-size: 40px" @click.stop="selectImageChange(btn)"/>
                     <div class="img-text text-ellipsis" :title="btn.imageName">{{btn.imageName}}</div>
@@ -87,7 +87,7 @@
               :show-file-list="true"
               :on-change="beforeAvatarUpload"
               :auto-upload="false"
-              accept=".jpg,.png"
+              accept=".jpg,.png,.gif"
               :limit="1"
               :id="'upload-pic-show'">
               <!--<div slot="tip" class="el-upload__tip" >{{$t('overall.importTipImg')}}</div>-->
@@ -180,6 +180,7 @@ export default {
       if (findItem) {
         this.unit = findItem.unit
         this.imageName = findItem.name
+        this.selectImgId = findItem.id
       }
     }
     this.imageInit()
@@ -196,9 +197,11 @@ export default {
           if (this.imgId == item.id) {
             this.unit = item.unit
             this.imageName = item.imageName
+            this.selectImgId = item.id
           } else if (this.selectImage === item.image) {
             this.unit = item.unit
             this.imageName = item.imageName
+            this.selectImgId = item.id
           }
           const group = this.tools.find(tool => tool.group === item.unit)
           if (group) {
@@ -208,7 +211,8 @@ export default {
               image: item.image,
               imageId: item.id,
               id: item.id,
-              unit: item.unit
+              unit: item.unit,
+              type: item.type
             })
           } else {
             this.tools.push({
@@ -220,7 +224,8 @@ export default {
                 image: item.image,
                 imageId: item.id,
                 id: item.id,
-                unit: item.unit
+                unit: item.unit,
+                type: item.type
               }]
             })
           }
@@ -235,7 +240,7 @@ export default {
     },
     changeSelectBoxShow (flag) {
       this.selectBoxShow = flag
-      this.selectImgId = this.imgId
+      // this.selectImgId = this.imgId
       const findItem = this.tools.find(group => {
         group.show = false
         return group.group === this.unit
@@ -262,6 +267,7 @@ export default {
     changImage () {
       this.unit = this.selectImg.unit
       this.imageName = this.selectImg.imageName
+      this.selectImgId = this.selectImg.id
       this.$emit('updateImage', this.selectImg)
       this.changeSelectBoxShow(false)
     },
@@ -331,7 +337,8 @@ export default {
     },
     beforeAvatarUpload (file, fileList) {
       const this_ = this
-      const isJPG = (file.raw.type === 'image/jpeg' || file.raw.type === 'image/png')
+      console.log(file.raw.type)
+      const isJPG = (file.raw.type === 'image/jpeg' || file.raw.type === 'image/png' || file.raw.type === 'image/gif')
       const isLt2M = (file.size / 1024 / 1024) < 2
       if (!isJPG) {
         this.$message.error(this_.$t('project.topology.imgFormat'))
diff --git a/nezha-fronted/src/components/page/monitor/project/project.vue b/nezha-fronted/src/components/page/monitor/project/project.vue
index 72d0ad55a..d7226c038 100644
--- a/nezha-fronted/src/components/page/monitor/project/project.vue
+++ b/nezha-fronted/src/components/page/monitor/project/project.vue
@@ -42,6 +42,7 @@
       :title="'123'"
       :visible.sync="isPreview.show"
       fullscreen
+      class="no-transform-dialog"
       custom-class="nz-new-dialog meta2d-preview"
       :append-to-body="true"
       :modal-append-to-body="false"