chore: merge

packages/uni-components/dist/components.js

@@ -3160,10 +3160,6 @@ var Switch = defineComponent({
       if (props2.disabled) {
         return;
       }
-      if (isLabelClick) {
-        rootRef.value.click();
-        return;
-      }
       switchChecked.value = !switchChecked.value;
       trigger("change", {
         value: switchChecked.value
@@ -3319,10 +3315,6 @@ var Checkbox = defineComponent({
       if (props2.disabled) {
         return;
       }
-      if (isLabelClick) {
-        rootRef.value.click();
-        return;
-      }
       checkboxChecked.value = !checkboxChecked.value;
       uniCheckGroup && uniCheckGroup.checkboxChange($event);
     };
@@ -3564,10 +3556,6 @@ var Radio = defineComponent({
       if (props2.disabled) {
         return;
       }
-      if (isLabelClick) {
-        rootRef.value.click();
-        return;
-      }
       radioChecked.value = !radioChecked.value;
       uniCheckGroup && uniCheckGroup.radioChange($event, field);
     };
@@ -4034,7 +4022,9 @@ function useSwiperState(props2) {
 function useSwiperListeners(state, props2, swiperItems, trigger) {
   let lastOffsetRatio = 0;
   const onScroll = (event) => {
-    let offsetRatio = props2.vertical ? event.offsetYRatio : event.offsetXRatio;
+    const detail = event.detail;
+    const isVertical = props2.vertical;
+    let offsetRatio = (isVertical ? detail.offsetYRatio : detail.offsetXRatio) || 0;
     if (event.drag || event.drag) {
       state.currentChangeSource = "touch";
     }
@@ -4048,8 +4038,8 @@ function useSwiperListeners(state, props2, swiperItems, trigger) {
     }
     lastOffsetRatio = offsetRatio;
     trigger("transition", {
-      dx: props2.vertical ? 0 : -state.swiperWidth * offsetRatio,
-      dy: props2.vertical ? -state.swiperHeight * offsetRatio : 0
+      dx: isVertical ? 0 : -state.swiperWidth * offsetRatio,
+      dy: isVertical ? -state.swiperHeight * offsetRatio : 0
     });
   };
   const onScrollend = (event) => {
@@ -4064,10 +4054,10 @@ function useSwiperListeners(state, props2, swiperItems, trigger) {
     }
   };
   const onChange = (event) => {
-    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;
   };
   function getDetail() {

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)

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)

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
   }
 

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', {