From 9946180810c7a7e74e6253e27d179b9e8b72d9ee Mon Sep 17 00:00:00 2001 From: "xiyang.bai" Date: Thu, 29 Jul 2021 10:24:28 +0800 Subject: [PATCH 1/2] zoom in && zoom out --- packages/dooringx-lib/src/core/scale/index.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/dooringx-lib/src/core/scale/index.ts b/packages/dooringx-lib/src/core/scale/index.ts index 85dd3a0..fcceef4 100644 --- a/packages/dooringx-lib/src/core/scale/index.ts +++ b/packages/dooringx-lib/src/core/scale/index.ts @@ -20,16 +20,17 @@ export const onWheelEvent = (config: UserConfig) => { } if (e.deltaY > 0) { scaleCancelFn(); - if (scale.value < scale.maxValue) { - scale.value = scale.value + 0.1; + //往下滚缩小 + if (scale.value > scale.minValue) { + scale.value = scale.value - 0.1; store.forceUpdate(); config.refreshIframe(); } } else { scaleCancelFn(); - //往上滚缩小 - if (scale.value > scale.minValue) { - scale.value = scale.value - 0.1; + //往上滚放大 + if (scale.value < scale.maxValue) { + scale.value = scale.value + 0.1; store.forceUpdate(); config.refreshIframe(); } From 1b7a4557bf32cd132324f692a15326c6812d1ed0 Mon Sep 17 00:00:00 2001 From: "xiyang.bai" Date: Thu, 29 Jul 2021 14:01:59 +0800 Subject: [PATCH 2/2] iframeWrapper --- .../src/components/IframeWrapperMove/index.tsx | 4 ++-- packages/dooringx-lib/src/core/scale/index.ts | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/dooringx-lib/src/components/IframeWrapperMove/index.tsx b/packages/dooringx-lib/src/components/IframeWrapperMove/index.tsx index 0daa87a..09e1a4d 100644 --- a/packages/dooringx-lib/src/components/IframeWrapperMove/index.tsx +++ b/packages/dooringx-lib/src/components/IframeWrapperMove/index.tsx @@ -7,7 +7,7 @@ */ import { AllHTMLAttributes, CSSProperties, PropsWithChildren, ReactNode, useRef } from 'react'; import { wrapperEvent } from './event'; -import { onWheelEvent } from '../../core/scale'; +import { onWheelEventIframe } from '../../core/scale'; import React from 'react'; import Ticker from './ticker'; import UserConfig from '../../config'; @@ -45,7 +45,7 @@ function ContainerWrapper(props: PropsWithChildren) { ...style, }} {...wrapperEvent(ref, props.config)} - {...onWheelEvent(props.config)} + {...onWheelEventIframe(props.config, scaleState)} {...rest} >
0) { scaleCancelFn(); - if (scale.value < scale.maxValue) { - scale.value = scale.value + 0.1; + //往下滚缩小 + if (scale.value > scale.minValue) { + scale.value = scale.value - 0.1; config.sendParent({ type: 'update', column: 'scale', @@ -91,9 +92,9 @@ export const onWheelEventIframe = ( } } else { scaleCancelFn(); - //往上滚缩小 - if (scale.value > scale.minValue) { - scale.value = scale.value - 0.1; + //往上滚放大 + if (scale.value < scale.maxValue) { + scale.value = scale.value + 0.1; config.sendParent({ type: 'update', column: 'scale',