Skip to content

Commit b8f097c

Browse files
committed
feat(date-picker): [date-picker]Optimize case display and fix style issues
1 parent 2d47f95 commit b8f097c

File tree

10 files changed

+25
-9
lines changed

10 files changed

+25
-9
lines changed

examples/sites/demos/pc/app/date-picker/align-composition-api.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ const value = ref('')
3131

3232
<style scoped>
3333
.demo-date-picker-wrap {
34-
width: 350px;
34+
width: 280px;
3535
}
3636
</style>

examples/sites/demos/pc/app/date-picker/align.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ export default {
3939

4040
<style scoped>
4141
.demo-date-picker-wrap {
42-
width: 350px;
42+
width: 280px;
4343
}
4444
</style>

examples/sites/demos/pc/app/date-picker/date-range-composition-api.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const yearValue = ref('')
3939

4040
<style scoped lang="less">
4141
.demo-date-picker-wrap {
42+
width: 360px;
4243
& > * {
4344
margin-top: 12px;
4445
}

examples/sites/demos/pc/app/date-picker/date-range.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ export default {
4747

4848
<style scoped lang="less">
4949
.demo-date-picker-wrap {
50+
width: 360px;
5051
& > * {
5152
margin-top: 12px;
5253
}

examples/sites/demos/pc/app/date-picker/events-composition-api.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</tiny-col>
1616
</tiny-row>
1717
<tiny-row>
18-
<tiny-col :span="12">
18+
<tiny-col :span="6">
1919
<label class="demo-date-picker-label">onPick:</label>
2020
<tiny-date-picker v-model="valueOnPick" type="daterange" :picker-options="pickerOptions"></tiny-date-picker>
2121
</tiny-col>

examples/sites/demos/pc/app/date-picker/events.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</tiny-col>
1616
</tiny-row>
1717
<tiny-row>
18-
<tiny-col :span="12">
18+
<tiny-col :span="6">
1919
<label class="demo-date-picker-label">onPick:</label>
2020
<tiny-date-picker v-model="valueOnPick" type="daterange" :picker-options="pickerOptions"></tiny-date-picker>
2121
</tiny-col>

examples/sites/demos/pc/app/date-picker/now-composition-api.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<div style="width: 400px">
3+
<div class="demo-date-picker">
44
<div class="title">插槽式:</div>
55
<tiny-date-picker v-model="value1" type="datetime">
66
<template #now>
@@ -9,7 +9,7 @@
99
</tiny-date-picker>
1010
</div>
1111

12-
<div style="width: 400px">
12+
<div class="demo-date-picker">
1313
<div class="title">函数式:</div>
1414
<tiny-date-picker v-model="value2" type="datetime" :now-click="nowClick"> </tiny-date-picker>
1515
</div>
@@ -37,6 +37,9 @@ const now = () => {
3737
</script>
3838

3939
<style scoped>
40+
.demo-date-picker {
41+
width: 280px;
42+
}
4043
.nowclass {
4144
display: inline-flex;
4245
height: 28px;

examples/sites/demos/pc/app/date-picker/now.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<div style="width: 400px">
3+
<div class="demo-date-picker">
44
<div class="title">插槽式:</div>
55
<tiny-date-picker v-model="value1" type="datetime">
66
<template #now>
@@ -9,7 +9,7 @@
99
</tiny-date-picker>
1010
</div>
1111

12-
<div style="width: 400px">
12+
<div class="demo-date-picker">
1313
<div class="title">函数式:</div>
1414
<tiny-date-picker v-model="value2" type="datetime" :now-click="nowClick"> </tiny-date-picker>
1515
</div>
@@ -45,6 +45,9 @@ export default {
4545
</script>
4646

4747
<style scoped>
48+
.demo-date-picker {
49+
width: 280px;
50+
}
4851
.nowclass {
4952
display: inline-flex;
5053
height: 28px;

examples/sites/demos/pc/app/date-picker/timezone-composition-api.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,9 @@ function selectChange(tz) {
4242
Modal.message({ message: `当前值为 ${tz.tz.name}`, status: 'info' })
4343
}
4444
</script>
45+
46+
<style scoped>
47+
.demo-date-picker-wrap {
48+
width: 280px;
49+
}
50+
</style>

packages/theme/src/date-table/index.less

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@
228228
div {
229229
margin-left: 4px;
230230
margin-right: 4px;
231-
background-color: var(--tv-DateTable-td-bg-color-range-selected);
232231
}
233232

234233
span {
@@ -242,6 +241,9 @@
242241
background-color: var(--tv-DateTable-bg-color-current-select);
243242
}
244243
}
244+
&.selected.in-range {
245+
background-color: var(--tv-DateTable-td-bg-color-range-selected);
246+
}
245247

246248
&.week {
247249
font-size: 80%;

0 commit comments

Comments
 (0)