Skip to content

fix(configprovider): 调整demo,修复web h5 下引入不一致问题,修复文档 #3244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
irisSong merged 1 commit into from
Jun 7, 2025
Merged

fix(configprovider): 调整demo,修复web h5 下引入不一致问题,修复文档 #3244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/packages/configprovider/demo.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ import { useTranslate } from '@/sites/assets/locale/taro'
const ConfigProviderDemo = () => {
const [translated] = useTranslate({
'zh-CN': {
text: 'Textarea 中文与英文',
text: 'Pagination 中文与英文',
theme: '默认主题与定制主题',
RTL: harmony() ? 'RTL【暂不支持】' : 'RTL',
},
'zh-TW': {
text: 'Textarea 中文与英文',
text: 'Pagination 中文与英文',
theme: '默認主題与定制主題',
RTL: harmony() ? 'RTL【暂不支持】' : 'RTL',
},
'en-US': {
text: 'Textarea zh-CN and en-US',
text: 'Pagination zh-CN and en-US',
theme: 'Default Theme And Custom Theme',
RTL: harmony() ? 'RTL[Pendding]' : 'RTL',
},
Expand Down
6 changes: 3 additions & 3 deletions src/packages/configprovider/demo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import { useTranslate } from '@/sites/assets/locale'
const ConfigProviderDemo = () => {
const [translated] = useTranslate({
'zh-CN': {
text: 'Textarea 中文与英文',
text: 'Pagination 中文与英文',
theme: '默认主题与定制主题',
},
'zh-TW': {
text: 'Textarea 中文与英文',
text: 'Pagination 中文与英文',
theme: '默認主題与定制主題',
},
'en-US': {
text: 'Textarea zh-CN and en-US',
text: 'Pagination zh-CN and en-US',
theme: 'Default Theme And Custom Theme',
},
})
Expand Down
8 changes: 4 additions & 4 deletions src/packages/configprovider/demos/h5/demo2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import React from 'react'
import { ConfigProvider, TextArea, Cell } from '@nutui/nutui-react'
import enUS from '@nutui/nutui-react/dist/es/locale/en-US'
import { ConfigProvider, Pagination, Cell } from '@nutui/nutui-react'
import enUS from '@nutui/nutui-react/dist/es/locales/en-US'

const Demo = () => {
return (
<>
<ConfigProvider>
<Cell>
<TextArea disabled showCount maxLength={20} />
<Pagination total={20} pageSize={5} />
</Cell>
</ConfigProvider>
<ConfigProvider locale={enUS}>
<Cell>
<TextArea disabled showCount maxLength={20} />
<Pagination total={20} pageSize={5} />
</Cell>
</ConfigProvider>
</>
Expand Down
6 changes: 3 additions & 3 deletions src/packages/configprovider/demos/taro/demo2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import React from 'react'
import { ConfigProvider, TextArea, Cell } from '@nutui/nutui-react-taro'
import { ConfigProvider, Pagination, Cell } from '@nutui/nutui-react-taro'
import enUS from '@nutui/nutui-react-taro/dist/es/locales/en-US'

const Demo = () => {
return (
<>
<ConfigProvider>
<Cell>
<TextArea disabled showCount maxLength={20} />
<Pagination total={20} pageSize={5} />
</Cell>
</ConfigProvider>
<ConfigProvider locale={enUS}>
<Cell>
<TextArea disabled showCount maxLength={20} />
<Pagination total={20} pageSize={5} />
</Cell>
</ConfigProvider>
</>
Expand Down
4 changes: 2 additions & 2 deletions src/packages/configprovider/doc.en-US.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ You can override these CSS variables directly in your code, and the styling of t
/* After you add this style, the Primary Button turns green */
:root {
--nutui-color-primary: green;
--nutui-color-primary-stop1: green;
--nutui-color-primary-stop2: green;
--nutui-color-primary-stop-1: green;
--nutui-color-primary-stop-2: green;
}
```

Expand Down
4 changes: 2 additions & 2 deletions src/packages/configprovider/doc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ NutUI-React 可以通过 [CSS 变量](https://developer.mozilla.org/zh-CN/docs/W
/* 添加这段样式后，Primary Button 会变成绿色 */
:root {
--nutui-color-primary: green;
--nutui-color-primary-stop1: green;
--nutui-color-primary-stop2: green;
--nutui-color-primary-stop-1: green;
--nutui-color-primary-stop-2: green;
}
```

Expand Down
4 changes: 2 additions & 2 deletions src/packages/configprovider/doc.taro.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ NutUI-React 可以通过 [CSS 变量](https://developer.mozilla.org/zh-CN/docs/W
/* 添加这段样式后，Primary Button 会变成绿色 */
:root {
--nutui-color-primary: green;
--nutui-color-primary-stop1: green;
--nutui-color-primary-stop2: green;
--nutui-color-primary-stop-1: green;
--nutui-color-primary-stop-2: green;
}
```

Expand Down
4 changes: 2 additions & 2 deletions src/packages/configprovider/doc.zh-TW.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ NutUI-React 可以通過 \[CSS 變數\]（<https://developer.mozilla.org/zh-CN/d
/* 添加這段樣式后，Primary Button 會變成綠色 */
:root {
--nutui-color-primary: green;
--nutui-color-primary-stop1: green;
--nutui-color-primary-stop2: green;
--nutui-color-primary-stop-1: green;
--nutui-color-primary-stop-2: green;
}
```

Expand Down
4 changes: 2 additions & 2 deletions src/sites/sites-react/doc/docs/react/theme-react.en-US.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Create a new 'SCSS' file 'custom_theme.scss' in your local project.
```scss
// Dominant tone
$color-primary: #fa2c19;
$color-primary-end: #fa6419;
$color-primary-stop-1: #fa6419;
...
```

Expand Down Expand Up @@ -62,7 +62,7 @@ export default defineConfig({
loader: 'sass-loader',
options: {
// Note: The option name is different for different versions of ass-loader. For details, see the corresponding version document of ass-loader
data: `@import "./assets/custom_theme.scss";@import "@nutui/nutui/dist/styles/variables.scss";`,
data: `@import "./assets/custom_theme.scss";@import "@nutui/nutui-react/dist/styles/variables.scss";`,
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions src/sites/sites-react/doc/docs/react/theme-react.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ NutUI-React 支持灵活的样式定制，满足多种视觉业务和品牌需
```scss
// 主色调
$color-primary: #fa2c19;
$color-primary-end: #fa6419;
$color-primary-stop-1: #fa6419;
...
```

Expand Down Expand Up @@ -59,7 +59,7 @@ export default defineConfig({
loader: 'sass-loader',
options: {
// 注意：在 sass-loader 不同版本，这个选项名是 是不一样的，具体可参考 sass-loader对应的版本文档
data: `@import "./assets/custom_theme.scss";@import "@nutui/nutui/dist/styles/variables.scss";`,
data: `@import "./assets/custom_theme.scss";@import "@nutui/nutui-react/dist/styles/variables.scss";`,
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions src/sites/sites-react/doc/docs/taro/theme-react.en-US.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Create a new 'SCSS' file 'custom_theme.scss' in your local project.
```scss
// Dominant tone
$color-primary: #fa2c19;
$color-primary-end: #fa6419;
$color-primary-stop-1: #fa6419;
...
```

Expand All @@ -45,7 +45,7 @@ export default defineConfig({
css: {
preprocessorOptions: {
scss: {
additionalData: `@import "@nutui/nutui-react/dist/styles/variables.scss";@import "./your/custom_theme.scss";`,
additionalData: `@import "@nutui/nutui-react-taro/dist/styles/variables.scss";@import "./your/custom_theme.scss";`,
},
},
},
Expand All @@ -62,7 +62,7 @@ export default defineConfig({
loader: 'sass-loader',
options: {
// Note: The option name is different for different versions of ass-loader. For details, see the corresponding version document of ass-loader
data: `@import "./assets/custom_theme.scss";@import "@nutui/nutui/dist/styles/variables.scss";`,
data: `@import "./assets/custom_theme.scss";@import "@nutui/nutui-react-taro/dist/styles/variables.scss";`,
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions src/sites/sites-react/doc/docs/taro/theme-react.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ NutUI-React 支持灵活的样式定制，满足多种视觉业务和品牌需
```scss
// 主色调
$color-primary: #fa2c19;
$color-primary-end: #fa6419;
$color-primary-stop-1: #fa6419;
...
```

Expand All @@ -42,7 +42,7 @@ export default defineConfig({
css: {
preprocessorOptions: {
scss: {
additionalData: `@import "@nutui/nutui-react/dist/styles/variables.scss";@import "./your/custom_theme.scss";`,
additionalData: `@import "@nutui/nutui-react-taro/dist/styles/variables.scss";@import "./your/custom_theme.scss";`,
},
},
},
Expand All @@ -59,7 +59,7 @@ export default defineConfig({
loader: 'sass-loader',
options: {
// 注意：在 sass-loader 不同版本，这个选项名是 是不一样的，具体可参考 sass-loader对应的版本文档
data: `@import "./assets/custom_theme.scss";@import "@nutui/nutui/dist/styles/variables.scss";`,
data: `@import "./assets/custom_theme.scss";@import "@nutui/nutui-react-taro/dist/styles/variables.scss";`,
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@/*": [
"src/*"
],
"@nutui/nutui-react/dist/es/locale/en-US": [
"@nutui/nutui-react/dist/es/locales/en-US": [
"src/locales/en-US.ts"
],
"@nutui/nutui-react-taro/dist/es/locales/en-US": [
Expand Down
Loading