drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update DatePicker

Browse source 
update DatePicker
This commit is contained in:
梁灏 2016-12-16 14:15:11 +08:00
parent 13be443453
commit 2533a192dd
4 changed files with 76 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/table/table.vue
View file

@ -454,14 +454,17 @@
let data = this.makeData();
let sortType = 'normal';
let sortIndex = -1;
let isCustom = false;
for (let i = 0; i < this.cloneColumns.length; i++) {
if (this.cloneColumns[i]._sortType !== 'normal') {
sortType = this.cloneColumns[i]._sortType;
sortIndex = i;
isCustom = this.cloneColumns[i].sortable === 'custom';
break;
}
}
if (sortType !== 'normal') data = this.sortData(data, sortType, sortIndex);
if (sortType !== 'normal' && !isCustom) data = this.sortData(data, sortType, sortIndex);
return data;
},
makeDataWithFilter () {