From 11e20ead4aadc1f6ef63d1d22f96aef82095e2cd Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Mon, 24 Aug 2020 13:40:08 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Aaddline=20color=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4clear=20=E5=92=8C=20click=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss           |  4 ++++
 .../src/components/common/project/addLine.vue       | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index d29a1cd26..0f27c2bd3 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -2015,3 +2015,7 @@ li{
     }
   }
 }
+
+.el-color-dropdown .el-button--mini{
+  display: none !important;
+}
diff --git a/nezha-fronted/src/components/common/project/addLine.vue b/nezha-fronted/src/components/common/project/addLine.vue
index c90459a4d..3465c6c66 100644
--- a/nezha-fronted/src/components/common/project/addLine.vue
+++ b/nezha-fronted/src/components/common/project/addLine.vue
@@ -65,6 +65,7 @@
                 v-model="form.color"
                 :predefine="predefineColors"
                 ref="colorPicker"
+                @active-change="colorChange"
               >
               </el-color-picker>
             </div>
@@ -166,6 +167,18 @@
       colorPickerClick(){
         this.$refs['colorPicker'].showPicker=true;
       },
+      colorChange(val){
+        this.form.color=this.colorRGBtoHex(val)
+      },
+      colorRGBtoHex(color) {
+        let rgb = color.split(',');
+        let r = parseInt(rgb[0].split('(')[1]);
+        let g = parseInt(rgb[1]);
+        let b = parseInt(rgb[2].split(')')[0]);
+        let hex = "#" + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1);
+        return hex;
+      }
+
     },
 
   }