Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-11-21 18:47:31 +08:00
59 changed files with 277 additions and 264 deletions
+1 -1
View File
@@ -223,7 +223,7 @@ export default createComponent({
setIndex(index, true);
// compatible with desktop scenario
// use setTimeout to skip the click event triggered after touchstart
// use setTimeout to skip the click event Emitted after touchstart
setTimeout(() => {
moving = false;
}, 0);
+3 -3
View File
@@ -261,9 +261,9 @@ Picker events will pass different parameters according to the columns are single
| Event | Description | Arguments |
| --- | --- | --- |
| confirm | Triggered when click confirm button | Single columncurrent valuecurrent index<br>Multiple columnscurrent valuescurrent indexes |
| cancel | Triggered when click cancel button | Single columncurrent valuecurrent index<br>Multiple columnscurrent valuescurrent indexes |
| change | Triggered when current option changed | Single columnPicker instance, current valuecurrent index<br>Multiple columnsPicker instance, current valuescolumn index |
| confirm | Emitted when click confirm button | Single columncurrent valuecurrent index<br>Multiple columnscurrent valuescurrent indexes |
| cancel | Emitted when click cancel button | Single columncurrent valuecurrent index<br>Multiple columnscurrent valuescurrent indexes |
| change | Emitted when current option changed | Single columnPicker instance, current valuecurrent index<br>Multiple columnsPicker instance, current valuescolumn index |
### Slots