From f8a27565b052080199ae0c04e42eb17ae3aa58c4 Mon Sep 17 00:00:00 2001
From: SkyAo <csvwolf@qq.com>
Date: Mon, 5 Nov 2018 15:51:12 +0800
Subject: [PATCH] ColorPicker: add immediate watcher for  currentColor (#13278)

---
 packages/color-picker/src/components/picker-dropdown.vue | 7 +++++--
 packages/color-picker/src/main.vue                       | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/color-picker/src/components/picker-dropdown.vue b/packages/color-picker/src/components/picker-dropdown.vue
index b50f85ae6..7a326b8cf 100644
--- a/packages/color-picker/src/components/picker-dropdown.vue
+++ b/packages/color-picker/src/components/picker-dropdown.vue
@@ -109,8 +109,11 @@
         }
       },
 
-      currentColor(val) {
-        this.customInput = val;
+      currentColor: {
+        immediate: true,
+        handler(val) {
+          this.customInput = val;
+        }
       }
     }
   };
diff --git a/packages/color-picker/src/main.vue b/packages/color-picker/src/main.vue
index e32423078..84595ffd2 100644
--- a/packages/color-picker/src/main.vue
+++ b/packages/color-picker/src/main.vue
@@ -165,6 +165,7 @@
         enableAlpha: this.showAlpha,
         format: this.colorFormat
       });
+
       return {
         color,
         showPicker: false,