feat: 支持自定义受控 loading 态图标

irisSong · irisSong · commit 6f4a65e57bdb · 2025-03-26T10:22:12.000+08:00
diff --git a/src/packages/switch/doc.en-US.md b/src/packages/switch/doc.en-US.md
@@ -77,6 +77,7 @@ import { Switch } from '@nutui/nutui-react'
 | disabled | Disabled | `boolean` | `false` |
 | activeText | Text description when opening | `ReactNode` | `-` |
 | inactiveText | Text description when closed | `ReactNode` | `-` |
+| loadingIcon | Controlled loading state icon | `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,6 +77,7 @@ 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,6 +77,7 @@ 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,6 +77,7 @@ 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
@@ -13,6 +13,7 @@ const defaultProps = {
   disabled: false,
   activeText: '',
   inactiveText: '',
+  loadingIcon: <Loading1 />,
 } as TaroSwitchProps
 export const Switch: FunctionComponent<Partial<TaroSwitchProps>> = (props) => {
   const {
@@ -21,6 +22,7 @@ export const Switch: FunctionComponent<Partial<TaroSwitchProps>> = (props) => {
     disabled,
     activeText,
     inactiveText,
+    loadingIcon,
     className,
     style,
     onChange,
@@ -80,8 +82,8 @@ export const Switch: FunctionComponent<Partial<TaroSwitchProps>> = (props) => {
           },
         ])}
       >
-        {changing ? (
-          <Loading1 />
+        {changing && loadingIcon ? (
+          <>{loadingIcon}</>
         ) : (
           <>
             {!value && !activeText && (
diff --git a/src/packages/switch/switch.tsx b/src/packages/switch/switch.tsx
@@ -11,6 +11,7 @@ const defaultProps = {
   disabled: false,
   activeText: '',
   inactiveText: '',
+  loadingIcon: <Loading1 />,
 } as WebSwitchProps
 export const Switch: FunctionComponent<Partial<WebSwitchProps>> = (props) => {
   const {
@@ -19,6 +20,7 @@ export const Switch: FunctionComponent<Partial<WebSwitchProps>> = (props) => {
     disabled,
     activeText,
     inactiveText,
+    loadingIcon,
     className,
     style,
     onChange,
@@ -78,8 +80,8 @@ export const Switch: FunctionComponent<Partial<WebSwitchProps>> = (props) => {
           },
         ])}
       >
-        {changing ? (
-          <Loading1 />
+        {changing && loadingIcon ? (
+          <>{loadingIcon}</>
         ) : (
           <>
             {!value && !activeText && (
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
@@ -225,6 +225,7 @@ 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
@@ -228,6 +228,7 @@ plugins: [
 
 - `activeText` 属性类型更改为`ReactNode`
 - `inactiveText` 属性类型更改为 `ReactNode`
+- 新增 `loadingIcon` 属性，受控 loading 态图标
 
 [//]: # '#### Toast'
 
diff --git a/src/types/spec/switch/base.ts b/src/types/spec/switch/base.ts
@@ -7,5 +7,6 @@ export interface BaseSwitch extends BaseProps {
   disabled: boolean
   activeText: ReactNode
   inactiveText: ReactNode
+  loadingIcon: ReactNode
   onChange: (val: boolean) => void
 }

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ export interface BaseSwitch extends BaseProps {`
`7`	`7`	`disabled: boolean`
`8`	`8`	`activeText: ReactNode`
`9`	`9`	`inactiveText: ReactNode`
	`10`	`+ loadingIcon: ReactNode`
`10`	`11`	`onChange: (val: boolean) => void`
`11`	`12`	`}`