blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

feat(CalendarDay): add default margin-bottom (#10441)

Browse Source 
* feat(CalendarDay): add default margin-bottom 10px

* feat(Calendar): add --van-calendar-day-margin-bottom

* fix(CalendarDay): adjust marginBottom of day

* docs(Calendar): add --van-calendar-day-margin-bottom

* Update README.md

* Update README.zh-CN.md

Co-authored-by: neverland <chenjiahan.jait@bytedance.com>
Co-authored-by: neverland <chenjiahan@youzan.com>
This commit is contained in:
Nemo Shen 2022-03-31 17:51:49 +08:00 committed by GitHub
parent 25be56aa3e
commit a1054c3a29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/vant/src/calendar/CalendarDay.tsx
View File

@ -54,6 +54,10 @@ export default defineComponent({
}
}
if (offset + (item.date?.getDate() || 1) > 28) {
style.marginBottom = 0;
}
return style;
});

1
packages/vant/src/calendar/README.md
View File

@ -395,6 +395,7 @@ The component provides the following CSS variables, which can be used to customi
| --van-calendar-month-mark-font-size | _160px_ | - |
| --van-calendar-day-height | _64px_ | - |
| --van-calendar-day-font-size | _var(--van-font-size-lg)_ | - |
| --van-calendar-day-margin-bottom | _4px_ | - |
| --van-calendar-range-edge-color | _var(--van-white)_ | - |
| --van-calendar-range-edge-background-color | _var(--van-danger-color)_ | - |
| --van-calendar-range-middle-color | _var(--van-danger-color)_ | - |

1
packages/vant/src/calendar/README.zh-CN.md
View File

@ -401,6 +401,7 @@ calendarRef.value?.reset();
| --van-calendar-month-mark-font-size | _160px_ | - |
| --van-calendar-day-height | _64px_ | - |
| --van-calendar-day-font-size | _var(--van-font-size-lg)_ | - |
| --van-calendar-day-margin-bottom | _4px_ | - |
| --van-calendar-range-edge-color | _var(--van-white)_ | - |
| --van-calendar-range-edge-background-color | _var(--van-danger-color)_ | - |
| --van-calendar-range-middle-color | _var(--van-danger-color)_ | - |

2
packages/vant/src/calendar/index.less
View File

@ -14,6 +14,7 @@
--van-calendar-month-mark-font-size: @calendar-month-mark-font-size;
--van-calendar-day-height: @calendar-day-height;
--van-calendar-day-font-size: @calendar-day-font-size;
--van-calendar-day-margin-bottom: @calendar-day-margin-bottom;
--van-calendar-range-edge-color: @calendar-range-edge-color;
--van-calendar-range-edge-background-color: @calendar-range-edge-background-color;
--van-calendar-range-middle-color: @calendar-range-middle-color;
@ -124,6 +125,7 @@
width: 14.285%;
height: var(--van-calendar-day-height);
font-size: var(--van-calendar-day-font-size);
margin-bottom: var(--van-calendar-day-margin-bottom);
cursor: pointer;
&--end,

40
packages/vant/src/calendar/test/__snapshots__/index.spec.ts.snap
View File

@ -251,41 +251,49 @@ exports[`color prop when type is single 1`] = `
23
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
24
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
25
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
26
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
27
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
28
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
29
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
30
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
31
@ -484,41 +492,49 @@ exports[`formatter prop 1`] = `
23
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
24
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
25
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
26
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
27
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
28
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
29
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
30
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
31
@ -836,49 +852,49 @@ exports[`row-height prop 1`] = `
23
</div>
<div role="gridcell"
style="height: 50px;"
style="height: 50px; margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
24
</div>
<div role="gridcell"
style="height: 50px;"
style="height: 50px; margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
25
</div>
<div role="gridcell"
style="height: 50px;"
style="height: 50px; margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
26
</div>
<div role="gridcell"
style="height: 50px;"
style="height: 50px; margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
27
</div>
<div role="gridcell"
style="height: 50px;"
style="height: 50px; margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
28
</div>
<div role="gridcell"
style="height: 50px;"
style="height: 50px; margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
29
</div>
<div role="gridcell"
style="height: 50px;"
style="height: 50px; margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
30
</div>
<div role="gridcell"
style="height: 50px;"
style="height: 50px; margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
31
@ -1083,41 +1099,49 @@ exports[`should render title、footer、subtitle slot correctly 1`] = `
23
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
24
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
25
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
26
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
27
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
28
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
29
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
30
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
31

8
packages/vant/src/calendar/test/__snapshots__/prop.spec.ts.snap
View File

@ -170,41 +170,49 @@ exports[`lazy-render prop 1`] = `
23
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
24
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
25
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
26
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
27
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
28
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
29
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
30
</div>
<div role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
31

1
packages/vant/src/calendar/var.less
View File

@ -13,6 +13,7 @@
@calendar-month-mark-font-size: 160px;
@calendar-day-height: 64px;
@calendar-day-font-size: var(--van-font-size-lg);
@calendar-day-margin-bottom: 4px;
@calendar-range-edge-color: var(--van-white);
@calendar-range-edge-background-color: var(--van-danger-color);
@calendar-range-middle-color: var(--van-danger-color);