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

Correct time layout when showing week numbers

Browse source
This commit is contained in:
Sergio Crisostomo 2018-05-16 10:01:49 +02:00
parent 1ba0bb6eee
commit e56c394d0b
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/components/date-picker/panel/Date/date-range.vue
View file

@ -6,7 +6,7 @@
v-for="shortcut in shortcuts" v-for="shortcut in shortcuts"
@click="handleShortcutClick(shortcut)">{{ shortcut.text }}</div> @click="handleShortcutClick(shortcut)">{{ shortcut.text }}</div>
</div> </div>
<div :class="[prefixCls + '-body']"> <div :class="panelBodyClasses">
<div :class="[prefixCls + '-content', prefixCls + '-content-left']" v-show="!isTime"> <div :class="[prefixCls + '-content', prefixCls + '-content-left']" v-show="!isTime">
<div :class="[datePrefixCls + '-header']" v-show="currentView !== 'time'"> <div :class="[datePrefixCls + '-header']" v-show="currentView !== 'time'">
<span <span
@ -171,6 +171,15 @@
} }
]; ];
}, },
panelBodyClasses(){
return [
prefixCls + '-body',
{
[prefixCls + '-body-time']: this.showTime,
[prefixCls + '-body-date']: !this.showTime,
}
]
},
leftDatePanelLabel(){ leftDatePanelLabel(){
return this.panelLabelConfig('left'); return this.panelLabelConfig('left');
}, },

2
src/styles/components/date-picker.less
View file

@ -205,7 +205,7 @@
&-with-week-numbers{ &-with-week-numbers{
.@{picker-prefix-cls}-panel{ .@{picker-prefix-cls}-panel{
&-body{ &-body-date {
min-width: (@date-picker-cells-width-with-weeknumbers + 20) * 2; min-width: (@date-picker-cells-width-with-weeknumbers + 20) * 2;
} }
} }