From 5d847aa2bc4126f0a9fc14465ba45b7f4f8d8e4a Mon Sep 17 00:00:00 2001 From: "ext.wangqi150" <664144354@qq.com> Date: Wed, 16 Sep 2026 15:03:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0Lottie=E5=BD=A2?= =?UTF-8?q?=E5=BC=8Floading=E6=96=B0=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/loading/demo.taro.tsx | 2 ++ src/packages/loading/demo.tsx | 2 ++ src/packages/loading/demos/h5/demo9.tsx | 36 +++++++++++++++++++++++ src/packages/loading/demos/taro/demo9.tsx | 36 +++++++++++++++++++++++ src/packages/loading/loading.tsx | 14 +++++---- src/types/spec/loading/base.ts | 3 +- 6 files changed, 87 insertions(+), 6 deletions(-) create mode 100644 src/packages/loading/demos/h5/demo9.tsx create mode 100644 src/packages/loading/demos/taro/demo9.tsx diff --git a/src/packages/loading/demo.taro.tsx b/src/packages/loading/demo.taro.tsx index 7ee4e13d3c..6fcbd1abc8 100644 --- a/src/packages/loading/demo.taro.tsx +++ b/src/packages/loading/demo.taro.tsx @@ -10,6 +10,7 @@ import Demo5 from './demos/taro/demo5' import Demo6 from './demos/taro/demo6' import Demo7 from './demos/taro/demo7' import Demo8 from './demos/taro/demo8' +import Demo9 from './demos/taro/demo9' const LoadingDemo = () => { const [translated] = useTranslate({ @@ -65,6 +66,7 @@ const LoadingDemo = () => { {translated.title8} + ) diff --git a/src/packages/loading/demo.tsx b/src/packages/loading/demo.tsx index fcb6510459..e8c27a1f5e 100644 --- a/src/packages/loading/demo.tsx +++ b/src/packages/loading/demo.tsx @@ -8,6 +8,7 @@ import Demo5 from './demos/h5/demo5' import Demo6 from './demos/h5/demo6' import Demo7 from './demos/h5/demo7' import Demo8 from './demos/h5/demo8' +import Demo9 from './demos/h5/demo9' const LoadingDemo = () => { const [translated] = useTranslate({ @@ -61,6 +62,7 @@ const LoadingDemo = () => {

{translated.title8}

+ ) diff --git a/src/packages/loading/demos/h5/demo9.tsx b/src/packages/loading/demos/h5/demo9.tsx new file mode 100644 index 0000000000..d6c3f37258 --- /dev/null +++ b/src/packages/loading/demos/h5/demo9.tsx @@ -0,0 +1,36 @@ +import React from 'react' +import { Loading, Cell, Lottie } from '@nutui/nutui-react' +import lightLoading from '@nutui/nutui-react/dist/es/lottie/animation/light/loading.json' + +const Demo9 = () => { + const WrapperStyle = { + padding: 8, + borderRadius: 8, + backgroundColor: '#11141A05', + } + + const WrapperTextStyle = { + height: 18, + padding: 0, + } + + const lottie = ( + + ) + + return ( + <> + + + 内容加载中 + + + + ) +} +export default Demo9 diff --git a/src/packages/loading/demos/taro/demo9.tsx b/src/packages/loading/demos/taro/demo9.tsx new file mode 100644 index 0000000000..c790a7e918 --- /dev/null +++ b/src/packages/loading/demos/taro/demo9.tsx @@ -0,0 +1,36 @@ +import React from 'react' +import { Loading, Cell, Lottie } from '@nutui/nutui-react-taro' +import lightLoading from '@nutui/nutui-react-taro/dist/es/lottie/animation/light/loading.json' + +const Demo9 = () => { + const WrapperStyle = { + padding: 8, + borderRadius: 8, + backgroundColor: '#11141A05', + } + + const WrapperTextStyle = { + height: 18, + padding: 0, + } + + const lottie = ( + + ) + + return ( + <> + + + 内容加载中 + + + + ) +} +export default Demo9 diff --git a/src/packages/loading/loading.tsx b/src/packages/loading/loading.tsx index 6517de575d..6cbf0b5d1a 100644 --- a/src/packages/loading/loading.tsx +++ b/src/packages/loading/loading.tsx @@ -19,14 +19,16 @@ const defaultProps = { type: 'circular', direction: 'horizontal', lottieProps: {}, + textStyle: {}, } as WebLoadingProps export const Loading = React.forwardRef>( (props, ref) => { - const { className, style, children, direction, icon, ...rest } = { - ...defaultProps, - ...props, - } + const { className, style, children, direction, icon, textStyle, ...rest } = + { + ...defaultProps, + ...props, + } const classPrefix = 'nut-loading' const getLoadingIcon = () => { @@ -47,7 +49,9 @@ export const Loading = React.forwardRef>( >
{icon || getLoadingIcon()}
{children ? ( -
{children}
+
+ {children} +
) : null} ) diff --git a/src/types/spec/loading/base.ts b/src/types/spec/loading/base.ts index a883bc6eb8..aa426ab202 100644 --- a/src/types/spec/loading/base.ts +++ b/src/types/spec/loading/base.ts @@ -1,4 +1,4 @@ -import { ReactNode } from 'react' +import { CSSProperties, ReactNode } from 'react' import { BaseProps } from '../../base/props' import { Direction } from '../../base/atoms' @@ -12,4 +12,5 @@ export interface BaseLoading extends BaseProps { jsonData: any lottieProps: Partial + textStyle: CSSProperties } From 21fbf5ebed2586ce6e106f65b43e9c10a2916569 Mon Sep 17 00:00:00 2001 From: "ext.wangqi150" <664144354@qq.com> Date: Thu, 17 Sep 2026 10:39:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5taro=E6=96=87?= =?UTF-8?q?=E4=BB=B6loading=E6=96=B0=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/loading/loading.taro.tsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/packages/loading/loading.taro.tsx b/src/packages/loading/loading.taro.tsx index fcecdba8e3..7d770c2777 100644 --- a/src/packages/loading/loading.taro.tsx +++ b/src/packages/loading/loading.taro.tsx @@ -23,10 +23,11 @@ const defaultProps = { export const Loading = React.forwardRef>( (props, ref) => { - const { className, style, children, direction, icon, ...rest } = { - ...defaultProps, - ...props, - } + const { className, style, children, direction, icon, textStyle, ...rest } = + { + ...defaultProps, + ...props, + } const classPrefix = 'nut-loading' const getLoadingIcon = () => { @@ -47,7 +48,9 @@ export const Loading = React.forwardRef>( > {icon || getLoadingIcon()} {children ? ( - {children} + + {children} + ) : null} ) From 6e770ff34a4c2c0ee12ddc39a9de8111d0259f24 Mon Sep 17 00:00:00 2001 From: "ext.wangqi150" <664144354@qq.com> Date: Fri, 18 Sep 2026 15:16:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9textStyle=E4=B8=BA?= =?UTF-8?q?=E5=8F=AF=E9=80=89=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/spec/loading/base.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/types/spec/loading/base.ts b/src/types/spec/loading/base.ts index aa426ab202..0b241f3feb 100644 --- a/src/types/spec/loading/base.ts +++ b/src/types/spec/loading/base.ts @@ -12,5 +12,5 @@ export interface BaseLoading extends BaseProps { jsonData: any lottieProps: Partial - textStyle: CSSProperties + textStyle?: CSSProperties }