Skip to content

Commit 5b47bcc

Browse files
authored
Merge pull request #435 from Tencent/fix/picker/title-align
Fix/picker/title align
2 parents 164f23f + f81d7cf commit 5b47bcc

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

src/picker/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ Page({
5959
6060
名称 | 类型 | 默认值 | 说明 | 必传
6161
-- | -- | -- | -- | --
62-
cancel-btn | String | 取消 | 取消按钮文字 | N
63-
confirm-btn | String | 确认 | 确定按钮文字 | N
62+
cancel-btn | String | '' | 取消按钮文字 | N
63+
confirm-btn | String | '' | 确定按钮文字 | N
6464
footer | Slot | - | 底部内容 | N
6565
header | Boolean / Slot | true | 头部内容。值为 true 显示空白头部,值为 false 不显示任何内容,值类型为 TNode 表示自定义头部内容 | N
6666
title | String | '' | 标题 | N
@@ -72,9 +72,9 @@ visible | Boolean | false | 是否显示 | N
7272
7373
名称 | 参数 | 描述
7474
-- | -- | --
75-
cancel | `({})` | 点击取消按钮时触发
75+
cancel | - | 点击取消按钮时触发
7676
change | `(value: Array<PickerValue>)` | 选中变化时候触发
77-
confirm | `({})` | 点击确认确认按钮时触发
77+
confirm | `(index: number, value: Array<PickerValue>)` | 点击确认确认按钮时触发
7878
7979
### PickerItem Props
8080

src/picker/picker.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
}
2929

3030
&__title {
31+
flex: 1;
32+
text-align: center;
33+
overflow: hidden;
34+
white-space: nowrap;
35+
text-overflow: ellipsis;
3136
color: @text-level-1-color;
3237
font-weight: @picker-font-weight;
3338
}

src/picker/picker.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,10 @@ export default class Picker extends SuperComponent {
4848
return { index: undefined, value: undefined };
4949
}
5050

51-
const selectedValues = {
51+
return {
5252
index: pickerColumns.map((pickerColumn) => pickerColumn._selectedIndex),
5353
value: pickerColumns.map((pickerColumn) => pickerColumn._selectedValue),
5454
};
55-
56-
return selectedValues;
5755
},
5856
onConfirm() {
5957
this.triggerEvent('confirm', this.getSelectedValues());

0 commit comments

Comments
 (0)