From 61b3fd893e2f2deeb5e9a68bcf6bca1c00933bf3 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 21:34:28 +0800
Subject: [PATCH] Select support Form's disabled

---
 src/components/select/option.vue |  7 ++++---
 src/components/select/select.vue | 15 ++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/select/option.vue b/src/components/select/option.vue
index 6a513740..dffb6b48 100644
--- a/src/components/select/option.vue
+++ b/src/components/select/option.vue
@@ -7,6 +7,7 @@
 </template>
 <script>
     import Emitter from '../../mixins/emitter';
+    import mixinsForm from '../../mixins/form';
     import { findComponentUpward } from '../../utils/assist';
 
     const prefixCls = 'ivu-select-item';
@@ -14,7 +15,7 @@
     export default {
         name: 'iOption',
         componentName: 'select-item',
-        mixins: [ Emitter ],
+        mixins: [ Emitter, mixinsForm ],
         props: {
             value: {
                 type: [String, Number],
@@ -51,7 +52,7 @@
                 return [
                     `${prefixCls}`,
                     {
-                        [`${prefixCls}-disabled`]: this.disabled,
+                        [`${prefixCls}-disabled`]: this.itemDisabled,
                         [`${prefixCls}-selected`]: this.selected && !this.autoComplete,
                         [`${prefixCls}-focus`]: this.isFocused
                     }
@@ -66,7 +67,7 @@
         },
         methods: {
             select () {
-                if (this.disabled) return false;
+                if (this.itemDisabled) return false;
 
                 this.dispatch('iSelect', 'on-select-selected', {
                     value: this.value,
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 047a8487..46804686 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -35,7 +35,7 @@
                     :values="values"
                     :clearable="canBeCleared"
                     :prefix="prefix"
-                    :disabled="disabled"
+                    :disabled="itemDisabled"
                     :remote="remote"
                     :input-element-id="elementId"
                     :initial-label="initialLabel"
@@ -91,6 +91,7 @@
     import TransferDom from '../../directives/transfer-dom';
     import { oneOf, findComponentsDownward } from '../../utils/assist';
     import Emitter from '../../mixins/emitter';
+    import mixinsForm from '../../mixins/form';
     import Locale from '../../mixins/locale';
     import SelectHead from './select-head.vue';
     import FunctionalOptions from './functional-options.vue';
@@ -163,7 +164,7 @@
 
     export default {
         name: 'iSelect',
-        mixins: [ Emitter, Locale ],
+        mixins: [ Emitter, Locale, mixinsForm ],
         components: { FunctionalOptions, Drop, SelectHead, Icon },
         directives: { clickOutside, TransferDom },
         props: {
@@ -307,7 +308,7 @@
                     `${prefixCls}`,
                     {
                         [`${prefixCls}-visible`]: this.visible,
-                        [`${prefixCls}-disabled`]: this.disabled,
+                        [`${prefixCls}-disabled`]: this.itemDisabled,
                         [`${prefixCls}-multiple`]: this.multiple,
                         [`${prefixCls}-single`]: !this.multiple,
                         [`${prefixCls}-show-clear`]: this.showCloseIcon,
@@ -379,7 +380,7 @@
             },
             canBeCleared(){
                 const uiStateMatch = this.hasMouseHoverHead || this.active;
-                const qualifiesForClear = !this.multiple && !this.disabled && this.clearable;
+                const qualifiesForClear = !this.multiple && !this.itemDisabled && this.clearable;
                 return uiStateMatch && qualifiesForClear && this.reset; // we return a function
             },
             selectOptions() {
@@ -446,7 +447,7 @@
                 return extractOptions(this.selectOptions);
             },
             selectTabindex(){
-                return this.disabled || this.filterable ? -1 : 0;
+                return this.itemDisabled || this.filterable ? -1 : 0;
             },
             remote(){
                 return typeof this.remoteMethod === 'function';
@@ -526,7 +527,7 @@
             },
 
             toggleMenu (e, force) {
-                if (this.disabled) {
+                if (this.itemDisabled) {
                     return false;
                 }
 
@@ -710,7 +711,7 @@
                 this.filterQueryChange = true;
             },
             toggleHeaderFocus({type}){
-                if (this.disabled) {
+                if (this.itemDisabled) {
                     return;
                 }
                 this.isFocused = type === 'focus';