From f15c216a51c615681bba307f5db572fe5fde1abe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E5=BC=BA?= <b1g3rr0r1@gmail.com>
Date: Tue, 25 Apr 2017 16:52:51 +0800
Subject: [PATCH 01/68] =?UTF-8?q?Input=20=E7=BB=84=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0autofocus=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/routers/input-number.vue            | 2 +-
 examples/routers/input.vue                   | 2 +-
 src/components/input-number/input-number.vue | 4 ++++
 src/components/input/input.vue               | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/examples/routers/input-number.vue b/examples/routers/input-number.vue
index f2494ed8..e4729cc3 100644
--- a/examples/routers/input-number.vue
+++ b/examples/routers/input-number.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Input-number :max="10" :min="-1" v-model="v1"></Input-number>
+        <Input-number :max="10" :min="-1" v-model="v1" autofocus></Input-number>
         {{ v1 }}
         <div @click="c">change v1</div>
         <Input-number disabled :max="10" :min="1" :step="1.2" v-model="v2"></Input-number>
diff --git a/examples/routers/input.vue b/examples/routers/input.vue
index fa74187b..8b6c7ff8 100644
--- a/examples/routers/input.vue
+++ b/examples/routers/input.vue
@@ -1,6 +1,6 @@
 <template>
     <div style="width: 300px;">
-        <i-input v-model="value11" icon="ios-clock-outline">
+        <i-input v-model="value11" icon="ios-clock-outline" autofocus>
             <span slot="prepend">.com</span>
         </i-input>
         <i-input v-model="value11" icon="ios-clock-outline">
diff --git a/src/components/input-number/input-number.vue b/src/components/input-number/input-number.vue
index cf36224a..6a227e9b 100644
--- a/src/components/input-number/input-number.vue
+++ b/src/components/input-number/input-number.vue
@@ -19,6 +19,7 @@
                 :class="inputClasses"
                 :disabled="disabled"
                 autocomplete="off"
+                :autofocus="autofocus"
                 @focus="focus"
                 @blur="blur"
                 @keydown.stop="keyDown"
@@ -89,6 +90,9 @@
             disabled: {
                 type: Boolean,
                 default: false
+            },
+            autofocus: {
+                type: String
             }
         },
         data () {
diff --git a/src/components/input/input.vue b/src/components/input/input.vue
index 4aa160b5..a84108de 100644
--- a/src/components/input/input.vue
+++ b/src/components/input/input.vue
@@ -16,6 +16,7 @@
                 :name="name"
                 :value="currentValue"
                 :number="number"
+                :autofocus="autofocus"
                 @keyup.enter="handleEnter"
                 @focus="handleFocus"
                 @blur="handleBlur"
@@ -98,6 +99,9 @@
             number: {
                 type: Boolean,
                 default: false
+            },
+            autofocus: {
+                type: String
             }
         },
         data () {

From 8409abb81544da0859691bdf6edaf98b194f2428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 27 Apr 2017 16:27:38 +0800
Subject: [PATCH 02/68] update Page #759

---
 src/components/page/page.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/page/page.vue b/src/components/page/page.vue
index 2262a6df..1463f06c 100644
--- a/src/components/page/page.vue
+++ b/src/components/page/page.vue
@@ -236,8 +236,8 @@
             },
             onSize (pageSize) {
                 this.currentPageSize = pageSize;
-                this.changePage(1);
                 this.$emit('on-page-size-change', pageSize);
+                this.changePage(1);
             },
             onPage (page) {
                 this.changePage(page);

From cb6418ac5ed418fd169a3b6e92098318b4ac77a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 27 Apr 2017 16:55:48 +0800
Subject: [PATCH 03/68] fixed #721

---
 examples/routers/checkbox.vue        |  2 +-
 examples/routers/dropdown.vue        | 72 +++++++++++++++++++++-------
 src/components/dropdown/dropdown.vue |  7 +--
 3 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/examples/routers/checkbox.vue b/examples/routers/checkbox.vue
index 399407cb..cc7db9a7 100644
--- a/examples/routers/checkbox.vue
+++ b/examples/routers/checkbox.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <Checkbox-group v-model="fruit">
-            <Checkbox v-for="item in tags" :label="item.label"></Checkbox>
+            <Checkbox v-for="item in tags" :label="item.label" :key="item"></Checkbox>
         </Checkbox-group>
         <div>{{ fruit }}</div>
     </div>
diff --git a/examples/routers/dropdown.vue b/examples/routers/dropdown.vue
index 275dbc31..832f72ba 100644
--- a/examples/routers/dropdown.vue
+++ b/examples/routers/dropdown.vue
@@ -1,25 +1,63 @@
+<!--<template>-->
+    <!--<Row>-->
+        <!--<i-col span="8">-->
+            <!--<Card>-->
+                <!--<Dropdown @on-click="handleClick">-->
+                    <!--<a href="javascript:void(0)">-->
+                        <!--下拉菜单-->
+                        <!--<Icon type="arrow-down-b"></Icon>-->
+                    <!--</a>-->
+                    <!--<Dropdown-menu slot="list">-->
+                        <!--<Dropdown-item name="1">驴打滚</Dropdown-item>-->
+                        <!--<Dropdown-item name="2">炸酱面</Dropdown-item>-->
+                        <!--<Dropdown-item name="3" disabled>豆汁儿</Dropdown-item>-->
+                        <!--<Dropdown-item name="4">冰糖葫芦</Dropdown-item>-->
+                        <!--<Dropdown-item name="5" divided>北京烤鸭</Dropdown-item>-->
+                    <!--</Dropdown-menu>-->
+                <!--</Dropdown>-->
+            <!--</Card>-->
+        <!--</i-col>-->
+    <!--</Row>-->
+<!--</template>-->
+<!--<script>-->
+    <!--export default {-->
+        <!--methods: {-->
+            <!--handleClick (val) {-->
+                <!--console.log(val)-->
+            <!--}-->
+        <!--}-->
+    <!--}-->
+<!--</script>-->
+
 <template>
-    <div>
-        <Dropdown @on-click="handleClick">
-            <a href="javascript:void(0)">
-                下拉菜单
-                <Icon type="arrow-down-b"></Icon>
-            </a>
-            <Dropdown-menu slot="list">
-                <Dropdown-item name="1">驴打滚</Dropdown-item>
-                <Dropdown-item name="2">炸酱面</Dropdown-item>
-                <Dropdown-item name="3" disabled>豆汁儿</Dropdown-item>
-                <Dropdown-item name="4">冰糖葫芦</Dropdown-item>
-                <Dropdown-item name="5" divided>北京烤鸭</Dropdown-item>
-            </Dropdown-menu>
-        </Dropdown>
-    </div>
+    <Table border :context="self" :columns="columns7" :data="data6"></Table>
 </template>
 <script>
     export default {
+        data () {
+            return {
+                self: this,
+                columns7: [
+                    {
+                        title: '姓名',
+                        key: 'name',
+                        render (row, column, index) {
+                            return `<Dropdown @on-click="change"><a href="javascript:void(0)">下拉菜单<Icon type="arrow-down-b"></Icon></a><Dropdown-menu slot="list"><Dropdown-item name="1">驴打滚</Dropdown-item><Dropdown-item name="2">炸酱面</Dropdown-item><Dropdown-item disabled name="3">豆汁儿</Dropdown-item><Dropdown-item>冰糖葫芦</Dropdown-item><Dropdown-item divided>北京烤鸭</Dropdown-item></Dropdown-menu></Dropdown>`;
+                        }
+                    }
+                ],
+                data6: [
+                    {
+                        name: '王小明',
+                        age: 18,
+                        address: '北京市朝阳区芍药居'
+                    }
+                ]
+            }
+        },
         methods: {
-            handleClick (val) {
-                console.log(val)
+            change (s) {
+                console.log(s)
             }
         }
     }
diff --git a/src/components/dropdown/dropdown.vue b/src/components/dropdown/dropdown.vue
index 280f9923..5e331d85 100644
--- a/src/components/dropdown/dropdown.vue
+++ b/src/components/dropdown/dropdown.vue
@@ -13,7 +13,7 @@
 <script>
     import Drop from '../select/dropdown.vue';
     import clickoutside from '../../directives/clickoutside';
-    import { oneOf } from '../../utils/assist';
+    import { oneOf, findComponentUpward } from '../../utils/assist';
 
     const prefixCls = 'ivu-dropdown';
 
@@ -99,8 +99,9 @@
                 this.currentVisible = false;
             },
             hasParent () {
-                const $parent = this.$parent.$parent.$parent;
-                if ($parent && $parent.$options.name === 'Dropdown') {
+//                const $parent = this.$parent.$parent.$parent;
+                const $parent = findComponentUpward(this, 'Dropdown');
+                if ($parent) {
                     return $parent;
                 } else {
                     return false;

From f89dd9c28740685deb98ec9fe3f6b144decc4d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 27 Apr 2017 17:35:47 +0800
Subject: [PATCH 04/68] =?UTF-8?q?Paeg=E3=80=81Select=20add=20placement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/routers/page.vue        | 12 +++---------
 examples/routers/select.vue      | 10 ++++++----
 src/components/page/options.vue  |  5 +++--
 src/components/page/page.vue     |  7 +++++++
 src/components/select/select.vue | 13 +++++++++++--
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/examples/routers/page.vue b/examples/routers/page.vue
index b18e09bf..670e89ea 100644
--- a/examples/routers/page.vue
+++ b/examples/routers/page.vue
@@ -1,16 +1,10 @@
 <template>
-    <div>
-        <Page :total="100" :current="current"></Page>
-        {{ current }}
-        <Button @click="current = 1">set current</Button>
+    <div style="margin: 100px;">
+        <Page :total="100" show-sizer placement="top"></Page>
     </div>
 </template>
 <script>
     export default {
-        data () {
-            return {
-                current: 2
-            }
-        }
+
     }
 </script>
diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 6d5533b4..cad3a966 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -1,8 +1,10 @@
 <template>
-    <Select v-model="fields.pid" filterable>
-        <Option :value="0" label="一级菜单"></Option>
-        <Option :value="1" label="二级菜单"></Option>
-    </Select>
+    <div style="width: 200px;margin: 100px;">
+        <Select v-model="fields.pid" filterable placement="top">
+            <Option :value="0" label="一级菜单"></Option>
+            <Option :value="1" label="二级菜单"></Option>
+        </Select>
+    </div>
 </template>
 
 <script>
diff --git a/src/components/page/options.vue b/src/components/page/options.vue
index ead5b4ea..490bfc2f 100644
--- a/src/components/page/options.vue
+++ b/src/components/page/options.vue
@@ -1,7 +1,7 @@
 <template>
     <div v-if="showSizer || showElevator" :class="optsClasses">
         <div v-if="showSizer" :class="sizerClasses">
-            <i-select v-model="currentPageSize" :size="size" @on-change="changeSize">
+            <i-select v-model="currentPageSize" :size="size" :placement="placement" @on-change="changeSize">
                 <i-option v-for="item in pageSizeOpts" :key="item" :value="item" style="text-align:center;">{{ item }} {{ t('i.page.page') }}</i-option>
             </i-select>
         </div>
@@ -35,7 +35,8 @@
             _current: Number,
             pageSize: Number,
             allPages: Number,
-            isSmall: Boolean
+            isSmall: Boolean,
+            placement: String
         },
         data () {
             return {
diff --git a/src/components/page/page.vue b/src/components/page/page.vue
index 1463f06c..65c8270d 100644
--- a/src/components/page/page.vue
+++ b/src/components/page/page.vue
@@ -52,6 +52,7 @@
             :show-sizer="showSizer"
             :page-size="currentPageSize"
             :page-size-opts="pageSizeOpts"
+            :placement="placement"
             :show-elevator="showElevator"
             :_current.once="currentPage"
             :current="currentPage"
@@ -92,6 +93,12 @@
                     return [10, 20, 30, 40];
                 }
             },
+            placement: {
+                validator (value) {
+                    return oneOf(value, ['top', 'bottom']);
+                },
+                default: 'bottom'
+            },
             size: {
                 validator (value) {
                     return oneOf(value, ['small']);
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index f611d08d..ee27eb72 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -24,8 +24,8 @@
             <Icon type="ios-close" :class="[prefixCls + '-arrow']" v-show="showCloseIcon" @click.native.stop="clearSingleSelect"></Icon>
             <Icon type="arrow-down-b" :class="[prefixCls + '-arrow']"></Icon>
         </div>
-        <transition name="slide-up">
-            <Drop v-show="visible" ref="dropdown">
+        <transition :name="transitionName">
+            <Drop v-show="visible" :placement="placement" ref="dropdown">
                 <ul v-show="notFound" :class="[prefixCls + '-not-found']"><li>{{ localeNotFoundText }}</li></ul>
                 <ul v-show="!notFound" :class="[prefixCls + '-dropdown-list']" ref="options"><slot></slot></ul>
             </Drop>
@@ -85,6 +85,12 @@
             },
             notFoundText: {
                 type: String
+            },
+            placement: {
+                validator (value) {
+                    return oneOf(value, ['top', 'bottom']);
+                },
+                default: 'bottom'
             }
         },
         data () {
@@ -161,6 +167,9 @@
                 } else {
                     return this.notFoundText;
                 }
+            },
+            transitionName () {
+                return this.placement === 'bottom' ? 'slide-up' : 'slide-down';
             }
         },
         methods: {

From bb1f58e20305f28166cdc401951061d15dd57466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 27 Apr 2017 18:04:51 +0800
Subject: [PATCH 05/68] update Radio

---
 examples/routers/radio.vue     | 14 +++++++++-----
 src/components/radio/radio.vue |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/examples/routers/radio.vue b/examples/routers/radio.vue
index 41b72c44..53df9a44 100644
--- a/examples/routers/radio.vue
+++ b/examples/routers/radio.vue
@@ -1,8 +1,10 @@
 <template>
     <div>
         <Radio-group v-model="date.sex">
-            <Radio label="male form"></Radio>
-            <Radio label="female"></Radio>
+            <div v-if="show">
+                <Radio label="male"></Radio>
+                <Radio label="female"></Radio>
+            </div>
         </Radio-group>
         <Button @click="handleChange">change</Button>
     </div>
@@ -12,13 +14,15 @@
         data () {
             return {
                 date: {
-                    sex: ''
-                }
+                    sex: 'male'
+                },
+                show: false
             }
         },
         methods: {
             handleChange () {
-                this.date.sex = 'male form';
+//                this.date.sex = 'male form';
+                this.show = true;
             }
         }
     }
diff --git a/src/components/radio/radio.vue b/src/components/radio/radio.vue
index 37261629..d7513dac 100644
--- a/src/components/radio/radio.vue
+++ b/src/components/radio/radio.vue
@@ -71,6 +71,8 @@
             if (this.parent) this.group = true;
             if (!this.group) {
                 this.updateValue();
+            } else {
+                this.parent.updateValue();
             }
         },
         methods: {

From f4c38b4604d1328a53a41a39300a5da5842c9ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 28 Apr 2017 11:16:40 +0800
Subject: [PATCH 06/68] fixed #805

---
 examples/routers/select.vue      | 29 ++++++++++++++++++++++-------
 src/components/select/select.vue |  6 ++++++
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index cad3a966..0bb9ab67 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -1,9 +1,8 @@
 <template>
     <div style="width: 200px;margin: 100px;">
-        <Select v-model="fields.pid" filterable placement="top">
-            <Option :value="0" label="一级菜单"></Option>
-            <Option :value="1" label="二级菜单"></Option>
-        </Select>
+        <i-select v-model="model" filterable clearable style="width:200px">
+            <i-option :value="option.value" v-for="option in options" :key="option">{{option.label}}</i-option>
+        </i-select>
     </div>
 </template>
 
@@ -11,10 +10,26 @@
     export default {
         data () {
             return {
-                fields: {
-                    pid: 0
-                }
+                model: 1,
+                options: [
+
+                ]
             }
+        },
+        mounted () {
+            this.options = [{
+                label: '全部',
+                value: 0
+            },{
+                label: '苹果',
+                value: 1
+            },{
+                label: '香蕉',
+                value: 2
+            },{
+                label: '西瓜',
+                value: 3
+            }];
         }
     }
 </script>
\ No newline at end of file
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index ee27eb72..8fac8749 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -536,11 +536,17 @@
 
             this.$on('append', () => {
                 this.modelToQuery();
+                this.$nextTick(() => {
+                    this.broadcastQuery('');
+                });
                 this.slotChange();
                 this.updateOptions(true, true);
             });
             this.$on('remove', () => {
                 this.modelToQuery();
+                this.$nextTick(() => {
+                    this.broadcastQuery('');
+                });
                 this.slotChange();
                 this.updateOptions(true, true);
             });

From f1f8ca05a00c102c1fec00f4fed0ebc736098ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 28 Apr 2017 11:42:21 +0800
Subject: [PATCH 07/68] release 2.0.0-rc.12

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a416cdc3..55c68bde 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iview",
-  "version": "2.0.0-rc.11",
+  "version": "2.0.0-rc.12",
   "title": "iView",
   "description": "A high quality  UI components Library with Vue.js",
   "homepage": "http://www.iviewui.com",

From 8d3a02a52e87403e3be7491db2bf2ef5d865510f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E5=BC=BA?= <b1g3rr0r1@gmail.com>
Date: Fri, 28 Apr 2017 14:53:17 +0800
Subject: [PATCH 08/68] =?UTF-8?q?=E4=BF=AE=E6=94=B9input=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=20autofocus=E4=B8=BABoolean=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/routers/input-number.vue            | 5 +++--
 examples/routers/input.vue                   | 5 +++--
 src/components/input-number/input-number.vue | 3 ++-
 src/components/input/input.vue               | 3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/examples/routers/input-number.vue b/examples/routers/input-number.vue
index e4729cc3..df86e737 100644
--- a/examples/routers/input-number.vue
+++ b/examples/routers/input-number.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Input-number :max="10" :min="-1" v-model="v1" autofocus></Input-number>
+        <Input-number :max="10" :min="-1" v-model="v1" :autofocus="autofocus"></Input-number>
         {{ v1 }}
         <div @click="c">change v1</div>
         <Input-number disabled :max="10" :min="1" :step="1.2" v-model="v2"></Input-number>
@@ -12,7 +12,8 @@
         data () {
             return {
                 v1: 1,
-                v2: 1
+                v2: 1,
+                autofocus: true
             };
         },
         computed: {},
diff --git a/examples/routers/input.vue b/examples/routers/input.vue
index 8b6c7ff8..e55ca4e3 100644
--- a/examples/routers/input.vue
+++ b/examples/routers/input.vue
@@ -1,6 +1,6 @@
 <template>
     <div style="width: 300px;">
-        <i-input v-model="value11" icon="ios-clock-outline" autofocus>
+        <i-input v-model="value11" icon="ios-clock-outline" :autofocus="autofocus">
             <span slot="prepend">.com</span>
         </i-input>
         <i-input v-model="value11" icon="ios-clock-outline">
@@ -17,7 +17,8 @@
                 value13: '',
                 select1: 'http',
                 select2: 'com',
-                select3: 'day'
+                select3: 'day',
+                autofocus: true
             }
         }
     }
