From abd1157bc79e65435eac4f4778edc60524834cb2 Mon Sep 17 00:00:00 2001
From: jixinbao <jixinbao@dcloud.io>
Date: Wed, 6 Mar 2024 16:07:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(x):=20ios=20=E9=80=82=E9=85=8D=20from=20?=
 =?UTF-8?q?=E5=86=85=E7=BD=AE=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E6=B3=A8=E5=86=8C=E5=BD=93=E5=89=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=20console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkbox-group/checkbox-group.tsx         | 26 +------------------
 .../picker-view/picker-view-column.tsx        |  1 -
 .../x/components/picker-view/picker-view.tsx  |  2 --
 .../x/components/radio-group/radio-group.tsx  | 24 +----------------
 4 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/packages/uni-app-plus/src/x/components/checkbox-group/checkbox-group.tsx b/packages/uni-app-plus/src/x/components/checkbox-group/checkbox-group.tsx
index 965e3d24b0c..d2a37a5abfa 100644
--- a/packages/uni-app-plus/src/x/components/checkbox-group/checkbox-group.tsx
+++ b/packages/uni-app-plus/src/x/components/checkbox-group/checkbox-group.tsx
@@ -3,14 +3,12 @@ import { defineBuiltInComponent } from '@dcloudio/uni-components'
 import {
   CHECKBOX_GROUP_NAME,
   CHECKBOX_GROUP_ROOT_ELEMENT,
-  // UniCheckboxGroupChangeEvent,
   checkboxGroupProps,
   CheckboxInfo,
   UniCheckboxGroupChangeEvent,
   UniCheckboxGroupElement,
 } from './model'
-import { getCurrentInstance, onMounted, onUnmounted, ref, camelize } from 'vue'
-import { $dispatch } from '../../utils'
+import { getCurrentInstance, onMounted, ref, camelize } from 'vue'
 
 export default /*#__PURE__*/ defineBuiltInComponent({
   name: CHECKBOX_GROUP_NAME,
@@ -88,31 +86,9 @@ export default /*#__PURE__*/ defineBuiltInComponent({
             ? props[keyString]?.toString() ?? null
             : null
         }
-
-        // for form
-        const ctx = instance.proxy
-        $dispatch(
-          ctx,
-          'Form',
-          'formControlUpdate',
-          uniCheckboxGroupElementRef.value,
-          'add'
-        )
       })
     })
 
-    onUnmounted(() => {
-      // for form
-      const ctx = instance?.proxy
-      $dispatch(
-        ctx,
-        'Form',
-        'formControlUpdate',
-        uniCheckboxGroupElementRef.value,
-        'remove'
-      )
-    })
-
     expose({
       _checkboxGroupUpdateHandler,
       _changeHandler,
diff --git a/packages/uni-app-plus/src/x/components/picker-view/picker-view-column.tsx b/packages/uni-app-plus/src/x/components/picker-view/picker-view-column.tsx
index 7ec70400770..ea45aacbe3f 100644
--- a/packages/uni-app-plus/src/x/components/picker-view/picker-view-column.tsx
+++ b/packages/uni-app-plus/src/x/components/picker-view/picker-view-column.tsx
@@ -113,7 +113,6 @@ export default /*#__PURE__*/ defineBuiltInComponent({
     }
 
     const onScrollend = (e: ScrollEvent) => {
-      console.log('onScrollend')
       if (Date.now() - data.scrollToElementTime < 200) {
         return
       }
diff --git a/packages/uni-app-plus/src/x/components/picker-view/picker-view.tsx b/packages/uni-app-plus/src/x/components/picker-view/picker-view.tsx
index ed5b5644714..12d36be397c 100644
--- a/packages/uni-app-plus/src/x/components/picker-view/picker-view.tsx
+++ b/packages/uni-app-plus/src/x/components/picker-view/picker-view.tsx
@@ -51,8 +51,6 @@ export default /*#__PURE__*/ defineBuiltInComponent({
       val.forEach((_val, index) => {
         if (data.$items.length > index) {
           const fn = data.$items[index].$.exposed?.setCurrent
-          // data.$items[index].$.exposed?.setCurrent?.(val)
-          console.log(fn, _val)
           fn(_val)
         }
       })
diff --git a/packages/uni-app-plus/src/x/components/radio-group/radio-group.tsx b/packages/uni-app-plus/src/x/components/radio-group/radio-group.tsx
index 7dca9a1f193..f9f2c180447 100644
--- a/packages/uni-app-plus/src/x/components/radio-group/radio-group.tsx
+++ b/packages/uni-app-plus/src/x/components/radio-group/radio-group.tsx
@@ -1,6 +1,6 @@
 /// <reference types="@dcloudio/uni-app-x/types/native-global" />
 import { defineBuiltInComponent } from '@dcloudio/uni-components'
-import { onMounted, getCurrentInstance, ref, onUnmounted, camelize } from 'vue'
+import { onMounted, getCurrentInstance, ref, camelize } from 'vue'
 import {
   RADIOGROUP_NAME,
   RADIOGROUP_ROOT_ELEMENT,
@@ -9,7 +9,6 @@ import {
   UniRadioGroupChangeEvent,
   UniRadioGroupElement,
 } from './model'
-import { $dispatch } from '../../utils'
 
 /**
  * radio-group 组件
@@ -109,30 +108,9 @@ export default /*#__PURE__*/ defineBuiltInComponent({
             ? props[keyString]?.toString() ?? null
             : null
         }
-
-        // for form
-        const ctx = instance?.proxy
-        $dispatch(
-          ctx,
-          'Form',
-          'formControlUpdate',
-          uniRadioGroupElementRef.value,
-          'add'
-        )
       })
     })
 
-    onUnmounted(() => {
-      const ctx = instance?.proxy
-      $dispatch(
-        ctx,
-        'Form',
-        'formControlUpdate',
-        uniRadioGroupElementRef.value,
-        'remove'
-      )
-    })
-
     expose({
       _radioGroupUpdateHandler,
       _getValue,