From 64ef06ad302361787be372678579fc95d2ad729e Mon Sep 17 00:00:00 2001
From: handongxun <handongxun@dcloud.io>
Date: Thu, 24 Feb 2022 16:32:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(nvue3):=20swiper=20=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=80=BC=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uni-components/src/nvue/checkbox/index.tsx    |  3 +--
 packages/uni-components/src/nvue/radio/index.tsx  |  3 +--
 packages/uni-components/src/nvue/swiper/index.tsx | 15 +++++++++------
 packages/uni-components/src/nvue/switch/index.tsx |  3 +--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/uni-components/src/nvue/checkbox/index.tsx b/packages/uni-components/src/nvue/checkbox/index.tsx
index acb92b248..f57dfdc34 100644
--- a/packages/uni-components/src/nvue/checkbox/index.tsx
+++ b/packages/uni-components/src/nvue/checkbox/index.tsx
@@ -89,8 +89,7 @@ export default defineComponent({
         return
       }
       if (isLabelClick) {
-        rootRef.value!.click()
-        return
+        // TODO
       }
       checkboxChecked.value = !checkboxChecked.value
       uniCheckGroup && uniCheckGroup.checkboxChange($event)
diff --git a/packages/uni-components/src/nvue/radio/index.tsx b/packages/uni-components/src/nvue/radio/index.tsx
index 5a9d056a8..3810ba884 100644
--- a/packages/uni-components/src/nvue/radio/index.tsx
+++ b/packages/uni-components/src/nvue/radio/index.tsx
@@ -101,8 +101,7 @@ export default defineComponent({
         return
       }
       if (isLabelClick) {
-        rootRef.value!.click()
-        return
+        // TODO
       }
       radioChecked.value = !radioChecked.value
       uniCheckGroup && uniCheckGroup.radioChange($event, field)
diff --git a/packages/uni-components/src/nvue/swiper/index.tsx b/packages/uni-components/src/nvue/swiper/index.tsx
index 1d97b5f4a..63a06c8eb 100644
--- a/packages/uni-components/src/nvue/swiper/index.tsx
+++ b/packages/uni-components/src/nvue/swiper/index.tsx
@@ -142,7 +142,10 @@ function useSwiperListeners(
   let lastOffsetRatio: number = 0
 
   const onScroll = (event: any) => {
-    let offsetRatio = props.vertical ? event.offsetYRatio : event.offsetXRatio
+    const detail = event.detail
+    const isVertical = props.vertical
+    let offsetRatio =
+      (isVertical ? detail.offsetYRatio : detail.offsetXRatio) || 0
     if (event.drag || event.drag) {
       state.currentChangeSource = 'touch'
     }
@@ -157,8 +160,8 @@ function useSwiperListeners(
     }
     lastOffsetRatio = offsetRatio
     trigger('transition', {
-      dx: props.vertical ? 0 : -state.swiperWidth * offsetRatio,
-      dy: props.vertical ? -state.swiperHeight * offsetRatio : 0,
+      dx: isVertical ? 0 : -state.swiperWidth * offsetRatio,
+      dy: isVertical ? -state.swiperHeight * offsetRatio : 0,
     })
   }
 
@@ -176,10 +179,10 @@ function useSwiperListeners(
   }
 
   const onChange = (event: any) => {
-    if (typeof event.source === 'string') {
-      state.currentChangeSource = event.source
+    if (typeof event.detail.source === 'string') {
+      state.currentChangeSource = event.detail.source
     }
-    state.currentSync = event.index
+    state.currentSync = event.detail.index
     lastOffsetRatio = 0
   }
 
diff --git a/packages/uni-components/src/nvue/switch/index.tsx b/packages/uni-components/src/nvue/switch/index.tsx
index 0dbccfe2c..9889d4266 100644
--- a/packages/uni-components/src/nvue/switch/index.tsx
+++ b/packages/uni-components/src/nvue/switch/index.tsx
@@ -57,8 +57,7 @@ export default defineComponent({
         return
       }
       if (isLabelClick) {
-        rootRef.value!.click()
-        return
+        // TODO
       }
       switchChecked.value = !switchChecked.value
       trigger('change', {
-- 
GitLab