From 1594942f2cbe58dad042e2bbd431f0f2edc002a2 Mon Sep 17 00:00:00 2001
From: leonine <326026108@qq.com>
Date: Wed, 15 Feb 2017 16:04:35 +0800
Subject: [PATCH 01/10] =?UTF-8?q?itable=20=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E8=A1=8C=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/table.vue |  6 +++++-
 test/routers/table.vue         | 35 ++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 0898092e..bbd73cca 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -548,7 +548,11 @@
                 this.data.forEach((row, index) => {
                     const newRow = deepCopy(row);// todo 直接替换
                     newRow._isHover = false;
-                    newRow._isChecked = false;
+                    if(newRow.checked){// 传checked:true 可以设置该行为默认选中状态
+                        newRow._isChecked = newRow.checked;
+                    }else{
+                        newRow._isChecked = false;
+                    }
                     newRow._isHighlight = false;
                     data[index] = newRow;
                 });
diff --git a/test/routers/table.vue b/test/routers/table.vue
index 101cd12f..99b29264 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -1,5 +1,8 @@
 <template>
     <i-table border :content="self" :columns="columns7" :data="data6"></i-table>
+
+     默认选中行
+     <i-table border :content="self" :columns="columns8" :data="data8"></i-table>
 </template>
 <script>
     export default {
@@ -64,6 +67,38 @@
                         age: 26,
                         address: '深圳市南山区深南大道'
                     }
+                ],
+                columns8:[
+                     {
+                        type: 'selection',
+                        width: 60,
+                        align: 'center'
+                    },
+                    {
+                        title: '名称',
+                        key: 'name'
+                    },
+                    {
+                        title: '年龄',
+                        key: 'age'
+                    },
+                    {
+                        title: '地址',
+                        key: 'address'
+                    }
+                ],
+                data8:[
+                     {
+                        name: '王小明',
+                        age: 18,
+                        address: '北京市朝阳区芍药居',
+                        checked:true  // 传checked 可以设置该行为默认选中状态
+                    },
+                    {
+                        name: '张小刚',
+                        age: 25,
+                        address: '北京市海淀区西二旗'
+                    }
                 ]
             }
         },

