From d437b6a843d9d02518fee8ee6d4f4bbbe36d2c68 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Mon, 21 Apr 2025 09:45:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E5=80=BC=E4=B8=BA0=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/pickerview/pickerroller.taro.tsx | 5 ++--- src/packages/pickerview/pickerview.taro.tsx | 3 ++- src/packages/pickerview/pickerview.tsx | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/packages/pickerview/pickerroller.taro.tsx b/src/packages/pickerview/pickerroller.taro.tsx index 587cad1ac1..4b2aa7d00c 100644 --- a/src/packages/pickerview/pickerroller.taro.tsx +++ b/src/packages/pickerview/pickerroller.taro.tsx @@ -262,7 +262,7 @@ const InternalPickerRoller: ForwardRefRenderFunction< {/* 3D 效果 */} {threeDimensional && options.map((item: PickerOption, index: number) => ( - <> + {isGetLineSpacing ? ( {renderLabel(item)} ) : null} - + ))} {/* Tiled */} {!threeDimensional && diff --git a/src/packages/pickerview/pickerview.taro.tsx b/src/packages/pickerview/pickerview.taro.tsx index f5486983e0..3725fe30cd 100644 --- a/src/packages/pickerview/pickerview.taro.tsx +++ b/src/packages/pickerview/pickerview.taro.tsx @@ -133,7 +133,8 @@ const InternalPickerView: ForwardRefRenderFunction< const handleSelect = useCallback( (option: PickerOption, index: number) => { const newValue = option?.value - if (!newValue || innerValue[index] === newValue) return + if ((!newValue && newValue !== 0) || innerValue[index] === newValue) + return changeIndex.current = index if (columnsType === 'multiple') { setInnerValue((prev) => { diff --git a/src/packages/pickerview/pickerview.tsx b/src/packages/pickerview/pickerview.tsx index 8ddb2851d0..f6d4cea931 100644 --- a/src/packages/pickerview/pickerview.tsx +++ b/src/packages/pickerview/pickerview.tsx @@ -132,7 +132,8 @@ const InternalPickerView: ForwardRefRenderFunction< const handleSelect = useCallback( (option: PickerOption, index: number) => { const newValue = option?.value - if (!newValue || innerValue[index] === newValue) return + if ((!newValue && newValue !== 0) || innerValue[index] === newValue) + return changeIndex.current = index if (columnsType === 'multiple') { setInnerValue((prev) => { From ad80dd6173e4164e512d9a5525d005fce257c48e Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Mon, 21 Apr 2025 09:58:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=A4=8D=E7=94=A8utils=E5=87=BD?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/pickerview/pickerview.taro.tsx | 4 ++-- src/packages/pickerview/pickerview.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/packages/pickerview/pickerview.taro.tsx b/src/packages/pickerview/pickerview.taro.tsx index 3725fe30cd..5f2f646422 100644 --- a/src/packages/pickerview/pickerview.taro.tsx +++ b/src/packages/pickerview/pickerview.taro.tsx @@ -18,6 +18,7 @@ import { PickerOptions, } from '@/types' import PickerRoller from './pickerroller.taro' +import { isEmpty } from '@/utils/is-empty' const defaultProps = { ...ComponentDefaults, @@ -133,8 +134,7 @@ const InternalPickerView: ForwardRefRenderFunction< const handleSelect = useCallback( (option: PickerOption, index: number) => { const newValue = option?.value - if ((!newValue && newValue !== 0) || innerValue[index] === newValue) - return + if (isEmpty(newValue) || innerValue[index] === newValue) return changeIndex.current = index if (columnsType === 'multiple') { setInnerValue((prev) => { diff --git a/src/packages/pickerview/pickerview.tsx b/src/packages/pickerview/pickerview.tsx index f6d4cea931..9a17f74ce9 100644 --- a/src/packages/pickerview/pickerview.tsx +++ b/src/packages/pickerview/pickerview.tsx @@ -17,6 +17,7 @@ import { PickerOptions, } from '@/types' import PickerRoller from './pickerroller' +import { isEmpty } from '@/utils/is-empty' const defaultProps = { ...ComponentDefaults, @@ -132,8 +133,7 @@ const InternalPickerView: ForwardRefRenderFunction< const handleSelect = useCallback( (option: PickerOption, index: number) => { const newValue = option?.value - if ((!newValue && newValue !== 0) || innerValue[index] === newValue) - return + if (isEmpty(newValue) || innerValue[index] === newValue) return changeIndex.current = index if (columnsType === 'multiple') { setInnerValue((prev) => {