This commit is contained in:
梁灏 2017-09-03 12:26:16 +08:00
parent 0e4166bd0a
commit 17db7df4fd
2 changed files with 13 additions and 43 deletions

View file

@ -1,27 +1,15 @@
<template> <template>
<Table :columns="columns10" :data="data9"></Table> <Table border :columns="columns4" :data="data1"></Table>
</template> </template>
<script> <script>
import expandRow from '../components/tableExpand.vue';
export default { export default {
components: { expandRow },
data () { data () {
return { return {
columns10: [ columns4: [
{ {
type: 'expand', type: 'selection',
width: 100, width: 60,
title: '展', align: 'center'
renderHeader (h) {
return h('i', '展开')
},
render: (h, params) => {
return h(expandRow, {
props: {
row: params.row
}
})
}
}, },
{ {
title: '姓名', title: '姓名',
@ -36,50 +24,31 @@
key: 'address' key: 'address'
} }
], ],
data9: [ data1: [
{ {
name: '王小明', name: '王小明',
age: 18, age: 18,
address: '北京市朝阳区芍药居', address: '北京市朝阳区芍药居',
job: '数据工程师', _disabled: false,
interest: '羽毛球', _checked: true
birthday: '1991-05-14',
book: '乔布斯传',
movie: '致命魔术',
music: 'I Cry'
}, },
{ {
name: '张小刚', name: '张小刚',
age: 25, age: 25,
address: '北京市海淀区西二旗', address: '北京市海淀区西二旗',
job: '数据科学家', _disabled: true
interest: '排球',
birthday: '1989-03-18',
book: '我的奋斗',
movie: '罗马假日',
music: 'My Heart Will Go On'
}, },
{ {
name: '李小红', name: '李小红',
age: 30, age: 30,
address: '上海市浦东新区世纪大道', address: '上海市浦东新区世纪大道',
job: '数据产品经理', _disabled: true
interest: '网球',
birthday: '1992-01-31',
book: '赢',
movie: '乔布斯',
music: 'Dont Cry'
}, },
{ {
name: '周小伟', name: '周小伟',
age: 26, age: 26,
address: '深圳市南山区深南大道', address: '深圳市南山区深南大道',
job: '数据分析师', _disabled: true
interest: '桌球,跑步',
birthday: '1988-7-25',
book: '红楼梦',
movie: '倩女幽魂',
music: '演员'
} }
] ]
} }

View file

@ -92,6 +92,7 @@
isSelectAll () { isSelectAll () {
let isSelectAll = true; let isSelectAll = true;
if (!this.data.length) isSelectAll = false; 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++) { for (let i = 0; i < this.data.length; i++) {
if (!this.objData[this.data[i]._index]._isChecked && !this.objData[this.data[i]._index]._isDisabled) { if (!this.objData[this.data[i]._index]._isChecked && !this.objData[this.data[i]._index]._isDisabled) {
isSelectAll = false; isSelectAll = false;