From 17db7df4fd27fba03db50ef2afb17c31078bb3d7 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Sun, 3 Sep 2017 12:26:16 +0800
Subject: [PATCH] fixed #1751

---
 examples/routers/table.vue          | 55 ++++++++++++-------------------------------------------
 src/components/table/table-head.vue |  1 +
 2 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index c48347b..19f9a73 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,27 +1,15 @@
 <template>
-    <Table :columns="columns10" :data="data9"></Table>
+    <Table border :columns="columns4" :data="data1"></Table>
 </template>
 <script>
-    import expandRow from '../components/tableExpand.vue';
     export default {
-        components: { expandRow },
         data () {
             return {
-                columns10: [
+                columns4: [
                     {
-                        type: 'expand',
-                        width: 100,
-                        title: '展',
-                        renderHeader (h) {
-                            return h('i', '展开')
-                        },
-                        render: (h, params) => {
-                            return h(expandRow, {
-                                props: {
-                                    row: params.row
-                                }
-                            })
-                        }
+                        type: 'selection',
+                        width: 60,
+                        align: 'center'
                     },
                     {
                         title: '姓名',
@@ -36,53 +24,34 @@
                         key: 'address'
                     }
                 ],
-                data9: [
+                data1: [
                     {
                         name: '王小明',
                         age: 18,
                         address: '北京市朝阳区芍药居',
-                        job: '数据工程师',
-                        interest: '羽毛球',
-                        birthday: '1991-05-14',
-                        book: '乔布斯传',
-                        movie: '致命魔术',
-                        music: 'I Cry'
+                        _disabled: false,
+                        _checked: true
                     },
                     {
                         name: '张小刚',
                         age: 25,
                         address: '北京市海淀区西二旗',
-                        job: '数据科学家',
-                        interest: '排球',
-                        birthday: '1989-03-18',
-                        book: '我的奋斗',
-                        movie: '罗马假日',
-                        music: 'My Heart Will Go On'
+                        _disabled: true
                     },
                     {
                         name: '李小红',
                         age: 30,
                         address: '上海市浦东新区世纪大道',
-                        job: '数据产品经理',
-                        interest: '网球',
-                        birthday: '1992-01-31',
-                        book: '赢',
-                        movie: '乔布斯',
-                        music: 'Don’t Cry'
+                        _disabled: true
                     },
                     {
                         name: '周小伟',
                         age: 26,
                         address: '深圳市南山区深南大道',
-                        job: '数据分析师',
-                        interest: '桌球，跑步',
-                        birthday: '1988-7-25',
-                        book: '红楼梦',
-                        movie: '倩女幽魂',
-                        music: '演员'
+                        _disabled: true
                     }
                 ]
             }
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index efa5a8d..0809ece 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -92,6 +92,7 @@
             isSelectAll () {
                 let isSelectAll = true;
                 if (!this.data.length) isSelectAll = false;
+                if (!this.data.find(item => !item._disabled)) isSelectAll = false;    // #1751
                 for (let i = 0; i < this.data.length; i++) {
                     if (!this.objData[this.data[i]._index]._isChecked && !this.objData[this.data[i]._index]._isDisabled) {
                         isSelectAll = false;
--
libgit2 0.21.4