From 30af04b707974608deb1c6bdb9614efe702d6c47 Mon Sep 17 00:00:00 2001 From: lllomh Date: Mon, 18 Sep 2023 18:23:01 +0800 Subject: [PATCH 01/59] fix(Picker): fix bug the content of the popup window is not consistent with the Chinese version under the English version --- packages/vant/src/picker/demo/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/vant/src/picker/demo/index.vue b/packages/vant/src/picker/demo/index.vue index cb36a910148..c6353ceb9dc 100644 --- a/packages/vant/src/picker/demo/index.vue +++ b/packages/vant/src/picker/demo/index.vue @@ -44,8 +44,7 @@ const t = useTranslate({ multipleColumns: 'Multiple Columns', customChildrenKey: 'Custom Columns Fields', customChildrenColumns: customKeyColumns['en-US'], - toastContent: (value: string, index: number) => - `Value: ${value}, Index:${index}`, + toastContent: (value: string) => `Value: ${value}`, }, }); From 37fc0b8f7d5a6d14d7bbfbae4d07ec0b4cca3b79 Mon Sep 17 00:00:00 2001 From: lllomh Date: Wed, 20 Sep 2023 14:54:14 +0800 Subject: [PATCH 02/59] fix(Picker): Fix the issue that scroll wheel selection list is not supported on pc --- packages/vant/src/picker/PickerColumn.tsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/vant/src/picker/PickerColumn.tsx b/packages/vant/src/picker/PickerColumn.tsx index 7b07594b66e..b1af3e29ef4 100644 --- a/packages/vant/src/picker/PickerColumn.tsx +++ b/packages/vant/src/picker/PickerColumn.tsx @@ -219,6 +219,12 @@ export default defineComponent({ }, 0); }; + const onMouseWheel = () => { + if (isReadonly()) { + return; + } + }; + const renderOptions = () => { const optionStyle = { height: `${props.optionHeight}px`, @@ -240,6 +246,7 @@ export default defineComponent({ option.className, ], onClick: () => onClickOption(index), + onWheel: () => onClickOption(index), }; const childData = { @@ -286,6 +293,7 @@ export default defineComponent({ onTouchstartPassive={onTouchStart} onTouchend={onTouchEnd} onTouchcancel={onTouchEnd} + onWheel={onMouseWheel} >