From 2d5005edbc09c975b8f154bdf0a5ddac83b6e0eb Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Thu, 5 Dec 2024 16:59:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=BB=9A=E5=8A=A8=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/elevator/demos/taro/demo2.tsx | 2 +- src/packages/elevator/demos/taro/demo3.tsx | 1 + src/packages/elevator/demos/taro/demo4.tsx | 1 + src/packages/elevator/demos/taro/demo5.tsx | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/packages/elevator/demos/taro/demo2.tsx b/src/packages/elevator/demos/taro/demo2.tsx index bd25162c9e..aa297b9228 100644 --- a/src/packages/elevator/demos/taro/demo2.tsx +++ b/src/packages/elevator/demos/taro/demo2.tsx @@ -113,7 +113,7 @@ const Demo2 = () => { } return ( { } return ( { } return ( { } return ( onItemClick(key, item)} From ff9b9a56e3fb92a9a0229ef34808347c2f69a471 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Fri, 6 Dec 2024 09:35:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(elevator):=20harmony=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/elevator/elevator.scss | 11 +++++--- src/packages/elevator/elevator.taro.tsx | 35 +++++++++++++------------ 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/packages/elevator/elevator.scss b/src/packages/elevator/elevator.scss index 24c4bf45f9..89136fa9d4 100644 --- a/src/packages/elevator/elevator.scss +++ b/src/packages/elevator/elevator.scss @@ -51,6 +51,8 @@ } &-fixed { + display: flex; + align-items: center; width: 100%; position: absolute; top: 0; @@ -58,13 +60,14 @@ z-index: 1; padding: $elevator-list-item-padding; height: $elevator-list-item-code-height; - line-height: $elevator-list-item-code-line-height; - font-size: $elevator-list-item-code-font-size; - color: $elevator-list-fixed-color; - font-weight: $elevator-list-item-code-font-weight; background-color: $elevator-list-fixed-bg-color; box-sizing: border-box; box-shadow: $elevator-list-fixed-box-shadow; + &-title { + font-size: $elevator-list-item-code-font-size; + color: $elevator-list-fixed-color; + font-weight: $elevator-list-item-code-font-weight; + } } } diff --git a/src/packages/elevator/elevator.taro.tsx b/src/packages/elevator/elevator.taro.tsx index b58313f3c9..ee273a90f7 100644 --- a/src/packages/elevator/elevator.taro.tsx +++ b/src/packages/elevator/elevator.taro.tsx @@ -4,12 +4,13 @@ import React, { useEffect, useState, createContext, + useMemo, } from 'react' import Taro, { nextTick, createSelectorQuery } from '@tarojs/taro' - -import { ScrollView, View } from '@tarojs/components' +import { ScrollView, View, Text } from '@tarojs/components' import classNames from 'classnames' import { BasicComponent, ComponentDefaults } from '@/utils/typings' +import { harmony } from '@/utils/platform-taro' export const elevatorContext = createContext({} as ElevatorData) @@ -146,8 +147,7 @@ export const Elevator: FunctionComponent< touchState.current.y2 = firstTouch.pageY const delta = (touchState.current.y2 - touchState.current.y1) / spaceHeight || 0 - const cacheIndex = state.current.anchorIndex + Math.floor(delta) - + const cacheIndex = state.current.anchorIndex + Math.round(delta) setCodeIndex(cacheIndex) scrollTo(cacheIndex) } @@ -211,6 +211,12 @@ export const Elevator: FunctionComponent< } } + const getWrapStyle = useMemo(() => { + const calcHeight = Number.isNaN(+height) ? height : `${height}px` + + return { height: harmony() ? Number(calcHeight) : calcHeight } + }, [height]) + useEffect(() => { if (listview.current) { nextTick(() => { @@ -221,10 +227,7 @@ export const Elevator: FunctionComponent< return (
- + ) : null} - touchStart(event as any)} - onTouchMove={(event) => touchMove(event as any)} - onTouchEnd={touchEnd} - style={{ touchAction: 'pan-y' }} - > + {list.map((item: any, index: number) => { return ( handleClickIndex(item[floorKey])} + onTouchStart={(event) => touchStart(event as any)} + onTouchMove={(event) => touchMove(event as any)} + onTouchEnd={touchEnd} + style={{ touchAction: 'pan-y' }} > {item[floorKey]} @@ -320,9 +321,9 @@ export const Elevator: FunctionComponent< ) : null} {sticky && scrollY > 0 ? ( - + {list[codeIndex][floorKey]} - + ) : null}
From 6d0d987eacfce7df96fc4ef9e1ceeaf625e40031 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Fri, 6 Dec 2024 11:41:57 +0800 Subject: [PATCH 3/3] fix: harmony height --- src/packages/elevator/elevator.taro.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/elevator/elevator.taro.tsx b/src/packages/elevator/elevator.taro.tsx index c472d5b056..ce97fa3872 100644 --- a/src/packages/elevator/elevator.taro.tsx +++ b/src/packages/elevator/elevator.taro.tsx @@ -216,7 +216,7 @@ export const Elevator: FunctionComponent< const getWrapStyle = useMemo(() => { const calcHeight = Number.isNaN(+height) ? height : `${height}px` - return { height: harmony() ? Number(calcHeight) : calcHeight } + return { height: harmony() ? Number(height) : calcHeight } }, [height]) useEffect(() => {