From 086e910afd7b55a2b3e4d024d45b62f0b54682c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 28 Jan 2020 21:43:07 +0800 Subject: [PATCH] =?UTF-8?q?feat(Calendar):=20row-height=E3=80=81max-range?= =?UTF-8?q?=20can=20be=20string=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calendar/README.md | 4 ++-- src/calendar/README.zh-CN.md | 4 ++-- src/calendar/components/Month.js | 2 +- src/calendar/index.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/calendar/README.md b/src/calendar/README.md index 57156122b..1306067d7 100644 --- a/src/calendar/README.md +++ b/src/calendar/README.md @@ -218,7 +218,7 @@ Set `poppable` to `false`, the calendar will be displayed directly on the page i | min-date | Min date | *Date* | Today | | max-date | Max date | *Date* | Six months after the today | | default-date | Default selected date | *Date \| Date[]* | Today | -| row-height | Row height | *number* | `64` | +| row-height | Row height | *string \| number* | `64` | | formatter | Day formatter | *(day: Day) => Day* | - | | position | Popup position, can be set to `top` `right` `left` | *string* | `bottom` | | poppable | Whether to show the calendar inside a popup | *boolean* | `true` | @@ -230,7 +230,7 @@ Set `poppable` to `false`, the calendar will be displayed directly on the page i | safe-area-inset-bottom | Whether to enable bottom safe area adaptation | *boolean* | `true` | | confirm-text | Confirm button text | *string* | `Confirm` | | confirm-disabled-text | Confirm button text when disabled | *string* | `Confirm` | -| max-range `v2.4.3` | Number of selectable days | *number* | - | +| max-range `v2.4.3` | Number of selectable days | *string \| number* | - | | range-prompt `v2.4.3` | Error message when exceeded max range | *string* | `Choose no more than xx days` | | get-container `v2.4.4` | Return the mount node for Calendar | _string \| () => Element_ | - | diff --git a/src/calendar/README.zh-CN.md b/src/calendar/README.zh-CN.md index 3d8e9358a..02692ddd0 100644 --- a/src/calendar/README.zh-CN.md +++ b/src/calendar/README.zh-CN.md @@ -218,7 +218,7 @@ export default { | min-date | 最小日期 | *Date* | 当前日期 | | max-date | 最大日期 | *Date* | 当前日期的六个月后 | | default-date | 默认选中的日期 | *Date \| Date[]* | 今天 | -| row-height | 日期行高 | *number* | `64` | +| row-height | 日期行高 | *string \| number* | `64` | | formatter | 日期格式化函数 | *(day: Day) => Day* | - | | position | 弹出位置，可选值为 `top` `right` `left` | *string* | `bottom` | | poppable | 是否以弹层的形式展示日历 | *boolean* | `true` | @@ -230,7 +230,7 @@ export default { | safe-area-inset-bottom | 是否开启 [底部安全区适配](#/zh-CN/quickstart#di-bu-an-quan-qu-gua-pei) | *boolean* | `true` | | confirm-text | 确认按钮的文字 | *string* | `确定` | | confirm-disabled-text | 确认按钮处于禁用状态时的文字 | *string* | `确定` | -| max-range `v2.4.3` | 日期区间最多可选天数，默认无限制 | *number* | - | +| max-range `v2.4.3` | 日期区间最多可选天数，默认无限制 | *string \| number* | - | | range-prompt `v2.4.3` | 选择超过区间范围时的提示文案 | *string* | `选择天数不能超过 xx 天` | | get-container `v2.4.4` | 指定挂载的节点，[用法示例](#/zh-CN/popup#zhi-ding-gua-zai-wei-zhi) | *string \| () => Element* | - | diff --git a/src/calendar/components/Month.js b/src/calendar/components/Month.js index eb0622016..f5252a6c7 100644 --- a/src/calendar/components/Month.js +++ b/src/calendar/components/Month.js @@ -13,7 +13,7 @@ export default createComponent({ maxDate: Date, showMark: Boolean, showTitle: Boolean, - rowHeight: Number, + rowHeight: [Number, String], formatter: Function, currentDate: [Date, Array], }, diff --git a/src/calendar/index.js b/src/calendar/index.js index 6dd74efd9..58760f74c 100644 --- a/src/calendar/index.js +++ b/src/calendar/index.js @@ -53,7 +53,7 @@ export default createComponent({ default: 'bottom', }, rowHeight: { - type: Number, + type: [Number, String], default: ROW_HEIGHT, }, round: { @@ -81,7 +81,7 @@ export default createComponent({ default: true, }, maxRange: { - type: Number, + type: [Number, String], default: null, }, },