From 5b0a9a7492b0b04f7388ae7325d681aa18a51a8b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 9 Jun 2023 16:19:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=20chartDiagram?=
 =?UTF-8?q?=20=E9=80=89=E6=8B=A9=E5=9B=BE=E7=89=87=E6=97=B6=20=E4=BC=9A?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80=E5=88=B0=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/project/meta2d/js/defaultIcon.js   | 9 +++++----
 .../common/project/meta2d/js/meta2dMainCalc.js           | 6 +++---
 .../components/common/project/meta2d/meta2dElement.vue   | 5 +++--
 .../src/components/common/project/meta2d/meta2dProps.vue | 2 +-
 .../common/project/meta2d/meta2dSelectImage.vue          | 6 +++---
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/meta2d/js/defaultIcon.js b/nezha-fronted/src/components/common/project/meta2d/js/defaultIcon.js
index 243f5e3ac..f11d0e3ac 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/defaultIcon.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/defaultIcon.js
@@ -1,6 +1,7 @@
 export const Tools = [
   {
     group: 'General',
+    show: false,
     children: [
       {
         name: 'rectangle',
@@ -11,21 +12,21 @@ export const Tools = [
       },
       {
         name: 'rectangle',
-        icon: '\ue730;',
+        icon: '\ue730',
         id: 'e730;',
         nzClassName: 'nz-icon-rectangle1',
         unit: 'General'
       },
       {
         name: 'rectangle',
-        icon: '\ue731;',
+        icon: '\ue731',
         id: '731',
         nzClassName: 'nz-icon-EMAC1',
         unit: 'General'
       },
       {
         name: 'rectangle',
-        icon: '\ue67f;',
+        icon: '\ue67f',
         id: 'e67f',
         nzClassName: 'nz-icon-module5',
         unit: 'General'
@@ -64,7 +65,7 @@ export const Tools = [
         id: 'e680',
         nzClassName: 'nz-icon-module6',
         unit: 'General'
-      },
+      }
     ]
   }
 ]
diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
index 43d213957..2e9d2a978 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
@@ -295,11 +295,11 @@ export default {
       pen.autoPlay = false
     },
     pensActive (pens, e) { // 选中节点
-      this.selectPens = pens
-      this.modulesDiff(pens[0])
       setTimeout(() => {
+        this.selectPens = pens
+        this.modulesDiff(pens[0])
         this.$refs.meta2dProps && (this.$refs.meta2dProps.isUpdate = true)
-      })
+      }, 600)
     },
     topoClick (params, e) { // 点击节点
       if (!params.pen && this.$refs.meta2dProps) {
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
index 49967f396..3040951a9 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
@@ -28,7 +28,7 @@
                 @change="change('nzName')"></el-input>
             </div>
           </div>
-          <div class="form-row-item form-row-item-full" v-if="!pen.type">
+          <div class="form-row-item form-row-item-full" v-if="!pen.type && !isChart">
             <div class="form-row-key">
               {{$t('overall.module')}}
             </div>
@@ -1087,7 +1087,8 @@ export default {
   props: {
     selectPens: {},
     elements: {},
-    modules: {}
+    modules: {},
+    isChart: {}
   },
   watch: {
     selectPens: {
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dProps.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dProps.vue
index 33517a25d..9f3972a5f 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dProps.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dProps.vue
@@ -2,7 +2,7 @@
   <div class="props-box props" @keypress.stop="" @keydown.stop="" @keyup.stop="">
     <el-tabs v-model="activeName" type="card"  :before-leave="beforeLeave">
       <el-tab-pane :label="$t('project.topology.element')" name="elements" v-if="selectPens.length === 1">
-        <meta2dElement :modules="modules" :selectPens.sync="selectPens" @change="change" :elements="elements"/>
+        <meta2dElement :modules="modules" :selectPens.sync="selectPens" @change="change" :elements="elements" :isChart="isChart"/>
       </el-tab-pane>
       <el-tab-pane :label="$t('project.topology.canvas')" name="canvas">
         <meta2dCanvas :canvasProps="canvasProps"  :params.sync="params" :meta2dId='meta2dId' @changeActiveName="changeActiveName" ref ='meta2dCanvas'/>
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue
index 71564ef43..2d386f25f 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue
@@ -15,7 +15,7 @@
       custom-class="nz-select-img-dialog nz-new-dialog prevent-clickoutside"
       :visible.sync="selectBoxShow"
       width="auto"
-      :append-to-body="true"
+      :append-to-body="false"
       :modal-append-to-body="false"
       @close="changeSelectBoxShow(false)"
       destroy-on-close
@@ -37,7 +37,7 @@
                 <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':''">
                     <img :src="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)"/>
+                    <i v-if="btn.nzClassName" class="nz-icon image-src" :class="btn.nzClassName" style="font-size: 36px" @click.stop="selectImageChange(btn)"/>
                     <div class="img-text text-ellipsis" :title="btn.imageName">{{btn.imageName}}</div>
                     <i v-if="item.group!=='General'" class="delIcon nz-icon nz-icon-delete" @click.stop="tooltipDelete(btn)"></i>
                   </div>
@@ -144,7 +144,7 @@ export default {
     imgId: {},
     showDefault: {
       type: Boolean,
-      default: false
+      default: true
     }
   },
   data () {