From cd3cc07254baad6be86d3878c904b260e06c871e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Wed, 29 Jan 2020 15:39:05 +0800 Subject: [PATCH] feat(Picker): default-index can be string --- src/picker/README.md | 2 +- src/picker/README.zh-CN.md | 2 +- src/picker/index.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/picker/README.md b/src/picker/README.md index 20d56cd13..ca4e4c6be 100644 --- a/src/picker/README.md +++ b/src/picker/README.md @@ -267,7 +267,7 @@ export default { | loading | Whether to show loading prompt | *boolean* | `false` | | show-toolbar | Whether to show toolbar | *boolean* | `false` | | allow-html `v2.1.8` | Whether to allow HTML in option text | *boolean* | `true` | -| default-index | Default value index of single column picker | *number* | `0` | +| default-index | Default value index of single column picker | *number \| string* | `0` | | item-height | Option height | *number \| string* | `44` | | visible-item-count | Count of visible columns | *number \| string* | `5` | | swipe-duration `v2.2.10` | Duration of the momentum animation,unit `ms` | *number \| string* | `1000` | diff --git a/src/picker/README.zh-CN.md b/src/picker/README.zh-CN.md index 4c7bb4d08..aff6c460a 100644 --- a/src/picker/README.zh-CN.md +++ b/src/picker/README.zh-CN.md @@ -281,7 +281,7 @@ export default { | loading | 是否显示加载状态 | *boolean* | `false` | | show-toolbar | 是否显示顶部栏 | *boolean* | `false` | | allow-html `v2.1.8` | 是否允许选项内容中渲染 HTML | *boolean* | `true` | -| default-index | 单列选择时,默认选中项的索引 | *number* | `0` | +| default-index | 单列选择时,默认选中项的索引 | *number \| string* | `0` | | item-height | 选项高度 | *number \| string* | `44` | | visible-item-count | 可见的选项个数 | *number \| string* | `5` | | swipe-duration `v2.2.10` | 快速滑动时惯性滚动的时长,单位`ms` | *number \| string* | `1000` | diff --git a/src/picker/index.js b/src/picker/index.js index f0217a74f..37ddf2abd 100644 --- a/src/picker/index.js +++ b/src/picker/index.js @@ -14,7 +14,7 @@ export default createComponent({ props: { ...pickerProps, defaultIndex: { - type: Number, + type: [Number, String], default: 0, }, columns: { @@ -81,7 +81,7 @@ export default createComponent({ let cursor = { children: this.columns }; while (cursor && cursor.children) { - const defaultIndex = cursor.defaultIndex || this.defaultIndex; + const defaultIndex = cursor.defaultIndex || +this.defaultIndex; formatted.push({ values: cursor.children.map(item => item[this.valueKey]), @@ -270,7 +270,7 @@ export default createComponent({ allowHtml={this.allowHtml} className={item.className} itemHeight={this.itemHeight} - defaultIndex={item.defaultIndex || this.defaultIndex} + defaultIndex={item.defaultIndex || +this.defaultIndex} swipeDuration={this.swipeDuration} visibleItemCount={this.visibleItemCount} initialOptions={item.values}