From bd32e722ceff148a360934b61056bcfbdec13046 Mon Sep 17 00:00:00 2001 From: leejimqiu Date: Mon, 9 May 2022 11:07:36 +0800 Subject: [PATCH 1/2] fix(picker): title align problem --- src/picker/README.md | 4 ++-- src/picker/picker.less | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/picker/README.md b/src/picker/README.md index bd23873b5..54d47161c 100644 --- a/src/picker/README.md +++ b/src/picker/README.md @@ -59,8 +59,8 @@ Page({ 名称 | 类型 | 默认值 | 说明 | 必传 -- | -- | -- | -- | -- -cancel-btn | String | 取消 | 取消按钮文字 | N -confirm-btn | String | 确认 | 确定按钮文字 | N +cancel-btn | String | '' | 取消按钮文字 | N +confirm-btn | String | '' | 确定按钮文字 | N footer | Slot | - | 底部内容 | N header | Boolean / Slot | true | 头部内容。值为 true 显示空白头部,值为 false 不显示任何内容,值类型为 TNode 表示自定义头部内容 | N title | String | '' | 标题 | N diff --git a/src/picker/picker.less b/src/picker/picker.less index b4953ee16..48b52870e 100644 --- a/src/picker/picker.less +++ b/src/picker/picker.less @@ -28,6 +28,11 @@ } &__title { + flex: 1; + text-align: center; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; color: @text-level-1-color; font-weight: @picker-font-weight; } From f81d7cf7bcb7dfec99262f92af064861caccf4d9 Mon Sep 17 00:00:00 2001 From: leejimqiu Date: Mon, 9 May 2022 11:24:46 +0800 Subject: [PATCH 2/2] fix(picker): simplify code and update docs --- src/picker/README.md | 4 ++-- src/picker/picker.ts | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/picker/README.md b/src/picker/README.md index 54d47161c..fe3ef93d1 100644 --- a/src/picker/README.md +++ b/src/picker/README.md @@ -72,9 +72,9 @@ visible | Boolean | false | 是否显示 | N 名称 | 参数 | 描述 -- | -- | -- -cancel | `({})` | 点击取消按钮时触发 +cancel | - | 点击取消按钮时触发 change | `(value: Array)` | 选中变化时候触发 -confirm | `({})` | 点击确认确认按钮时触发 +confirm | `(index: number, value: Array)` | 点击确认确认按钮时触发 ### PickerItem Props diff --git a/src/picker/picker.ts b/src/picker/picker.ts index 3ae70972c..50e8f8bd8 100644 --- a/src/picker/picker.ts +++ b/src/picker/picker.ts @@ -48,12 +48,10 @@ export default class Picker extends SuperComponent { return { index: undefined, value: undefined }; } - const selectedValues = { + return { index: pickerColumns.map((pickerColumn) => pickerColumn._selectedIndex), value: pickerColumns.map((pickerColumn) => pickerColumn._selectedValue), }; - - return selectedValues; }, onConfirm() { this.triggerEvent('confirm', this.getSelectedValues());