diff --git a/src/packages/configprovider/demo.taro.tsx b/src/packages/configprovider/demo.taro.tsx index b6a58b37a0..9cefae570e 100644 --- a/src/packages/configprovider/demo.taro.tsx +++ b/src/packages/configprovider/demo.taro.tsx @@ -6,31 +6,23 @@ import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' import Demo2 from './demos/taro/demo2' import Demo3 from './demos/taro/demo3' -import Demo4 from './demos/taro/demo4' -import Demo5 from './demos/taro/demo5' import { useTranslate } from '@/sites/assets/locale/taro' const ConfigProviderDemo = () => { const [translated] = useTranslate({ 'zh-CN': { - title1: 'Textarea 默认-禁用', - title2: 'Textarea 英文-禁用', - defaultTheme: '默认主题', - customTheme: `定制主题${harmony() ? '【暂不支持】' : ''}`, + text: 'Textarea 中文与英文', + theme: '默认主题与定制主题', RTL: harmony() ? 'RTL【暂不支持】' : 'RTL', }, 'zh-TW': { - title1: 'Textarea 默認用法-禁用', - title2: 'Textarea 英文-禁用', - defaultTheme: '默認主題', - customTheme: `定制主題${harmony() ? '【暂不支持】' : ''}`, + text: 'Textarea 中文与英文', + theme: '默認主題与定制主題', RTL: harmony() ? 'RTL【暂不支持】' : 'RTL', }, 'en-US': { - title1: 'Textarea default + disabled', - title2: 'Textarea en-US + disabled', - customTheme: 'Custom Theme', - defaultTheme: `Default Theme ${harmony() ? '[Pendding]' : ''}`, + text: 'Textarea zh-CN and en-US', + theme: 'Default Theme And Custom Theme', RTL: harmony() ? 'RTL[Pendding]' : 'RTL', }, }) @@ -38,16 +30,12 @@ const ConfigProviderDemo = () => { <>
- {translated.defaultTheme} + {translated.theme} - {translated.customTheme} + {translated.text} - {translated.title1} - - {translated.title2} - {translated.RTL} - + ) diff --git a/src/packages/configprovider/demo.tsx b/src/packages/configprovider/demo.tsx index da556acc66..a1d768965f 100644 --- a/src/packages/configprovider/demo.tsx +++ b/src/packages/configprovider/demo.tsx @@ -2,44 +2,32 @@ import React from 'react' import Demo1 from './demos/h5/demo1' import Demo2 from './demos/h5/demo2' import Demo3 from './demos/h5/demo3' -import Demo4 from './demos/h5/demo4' -import Demo5 from './demos/h5/demo5' import { useTranslate } from '@/sites/assets/locale' const ConfigProviderDemo = () => { const [translated] = useTranslate({ 'zh-CN': { - title1: 'Textarea 默认', - title2: 'Textarea 英文', - defaultTheme: '默认主题', - customTheme: '定制主题', + text: 'Textarea 中文与英文', + theme: '默认主题与定制主题', }, 'zh-TW': { - title1: '默認用法', - title2: 'Textarea 英文', - defaultTheme: '默認主題', - customTheme: '定制主題', + text: 'Textarea 中文与英文', + theme: '默認主題与定制主題', }, 'en-US': { - title1: 'Textarea default', - title2: 'Textarea en-US', - customTheme: 'Custom Theme', - defaultTheme: 'Default Theme', + text: 'Textarea zh-CN and en-US', + theme: 'Default Theme And Custom Theme', }, }) return ( <>
-

{translated.defaultTheme}

+

{translated.theme}

-

{translated.customTheme}

+

{translated.text}

-

{translated.title1}

- -

{translated.title2}

-

RTL

- +
) diff --git a/src/packages/configprovider/demos/h5/demo1.tsx b/src/packages/configprovider/demos/h5/demo1.tsx index e34e4eda4f..2712f2fff8 100644 --- a/src/packages/configprovider/demos/h5/demo1.tsx +++ b/src/packages/configprovider/demos/h5/demo1.tsx @@ -1,7 +1,12 @@ import React from 'react' import { ConfigProvider, Cell, Rate, Button } from '@nutui/nutui-react' -const Demo1 = () => { +const Demo = () => { + const darkTheme = { + nutuiColorPrimaryIcon: 'green', + nutuiColorPrimaryStop1: 'green', + nutuiColorPrimaryStop2: 'green', + } return ( <> @@ -16,8 +21,20 @@ const Demo1 = () => { + + + + + + + + + + ) } -export default Demo1 +export default Demo diff --git a/src/packages/configprovider/demos/h5/demo2.tsx b/src/packages/configprovider/demos/h5/demo2.tsx index 2b3fe3cddf..5fadb894e9 100644 --- a/src/packages/configprovider/demos/h5/demo2.tsx +++ b/src/packages/configprovider/demos/h5/demo2.tsx @@ -1,28 +1,22 @@ import React from 'react' -import { ConfigProvider, Cell, Rate, Button } from '@nutui/nutui-react' +import { ConfigProvider, TextArea, Cell } from '@nutui/nutui-react' +import enUS from '@nutui/nutui-react/dist/es/locale/en-US' -const Demo2 = () => { - const darkTheme = { - nutuiColorPrimaryIcon: 'green', - nutuiColorPrimaryStop1: 'green', - nutuiColorPrimaryStop2: 'green', - } +const Demo = () => { return ( <> - - - - - - - - - + + +