Compare commits

...

4 Commits

Author SHA1 Message Date
neverland
b9920eee4a
docs(Calendar): add allow-same-day tips #4174 2021-05-10 19:20:08 +08:00
DAI JIE
6d85222338
fix(calendar): fix custom color for same-day button (#4200) 2021-05-10 19:15:32 +08:00
chenjiahan
514524f543 Revert "build(deps-dev): bump less from 3.13.1 to 4.1.1 (#4190)"
This reverts commit 986df09bd6af25072a9f8571fead3938c6c27ed0.
2021-05-10 19:13:03 +08:00
DAI JIE
fa5b7a19eb
docs(calendar): Fix typo (#4199) 2021-05-10 19:12:16 +08:00
4 changed files with 7 additions and 4 deletions

View File

@ -47,7 +47,7 @@
"gulp-rename": "^2.0.0",
"miniprogram-api-typings": "^3.1.6",
"miniprogram-ci": "^1.0.27",
"less": "^4.1.1",
"less": "^3.0.0",
"tscpaths": "^0.0.9",
"vue": "^3.0.0",
"@vue/compiler-sfc": "^3.0.0"

View File

@ -128,6 +128,8 @@ Page({
});
```
> Tips: 默认情况下,日期区间的起止时间不能为同一天,可以通过设置 allow-same-day 属性来允许选择同一天。
### 快捷选择
`show-confirm`设置为`false`可以隐藏确认按钮,这种情况下选择完成后会立即触发`confirm`事件。
@ -293,7 +295,7 @@ Page({
| --- | --- | --- | --- |
| max-range | 日期区间最多可选天数,默认无限制 | _number \| string_ | - |
| range-prompt | 范围选择超过最多可选天数时的提示文案 | _string_ | `选择天数不能超过 xx 天` |
| allow-same-day | 是否允许日期范围的起止时间为同一天 | _boolean_ | `fasle` |
| allow-same-day | 是否允许日期范围的起止时间为同一天 | _boolean_ | `false` |
### Day 数据结构

View File

@ -23,6 +23,7 @@ function getDayStyle(type, index, date, rowHeight, color) {
if (
type === 'start' ||
type === 'end' ||
type === 'start-end' ||
type === 'multiple-selected' ||
type === 'multiple-middle'
) {

View File

@ -10155,7 +10155,7 @@ less-loader@^7.2.1:
loader-utils "^2.0.0"
schema-utils "^3.0.0"
"less@2.6.x || ^3.7.1":
"less@2.6.x || ^3.7.1", less@^3.0.0:
version "3.13.1"
resolved "https://registry.npmjs.org/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909"
integrity sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==
@ -10171,7 +10171,7 @@ less-loader@^7.2.1:
native-request "^1.0.5"
source-map "~0.6.0"
less@^4.1.0, less@^4.1.1:
less@^4.1.0:
version "4.1.1"
resolved "https://registry.npm.taobao.org/less/download/less-4.1.1.tgz?cache=0&sync_timestamp=1612065678706&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fless%2Fdownload%2Fless-4.1.1.tgz#15bf253a9939791dc690888c3ff424f3e6c7edba"
integrity sha1-Fb8lOpk5eR3GkIiMP/Qk8+bH7bo=