Skip to content

Commit 8f0247e

Browse files
hpyourdkmaster
authored andcommitted
修复: #563 Time在Combo下拉时,点击切换到配置时分秒时,会自动关闭下拉
1 parent 6b73bd7 commit 8f0247e

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

src/app/demo/time/with-combo-select/demo.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<!-- start to learn the demo from here -->
77
<jigsaw-combo-select [(value)]="singleTimeComboValue" width="150px">
88
<ng-template>
9-
<jigsaw-time [(date)]="date" (dateChange)="handleDateChange($event)">
9+
<jigsaw-time [(date)]="date" (dateChange)="handleDateChange($event)" gr="second">
1010
</jigsaw-time>
1111
</ng-template>
1212
</jigsaw-combo-select>

src/app/demo/time/with-combo-select/demo.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {ArrayCollection} from "jigsaw/core/data/array-collection";
77
templateUrl: './demo.component.html'
88
})
99
export class ComboSelectDemoComponent {
10-
date = TimeService.getFormatDate('now', TimeGr.date);
10+
date = TimeService.getFormatDate('now', TimeGr.second);
1111
singleTimeComboValue = new ArrayCollection([{
1212
label: this.date,
1313
closable: false

src/jigsaw/assets/scss/index.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,16 @@
110110
text-shadow: none;
111111
}
112112
}
113+
114+
.bootstrap-datetimepicker-widget .timepicker table td {
115+
height: 68px;
116+
line-height: 68px;
117+
}
118+
119+
.bootstrap-datetimepicker-widget.usetwentyfour .timepicker table td.hour{
120+
height: 34px;
121+
line-height: 34px;
122+
}
113123
}
114124

115125
/*时间组件样式end*/

0 commit comments

Comments
 (0)