From 88b5bc6e63993157ee03d3bff7b3436702667aa7 Mon Sep 17 00:00:00 2001
From: kingwl <805037171@163.com>
Date: Sun, 4 Jun 2017 17:11:16 +0800
Subject: [PATCH] ColorPicker: fix nocorrect rgb value (#5179) (#5183)

---
 packages/color-picker/src/color.js   |  2 +-
 test/unit/specs/color-picker.spec.js | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/packages/color-picker/src/color.js b/packages/color-picker/src/color.js
index 7b1195438..93d603866 100644
--- a/packages/color-picker/src/color.js
+++ b/packages/color-picker/src/color.js
@@ -117,7 +117,7 @@ const rgb2hsv = function(r, g, b) {
     h /= 6;
   }
 
-  return { h: Math.round(h * 360), s: Math.round(s * 100), v: Math.round(v * 100) };
+  return { h: h * 360, s: s * 100, v: v * 100 };
 };
 
 // `hsvToRgb`
diff --git a/test/unit/specs/color-picker.spec.js b/test/unit/specs/color-picker.spec.js
index 0e1946b90..88b088d00 100644
--- a/test/unit/specs/color-picker.spec.js
+++ b/test/unit/specs/color-picker.spec.js
@@ -80,6 +80,29 @@ describe('ColorPicker', () => {
     }, ANIMATION_TIME);
   });
 
+  it('should show correct rgb value', (done) => {
+    const vm = createVue({
+      template: `
+        <el-color-picker v-model="color"></el-color-picker>
+      `,
+
+      data() {
+        return {
+          color: '#20A0FF'
+        };
+      }
+    }, true);
+
+    const trigger = vm.$el.querySelector('.el-color-picker__trigger');
+    trigger.click();
+
+    setTimeout(() => {
+      const value = document.querySelector('.el-color-dropdown__value');
+      expect(value.innerText.trim().toUpperCase()).to.equal('#20A0FF');
+      done();
+    }, ANIMATION_TIME);
+  });
+
   it('should init the right color when open', (done) => {
     const vm = createVue({
       template: `
@@ -216,4 +239,3 @@ describe('ColorPicker', () => {
     }, ANIMATION_TIME);
   });
 });
-