diff --git a/src/components/input-number/input-number.vue b/src/components/input-number/input-number.vue
index 6a227e9b..7786874e 100644
--- a/src/components/input-number/input-number.vue
+++ b/src/components/input-number/input-number.vue
@@ -92,7 +92,8 @@
                 default: false
             },
             autofocus: {
-                type: String
+                type: Boolean,
+                default: false
             }
         },
         data () {
diff --git a/src/components/input/input.vue b/src/components/input/input.vue
index a84108de..ed0919fe 100644
--- a/src/components/input/input.vue
+++ b/src/components/input/input.vue
@@ -101,7 +101,8 @@
                 default: false
             },
             autofocus: {
-                type: String
+                type: Boolean,
+                default: false
             }
         },
         data () {

From 687c4562f12e3e6adc704b6163e9eab4c8623a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 4 May 2017 10:33:50 +0800
Subject: [PATCH 09/68] fixed #810

---
 examples/routers/cascader.vue        | 8 +++-----
 src/components/cascader/cascader.vue | 6 ++++--
 src/components/cascader/caspanel.vue | 3 ---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue
index 246881ac..8892ae7e 100644
--- a/examples/routers/cascader.vue
+++ b/examples/routers/cascader.vue
@@ -1,14 +1,13 @@
 <template>
-    <div>
-        <Cascader :data="data2" v-model="v1" disabled clearable></Cascader>
-        <Cascader :data="data2" clearable></Cascader>
+    <div style="width: 300px;margin: 100px;">
+        <Cascader :data="data2" v-model="v1" change-on-select></Cascader>
     </div>
 </template>
 <script>
     export default {
         data () {
             return {
-                v1: ['zhejiang', 'hangzhou', 'xihu'],
+                v1: ['zhejiang'],
                 data2: [{
                     value: 'zhejiang',
                     label: '浙江',
@@ -23,7 +22,6 @@
                 }, {
                     value: 'jiangsu',
                     label: '江苏',
-                    disabled: true,
                     children: [{
                         value: 'nanjing',
                         label: '南京',
diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index 5768d1ee..331a6e2e 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -172,8 +172,7 @@
                 }
             }
         },
-        mounted () {
-            this.updateSelected(true);
+        created () {
             this.$on('on-result-change', (params) => {
                 // lastValue: is click the final val
                 // fromInit: is this emit from update value
@@ -201,6 +200,9 @@
                 }
             });
         },
+        mounted () {
+            this.updateSelected(true);
+        },
         watch: {
             visible (val) {
                 if (val) {
diff --git a/src/components/cascader/caspanel.vue b/src/components/cascader/caspanel.vue
index ad8b21d1..6505ee1f 100644
--- a/src/components/cascader/caspanel.vue
+++ b/src/components/cascader/caspanel.vue
@@ -60,10 +60,8 @@
                 const backItem = this.getBaseItem(item);
                 this.tmpItem = backItem;
                 this.emitUpdate([backItem]);
-
                 if (item.children && item.children.length){
                     this.sublist = item.children;
-//                    this.$dispatch('on-result-change', false, this.changeOnSelect, fromInit);
                     this.dispatch('Cascader', 'on-result-change', {
                         lastValue: false,
                         changeOnSelect: this.changeOnSelect,
@@ -71,7 +69,6 @@
                     });
                 } else {
                     this.sublist = [];
-//                    this.$dispatch('on-result-change', true, this.changeOnSelect, fromInit);
                     this.dispatch('Cascader', 'on-result-change', {
                         lastValue: true,
                         changeOnSelect: this.changeOnSelect,

From 87b6ef9d8ba27daad950f8dcdaae36d45f6da8ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 4 May 2017 12:05:29 +0800
Subject: [PATCH 10/68] Table support real Render function to render Cell

---
 examples/routers/table.vue    | 31 +++++++++++---
 src/components/table/cell.vue | 81 +++++++++++++++++++++--------------
 2 files changed, 75 insertions(+), 37 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 42247ddd..0dc7340f 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
-        <Table border :context="self" :columns="columns7" :data="data6"></Table>
-        <abc></abc>
+        <Table border :columns="columns7" :data="data6"></Table>
+        <Button @click="handleAdd"> + 1</Button>
     </div>
 </template>
 <script>
@@ -10,13 +10,23 @@
         components: { abc },
         data () {
             return {
-                self: this,
+                data1: 1,
+//                self: this,
                 columns7: [
                     {
                         title: '姓名',
                         key: 'name',
-                        render (row, column, index) {
-                            return `<abc></abc>`;
+//                        render (row, column, index) {
+//                            return `<abc></abc>`;
+//                        }
+                        render: (h, row, column, index) => {
+                            return h('div', [
+                                h('Button',{
+                                    on: {
+                                        click: this.handleClick
+                                    }
+                                }, 'hello')
+                            ])
                         }
                     },
                     {
@@ -61,6 +71,11 @@
                 ]
             }
         },
+        computed: {
+            ttt () {
+                return this.data1 + 1;
+            }
+        },
         methods: {
             show (index) {
                 this.$Modal.info({
@@ -70,6 +85,12 @@
             },
             remove (index) {
                 this.data6.splice(index, 1);
+            },
+            handleAdd () {
+                this.data1++;
+            },
+            handleClick () {
+                this.$Message.info('111')
             }
         }
     }
diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index 94bcfb44..d731a793 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -48,42 +48,59 @@
         methods: {
             compile () {
                 if (this.column.render) {
-                    const $parent = this.context;
-                    const template = this.column.render(this.row, this.column, this.index);
-                    const cell = document.createElement('div');
-                    cell.innerHTML = template;
+                    // 兼容真 Render，后期废弃旧用法
+                    let isRealRender = false;
+                    try {
+                        this.column.render(this.row, this.column, this.index);
+                    }
+                    catch (err) {
+                        isRealRender = true;
+                    }
 
-                    this.$el.innerHTML = '';
-                    let methods = {};
-                    Object.keys($parent).forEach(key => {
-                        const func = $parent[key];
-                        if (typeof(func) === 'function' && (func.name  === 'boundFn' || func.name === 'n')) {
-                            methods[key] = func;
-                        }
-                    });
-                    const res = Vue.compile(cell.outerHTML);
-                    // todo 临时解决方案
+                    if (isRealRender) {
+                        const component = new Vue({
+                            render: (h) => {
+                                return this.column.render(h, this.row, this.column, this.index);
+                            }
+                        });
+                        const Cell = component.$mount();
+                        this.$refs.cell.appendChild(Cell.$el);
+                    } else {
+                        const $parent = this.context;
+                        const template = this.column.render(this.row, this.column, this.index);
+                        const cell = document.createElement('div');
+                        cell.innerHTML = template;
 
-                    // 获取父组件使用的局部 component
-                    const components = {};
-                    Object.getOwnPropertyNames($parent.$options.components).forEach(item => {
-                        components[item] = $parent.$options.components[item];
-                    });
+                        this.$el.innerHTML = '';
+                        let methods = {};
+                        Object.keys($parent).forEach(key => {
+                            const func = $parent[key];
+                            if (typeof(func) === 'function' && (func.name  === 'boundFn' || func.name === 'n')) {
+                                methods[key] = func;
+                            }
+                        });
+                        const res = Vue.compile(cell.outerHTML);
+                        // 获取父组件使用的局部 component
+                        const components = {};
+                        Object.getOwnPropertyNames($parent.$options.components).forEach(item => {
+                            components[item] = $parent.$options.components[item];
+                        });
 
-                    const component = new Vue({
-                        render: res.render,
-                        staticRenderFns: res.staticRenderFns,
-                        methods: methods,
-                        data () {
-                            return $parent._data;
-                        },
-                        components: components
-                    });
-                    component.row = this.row;
-                    component.column = this.column;
+                        const component = new Vue({
+                            render: res.render,
+                            staticRenderFns: res.staticRenderFns,
+                            methods: methods,
+                            data () {
+                                return $parent._data;
+                            },
+                            components: components
+                        });
+                        component.row = this.row;
+                        component.column = this.column;
 
-                    const Cell = component.$mount();
-                    this.$refs.cell.appendChild(Cell.$el);
+                        const Cell = component.$mount();
+                        this.$refs.cell.appendChild(Cell.$el);
+                    }
                 }
             },
             destroy () {

From 28587238ded06647eeddecaff776f4d8fb213d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 4 May 2017 15:22:31 +0800
Subject: [PATCH 11/68] update Table functional

---
 src/components/table/cell.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index d731a793..65bf8b9c 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -59,6 +59,7 @@
 
                     if (isRealRender) {
                         const component = new Vue({
+                            functional: true,
                             render: (h) => {
                                 return this.column.render(h, this.row, this.column, this.index);
                             }

From 01b54e302194cbb6f889df126551c9d94fca0924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 5 May 2017 14:20:46 +0800
Subject: [PATCH 12/68] Select support remote search

---
 examples/routers/select.vue       |  94 ++++++++++++++++++++++-----
 src/components/select/select.vue  | 102 ++++++++++++++++++++++--------
 src/locale/lang/en-US.js          |   3 +-
 src/locale/lang/es-ES.js          |   3 +-
 src/locale/lang/ja-JP.js          |   3 +-
 src/locale/lang/tr-TR.js          |   3 +-
 src/locale/lang/zh-CN.js          |   3 +-
 src/locale/lang/zh-TW.js          |   3 +-
 src/styles/components/select.less |   4 ++
 9 files changed, 167 insertions(+), 51 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 0bb9ab67..55fdd4ae 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -1,8 +1,9 @@
 <template>
     <div style="width: 200px;margin: 100px;">
-        <i-select v-model="model" filterable clearable style="width:200px">
-            <i-option :value="option.value" v-for="option in options" :key="option">{{option.label}}</i-option>
+        <i-select v-model="model" filterable remote :remote-method="remoteMethod" :loading="loading" clearable style="width:200px">
+            <i-option v-for="option in options" :value="option.value" :key="option">{{option.label}}</i-option>
         </i-select>
+        <!--<Button @click="handleAdd">+</Button>-->
     </div>
 </template>
 
@@ -10,26 +11,85 @@
     export default {
         data () {
             return {
-                model: 1,
+                model: '',
                 options: [
 
-                ]
+                ],
+                list: [],
+                loading: false,
+                states: ["Alabama", "Alaska", "Arizona",
+                    "Arkansas", "California", "Colorado",
+                    "Connecticut", "Delaware", "Florida",
+                    "Georgia", "Hawaii", "Idaho", "Illinois",
+                    "Indiana", "Iowa", "Kansas", "Kentucky",
+                    "Louisiana", "Maine", "Maryland",
+                    "Massachusetts", "Michigan", "Minnesota",
+                    "Mississippi", "Missouri", "Montana",
+                    "Nebraska", "Nevada", "New Hampshire",
+                    "New Jersey", "New Mexico", "New York",
+                    "North Carolina", "North Dakota", "Ohio",
+                    "Oklahoma", "Oregon", "Pennsylvania",
+                    "Rhode Island", "South Carolina",
+                    "South Dakota", "Tennessee", "Texas",
+                    "Utah", "Vermont", "Virginia",
+                    "Washington", "West Virginia", "Wisconsin",
+                    "Wyoming"]
             }
         },
         mounted () {
-            this.options = [{
-                label: '全部',
-                value: 0
-            },{
-                label: '苹果',
-                value: 1
-            },{
-                label: '香蕉',
-                value: 2
-            },{
-                label: '西瓜',
-                value: 3
-            }];
+            this.options = [
+//                {
+//                    label: '全部',
+//                    value: 0
+//                },{
+//                    label: '苹果',
+//                    value: 1
+//                },{
+//                    label: '香蕉',
+//                    value: 2
+//                },{
+//                    label: '西瓜',
+//                    value: 3
+//                }
+            ];
+        },
+        methods: {
+            handleAdd () {
+                this.options = [
+                    {
+                        label: '全部',
+                        value: 0
+                    },{
+                        label: '苹果',
+                        value: 1
+                    },{
+                        label: '香蕉',
+                        value: 2
+                    },{
+                        label: '西瓜',
+                        value: 3
+                    }
+                ]
+            },
+            remoteMethod (query) {
+                if (query !== '') {
+                    this.loading = true;
+                    setTimeout(() => {
+                        this.loading = false;
+                        this.options = this.list.filter(item => {
+                            return item.label.toLowerCase()
+                                    .indexOf(query.toLowerCase()) > -1;
+                        });
+                    }, 200);
+                } else {
+                    this.options = [];
+                }
+            }
+        },
+        mounted () {
+            this.list = this.states.map(item => {
+                return { value: item, label: item };
+            });
         }
     }
 </script>
\ No newline at end of file
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 8fac8749..6150170f 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -22,12 +22,16 @@
                 @keydown.delete="handleInputDelete"
                 ref="input">
             <Icon type="ios-close" :class="[prefixCls + '-arrow']" v-show="showCloseIcon" @click.native.stop="clearSingleSelect"></Icon>
-            <Icon type="arrow-down-b" :class="[prefixCls + '-arrow']"></Icon>
+            <Icon type="arrow-down-b" :class="[prefixCls + '-arrow']" v-if="!remote"></Icon>
         </div>
         <transition :name="transitionName">
-            <Drop v-show="visible" :placement="placement" ref="dropdown">
-                <ul v-show="notFound" :class="[prefixCls + '-not-found']"><li>{{ localeNotFoundText }}</li></ul>
-                <ul v-show="!notFound" :class="[prefixCls + '-dropdown-list']" ref="options"><slot></slot></ul>
+            <Drop v-show="(visible && options.length) ||
+                (visible && !options.length && loading) ||
+                (visible && remote && !loading && !options.length && query !== '')" :placement="placement" ref="dropdown">
+            <!--<Drop v-show="visible" :placement="placement" ref="dropdown">-->
+                <ul v-show="(notFound && !remote) || (remote && !loading && !options.length)" :class="[prefixCls + '-not-found']"><li>{{ localeNotFoundText }}</li></ul>
+                <ul v-show="(!notFound && !remote) || (remote && !loading && !notFound)" :class="[prefixCls + '-dropdown-list']" ref="options"><slot></slot></ul>
+                <ul v-show="loading" :class="[prefixCls + '-loading']">{{ localeLoadingText }}</ul>
             </Drop>
         </transition>
     </div>
@@ -74,6 +78,20 @@
             filterMethod: {
                 type: Function
             },
+            remote: {
+                type: Boolean,
+                default: false
+            },
+            remoteMethod: {
+                type: Function
+            },
+            loading: {
+                type: Boolean,
+                default: false
+            },
+            loadingText: {
+                type: String
+            },
             size: {
                 validator (value) {
                     return oneOf(value, ['small', 'large', 'default']);
@@ -103,6 +121,7 @@
                 selectedMultiple: [],
                 focusIndex: 0,
                 query: '',
+                selectToChangeQuery: false,    // when select an option, set this first and set query, because query is watching, it will emit event
                 inputLength: 20,
                 notFound: false,
                 slotChangeDuration: false,    // if slot change duration and in multiple, set true and after slot change, set false
@@ -168,6 +187,13 @@
                     return this.notFoundText;
                 }
             },
+            localeLoadingText () {
+                if (this.loadingText === undefined) {
+                    return this.t('i.select.loading');
+                } else {
+                    return this.loadingText;
+                }
+            },
             transitionName () {
                 return this.placement === 'bottom' ? 'slide-up' : 'slide-down';
             }
@@ -187,15 +213,18 @@
             },
             // find option component
             findChild (cb) {
+                const _this = this;
                 const find = function (child) {
                     const name = child.$options.componentName;
 
                     if (name) {
                         cb(child);
                     } else if (child.$children.length) {
-                        child.$children.forEach((innerChild) => {
-                            find(innerChild, cb);
-                        });
+                        _this.$nextTick(() => {
+                            child.$children.forEach((innerChild) => {
+                                find(innerChild, cb);
+                            });
+                        })
                     }
                 };
 
@@ -228,8 +257,10 @@
                 this.options = options;
 
                 if (init) {
-                    this.updateSingleSelected(true, slot);
-                    this.updateMultipleSelected(true, slot);
+                    if (!this.remote) {
+                        this.updateSingleSelected(true, slot);
+                        this.updateMultipleSelected(true, slot);
+                    }
                 }
             },
             updateSingleSelected (init = false, slot = false) {
@@ -535,18 +566,22 @@
             document.addEventListener('keydown', this.handleKeydown);
 
             this.$on('append', () => {
-                this.modelToQuery();
-                this.$nextTick(() => {
-                    this.broadcastQuery('');
-                });
+                if (!this.remote) {
+                    this.modelToQuery();
+                    this.$nextTick(() => {
+                        this.broadcastQuery('');
+                    });
+                }
                 this.slotChange();
                 this.updateOptions(true, true);
             });
             this.$on('remove', () => {
-                this.modelToQuery();
-                this.$nextTick(() => {
-                    this.broadcastQuery('');
-                });
+                if (!this.remote) {
+                    this.modelToQuery();
+                    this.$nextTick(() => {
+                        this.broadcastQuery('');
+                    });
+                }
                 this.slotChange();
                 this.updateOptions(true, true);
             });
@@ -565,6 +600,7 @@
                         }
 
                         if (this.filterable) {
+                            this.selectToChangeQuery = true;
                             this.query = '';
                             this.$refs.input.focus();
                         }
@@ -574,6 +610,7 @@
                         if (this.filterable) {
                             this.findChild((child) => {
                                 if (child.value === value) {
+                                    this.selectToChangeQuery = true;
                                     this.query = child.label === undefined ? child.searchLabel : child.label;
                                 }
                             });
@@ -625,20 +662,29 @@
                 }
             },
             query (val) {
-                this.$emit('on-query-change', val);
+                if (this.remote && this.remoteMethod) {
+                    if (!this.selectToChangeQuery) {
+                        this.$emit('on-query-change', val);
+                        this.remoteMethod(val);
+                    }
+                } else {
+                    if (!this.selectToChangeQuery) {
+                        this.$emit('on-query-change', val);
+                    }
+                    this.broadcastQuery(val);
 
-                this.broadcastQuery(val);
-                
-                let is_hidden = true;
+                    let is_hidden = true;
 
-                this.$nextTick(() => {
-                    this.findChild((child) => {
-                        if (!child.hidden) {
-                            is_hidden = false;
-                        }
+                    this.$nextTick(() => {
+                        this.findChild((child) => {
+                            if (!child.hidden) {
+                                is_hidden = false;
+                            }
+                        });
+                        this.notFound = is_hidden;
                     });
-                    this.notFound = is_hidden;
-                });
+                }
+                this.selectToChangeQuery = false;
                 this.broadcast('Drop', 'on-update-popper');
             }
         }
diff --git a/src/locale/lang/en-US.js b/src/locale/lang/en-US.js
index ade42ebe..9de431f1 100644
--- a/src/locale/lang/en-US.js
+++ b/src/locale/lang/en-US.js
@@ -2,7 +2,8 @@ export default {
     i: {
         select: {
             placeholder: 'Select',
-            noMatch: 'No matching data'
+            noMatch: 'No matching data',
+            loading: 'Loading'
         },
         table: {
             noDataText: 'No Data',
diff --git a/src/locale/lang/es-ES.js b/src/locale/lang/es-ES.js
index b951e646..4c4d813c 100644
--- a/src/locale/lang/es-ES.js
+++ b/src/locale/lang/es-ES.js
@@ -2,7 +2,8 @@ export default {
     i: {
         select: {
             placeholder: 'Seleccionar',
-            noMatch: 'Sin coincidencias'
+            noMatch: 'Sin coincidencias',
+            loading: 'Cargando'
         },
         table: {
             noDataText: 'Sin Datos',
diff --git a/src/locale/lang/ja-JP.js b/src/locale/lang/ja-JP.js
index 4d49f42e..bcad1496 100644
--- a/src/locale/lang/ja-JP.js
+++ b/src/locale/lang/ja-JP.js
@@ -2,7 +2,8 @@ export default {
     i: {
         select: {
             placeholder: '選んでください',
-            noMatch: 'マッチするデータなし'
+            noMatch: 'マッチするデータなし',
+            loading: 'ロード中'
         },
         table: {
             noDataText: 'データなし',
diff --git a/src/locale/lang/tr-TR.js b/src/locale/lang/tr-TR.js
index 4b76269b..ed95c980 100644
--- a/src/locale/lang/tr-TR.js
+++ b/src/locale/lang/tr-TR.js
@@ -2,7 +2,8 @@ export default {
     i: {
         select: {
             placeholder: 'Seç',
-            noMatch: 'Eşleşen veri yok'
+            noMatch: 'Eşleşen veri yok',
+            loading: 'yükleme'
         },
         table: {
             noDataText: 'Veri Yok',
diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js
index 4e1c9148..ea87ebcb 100644
--- a/src/locale/lang/zh-CN.js
+++ b/src/locale/lang/zh-CN.js
@@ -2,7 +2,8 @@ export default {
     i: {
         select: {
             placeholder: '请选择',
-            noMatch: '无匹配数据'
+            noMatch: '无匹配数据',
+            loading: '加载中'
         },
         table: {
             noDataText: '暂无数据',
diff --git a/src/locale/lang/zh-TW.js b/src/locale/lang/zh-TW.js
index aa6fe1d3..b9e45cc2 100644
--- a/src/locale/lang/zh-TW.js
+++ b/src/locale/lang/zh-TW.js
@@ -2,7 +2,8 @@ export default {
     i: {
         select: {
             placeholder: '請選擇',
-            noMatch: '無匹配數據'
+            noMatch: '無匹配數據',
+            loading: '加載中'
         },
         table: {
             noDataText: '暫無數據',
diff --git a/src/styles/components/select.less b/src/styles/components/select.less
index 550d4192..2227c96a 100644
--- a/src/styles/components/select.less
+++ b/src/styles/components/select.less
@@ -174,6 +174,10 @@
         text-align: center;
         color: @btn-disable-color;
     }
+    &-loading{
+        text-align: center;
+        color: @btn-disable-color;
+    }
 
     &-multiple .@{css-prefix}tag{
         margin: 3px 4px 2px 0;

From ec98f3c3aed842a48c1abe83c9e338cbb6923a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 8 May 2017 10:01:07 +0800
Subject: [PATCH 13/68] update Select

---
 examples/routers/select.vue      |  3 ++-
 src/components/select/select.vue | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 55fdd4ae..7ec70f2a 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -1,5 +1,6 @@
 <template>
     <div style="width: 200px;margin: 100px;">
+        {{ model }}
         <i-select v-model="model" filterable remote :remote-method="remoteMethod" :loading="loading" clearable style="width:200px">
             <i-option v-for="option in options" :value="option.value" :key="option">{{option.label}}</i-option>
         </i-select>
@@ -80,7 +81,7 @@
                             return item.label.toLowerCase()
                                     .indexOf(query.toLowerCase()) > -1;
                         });
-                    }, 200);
+                    }, 500);
                 } else {
                     this.options = [];
                 }
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 6150170f..86585ceb 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -25,10 +25,7 @@
             <Icon type="arrow-down-b" :class="[prefixCls + '-arrow']" v-if="!remote"></Icon>
         </div>
         <transition :name="transitionName">
-            <Drop v-show="(visible && options.length) ||
-                (visible && !options.length && loading) ||
-                (visible && remote && !loading && !options.length && query !== '')" :placement="placement" ref="dropdown">
-            <!--<Drop v-show="visible" :placement="placement" ref="dropdown">-->
+            <Drop v-show="dropVisible" :placement="placement" ref="dropdown">
                 <ul v-show="(notFound && !remote) || (remote && !loading && !options.length)" :class="[prefixCls + '-not-found']"><li>{{ localeNotFoundText }}</li></ul>
                 <ul v-show="(!notFound && !remote) || (remote && !loading && !notFound)" :class="[prefixCls + '-dropdown-list']" ref="options"><slot></slot></ul>
                 <ul v-show="loading" :class="[prefixCls + '-loading']">{{ localeLoadingText }}</ul>
@@ -196,6 +193,11 @@
             },
             transitionName () {
                 return this.placement === 'bottom' ? 'slide-up' : 'slide-down';
+            },
+            dropVisible () {
+                let status = true;
+                if (!this.loading && this.remote && this.query === '' && !this.options.length) status = false;
+                return this.visible && status;
             }
         },
         methods: {
@@ -203,7 +205,6 @@
                 if (this.disabled) {
                     return false;
                 }
-
                 this.visible = !this.visible;
             },
             hideMenu () {
@@ -224,7 +225,7 @@
                             child.$children.forEach((innerChild) => {
                                 find(innerChild, cb);
                             });
-                        })
+                        });
                     }
                 };
 

From 0b916a32809ae76cf2758539a82081daaf03787f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 8 May 2017 10:21:33 +0800
Subject: [PATCH 14/68] update Select

---
 examples/routers/select.vue      | 2 +-
 src/components/select/select.vue | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 7ec70f2a..9c85fbab 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -18,7 +18,7 @@
                 ],
                 list: [],
                 loading: false,
-                states: ["Alabama", "Alaska", "Arizona",
+                states: ["Al", "Alabama", "Alaska", "Arizona",
                     "Arkansas", "California", "Colorado",
                     "Connecticut", "Delaware", "Florida",
                     "Georgia", "Hawaii", "Idaho", "Illinois",
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 86585ceb..66909651 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -27,7 +27,7 @@
         <transition :name="transitionName">
             <Drop v-show="dropVisible" :placement="placement" ref="dropdown">
                 <ul v-show="(notFound && !remote) || (remote && !loading && !options.length)" :class="[prefixCls + '-not-found']"><li>{{ localeNotFoundText }}</li></ul>
-                <ul v-show="(!notFound && !remote) || (remote && !loading && !notFound)" :class="[prefixCls + '-dropdown-list']" ref="options"><slot></slot></ul>
+                <ul v-show="(!notFound && !remote) || (remote && !loading && !notFound)" :class="[prefixCls + '-dropdown-list']"><slot></slot></ul>
                 <ul v-show="loading" :class="[prefixCls + '-loading']">{{ localeLoadingText }}</ul>
             </Drop>
         </transition>
@@ -510,6 +510,12 @@
                                     this.query = child.label === undefined ? child.searchLabel : child.label;
                                 }
                             });
+                            // 如果删除了搜索词，下拉列表也情况了，所以强制调用一次remoteMethod
+                            if (this.remote) {
+                                this.$nextTick(() => {
+                                    this.query = model;
+                                })
+                            }
                         } else {
                             this.query = '';
                         }

From 6f8608bbc202d31a455754b4cb128bf4be40eeee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 8 May 2017 10:26:50 +0800
Subject: [PATCH 15/68] update Select

---
 src/components/select/select.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 66909651..ea6b2738 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -514,7 +514,7 @@
                             if (this.remote) {
                                 this.$nextTick(() => {
                                     this.query = model;
-                                })
+                                });
                             }
                         } else {
                             this.query = '';

From d87ce40a740534e9876c228be2fcfebb1e902af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 8 May 2017 14:22:24 +0800
Subject: [PATCH 16/68] update Select

---
 examples/routers/select.vue      | 17 +++++++++--------
 src/components/select/select.vue | 19 +++++++++++++++++--
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 9c85fbab..8fd13473 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -1,18 +1,19 @@
 <template>
-    <div style="width: 200px;margin: 100px;">
-        {{ model }}
-        <i-select v-model="model" filterable remote :remote-method="remoteMethod" :loading="loading" clearable style="width:200px">
-            <i-option v-for="option in options" :value="option.value" :key="option">{{option.label}}</i-option>
-        </i-select>
-        <!--<Button @click="handleAdd">+</Button>-->
-    </div>
+    <Row>
+        <i-col span="4">{{model}}</i-col>
+        <i-col span="8">
+            <i-select v-model="model" multiple filterable remote :remote-method="remoteMethod" :loading="loading" clearable>
+                <i-option v-for="option in options" :value="option.value" :key="option">{{option.label}}</i-option>
+            </i-select>
+        </i-col>
+    </Row>
 </template>
 
 <script>
     export default {
         data () {
             return {
-                model: '',
+                model: [],
                 options: [
 
                 ],
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index ea6b2738..d0d6fe03 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -300,7 +300,7 @@
             },
             updateMultipleSelected (init = false, slot = false) {
                 if (this.multiple && Array.isArray(this.model)) {
-                    let selected = [];
+                    let selected = this.remote ? this.selectedMultiple : [];
 
                     for (let i = 0; i < this.model.length; i++) {
                         const model = this.model[i];
@@ -317,7 +317,16 @@
                         }
                     }
 
-                    this.selectedMultiple = selected;
+                    const selectedArray = [];
+                    const selectedObject = {};
+                    selected.forEach(item => {
+                        if (!selectedObject[item.value]) {
+                            selectedArray.push(item);
+                            selectedObject[item.value] = 1;
+                        }
+                    });
+
+                    this.selectedMultiple = this.remote ? selectedArray : selected;
 
                     if (slot) {
                         let selectedModel = [];
@@ -340,6 +349,12 @@
                 if (this.disabled) {
                     return false;
                 }
+
+                if (this.remote) {
+                    const tag = this.model[index];
+                    this.selectedMultiple = this.selectedMultiple.filter(item => item.value !== tag);
+                }
+
                 this.model.splice(index, 1);
 
                 if (this.filterable && this.visible) {

From 393d85515e2311e758d5d1328742e8e85b067356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 8 May 2017 14:30:08 +0800
Subject: [PATCH 17/68] update Select

---
 src/components/select/select.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index d0d6fe03..6229e6f0 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -593,6 +593,10 @@
                     this.$nextTick(() => {
                         this.broadcastQuery('');
                     });
+                } else {
+                    this.findChild(child => {
+                        child.selected = this.model.indexOf(child.value) > -1;
+                    });
                 }
                 this.slotChange();
                 this.updateOptions(true, true);
@@ -603,6 +607,10 @@
                     this.$nextTick(() => {
                         this.broadcastQuery('');
                     });
+                } else {
+                    this.findChild(child => {
+                        child.selected = this.model.indexOf(child.value) > -1;
+                    });
                 }
                 this.slotChange();
                 this.updateOptions(true, true);
@@ -670,6 +678,11 @@
                         } else {
                             this.$refs.input.select();
                         }
+                        if (this.remote) {
+                            this.findChild(child => {
+                                child.selected = this.model.indexOf(child.value) > -1;
+                            });
+                        }
                     }
                     this.broadcast('Drop', 'on-update-popper');
                 } else {

From f10b27f99dfd3877b8f837f7631f7f362efd5dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 8 May 2017 17:04:25 +0800
Subject: [PATCH 18/68] update Select

---
 examples/routers/select.vue      | 2 +-
 src/components/select/select.vue | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 8fd13473..4c935e1d 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -82,7 +82,7 @@
                             return item.label.toLowerCase()
                                     .indexOf(query.toLowerCase()) > -1;
                         });
-                    }, 500);
+                    }, 200);
                 } else {
                     this.options = [];
                 }
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 6229e6f0..95d07e00 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -630,7 +630,8 @@
                         }
 
                         if (this.filterable) {
-                            this.selectToChangeQuery = true;
+                            // remote&filterable&multiple时，一次点多项，不应该设置true，因为无法置为false，下次的搜索会失效
+                            if (this.query !== '') this.selectToChangeQuery = true;
                             this.query = '';
                             this.$refs.input.focus();
                         }
@@ -640,7 +641,7 @@
                         if (this.filterable) {
                             this.findChild((child) => {
                                 if (child.value === value) {
-                                    this.selectToChangeQuery = true;
+                                    if (this.query !== '') this.selectToChangeQuery = true;
                                     this.query = child.label === undefined ? child.searchLabel : child.label;
                                 }
                             });
@@ -702,6 +703,10 @@
                         this.$emit('on-query-change', val);
                         this.remoteMethod(val);
                     }
+                    this.focusIndex = 0;
+                    this.findChild(child => {
+                        child.isFocus = false;
+                    });
                 } else {
                     if (!this.selectToChangeQuery) {
                         this.$emit('on-query-change', val);

From 7dcfe45d1b2e5895c21f5045997d2eb6ba14bb4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Tue, 9 May 2017 09:35:04 +0800
Subject: [PATCH 19/68] update Select

---
 examples/routers/select.vue      |  9 ++++++---
 src/components/select/select.vue | 10 +++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 4c935e1d..301c753a 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -2,8 +2,8 @@
     <Row>
         <i-col span="4">{{model}}</i-col>
         <i-col span="8">
-            <i-select v-model="model" multiple filterable remote :remote-method="remoteMethod" :loading="loading" clearable>
-                <i-option v-for="option in options" :value="option.value" :key="option">{{option.label}}</i-option>
+            <i-select v-model="model" @input="handleInput" multiple filterable remote :remote-method="remoteMethod" :loading="loading" clearable>
+                <i-option v-for="option in options" :value="option.value" :key="new Date()">{{option.label}}</i-option>
             </i-select>
         </i-col>
     </Row>
@@ -82,10 +82,13 @@
                             return item.label.toLowerCase()
                                     .indexOf(query.toLowerCase()) > -1;
                         });
-                    }, 200);
+                    }, 500);
                 } else {
                     this.options = [];
                 }
+            },
+            handleInput () {
+//                console.log(1)
             }
         },
         mounted () {
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 95d07e00..b240da5d 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -222,9 +222,12 @@
                         cb(child);
                     } else if (child.$children.length) {
                         _this.$nextTick(() => {
-                            child.$children.forEach((innerChild) => {
-                                find(innerChild, cb);
-                            });
+//                            child.$children.forEach((innerChild) => {
+//                                find(innerChild, cb);
+//                            });
+                        });
+                        child.$children.forEach((innerChild) => {
+                            find(innerChild, cb);
                         });
                     }
                 };
