From 27cf2d60efc3391dab44a29dae796d2ef2df4039 Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 14 Dec 2020 17:21:45 +0800 Subject: [PATCH 1/2] docs(Calendar): add allow-same-day tips (#7740) --- src/calendar/README.zh-CN.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calendar/README.zh-CN.md b/src/calendar/README.zh-CN.md index 466ea73b1..8b8150f3c 100644 --- a/src/calendar/README.zh-CN.md +++ b/src/calendar/README.zh-CN.md @@ -100,6 +100,8 @@ export default { }; ``` +> Tips: 默认情况下,日期区间的起止时间不能为同一天,可以通过设置 allow-same-day 属性来允许选择同一天。 + ### 快捷选择 将 `show-confirm` 设置为 `false` 可以隐藏确认按钮,这种情况下选择完成后会立即触发 `confirm` 事件。 From 4af658e67aa777e5be8285f4574e6c5baf27268b Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 16 Dec 2020 20:23:36 +0800 Subject: [PATCH 2/2] fix(cli): failed to find root dir (#7755) --- packages/vant-cli/src/common/constant.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/vant-cli/src/common/constant.ts b/packages/vant-cli/src/common/constant.ts index b266ec61a..dec3eac5c 100644 --- a/packages/vant-cli/src/common/constant.ts +++ b/packages/vant-cli/src/common/constant.ts @@ -3,15 +3,16 @@ import { existsSync } from 'fs-extra'; import { join, dirname, isAbsolute } from 'path'; function findRootDir(dir: string): string { - if (dir === '/') { - return '/'; - } - if (existsSync(join(dir, 'vant.config.js'))) { return dir; } - return findRootDir(dirname(dir)); + const parentDir = dirname(dir); + if (dir === parentDir) { + return dir; + } + + return findRootDir(parentDir); } // Colors