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

feat(calendar): allow default date to be null (#5395)

Browse Source
This commit is contained in:
johnsonwong666 2023-07-05 13:54:40 +08:00 committed by GitHub
parent 2c7629fe07
commit b005b41c4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/calendar/README.md
View File

@ -274,7 +274,7 @@ Page({
| color | 主题色，对底部按钮和选中日期生效 | _string_ | `#ee0a24` | | color | 主题色，对底部按钮和选中日期生效 | _string_ | `#ee0a24` |
| min-date | 可选择的最小日期 | _timestamp_ | 当前日期 | | min-date | 可选择的最小日期 | _timestamp_ | 当前日期 |
| max-date | 可选择的最大日期 | _timestamp_ | 当前日期的六个月后 | | max-date | 可选择的最大日期 | _timestamp_ | 当前日期的六个月后 |
| default-date | 默认选中的日期，`type`为`multiple`或`range`时为数组 | _timestamp \| timestamp[]_ | 今天 | | default-date `v1.10.21` | 默认选中的日期，`type`为`multiple`或`range`时为数组，传入 `null` 表示默认不选择| _timestamp \| timestamp[] \| null_ | 今天 |
| row-height | 日期行高 | _number \| string_ | `64` | | row-height | 日期行高 | _number \| string_ | `64` |
| formatter | 日期格式化函数 | _(day: Day) => Day_ | - | | formatter | 日期格式化函数 | _(day: Day) => Day_ | - |
| poppable | 是否以弹层的形式展示日历 | _boolean_ | `true` | | poppable | 是否以弹层的形式展示日历 | _boolean_ | `true` |

4
packages/calendar/index.ts
View File

@ -63,6 +63,7 @@ VantComponent({
}, },
defaultDate: { defaultDate: {
type: null, type: null,
value: getToday().getTime(),
observer(val) { observer(val) {
this.setData({ currentDate: val }); this.setData({ currentDate: val });
this.scrollIntoView(); this.scrollIntoView();
@ -202,6 +203,8 @@ VantComponent({
getInitialDate(defaultDate: number | number[] | null = null) { getInitialDate(defaultDate: number | number[] | null = null) {
const { type, minDate, maxDate, allowSameDay } = this.data; const { type, minDate, maxDate, allowSameDay } = this.data;
if (!defaultDate) return [];
const now = getToday().getTime(); const now = getToday().getTime();
if (type === 'range') { if (type === 'range') {
@ -245,6 +248,7 @@ VantComponent({
requestAnimationFrame(() => { requestAnimationFrame(() => {
const { currentDate, type, show, poppable, minDate, maxDate } = const { currentDate, type, show, poppable, minDate, maxDate } =
this.data; this.data;
if (!currentDate) return;
// @ts-ignore // @ts-ignore
const targetDate = type === 'single' ? currentDate : currentDate[0]; const targetDate = type === 'single' ? currentDate : currentDate[0];
const displayed = show || !poppable; const displayed = show || !poppable;