@@ -300,6 +303,7 @@
             },
             updateMultipleSelected (init = false, slot = false) {
                 if (this.multiple && Array.isArray(this.model)) {
+                    // todo 这里的 label 有问题，另删除字符时也有问题
                     let selected = this.remote ? this.selectedMultiple : [];
 
                     for (let i = 0; i < this.model.length; i++) {

From 13a940ee8665eb5c0cb7cf856460a26d924c8015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Tue, 9 May 2017 11:04:07 +0800
Subject: [PATCH 20/68] update Select

---
 src/components/select/select.vue | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index b240da5d..97a87761 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -196,7 +196,8 @@
             },
             dropVisible () {
                 let status = true;
-                if (!this.loading && this.remote && this.query === '' && !this.options.length) status = false;
+                const options = this.$slots.default || [];
+                if (!this.loading && this.remote && this.query === '' && !options.length) status = false;
                 return this.visible && status;
             }
         },
@@ -214,18 +215,12 @@
             },
             // find option component
             findChild (cb) {
-                const _this = this;
                 const find = function (child) {
                     const name = child.$options.componentName;
 
                     if (name) {
                         cb(child);
                     } else if (child.$children.length) {
-                        _this.$nextTick(() => {
-//                            child.$children.forEach((innerChild) => {
-//                                find(innerChild, cb);
-//                            });
-                        });
                         child.$children.forEach((innerChild) => {
                             find(innerChild, cb);
                         });
@@ -599,7 +594,7 @@
                     });
                 } else {
                     this.findChild(child => {
-                        child.selected = this.model.indexOf(child.value) > -1;
+                        child.selected = this.multiple ? this.model.indexOf(child.value) > -1 : this.model === child.value;
                     });
                 }
                 this.slotChange();
@@ -613,7 +608,7 @@
                     });
                 } else {
                     this.findChild(child => {
-                        child.selected = this.model.indexOf(child.value) > -1;
+                        child.selected = this.multiple ? this.model.indexOf(child.value) > -1 : this.model === child.value;
                     });
                 }
                 this.slotChange();
@@ -685,7 +680,7 @@
                         }
                         if (this.remote) {
                             this.findChild(child => {
-                                child.selected = this.model.indexOf(child.value) > -1;
+                                child.selected = this.multiple ? this.model.indexOf(child.value) > -1 : this.model === child.value;
                             });
                         }
                     }

From 8f69e63c776e1bb583b775078c3dd13b4c1dd8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E5=BA=86=E5=AE=89?= <lvqingan@gmail.com>
Date: Tue, 9 May 2017 15:04:59 +0800
Subject: [PATCH 21/68] =?UTF-8?q?=E4=BF=AE=E6=AD=A3table=20render=E7=9A=84?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?this.$store=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在table的render中生成的组件，组件内部无法通过this.$store来获取vuex对象
---
 src/components/table/cell.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index 65bf8b9c..7efb951f 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -96,6 +96,9 @@
                             },
                             components: components
                         });
+                        if ($parent.$store != undefined) {
+                            component.$store = $parent.$store;
+                        }
                         component.row = this.row;
                         component.column = this.column;
 

From f7ffdac56931b17211074c0ac0c41b5a25c946b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Tue, 9 May 2017 15:46:08 +0800
Subject: [PATCH 22/68] Cascader support loadData async

---
 examples/routers/cascader.vue        | 53 +++++++++++++++++++++-------
 src/components/cascader/cascader.vue | 10 ++++--
 src/components/cascader/casitem.vue  | 12 ++++++-
 src/components/cascader/caspanel.vue | 11 ++++++
 4 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue
index 8892ae7e..42d3d57e 100644
--- a/examples/routers/cascader.vue
+++ b/examples/routers/cascader.vue
@@ -1,24 +1,24 @@
 <template>
-    <div style="width: 300px;margin: 100px;">
-        <Cascader :data="data2" v-model="v1" change-on-select></Cascader>
-    </div>
+    <Row>
+        <i-col span="4">
+            <Button @click="handleLoad">load</Button>
+        </i-col>
+        <i-col span="6">
+            <!--<Cascader :data="data2" v-model="v1" change-on-select></Cascader>-->
+            <Cascader :data="data2" v-model="v1" :loadData="loadData"></Cascader>
+        </i-col>
+    </Row>
 </template>
 <script>
     export default {
         data () {
             return {
-                v1: ['zhejiang'],
+                v1: [],
                 data2: [{
                     value: 'zhejiang',
                     label: '浙江',
-                    children: [{
-                        value: 'hangzhou',
-                        label: '杭州',
-                        children: [{
-                            value: 'xihu',
-                            label: '西湖'
-                        }]
-                    }]
+                    children: [],
+                    loading: false
                 }, {
                     value: 'jiangsu',
                     label: '江苏',
@@ -32,6 +32,35 @@
                     }]
                 }]
             }
+        },
+        methods: {
+            handleLoad () {
+                this.data2[0].loading = !this.data2[0].loading;
+            },
+            loadData (item, cb) {
+                item.loading = true;
+                setTimeout(() => {
+                    if (item.value === 'zhejiang') {
+                        item.children = [
+                            {
+                                value: 'hangzhou',
+                                label: '杭州',
+                                loading: false,
+                                children: []
+                            }
+                        ];
+                    } else if (item.value === 'hangzhou') {
+                        item.children = [
+                            {
+                                value: 'ali',
+                                label: '阿里巴巴'
+                            }
+                        ];
+                    }
+                    item.loading = false;
+                    cb();
+                }, 1000);
+            }
         }
     }
 </script>
diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index 331a6e2e..296f903b 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -88,6 +88,9 @@
                 default (label) {
                     return label.join(' / ');
                 }
+            },
+            loadData: {
+                type: Function
             }
         },
         data () {
@@ -224,8 +227,11 @@
                 }
                 this.updateSelected(true);
             },
-            data () {
-                this.$nextTick(() => this.updateSelected());
+            data: {
+                deep: true,
+                handler () {
+                    this.$nextTick(() => this.updateSelected());
+                }
             }
         }
     };
diff --git a/src/components/cascader/casitem.vue b/src/components/cascader/casitem.vue
index 2f68ce98..3c707268 100644
--- a/src/components/cascader/casitem.vue
+++ b/src/components/cascader/casitem.vue
@@ -1,5 +1,9 @@
 <template>
-    <li :class="classes">{{ data.label }}<i v-if="data.children && data.children.length" class="ivu-icon ivu-icon-ios-arrow-right"></i></li>
+    <li :class="classes">
+        {{ data.label }}
+        <i v-if="showArrow" class="ivu-icon ivu-icon-ios-arrow-right"></i>
+        <i v-if="showLoading" class="ivu-icon ivu-icon-load-c ivu-load-loop"></i>
+    </li>
 </template>
 <script>
     export default {
@@ -18,6 +22,12 @@
                         [`${this.prefixCls}-menu-item-disabled`]: this.data.disabled
                     }
                 ];
+            },
+            showArrow () {
+                return (this.data.children && this.data.children.length) || ('loading' in this.data && !this.data.loading);
+            },
+            showLoading () {
+                return 'loading' in this.data && this.data.loading;
             }
         }
     };
diff --git a/src/components/cascader/caspanel.vue b/src/components/cascader/caspanel.vue
index 6505ee1f..296c4d08 100644
--- a/src/components/cascader/caspanel.vue
+++ b/src/components/cascader/caspanel.vue
@@ -15,6 +15,7 @@
 <script>
     import Casitem from './casitem.vue';
     import Emitter from '../../mixins/emitter';
+    import { findComponentUpward } from '../../utils/assist';
 
     export default {
         name: 'Caspanel',
@@ -56,6 +57,16 @@
             handleTriggerItem (item, fromInit = false) {
                 if (item.disabled) return;
 
+                if (item.loading !== undefined && !item.children.length) {
+                    const cascader = findComponentUpward(this, 'Cascader');
+                    if (cascader && cascader.loadData) {
+                        cascader.loadData(item, () => {
+                            this.handleTriggerItem(item);
+                        });
+                        return;
+                    }
+                }
+
                 // return value back recursion  // 向上递归，设置临时选中值（并非真实选中）
                 const backItem = this.getBaseItem(item);
                 this.tmpItem = backItem;

From 5a9a12cd1c1270f976d788eeedfed8f43b1a5fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 10 May 2017 09:18:54 +0800
Subject: [PATCH 23/68] update Cascader

---
 examples/routers/cascader.vue        | 51 ++++++++++++++++++++++++++--
 src/components/cascader/cascader.vue |  6 +++-
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue
index 42d3d57e..c0b2565b 100644
--- a/examples/routers/cascader.vue
+++ b/examples/routers/cascader.vue
@@ -4,8 +4,8 @@
             <Button @click="handleLoad">load</Button>
         </i-col>
         <i-col span="6">
-            <!--<Cascader :data="data2" v-model="v1" change-on-select></Cascader>-->
-            <Cascader :data="data2" v-model="v1" :loadData="loadData"></Cascader>
+            <Cascader :data="data3" filterable v-model="v1"></Cascader>
+            <!--<Cascader :data="data2" filterable v-model="v1" :loadData="loadData"></Cascader>-->
         </i-col>
     </Row>
 </template>
@@ -30,6 +30,53 @@
                             label: '中华门'
                         }]
                     }]
+                }],
+                data3: [{
+                    value: 'beijing',
+                    label: '北京',
+                    children: [
+                        {
+                            value: 'gugong',
+                            label: '故宫'
+                        },
+                        {
+                            value: 'tiantan',
+                            label: '天坛'
+                        },
+                        {
+                            value: 'wangfujing',
+                            label: '王府井'
+                        }
+                    ]
+                }, {
+                    value: 'jiangsu',
+                    label: '江苏',
+                    children: [
+                        {
+                            value: 'nanjing',
+                            label: '南京',
+                            children: [
+                                {
+                                    value: 'fuzimiao',
+                                    label: '夫子庙',
+                                }
+                            ]
+                        },
+                        {
+                            value: 'suzhou',
+                            label: '苏州',
+                            children: [
+                                {
+                                    value: 'zhuozhengyuan',
+                                    label: '拙政园',
+                                },
+                                {
+                                    value: 'shizilin',
+                                    label: '狮子林',
+                                }
+                            ]
+                        }
+                    ],
                 }]
             }
         },
diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index 296f903b..fa5bb45b 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -3,7 +3,7 @@
         <div :class="[prefixCls + '-rel']" @click="toggleOpen">
             <slot>
                 <i-input
-                    readonly
+                    :readonly="!filterable"
                     :disabled="disabled"
                     v-model="displayRender"
                     :size="size"
@@ -91,6 +91,10 @@
             },
             loadData: {
                 type: Function
+            },
+            filterable: {
+                type: Boolean,
+                default: false
             }
         },
         data () {

From 7959adf7a85d032d6d9ab1533d94a0acf8973c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 10 May 2017 09:22:10 +0800
Subject: [PATCH 24/68] fixed #862

---
 examples/routers/input-number.vue            | 2 +-
 src/components/input-number/input-number.vue | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/routers/input-number.vue b/examples/routers/input-number.vue
index df86e737..9831de89 100644
--- a/examples/routers/input-number.vue
+++ b/examples/routers/input-number.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Input-number :max="10" :min="-1" v-model="v1" :autofocus="autofocus"></Input-number>
+        <Input-number :max="10" name="he" :min="-1" v-model="v1" :autofocus="autofocus"></Input-number>
         {{ v1 }}
         <div @click="c">change v1</div>
         <Input-number disabled :max="10" :min="1" :step="1.2" v-model="v2"></Input-number>
diff --git a/src/components/input-number/input-number.vue b/src/components/input-number/input-number.vue
index 7786874e..3b10de80 100644
--- a/src/components/input-number/input-number.vue
+++ b/src/components/input-number/input-number.vue
@@ -24,6 +24,7 @@
                 @blur="blur"
                 @keydown.stop="keyDown"
                 @change="change"
+                :name="name"
                 :value="value">
         </div>
     </div>
@@ -94,6 +95,9 @@
             autofocus: {
                 type: Boolean,
                 default: false
+            },
+            name: {
+                type: String
             }
         },
         data () {

From 7ec0b5330b4893d32d949532b1ad02c506c05e4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 10 May 2017 18:24:30 +0800
Subject: [PATCH 25/68] Cascader support search

---
 examples/routers/cascader.vue        | 37 +++++++++--------
 src/components/cascader/cascader.vue | 60 ++++++++++++++++++++++++++--
 src/styles/components/cascader.less  |  4 ++
 3 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue
index c0b2565b..09e14d5d 100644
--- a/examples/routers/cascader.vue
+++ b/examples/routers/cascader.vue
@@ -2,8 +2,9 @@
     <Row>
         <i-col span="4">
             <Button @click="handleLoad">load</Button>
+            {{ v1 }}
         </i-col>
-        <i-col span="6">
+        <i-col span="4">
             <Cascader :data="data3" filterable v-model="v1"></Cascader>
             <!--<Cascader :data="data2" filterable v-model="v1" :loadData="loadData"></Cascader>-->
         </i-col>
@@ -14,23 +15,26 @@
         data () {
             return {
                 v1: [],
-                data2: [{
-                    value: 'zhejiang',
-                    label: '浙江',
-                    children: [],
-                    loading: false
-                }, {
-                    value: 'jiangsu',
-                    label: '江苏',
-                    children: [{
-                        value: 'nanjing',
-                        label: '南京',
+                data2: [
+                    {
+                        value: 'zhejiang',
+                        label: '浙江',
+                        children: [],
+                        loading: false
+                    },
+                    {
+                        value: 'jiangsu',
+                        label: '江苏',
                         children: [{
-                            value: 'zhonghuamen',
-                            label: '中华门'
+                            value: 'nanjing',
+                            label: '南京',
+                            children: [{
+                                value: 'zhonghuamen',
+                                label: '中华门'
+                            }]
                         }]
-                    }]
-                }],
+                    }
+                ],
                 data3: [{
                     value: 'beijing',
                     label: '北京',
@@ -67,6 +71,7 @@
                             label: '苏州',
                             children: [
                                 {
+                                    disabled: true,
                                     value: 'zhuozhengyuan',
                                     label: '拙政园',
                                 },
diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index fa5bb45b..5931facb 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -5,7 +5,8 @@
                 <i-input
                     :readonly="!filterable"
                     :disabled="disabled"
-                    v-model="displayRender"
+                    :value="displayRender"
+                    @on-change="handleInput"
                     :size="size"
                     :placeholder="placeholder"></i-input>
                 <Icon type="ios-close" :class="[prefixCls + '-arrow']" v-show="showCloseIcon" @click.native.stop="clearSelect"></Icon>
@@ -16,12 +17,23 @@
             <Drop v-show="visible">
                 <div>
                     <Caspanel
+                        v-show="!filterable || (filterable && query === '')"
                         ref="caspanel"
                         :prefix-cls="prefixCls"
                         :data="data"
                         :disabled="disabled"
                         :change-on-select="changeOnSelect"
                         :trigger="trigger"></Caspanel>
+                    <div :class="[prefixCls + '-dropdown']" v-show="filterable && query !== ''">
+                        <ul :class="[selectPrefixCls + '-dropdown-list']">
+                            <li
+                                :class="[selectPrefixCls + '-item', {
+                                    [selectPrefixCls + '-item-disabled']: item.disabled
+                                }]"
+                                v-for="(item, index) in querySelections"
+                                @click="handleSelectItem(index)">{{ item.label }}</li>
+                        </ul>
+                    </div>
                 </div>
             </Drop>
         </transition>
@@ -37,6 +49,7 @@
     import Emitter from '../../mixins/emitter';
 
     const prefixCls = 'ivu-cascader';
+    const selectPrefixCls = 'ivu-select';
 
     export default {
         name: 'Cascader',
@@ -100,11 +113,13 @@
         data () {
             return {
                 prefixCls: prefixCls,
+                selectPrefixCls: selectPrefixCls,
                 visible: false,
                 selected: [],
                 tmpSelected: [],
                 updatingValue: false,    // to fix set value in changeOnSelect type
-                currentValue: this.value
+                currentValue: this.value,
+                query: ''
             };
         },
         computed: {
@@ -128,6 +143,32 @@
                 }
 
                 return this.renderFormat(label, this.selected);
+            },
+            querySelections () {
+                let selections = [];
+                function getSelections (arr, label, value) {
+                    for (let i = 0; i < arr.length; i++) {
+                        let item = arr[i];
+                        item.__label = label ? label + ' / ' + item.label : item.label;
+                        item.__value = value ? value + ',' + item.value : item.value;
+
+                        if (item.children && item.children.length) {
+                            getSelections(item.children, item.__label, item.__value);
+                            delete item.__label;
+                            delete item.__value;
+                        } else {
+                            selections.push({
+                                label: item.__label,
+                                value: item.__value,
+                                item: item,
+                                disabled: !!item.disabled
+                            });
+                        }
+                    }
+                }
+                getSelections(this.data);
+                selections = selections.filter(item => item.label.indexOf(this.query) > -1);
+                return selections;
             }
         },
         methods: {
@@ -146,7 +187,7 @@
             toggleOpen () {
                 if (this.disabled) return false;
                 if (this.visible) {
-                    this.handleClose();
+                    if (!this.filterable) this.handleClose();
                 } else {
                     this.onFocus();
                 }
@@ -177,6 +218,19 @@
                         });
                     });
                 }
+            },
+            handleInput (event) {
+                this.query = event.target.value;
+            },
+            handleSelectItem (index) {
+                const item = this.querySelections[index];
+
+                if (item.item.disabled) return false;
+                this.query = '';
+                const oldVal = JSON.stringify(this.currentValue);
+                this.currentValue = item.value.split(',');
+                this.emitValue(this.currentValue, oldVal);
+                this.handleClose();
             }
         },
         created () {
diff --git a/src/styles/components/cascader.less b/src/styles/components/cascader.less
index 8978f7cf..71a160e6 100644
--- a/src/styles/components/cascader.less
+++ b/src/styles/components/cascader.less
@@ -49,6 +49,10 @@
 
     .select-item(@cascader-prefix-cls, @cascader-item-prefix-cls);
 
+    &-dropdown{
+        padding: 5px 0;
+    }
+
     &-menu{
         display: inline-block;
         min-width: 100px;

From 545add717e1ef47b6143d82b90434a5aac676261 Mon Sep 17 00:00:00 2001
From: yinheli <me@yinheli.com>
Date: Wed, 10 May 2017 23:34:15 +0800
Subject: [PATCH 26/68] =?UTF-8?q?input=20=E6=94=AF=E6=8C=81=20focus=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/input/input.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/input/input.vue b/src/components/input/input.vue
index ed0919fe..6900dc9a 100644
--- a/src/components/input/input.vue
+++ b/src/components/input/input.vue
@@ -7,6 +7,7 @@
                 <i class="ivu-icon ivu-icon-load-c ivu-load-loop" :class="[prefixCls + '-icon', prefixCls + '-icon-validate']" v-if="!icon"></i>
             </transition>
             <input
+                ref="input"
                 :type="type"
                 :class="inputClasses"
                 :placeholder="placeholder"
@@ -194,6 +195,13 @@
                 const maxRows = autosize.maxRows;
 
                 this.textareaStyles = calcTextareaHeight(this.$refs.textarea, minRows, maxRows);
+            },
+            focus() {
+                if (this.type === 'textarea') {
+                    this.$refs.textarea.focus();
+                } else {
+                    this.$refs.input.focus();
+                }
             }
         },
         watch: {

From 8be3ad5fc6e7c69e6832f8acce153db3c0049434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?EyreFree=E1=B5=88=E1=B5=89=E1=B5=9B?=
 <eyrefree@eyrefree.org>
Date: Thu, 11 May 2017 16:09:43 +0800
Subject: [PATCH 27/68] Change gitter badge style to flat-square

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 96e3d14c..fc0c3baf 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
     </a>
 </p>
 
-# iView  [![](https://img.shields.io/travis/iview/iview.svg?style=flat-square)](https://travis-ci.org/iview/iview) [![iView](https://img.shields.io/npm/v/iview.svg?style=flat-square)](https://www.npmjs.org/package/iview) [![NPM downloads](http://img.shields.io/npm/dm/iview.svg?style=flat-square)](https://npmjs.org/package/iview) [![Join the chat at https://gitter.im/iview/iview](https://badges.gitter.im/iview/iview.svg)](https://gitter.im/iview/iview?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# iView  [![](https://img.shields.io/travis/iview/iview.svg?style=flat-square)](https://travis-ci.org/iview/iview) [![iView](https://img.shields.io/npm/v/iview.svg?style=flat-square)](https://www.npmjs.org/package/iview) [![NPM downloads](http://img.shields.io/npm/dm/iview.svg?style=flat-square)](https://npmjs.org/package/iview) [![Join the chat at https://gitter.im/iview/iview](https://img.shields.io/badge/chat-on_gitter-30b392.svg?style=flat-square)](https://gitter.im/iview/iview?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ### A high quality  UI Toolkit built on Vue.js.
 
@@ -97,4 +97,4 @@ Normal browsers and Internet Explorer 9+.
 ## License
 [MIT](http://opensource.org/licenses/MIT)
 
-Copyright (c) 2016-present, iView
\ No newline at end of file
+Copyright (c) 2016-present, iView

From 3ae11e857694b70a572ca1b601d827924c8910ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 11 May 2017 17:17:44 +0800
Subject: [PATCH 28/68] update Cascader

---
 src/components/cascader/cascader.vue | 39 ++++++++++++++++++++++++----
 src/styles/components/cascader.less  | 23 ++++++++++++++++
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index 5931facb..f7111c43 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -3,12 +3,17 @@
         <div :class="[prefixCls + '-rel']" @click="toggleOpen">
             <slot>
                 <i-input
+                    ref="input"
                     :readonly="!filterable"
                     :disabled="disabled"
-                    :value="displayRender"
+                    :value="displayInputRender"
                     @on-change="handleInput"
                     :size="size"
-                    :placeholder="placeholder"></i-input>
+                    :placeholder="inputPlaceholder"></i-input>
+                <div
+                    :class="[prefixCls + '-label']"
+                    v-show="filterable && query === ''"
+                    @click="handleFocus">{{ displayRender }}</div>
                 <Icon type="ios-close" :class="[prefixCls + '-arrow']" v-show="showCloseIcon" @click.native.stop="clearSelect"></Icon>
                 <Icon type="arrow-down-b" :class="[prefixCls + '-arrow']"></Icon>
             </slot>
@@ -47,13 +52,14 @@
     import clickoutside from '../../directives/clickoutside';
     import { oneOf } from '../../utils/assist';
     import Emitter from '../../mixins/emitter';
+    import Locale from '../../mixins/locale';
 
     const prefixCls = 'ivu-cascader';
     const selectPrefixCls = 'ivu-select';
 
     export default {
         name: 'Cascader',
-        mixins: [ Emitter ],
+        mixins: [ Emitter, Locale ],
         components: { iInput, Drop, Icon, Caspanel },
         directives: { clickoutside },
         props: {
@@ -78,8 +84,7 @@
                 default: true
             },
             placeholder: {
-                type: String,
-                default: '请选择'
+                type: String
             },
             size: {
                 validator (value) {
@@ -128,6 +133,7 @@
                     `${prefixCls}`,
                     {
                         [`${prefixCls}-show-clear`]: this.showCloseIcon,
+                        [`${prefixCls}-size-${this.size}`]: !!this.size,
                         [`${prefixCls}-visible`]: this.visible,
                         [`${prefixCls}-disabled`]: this.disabled
                     }
@@ -144,6 +150,19 @@
 
                 return this.renderFormat(label, this.selected);
             },
+            displayInputRender () {
+                return this.filterable ? '' : this.displayRender;
+            },
+            localePlaceholder () {
+                if (this.placeholder === undefined) {
+                    return this.t('i.select.placeholder');
+                } else {
+                    return this.placeholder;
+                }
+            },
+            inputPlaceholder () {
+                return this.filterable && this.currentValue.length ? null : this.localePlaceholder;
+            },
             querySelections () {
                 let selections = [];
                 function getSelections (arr, label, value) {
@@ -226,11 +245,16 @@
                 const item = this.querySelections[index];
 
                 if (item.item.disabled) return false;
+                // todo 还有bug，选完，删除后，失焦，不能回到上次选择的
                 this.query = '';
+                this.$refs.input.currentValue = '';
                 const oldVal = JSON.stringify(this.currentValue);
                 this.currentValue = item.value.split(',');
                 this.emitValue(this.currentValue, oldVal);
                 this.handleClose();
+            },
+            handleFocus () {
+                this.$refs.input.focus();
             }
         },
         created () {
@@ -270,6 +294,11 @@
                     if (this.currentValue.length) {
                         this.updateSelected();
                     }
+                } else {
+                    if (this.filterable) {
+                        this.query = '';
+                        this.$refs.input.currentValue = '';
+                    }
                 }
                 this.$emit('on-visible-change', val);
             },
diff --git a/src/styles/components/cascader.less b/src/styles/components/cascader.less
index 71a160e6..1c8e03d3 100644
--- a/src/styles/components/cascader.less
+++ b/src/styles/components/cascader.less
@@ -19,6 +19,29 @@
         cursor: @cursor-disabled;
     }
 
+    &-label{
+        width: 100%;
+        height: 100%;
+        line-height: 32px;
+        padding: 0 7px;
+        box-sizing: border-box;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        cursor: pointer;
+        font-size: @font-size-small;
+        position: absolute;
+        left: 0;
+        top: 0;
+    }
+    &-size-large &-label{
+        line-height: 36px;
+        font-size: @font-size-base;
+    }
+    &-size-small &-label{
+        line-height: 26px;
+    }
+
     .@{cascader-prefix-cls}-arrow:nth-of-type(1) {
         display: none;
         cursor: pointer;

From 4e23e47c9494d1aa2be79d0fee94c0ab7c591770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 11 May 2017 17:29:44 +0800
Subject: [PATCH 29/68] update Cascader

---
 src/components/cascader/cascader.vue | 9 ++++++---
 src/styles/components/cascader.less  | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index f7111c43..7f4d7888 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -36,7 +36,7 @@
                                     [selectPrefixCls + '-item-disabled']: item.disabled
                                 }]"
                                 v-for="(item, index) in querySelections"
-                                @click="handleSelectItem(index)">{{ item.label }}</li>
+                                @click="handleSelectItem(index)" v-html="item.display"></li>
                         </ul>
                     </div>
                 </div>
@@ -179,6 +179,7 @@
                             selections.push({
                                 label: item.__label,
                                 value: item.__value,
+                                display: item.__label,
                                 item: item,
                                 disabled: !!item.disabled
                             });
@@ -186,7 +187,10 @@
                     }
                 }
                 getSelections(this.data);
