From 737894dee21df6fb16bd5f9729751c58aa560f5b Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Thu, 28 Jun 2018 14:48:58 +0800
Subject: [PATCH] ColorPicker support global setting

---
 examples/routers/color-picker.vue            |  8 +-------
 src/components/color-picker/color-picker.vue |  9 ++++++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/examples/routers/color-picker.vue b/examples/routers/color-picker.vue
index 8aaa153..fe52cd5 100644
--- a/examples/routers/color-picker.vue
+++ b/examples/routers/color-picker.vue
@@ -5,18 +5,15 @@
         <color-picker
             v-model="color"
             placement="bottom-start"
-            size="large"
             @on-change="c1"
             @on-active-change="c2"></color-picker>
         <Input value="hello" style="display: inline-block" />
         <Date-picker
-            transfer
             type="date"
             placeholder="选择日期"
             style="width: 200px"></Date-picker>
         <color-picker
             ref="xxx"
-            :transfer="true"
             v-model="color"
             :recommend="true"
             format="rgb"
@@ -32,17 +29,15 @@
         <color-picker
             v-model="color"
             placement="bottom-start"
-            size="small"></color-picker>
+            ></color-picker>
         <Date-picker
             type="date"
             placeholder="选择日期"
-            size="small"
             style="width: 200px"></Date-picker>
         <color-picker
             ref="yyy"
             :colors="colors"
             v-model="color"
-            transfer
             format="rgb"
             alpha></color-picker>
         <Button @click="setColor">set color</Button>
@@ -57,7 +52,6 @@
             v-model="color7"
             :hue="false"
             :hide-drop-down="hideDropDown"
-            transfer
             @on-open-change="onOpenChange"></ColorPicker>
 
         <br><br><br><br>
diff --git a/src/components/color-picker/color-picker.vue b/src/components/color-picker/color-picker.vue
index 25a552b..9159f2e 100644
--- a/src/components/color-picker/color-picker.vue
+++ b/src/components/color-picker/color-picker.vue
@@ -168,11 +168,12 @@ export default {
             default: false,
         },
         size: {
-            type: String,
             validator(value) {
                 return oneOf(value, ['small', 'large', 'default']);
             },
-            default: 'default',
+            default () {
+                return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
+            }
         },
         hideDropDown: {
             type: Boolean,
@@ -200,7 +201,9 @@ export default {
         },
         transfer: {
             type: Boolean,
-            default: false,
+            default () {
+                return this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer;
+            }
         },
         name: {
             type: String,
--
libgit2 0.21.4