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

13
src/components/date-picker/panel/date.vue
View file

@ -1,5 +1,5 @@
<template>
<div :class="[prefixCls + '-body-wrapper']">
<div :class="classes">
<div :class="[prefixCls + '-sidebar']" v-if="shortcuts">
<div
:class="[prefixCls + '-shortcut']"
@ -91,6 +91,14 @@
}
},
computed: {
classes () {
return [
`${prefixCls}-body-wrapper`,
{
[`${prefixCls}-with-sidebar`]: this.shortcuts.length
}
]
},
yearLabel () {
const year = this.year;
if (!year) return '';
@ -122,7 +130,8 @@
this.$emit('on-pick', '');
},
handleShortcutClick (shortcut) {
if (shortcut.value) this.$emit('on-pick', shortcut.value());
if (shortcut.onClick) shortcut.onClick(this);
},
iconBtnCls (direction, type = '') {
return [

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 () {