-                selections = selections.filter(item => item.label.indexOf(this.query) > -1);
+                selections = selections.filter(item => item.label.indexOf(this.query) > -1).map(item => {
+                    item.display = item.display.replace(new RegExp(this.query, 'g'), `<span>${this.query}</span>`);
+                    return item;
+                });
                 return selections;
             }
         },
@@ -245,7 +249,6 @@
                 const item = this.querySelections[index];
 
                 if (item.item.disabled) return false;
-                // todo 还有bug，选完，删除后，失焦，不能回到上次选择的
                 this.query = '';
                 this.$refs.input.currentValue = '';
                 const oldVal = JSON.stringify(this.currentValue);
diff --git a/src/styles/components/cascader.less b/src/styles/components/cascader.less
index 1c8e03d3..b837a54d 100644
--- a/src/styles/components/cascader.less
+++ b/src/styles/components/cascader.less
@@ -71,6 +71,9 @@
     }
 
     .select-item(@cascader-prefix-cls, @cascader-item-prefix-cls);
+    .ivu-select-item span{
+        color: @error-color;
+    }
 
     &-dropdown{
         padding: 5px 0;

From b9a4026ff748916336635456d6693bfa00ae34b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 11 May 2017 17:38:05 +0800
Subject: [PATCH 30/68] fixed #845

---
 examples/routers/date.vue                     | 24 ++-----------------
 .../date-picker/panel/date-range.vue          |  2 +-
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/examples/routers/date.vue b/examples/routers/date.vue
index 8f17fd8a..924b664b 100644
--- a/examples/routers/date.vue
+++ b/examples/routers/date.vue
@@ -1,34 +1,14 @@
 <template>
-    <div>
-        {{ val1 }}
-        <Date-picker type="datetime" placeholder="选择日期和时间" style="width: 200px"></Date-picker>
-        <Date-picker v-model="val1" type="date" placeholder="选择日期" style="width: 200px"></Date-picker>
-        <Date-picker type="daterange" placement="bottom-end" placeholder="选择日期" style="width: 200px"></Date-picker>
-        <div @click="val1 = '2017-03-02'">change</div>
-    </div>
+    <Date-picker type="daterange" placeholder="选择日期" style="width: 200px"></Date-picker>
 </template>
 <script>
     export default {
-        data () {
-            return {
-                val1: ''
-            }
-        },
-        computed: {
-            ddd () {
-                const date = new Date(this.val1);
-                const year = date.getFullYear();
-                const month = date.getMonth() + 1;
-                const day = date.getDate();
 
-                return `${year}-${month}-${day}`;
-
-            }
-        }
     }
 </script>
 
 
+
 <!--<template>-->
     <!--<row>-->
         <!--<i-col span="12">-->
diff --git a/src/components/date-picker/panel/date-range.vue b/src/components/date-picker/panel/date-range.vue
index e5d7370e..eed084e7 100644
--- a/src/components/date-picker/panel/date-range.vue
+++ b/src/components/date-picker/panel/date-range.vue
@@ -324,7 +324,7 @@
                 if (this[`${direction}CurrentView`] === 'year') {
                     this.$refs[`${direction}YearTable`].nextTenYear();
                 } else if (this[`${direction}CurrentView`] === 'month') {
-                    this[`${direction}TableYear`]--;
+                    this[`${direction}TableYear`]++;
                 } else {
                     const date = this.date;
                     date.setFullYear(date.getFullYear() + 1);

From 29264399e4b28cdce70bfc290d90f1a535488059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 12 May 2017 09:49:36 +0800
Subject: [PATCH 31/68] update Select

---
 src/components/select/select.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 97a87761..a97ce9ee 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -26,7 +26,7 @@
         </div>
         <transition :name="transitionName">
             <Drop v-show="dropVisible" :placement="placement" ref="dropdown">
-                <ul v-show="(notFound && !remote) || (remote && !loading && !options.length)" :class="[prefixCls + '-not-found']"><li>{{ localeNotFoundText }}</li></ul>
+                <ul v-show="notFountShow" :class="[prefixCls + '-not-found']"><li>{{ localeNotFoundText }}</li></ul>
                 <ul v-show="(!notFound && !remote) || (remote && !loading && !notFound)" :class="[prefixCls + '-dropdown-list']"><slot></slot></ul>
                 <ul v-show="loading" :class="[prefixCls + '-loading']">{{ localeLoadingText }}</ul>
             </Drop>
@@ -199,6 +199,10 @@
                 const options = this.$slots.default || [];
                 if (!this.loading && this.remote && this.query === '' && !options.length) status = false;
                 return this.visible && status;
+            },
+            notFountShow () {
+                const options = this.$slots.default || [];
+                return (this.notFound && !this.remote) || (this.remote && !this.loading && !options.length);
             }
         },
         methods: {

From 952ddb518e702ec051eff89c024acb045fe7d97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 12 May 2017 10:23:11 +0800
Subject: [PATCH 32/68] update Cascader

---
 src/components/cascader/cascader.vue | 16 ++++++++++++++--
 src/styles/components/cascader.less  |  9 +++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index 7f4d7888..9a4c0ccd 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -29,7 +29,7 @@
                         :disabled="disabled"
                         :change-on-select="changeOnSelect"
                         :trigger="trigger"></Caspanel>
-                    <div :class="[prefixCls + '-dropdown']" v-show="filterable && query !== ''">
+                    <div :class="[prefixCls + '-dropdown']" v-show="filterable && query !== '' && querySelections.length">
                         <ul :class="[selectPrefixCls + '-dropdown-list']">
                             <li
                                 :class="[selectPrefixCls + '-item', {
@@ -39,6 +39,7 @@
                                 @click="handleSelectItem(index)" v-html="item.display"></li>
                         </ul>
                     </div>
+                    <ul v-show="filterable && query !== '' && !querySelections.length" :class="[prefixCls + '-not-found-tip']"><li>{{ localeNotFoundText }}</li></ul>
                 </div>
             </Drop>
         </transition>
@@ -113,6 +114,9 @@
             filterable: {
                 type: Boolean,
                 default: false
+            },
+            notFoundText: {
+                type: String
             }
         },
         data () {
@@ -135,7 +139,8 @@
                         [`${prefixCls}-show-clear`]: this.showCloseIcon,
                         [`${prefixCls}-size-${this.size}`]: !!this.size,
                         [`${prefixCls}-visible`]: this.visible,
-                        [`${prefixCls}-disabled`]: this.disabled
+                        [`${prefixCls}-disabled`]: this.disabled,
+                        [`${prefixCls}-not-found`]: this.filterable && this.query !== '' && !this.querySelections.length
                     }
                 ];
             },
@@ -163,6 +168,13 @@
             inputPlaceholder () {
                 return this.filterable && this.currentValue.length ? null : this.localePlaceholder;
             },
+            localeNotFoundText () {
+                if (this.notFoundText === undefined) {
+                    return this.t('i.select.noMatch');
+                } else {
+                    return this.notFoundText;
+                }
+            },
             querySelections () {
                 let selections = [];
                 function getSelections (arr, label, value) {
diff --git a/src/styles/components/cascader.less b/src/styles/components/cascader.less
index b837a54d..6cd2049d 100644
--- a/src/styles/components/cascader.less
+++ b/src/styles/components/cascader.less
@@ -79,6 +79,15 @@
         padding: 5px 0;
     }
 
+    &-not-found-tip{
+        padding: 5px 0;
+        text-align: center;
+        color: @btn-disable-color;
+    }
+    &-not-found .@{select-dropdown-prefix-cls} {
+        width: 100%;
+    }
+
     &-menu{
         display: inline-block;
         min-width: 100px;

From 638590f55b77461063d64ffe3503a3d9a9114d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 12 May 2017 10:48:23 +0800
Subject: [PATCH 33/68] update Cascader

---
 src/styles/components/cascader.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/components/cascader.less b/src/styles/components/cascader.less
index 6cd2049d..630e5251 100644
--- a/src/styles/components/cascader.less
+++ b/src/styles/components/cascader.less
@@ -85,7 +85,7 @@
         color: @btn-disable-color;
     }
     &-not-found .@{select-dropdown-prefix-cls} {
-        width: 100%;
+        width: inherit;
     }
 
     &-menu{

From 78d8ea4d4a0271b1cd46e835e5c20bf4d6ea71e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 12 May 2017 15:45:28 +0800
Subject: [PATCH 34/68] release 2.0.0-rc.13

---
 package.json                  | 2 +-
 src/components/table/cell.vue | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 55c68bde..321a5212 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iview",
-  "version": "2.0.0-rc.12",
+  "version": "2.0.0-rc.13",
   "title": "iView",
   "description": "A high quality  UI components Library with Vue.js",
   "homepage": "http://www.iviewui.com",
diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index 7efb951f..5c034bdc 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -61,7 +61,11 @@
                         const component = new Vue({
                             functional: true,
                             render: (h) => {
-                                return this.column.render(h, this.row, this.column, this.index);
+                                return this.column.render(h, {
+                                    row: this.row,
+                                    column: this.column,
+                                    index: this.index
+                                });
                             }
                         });
                         const Cell = component.$mount();

From c70ff0f294813abb05d1caaf8aa4b3dd395ed455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 15 May 2017 09:16:30 +0800
Subject: [PATCH 35/68] fixed #915

---
 examples/routers/select.vue      | 9 ++++++---
 src/components/select/select.vue | 9 +++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 301c753a..725d6638 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -2,7 +2,7 @@
     <Row>
         <i-col span="4">{{model}}</i-col>
         <i-col span="8">
-            <i-select v-model="model" @input="handleInput" multiple filterable remote :remote-method="remoteMethod" :loading="loading" clearable>
+            <i-select v-model="model" @input="handleInput" filterable remote :remote-method="remoteMethod" :loading="loading" clearable>
                 <i-option v-for="option in options" :value="option.value" :key="new Date()">{{option.label}}</i-option>
             </i-select>
         </i-col>
@@ -13,7 +13,7 @@
     export default {
         data () {
             return {
-                model: [],
+                model: '',
                 options: [
 
                 ],
@@ -93,7 +93,10 @@
         },
         mounted () {
             this.list = this.states.map(item => {
-                return { value: item, label: item };
+                return {
+                    value: item,
+                    label: 'L ' + item
+                };
             });
         }
     }
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index a97ce9ee..c2274093 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -118,6 +118,7 @@
                 selectedMultiple: [],
                 focusIndex: 0,
                 query: '',
+                lastQuery: '',
                 selectToChangeQuery: false,    // when select an option, set this first and set query, because query is watching, it will emit event
                 inputLength: 20,
                 notFound: false,
@@ -528,10 +529,10 @@
                                     this.query = child.label === undefined ? child.searchLabel : child.label;
                                 }
                             });
-                            // 如果删除了搜索词，下拉列表也情况了，所以强制调用一次remoteMethod
-                            if (this.remote) {
+                            // 如果删除了搜索词，下拉列表也清空了，所以强制调用一次remoteMethod
+                            if (this.remote && this.query !== this.lastQuery) {
                                 this.$nextTick(() => {
-                                    this.query = model;
+                                    this.query = this.lastQuery;
                                 });
                             }
                         } else {
@@ -645,7 +646,7 @@
                             this.findChild((child) => {
                                 if (child.value === value) {
                                     if (this.query !== '') this.selectToChangeQuery = true;
-                                    this.query = child.label === undefined ? child.searchLabel : child.label;
+                                    this.lastQuery = this.query = child.label === undefined ? child.searchLabel : child.label;
                                 }
                             });
                         }

From 195d4af514b1f5f17f053b581fc3a2f1d9497a9a Mon Sep 17 00:00:00 2001
From: Rui Ma <xjmarui@gmail.com>
Date: Mon, 15 May 2017 15:59:23 +0800
Subject: [PATCH 36/68] click transfer's title to toggle select status

---
 src/components/transfer/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/transfer/list.vue b/src/components/transfer/list.vue
index 3e12bdf5..e211d5cb 100644
--- a/src/components/transfer/list.vue
+++ b/src/components/transfer/list.vue
@@ -2,7 +2,7 @@
     <div :class="classes" :style="style">
         <div :class="prefixCls + '-header'">
             <Checkbox :value="checkedAll" :disabled="checkedAllDisabled" @on-change="toggleSelectAll"></Checkbox>
-            <span>{{ title }}</span>
+            <span @click="toggleSelectAll(!checkedAll)">{{ title }}</span>
             <span :class="prefixCls + '-header-count'">{{ count }}</span>
         </div>
         <div :class="bodyClasses">

From f031f4656a9ffb1794ebe2186e00eda4b39c9a1a Mon Sep 17 00:00:00 2001
From: Rui Ma <xjmarui@gmail.com>
Date: Mon, 15 May 2017 16:37:12 +0800
Subject: [PATCH 37/68] `style` cannot be used as component prop.

---
 src/components/transfer/list.vue     | 4 ++--
 src/components/transfer/transfer.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/transfer/list.vue b/src/components/transfer/list.vue
index 3e12bdf5..331a4080 100644
--- a/src/components/transfer/list.vue
+++ b/src/components/transfer/list.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="classes" :style="style">
+    <div :class="classes" :style="listStyle">
         <div :class="prefixCls + '-header'">
             <Checkbox :value="checkedAll" :disabled="checkedAllDisabled" @on-change="toggleSelectAll"></Checkbox>
             <span>{{ title }}</span>
@@ -40,7 +40,7 @@
             data: Array,
             renderFormat: Function,
             checkedKeys: Array,
-            style: Object,
+            listStyle: Object,
             title: [String, Number],
             filterable: Boolean,
             filterPlaceholder: String,
diff --git a/src/components/transfer/transfer.vue b/src/components/transfer/transfer.vue
index d0006f1a..120480c5 100644
--- a/src/components/transfer/transfer.vue
+++ b/src/components/transfer/transfer.vue
@@ -39,7 +39,7 @@
                         renderFormat: this.renderFormat,
                         checkedKeys: this.leftCheckedKeys,
                         validKeysCount: this.leftValidKeysCount,
-                        style: this.listStyle,
+                        listStyle: this.listStyle,
                         title: this.localeTitles[0],
                         filterable: this.filterable,
                         filterPlaceholder: this.localeFilterPlaceholder,
@@ -68,7 +68,7 @@
                         renderFormat: this.renderFormat,
                         checkedKeys: this.rightCheckedKeys,
                         validKeysCount: this.rightValidKeysCount,
-                        style: this.listStyle,
+                        listStyle: this.listStyle,
                         title: this.localeTitles[1],
                         filterable: this.filterable,
                         filterPlaceholder: this.localeFilterPlaceholder,

From ddc35c9aaaa0357d8f7b30185c92019ca4cc7322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 18 May 2017 16:01:53 +0800
Subject: [PATCH 38/68] fixed #952

---
 examples/routers/select.vue      |  6 ++++--
 src/components/select/select.vue | 27 ++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 725d6638..6cea6dee 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -2,7 +2,7 @@
     <Row>
         <i-col span="4">{{model}}</i-col>
         <i-col span="8">
-            <i-select v-model="model" @input="handleInput" filterable remote :remote-method="remoteMethod" :loading="loading" clearable>
+            <i-select v-model="model" :label="['L Alabama', 'L Hawaii']" multiple @input="handleInput" filterable remote :remote-method="remoteMethod" :loading="loading" clearable>
                 <i-option v-for="option in options" :value="option.value" :key="new Date()">{{option.label}}</i-option>
             </i-select>
         </i-col>