From 2404849c30fd0eacb0d40352335d66a274f42379 Mon Sep 17 00:00:00 2001
From: leonine <326026108@qq.com>
Date: Mon, 20 Feb 2017 09:53:10 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=8E=9F=E4=BD=9C?=
 =?UTF-8?q?=E8=80=85=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                     |  2 +-
 src/components/table/table.vue   | 12 ++++++++----
 src/components/transfer/list.vue |  2 +-
 test/routers/table.vue           | 23 +++++++++++++++--------
 test/routers/transfer.vue        |  4 ++++
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index fb7e8210..79b9a66d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iview",
-  "version": "0.9.17",
+  "version": "1.0.0",
   "title": "iView",
   "description": "A high quality  UI components Library with Vue.js",
   "homepage": "http://www.iviewui.com",
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index bbd73cca..50a700eb 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -548,12 +548,16 @@
                 this.data.forEach((row, index) => {
                     const newRow = deepCopy(row);// todo 直接替换
                     newRow._isHover = false;
-                    if(newRow.checked){// 传checked:true 可以设置该行为默认选中状态
-                        newRow._isChecked = newRow.checked;
-                    }else{
+                    if (newRow._checked) {
+                        newRow._isChecked = newRow._checked;
+                    } else {
                         newRow._isChecked = false;
                     }
-                    newRow._isHighlight = false;
+                    if (newRow._highlight) {
+                        newRow._isHighlight = newRow._highlight;
+                    } else {
+                        newRow._isHighlight = false;
+                    }
                     data[index] = newRow;
                 });
                 return data;
diff --git a/src/components/transfer/list.vue b/src/components/transfer/list.vue
index e8e323ec..9f5fc8bb 100644
--- a/src/components/transfer/list.vue
+++ b/src/components/transfer/list.vue
@@ -18,7 +18,7 @@
                     :class="itemClasses(item)"
                     @click.prevent="select(item)">
                     <Checkbox :checked="isCheck(item)" :disabled="item.disabled"></Checkbox>
-                    <span>{{ showLabel(item) }}</span>
+                    <span>{{{ showLabel(item) }}}</span>
                 </li>
                 <li :class="prefixCls + '-content-not-found'">{{ notFoundText }}</li>
             </ul>
diff --git a/test/routers/table.vue b/test/routers/table.vue
index 99b29264..b8e7a24b 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -1,8 +1,5 @@
 <template>
-    <i-table border :content="self" :columns="columns7" :data="data6"></i-table>
-
-     默认选中行
-     <i-table border :content="self" :columns="columns8" :data="data8"></i-table>
+    <i-table highlight-row border :content="self" :columns="columns7" :data="data6"></i-table>
 </template>
 <script>
     export default {
@@ -10,6 +7,11 @@
             return {
                 self: this,
                 columns7: [
+                    {
+                        type: 'selection',
+                        width: 60,
+                        align: 'center'
+                    },
                     {
                         title: '姓名',
                         key: 'name',
@@ -50,22 +52,27 @@
                     {
                         name: '王小明',
                         age: 18,
-                        address: '北京市朝阳区芍药居'
+                        address: '北京市朝阳区芍药居',
+                        _highlight: true,
+                        _checked: true
                     },
                     {
                         name: '张小刚',
                         age: 25,
-                        address: '北京市海淀区西二旗'
+                        address: '北京市海淀区西二旗',
+                        _checked: true
                     },
                     {
                         name: '李小红',
                         age: 30,
-                        address: '上海市浦东新区世纪大道'
+                        address: '上海市浦东新区世纪大道',
+                        _checked: true
                     },
                     {
                         name: '周小伟',
                         age: 26,
-                        address: '深圳市南山区深南大道'
+                        address: '深圳市南山区深南大道',
+                        _checked: true
                     }
                 ],
                 columns8:[
diff --git a/test/routers/transfer.vue b/test/routers/transfer.vue
index 7b04e0cd..a8c0ba43 100644
--- a/test/routers/transfer.vue
+++ b/test/routers/transfer.vue
@@ -3,6 +3,7 @@
             :data="data2"
             :target-keys="targetKeys2"
             filterable
+            :render-format="rf"
             :filter-method="filterMethod"
             @on-change="handleChange2"></Transfer>
 </template>
@@ -37,6 +38,9 @@
             },
             filterMethod (data, query) {
                 return data.label.indexOf(query) > -1;
+            },
+            rf (data) {
+                return '<i class="ivu-icon ivu-icon-alert"></i>' + data.label;
             }
         }
     }

From b0bbb632eb94977b0978f79df3aa4fd1d5f60cb1 Mon Sep 17 00:00:00 2001
From: leonine <326026108@qq.com>
Date: Mon, 20 Feb 2017 10:01:37 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/routers/table.vue | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/test/routers/table.vue b/test/routers/table.vue
index b8e7a24b..be1f25ce 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -74,38 +74,6 @@
                         address: '深圳市南山区深南大道',
                         _checked: true
                     }
-                ],
-                columns8:[
-                     {
-                        type: 'selection',
-                        width: 60,
-                        align: 'center'
-                    },
-                    {
-                        title: '名称',
-                        key: 'name'
-                    },
-                    {
-                        title: '年龄',
-                        key: 'age'
-                    },
-                    {
-                        title: '地址',
-                        key: 'address'
-                    }
-                ],
-                data8:[
-                     {
-                        name: '王小明',
-                        age: 18,
-                        address: '北京市朝阳区芍药居',
-                        checked:true  // 传checked 可以设置该行为默认选中状态
-                    },
-                    {
-                        name: '张小刚',
-                        age: 25,
-                        address: '北京市海淀区西二旗'
-                    }
                 ]
             }
         },

