Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jdf2e/nutui-react
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.0.4
Choose a base ref
...
head repository: jdf2e/nutui-react
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.0.5
Choose a head ref
  • 16 commits
  • 76 files changed
  • 5 contributors

Commits on Mar 17, 2025

  1. fix: 开发环境中导出 types 下的类型 (#3090)

    oasis-cloud authored Mar 17, 2025
    Copy the full SHA
    31dd4ee View commit details

Commits on Mar 18, 2025

  1. fix: correct import paths (#3089)

    * fix(configprovider): locale import path error
    
    * fix(configprovider): css import path error
    Alex-huxiyang authored Mar 18, 2025

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    41d4495 View commit details
  2. fix(swipe): 调整 demo 中字体为 12 (#3093)

    oasis-cloud authored Mar 18, 2025

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    3fd5483 View commit details

Commits on Mar 19, 2025

  1. feat(pickerview): 选中值增加class类名用于自定义样式 (#3097)

    * feat(pickerview): 选中值增加class类名用于自定义样式
    
    * feat(pickerview): 选中值增加class类名用于自定义样式
    
    * fix: remove console
    
    * chore: add types alias
    
    * test: update snap
    
    ---------
    
    Co-authored-by: oasis <suanbanren@foxmail.com>
    irisSong and oasis-cloud authored Mar 19, 2025

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    a338dcc View commit details
  2. refactor(fixednav): support harmony (#3095)

    * fix(fixednav): harmony
    
    * fix: update test
    irisSong authored Mar 19, 2025

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    72d74c0 View commit details
  3. fix: adjust site style (#3096)

    Alex-huxiyang authored Mar 19, 2025
    Copy the full SHA
    34758ef View commit details
  4. docs: 补充web 设置 px 转 rem时的文档 (#3098)

    * docs: 补充rem时的文档
    
    * docs: taro
    xiaoyatong authored Mar 19, 2025
    Copy the full SHA
    febca3e View commit details
  5. fix(SearchBar): demo 样式变量修订 (#3101)

    xiaoyatong authored Mar 19, 2025
    Copy the full SHA
    52269c2 View commit details
  6. fix(resultpage): 引入button样式 (#3103)

    * fix: 引入button样式
    
    * fix(empty): 引入button样式
    irisSong authored Mar 19, 2025
    Copy the full SHA
    9ada0f8 View commit details

Commits on Mar 20, 2025

  1. feat: 优化了一下文档样式,更紧凑清晰 (#3105)

    xiaoyatong authored Mar 20, 2025
    Copy the full SHA
    2a74f0f View commit details

Commits on Mar 21, 2025

  1. fix(inputnumber): value 大于 max 图标应处于禁用态 (#3107)

    oasis-cloud authored Mar 21, 2025
    Copy the full SHA
    2cf72cc View commit details
  2. test(uploader): optimize async test cases stability (#3104)

    Alex-huxiyang authored Mar 21, 2025
    Copy the full SHA
    e049b0e View commit details
  3. fix(ImagePreview): 优化代码,fix 因为popup最大宽度导致的问题 (#2939)

    * fix: 优化imagepreview 代码
    
    * feat: 给taro版本增加缩放功能,优化代码
    
    * test: fixed
    
    * test: fix
    
    * test: fix
    
    * test: fix
    
    * fix: 简写
    
    * fix: cr
    
    * fix: cr
    
    * fix: 性能优化
    
    * fix: 性能优化
    xiaoyatong authored Mar 21, 2025
    Copy the full SHA
    0ed86df View commit details
  4. feat(pickerview): 小程序支持自定义列表行高 (#3102)

    * feat(pickerview): 选中值增加class类名用于自定义样式
    
    * feat(pickerview): 选中值增加class类名用于自定义样式
    
    * fix: remove console
    
    * chore: add types alias
    
    * test: update snap
    
    * feat: 小程序支持自定义列表行高
    
    * fix: update test
    
    * fix: cr修改
    
    ---------
    
    Co-authored-by: oasis <suanbanren@foxmail.com>
    irisSong and oasis-cloud authored Mar 21, 2025
    Copy the full SHA
    8e1468c View commit details
  5. fix(badge): 解决中文偏上问题 (#3111)

    * fix(badge): 解决中文偏上问题
    
    * fix: css 变量更新
    
    * fix: 增补变量
    
    ---------
    
    Co-authored-by: oasis <suanbanren@foxmail.com>
    irisSong and oasis-cloud authored Mar 21, 2025
    Copy the full SHA
    464f0a9 View commit details
  6. chore(release): v3.0.5

    oasis-cloud committed Mar 21, 2025
    Copy the full SHA
    9a903a0 View commit details
Showing with 820 additions and 1,100 deletions.
  1. +21 −1 CHANGELOG.md
  2. +1 −1 package.json
  3. +2 −1 packages/nutui-taro-demo/config/index.js
  4. +1 −0 scripts/generate-nutui.js
  5. +1 −0 scripts/taro/generate-nutui-taro.js
  6. +1 −1 src/config.json
  7. +3 −8 src/packages/badge/badge.scss
  8. +1 −1 src/packages/configprovider/demos/h5/demo4.tsx
  9. +1 −1 src/packages/configprovider/demos/taro/demo4.tsx
  10. +1 −0 src/packages/configprovider/types.ts
  11. +0 −431 src/packages/datepickerview/__test__/__snapshots__/datepickerview.spec.tsx.snap
  12. +1 −0 src/packages/empty/empty.scss
  13. +6 −2 src/packages/fixednav/__tests__/fixednav.spec.tsx
  14. +3 −2 src/packages/fixednav/demo.taro.tsx
  15. +9 −2 src/packages/fixednav/demos/h5/demo5.tsx
  16. +10 −11 src/packages/fixednav/demos/taro/demo1.tsx
  17. +11 −12 src/packages/fixednav/demos/taro/demo2.tsx
  18. +9 −10 src/packages/fixednav/demos/taro/demo3.tsx
  19. +13 −9 src/packages/fixednav/demos/taro/demo4.tsx
  20. +43 −39 src/packages/fixednav/fixednav.scss
  21. +3 −3 src/packages/fixednav/fixednav.taro.tsx
  22. +2 −2 src/packages/fixednav/fixednav.tsx
  23. +177 −127 src/packages/imagepreview/__test__/imagepreview.spec.tsx
  24. +2 −1 src/packages/imagepreview/imagepreview.scss
  25. +72 −123 src/packages/imagepreview/imagepreview.taro.tsx
  26. +66 −116 src/packages/imagepreview/imagepreview.tsx
  27. +4 −2 src/packages/inputnumber/inputnumber.taro.tsx
  28. +4 −2 src/packages/inputnumber/inputnumber.tsx
  29. +1 −1 src/packages/notify/Notification.tsx
  30. +1 −2 src/packages/picker/demos/h5/demo8.tsx
  31. +1 −1 src/packages/picker/demos/taro/demo8.tsx
  32. +25 −25 src/packages/pickerview/__test__/__snapshots__/pickerview.spec.tsx.snap
  33. +57 −20 src/packages/pickerview/pickerroller.taro.tsx
  34. +18 −10 src/packages/pickerview/pickerroller.tsx
  35. +0 −1 src/packages/pickerview/pickerview.scss
  36. +1 −0 src/packages/resultpage/resultpage.scss
  37. +1 −1 src/packages/searchbar/demos/h5/demo3.tsx
  38. +1 −1 src/packages/searchbar/demos/taro/demo3.tsx
  39. +5 −1 src/packages/swipe/demos/taro/demo1.tsx
  40. +5 −1 src/packages/swipe/demos/taro/demo2.tsx
  41. +5 −1 src/packages/swipe/demos/taro/demo3.tsx
  42. +3 −1 src/packages/swipe/demos/taro/demo4.tsx
  43. +5 −1 src/packages/swipe/demos/taro/demo5.tsx
  44. +5 −1 src/packages/swipe/demos/taro/demo6.tsx
  45. +5 −1 src/packages/swipe/demos/taro/demo7.tsx
  46. +5 −1 src/packages/swipe/demos/taro/demo8.tsx
  47. +2 −1 src/packages/swipe/demos/taro/demo9.tsx
  48. +1 −1 src/packages/toast/Notification.tsx
  49. +35 −16 src/packages/uploader/__tests__/uploader.spec.tsx
  50. +4 −5 src/sites/assets/styles/highlight.scss
  51. +9 −20 src/sites/assets/styles/md-style.scss
  52. +2 −3 src/sites/sites-react/doc-taro/App.scss
  53. +2 −4 src/sites/sites-react/doc/App.scss
  54. +30 −0 src/sites/sites-react/doc/components/contribution/contribution.scss
  55. +20 −40 src/sites/sites-react/doc/components/contribution/contribution.tsx
  56. +0 −1 src/sites/sites-react/doc/components/demoblock/codeblock.tsx
  57. +9 −7 src/sites/sites-react/doc/components/nav/nav.scss
  58. +1 −1 src/sites/sites-react/doc/components/nav/nav.tsx
  59. +1 −1 src/sites/sites-react/doc/docs/react/international-react.en-US.md
  60. +2 −2 src/sites/sites-react/doc/docs/react/international-react.md
  61. +13 −2 src/sites/sites-react/doc/docs/react/start-react.en-US.md
  62. +13 −2 src/sites/sites-react/doc/docs/react/start-react.md
  63. +1 −1 src/sites/sites-react/doc/docs/taro/international-react.en-US.md
  64. +1 −1 src/sites/sites-react/doc/docs/taro/international-react.md
  65. +21 −1 src/sites/sites-react/doc/docs/taro/start-react.en-US.md
  66. +22 −1 src/sites/sites-react/doc/docs/taro/start-react.md
  67. +2 −2 src/sites/theme/App.scss
  68. +3 −3 src/sites/theme/components/nav/nav.scss
  69. +2 −0 src/styles/theme-dark.scss
  70. +2 −0 src/styles/theme-default.scss
  71. +1 −0 src/styles/variables-jmapp.scss
  72. +1 −0 src/styles/variables-jrkf.scss
  73. +2 −1 src/styles/variables.scss
  74. +2 −2 tsconfig.json
  75. +2 −2 vite.config.demo.ts
  76. +2 −2 vite.config.mts
22 changes: 21 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
# v3.0.3
# v3.0.5

`2025-03-21`

- feat(pickerview): 小程序支持自定义列表行高 (#3102)
- feat: 优化了一下文档样式,更紧凑清晰 (#3105)
- fix(ImagePreview): 优化代码,fix 因为popup最大宽度导致的问题 (#2939)
- fix(badge): 解决中文偏上问题 (#3111)
- fix(swipe): 调整 demo 中字体为 12 (#3093)
- fix: correct import paths (#3089)
- fix: 开发环境中导出 types 下的类型 (#3090)
- fix(inputnumber): value 大于 max 图标应处于禁用态 (#3107)
- fix(resultpage): 引入button样式 (#3103)
- fix(SearchBar): demo 样式变量修订 (#3101)
- fix: adjust site style (#3096)
- refactor(fixednav): support harmony (#3095)
- docs: 补充web 设置 px 转 rem时的文档 (#3098)
- feat(pickerview): 选中值增加class类名用于自定义样式 (#3097)
- test(uploader): optimize async test cases stability (#3104)

# v3.0.4

`2025-03-07`

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nutui/nutui-react-taro",
"version": "3.0.4",
"version": "3.0.5",
"style": "dist/style.css",
"main": "dist/nutui.react.umd.js",
"module": "dist/es/packages/nutui.react.build.js",
3 changes: 2 additions & 1 deletion packages/nutui-taro-demo/config/index.js
Original file line number Diff line number Diff line change
@@ -112,7 +112,7 @@ const config = {
'../../../src/packages/lottie/animation/dark/pulltorefresh-white.json'
),

'@nutui/nutui-react-taro/dist/locales/en-US': path.resolve(
'@nutui/nutui-react-taro/dist/es/locales/en-US': path.resolve(
__dirname,
'../../../src/locales/en-US.ts'
),
@@ -121,6 +121,7 @@ const config = {
'@/locales': path.resolve(__dirname, '../../../src/locales'),
'@/utils': path.resolve(__dirname, '../../../src/utils'),
'@/hooks': path.resolve(__dirname, '../../../src/hooks'),
'@/types': path.resolve(__dirname, '../../../src/types'),
'@nutui/nutui-react-taro': path.resolve(
__dirname,
'../../../src/packages/nutui.react.taro.ts'
1 change: 1 addition & 0 deletions scripts/generate-nutui.js
Original file line number Diff line number Diff line change
@@ -71,6 +71,7 @@ fs.outputFile(

let fileStr = `${importStr}
${importScssStr}
export * from '@/types';
export { ${packages.join(',')} };`
fs.outputFile(
path.resolve(__dirname, '../src/packages/nutui.react.ts'),
1 change: 1 addition & 0 deletions scripts/taro/generate-nutui-taro.js
Original file line number Diff line number Diff line change
@@ -59,6 +59,7 @@ fs.outputFile(

let fileStr = `${importStr}
${importScssStr}
export * from '@/types';
export { ${packages.join(',')} };`
fs.outputFile(
path.resolve(__dirname, '../../src/packages/nutui.react.taro.ts'),
2 changes: 1 addition & 1 deletion src/config.json
Original file line number Diff line number Diff line change
@@ -330,7 +330,7 @@
"taro": true,
"v15": 100,
"author": "Ymm0008",
"dd": false
"dd": true
},
{
"version": "3.0.0",
11 changes: 3 additions & 8 deletions src/packages/badge/badge.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.nut-badge {
position: relative;
display: inline-flex;
vertical-align: middle;
box-sizing: content-box;
width: auto;

&-icon {
@@ -37,8 +39,7 @@

&-sup {
display: inline-flex;
justify-content: center;
height: $badge-height;
text-align: center;
min-width: $badge-min-width;
padding: $badge-padding;
box-sizing: border-box;
@@ -54,12 +55,6 @@

&-number {
font-family: 'JD';
/* #ifdef harmony */
line-height: 12px;
/* #endif */
/* #ifndef harmony */
line-height: 13px;
/* #endif */
}

&-one {
2 changes: 1 addition & 1 deletion src/packages/configprovider/demos/h5/demo4.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import { ConfigProvider, TextArea } from '@nutui/nutui-react'
import enUS from '@nutui/nutui-react/dist/locale/en-US'
import enUS from '@nutui/nutui-react/dist/es/locale/en-US'

const Demo4 = () => {
return (
2 changes: 1 addition & 1 deletion src/packages/configprovider/demos/taro/demo4.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import { ConfigProvider, TextArea } from '@nutui/nutui-react-taro'
import enUS from '@nutui/nutui-react-taro/dist/locales/en-US'
import enUS from '@nutui/nutui-react-taro/dist/es/locales/en-US'

const Demo4 = () => {
return (
1 change: 1 addition & 0 deletions src/packages/configprovider/types.ts
Original file line number Diff line number Diff line change
@@ -50,6 +50,7 @@ export type NutCSSVariables =
| 'nutuiColorTextDisabled'
| 'nutuiColorTextDark'
| 'nutuiColorTextLink'
| 'nutuiFontSizeXxxs'
| 'nutuiFontSizeXxs'
| 'nutuiFontSizeXs'
| 'nutuiFontSizeS'
Loading