@@ -13,7 +13,8 @@
     export default {
         data () {
             return {
-                model: '',
+//                model: 'Alabama',
+                model: ['Alabama', 'Hawaii'],
                 options: [
 
                 ],
@@ -74,6 +75,7 @@
                 ]
             },
             remoteMethod (query) {
+                console.log(13)
                 if (query !== '') {
                     this.loading = true;
                     setTimeout(() => {
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index c2274093..368e2117 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -53,6 +53,10 @@
                 type: [String, Number, Array],
                 default: ''
             },
+            label: {
+                type: [String, Number, Array],
+                default: ''
+            },
             multiple: {
                 type: Boolean,
                 default: false
@@ -303,7 +307,6 @@
             },
             updateMultipleSelected (init = false, slot = false) {
                 if (this.multiple && Array.isArray(this.model)) {
-                    // todo 这里的 label 有问题，另删除字符时也有问题
                     let selected = this.remote ? this.selectedMultiple : [];
 
                     for (let i = 0; i < this.model.length; i++) {
@@ -584,6 +587,23 @@
         },
         mounted () {
             this.modelToQuery();
+            // 处理 remote 初始值
+            if (this.remote) {
+                if (!this.multiple && this.model !== '') {
+                    this.selectToChangeQuery = true;
+                    if (this.label === '') this.label = this.model;
+                    this.lastQuery = this.label;
+                    this.query = this.label;
+                } else if (this.multiple && this.model.length) {
+                    if (this.label.length !== this.model.length) this.label = this.model;
+                    this.selectedMultiple = this.model.map((item, index) => {
+                        return {
+                            value: item,
+                            label: this.label[index]
+                        };
+                    });
+                }
+            }
             this.$nextTick(() => {
                 this.broadcastQuery('');
             });
@@ -687,6 +707,11 @@
                             this.findChild(child => {
                                 child.selected = this.multiple ? this.model.indexOf(child.value) > -1 : this.model === child.value;
                             });
+                            // remote下，设置了默认值，第一次打开时，搜索一次
+                            const options = this.$slots.default || [];
+                            if (this.query !== '' && !options.length) {
+                                this.remoteMethod(this.query);
+                            }
                         }
                     }
                     this.broadcast('Drop', 'on-update-popper');

From a28bc982af1164730d074209bc131ecbcbf2e2a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 18 May 2017 16:34:09 +0800
Subject: [PATCH 39/68] update Cascader style

---
 examples/routers/cascader.vue       | 40 +++++++++++++++++++++++++----
 src/styles/components/cascader.less |  8 ++++++
 src/styles/components/select.less   |  3 +++
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue
index 09e14d5d..1a843a8d 100644
--- a/examples/routers/cascader.vue
+++ b/examples/routers/cascader.vue
@@ -5,7 +5,7 @@
             {{ v1 }}
         </i-col>
         <i-col span="4">
-            <Cascader :data="data3" filterable v-model="v1"></Cascader>
+            <Cascader :data="data2" filterable v-model="v1" style="width: 200px;"></Cascader>
             <!--<Cascader :data="data2" filterable v-model="v1" :loadData="loadData"></Cascader>-->
         </i-col>
     </Row>
@@ -28,10 +28,40 @@
                         children: [{
                             value: 'nanjing',
                             label: '南京',
-                            children: [{
-                                value: 'zhonghuamen',
-                                label: '中华门'
-                            }]
+                            children: [
+                                {
+                                    value: 'zhonghuamen',
+                                    label: '中华门'
+                                },
+                                {
+                                    value: 'v1',
+                                    label: 'v111'
+                                },
+                                {
+                                    value: 'v2',
+                                    label: 'v2222'
+                                },
+                                {
+                                    value: 'v3',
+                                    label: 'v333'
+                                },
+                                {
+                                    value: 'v4',
+                                    label: 'v4444'
+                                },
+                                {
+                                    value: 'v5',
+                                    label: 'v555'
+                                },
+                                {
+                                    value: 'v6',
+                                    label: 'v666'
+                                },
+                                {
+                                    value: 'v7',
+                                    label: 'v777'
+                                }
+                            ]
                         }]
                     }
                 ],
diff --git a/src/styles/components/cascader.less b/src/styles/components/cascader.less
index 630e5251..d5726a5b 100644
--- a/src/styles/components/cascader.less
+++ b/src/styles/components/cascader.less
@@ -77,12 +77,20 @@
 
     &-dropdown{
         padding: 5px 0;
+        .@{select-dropdown-prefix-cls}-list{
+            max-height: 190px;
+            box-sizing: border-box;
+            overflow: auto;
+        }
     }
 
     &-not-found-tip{
         padding: 5px 0;
         text-align: center;
         color: @btn-disable-color;
+        li:not([class^=ivu-]){
+            margin-bottom: 0;
+        }
     }
     &-not-found .@{select-dropdown-prefix-cls} {
         width: inherit;
diff --git a/src/styles/components/select.less b/src/styles/components/select.less
index 2227c96a..7a031922 100644
--- a/src/styles/components/select.less
+++ b/src/styles/components/select.less
@@ -173,6 +173,9 @@
     &-not-found{
         text-align: center;
         color: @btn-disable-color;
+        li:not([class^=ivu-]){
+            margin-bottom: 0;
+        }
     }
     &-loading{
         text-align: center;

From 933afc7a2ce26c15fb9996b8a15d8abc9f2106a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 18 May 2017 18:23:39 +0800
Subject: [PATCH 40/68] fixed #950

---
 examples/routers/cascader.vue        | 289 ++++++++++++++++-----------
 src/components/cascader/cascader.vue |  35 +++-
 src/components/cascader/caspanel.vue |   1 +
 3 files changed, 210 insertions(+), 115 deletions(-)

diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue
index 1a843a8d..26da6993 100644
--- a/examples/routers/cascader.vue
+++ b/examples/routers/cascader.vue
@@ -1,134 +1,193 @@
+<!--<template>-->
+    <!--<Row>-->
+        <!--<i-col span="4">-->
+            <!--<Button @click="handleLoad">load</Button>-->
+            <!--{{ v1 }}-->
+        <!--</i-col>-->
+        <!--<i-col span="4">-->
+            <!--<Cascader :data="data2" filterable v-model="v1" style="width: 200px;"></Cascader>-->
+            <!--&lt;!&ndash;<Cascader :data="data2" filterable v-model="v1" :loadData="loadData"></Cascader>&ndash;&gt;-->
+        <!--</i-col>-->
+    <!--</Row>-->
+<!--</template>-->
+<!--<script>-->
+    <!--export default {-->
+        <!--data () {-->
+            <!--return {-->
+                <!--v1: [],-->
+                <!--data2: [-->
+                    <!--{-->
+                        <!--value: 'zhejiang',-->
+                        <!--label: '浙江',-->
+                        <!--children: [],-->
+                        <!--loading: false-->
+                    <!--},-->
+                    <!--{-->
+                        <!--value: 'jiangsu',-->
+                        <!--label: '江苏',-->
+                        <!--children: [{-->
+                            <!--value: 'nanjing',-->
+                            <!--label: '南京',-->
+                            <!--children: [-->
+                                <!--{-->
+                                    <!--value: 'zhonghuamen',-->
+                                    <!--label: '中华门'-->
+                                <!--},-->
+                                <!--{-->
+                                    <!--value: 'v1',-->
+                                    <!--label: 'v111'-->
+                                <!--},-->
+                                <!--{-->
+                                    <!--value: 'v2',-->
+                                    <!--label: 'v2222'-->
+                                <!--},-->
+                                <!--{-->
+                                    <!--value: 'v3',-->
+                                    <!--label: 'v333'-->
+                                <!--},-->
+                                <!--{-->
+                                    <!--value: 'v4',-->
+                                    <!--label: 'v4444'-->
+                                <!--},-->
+                                <!--{-->
+                                    <!--value: 'v5',-->
+                                    <!--label: 'v555'-->
+                                <!--},-->
+                                <!--{-->
+                                    <!--value: 'v6',-->
+                                    <!--label: 'v666'-->
+                                <!--},-->
+                                <!--{-->
+                                    <!--value: 'v7',-->
+                                    <!--label: 'v777'-->
+                                <!--}-->
+                            <!--]-->
+                        <!--}]-->
+                    <!--}-->
+                <!--],-->
+                <!--data3: [{-->
+                    <!--value: 'beijing',-->
+                    <!--label: '北京',-->
+                    <!--children: [-->
+                        <!--{-->
+                            <!--value: 'gugong',-->
+                            <!--label: '故宫'-->
+                        <!--},-->
+                        <!--{-->
+                            <!--value: 'tiantan',-->
+                            <!--label: '天坛'-->
+                        <!--},-->
+                        <!--{-->
+                            <!--value: 'wangfujing',-->
+                            <!--label: '王府井'-->
+                        <!--}-->
+                    <!--]-->
+                <!--}, {-->
+                    <!--value: 'jiangsu',-->
+                    <!--label: '江苏',-->
+                    <!--children: [-->
+                        <!--{-->
+                            <!--value: 'nanjing',-->
+                            <!--label: '南京',-->
+                            <!--children: [-->
+                                <!--{-->
+                                    <!--value: 'fuzimiao',-->
+                                    <!--label: '夫子庙',-->
+                                <!--}-->
+                            <!--]-->
+                        <!--},-->
+                        <!--{-->
+                            <!--value: 'suzhou',-->
+                            <!--label: '苏州',-->
+                            <!--children: [-->
+                                <!--{-->
+                                    <!--disabled: true,-->
+                                    <!--value: 'zhuozhengyuan',-->
+                                    <!--label: '拙政园',-->
+                                <!--},-->
+                                <!--{-->
+                                    <!--value: 'shizilin',-->
+                                    <!--label: '狮子林',-->
+                                <!--}-->
+                            <!--]-->
+                        <!--}-->
+                    <!--],-->
+                <!--}]-->
+            <!--}-->
+        <!--},-->
+        <!--methods: {-->
+            <!--handleLoad () {-->
+                <!--this.data2[0].loading = !this.data2[0].loading;-->
+            <!--},-->
+            <!--loadData (item, cb) {-->
+                <!--item.loading = true;-->
+                <!--setTimeout(() => {-->
+                    <!--if (item.value === 'zhejiang') {-->
+                        <!--item.children = [-->
+                            <!--{-->
+                                <!--value: 'hangzhou',-->
+                                <!--label: '杭州',-->
+                                <!--loading: false,-->
+                                <!--children: []-->
+                            <!--}-->
+                        <!--];-->
+                    <!--} else if (item.value === 'hangzhou') {-->
+                        <!--item.children = [-->
+                            <!--{-->
+                                <!--value: 'ali',-->
+                                <!--label: '阿里巴巴'-->
+                            <!--}-->
+                        <!--];-->
+                    <!--}-->
+                    <!--item.loading = false;-->
+                    <!--cb();-->
+                <!--}, 1000);-->
+            <!--}-->
+        <!--}-->
+    <!--}-->
+<!--</script>-->
+
+
 <template>
-    <Row>
-        <i-col span="4">
-            <Button @click="handleLoad">load</Button>
-            {{ v1 }}
-        </i-col>
-        <i-col span="4">
-            <Cascader :data="data2" filterable v-model="v1" style="width: 200px;"></Cascader>
-            <!--<Cascader :data="data2" filterable v-model="v1" :loadData="loadData"></Cascader>-->
-        </i-col>
-    </Row>
+    <Cascader :data="data4" :load-data="loadData" style="width: 200px;"></Cascader>
 </template>
 <script>
     export default {
         data () {
             return {
-                v1: [],
-                data2: [
+                data4: [
                     {
-                        value: 'zhejiang',
-                        label: '浙江',
+                        value: 'beijing',
+                        label: '北京',
                         children: [],
                         loading: false
                     },
                     {
-                        value: 'jiangsu',
-                        label: '江苏',
-                        children: [{
-                            value: 'nanjing',
-                            label: '南京',
-                            children: [
-                                {
-                                    value: 'zhonghuamen',
-                                    label: '中华门'
-                                },
-                                {
-                                    value: 'v1',
-                                    label: 'v111'
-                                },
-                                {
-                                    value: 'v2',
-                                    label: 'v2222'
-                                },
-                                {
-                                    value: 'v3',
-                                    label: 'v333'
-                                },
-                                {
-                                    value: 'v4',
-                                    label: 'v4444'
-                                },
-                                {
-                                    value: 'v5',
-                                    label: 'v555'
-                                },
-                                {
-                                    value: 'v6',
-                                    label: 'v666'
-                                },
-                                {
-                                    value: 'v7',
-                                    label: 'v777'
-                                }
-                            ]
-                        }]
+                        value: 'hangzhou',
+                        label: '杭州',
+                        children: [],
+                        loading:false
                     }
-                ],
-                data3: [{
-                    value: 'beijing',
-                    label: '北京',
-                    children: [
-                        {
-                            value: 'gugong',
-                            label: '故宫'
-                        },
-                        {
-                            value: 'tiantan',
-                            label: '天坛'
-                        },
-                        {
-                            value: 'wangfujing',
-                            label: '王府井'
-                        }
-                    ]
-                }, {
-                    value: 'jiangsu',
-                    label: '江苏',
-                    children: [
-                        {
-                            value: 'nanjing',
-                            label: '南京',
-                            children: [
-                                {
-                                    value: 'fuzimiao',
-                                    label: '夫子庙',
-                                }
-                            ]
-                        },
-                        {
-                            value: 'suzhou',
-                            label: '苏州',
-                            children: [
-                                {
-                                    disabled: true,
-                                    value: 'zhuozhengyuan',
-                                    label: '拙政园',
-                                },
-                                {
-                                    value: 'shizilin',
-                                    label: '狮子林',
-                                }
-                            ]
-                        }
-                    ],
-                }]
+                ]
             }
         },
         methods: {
-            handleLoad () {
-                this.data2[0].loading = !this.data2[0].loading;
-            },
-            loadData (item, cb) {
+            loadData (item, callback) {
                 item.loading = true;
                 setTimeout(() => {
-                    if (item.value === 'zhejiang') {
+                    if (item.value === 'beijing') {
                         item.children = [
                             {
-                                value: 'hangzhou',
-                                label: '杭州',
-                                loading: false,
-                                children: []
+                                value: 'talkingdata',
+                                label: 'TalkingData'
+                            },
+                            {
+                                value: 'baidu',
+                                label: '百度'
+                            },
+                            {
+                                value: 'sina',
+                                label: '新浪'
                             }
                         ];
                     } else if (item.value === 'hangzhou') {
@@ -136,11 +195,15 @@
                             {
                                 value: 'ali',
                                 label: '阿里巴巴'
+                            },
+                            {
+                                value: '163',
+                                label: '网易'
                             }
                         ];
                     }
                     item.loading = false;
-                    cb();
+                    callback();
                 }, 1000);
             }
         }
diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index 9a4c0ccd..926b4bff 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -128,7 +128,9 @@
                 tmpSelected: [],
                 updatingValue: false,    // to fix set value in changeOnSelect type
                 currentValue: this.value,
-                query: ''
+                query: '',
+                validDataStr: '',
+                isLoadedChildren: false    // #950
             };
         },
         computed: {
@@ -270,9 +272,31 @@
             },
             handleFocus () {
                 this.$refs.input.focus();
+            },
+            // 排除 loading 后的 data，避免重复触发 updateSelect
+            getValidData (data) {
+                function deleteData (item) {
+                    const new_item = Object.assign({}, item);
+                    if ('loading' in new_item) {
+                        delete new_item.loading;
+                    }
+                    if ('__value' in new_item) {
+                        delete new_item.__value;
+                    }
+                    if ('__label' in new_item) {
+                        delete new_item.__label;
+                    }
+                    if ('children' in new_item && new_item.children.length) {
+                        new_item.children = new_item.children.map(i => deleteData(i));
+                    }
+                    return new_item;
+                }
+
+                return data.map(item => deleteData(item));
             }
         },
         created () {
+            this.validDataStr = JSON.stringify(this.getValidData(this.data));
             this.$on('on-result-change', (params) => {
                 // lastValue: is click the final val
                 // fromInit: is this emit from update value
@@ -332,7 +356,14 @@
             data: {
                 deep: true,
                 handler () {
-                    this.$nextTick(() => this.updateSelected());
+                    const validDataStr = JSON.stringify(this.getValidData(this.data));
+                    if (validDataStr !== this.validDataStr) {
+                        this.validDataStr = validDataStr;
+                        if (!this.isLoadedChildren) {
+                            this.$nextTick(() => this.updateSelected());
+                        }
+                        this.isLoadedChildren = false;
+                    }
                 }
             }
         }
diff --git a/src/components/cascader/caspanel.vue b/src/components/cascader/caspanel.vue
index 296c4d08..5c36499d 100644
--- a/src/components/cascader/caspanel.vue
+++ b/src/components/cascader/caspanel.vue
@@ -61,6 +61,7 @@
                     const cascader = findComponentUpward(this, 'Cascader');
                     if (cascader && cascader.loadData) {
                         cascader.loadData(item, () => {
+                            cascader.isLoadedChildren = true;
                             this.handleTriggerItem(item);
                         });
                         return;

From 03a904529d5cac75faa7cbe0d5c3a61dba7543fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 19 May 2017 10:08:19 +0800
Subject: [PATCH 41/68] update Cascader

---
 examples/routers/cascader.vue        | 110 +++++++++++++++++++++------
 src/components/cascader/caspanel.vue |  11 ++-
 2 files changed, 93 insertions(+), 28 deletions(-)

diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue
index 26da6993..0f3116fc 100644
--- a/examples/routers/cascader.vue
+++ b/examples/routers/cascader.vue
@@ -147,9 +147,78 @@
     <!--}-->
 <!--</script>-->
 
+<!--<template>-->
+    <!--<Cascader :data="data4" :load-data="loadData"></Cascader>-->
+<!--</template>-->
+<!--<script>-->
+    <!--export default {-->
+        <!--data () {-->
+            <!--return {-->
+                <!--data4: [-->
+                    <!--{-->
+                        <!--value: 'beijing',-->
+                        <!--label: '北京',-->
+                        <!--children: [],-->
+                        <!--loading: false-->
+                    <!--},-->
+                    <!--{-->
+                        <!--value: 'hangzhou',-->
+                        <!--label: '杭州',-->
+                        <!--children: [],-->
+                        <!--loading:false-->
+                    <!--}-->
+                <!--]-->
+            <!--}-->
+        <!--},-->
+        <!--methods: {-->
+            <!--loadData (item, callback) {-->
+                <!--item.loading = true;-->
+                <!--setTimeout(() => {-->
+                    <!--if (item.value === 'beijing') {-->
+                        <!--item.children = [-->
+                            <!--{-->
+                                <!--value: 'talkingdata',-->
+                                <!--label: 'TalkingData'-->
+                            <!--},-->
+                            <!--{-->
+                                <!--value: 'baidu',-->
+                                <!--label: '百度'-->
+                            <!--},-->
+                            <!--{-->
+                                <!--value: 'sina',-->
+                                <!--label: '新浪'-->
+                            <!--}-->
+                        <!--];-->
+                    <!--} else if (item.value === 'hangzhou') {-->
+                        <!--item.children = [-->
+                            <!--{-->
+                                <!--value: 'ali',-->
+                                <!--label: '阿里巴巴'-->
+                            <!--},-->
+                            <!--{-->
+                                <!--value: '163',-->
+                                <!--label: '网易'-->
+                            <!--}-->
+                        <!--];-->
+                    <!--}-->
+                    <!--item.loading = false;-->
+                    <!--callback();-->
+                <!--}, 1000);-->
+            <!--}-->
+        <!--}-->
+    <!--}-->
+<!--</script>-->
+
+
 
 <template>
-    <Cascader :data="data4" :load-data="loadData" style="width: 200px;"></Cascader>
+    <!--<Cascader :data="data4" :load-data="loadData" style="width: 200px;"></Cascader>-->
+    <div>
+        <Cascader :data="data" v-model="model" :load-data="loadData"></Cascader>
+        <ul>
+            <li v-for="(log, idx) in logs" :key="idx">{{log}}</li>
+        </ul>
+    </div>
 </template>
 <script>
     export default {
@@ -168,44 +237,37 @@
                         children: [],
                         loading:false
                     }
-                ]
+                ],
+                data: [],
+                model: [340000, 340100, 340104],
+                count: 1,
+                logs: []
             }
         },
         methods: {
             loadData (item, callback) {
+                this.logs.push(`第${this.count}次请求: ${item.value}`)
+                this.count++
                 item.loading = true;
                 setTimeout(() => {
-                    if (item.value === 'beijing') {
+                    if (item.value === 340000) {
                         item.children = [
-                            {
-                                value: 'talkingdata',
-                                label: 'TalkingData'
-                            },
-                            {
-                                value: 'baidu',
-                                label: '百度'
-                            },
-                            {
-                                value: 'sina',
-                                label: '新浪'
-                            }
+                            {value: 340100, label: "合肥市", children: [], loading: false}
                         ];
-                    } else if (item.value === 'hangzhou') {
+                    } else if (item.value === 340100) {
                         item.children = [
-                            {
-                                value: 'ali',
-                                label: '阿里巴巴'
-                            },
-                            {
-                                value: '163',
-                                label: '网易'
-                            }
+                            {value: 340104, label: "蜀山区"},
+                            {value: 340111, label: "包河区"}
                         ];
                     }
                     item.loading = false;
                     callback();
                 }, 1000);
             }
+        },
+        mounted() {
+            this.data = [{value: 340000, label: "安徽省", children: [], loading: false}];
         }
     }
 </script>
+
diff --git a/src/components/cascader/caspanel.vue b/src/components/cascader/caspanel.vue
index 5c36499d..abc5251b 100644
--- a/src/components/cascader/caspanel.vue
+++ b/src/components/cascader/caspanel.vue
@@ -48,20 +48,23 @@
         methods: {
             handleClickItem (item) {
                 if (this.trigger !== 'click' && item.children) return;
-                this.handleTriggerItem(item);
+                this.handleTriggerItem(item, false, true);
             },
             handleHoverItem (item) {
                 if (this.trigger !== 'hover' || !item.children) return;
-                this.handleTriggerItem(item);
+                this.handleTriggerItem(item, false, true);
             },
-            handleTriggerItem (item, fromInit = false) {
+            handleTriggerItem (item, fromInit = false, fromUser = false) {
                 if (item.disabled) return;
 
                 if (item.loading !== undefined && !item.children.length) {
                     const cascader = findComponentUpward(this, 'Cascader');
                     if (cascader && cascader.loadData) {
                         cascader.loadData(item, () => {
-                            cascader.isLoadedChildren = true;
+                            // todo
+                            if (fromUser) {
+                                cascader.isLoadedChildren = true;
+                            }
                             this.handleTriggerItem(item);
                         });
                         return;

From 219e5c925147a29f858353c2c4297262b82e86b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 19 May 2017 10:49:47 +0800
Subject: [PATCH 42/68] fixed #957

---
 examples/routers/select.vue      | 247 +++++++++++++++++++------------
 src/components/select/select.vue |   6 +
 2 files changed, 160 insertions(+), 93 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 6cea6dee..b2986b89 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -1,105 +1,166 @@
-<template>
-    <Row>
-        <i-col span="4">{{model}}</i-col>
-        <i-col span="8">
-            <i-select v-model="model" :label="['L Alabama', 'L Hawaii']" multiple @input="handleInput" filterable remote :remote-method="remoteMethod" :loading="loading" clearable>
-                <i-option v-for="option in options" :value="option.value" :key="new Date()">{{option.label}}</i-option>
-            </i-select>
-        </i-col>
-    </Row>
-</template>
+<!--<template>-->
+    <!--<Row>-->
+        <!--<i-col span="4">{{model}}</i-col>-->
+        <!--<i-col span="8">-->
+            <!--<i-select v-model="model" :label="['L Alabama', 'L Hawaii']" multiple @input="handleInput" filterable remote :remote-method="remoteMethod" :loading="loading" clearable>-->
+                <!--<i-option v-for="option in options" :value="option.value" :key="new Date()">{{option.label}}</i-option>-->
+            <!--</i-select>-->
+        <!--</i-col>-->
+    <!--</Row>-->
+<!--</template>-->
 
+<!--<script>-->
+    <!--export default {-->
+        <!--data () {-->
+            <!--return {-->
+<!--//                model: 'Alabama',-->
+                <!--model: ['Alabama', 'Hawaii'],-->
+                <!--options: [-->
+
+                <!--],-->
+                <!--list: [],-->
+                <!--loading: false,-->
+                <!--states: ["Al", "Alabama", "Alaska", "Arizona",-->
+                    <!--"Arkansas", "California", "Colorado",-->
+                    <!--"Connecticut", "Delaware", "Florida",-->
+                    <!--"Georgia", "Hawaii", "Idaho", "Illinois",-->
+                    <!--"Indiana", "Iowa", "Kansas", "Kentucky",-->
+                    <!--"Louisiana", "Maine", "Maryland",-->
+                    <!--"Massachusetts", "Michigan", "Minnesota",-->
+                    <!--"Mississippi", "Missouri", "Montana",-->
+                    <!--"Nebraska", "Nevada", "New Hampshire",-->
+                    <!--"New Jersey", "New Mexico", "New York",-->
+                    <!--"North Carolina", "North Dakota", "Ohio",-->
+                    <!--"Oklahoma", "Oregon", "Pennsylvania",-->
+                    <!--"Rhode Island", "South Carolina",-->
+                    <!--"South Dakota", "Tennessee", "Texas",-->
+                    <!--"Utah", "Vermont", "Virginia",-->
+                    <!--"Washington", "West Virginia", "Wisconsin",-->
+                    <!--"Wyoming"]-->
+            <!--}-->
+        <!--},-->
+        <!--mounted () {-->
+            <!--this.options = [-->
+<!--//                {-->
+<!--//                    label: '全部',-->
+<!--//                    value: 0-->
+<!--//                },{-->
+<!--//                    label: '苹果',-->
+<!--//                    value: 1-->
+<!--//                },{-->
+<!--//                    label: '香蕉',-->
+<!--//                    value: 2-->
+<!--//                },{-->
+<!--//                    label: '西瓜',-->
+<!--//                    value: 3-->
+<!--//                }-->
+            <!--];-->
+        <!--},-->
+        <!--methods: {-->
+            <!--handleAdd () {-->
+                <!--this.options = [-->
+                    <!--{-->
+                        <!--label: '全部',-->
+                        <!--value: 0-->
+                    <!--},{-->
+                        <!--label: '苹果',-->
+                        <!--value: 1-->
+                    <!--},{-->
+                        <!--label: '香蕉',-->
+                        <!--value: 2-->
+                    <!--},{-->
+                        <!--label: '西瓜',-->
+                        <!--value: 3-->
+                    <!--}-->
+                <!--]-->
+            <!--},-->
+            <!--remoteMethod (query) {-->
+                <!--console.log(13)-->
+                <!--if (query !== '') {-->
+                    <!--this.loading = true;-->
+                    <!--setTimeout(() => {-->
+                        <!--this.loading = false;-->
+                        <!--this.options = this.list.filter(item => {-->
+                            <!--return item.label.toLowerCase()-->
+                                    <!--.indexOf(query.toLowerCase()) > -1;-->
+                        <!--});-->
+                    <!--}, 500);-->
+                <!--} else {-->
+                    <!--this.options = [];-->
+                <!--}-->
+            <!--},-->
+            <!--handleInput () {-->
+<!--//                console.log(1)-->
+            <!--}-->
+        <!--},-->
+        <!--mounted () {-->
+            <!--this.list = this.states.map(item => {-->
+                <!--return {-->
+                    <!--value: item,-->
+                    <!--label: 'L ' + item-->
+                <!--};-->
+            <!--});-->
+        <!--}-->
+    <!--}-->
+<!--</script>-->
+
+
+<template>
+    <div>
+        <Row style="width: 400px;">
+            <i-col span="12" style="padding-right:10px">
+                <Select v-model="model11" filterable>
+                    <Option v-for="item in cityList" :value="item.value" :key="item">{{ item.label }}</Option>
+                </Select>
+            </i-col>
+            <i-col span="12">
+                <Select v-model="model12" filterable multiple>
+                    <Option v-for="item in cityList" :value="item.value" :key="item">{{ item.label }}</Option>
+                </Select>
+            </i-col>
+        </Row>
+        <Button @click="handleSet">set</Button>
+    </div>
+</template>
 <script>
     export default {
         data () {
             return {
-//                model: 'Alabama',
-                model: ['Alabama', 'Hawaii'],
-                options: [
-
+                cityList: [
+                    {
+                        value: 'beijing',
+                        label: '北京市'
+                    },
+                    {
+                        value: 'shanghai',
+                        label: '上海市'
+                    },
+                    {
+                        value: 'shenzhen',
+                        label: '深圳市'
+                    },
+                    {
+                        value: 'hangzhou',
+                        label: '杭州市'
+                    },
+                    {
+                        value: 'nanjing',
+                        label: '南京市'
+                    },
+                    {
+                        value: 'chongqing',
+                        label: '重庆市'
+                    }
                 ],
-                list: [],
-                loading: false,
-                states: ["Al", "Alabama", "Alaska", "Arizona",
-                    "Arkansas", "California", "Colorado",
-                    "Connecticut", "Delaware", "Florida",
-                    "Georgia", "Hawaii", "Idaho", "Illinois",
-                    "Indiana", "Iowa", "Kansas", "Kentucky",
-                    "Louisiana", "Maine", "Maryland",
-                    "Massachusetts", "Michigan", "Minnesota",
-                    "Mississippi", "Missouri", "Montana",
-                    "Nebraska", "Nevada", "New Hampshire",
-                    "New Jersey", "New Mexico", "New York",
-                    "North Carolina", "North Dakota", "Ohio",
-                    "Oklahoma", "Oregon", "Pennsylvania",
-                    "Rhode Island", "South Carolina",
-                    "South Dakota", "Tennessee", "Texas",
-                    "Utah", "Vermont", "Virginia",
-                    "Washington", "West Virginia", "Wisconsin",
-                    "Wyoming"]
+                model11: '',
+                model12: []
             }
         },
-        mounted () {
-            this.options = [
-//                {
-//                    label: '全部',
-//                    value: 0
-//                },{
-//                    label: '苹果',
-//                    value: 1
-//                },{
-//                    label: '香蕉',
-//                    value: 2
-//                },{
-//                    label: '西瓜',
-//                    value: 3
-//                }
-            ];
-        },
         methods: {
-            handleAdd () {
-                this.options = [
-                    {
-                        label: '全部',
-                        value: 0
-                    },{
-                        label: '苹果',
-                        value: 1
-                    },{
-                        label: '香蕉',
-                        value: 2
-                    },{
-                        label: '西瓜',
-                        value: 3
-                    }
-                ]
-            },
-            remoteMethod (query) {
-                console.log(13)
-                if (query !== '') {
-                    this.loading = true;
-                    setTimeout(() => {
-                        this.loading = false;
-                        this.options = this.list.filter(item => {
-                            return item.label.toLowerCase()
-                                    .indexOf(query.toLowerCase()) > -1;
-                        });
-                    }, 500);
-                } else {
-                    this.options = [];
-                }
-            },
-            handleInput () {
-//                console.log(1)
+            handleSet () {
+                this.model11 = 'shanghai';
+//                this.model12 = ['beijing'];
             }
-        },
-        mounted () {
-            this.list = this.states.map(item => {
-                return {
-                    value: item,
-                    label: 'L ' + item
-                };
-            });
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 368e2117..bcda26e8 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -694,6 +694,12 @@
                 } else {
                     this.updateSingleSelected();
                 }
+                // #957
+                if (!this.visible && this.filterable) {
+                    this.$nextTick(() => {
+                        this.broadcastQuery('');
+                    });
+                }
             },
             visible (val) {
                 if (val) {

From d22e36718b085aec030e524a444673ee4f95c022 Mon Sep 17 00:00:00 2001
From: marvinwilliam <la805779602@hotmail.com>
Date: Sat, 20 May 2017 17:55:08 +0800
Subject: [PATCH 43/68] fix form default submit behavior.

---
 src/components/form/form.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/form/form.vue b/src/components/form/form.vue
index 98f4614c..cdc8342d 100644
--- a/src/components/form/form.vue
+++ b/src/components/form/form.vue
@@ -1,5 +1,7 @@
 <template>
-    <form :class="classes"><slot></slot></form>
+    <form :class="classes" @submit="formSubmit">
+        <slot></slot>
+    </form>
 </template>
 <script>
     // https://github.com/ElemeFE/element/blob/dev/packages/form/src/form.vue
@@ -75,6 +77,9 @@
                 if (!field) { throw new Error('[iView warn]: must call validateField with valid prop string!'); }
 
                 field.validate('', cb);
+            },
+            formSubmit(event){
+                event.preventDefault();
             }
         },
         watch: {
@@ -93,4 +98,4 @@
             });
         }
     };
-</script>
\ No newline at end of file
+</script>

From 1e20ac5cf4f5058834743404a30700b08d3d8cd0 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Mon, 22 May 2017 10:49:46 +0800
Subject: [PATCH 44/68] #958

---
 examples/routers/table.vue    |  8 ++++----
 src/components/form/form.vue  |  6 ++----
 src/components/table/cell.vue | 11 ++++-------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 0dc7340f..14815481 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -11,7 +11,7 @@
         data () {
             return {
                 data1: 1,
-//                self: this,
+                self: this,
                 columns7: [
                     {
                         title: '姓名',
@@ -42,9 +42,9 @@
                         key: 'action',
                         width: 150,
                         align: 'center',
-                        render (row, column, index) {
-                            return `<i-button type="primary" size="small" @click="show(${index})">查看</i-button> <i-button type="error" size="small" @click="remove(${index})">删除</i-button>`;
-                        }
+//                        render (row, column, index) {
+//                            return `<i-button type="primary" size="small" @click="show(${index})">查看</i-button> <i-button type="error" size="small" @click="remove(${index})">删除</i-button>`;
+//                        }
                     }
                 ],
                 data6: [
diff --git a/src/components/form/form.vue b/src/components/form/form.vue
index cdc8342d..13a880ec 100644
--- a/src/components/form/form.vue
+++ b/src/components/form/form.vue
@@ -1,7 +1,5 @@
 <template>
-    <form :class="classes" @submit="formSubmit">
-        <slot></slot>
-    </form>
+    <form :class="classes" @submit="formSubmit"><slot></slot></form>
 </template>
 <script>
     // https://github.com/ElemeFE/element/blob/dev/packages/form/src/form.vue
@@ -78,7 +76,7 @@
 
                 field.validate('', cb);
             },
-            formSubmit(event){
+            formSubmit (event) {
                 event.preventDefault();
             }
         },
diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index 5c034bdc..d6cc78f2 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -10,6 +10,7 @@
 <script>
     import Vue from 'vue';
     import Checkbox from '../checkbox/checkbox.vue';
+    import { findComponentUpward } from '../../utils/assist';
 
     export default {
         name: 'TableCell',
@@ -49,13 +50,9 @@
             compile () {
                 if (this.column.render) {
                     // 兼容真 Render，后期废弃旧用法
-                    let isRealRender = false;
-                    try {
-                        this.column.render(this.row, this.column, this.index);
-                    }
-                    catch (err) {
-                        isRealRender = true;
-                    }
+                    let isRealRender = true;
+                    const Table = findComponentUpward(this, 'Table');
+                    if (Table.context) isRealRender = false;
 
                     if (isRealRender) {
                         const component = new Vue({

From b6b0e9e7cc082b41cc6fd959bea36632b10eafce Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Mon, 22 May 2017 13:25:04 +0800
Subject: [PATCH 45/68] release 2.0.0-rc.14

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 321a5212..befcef38 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iview",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.14",
   "title": "iView",
   "description": "A high quality  UI components Library with Vue.js",
   "homepage": "http://www.iviewui.com",

From de997724fab683819c9da9e29ee1ff5f478d5235 Mon Sep 17 00:00:00 2001
From: Haven <baoyx007@gmail.com>
Date: Wed, 24 May 2017 00:02:58 +0800
Subject: [PATCH 46/68] Update button.less
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

当页面上 button 太多时， transform: translate3d(0, 0, 0)会降低性能，所以删除
---
 src/styles/mixins/button.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/mixins/button.less b/src/styles/mixins/button.less
index c6dd9f5e..b99e852b 100644
--- a/src/styles/mixins/button.less
+++ b/src/styles/mixins/button.less
@@ -133,7 +133,7 @@
     line-height: @line-height-base;
     user-select: none;
     .button-size(@btn-padding-base; @btn-font-size; @btn-border-radius);
-    transform: translate3d(0, 0, 0);
+    //transform: translate3d(0, 0, 0);
     //transition: all @transition-time linear;
     transition: color @transition-time linear, background-color @transition-time linear, border @transition-time linear;
 

From 922145732fa53523adf65736a886009bf66b692b Mon Sep 17 00:00:00 2001
From: WJD <785724102@qq.com>
Date: Thu, 25 May 2017 17:30:02 +0800
Subject: [PATCH 47/68] Update Select.vue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加单选下拉的值为 null 时，不清空框内文字的情况
---
 src/components/select/select.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index bcda26e8..a14fe109 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -155,6 +155,8 @@
                     if (!this.model.length) {
                         status = true;
                     }
+                } else if( this.model === null){
+                    status = true;
                 }
 
                 return status;

From 3239ed9819d669d6c5739996a56e4801e2145bf1 Mon Sep 17 00:00:00 2001
From: renhang <renhang@pindou.com>
Date: Thu, 25 May 2017 18:32:59 +0800
Subject: [PATCH 48/68] backTop

---
 src/components/back-top/back-top.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/back-top/back-top.vue b/src/components/back-top/back-top.vue
index 4ea7cfbb..482397d7 100644
--- a/src/components/back-top/back-top.vue
+++ b/src/components/back-top/back-top.vue
@@ -67,7 +67,8 @@
                 this.backTop = window.pageYOffset >= this.height;
             },
             back () {
-                scrollTop(window, document.body.scrollTop, 0, this.duration);
+                let scrollTop = document.documentElement.scrollTop||document.body.scrollTop;
+                scrollTop(window, scrollTop, 0, this.duration);
                 this.$emit('on-click');
             }
         }

From 4b19f87edf5bf65b42022e75bb4cf1731f355fed Mon Sep 17 00:00:00 2001
From: renhang <renhang@pindou.com>
Date: Thu, 25 May 2017 18:48:46 +0800
Subject: [PATCH 49/68] backTop

---
 src/components/back-top/back-top.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/back-top/back-top.vue b/src/components/back-top/back-top.vue
index 482397d7..391ccf28 100644
--- a/src/components/back-top/back-top.vue
+++ b/src/components/back-top/back-top.vue
@@ -67,8 +67,8 @@
                 this.backTop = window.pageYOffset >= this.height;
             },
             back () {
-                let scrollTop = document.documentElement.scrollTop||document.body.scrollTop;
-                scrollTop(window, scrollTop, 0, this.duration);
+                var sTop = document.documentElement.scrollTop||document.body.scrollTop;
+                scrollTop(window, sTop, 0, this.duration);
                 this.$emit('on-click');
             }
         }

From 46b95937b993e11b581e06bae7c3d9a3e40ba295 Mon Sep 17 00:00:00 2001
From: "Ilya Rumyancev (MacBook)" <explosivebit@gmail.com>
Date: Thu, 25 May 2017 14:52:00 +0300
Subject: [PATCH 50/68] Add Russ lang

Added Russian language
---
 src/locale/lang/ru-RU.js | 96 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 src/locale/lang/ru-RU.js

diff --git a/src/locale/lang/ru-RU.js b/src/locale/lang/ru-RU.js
new file mode 100644
index 00000000..7a2691d1
--- /dev/null
+++ b/src/locale/lang/ru-RU.js
@@ -0,0 +1,96 @@
+export default {
+    i: {
+        select: {
+            placeholder: 'Выбрать',
+            noMatch: 'Нет соответствующих данных',
+            loading: 'Загрузка'
+        },
+        table: {
+            noDataText: 'Нет данных',
+            noFilteredDataText: 'Нет данных по фильтру',
+            confirmFilter: 'Подтвердить',
+            resetFilter: 'Сброс',
+            clearFilter: 'Все'
+        },
+        datepicker: {
+            selectDate: 'Выбрать дату',
+            selectTime: 'Выбрать время',
+            startTime: 'Начальное время',
+            endTime: 'Конечное время',
+            clear: 'Очистить',
+            ok: 'OK',
+            month: '',
+            month1: 'Январь',
+            month2: 'Февраль',
+            month3: 'Март',
+            month4: 'Апрель',
+            month5: 'Май',
+            month6: 'Июнь',
+            month7: 'Июль',
+            month8: 'Август',
+            month9: 'Сентябрь',
+            month10: 'Октябрь',
+            month11: 'Ноябрь',
+            month12: 'Декабрь',
+            year: '',
+            weeks: {
+                sun: 'Вс',
+                mon: 'Пн',
+                tue: 'Вт',
+                wed: 'Ср',
+                thu: 'Чт',
+                fri: 'Пт',
+                sat: 'Сб'
+            },
+            months: {
+                m1: 'Янв',
+                m2: 'Фев',
+                m3: 'Мар',
+                m4: 'Апр',
+                m5: 'Май',
+                m6: 'Июн',
+                m7: 'Июл',
+                m8: 'Авг',
+                m9: 'Сен',
+                m10: 'Окт',
+                m11: 'Ноя',
+                m12: 'Дек'
+            }
+        },
+        transfer: {
+            titles: {
+                source: 'Источник',
+                target: 'Цель'
+            },
+            filterPlaceholder: 'Искать здесь',
+            notFoundText: 'Не Найдено'
+        },
+        modal: {
+            okText: 'OK',
+            cancelText: 'Отменить'
+        },
+        poptip: {
+            okText: 'OK',
+            cancelText: 'Отменить'
+        },
+        page: {
+            prev: 'Пред. страница',
+            next: 'След. страница',
+            total: 'Всего',
+            item: 'пункт',
+            items: 'пункты',
+            prev5: 'Пред. 5 страниц',
+            next5: 'След. 5 страниц',
+            page: '/page',
+            goto: 'Идти к',
+            p: ''
+        },
+        rate: {
+            star: 'Звезда',
+            stars: 'Звезды'
+        },
+        tree: {
+            emptyText: 'Нет данных'
+        }
+    }
+};
\ No newline at end of file

From 12f7b3a1e3fb46eec3cbb6bed56f3edb8221cdd4 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Fri, 26 May 2017 09:45:05 +0800
Subject: [PATCH 51/68] update Backtop

---
 src/components/back-top/back-top.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/back-top/back-top.vue b/src/components/back-top/back-top.vue
index 391ccf28..303951d2 100644
--- a/src/components/back-top/back-top.vue
+++ b/src/components/back-top/back-top.vue
@@ -67,7 +67,7 @@
                 this.backTop = window.pageYOffset >= this.height;
             },
             back () {
-                var sTop = document.documentElement.scrollTop||document.body.scrollTop;
+                const sTop = document.documentElement.scrollTop || document.body.scrollTop;
                 scrollTop(window, sTop, 0, this.duration);
                 this.$emit('on-click');
             }

From ea9620eb9e5cd5b89b7d5326c13a854bac513778 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Fri, 26 May 2017 10:12:27 +0800
Subject: [PATCH 52/68] update Transfer

---
 examples/routers/transfer.vue       | 2 +-
 src/components/transfer/list.vue    | 2 +-
 src/styles/components/transfer.less | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/examples/routers/transfer.vue b/examples/routers/transfer.vue
index 9ebe3ac8..570bb863 100644
--- a/examples/routers/transfer.vue
+++ b/examples/routers/transfer.vue
@@ -178,7 +178,7 @@
                 setTimeout(function() {
                     console.log('--1');
                     // _this.data1 = null;
-                    _this.data1 = _this.getMockData1();
+//                    _this.data1 = _this.getMockData1();
                     console.log('-fetch-', _this.data1);
 
                 }, 1500);
diff --git a/src/components/transfer/list.vue b/src/components/transfer/list.vue
index 2cc7e958..12236c93 100644
--- a/src/components/transfer/list.vue
+++ b/src/components/transfer/list.vue
@@ -2,7 +2,7 @@
     <div :class="classes" :style="listStyle">
         <div :class="prefixCls + '-header'">
             <Checkbox :value="checkedAll" :disabled="checkedAllDisabled" @on-change="toggleSelectAll"></Checkbox>
-            <span @click="toggleSelectAll(!checkedAll)">{{ title }}</span>
+            <span :class="prefixCls + '-header-title'" @click="toggleSelectAll(!checkedAll)">{{ title }}</span>
             <span :class="prefixCls + '-header-count'">{{ count }}</span>
         </div>
         <div :class="bodyClasses">
diff --git a/src/styles/components/transfer.less b/src/styles/components/transfer.less
index 83c05aac..bbadb235 100644
--- a/src/styles/components/transfer.less
+++ b/src/styles/components/transfer.less
@@ -31,6 +31,10 @@
             left: 0;
             width: 100%;
 
+            &-title{
+                cursor: pointer;
+            }
+
             & > span{
                 padding-left: 4px;
             }

From 10d3a3238a25f4188466c08a6a952fe2dacff46e Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Fri, 26 May 2017 14:00:42 +0800
Subject: [PATCH 53/68] fixed #1011

---
 examples/routers/table.vue    | 81 +++++++----------------------------
 src/components/table/cell.vue |  1 +
 2 files changed, 17 insertions(+), 65 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 14815481..23adae41 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,97 +1,48 @@
 <template>
-    <div>
-        <Table border :columns="columns7" :data="data6"></Table>
-        <Button @click="handleAdd"> + 1</Button>
-    </div>
+    <Table border :columns="columns5" :data="data5"></Table>
 </template>
 <script>
-    import abc from '../components/test.vue';
     export default {
-        components: { abc },
         data () {
             return {
-                data1: 1,
-                self: this,
-                columns7: [
+                columns5: [
+                    {
+                        title: '日期',
+                        key: 'date',
+                        sortable: true
+                    },
                     {
                         title: '姓名',
                         key: 'name',
-//                        render (row, column, index) {
-//                            return `<abc></abc>`;
-//                        }
-                        render: (h, row, column, index) => {
-                            return h('div', [
-                                h('Button',{
-                                    on: {
-                                        click: this.handleClick
-                                    }
-                                }, 'hello')
-                            ])
+                        render: (h, params) => {
+                            return h('div', params.row.name);
                         }
                     },
                     {
                         title: '年龄',
-                        key: 'age'
+                        key: 'age',
+                        sortable: true
                     },
                     {
                         title: '地址',
                         key: 'address'
-                    },
-                    {
-                        title: '操作',
-                        key: 'action',
-                        width: 150,
-                        align: 'center',
-//                        render (row, column, index) {
-//                            return `<i-button type="primary" size="small" @click="show(${index})">查看</i-button> <i-button type="error" size="small" @click="remove(${index})">删除</i-button>`;
-//                        }
                     }
                 ],
-                data6: [
+                data5: [
                     {
                         name: '王小明',
                         age: 18,
-                        address: '北京市朝阳区芍药居'
+                        address: '北京市朝阳区芍药居',
+                        date: '2016-10-03'
                     },
                     {
                         name: '张小刚',
                         age: 25,
-                        address: '北京市海淀区西二旗'
-                    },
-                    {
-                        name: '李小红',
-                        age: 30,
-                        address: '上海市浦东新区世纪大道'
-                    },
-                    {
-                        name: '周小伟',
-                        age: 26,
-                        address: '深圳市南山区深南大道'
+                        address: '北京市海淀区西二旗',
+                        date: '2016-10-01'
                     }
                 ]
             }
-        },
-        computed: {
-            ttt () {
-                return this.data1 + 1;
-            }
-        },
-        methods: {
-            show (index) {
-                this.$Modal.info({
-                    title: '用户信息',
-                    content: `姓名：${this.data6[index].name}<br>年龄：${this.data6[index].age}<br>地址：${this.data6[index].address}`
-                })
-            },
-            remove (index) {
-                this.data6.splice(index, 1);
-            },
-            handleAdd () {
-                this.data1++;
-            },
-            handleClick () {
-                this.$Message.info('111')
-            }
         }
     }
 </script>
diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index d6cc78f2..9368e0b3 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -55,6 +55,7 @@
                     if (Table.context) isRealRender = false;
 
                     if (isRealRender) {
+                        this.$el.innerHTML = '';
                         const component = new Vue({
                             functional: true,
                             render: (h) => {

From 67a87e8d8b591d051d1b0ef33066505497d4a834 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Fri, 26 May 2017 16:38:40 +0800
Subject: [PATCH 54/68] fixed #1017

---
 src/components/input/input.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/input/input.vue b/src/components/input/input.vue
index 6900dc9a..83ba040a 100644
--- a/src/components/input/input.vue
+++ b/src/components/input/input.vue
@@ -37,6 +37,7 @@
             :readonly="readonly"
             :name="name"
             :value="value"
+            :autofocus="autofocus"
             @keyup.enter="handleEnter"
             @focus="handleFocus"
             @blur="handleBlur"

From df64fd36bdfbaa3e3475478e3ed554777d3c9ea1 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Fri, 26 May 2017 17:29:58 +0800
Subject: [PATCH 55/68] update styles

---
 examples/routers/notice.vue       |  2 +-
 src/styles/components/notice.less |  4 +++-
 src/styles/custom.less            | 24 ++++++++++++------------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/examples/routers/notice.vue b/examples/routers/notice.vue
index 563b46e0..aa0f4e0b 100644
--- a/examples/routers/notice.vue
+++ b/examples/routers/notice.vue
@@ -14,7 +14,7 @@
         mounted () {
             this.$Notice.config({
                 top: 150,
-                duration: 3
+                duration: 30
             });
         }
     }
diff --git a/src/styles/components/notice.less b/src/styles/components/notice.less
index 88d35eb6..651e7c4d 100644
--- a/src/styles/components/notice.less
+++ b/src/styles/components/notice.less
@@ -50,6 +50,7 @@
         white-space: nowrap;
     }
     &-with-desc &-title{
+        font-weight: bold;
         margin-bottom: 8px;
     }
     &-with-desc&-with-icon &-title{
@@ -58,7 +59,8 @@
 
     &-desc {
         font-size: 12px;
-        color: @legend-color;
+        //color: @legend-color;
+        color: @text-color;
         text-align: justify;
         line-height: 1.5;
     }
diff --git a/src/styles/custom.less b/src/styles/custom.less
index 87649eb1..3ff9d739 100644
--- a/src/styles/custom.less
+++ b/src/styles/custom.less
@@ -3,25 +3,25 @@
 @css-prefix-iconfont    : ivu-icon;
 
 // Color
-@primary-color          : #3399ff;
+@primary-color          : #2d8cf0;
 @info-color             : #2db7f5;
-@success-color          : #00cc66;
+@success-color          : #19be6b;
 @warning-color          : #ff9900;
-@error-color            : #ff3300;
-@link-color             : #3399ff;
+@error-color            : #ed3f14;
+@link-color             : #2D8cF0;
 @link-hover-color       : tint(@link-color, 20%);
 @link-active-color      : shade(@link-color, 5%);
 @selected-color         : fade(@primary-color, 90%);
 @tooltip-color          : #fff;
-@subsidiary-color       : #9ea7b4;
+@subsidiary-color       : #80848f;
 @rate-star-color        : #f5a623;
 
 // Base
 @body-background        : #fff;
 @font-family            : "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
 @code-family            : Consolas,Menlo,Courier,monospace;
-@title-color            : #464c5b;
-@text-color             : #657180;
+@title-color            : #1c2438;
+@text-color             : #495060;
 @font-size-base         : 14px;
 @font-size-small        : 12px;
 @line-height-base       : 1.5;
@@ -31,16 +31,16 @@
 @cursor-disabled        : not-allowed;
 
 // Border color
-@border-color-base      : #d7dde4;  // outside
-@border-color-split     : #e3e8ee;  // inside
+@border-color-base      : #dddee1;  // outside
+@border-color-split     : #e9eaec;  // inside
 
 // Background color
 @background-color-base        : #f7f7f7;  // base
 @background-color-select-hover: @input-disabled-bg;
 @tooltip-bg                   : rgba(70, 76, 91, .9);
 @head-bg                      : #f9fafc;
-@table-thead-bg               : #f5f7f9;
-@table-td-stripe-bg           : #f5f7f9;
+@table-thead-bg               : #f8f8f9;
+@table-td-stripe-bg           : #f8f8f9;
 @table-td-hover-bg            : #ebf7ff;
 @table-td-highlight-bg        : #ebf7ff;
 @menu-dark-active-bg          : #313540;
@@ -66,7 +66,7 @@
 @btn-border-radius-small: 3px;
 @btn-group-border       : shade(@primary-color, 5%);
 
-@btn-disable-color      : #c3cbd6;
+@btn-disable-color      : #bbbec4;
 @btn-disable-bg         : @background-color-base;
 @btn-disable-border     : @border-color-base;
 

From 08fd628d1f5badec33d62d12198a58a4eb4f710c Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Sat, 27 May 2017 15:13:10 +0800
Subject: [PATCH 56/68] Table support expand

---
 examples/components/table.vue       | 101 ++++++++++++++++++++++++++++
 examples/routers/table.vue          |  92 ++++++++++++++++++++++---
 src/components/table/cell.vue       |  27 +++++++-
 src/components/table/expand.vue     |  37 ++++++++++
 src/components/table/table-body.vue |  67 ++++++++++++------
 src/components/table/table-head.vue |   3 +-
 src/components/table/table.vue      |  21 +++++-
 src/styles/components/table.less    |  29 ++++++++
 8 files changed, 339 insertions(+), 38 deletions(-)
 create mode 100644 examples/components/table.vue
 create mode 100644 src/components/table/expand.vue

diff --git a/examples/components/table.vue b/examples/components/table.vue
new file mode 100644
index 00000000..e882eb2f
--- /dev/null
+++ b/examples/components/table.vue
@@ -0,0 +1,101 @@
+<template>
+    <Table width="550" border :columns="columns2" :data="data3"></Table>
+</template>
+<script>
+    export default {
+        name: 'etable',
+        data () {
+            return {
+                columns2: [
+                    {
+                        title: '姓名',
+                        key: 'name',
+                        width: 100,
+                        fixed: 'left'
+                    },
+                    {
+                        title: '年龄',
+                        key: 'age',
+                        width: 100
+                    },
+                    {
+                        title: '省份',
+                        key: 'province',
+                        width: 100
+                    },
+                    {
+                        title: '市区',
+                        key: 'city',
+                        width: 100
+                    },
+                    {
+                        title: '地址',
+                        key: 'address',
+                        width: 200
+                    },
+                    {
+                        title: '邮编',
+                        key: 'zip',
+                        width: 100
+                    },
+                    {
+                        title: '操作',
+                        key: 'action',
+                        fixed: 'right',
+                        width: 120,
+                        render: (h, params) => {
+                            return h('div', [
+                                h('Button', {
+                                    props: {
+                                        type: 'text',
+                                        size: 'small'
+                                    }
+                                }, '查看'),
+                                h('Button', {
+                                    props: {
+                                        type: 'text',
+                                        size: 'small'
+                                    }
+                                }, '编辑')
+                            ]);
+                        }
+                    }
+                ],
+                data3: [
+                    {
+                        name: '王小明',
+                        age: 18,
+                        address: '北京市朝阳区芍药居',
+                        province: '北京市',
+                        city: '朝阳区',
+                        zip: 100000
+                    },
+                    {
+                        name: '张小刚',
+                        age: 25,
+                        address: '北京市海淀区西二旗',
+                        province: '北京市',
+                        city: '海淀区',
+                        zip: 100000
+                    },
+                    {
+                        name: '李小红',
+                        age: 30,
+                        address: '上海市浦东新区世纪大道',
+                        province: '上海市',
+                        city: '浦东新区',
+                        zip: 100000
+                    },
+                    {
+                        name: '周小伟',
+                        age: 26,
+                        address: '深圳市南山区深南大道',
+                        province: '广东',
+                        city: '南山区',
+                        zip: 100000
+                    }
+                ]
+            }
+        }
+    }
+</script>
diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 23adae41..e42834af 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,21 +1,33 @@
 <template>
-    <Table border :columns="columns5" :data="data5"></Table>
+    <Table :columns="columns7" :data="data6" @on-expand="expand"></Table>
 </template>
 <script>
+    import etable from '../components/table.vue';
     export default {
+        components: { etable },
         data () {
             return {
-                columns5: [
+                columns7: [
                     {
-                        title: '日期',
-                        key: 'date',
-                        sortable: true
+                        type: 'expand',
+                        width: 50,
+                        render: (h, params) => {
+//                            return h(etable);
+                            return h('div', params.row.name)
+                        }
                     },
                     {
                         title: '姓名',
                         key: 'name',
                         render: (h, params) => {
-                            return h('div', params.row.name);
+                            return h('div', [
+                                h('Icon', {
+                                    props: {
+                                        type: 'person'
+                                    }
+                                }),
+                                h('strong', params.row.name)
+                            ]);
                         }
                     },
                     {
@@ -26,23 +38,81 @@
                     {
                         title: '地址',
                         key: 'address'
+                    },
+                    {
+                        title: '操作',
+                        key: 'action',
+                        width: 150,
+                        align: 'center',
+                        render: (h, params) => {
+                            return h('div', [
+                                h('Button', {
+                                    props: {
+                                        type: 'primary',
+                                        size: 'small'
+                                    },
+                                    style: {
+                                        marginRight: '5px'
+                                    },
+                                    on: {
+                                        click: () => {
+                                            this.show(params.index)
+                                        }
+                                    }
+                                }, '查看'),
+                                h('Button', {
+                                    props: {
+                                        type: 'error',
+                                        size: 'small'
+                                    },
+                                    on: {
+                                        click: () => {
+                                            this.remove(params.index)
+                                        }
+                                    }
+                                }, '删除')
+                            ]);
+                        }
                     }
                 ],
-                data5: [
+                data6: [
                     {
                         name: '王小明',
                         age: 18,
-                        address: '北京市朝阳区芍药居',
-                        date: '2016-10-03'
+                        address: '北京市朝阳区芍药居'
                     },
                     {
                         name: '张小刚',
                         age: 25,
-                        address: '北京市海淀区西二旗',
-                        date: '2016-10-01'
+                        address: '北京市海淀区西二旗'
+                    },
+                    {
+                        name: '李小红',
+                        age: 30,
+                        address: '上海市浦东新区世纪大道'
+                    },
+                    {
+                        name: '周小伟',
+                        age: 26,
+                        address: '深圳市南山区深南大道'
                     }
                 ]
             }
+        },
+        methods: {
+            show (index) {
+                this.$Modal.info({
+                    title: '用户信息',
+                    content: `姓名：${this.data6[index].name}<br>年龄：${this.data6[index].age}<br>地址：${this.data6[index].address}`
+                })
+            },
+            remove (index) {
+                this.data6.splice(index, 1);
+            },
+            expand (row, s) {
+//                console.log(row);
+//                console.log(s);
+            }
         }
     }
 </script>
diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index 9368e0b3..d4dfa847 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -5,16 +5,22 @@
             <Checkbox :value="checked" @on-change="toggleSelect" :disabled="disabled"></Checkbox>
         </template>
         <template v-if="renderType === 'normal'"><span v-html="row[column.key]"></span></template>
+        <template v-if="renderType === 'expand'">
+            <div :class="expandCls" @click="toggleExpand">
+                <Icon type="ios-arrow-right"></Icon>
+            </div>
+        </template>
     </div>
 </template>
 <script>
     import Vue from 'vue';
+    import Icon from '../icon/icon.vue';
     import Checkbox from '../checkbox/checkbox.vue';
     import { findComponentUpward } from '../../utils/assist';
 
     export default {
         name: 'TableCell',
-        components: { Checkbox },
+        components: { Icon, Checkbox },
         props: {
             prefixCls: String,
             row: Object,
@@ -23,6 +29,7 @@
             index: Number,           // _index of data
             checked: Boolean,
             disabled: Boolean,
+            expanded: Boolean,
             fixed: {
                 type: [Boolean, String],
                 default: false
@@ -41,14 +48,23 @@
                     `${this.prefixCls}-cell`,
                     {
                         [`${this.prefixCls}-hidden`]: !this.fixed && this.column.fixed && (this.column.fixed === 'left' || this.column.fixed === 'right'),
-                        [`${this.prefixCls}-cell-ellipsis`]: this.column.ellipsis || false
+                        [`${this.prefixCls}-cell-ellipsis`]: this.column.ellipsis || false,
+                        [`${this.prefixCls}-cell-with-expand`]: this.renderType === 'expand'
                     }
                 ];
+            },
+            expandCls () {
+                return [
+                    `${this.prefixCls}-cell-expand`,
+                    {
+                        [`${this.prefixCls}-cell-expand-expanded`]: this.expanded
+                    }
+                ]
             }
         },
         methods: {
             compile () {
-                if (this.column.render) {
+                if (this.column.render && this.renderType === 'render') {
                     // 兼容真 Render，后期废弃旧用法
                     let isRealRender = true;
                     const Table = findComponentUpward(this, 'Table');
@@ -114,6 +130,9 @@
             },
             toggleSelect () {
                 this.$parent.$parent.toggleSelect(this.index);
+            },
+            toggleExpand () {
+                this.$parent.$parent.toggleExpand(this.index);
             }
         },
         created () {
@@ -121,6 +140,8 @@
                 this.renderType = 'index';
             } else if (this.column.type === 'selection') {
                 this.renderType = 'selection';
+            } else if (this.column.type === 'expand') {
+                this.renderType = 'expand';
             } else if (this.column.render) {
                 this.renderType = 'render';
             } else {
diff --git a/src/components/table/expand.vue b/src/components/table/expand.vue
new file mode 100644
index 00000000..fc9a11d0
--- /dev/null
+++ b/src/components/table/expand.vue
@@ -0,0 +1,37 @@
+<template>
+    <div ref="cell"></div>
+</template>
+<script>
+    import Vue from 'vue';
+    export default {
+        name: 'TableExpand',
+        props: {
+            row: Object,
+            render: Function,
+            index: Number,
+        },
+        methods: {
+            compile () {
+                if (this.render) {
+                    this.$el.innerHTML = '';
+                    const component = new Vue({
+                        functional: true,
+                        render: (h) => {
+                            return this.render(h, {
+                                row: this.row,
+                                index: this.index
+                            });
+                        }
+                    });
+                    const Cell = component.$mount();
+                    this.$refs.cell.appendChild(Cell.$el);
+                }
+            }
+        },
+        mounted () {
+            this.$nextTick(() => {
+                this.compile();
+            });
+        }
+    };
+</script>
\ No newline at end of file
diff --git a/src/components/table/table-body.vue b/src/components/table/table-body.vue
index 73dd9d8b..59e72e7b 100644
--- a/src/components/table/table-body.vue
+++ b/src/components/table/table-body.vue
@@ -4,39 +4,47 @@
             <col v-for="(column, index) in columns" :width="setCellWidth(column, index, false)">
         </colgroup>
         <tbody :class="[prefixCls + '-tbody']">
-            <tr
-                v-for="(row, index) in data"
-                :key="row"
-                :class="rowClasses(row._index)"
-                @mouseenter.stop="handleMouseIn(row._index)"
-                @mouseleave.stop="handleMouseOut(row._index)"
-                @click.stop="clickCurrentRow(row._index)"
-                @dblclick.stop="dblclickCurrentRow(row._index)">
-                <td v-for="column in columns" :class="alignCls(column, row)">
-                    <Cell
-                        :fixed="fixed"
-                        :prefix-cls="prefixCls"
-                        :row="row"
-                        :column="column"
-                        :natural-index="index"
-                        :index="row._index"
-                        :checked="rowChecked(row._index)"
-                        :disabled="rowDisabled(row._index)"
+            <template v-for="(row, index) in data">
+                <tr
+                    :key="row"
+                    :class="rowClasses(row._index)"
+                    @mouseenter.stop="handleMouseIn(row._index)"
+                    @mouseleave.stop="handleMouseOut(row._index)"
+                    @click.stop="clickCurrentRow(row._index)"
+                    @dblclick.stop="dblclickCurrentRow(row._index)">
+                    <td v-for="column in columns" :class="alignCls(column, row)">
+                        <Cell
+                            :fixed="fixed"
+                            :prefix-cls="prefixCls"
+                            :row="row"
+                            :column="column"
+                            :natural-index="index"
+                            :index="row._index"
+                            :checked="rowChecked(row._index)"
+                            :disabled="rowDisabled(row._index)"
+                            :expanded="rowExpanded(row._index)"
                         ></Cell>
-                </td>
-            </tr>
+                    </td>
+                </tr>
+                <tr v-if="rowExpanded(row._index)">
+                    <td :colspan="columns.length">
+                        <Expand :row="row" :render="expandRender" :index="row._index"></Expand>
+                    </td>
+                </tr>
+            </template>
         </tbody>
     </table>
 </template>
 <script>
     // todo :key="row"
     import Cell from './cell.vue';
+    import Expand from './expand.vue';
     import Mixin from './mixin';
 
     export default {
         name: 'TableBody',
         mixins: [ Mixin ],
-        components: { Cell },
+        components: { Cell, Expand },
         props: {
             prefixCls: String,
             styleObject: Object,
@@ -49,6 +57,20 @@
                 default: false
             }
         },
+        computed: {
+            expandRender () {
+                let render = function () {
+                    return '';
+                };
+                for (let i = 0; i < this.columns.length; i++) {
+                    const column = this.columns[i];
+                    if (column.type && column.type === 'expand') {
+                        if (column.render) render = column.render;
+                    }
+                }
+                return render;
+            }
+        },
         methods: {
             rowClasses (_index) {
                 return [
@@ -66,6 +88,9 @@
             rowDisabled(_index){
                 return this.objData[_index] && this.objData[_index]._isDisabled;
             },
+            rowExpanded(_index){
+                return this.objData[_index] && this.objData[_index]._isExpanded;
+            },
             rowClsName (_index) {
                 return this.$parent.rowClassName(this.objData[_index], _index);
             },
diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index 72bb50dd..aa1d69c5 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -7,7 +7,8 @@
             <tr>
                 <th v-for="(column, index) in columns" :class="alignCls(column)">
                     <div :class="cellClasses(column)">
-                        <template v-if="column.type === 'selection'"><Checkbox :value="isSelectAll" @on-change="selectAll"></Checkbox></template>
+                        <template v-if="column.type === 'expand'"></template>
+                        <template v-else-if="column.type === 'selection'"><Checkbox :value="isSelectAll" @on-change="selectAll"></Checkbox></template>
                         <template v-else>
                             <span v-html="renderHeader(column, index)"></span>
                             <span :class="[prefixCls + '-sort']" v-if="column.sortable">
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index d8d5b5fe..c86a49c2 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -404,6 +404,18 @@
                 }
                 this.$emit('on-selection-change', selection);
             },
+            toggleExpand (_index) {
+                let data = {};
+
+                for (let i in this.objData) {
+                    if (parseInt(i) === _index) {
+                        data = this.objData[i];
+                    }
+                }
+                const status = !data._isExpanded;
+                this.objData[_index]._isExpanded = status;
+                this.$emit('on-expand', JSON.parse(JSON.stringify(this.cloneData[_index])), status);
+            },
             selectAll (status) {
                 // this.rebuildData.forEach((data) => {
                 //     if(this.objData[data._index]._isDisabled){
@@ -581,9 +593,9 @@
                 this.data.forEach((row, index) => {
                     const newRow = deepCopy(row);// todo 直接替换
                     newRow._isHover = false;
-                    if(newRow._disabled){
+                    if (newRow._disabled) {
                         newRow._isDisabled = newRow._disabled;
-                    }else{
+                    } else {
                         newRow._isDisabled = false;
                     }
                     if (newRow._checked) {
@@ -591,6 +603,11 @@
                     } else {
                         newRow._isChecked = false;
                     }
+                    if (newRow._expanded) {
+                        newRow._isExpanded = newRow._expanded;
+                    } else {
+                        newRow._isExpanded = false;
+                    }
                     if (newRow._highlight) {
                         newRow._isHighlight = newRow._highlight;
                     } else {
diff --git a/src/styles/components/table.less b/src/styles/components/table.less
index 576deb5c..4507ac72 100644
--- a/src/styles/components/table.less
+++ b/src/styles/components/table.less
@@ -145,6 +145,24 @@
             overflow: hidden;
             text-overflow: ellipsis;
         }
+
+        &-with-expand{
+            height: 47px;
+            line-height: 47px;
+            padding: 0;
+            text-align: center;
+        }
+
+        &-expand{
+            cursor: pointer;
+            transition: transform @transition-time @ease-in-out;
+            i{
+                font-size: @font-size-base;
+            }
+            &-expanded{
+                transform: rotate(90deg);
+            }
+        }
     }
     &-hidden{
         visibility: hidden;
@@ -184,6 +202,13 @@
             height: 60px;
             line-height: 60px;
         }
+        .@{table-prefix-cls}-cell-with-expand{
+            height: 59px;
+            line-height: 59px;
+            i{
+                font-size: @font-size-base+2;
+            }
+        }
     }
 
     &-small{
@@ -197,6 +222,10 @@
             height: 40px;
             line-height: 40px;
         }
+        .@{table-prefix-cls}-cell-with-expand{
+            height: 39px;
+            line-height: 39px;
+        }
     }
 
     &-row-highlight,

From af6e81cd6484794b9aef7db0068715cb54fd4e9f Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Sat, 27 May 2017 16:19:28 +0800
Subject: [PATCH 57/68] update Table

---
 src/components/table/cell.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index d4dfa847..50f5a3b3 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -59,7 +59,7 @@
                     {
                         [`${this.prefixCls}-cell-expand-expanded`]: this.expanded
                     }
-                ]
+                ];
             }
         },
         methods: {

From 367a4196a4e1e997fbdd9e5215ae6db3a2344a15 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Sat, 27 May 2017 16:32:51 +0800
Subject: [PATCH 58/68] update Table

---
 examples/routers/table.vue          | 2 +-
 src/components/table/table-body.vue | 2 +-
 src/styles/components/table.less    | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index e42834af..3a1ac41c 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,5 +1,5 @@
 <template>
-    <Table :columns="columns7" :data="data6" @on-expand="expand"></Table>
+    <Table border :columns="columns7" :data="data6" @on-expand="expand"></Table>
 </template>
 <script>
     import etable from '../components/table.vue';
diff --git a/src/components/table/table-body.vue b/src/components/table/table-body.vue
index 59e72e7b..ae66e9ed 100644
--- a/src/components/table/table-body.vue
+++ b/src/components/table/table-body.vue
@@ -27,7 +27,7 @@
                     </td>
                 </tr>
                 <tr v-if="rowExpanded(row._index)">
-                    <td :colspan="columns.length">
+                    <td :colspan="columns.length" :class="prefixCls + '-expanded-cell'">
                         <Expand :row="row" :render="expandRender" :index="row._index"></Expand>
                     </td>
                 </tr>
diff --git a/src/styles/components/table.less b/src/styles/components/table.less
index 4507ac72..556ac2e9 100644
--- a/src/styles/components/table.less
+++ b/src/styles/components/table.less
@@ -174,6 +174,11 @@
         vertical-align: middle;
     }
 
+    td&-expanded-cell{
+        padding: 20px 50px;
+        background: @table-thead-bg;
+    }
+
     &-stripe &-body,
     &-stripe &-fixed-body
     {

From d6070b23577d6fdea295aa3008e48925a7df6d54 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Sat, 27 May 2017 18:09:57 +0800
Subject: [PATCH 59/68] update Table

---
 examples/routers/table.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 3a1ac41c..6f52f0c1 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -89,7 +89,8 @@
                     {
                         name: '李小红',
                         age: 30,
-                        address: '上海市浦东新区世纪大道'
+                        address: '上海市浦东新区世纪大道',
+                        _expanded: true
                     },
                     {
                         name: '周小伟',

From e99320431095b04b723424f92c0d89efd97810d7 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Wed, 31 May 2017 13:59:14 +0800
Subject: [PATCH 60/68] fixed #978

---
 examples/routers/select.vue      | 304 +++++++++++++++----------------
 src/components/select/select.vue |  13 +-
 2 files changed, 159 insertions(+), 158 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index b2986b89..90a52417 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -1,166 +1,166 @@
-<!--<template>-->
-    <!--<Row>-->
-        <!--<i-col span="4">{{model}}</i-col>-->
-        <!--<i-col span="8">-->
-            <!--<i-select v-model="model" :label="['L Alabama', 'L Hawaii']" multiple @input="handleInput" filterable remote :remote-method="remoteMethod" :loading="loading" clearable>-->
-                <!--<i-option v-for="option in options" :value="option.value" :key="new Date()">{{option.label}}</i-option>-->
-            <!--</i-select>-->
-        <!--</i-col>-->
-    <!--</Row>-->
-<!--</template>-->
-
-<!--<script>-->
-    <!--export default {-->
-        <!--data () {-->
-            <!--return {-->
-<!--//                model: 'Alabama',-->
-                <!--model: ['Alabama', 'Hawaii'],-->
-                <!--options: [-->
-
-                <!--],-->
-                <!--list: [],-->
-                <!--loading: false,-->
-                <!--states: ["Al", "Alabama", "Alaska", "Arizona",-->
-                    <!--"Arkansas", "California", "Colorado",-->
-                    <!--"Connecticut", "Delaware", "Florida",-->
-                    <!--"Georgia", "Hawaii", "Idaho", "Illinois",-->
-                    <!--"Indiana", "Iowa", "Kansas", "Kentucky",-->
-                    <!--"Louisiana", "Maine", "Maryland",-->
-                    <!--"Massachusetts", "Michigan", "Minnesota",-->
-                    <!--"Mississippi", "Missouri", "Montana",-->
-                    <!--"Nebraska", "Nevada", "New Hampshire",-->
-                    <!--"New Jersey", "New Mexico", "New York",-->
-                    <!--"North Carolina", "North Dakota", "Ohio",-->
-                    <!--"Oklahoma", "Oregon", "Pennsylvania",-->
-                    <!--"Rhode Island", "South Carolina",-->
-                    <!--"South Dakota", "Tennessee", "Texas",-->
-                    <!--"Utah", "Vermont", "Virginia",-->
-                    <!--"Washington", "West Virginia", "Wisconsin",-->
-                    <!--"Wyoming"]-->
-            <!--}-->
-        <!--},-->
-        <!--mounted () {-->
-            <!--this.options = [-->
-<!--//                {-->
-<!--//                    label: '全部',-->
-<!--//                    value: 0-->
-<!--//                },{-->
-<!--//                    label: '苹果',-->
-<!--//                    value: 1-->
-<!--//                },{-->
-<!--//                    label: '香蕉',-->
-<!--//                    value: 2-->
-<!--//                },{-->
-<!--//                    label: '西瓜',-->
-<!--//                    value: 3-->
-<!--//                }-->
-            <!--];-->
-        <!--},-->
-        <!--methods: {-->
-            <!--handleAdd () {-->
-                <!--this.options = [-->
-                    <!--{-->
-                        <!--label: '全部',-->
-                        <!--value: 0-->
-                    <!--},{-->
-                        <!--label: '苹果',-->
-                        <!--value: 1-->
-                    <!--},{-->
-                        <!--label: '香蕉',-->
-                        <!--value: 2-->
-                    <!--},{-->
-                        <!--label: '西瓜',-->
-                        <!--value: 3-->
-                    <!--}-->
-                <!--]-->
-            <!--},-->
-            <!--remoteMethod (query) {-->
-                <!--console.log(13)-->
-                <!--if (query !== '') {-->
-                    <!--this.loading = true;-->
-                    <!--setTimeout(() => {-->
-                        <!--this.loading = false;-->
-                        <!--this.options = this.list.filter(item => {-->
-                            <!--return item.label.toLowerCase()-->
-                                    <!--.indexOf(query.toLowerCase()) > -1;-->
-                        <!--});-->
-                    <!--}, 500);-->
-                <!--} else {-->
-                    <!--this.options = [];-->
-                <!--}-->
-            <!--},-->
-            <!--handleInput () {-->
-<!--//                console.log(1)-->
-            <!--}-->
-        <!--},-->
-        <!--mounted () {-->
-            <!--this.list = this.states.map(item => {-->
-                <!--return {-->
-                    <!--value: item,-->
-                    <!--label: 'L ' + item-->
-                <!--};-->
-            <!--});-->
-        <!--}-->
-    <!--}-->
-<!--</script>-->
-
-
 <template>
-    <div>
-        <Row style="width: 400px;">
-            <i-col span="12" style="padding-right:10px">
-                <Select v-model="model11" filterable>
-                    <Option v-for="item in cityList" :value="item.value" :key="item">{{ item.label }}</Option>
-                </Select>
-            </i-col>
-            <i-col span="12">
-                <Select v-model="model12" filterable multiple>
-                    <Option v-for="item in cityList" :value="item.value" :key="item">{{ item.label }}</Option>
-                </Select>
-            </i-col>
-        </Row>
-        <Button @click="handleSet">set</Button>
-    </div>
+    <Row>
+        <i-col span="4">{{model}}</i-col>
+        <i-col span="8">
+            <i-select v-model="model" multiple @input="handleInput" filterable remote :remote-method="remoteMethod" :loading="loading" clearable>
+                <i-option v-for="option in options" :value="option.value" :key="new Date()">{{option.label}}</i-option>
+            </i-select>
+        </i-col>
+    </Row>
 </template>
+
 <script>
     export default {
         data () {
             return {
-                cityList: [
-                    {
-                        value: 'beijing',
-                        label: '北京市'
-                    },
-                    {
-                        value: 'shanghai',
-                        label: '上海市'
-                    },
-                    {
-                        value: 'shenzhen',
-                        label: '深圳市'
-                    },
-                    {
-                        value: 'hangzhou',
-                        label: '杭州市'
-                    },
-                    {
-                        value: 'nanjing',
-                        label: '南京市'
-                    },
-                    {
-                        value: 'chongqing',
-                        label: '重庆市'
-                    }
+//                model: 'Alabama',
+                model: ['Alabama', 'Hawaii'],
+                options: [
+
                 ],
-                model11: '',
-                model12: []
+                list: [],
+                loading: false,
+                states: ["Al", "Alabama", "Alaska", "Arizona",
+                    "Arkansas", "California", "Colorado",
+                    "Connecticut", "Delaware", "Florida",
+                    "Georgia", "Hawaii", "Idaho", "Illinois",
+                    "Indiana", "Iowa", "Kansas", "Kentucky",
+                    "Louisiana", "Maine", "Maryland",
+                    "Massachusetts", "Michigan", "Minnesota",
+                    "Mississippi", "Missouri", "Montana",
+                    "Nebraska", "Nevada", "New Hampshire",
+                    "New Jersey", "New Mexico", "New York",
+                    "North Carolina", "North Dakota", "Ohio",
+                    "Oklahoma", "Oregon", "Pennsylvania",
+                    "Rhode Island", "South Carolina",
+                    "South Dakota", "Tennessee", "Texas",
+                    "Utah", "Vermont", "Virginia",
+                    "Washington", "West Virginia", "Wisconsin",
+                    "Wyoming"]
             }
         },
+        mounted () {
+            this.options = [
+//                {
+//                    label: '全部',
+//                    value: 0
+//                },{
+//                    label: '苹果',
+//                    value: 1
+//                },{
+//                    label: '香蕉',
+//                    value: 2
+//                },{
+//                    label: '西瓜',
+//                    value: 3
+//                }
+            ];
+        },
         methods: {
-            handleSet () {
-                this.model11 = 'shanghai';
-//                this.model12 = ['beijing'];
+            handleAdd () {
+                this.options = [
+                    {
+                        label: '全部',
+                        value: 0
+                    },{
+                        label: '苹果',
+                        value: 1
+                    },{
+                        label: '香蕉',
+                        value: 2
+                    },{
+                        label: '西瓜',
+                        value: 3
+                    }
+                ]
+            },
+            remoteMethod (query) {
+                console.log(13)
+                if (query !== '') {
+                    this.loading = true;
+                    setTimeout(() => {
+                        this.loading = false;
+                        this.options = this.list.filter(item => {
+                            return item.label.toLowerCase()
+                                    .indexOf(query.toLowerCase()) > -1;
+                        });
+                    }, 500);
+                } else {
+                    this.options = [];
+                }
+            },
+            handleInput () {
+//                console.log(1)
             }
+        },
+        mounted () {
+            this.list = this.states.map(item => {
+                return {
+                    value: item,
+                    label: 'L ' + item
+                };
+            });
         }
     }
 </script>
+
+
+<!--<template>-->
+    <!--<div>-->
+        <!--<Row style="width: 400px;">-->
+            <!--<i-col span="12" style="padding-right:10px">-->
+                <!--<Select v-model="model11" filterable>-->
+                    <!--<Option v-for="item in cityList" :value="item.value" :key="item">{{ item.label }}</Option>-->
+                <!--</Select>-->
+            <!--</i-col>-->
+            <!--<i-col span="12">-->
+                <!--<Select v-model="model12" filterable multiple>-->
+                    <!--<Option v-for="item in cityList" :value="item.value" :key="item">{{ item.label }}</Option>-->
+                <!--</Select>-->
+            <!--</i-col>-->
+        <!--</Row>-->
+        <!--<Button @click="handleSet">set</Button>-->
+    <!--</div>-->
+<!--</template>-->
+<!--<script>-->
+    <!--export default {-->
+        <!--data () {-->
+            <!--return {-->
+                <!--cityList: [-->
+                    <!--{-->
+                        <!--value: 'beijing',-->
+                        <!--label: '北京市'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--value: 'shanghai',-->
+                        <!--label: '上海市'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--value: 'shenzhen',-->
+                        <!--label: '深圳市'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--value: 'hangzhou',-->
+                        <!--label: '杭州市'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--value: 'nanjing',-->
+                        <!--label: '南京市'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--value: 'chongqing',-->
+                        <!--label: '重庆市'-->
+                    <!--}-->
+                <!--],-->
+                <!--model11: '',-->
+                <!--model12: []-->
+            <!--}-->
+        <!--},-->
+        <!--methods: {-->
+            <!--handleSet () {-->
+                <!--this.model11 = 'shanghai';-->
+<!--//                this.model12 = ['beijing'];-->
+            <!--}-->
+        <!--}-->
+    <!--}-->
+<!--</script>-->
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index a14fe109..3c258165 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -127,7 +127,8 @@
                 inputLength: 20,
                 notFound: false,
                 slotChangeDuration: false,    // if slot change duration and in multiple, set true and after slot change, set false
-                model: this.value
+                model: this.value,
+                currentLabel: this.label
             };
         },
         computed: {
@@ -593,15 +594,15 @@
             if (this.remote) {
                 if (!this.multiple && this.model !== '') {
                     this.selectToChangeQuery = true;
-                    if (this.label === '') this.label = this.model;
-                    this.lastQuery = this.label;
-                    this.query = this.label;
+                    if (this.currentLabel === '') this.currentLabel = this.model;
+                    this.lastQuery = this.currentLabel;
+                    this.query = this.currentLabel;
                 } else if (this.multiple && this.model.length) {
-                    if (this.label.length !== this.model.length) this.label = this.model;
+                    if (this.currentLabel.length !== this.model.length) this.currentLabel = this.model;
                     this.selectedMultiple = this.model.map((item, index) => {
                         return {
                             value: item,
-                            label: this.label[index]
+                            label: this.currentLabel[index]
                         };
                     });
                 }

From e0bd31a64c8ea0452dba1c3e6b4f9a40594f587a Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Wed, 31 May 2017 15:49:41 +0800
Subject: [PATCH 61/68] update Message

Message add closable func, and update params
---
 examples/routers/message.vue                  | 12 ++++
 src/components/base/notification/notice.vue   | 21 +++++--
 .../base/notification/notification.vue        |  1 +
 src/components/message/index.js               | 56 +++++++++++++++----
 src/components/notice/index.js                |  3 +-
 src/styles/components/message.less            | 21 +++++++
 6 files changed, 97 insertions(+), 17 deletions(-)

diff --git a/examples/routers/message.vue b/examples/routers/message.vue
index 4ff90ec4..19644db9 100644
--- a/examples/routers/message.vue
+++ b/examples/routers/message.vue
@@ -1,5 +1,6 @@
 <template>
     <div>
+        <i-button @click.native="info">显示普通提示</i-button>
         <i-button @click.native="success">显示成功提示</i-button>
         <i-button @click.native="warning">显示警告提示</i-button>
         <i-button @click.native="error">显示错误提示</i-button>
@@ -9,6 +10,17 @@
 <script>
     export default {
         methods: {
+            info () {
+//                this.$Message.info('这是一条普通提示');
+                this.$Message.success({
+                    content: '这是一条普通提示2',
+                    duration: 500,
+                    onClose () {
+                        console.log(123)
+                    },
+                    closable: true
+                })
+            },
             success () {
                 this.$Message.success('这是一条成功的提示');
             },
diff --git a/src/components/base/notification/notice.vue b/src/components/base/notification/notice.vue
index dfa0c652..bec1f2fe 100644
--- a/src/components/base/notification/notice.vue
+++ b/src/components/base/notification/notice.vue
@@ -1,10 +1,20 @@
 <template>
     <transition :name="transitionName">
         <div :class="classes" :style="styles">
-            <div :class="[baseClass + '-content']" ref="content" v-html="content"></div>
-            <a :class="[baseClass + '-close']" @click="close" v-if="closable">
-                <i class="ivu-icon ivu-icon-ios-close-empty"></i>
-            </a>
+            <template v-if="type === 'notice'">
+                <div :class="[baseClass + '-content']" ref="content" v-html="content"></div>
+                <a :class="[baseClass + '-close']" @click="close" v-if="closable">
+                    <i class="ivu-icon ivu-icon-ios-close-empty"></i>
+                </a>
+            </template>
+            <template v-if="type === 'message'">
+                <div :class="[baseClass + '-content']" ref="content">
+                    <div :class="[baseClass + '-content-text']" v-html="content"></div>
+                    <a :class="[baseClass + '-close']" @click="close" v-if="closable">
+                        <i class="ivu-icon ivu-icon-ios-close-empty"></i>
+                    </a>
+                </div>
+            </template>
         </div>
     </transition>
 </template>
@@ -19,6 +29,9 @@
                 type: Number,
                 default: 1.5
             },
+            type: {
+                type: String
+            },
             content: {
                 type: String,
                 default: ''
diff --git a/src/components/base/notification/notification.vue b/src/components/base/notification/notification.vue
index 9695b55e..f3750f6b 100644
--- a/src/components/base/notification/notification.vue
+++ b/src/components/base/notification/notification.vue
@@ -5,6 +5,7 @@
             :key="notice.name"
             :prefix-cls="prefixCls"
             :styles="notice.styles"
+            :type="notice.type"
             :content="notice.content"
             :duration="notice.duration"
             :closable="notice.closable"
diff --git a/src/components/message/index.js b/src/components/message/index.js
index 3b9847ed..60d012b1 100644
--- a/src/components/message/index.js
+++ b/src/components/message/index.js
@@ -28,7 +28,7 @@ function getMessageInstance () {
     return messageInstance;
 }
 
-function notice (content, duration = defaultDuration, type, onClose) {
+function notice (content = '', duration = defaultDuration, type, onClose = function () {}, closable = false) {
     if (!onClose) {
         onClose = function () {
 
@@ -52,7 +52,9 @@ function notice (content, duration = defaultDuration, type, onClose) {
                 <span>${content}</span>
             </div>
         `,
-        onClose: onClose
+        onClose: onClose,
+        closable: closable,
+        type: 'message'
     });
 
     // 用于手动消除
@@ -66,20 +68,50 @@ function notice (content, duration = defaultDuration, type, onClose) {
 }
 
 export default {
-    info (content, duration, onClose) {
-        return notice(content, duration, 'info', onClose);
+    info (options) {
+        const type = typeof options;
+        if (type === 'string') {
+            options = {
+                content: options
+            };
+        }
+        return notice(options.content, options.duration, 'info', options.onClose, options.closable);
     },
-    success (content, duration, onClose) {
-        return notice(content, duration, 'success', onClose);
+    success (options) {
+        const type = typeof options;
+        if (type === 'string') {
+            options = {
+                content: options
+            };
+        }
+        return notice(options.content, options.duration, 'success', options.onClose, options.closable);
     },
-    warning (content, duration, onClose) {
-        return notice(content, duration, 'warning', onClose);
+    warning (options) {
+        const type = typeof options;
+        if (type === 'string') {
+            options = {
+                content: options
+            };
+        }
+        return notice(options.content, options.duration, 'warning', options.onClose, options.closable);
     },
-    error (content, duration, onClose) {
-        return notice(content, duration, 'error', onClose);
+    error (options) {
+        const type = typeof options;
+        if (type === 'string') {
+            options = {
+                content: options
+            };
+        }
+        return notice(options.content, options.duration, 'error', options.onClose, options.closable);
     },
-    loading (content, duration, onClose) {
-        return notice(content, duration, 'loading', onClose);
+    loading (options) {
+        const type = typeof options;
+        if (type === 'string') {
+            options = {
+                content: options
+            };
+        }
+        return notice(options.content, options.duration, 'loading', options.onClose, options.closable);
     },
     config (options) {
         if (options.top) {
diff --git a/src/components/notice/index.js b/src/components/notice/index.js
index 13927748..d6104d60 100644
--- a/src/components/notice/index.js
+++ b/src/components/notice/index.js
@@ -71,7 +71,8 @@ function notice (type, options) {
         transitionName: 'move-notice',
         content: content,
         onClose: onClose,
-        closable: true
+        closable: true,
+        type: 'notice'
     });
 }
 
diff --git a/src/styles/components/message.less b/src/styles/components/message.less
index 7196d63b..6e706f12 100644
--- a/src/styles/components/message.less
+++ b/src/styles/components/message.less
@@ -14,6 +14,18 @@
         vertical-align: middle;
         position: absolute;
         left: 50%;
+
+        &-close {
+            position: absolute;
+            right: 4px;
+            top: 9px;
+            color: #999;
+            outline: none;
+
+            i.@{icon-prefix-cls}{
+                .close-base(-3px);
+            }
+        }
     }
 
     &-notice-content {
@@ -25,6 +37,15 @@
         box-shadow: @shadow-base;
         background: #fff;
         display: block;
+        &-text{
+            display: inline-block;
+        }
+    }
+
+    &-notice-closable{
+        .@{message-prefix-cls}-notice-content-text{
+            padding-right: 32px;
+        }
     }
 
     &-success .@{icon-prefix-cls} {

From a50a847ca5f6155623d36dcdd7ec7e6d59b36a6d Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Wed, 31 May 2017 16:14:25 +0800
Subject: [PATCH 62/68] update message

---
 src/components/message/index.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/message/index.js b/src/components/message/index.js
index 60d012b1..70dea763 100644
--- a/src/components/message/index.js
+++ b/src/components/message/index.js
@@ -29,11 +29,6 @@ function getMessageInstance () {
 }
 
 function notice (content = '', duration = defaultDuration, type, onClose = function () {}, closable = false) {
-    if (!onClose) {
-        onClose = function () {
-
-        };
-    }
     const iconType = iconTypes[type];
 
     // if loading

From 9b2034a5abb7a87b17beb7bf845a0aae23aa36bc Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Wed, 31 May 2017 16:40:24 +0800
Subject: [PATCH 63/68] release 2.0.0-rc.15

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index befcef38..18419777 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iview",
-  "version": "2.0.0-rc.14",
+  "version": "2.0.0-rc.15",
   "title": "iView",
   "description": "A high quality  UI components Library with Vue.js",
   "homepage": "http://www.iviewui.com",

From e8e1677b47576ae728ff0d77a8e3d229f2fb7624 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Thu, 1 Jun 2017 10:48:03 +0800
Subject: [PATCH 64/68] Message & Notice support SSR

---
 build/webpack.dev.config.js               |  3 +-
 examples/routers/notice.vue               | 43 +++++++++++++++++------
 src/components/base/notification/index.js | 19 +++++-----
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/build/webpack.dev.config.js b/build/webpack.dev.config.js
index 5803c51e..8c07d166 100644
--- a/build/webpack.dev.config.js
+++ b/build/webpack.dev.config.js
@@ -27,7 +27,8 @@ module.exports = merge(webpackBaseConfig, {
     resolve: {
         alias: {
             iview: '../../src/index',
-            vue: 'vue/dist/vue.js'
+            // vue: 'vue/dist/vue.js'
+            vue: 'vue/dist/vue.runtime.js'
         }
     },
     plugins: [
diff --git a/examples/routers/notice.vue b/examples/routers/notice.vue
index aa0f4e0b..d1a76c58 100644
--- a/examples/routers/notice.vue
+++ b/examples/routers/notice.vue
@@ -1,21 +1,44 @@
 <template>
-    <i-button type="primary" @click.native="time">打开提醒</i-button>
+    <div>
+        <p>带描述信息</p>
+        <Button @click="info(false)">消息</Button>
+        <Button @click="success(false)">成功</Button>
+        <Button @click="warning(false)">警告</Button>
+        <Button @click="error(false)">错误</Button>
+        <p>仅标题</p>
+        <Button @click="info(true)">消息</Button>
+        <Button @click="success(true)">成功</Button>
+        <Button @click="warning(true)">警告</Button>
+        <Button @click="error(true)">错误</Button>
+    </div>
 </template>
 <script>
     export default {
         methods: {
-            time () {
-                this.$Notice.open({
+            info (nodesc) {
+                this.$Notice.info({
                     title: '这是通知标题',
-                    desc: '这条通知不会自动关闭，需要点击关闭按钮才可以关闭。'
+                    desc: nodesc ? '' : '这里是通知描述这里,是通知描述这里是通知描述这里,是通知描述这里,是通知描述这里是通知描述这里是通知描述'
+                });
+            },
+            success (nodesc) {
+                this.$Notice.success({
+                    title: '这是通知标题',
+                    desc: nodesc ? '' : '这里是通知描述这里,是通知描述这里是通知描述这里,是通知描述这里,是通知描述这里是通知描述这里是通知描述'
+                });
+            },
+            warning (nodesc) {
+                this.$Notice.warning({
+                    title: '这是通知标题',
+                    desc: nodesc ? '' : '这里是通知描述这里,是通知描述这里是通知描述这里,是通知描述这里,是通知描述这里是通知描述这里是通知描述'
+                });
+            },
+            error (nodesc) {
+                this.$Notice.error({
+                    title: '这是通知标题',
+                    desc: nodesc ? '' : '这里是通知描述这里,是通知描述这里是通知描述这里,是通知描述这里,是通知描述这里是通知描述这里是通知描述'
                 });
             }
-        },
-        mounted () {
-            this.$Notice.config({
-                top: 150,
-                duration: 30
-            });
         }
     }
 </script>
diff --git a/src/components/base/notification/index.js b/src/components/base/notification/index.js
index 7ab2c625..794bac56 100644
--- a/src/components/base/notification/index.js
+++ b/src/components/base/notification/index.js
@@ -10,15 +10,18 @@ Notification.newInstance = properties => {
         props += ' :' + camelcaseToHyphen(prop) + '=' + prop;
     });
 
-    const div = document.createElement('div');
-    div.innerHTML = `<notification${props}></notification>`;
-    document.body.appendChild(div);
-
-    const notification = new Vue({
-        el: div,
+    const Instance = new Vue({
         data: _props,
-        components: { Notification }
-    }).$children[0];
+        render (h) {
+            return h(Notification, {
+                props: _props
+            })
+        }
+    });
+
+    const component = Instance.$mount();
+    document.body.appendChild(component.$el);
+    const notification = Instance.$children[0];
 
     return {
         notice (noticeProps) {

From dd28e57f2726346fc32bae4088345da29b3d400c Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Thu, 1 Jun 2017 10:52:27 +0800
Subject: [PATCH 65/68] update Notice

---
 src/components/base/notification/index.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/base/notification/index.js b/src/components/base/notification/index.js
index 794bac56..b9453cf8 100644
--- a/src/components/base/notification/index.js
+++ b/src/components/base/notification/index.js
@@ -1,21 +1,15 @@
 import Notification from './notification.vue';
 import Vue from 'vue';
-import { camelcaseToHyphen } from '../../../utils/assist';
 
 Notification.newInstance = properties => {
     const _props = properties || {};
 
-    let props = '';
-    Object.keys(_props).forEach(prop => {
-        props += ' :' + camelcaseToHyphen(prop) + '=' + prop;
-    });
-
     const Instance = new Vue({
         data: _props,
         render (h) {
             return h(Notification, {
                 props: _props
-            })
+            });
         }
     });
 

From 24c8f4eaba6250092d30f0c7b2282a3a7f5797e6 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Thu, 1 Jun 2017 11:07:30 +0800
Subject: [PATCH 66/68] LoadingBar support SSR

---
 src/components/loading-bar/loading-bar.js | 27 +++++++++++------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/components/loading-bar/loading-bar.js b/src/components/loading-bar/loading-bar.js
index e978fb48..eb30043f 100644
--- a/src/components/loading-bar/loading-bar.js
+++ b/src/components/loading-bar/loading-bar.js
@@ -1,24 +1,21 @@
 import LoadingBar from './loading-bar.vue';
 import Vue from 'vue';
-import { camelcaseToHyphen } from '../../utils/assist';
 
 LoadingBar.newInstance = properties => {
     const _props = properties || {};
 
-    let props = '';
-    Object.keys(_props).forEach(prop => {
-        props += ' :' + camelcaseToHyphen(prop) + '=' + prop;
+    const Instance = new Vue({
+        data: _props,
+        render (h) {
+            return h(LoadingBar, {
+                props: _props
+            });
+        }
     });
 
-    const div = document.createElement('div');
-    div.innerHTML = `<loading-bar${props}></loading-bar>`;
-    document.body.appendChild(div);
-
-    const loading_bar = new Vue({
-        el: div,
-        data: _props,
-        components: { LoadingBar }
-    }).$children[0];
+    const component = Instance.$mount();
+    document.body.appendChild(component.$el);
+    const loading_bar = Instance.$children[0];
 
     return {
         update (options) {
@@ -34,7 +31,9 @@ LoadingBar.newInstance = properties => {
         },
         component: loading_bar,
         destroy () {
-            document.body.removeChild(div);
+            setTimeout(function() {
+                document.body.removeChild(document.getElementsByClassName('ivu-loading-bar')[0].parentElement);
+            }, 500);
         }
     };
 };

From 77cf1cd5738221778b0a6b180ddb787c66429740 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Thu, 1 Jun 2017 12:32:00 +0800
Subject: [PATCH 67/68] $Modal support SSR

---
 examples/routers/modal.vue      |  56 +++++++-----
 src/components/modal/confirm.js | 145 +++++++++++++++++++++++++-------
 src/components/modal/modal.vue  |   2 +-
 3 files changed, 148 insertions(+), 55 deletions(-)

diff --git a/examples/routers/modal.vue b/examples/routers/modal.vue
index 7e9cae22..335473d0 100644
--- a/examples/routers/modal.vue
+++ b/examples/routers/modal.vue
@@ -1,33 +1,45 @@
 <template>
     <div>
-        <Button type="primary" @click="modal1 = true">显示对话框</Button>
-        
-        <Modal
-                v-model="modal1"
-                :title="title"
-                @on-ok="ok"
-                :mask-closable="false"
-                @on-cancel="cancel">
-            <p><Button type="ghost" @click="title = '这是标题'">设置标题</Button> {{title}}</p>
-            <p>对话框内容</p>
-            <p>对话框内容</p>
-        </Modal>
+        <Button @click="confirm">标准</Button>
+        <Button @click="custom">自定义按钮文字</Button>
+        <Button @click="async">异步关闭</Button>
     </div>
 </template>
 <script>
     export default {
-        data () {
-            return {
-                modal1: true,
-                title:''
-            }
-        },
         methods: {
-            ok () {
-                this.$Message.info('点击了确定');
+            confirm () {
+                this.$Modal.confirm({
+                    title: '确认对话框标题',
+                    content: '<p>一些对话框内容</p><p>一些对话框内容</p>',
+                    onOk: () => {
+                        this.$Message.info('点击了确定');
+                    },
+                    onCancel: () => {
+                        this.$Message.info('点击了取消');
+                    }
+                });
             },
-            cancel () {
-                this.$Message.info('点击了取消');
+            custom () {
+                this.$Modal.confirm({
+                    title: '确认对话框标题',
+                    content: '<p>一些对话框内容</p><p>一些对话框内容</p>',
+                    okText: 'OK',
+                    cancelText: 'Cancel'
+                });
+            },
+            async () {
+                this.$Modal.confirm({
+                    title: '确认对话框标题',
+                    content: '<p>对话框将在 2秒 后关闭</p>',
+                    loading: true,
+                    onOk: () => {
+                        setTimeout(() => {
+                            this.$Modal.remove();
+                            this.$Message.info('异步关闭了对话框');
+                        }, 2000);
+                    }
+                });
             }
         }
     }
diff --git a/src/components/modal/confirm.js b/src/components/modal/confirm.js
index 04ccb5c9..e5681ddb 100644
--- a/src/components/modal/confirm.js
+++ b/src/components/modal/confirm.js
@@ -1,8 +1,6 @@
 import Vue from 'vue';
 import Modal from './modal.vue';
-import Icon from '../icon/icon.vue';
-import iButton from '../button/button.vue';
-import { camelcaseToHyphen } from '../../utils/assist';
+import Button from '../button/button.vue';
 import Locale from '../../mixins/locale';
 
 const prefixCls = 'ivu-modal-confirm';
@@ -10,36 +8,34 @@ const prefixCls = 'ivu-modal-confirm';
 Modal.newInstance = properties => {
     const _props = properties || {};
 
-    let props = '';
-    Object.keys(_props).forEach(prop => {
-        props += ' :' + camelcaseToHyphen(prop) + '=' + prop;
-    });
+    // let props = '';
+    // Object.keys(_props).forEach(prop => {
+    //     props += ' :' + camelcaseToHyphen(prop) + '=' + prop;
+    // });
+    //
+    // const div = document.createElement('div');
+    // div.innerHTML = `
+    //     <Modal${props} v-model="visible" :width="width" :scrollable="scrollable">
+    //         <div class="${prefixCls}">
+    //             <div class="${prefixCls}-head">
+    //                 <div class="${prefixCls}-head-title" v-html="title"></div>
+    //             </div>
+    //             <div class="${prefixCls}-body">
+    //                 <div :class="iconTypeCls"><i :class="iconNameCls"></i></div>
+    //                 <div v-html="body"></div>
+    //             </div>
+    //             <div class="${prefixCls}-footer">
+    //                 <i-button type="text" size="large" v-if="showCancel" @click.native="cancel">{{ localeCancelText }}</i-button>
+    //                 <i-button type="primary" size="large" :loading="buttonLoading" @click.native="ok">{{ localeOkText }}</i-button>
+    //             </div>
+    //         </div>
+    //     </Modal>
+    // `;
+    // document.body.appendChild(div);
 
-    const div = document.createElement('div');
-    div.innerHTML = `
-        <Modal${props} v-model="visible" :width="width" :scrollable="scrollable">
-            <div class="${prefixCls}">
-                <div class="${prefixCls}-head">
-                    <div class="${prefixCls}-head-title" v-html="title"></div>
-                </div>
-                <div class="${prefixCls}-body">
-                    <div :class="iconTypeCls"><i :class="iconNameCls"></i></div>
-                    <div v-html="body"></div>
-                </div>
-                <div class="${prefixCls}-footer">
-                    <i-button type="text" size="large" v-if="showCancel" @click.native="cancel">{{ localeCancelText }}</i-button>
-                    <i-button type="primary" size="large" :loading="buttonLoading" @click.native="ok">{{ localeOkText }}</i-button>
-                </div>
-            </div>
-        </Modal>
-    `;
-    document.body.appendChild(div);
-
-    const modal = new Vue({
-        el: div,
+    const Instance = new Vue({
         mixins: [ Locale ],
-        components: { Modal, iButton, Icon },
-        data: Object.assign(_props, {
+        data: Object.assign({}, _props, {
             visible: false,
             width: 416,
             title: '',
@@ -53,6 +49,87 @@ Modal.newInstance = properties => {
             buttonLoading: false,
             scrollable: false
         }),
+        render (h) {
+            let footerVNodes = [];
+            if (this.showCancel) {
+                footerVNodes.push(h(Button, {
+                    props: {
+                        type: 'text',
+                        size: 'large'
+                    },
+                    on: {
+                        click: this.cancel
+                    }
+                }, this.localeCancelText));
+            }
+            footerVNodes.push(h(Button, {
+                props: {
+                    type: 'primary',
+                    size: 'large',
+                    loading: this.buttonLoading
+                },
+                on: {
+                    click: this.ok
+                }
+            }, this.localeOkText));
+
+            return h(Modal, {
+                props: Object.assign({}, _props, {
+                    width: this.width,
+                    scrollable: this.scrollable
+                }),
+                domProps: {
+                    value: this.visible
+                },
+                on: {
+                    input: (status) => {
+                        this.visible = status;
+                    }
+                }
+            }, [
+                h('div', {
+                    attrs: {
+                        class: prefixCls
+                    }
+                }, [
+                    h('div', {
+                        attrs: {
+                            class: `${prefixCls}-head`
+                        }
+                    }, h('div', {
+                        attrs: {
+                            class: `${prefixCls}-head-title`
+                        },
+                        domProps: {
+                            innerHTML: this.title
+                        }
+                    })),
+                    h('div', {
+                        attrs: {
+                            class: `${prefixCls}-body`
+                        }
+                    }, [
+                        h('div', {
+                            class: this.iconTypeCls
+                        }, [
+                            h('i', {
+                                class: this.iconNameCls
+                            })
+                        ]),
+                        h('div', {
+                            domProps: {
+                                innerHTML: this.body
+                            }
+                        })
+                    ]),
+                    h('div', {
+                        attrs: {
+                            class: `${prefixCls}-footer`
+                        }
+                    }, footerVNodes)
+                ])
+            ]);
+        },
         computed: {
             iconTypeCls () {
                 return [
@@ -111,7 +188,11 @@ Modal.newInstance = properties => {
             onCancel () {},
             onRemove () {}
         }
-    }).$children[0];
+    });
+
+    const component = Instance.$mount();
+    document.body.appendChild(component.$el);
+    const modal = Instance.$children[0];
 
     return {
         show (props) {
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index b27b6ac6..7840e9bb 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-transfer-dom>
+    <div>
         <transition :name="transitionNames[1]">
             <div :class="maskClasses" v-show="visible" @click="mask"></div>
         </transition>

From 48e7799edf1a3d707f0ddc0ae7fb4205785fdf2b Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Thu, 1 Jun 2017 12:36:44 +0800
Subject: [PATCH 68/68] update $Modal

---
 src/components/modal/confirm.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/modal/confirm.js b/src/components/modal/confirm.js
index e5681ddb..edef2fc1 100644
--- a/src/components/modal/confirm.js
+++ b/src/components/modal/confirm.js
@@ -96,14 +96,16 @@ Modal.newInstance = properties => {
                         attrs: {
                             class: `${prefixCls}-head`
                         }
-                    }, h('div', {
-                        attrs: {
-                            class: `${prefixCls}-head-title`
-                        },
-                        domProps: {
-                            innerHTML: this.title
-                        }
-                    })),
+                    }, [
+                        h('div', {
+                            attrs: {
+                                class: `${prefixCls}-head-title`
+                            },
+                            domProps: {
+                                innerHTML: this.title
+                            }
+                        })
+                    ]),
                     h('div', {
                         attrs: {
                             class: `${prefixCls}-body`