From 0dcc948256e70b657f0e01fa3491f84b32b88d41 Mon Sep 17 00:00:00 2001
From: leonine <326026108@qq.com>
Date: Mon, 20 Feb 2017 11:17:47 +0800
Subject: [PATCH 04/10] =?UTF-8?q?itable=20=E6=B7=BB=E5=8A=A0=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E6=9F=90=E8=A1=8C=E9=80=89=E4=B8=AD=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/cell.vue       |  3 ++-
 src/components/table/table-body.vue | 10 ++++++++--
 src/components/table/table.vue      | 13 ++++++++++++-
 src/styles/components/table.less    |  8 ++++++++
 src/styles/custom.less              |  1 +
 test/routers/table.vue              |  3 ++-
 6 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index 6e916252..8e68af4c 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -2,7 +2,7 @@
     <div :class="classes">
         <template v-if="renderType === 'index'">{{naturalIndex + 1}}</template>
         <template v-if="renderType === 'selection'">
-            <Checkbox :checked="checked" @on-change="toggleSelect"></Checkbox>
+            <Checkbox :checked="checked" @on-change="toggleSelect" :disabled="disabled"></Checkbox>
         </template>
         <template v-if="renderType === 'normal'">{{{ row[column.key] }}}</template>
     </div>
@@ -19,6 +19,7 @@
             naturalIndex: Number,    // index of rebuildData
             index: Number,           // _index of data
             checked: Boolean,
+            disabled:Boolean,
             fixed: {
                 type: [Boolean, String],
                 default: false
diff --git a/src/components/table/table-body.vue b/src/components/table/table-body.vue
index b6bb8d3f..e543ccc9 100644
--- a/src/components/table/table-body.vue
+++ b/src/components/table/table-body.vue
@@ -19,7 +19,9 @@
                         :column="column"
                         :natural-index="index"
                         :index="row._index"
-                        :checked="rowChecked(row._index)"></Cell>
+                        :checked="rowChecked(row._index)"
+                        :disabled="rowDisabled(row._index)"
+                        ></Cell>
                 </td>
             </tr>
         </tbody>
@@ -51,13 +53,17 @@
                     this.rowClsName(_index),
                     {
                         [`${this.prefixCls}-row-highlight`]: this.objData[_index] && this.objData[_index]._isHighlight,
-                        [`${this.prefixCls}-row-hover`]: this.objData[_index] && this.objData[_index]._isHover
+                        [`${this.prefixCls}-row-hover`]: this.objData[_index] && this.objData[_index]._isHover,
+                        [`${this.prefixCls}-row-disabled`]: this.objData[_index] && this.objData[_index]._isDisabled
                     }
                 ];
             },
             rowChecked (_index) {
                 return this.objData[_index] && this.objData[_index]._isChecked;
             },
+            rowDisabled(_index){
+                return this.objData[_index] && this.objData[_index]._isDisabled;
+            },
             rowClsName (_index) {
                 return this.$parent.rowClassName(this.objData[_index], _index);
             },
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 50a700eb..9f3e325b 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -392,7 +392,12 @@
             },
             selectAll (status) {
                 this.rebuildData.forEach((data) => {
-                    this.objData[data._index]._isChecked = status;
+                    if(this.objData[data._index]._isDisabled){
+                        this.objData[data._index]._isChecked = false
+                    }else{
+                        this.objData[data._index]._isChecked = status;
+                    }
+                    
                 });
 
                 const selection = this.getSelection();
@@ -558,6 +563,12 @@
                     } else {
                         newRow._isHighlight = false;
                     }
+
+                    if(newRow._disabled){
+                        newRow._isDisabled = newRow._disabled;
+                    }else{
+                        newRow._isDisabled = false;
+                    }
                     data[index] = newRow;
                 });
                 return data;
diff --git a/src/styles/components/table.less b/src/styles/components/table.less
index 576deb5c..20a84bbb 100644
--- a/src/styles/components/table.less
+++ b/src/styles/components/table.less
@@ -209,6 +209,14 @@
         }
     }
 
