From 59dc2df009500d8f5fe43fe69acff22e0f020570 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Fri, 18 Aug 2017 15:52:06 +0800
Subject: [PATCH] update ColorPicker

---
 src/components/color-picker/color-picker.vue     | 65 +++++++++++++++++++++++++++++++++++++----------------------------
 src/components/color-picker/recommend-colors.vue |  2 +-
 src/styles/components/color-picker.less          | 11 ++++++++++-
 3 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/src/components/color-picker/color-picker.vue b/src/components/color-picker/color-picker.vue
index 9301d4a..5f33921 100644
--- a/src/components/color-picker/color-picker.vue
+++ b/src/components/color-picker/color-picker.vue
@@ -34,7 +34,10 @@
                         :class="[prefixCls + '-picker-colors']"
                         @picker-color="handleSelectColor"></recommend-colors>
                 </div>
-                <Confirm @on-pick-success="handleSuccess" @on-pick-clear="handleClear"></Confirm>
+                <div :class="[prefixCls + '-confirm']">
+                    <span :class="[prefixCls + '-confirm-color']">{{ formatColor }}</span>
+                    <Confirm @on-pick-success="handleSuccess" @on-pick-clear="handleClear"></Confirm>
+                </div>
             </div>
         </Dropdown-menu>
     </Dropdown>
@@ -58,7 +61,7 @@
     const inputPrefixCls = 'ivu-input';
 
     function _colorChange (data, oldHue) {
-        data = data === '' ? '#ff0000' : data;
+        data = data === '' ? '#2d8cf0' : data;
         const alpha = data && data.a;
         let color;
 
@@ -170,12 +173,16 @@
                     '#00c2b1',
                     '#ac7a33',
                     '#1d35ea',
-                    '#42bd82',
+                    '#8bc34a',
                     '#f16b62',
                     '#ea4ca3',
                     '#0d94aa',
                     '#febd79',
-                    '#3b90fc',
+                    '#5d4037',
+                    '#00bcd4',
+                    '#f06292',
+                    '#cddc39',
+                    '#607d8b',
                     '#000000',
                     '#ffffff'
                 ]
@@ -222,6 +229,29 @@
                     color = tinycolor(this.value).toRgb();
                 }
                 return `rgba(${color.r}, ${color.g}, ${color.b}, ${color.a})`;
+            },
+            formatColor () {
+                const value = this.saturationColors;
+                const format = this.format;
+                let color;
+
+                const rgba = `rgba(${value.rgba.r}, ${value.rgba.g}, ${value.rgba.b}, ${value.rgba.a})`;
+                if (format) {
+                    if (format === 'hsl') {
+                        color = tinycolor(value.hsl).toHslString();
+                    } else if (format === 'hsv') {
+                        color = tinycolor(value.hsv).toHsvString();
+                    } else if (format === 'hex') {
+                        color = value.hex;
+                    } else if (format === 'rgb') {
+                        color = rgba;
+                    }
+                } else if (this.alpha) {
+                    color = rgba;
+                } else {
+                    color = value.hex;
+                }
+                return color;
             }
         },
         watch: {
@@ -265,31 +295,10 @@
             handleToggleVisible (visible) {
                 this.visible = visible;
             },
-            getFormatColor () {
-                const value = this.saturationColors;
-                const format = this.format;
-                let color;
-
-                const rgba = `rgba(${value.rgba.r}, ${value.rgba.g}, ${value.rgba.b}, ${value.rgba.a})`;
-                if (format) {
-                    if (format === 'hsl') {
-                        color = tinycolor(value.hsl).toHslString();
-                    } else if (format === 'hsv') {
-                        color = tinycolor(value.hsv).toHsvString();
-                    } else if (format === 'hex') {
-                        color = value.hex;
-                    } else if (format === 'rgb') {
-                        color = rgba;
-                    }
-                } else if (this.alpha) {
-                    color = rgba;
-                } else {
-                    color = value.hex;
-                }
-                return color;
-            },
             handleSuccess () {
-                this.$emit('input', this.getFormatColor());
+                const color = this.formatColor;
+                this.$emit('input', color);
+                this.$emit('on-change', color);
                 this.$refs.picker.handleClose();
             },
             handleClear () {
diff --git a/src/components/color-picker/recommend-colors.vue b/src/components/color-picker/recommend-colors.vue
index ec3c8e9..8955ce0 100644
--- a/src/components/color-picker/recommend-colors.vue
+++ b/src/components/color-picker/recommend-colors.vue
@@ -2,7 +2,7 @@
     <div>
         <template v-for="(item, index) in list">
             <span @click="handleClick(index)"><em :style="{'background': item}"></em></span>
-            <br v-if="(index + 1) % 10 === 0 && index !== 0 && (index + 1) !== list.length">
+            <br v-if="(index + 1) % 12 === 0 && index !== 0 && (index + 1) !== list.length">
         </template>
     </div>
 </template>
diff --git a/src/styles/components/color-picker.less b/src/styles/components/color-picker.less
index 1c51f26..da7653b 100644
--- a/src/styles/components/color-picker.less
+++ b/src/styles/components/color-picker.less
@@ -45,7 +45,7 @@
             padding: 8px 8px 0;
         }
         &-panel{
-            width: 200px;
+            width: 240px;
             margin: 0 auto;
             box-sizing: initial;
             position: relative;
@@ -197,4 +197,13 @@
             transform: translateX(-2px);
         }
     }
+
+    &-confirm{
+        position: relative;
+        &-color{
+            position: absolute;
+            top: 11px;
+            left: 8px;
+        }
+    }
 }
\ No newline at end of file
--
libgit2 0.21.4