From aa9fc758da0be153b899f493f90f1784fff82b86 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Wed, 15 Mar 2017 19:59:46 +0800
Subject: [PATCH] update Transfer

---
 examples/routers/form.vue            | 10 ++++++++++
 src/components/input/input.vue       |  4 ++--
 src/components/transfer/search.vue   |  9 ---------
 src/components/transfer/transfer.vue |  2 +-
 src/styles/components/input.less     |  8 ++++++++
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/examples/routers/form.vue b/examples/routers/form.vue
index cc7fe0f..759d973 100644
--- a/examples/routers/form.vue
+++ b/examples/routers/form.vue
@@ -13,6 +13,7 @@
             </Form-item>
             <Form-item prop="targetKeys1">
                 <Transfer
+                    filterable
                     :data="formInline.data1"
                     :target-keys="formInline.targetKeys1"
                     :render-format="render1"
@@ -111,6 +112,15 @@
                             message: '请输入',
                             trigger: 'change'
                         }
+                    ],
+                    targetKeys1: [
+                        {
+                            required: true,
+                            type: 'array',
+                            max: 2,
+                            message: '太多了',
+                            trigger: 'change'
+                        }
                     ]
                 }
             }
diff --git a/src/components/input/input.vue b/src/components/input/input.vue
index baab0e3..e51becc 100644
--- a/src/components/input/input.vue
+++ b/src/components/input/input.vue
@@ -152,7 +152,7 @@
             },
             handleBlur () {
                 this.$emit('on-blur');
-                if (!findComponentUpward(this, ['DatePicker', 'TimePicker', 'Cascader'])) {
+                if (!findComponentUpward(this, ['DatePicker', 'TimePicker', 'Cascader', 'Search'])) {
                     this.dispatch('FormItem', 'on-form-blur', this.currentValue);
                 }
             },
@@ -171,7 +171,7 @@
                     this.resizeTextarea();
                 });
                 this.currentValue = value;
-                if (!findComponentUpward(this, ['DatePicker', 'TimePicker', 'Cascader'])) {
+                if (!findComponentUpward(this, ['DatePicker', 'TimePicker', 'Cascader', 'Search'])) {
                     this.dispatch('FormItem', 'on-form-change', value);
                 }
             },
diff --git a/src/components/transfer/search.vue b/src/components/transfer/search.vue
index ec28629..ba85bfc 100644
--- a/src/components/transfer/search.vue
+++ b/src/components/transfer/search.vue
@@ -44,14 +44,5 @@
                 this.$emit('on-query-clear');
             }
         }
-        // todo 事件
-//        events: {
-//            'on-form-blur' () {
-//                return false;
-//            },
-//            'on-form-change' () {
-//                return false;
-//            }
-//        }
     };
 </script>
diff --git a/src/components/transfer/transfer.vue b/src/components/transfer/transfer.vue
index d1030a9..2235ebf 100644
--- a/src/components/transfer/transfer.vue
+++ b/src/components/transfer/transfer.vue
@@ -120,7 +120,7 @@
                     on: {
                         'on-checked-keys-change': this.handleRightCheckedKeysChange
                     }
-                }, clonedVNodes),
+                }, clonedVNodes)
             ]);
         },
 
diff --git a/src/styles/components/input.less b/src/styles/components/input.less
index 45e21f9..93bfc82 100644
--- a/src/styles/components/input.less
+++ b/src/styles/components/input.less
@@ -58,6 +58,14 @@
     .@{input-prefix-cls}-group{
         .input-group-error;
     }
+    .@{transfer-prefix-cls} {
+        .@{input-prefix-cls} {
+            .input;
+            &-icon{
+                color: @subsidiary-color;
+            }
+        }
+    }
 }
 .@{form-item-prefix-cls}-validating{
     .@{input-prefix-cls}{
--
libgit2 0.21.4