From 4beb8e75b5f7bf6dfc8576b94f708a2541a3a15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 10 Apr 2019 11:17:16 +0800
Subject: [PATCH] ColorPicker add global setting, #5592

---
 src/components/color-picker/color-picker.vue | 42 ++++++++++++++++++--
 src/index.js                                 |  5 +++
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/components/color-picker/color-picker.vue b/src/components/color-picker/color-picker.vue
index f953c1c1..55bd90f3 100644
--- a/src/components/color-picker/color-picker.vue
+++ b/src/components/color-picker/color-picker.vue
@@ -10,7 +10,7 @@
                 :name="name"
                 :value="currentValue"
                 type="hidden">
-            <i :class="arrowClasses"></i>
+            <Icon :type="arrowType" :custom="customArrowType" :size="arrowSize" :class="arrowClasses"></Icon>
             <div
                 ref="input"
                 :tabindex="disabled ? undefined : 0"
@@ -125,6 +125,7 @@ import Hue from './hue.vue';
 import Alpha from './alpha.vue';
 import iInput from '../input/input.vue';
 import iButton from '../button/button.vue';
+import Icon from '../icon/icon.vue';
 import Locale from '../../mixins/locale';
 import {oneOf} from '../../utils/assist';
 import Emitter from '../../mixins/emitter';
@@ -134,7 +135,7 @@ import {changeColor, toRGBAString} from './utils';
 export default {
     name: 'ColorPicker',
 
-    components: {Drop, RecommendColors, Saturation, Hue, Alpha, iInput, iButton},
+    components: {Drop, RecommendColors, Saturation, Hue, Alpha, iInput, iButton, Icon},
 
     directives: {clickOutside, TransferDom},
 
@@ -260,8 +261,6 @@ export default {
     computed: {
         arrowClasses() {
             return [
-                this.iconPrefixCls,
-                `${this.iconPrefixCls}-ios-arrow-down`,
                 `${this.inputPrefixCls}-icon`,
                 `${this.inputPrefixCls}-icon-normal`,
             ];
@@ -352,6 +351,41 @@ export default {
                     [`${this.prefixCls}-confirm-color-editable`]: this.editable
                 }
             ];
+        },
+        // 3.4.0, global setting customArrow 有值时，arrow 赋值空
+        arrowType () {
+            let type = 'ios-arrow-down';
+
+            if (this.$IVIEW) {
+                if (this.$IVIEW.colorPicker.customArrow) {
+                    type = '';
+                } else if (this.$IVIEW.colorPicker.arrow) {
+                    type = this.$IVIEW.colorPicker.arrow;
+                }
+            }
+            return type;
+        },
+        // 3.4.0, global setting
+        customArrowType () {
+            let type = '';
+
+            if (this.$IVIEW) {
+                if (this.$IVIEW.colorPicker.customArrow) {
+                    type = this.$IVIEW.colorPicker.customArrow;
+                }
+            }
+            return type;
+        },
+        // 3.4.0, global setting
+        arrowSize () {
+            let size = '';
+
+            if (this.$IVIEW) {
+                if (this.$IVIEW.colorPicker.arrowSize) {
+                    size = this.$IVIEW.colorPicker.arrowSize;
+                }
+            }
+            return size;
         }
     },
 
diff --git a/src/index.js b/src/index.js
index f50f5f07..a946eb4d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -196,6 +196,11 @@ const install = function(Vue, opts = {}) {
             itemArrow: opts.cascader ? opts.cascader.itemArrow ? opts.cascader.itemArrow : '' : '',
             customItemArrow: opts.cascader ? opts.cascader.customItemArrow ? opts.cascader.customItemArrow : '' : '',
             itemArrowSize: opts.cascader ? opts.cascader.itemArrowSize ? opts.cascader.itemArrowSize : '' : ''
+        },
+        colorPicker: {
+            arrow: opts.colorPicker ? opts.colorPicker.arrow ? opts.colorPicker.arrow : '' : '',
+            customArrow: opts.colorPicker ? opts.colorPicker.customArrow ? opts.colorPicker.customArrow : '' : '',
+            arrowSize: opts.colorPicker ? opts.colorPicker.arrowSize ? opts.colorPicker.arrowSize : '' : ''
         }
     };