From 6e22b4d1ff51b58d124fd74e8ab1c539c925c861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 16 Sep 2019 22:09:03 +0800
Subject: [PATCH] ColorPicker support Form's disabled

---
 src/components/color-picker/color-picker.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/color-picker/color-picker.vue b/src/components/color-picker/color-picker.vue
index 55bd90f3..9e7468d1 100644
--- a/src/components/color-picker/color-picker.vue
+++ b/src/components/color-picker/color-picker.vue
@@ -13,7 +13,7 @@
             <Icon :type="arrowType" :custom="customArrowType" :size="arrowSize" :class="arrowClasses"></Icon>
             <div
                 ref="input"
-                :tabindex="disabled ? undefined : 0"
+                :tabindex="itemDisabled ? undefined : 0"
                 :class="inputClasses"
                 @keydown.tab="onTab"
                 @keydown.esc="onEscape"
@@ -129,6 +129,7 @@ import Icon from '../icon/icon.vue';
 import Locale from '../../mixins/locale';
 import {oneOf} from '../../utils/assist';
 import Emitter from '../../mixins/emitter';
+import mixinsForm from '../../mixins/form';
 import Prefixes from './prefixMixin';
 import {changeColor, toRGBAString} from './utils';
 
@@ -139,7 +140,7 @@ export default {
 
     directives: {clickOutside, TransferDom},
 
-    mixins: [Emitter, Locale, Prefixes],
+    mixins: [Emitter, Locale, Prefixes, mixinsForm],
 
     props: {
         value: {
@@ -292,7 +293,7 @@ export default {
                 `${this.inputPrefixCls}-wrapper`,
                 `${this.inputPrefixCls}-wrapper-${this.size}`,
                 {
-                    [`${this.prefixCls}-disabled`]: this.disabled,
+                    [`${this.prefixCls}-disabled`]: this.itemDisabled,
                 },
             ];
         },
@@ -303,7 +304,7 @@ export default {
                 `${this.inputPrefixCls}-${this.size}`,
                 {
                     [`${this.prefixCls}-focused`]: this.visible,
-                    [`${this.prefixCls}-disabled`]: this.disabled,
+                    [`${this.prefixCls}-disabled`]: this.itemDisabled,
                 },
             ];
         },
@@ -430,7 +431,7 @@ export default {
             this.visible = false;
         },
         toggleVisible() {
-            if (this.disabled) {
+            if (this.itemDisabled) {
                 return;
             }