From 5f253aa888e160f460efe51aa247bf903a38292a 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:39:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(AddressEdit):=20detail-rows=E3=80=81detail?= =?UTF-8?q?-maxlength=20can=20be=20string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/address-edit/Detail.js | 4 ++-- src/address-edit/README.md | 4 ++-- src/address-edit/README.zh-CN.md | 4 ++-- src/address-edit/index.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/address-edit/Detail.js b/src/address-edit/Detail.js index 0ff606452..b35fb89de 100644 --- a/src/address-edit/Detail.js +++ b/src/address-edit/Detail.js @@ -14,9 +14,9 @@ export default createComponent({ value: String, errorMessage: String, focused: Boolean, - detailRows: Number, + detailRows: [Number, String], searchResult: Array, - detailMaxlength: Number, + detailMaxlength: [Number, String], showSearchResult: Boolean, }, diff --git a/src/address-edit/README.md b/src/address-edit/README.md index ef9bd6fda..e55125e18 100644 --- a/src/address-edit/README.md +++ b/src/address-edit/README.md @@ -75,8 +75,8 @@ export default { | show-search-result | Whether to show address search result | *boolean* | `false` | | save-button-text | Save button text | *string* | `Save` | | delete-button-text | Delete button text | *string* | `Delete` | -| detail-rows | Detail input rows | *number* | `1` | -| detail-maxlength `v2.0.4` | Detail maxlength | *number* | `200` | +| detail-rows | Detail input rows | *string \| number* | `1` | +| detail-maxlength `v2.0.4` | Detail maxlength | *string \| number* | `200` | | is-saving | Whether to show save button loading status | *boolean* | `false` | | is-deleting | Whether to show delete button loading status | *boolean* | `false` | | tel-validator | The method to validate tel | *(tel: string) => boolean* | - | diff --git a/src/address-edit/README.zh-CN.md b/src/address-edit/README.zh-CN.md index 44feea897..81afe3022 100644 --- a/src/address-edit/README.zh-CN.md +++ b/src/address-edit/README.zh-CN.md @@ -75,8 +75,8 @@ export default { | show-search-result | 是否显示搜索结果 | *boolean* | `false` | | save-button-text | 保存按钮文字 | *string* | `保存` | | delete-button-text | 删除按钮文字 | *string* | `删除` | -| detail-rows | 详细地址输入框行数 | *number* | `1` | -| detail-maxlength `v2.0.4` | 详细地址最大长度 | *number* | `200` | +| detail-rows | 详细地址输入框行数 | *string \| number* | `1` | +| detail-maxlength `v2.0.4` | 详细地址最大长度 | *string \| number* | `200` | | is-saving | 是否显示保存按钮加载动画 | *boolean* | `false` | | is-deleting | 是否显示删除按钮加载动画 | *boolean* | `false` | | tel-validator | 手机号格式校验函数 | *string => boolean* | - | diff --git a/src/address-edit/index.js b/src/address-edit/index.js index 8151f7252..e24164db3 100644 --- a/src/address-edit/index.js +++ b/src/address-edit/index.js @@ -53,11 +53,11 @@ export default createComponent({ default: true, }, detailRows: { - type: Number, + type: [Number, String], default: 1, }, detailMaxlength: { - type: Number, + type: [Number, String], default: 200, }, addressInfo: {