fix: modify cr

irisSong · irisSong · commit cdac7884ab44 · 2025-04-03T17:41:40.000+08:00
diff --git a/src/packages/switch/demos/h5/demo2.tsx b/src/packages/switch/demos/h5/demo2.tsx
@@ -4,18 +4,18 @@ import { Cell, Switch, Toast } from '@nutui/nutui-react'
 const Demo2 = () => {
   const [checkedAsync, setCheckedAsync] = useState(true)
 
-  const mockRequest = (): Promise<void> => {
-    return new Promise((resolve) => {
+  const onChangeAsync = async (value: boolean) => {
+    Toast.show(`2秒后异步触发 ${value}`)
+    const res = await new Promise((resolve) => {
       setTimeout(() => {
-        resolve()
+        resolve(true)
       }, 2000)
     })
-  }
-
-  const onChangeAsync = async (value: boolean) => {
-    Toast.show(`2秒后异步触发 ${value}`)
-    await mockRequest()
-    setCheckedAsync(value)
+    if (!res) {
+      throw new Error()
+    } else {
+      setCheckedAsync(value)
+    }
   }
   return (
     <Cell>
diff --git a/src/packages/switch/demos/taro/demo2.tsx b/src/packages/switch/demos/taro/demo2.tsx
@@ -5,19 +5,20 @@ const Demo2 = () => {
   const [checkedAsync, setCheckedAsync] = useState(true)
   const [value, setValue] = useState(false)
   const [showToast, setShowToast] = useState(false)
-  const mockRequest = (): Promise<void> => {
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        resolve()
-      }, 2000)
-    })
-  }
 
   const onChangeAsync = async (value: boolean) => {
     setValue(value)
     setShowToast(true)
-    await mockRequest()
-    setCheckedAsync(value)
+    const res = await new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(true)
+      }, 2000)
+    })
+    if (!res) {
+      throw new Error()
+    } else {
+      setCheckedAsync(value)
+    }
   }
   return (
     <>
diff --git a/src/packages/switch/doc.en-US.md b/src/packages/switch/doc.en-US.md
@@ -77,7 +77,6 @@ import { Switch } from '@nutui/nutui-react'
 | disabled | Disabled | `boolean` | `false` |
 | activeText | Text description when opening | `ReactNode` | `-` |
 | inactiveText | Text description when closed | `ReactNode` | `-` |
-| loadingIcon | Control the loading state icon, disable the loading state when a null | `ReactNode` | `<Loading1 />` |
 | onChange | Trigger when switching switches | `onChange:(value: boolean, event: Event)` | `-` |
 
 ## Theming
diff --git a/src/packages/switch/doc.md b/src/packages/switch/doc.md
@@ -77,7 +77,6 @@ import { Switch } from '@nutui/nutui-react'
 | disabled | 禁用状态 | `boolean` | `false` |
 | activeText | 打开时文字描述 | `ReactNode` | `-` |
 | inactiveText | 关闭时文字描述 | `ReactNode` | `-` |
-| loadingIcon | 控制加载状态的图标，传入空值时禁用 loading 态 | `ReactNode` | `<Loading1 />` |
 | onChange | 切换开关时触发 | `onChange:(value: boolean, event: Event)` | `-` |
 
 ## 主题定制
diff --git a/src/packages/switch/doc.taro.md b/src/packages/switch/doc.taro.md
@@ -77,7 +77,6 @@ import { Switch } from '@nutui/nutui-react-taro'
 | disabled | 禁用状态 | `boolean` | `false` |
 | activeText | 打开时文字描述 | `ReactNode` | `-` |
 | inactiveText | 关闭时文字描述 | `ReactNode` | `-` |
-| loadingIcon | 控制加载状态的图标，传入空值时禁用 loading 态 | `ReactNode` | `<Loading1 />` |
 | onChange | 切换开关时触发 | `onChange:(value: boolean, event: Event)` | `-` |
 
 ## 主题定制
diff --git a/src/packages/switch/doc.zh-TW.md b/src/packages/switch/doc.zh-TW.md
@@ -77,7 +77,6 @@ import { Switch } from '@nutui/nutui-react'
 | disabled | 禁用狀態 | `boolean` | `false` |
 | activeText | 打開時文字描述 | `ReactNode` | `-` |
 | inactiveText | 關閉時文字描述 | `ReactNode` | `-` |
-| loadingIcon | 控制加載狀態的圖標，當傳入空值時禁用 loading 狀態 | `ReactNode` | `<Loading1 />` |
 | onChange | 切換開關時觸發 | `onChange:(value: boolean, event: Event)` | `-` |
 
 ## 主題定製
diff --git a/src/packages/switch/switch.taro.tsx b/src/packages/switch/switch.taro.tsx
@@ -34,7 +34,7 @@ export const Switch: FunctionComponent<Partial<TaroSwitchProps>> = (props) => {
   const classPrefix = 'nut-switch'
 
   const rtl = useRtl()
-
+  console.log('checked', checked)
   const [value, setValue] = usePropsValue<boolean>({
     value: checked,
     defaultValue: defaultChecked,
@@ -58,11 +58,15 @@ export const Switch: FunctionComponent<Partial<TaroSwitchProps>> = (props) => {
     ])
   }
 
-  const onClick = () => {
+  const onClick = async () => {
     if (disabled || changing) return
     if (onChange) {
-      loadingIcon && setChanging(true)
-      onChange(!value)
+      setChanging(true)
+      try {
+        await onChange(!value)
+      } catch (e) {
+        setChanging(false)
+      }
     }
     setValue(!value)
   }
diff --git a/src/packages/switch/switch.tsx b/src/packages/switch/switch.tsx
@@ -56,11 +56,15 @@ export const Switch: FunctionComponent<Partial<WebSwitchProps>> = (props) => {
     ])
   }
 
-  const onClick = () => {
+  const onClick = async () => {
     if (disabled || changing) return
     if (onChange) {
-      loadingIcon && setChanging(true)
-      onChange(!value)
+      setChanging(true)
+      try {
+        await onChange(!value)
+      } catch (e) {
+        setChanging(false)
+      }
     }
     setValue(!value)
   }
diff --git a/src/sites/sites-react/doc/docs/react/migrate-from-v2.md b/src/sites/sites-react/doc/docs/react/migrate-from-v2.md
@@ -238,7 +238,6 @@ plugins: [
 
 - `activeText` 属性类型更改为`ReactNode`
 - `inactiveText` 属性类型更改为 `ReactNode`
-- 新增 `loadingIcon` 属性，受控 loading 态图标
 
 [//]: # '#### Toast'
 
diff --git a/src/sites/sites-react/doc/docs/taro/migrate-from-v2.md b/src/sites/sites-react/doc/docs/taro/migrate-from-v2.md
@@ -237,7 +237,6 @@ plugins: [
 
 - `activeText` 属性类型更改为`ReactNode`
 - `inactiveText` 属性类型更改为 `ReactNode`
-- 新增 `loadingIcon` 属性，受控 loading 态图标
 
 [//]: # '#### Toast'
 

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,15 @@ export const Switch: FunctionComponent<Partial<WebSwitchProps>> = (props) => {`
`56`	`56`	`])`
`57`	`57`	`}`
`58`	`58`
`59`		`- const onClick = () => {`
	`59`	`+ const onClick = async () => {`
`60`	`60`	`if (disabled \|\| changing) return`
`61`	`61`	`if (onChange) {`
`62`		`- loadingIcon && setChanging(true)`
`63`		`- onChange(!value)`
	`62`	`+ setChanging(true)`
	`63`	`+ try {`
	`64`	`+ await onChange(!value)`
	`65`	`+ } catch (e) {`
	`66`	`+ setChanging(false)`
	`67`	`+ }`
`64`	`68`	`}`
`65`	`69`	`setValue(!value)`
`66`	`70`	`}`