+    &-row-disabled,
+    tr&-row-disabled,
+    {
+        td{
+            background-color: @table-td-disabled-ng;
+        }
+    }
+
     &-fixed, &-fixed-right{
         position: absolute;
         top: 0;
diff --git a/src/styles/custom.less b/src/styles/custom.less
index fb3367f3..3e51cfd8 100644
--- a/src/styles/custom.less
+++ b/src/styles/custom.less
@@ -43,6 +43,7 @@
 @table-td-stripe-bg           : #f5f7f9;
 @table-td-hover-bg            : #ebf7ff;
 @table-td-highlight-bg        : #ebf7ff;
+@table-td-disabled-ng         : #c3cbd6;
 @menu-dark-active-bg          : #313540;
 @date-picker-cell-hover-bg    : #e1f0fe;
 
diff --git a/test/routers/table.vue b/test/routers/table.vue
index be1f25ce..b55a79be 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -66,7 +66,8 @@
                         name: '李小红',
                         age: 30,
                         address: '上海市浦东新区世纪大道',
-                        _checked: true
+                        _checked: false,
+                        _disabled: true
                     },
                     {
                         name: '周小伟',

From bc1dfd602d4dc3cef4d626dafba96e65a18b8fa1 Mon Sep 17 00:00:00 2001
From: leonine <326026108@qq.com>
Date: Mon, 20 Feb 2017 11:21:17 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=BF=98=E8=AE=B0=20=20run=20test=20?=
 =?UTF-8?q?=E5=B0=91=E4=BA=86;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 9f3e325b..5607c6fc 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -393,7 +393,7 @@
             selectAll (status) {
                 this.rebuildData.forEach((data) => {
                     if(this.objData[data._index]._isDisabled){
-                        this.objData[data._index]._isChecked = false
+                        this.objData[data._index]._isChecked = false;
                     }else{
                         this.objData[data._index]._isChecked = status;
                     }

From 1952df8cec81140b8f211ebaeba9fd18a17916eb Mon Sep 17 00:00:00 2001
From: leonine <326026108@qq.com>
Date: Wed, 22 Feb 2017 15:39:03 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9carousel=E5=9C=A8IE?=
 =?UTF-8?q?=E4=B8=8B=20=20active=20=E6=A0=B7=E5=BC=8F=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/carousel/carousel.vue b/src/components/carousel/carousel.vue
index d4127eb5..03ad8c52 100644
--- a/src/components/carousel/carousel.vue
+++ b/src/components/carousel/carousel.vue
@@ -13,7 +13,7 @@
         </button>
         <ul :class="dotsClasses">
             <template v-for="n in slides.length">
-                <li :class="{ [`${prefixCls}-active`]: n === currentIndex }"
+                <li :class="[n === currentIndex ? prefixCls+'-active':'' ]"
                     @click="dotsEvent('click', n)"
                     @mouseover="dotsEvent('hover', n)">
                     <button></button>

From 87379c82058237f35c3e4ea2b5be4311205ad7b2 Mon Sep 17 00:00:00 2001
From: leonine <326026108@qq.com>
Date: Wed, 22 Feb 2017 17:30:39 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E8=A1=8C=E7=9A=84=20tr>td=20=E7=9A=84disabled=20=E7=9A=84css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/cell.vue       | 2 +-
 src/components/table/table-body.vue | 3 +--
 src/styles/components/table.less    | 8 --------
 src/styles/custom.less              | 1 -
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index 8e68af4c..c866e0e3 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -19,7 +19,7 @@
             naturalIndex: Number,    // index of rebuildData
             index: Number,           // _index of data
             checked: Boolean,
-            disabled:Boolean,
+            disabled: Boolean,
             fixed: {
                 type: [Boolean, String],
                 default: false
diff --git a/src/components/table/table-body.vue b/src/components/table/table-body.vue
index e543ccc9..b9b50eb5 100644
--- a/src/components/table/table-body.vue
+++ b/src/components/table/table-body.vue
@@ -53,8 +53,7 @@
                     this.rowClsName(_index),
                     {
                         [`${this.prefixCls}-row-highlight`]: this.objData[_index] && this.objData[_index]._isHighlight,
-                        [`${this.prefixCls}-row-hover`]: this.objData[_index] && this.objData[_index]._isHover,
-                        [`${this.prefixCls}-row-disabled`]: this.objData[_index] && this.objData[_index]._isDisabled
+                        [`${this.prefixCls}-row-hover`]: this.objData[_index] && this.objData[_index]._isHover
                     }
                 ];
             },
diff --git a/src/styles/components/table.less b/src/styles/components/table.less
index 20a84bbb..576deb5c 100644
--- a/src/styles/components/table.less
+++ b/src/styles/components/table.less
@@ -209,14 +209,6 @@
         }
     }
 
-    &-row-disabled,
-    tr&-row-disabled,
-    {
-        td{
-            background-color: @table-td-disabled-ng;
-        }
-    }
-
     &-fixed, &-fixed-right{
         position: absolute;
         top: 0;
diff --git a/src/styles/custom.less b/src/styles/custom.less
index 3e51cfd8..fb3367f3 100644
--- a/src/styles/custom.less
+++ b/src/styles/custom.less
@@ -43,7 +43,6 @@
 @table-td-stripe-bg           : #f5f7f9;
 @table-td-hover-bg            : #ebf7ff;
 @table-td-highlight-bg        : #ebf7ff;
-@table-td-disabled-ng         : #c3cbd6;
 @menu-dark-active-bg          : #313540;
 @date-picker-cell-hover-bg    : #e1f0fe;
 

From c7315098532c3d79c98dfb1d5eded3f71ea3a54a Mon Sep 17 00:00:00 2001
From: leonine <326026108@qq.com>
Date: Thu, 23 Feb 2017 14:29:49 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9A=201.=E5=A6=82=E6=9E=9C=E6=9F=90?=
 =?UTF-8?q?=E8=A1=8C=E7=A6=81=E7=94=A8=5Fdisabled=3Dtrue,=E5=88=99?=
 =?UTF-8?q?=E8=BF=99=E8=A1=8C=E7=9A=84=5Fchecked,=E6=97=A0=E8=AE=BA?=
 =?UTF-8?q?=E5=A6=82=E4=BD=95=E9=83=BD=E6=98=AFfalse,=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E7=9A=84=E7=9B=AE=E7=9A=84=E5=B0=B1=E6=98=AF?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9=202.=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9F=90=E8=A1=8C=E8=AE=BE=E7=BD=AE=5Fdisabled=3Dtrue=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=85=A8=E9=80=89=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=9C=89=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/table-head.vue | 11 +++++++++--
 src/components/table/table.vue      | 17 ++++++++++-------
 test/routers/table.vue              | 11 +++++++----
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index b5f96d55..e0dd1d68 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -84,16 +84,23 @@
             },
             isSelectAll () {
                 let isSelectAll = true;
+                let isAllDisabled = true;
                 if (!this.data.length) isSelectAll = false;
 
                 for (let i = 0; i < this.data.length; i++) {
-                    if (!this.objData[this.data[i]._index]._isChecked) {
+                    if(this.objData[this.data[i]._index]._isDisabled){
+                        isAllDisabled = isAllDisabled && true;
+                        continue;
+                    }else{
+                        isAllDisabled = isAllDisabled && false;
+                    } 
+                    if (!this.objData[this.data[i]._index]._isChecked ) {
                         isSelectAll = false;
                         break;
                     }
                 }
 
-                return isSelectAll;
+                return isAllDisabled ? false : isSelectAll;
             }
         },
         methods: {
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 5607c6fc..43787fa2 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -553,8 +553,17 @@
                 this.data.forEach((row, index) => {
                     const newRow = deepCopy(row);// todo 直接替换
                     newRow._isHover = false;
+                    if(newRow._disabled){
+                        newRow._isDisabled = newRow._disabled;
+                    }else{
+                        newRow._isDisabled = false;
+                    }
                     if (newRow._checked) {
-                        newRow._isChecked = newRow._checked;
+                        if(newRow._isDisabled){
+                            newRow._isChecked = false;
+                        }else{
+                            newRow._isChecked =  newRow._checked;
+                        }
                     } else {
                         newRow._isChecked = false;
                     }
@@ -563,12 +572,6 @@
                     } else {
                         newRow._isHighlight = false;
                     }
-
-                    if(newRow._disabled){
-                        newRow._isDisabled = newRow._disabled;
-                    }else{
-                        newRow._isDisabled = false;
-                    }
                     data[index] = newRow;
                 });
                 return data;
diff --git a/test/routers/table.vue b/test/routers/table.vue
index b55a79be..a4ec76cb 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -54,26 +54,29 @@
                         age: 18,
                         address: '北京市朝阳区芍药居',
                         _highlight: true,
-                        _checked: true
+                        _checked: true,
+                        _disabled: false
                     },
                     {
                         name: '张小刚',
                         age: 25,
                         address: '北京市海淀区西二旗',
-                        _checked: true
+                        _checked: false,
+                        _disabled: true
                     },
                     {
                         name: '李小红',
                         age: 30,
                         address: '上海市浦东新区世纪大道',
-                        _checked: false,
+                        _checked: true,
                         _disabled: true
                     },
                     {
                         name: '周小伟',
                         age: 26,
                         address: '深圳市南山区深南大道',
-                        _checked: true
+                        _checked: true,
+                        _disabled: false
                     }
                 ]
             }

