From 94d4654c4b2d0fa65e7eb458a38d184b8b1e3a55 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 25 Feb 2021 18:01:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=A2=9C=E8=89=B2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=20=E9=A2=84=E5=80=BC=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E7=82=B9=E5=87=BB=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=90=8E=20=E5=87=BA=E7=8E=B0tooltip=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/project/L5/CanvasProps.vue         | 20 ++++++++++++++++++-
 .../components/common/project/topologyL5.vue  |  5 +----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
index 8701f1374..e30a5f187 100644
--- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
@@ -1169,7 +1169,14 @@
             name:this.$t("project.topology.fade")
           }
         ],
-        predefineColors:['#FF0000','#FF5300','#FFC900','#00B536','#00CAFF','#0092FF','#B600D9','#FF666C','#FF9348','#FFDD33','#00D063','#00deff','#62B9FF','#D55BE9']
+        predefineColors:[
+          '#19730E','#37872D','#73BF69',
+          '#CC9D00','#E0B400','#FADE2A',
+          '#AD0317','#C4162A','#F2495C',
+          '#1250B0','#1F60C4','#5794F2',
+          '#E55400','#FA6400','#FF9830',
+          '#7C2EA3','#8F3BB8','#B877D9',
+          ]
       }
     },
     mixins:[rz],
@@ -1611,6 +1618,17 @@
     width: 180px;
     height: 100%;
   }
+  /deep/ .el-color-predefine__color-selector:nth-child(9n+1){
+    margin-left: 0;
+  }
+  /deep/ .el-color-predefine__color-selector:nth-child(10n+1){
+    margin-left: 8px;
+  }
+  /deep/ .el-color-predefine__color-selector {
+    margin: 0 0 8px 8px;
+    width: 24px;
+    height: 24px;
+  }
 </style>
 <style lang="scss" scoped>
   .project-title {
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index b3988f05c..001893029 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -1126,9 +1126,6 @@
           })
         }
         if(!Array.isArray(data)&&data){//判断不是数组 提前个data配置好节点属性
-          // if(data.type===0){
-          //   data.textRect=new Rect(data.rect.ex-10,data.rect.ey-10,data.rect.width,data.rect.height);
-          // }
           if(data.type===0&& !data.data.moduleId){
             data.data={
               ...data.data,
@@ -1281,7 +1278,7 @@
             case 'node':
             case 'addNode':
               this.modulesDiff(data);
-              if(data.data.expressArr.length===0){
+              if(data.data.expressArr.length===0&&event!=='node'){
                 data.data.expressArr.push('');
                 data.data.legends.push('');
               }