Compare commits

..

No commits in common. "b423decad054dfdbfbe4a59933d300072b6e08ec" and "4e9d830dbf464637cd7e99b4195b498bb1df9d54" have entirely different histories.

8 changed files with 11 additions and 43 deletions

View File

@ -26,7 +26,6 @@ test('should emit confirm event correctly', async () => {
{ text: '01', value: '01' },
],
selectedValues: ['2030', '01', '01'],
selectedIndexes: [0, 0, 0],
}
);
});
@ -48,7 +47,6 @@ test('should emit cancel event correctly', async () => {
{ text: '01', value: '01' },
],
selectedValues: ['2030', '01', '01'],
selectedIndexes: [0, 0, 0],
});
});

View File

@ -309,9 +309,7 @@ export default defineComponent({
if (inputRef.value && inputRef.value.value !== value) {
const { selectionStart, selectionEnd } = inputRef.value;
inputRef.value.value = value;
if (state.focused) {
inputRef.value.setSelectionRange(selectionStart, selectionEnd);
}
inputRef.value.setSelectionRange(selectionStart, selectionEnd);
}
if (value !== props.modelValue) {

View File

@ -122,14 +122,6 @@ export default defineComponent({
)
);
const selectedIndexes = computed(() =>
currentColumns.value.map((options, index) =>
options.findIndex(
(option) => option[fields.value.value] === selectedValues.value[index]
)
)
);
const setValue = (index: number, value: Numeric) => {
if (selectedValues.value[index] !== value) {
const newValues = selectedValues.value.slice(0);
@ -141,7 +133,6 @@ export default defineComponent({
const getEventParams = () => ({
selectedValues: selectedValues.value.slice(0),
selectedOptions: selectedOptions.value,
selectedIndexes: selectedIndexes.value,
});
const onChange = (value: Numeric, columnIndex: number) => {

View File

@ -355,10 +355,10 @@ export default {
| Event | Description | Arguments |
| --- | --- | --- |
| confirm | Emitted when the confirm button is clicked | _{ selectedValues, selectedOptions, selectedIndexes }_ |
| cancel | Emitted when the cancel button is clicked | _{ selectedValues, selectedOptions, selectedIndexes }_ |
| change | Emitted when current option is changed | _{ selectedValues, selectedOptions,selectedIndexes, columnIndex }_ |
| click-option | Emitted when an option is clicked | _{ currentOption, selectedValues, selectedOptions, selectedIndexes, columnIndex }_ |
| confirm | Emitted when the confirm button is clicked | _{ selectedValues, selectedOptions }_ |
| cancel | Emitted when the cancel button is clicked | _{ selectedValues, selectedOptions }_ |
| change | Emitted when current option is changed | _{ selectedValues, selectedOptions, columnIndex }_ |
| click-option | Emitted when an option is clicked | _{ currentOption, selectedValues, selectedOptions, columnIndex }_ |
### Slots

View File

@ -376,10 +376,10 @@ export default {
| 事件名 | 说明 | 回调参数 |
| --- | --- | --- |
| confirm | 点击完成按钮时触发 | _{ selectedValues, selectedOptions, selectedIndexes }_ |
| cancel | 点击取消按钮时触发 | _{ selectedValues, selectedOptions, selectedIndexes }_ |
| change | 选项改变时触发 | _{ selectedValues, selectedOptions, selectedIndexes, columnIndex }_ |
| click-option | 点击选项时触发 | _{ currentOption, selectedValues, selectedOptions, selectedIndexes, columnIndex }_ |
| confirm | 点击完成按钮时触发 | _{ selectedValues, selectedOptions }_ |
| cancel | 点击取消按钮时触发 | _{ selectedValues, selectedOptions }_ |
| change | 选项改变时触发 | _{ selectedValues, selectedOptions, columnIndex }_ |
| click-option | 点击选项时触发 | _{ currentOption, selectedValues, selectedOptions, columnIndex }_ |
### Slots

View File

@ -23,7 +23,6 @@ test('should emit confirm event after clicking the confirm button', async () =>
{
selectedOptions: [{ text: '1990', value: '1990' }],
selectedValues: ['1990'],
selectedIndexes: [0],
},
]);
});
@ -41,7 +40,6 @@ test('should emit cancel event after clicking the cancel button', () => {
{
selectedOptions: [{ text: '1990', value: '1990' }],
selectedValues: ['1990'],
selectedIndexes: [0],
},
]);
});
@ -62,7 +60,6 @@ test('should emit change event after draging the column', () => {
columnIndex: 0,
selectedOptions: [{ text: '1995', value: '1995' }],
selectedValues: ['1995'],
selectedIndexes: [5],
},
],
]);
@ -86,7 +83,6 @@ test('should emit change event when after clicking a option', async () => {
columnIndex: 0,
selectedOptions: [{ text: 'B', value: 'B' }],
selectedValues: ['B'],
selectedIndexes: [1],
},
],
]);
@ -138,7 +134,6 @@ test('should emit click-option event after clicking an option', async () => {
currentOption: { text: '1990', value: '1990' },
selectedOptions: [{ text: '1990', value: '1990' }],
selectedValues: ['1990'],
selectedIndexes: [0],
},
]);
});
@ -185,11 +180,7 @@ test('should allow to update columns props dynamically', async () => {
await wrapper.find('.van-picker__confirm').trigger('click');
expect(wrapper.emitted<[string, number]>('confirm')![0]).toEqual([
{
selectedOptions: [{ text: '2', value: '2' }],
selectedValues: ['2'],
selectedIndexes: [0],
},
{ selectedOptions: [{ text: '2', value: '2' }], selectedValues: ['2'] },
]);
});
@ -214,11 +205,7 @@ test('should not reset index when columns unchanged', async () => {
await wrapper.find('.van-picker__confirm').trigger('click');
expect(wrapper.emitted<[string, number]>('confirm')![0]).toEqual([
{
selectedOptions: [{ text: '2', value: '2' }],
selectedValues: ['2'],
selectedIndexes: [1],
},
{ selectedOptions: [{ text: '2', value: '2' }], selectedValues: ['2'] },
]);
});

View File

@ -47,7 +47,6 @@ export type PickerInstance = ComponentPublicInstance<PickerProps, PickerExpose>;
export type PickerConfirmEventParams = {
selectedValues: Numeric[];
selectedOptions: Array<PickerOption | undefined>;
selectedIndexes: number[];
};
export type PickerCancelEventParams = PickerConfirmEventParams;

View File

@ -77,7 +77,6 @@ test('should emit confirm event after clicking the confirm button', async () =>
{ text: '00', value: '00' },
],
selectedValues: ['12', '00'],
selectedIndexes: [12, 0],
},
],
]);
@ -106,7 +105,6 @@ test('should emit confirm event correctly after setting values', async () => {
{ text: '00', value: '00' },
],
selectedValues: ['00', '00'],
selectedIndexes: [0, 0],
},
],
[
@ -116,7 +114,6 @@ test('should emit confirm event correctly after setting values', async () => {
{ text: '30', value: '30' },
],
selectedValues: ['22', '30'],
selectedIndexes: [22, 30],
},
],
]);
@ -144,7 +141,6 @@ test('should emit confirm event correctly after setting range', async () => {
{ text: '30', value: '30' },
],
selectedValues: ['20', '30'],
selectedIndexes: [0, 0],
},
],
]);
@ -171,7 +167,6 @@ test('should emit confirm event correctly after setting smaller max-hour and max
{ text: '00', value: '00' },
],
selectedValues: ['00', '00'],
selectedIndexes: [0, 0],
},
],
]);