From cd85c675101d8f2e566fe0f389d8d876ed48bb9d Mon Sep 17 00:00:00 2001
From: leonine <326026108@qq.com>
Date: Thu, 23 Feb 2017 16:51:43 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=5Fchecked=3Dtrue=20?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=9C=A8=5Fdisabled=3Dtrue=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E8=A2=AB=E5=8F=96=E6=B6=88=E4=BA=86=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/table-head.vue | 12 ++----------
 src/components/table/table.vue      | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index e0dd1d68..e026b904 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -84,23 +84,15 @@
             },
             isSelectAll () {
                 let isSelectAll = true;
-                let isAllDisabled = true;
                 if (!this.data.length) isSelectAll = false;
-
                 for (let i = 0; i < this.data.length; i++) {
-                    if(this.objData[this.data[i]._index]._isDisabled){
-                        isAllDisabled = isAllDisabled && true;
-                        continue;
-                    }else{
-                        isAllDisabled = isAllDisabled && false;
-                    } 
-                    if (!this.objData[this.data[i]._index]._isChecked ) {
+                    if (!this.objData[this.data[i]._index]._isChecked && !this.objData[this.data[i]._index]._isDisabled) {
                         isSelectAll = false;
                         break;
                     }
                 }
 
-                return isAllDisabled ? false : isSelectAll;
+                return isSelectAll;
             }
         },
         methods: {
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 43787fa2..fbd71666 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -391,15 +391,21 @@
                 this.$emit('on-selection-change', selection);
             },
             selectAll (status) {
-                this.rebuildData.forEach((data) => {
+                // this.rebuildData.forEach((data) => {
+                //     if(this.objData[data._index]._isDisabled){
+                //         this.objData[data._index]._isChecked = false;
+                //     }else{
+                //         this.objData[data._index]._isChecked = status;
+                //     }
+                    
+                // });
+                for(const data of this.rebuildData){
                     if(this.objData[data._index]._isDisabled){
-                        this.objData[data._index]._isChecked = false;
+                        continue;
                     }else{
                         this.objData[data._index]._isChecked = status;
                     }
-                    
-                });
-
+                }
                 const selection = this.getSelection();
                 if (status) {
                     this.$emit('on-select-all', selection);
@@ -559,11 +565,7 @@
                         newRow._isDisabled = false;
                     }
                     if (newRow._checked) {
-                        if(newRow._isDisabled){
-                            newRow._isChecked = false;
-                        }else{
-                            newRow._isChecked =  newRow._checked;
-                        }
+                        newRow._isChecked =  newRow._checked;
                     } else {
                         newRow._isChecked = false;
                     }

From c52c64b65a5125b7c4756560292538b558077903 Mon Sep 17 00:00:00 2001
From: leonine <326026108@qq.com>
Date: Thu, 23 Feb 2017 16:53:51 +0800
Subject: [PATCH 10/10] =?UTF-8?q?table=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4not=20important?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/routers/table.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/routers/table.vue b/test/routers/table.vue
index a4ec76cb..cb8f0821 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -75,7 +75,7 @@
                         name: '周小伟',
                         age: 26,
                         address: '深圳市南山区深南大道',
-                        _checked: true,
+                        _checked: false,
                         _disabled: false
                     }
                 ]