Merge remote-tracking branch 'upstream/feat_v3.x' into feat_v3.x

Author: irisSong

CHANGELOG.md

@@ -1,3 +1,30 @@
+# v3.0.13
+
+`2025-05-30`
+
+- :sparkles: feat(lottie): 支持显示设置 dpr 设置宽高 (#3237)
+- :sparkles: feat(Textarea): 增加 ref 属性 (#3229)
+- :sparkles: feat(Swiper): 修订autoplay属性,并在taro版本上对齐了tc属性值 (#3225)
+- :bug: fix: 删除无用代码
+- :bug: fix: 适配td (#3241)
+- :bug: fix(input): 不需要加 get 属性的，用 nativeElement 就可了 (#3235)
+- :bug: fix(pickerview): 高度获取失败兜底值变更 (#3230)
+- :bug: fix(uploader): 修复官网蒙层层级、demo中ListItem类型的引入并更新文档 (#3239)
+- :bug: fix(textarea): 修订没有写placeholder时无法展示默认值的情况 (#3233)
+- :bug: fix(configprovider): 调整demo展示 (#3232)
+
+# v3.0.12
+
+`2025-05-17`
+
+- :sparkles: feat(range): 鸿蒙适配,修订NaN,纵向mark时异常问题 (#3217)
+- :sparkles: feat(progress): 兼容并支持taro components的progressProps & v15适配 (#3202)
+- :sparkles: feat(searchbar): v15 适配,增加了受控和默认值 (#3209)
+- :sparkles: feat(steps): v15 (#3216)
+- :bug: fix(uploader): beforeUpload failed to work (#3219)
+- :bug: fix(uploader): 多端上传媒体文件逻辑与2x保持一致 (#3223)
+- :bug: fix(address): 构建单一样式文件 (#3220)
+
 # v3.0.11
 
 `2025-05-09`

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@nutui/nutui-react",
-  "version": "3.0.11-patch.0",
+  "name": "@nutui/nutui-react-taro",
+  "version": "3.0.13",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/es/packages/nutui.react.build.js",

src/config.json

@@ -811,7 +811,6 @@
           "taro": true,
           "jdtaro": 2,
           "v15": 1,
-
           "author": "VickyYe",
           "dd": true
         },
@@ -1269,18 +1268,20 @@
           "dd": true
         },
         {
-          "version": "2.0.0",
+          "version": "3.0.0",
           "name": "Step",
           "sort": 17,
           "cName": "步骤条子组件",
           "type": "component",
           "show": false,
           "exportEmpty": true,
           "desc": "步骤条子组件",
-          "author": "swag~jun"
+          "v15": 2,
+          "author": "songsong",
+          "dd": true
         },
         {
-          "version": "2.0.0",
+          "version": "3.0.0",
           "name": "Steps",
           "type": "component",
           "cName": "步骤条",
@@ -1289,8 +1290,8 @@
           "show": true,
           "taro": true,
           "v15": 2,
-          "author": "swag~jun",
-          "dd": false
+          "author": "songsong",
+          "dd": true
         },
         {
           "version": "3.0.0",

src/packages/address/__test__/__snapshots__/address.spec.tsx.snap

@@ -10,6 +10,6 @@ exports[`Address: show custom icon 2`] = `"<div class="nut-overlay" style="z-ind
 
 exports[`Address: show custom true 1`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title"><div class="nut-popup-title-left"><div class="nut-address-left-icon"><svg class="nut-icon nut-icon-ArrowLeft " style="color: #cccccc;" xmlns="http://www.w3.org/2000/svg" color="#cccccc" viewBox="0 0 1024 1024" aria-labelledby="ArrowLeft" role="presentation"><path d="M661.33 153.81a10.67 10.67 0 0 0-18.13-7.68L277.33 512 643.2 877.87a10.67 10.67 0 0 0 18.13-7.68v-60.38a10.03 10.03 0 0 0-3.2-7.46L367.79 512l290.34-290.35a10.88 10.88 0 0 0 3.2-7.46z" fill="currentColor"></path></svg></div></div><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-cascader"><div class="nut-tabs nut-tabs-horizontal"><div class="nut-tabs-titles nut-tabs-titles-line nut-tabs-titles-scrollable"><div class="nut-tabs-titles-item nut-tabs-titles-item-active"><div class="nut-tabs-titles-item-line nut-tabs-titles-item-line-horizontal"></div><div class="nut-tabs-titles-item-text">请选择</div></div></div><div class="nut-tabs-content-wrap"><div class="nut-tabs-content" style="transform: translate3d(-0%, 0, 0); transition-duration: 300ms;"><div class="nut-tabpane"><div class="nut-cascader-pane"><div class="nut-cascader-item"><div class="nut-cascader-item-title">浙江</div></div><div class="disabled nut-cascader-item"><div class="nut-cascader-item-title">湖南</div></div><div class="nut-cascader-item"><div class="nut-cascader-item-title">福建</div></div><div class="nut-cascader-item"><div class="nut-cascader-item-title">北京</div></div></div></div></div></div></div></div></div>"`;
 
-exports[`Address: show elevator 1`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="height: 89%; z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div style="height: 93%; overflow-y: auto;"><div class="nut-address-title">热门城市</div><div class="nut-address-hotlist "></div><div class="nut-address-title">选择省份/地区</div><div class="nut-elevator nut-address-elevator" style="height: 100%;"><div class="nut-elevator-list" style="height: 93%;"><div class="nut-elevator-list-inner"><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">A</div><div class="nut-elevator-list-item-name">安徽</div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">B</div><div class="nut-elevator-list-item-name">北京</div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">C</div><div class="nut-elevator-list-item-name">重庆</div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">F</div><div class="nut-elevator-list-item-name">福建</div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">G</div><div class="nut-elevator-list-item-name">贵州</div><div class="nut-elevator-list-item-name">广东</div><div class="nut-elevator-list-item-name">广西</div><div class="nut-elevator-list-item-name">甘肃</div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">H</div><div class="nut-elevator-list-item-name">河北</div><div class="nut-elevator-list-item-name">河南</div><div class="nut-elevator-list-item-name">湖南</div><div class="nut-elevator-list-item-name">湖北</div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">S</div><div class="nut-elevator-list-item-name">山东</div><div class="nut-elevator-list-item-name">山西</div><div class="nut-elevator-list-item-name">上海</div><div class="nut-elevator-list-item-name">陕西</div><div class="nut-elevator-list-item-name">四川</div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">Z</div><div class="nut-elevator-list-item-name">浙江</div></div></div></div><div class="nut-elevator-bars"><div class="nut-elevator-bars-inner" style="touch-action: pan-y;"><div class="nut-elevator-bars-inner-item nut-elevator-bars-inner-item-active" data-index="0">A</div><div class="nut-elevator-bars-inner-item" data-index="1">B</div><div class="nut-elevator-bars-inner-item" data-index="2">C</div><div class="nut-elevator-bars-inner-item" data-index="3">F</div><div class="nut-elevator-bars-inner-item" data-index="4">G</div><div class="nut-elevator-bars-inner-item" data-index="5">H</div><div class="nut-elevator-bars-inner-item" data-index="6">S</div><div class="nut-elevator-bars-inner-item" data-index="7">Z</div></div></div></div></div></div>"`;
+exports[`Address: show elevator 1`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="height: 89%; z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div style="height: 93%; overflow-y: auto;"><div class="nut-address-title">热门城市</div><div class="nut-address-hotlist "></div><div class="nut-address-title">选择省份/地区</div><div class="nut-elevator nut-elevator-horizontal nut-address-elevator" style="height: 100%;"><div class="nut-elevator-list" style="height: 93%;"><div class="nut-elevator-list-inner"><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">A</div><div class="nut-elevator-list-item-sublist"><div class="nut-elevator-list-item-name">安徽</div></div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">B</div><div class="nut-elevator-list-item-sublist"><div class="nut-elevator-list-item-name">北京</div></div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">C</div><div class="nut-elevator-list-item-sublist"><div class="nut-elevator-list-item-name">重庆</div></div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">F</div><div class="nut-elevator-list-item-sublist"><div class="nut-elevator-list-item-name">福建</div></div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">G</div><div class="nut-elevator-list-item-sublist"><div class="nut-elevator-list-item-name">贵州</div><div class="nut-elevator-list-item-name">广东</div><div class="nut-elevator-list-item-name">广西</div><div class="nut-elevator-list-item-name">甘肃</div></div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">H</div><div class="nut-elevator-list-item-sublist"><div class="nut-elevator-list-item-name">河北</div><div class="nut-elevator-list-item-name">河南</div><div class="nut-elevator-list-item-name">湖南</div><div class="nut-elevator-list-item-name">湖北</div></div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">S</div><div class="nut-elevator-list-item-sublist"><div class="nut-elevator-list-item-name">山东</div><div class="nut-elevator-list-item-name">山西</div><div class="nut-elevator-list-item-name">上海</div><div class="nut-elevator-list-item-name">陕西</div><div class="nut-elevator-list-item-name">四川</div></div></div><div class="nut-elevator-list-item"><div class="nut-elevator-list-item-code">Z</div><div class="nut-elevator-list-item-sublist"><div class="nut-elevator-list-item-name">浙江</div></div></div></div></div><div class="nut-elevator-bars"><div class="nut-elevator-bars-inner" style="touch-action: pan-y;"><div class="nut-elevator-bars-inner-item nut-elevator-bars-inner-item-active" data-index="0">A</div><div class="nut-elevator-bars-inner-item" data-index="1">B</div><div class="nut-elevator-bars-inner-item" data-index="2">C</div><div class="nut-elevator-bars-inner-item" data-index="3">F</div><div class="nut-elevator-bars-inner-item" data-index="4">G</div><div class="nut-elevator-bars-inner-item" data-index="5">H</div><div class="nut-elevator-bars-inner-item" data-index="6">S</div><div class="nut-elevator-bars-inner-item" data-index="7">Z</div></div></div></div></div></div>"`;
 
 exports[`Address: show exist 1`] = `"<div class="nut-overlay" style="z-index: 1000;"></div><div style="z-index: 1000;" class="nut-popup nut-popup-round nut-popup-bottom"><div class="nut-popup-title"><div class="nut-popup-title-wrapper"><div class="nut-popup-title-title">选择地址</div></div><div class="nut-popup-title-right nut-popup-title-right-top-right"><svg class="nut-icon nut-icon-Close " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Close" role="presentation"><path d="m512 557.23 279.25 279.25c4.27 4.27 10.88 4.27 14.94 0l30.29-30.29c4.27-4.27 4.27-10.88 0-14.94L557.23 512l279.25-279.25c4.27-4.27 4.27-10.88 0-14.94l-30.29-30.29c-4.27-4.27-10.88-4.27-14.94 0L512 466.77 232.75 187.52c-4.27-4.27-10.88-4.27-14.94 0l-30.29 30.29c-4.27 4.27-4.27 10.88 0 14.94L466.77 512 187.52 791.25c-4.27 4.27-4.27 10.88 0 14.94l30.29 30.29c4.27 4.27 10.88 4.27 14.94 0z" fill="currentColor"></path></svg></div></div><div class="nut-address "><ul class="nut-address-exist"><li class="nut-address-exist-item active"><svg class="nut-icon nut-icon-Check " style="color: var(--nutui-color-primary);" xmlns="http://www.w3.org/2000/svg" color="var(--nutui-color-primary)" viewBox="0 0 49 48" aria-labelledby="Check" role="presentation"><path d="M45.121 16.121 47.243 14 43 9.757l-2.121 2.122L19 33.757 7.121 21.88 5 19.757.757 24l2.122 2.121L14.757 38l2.122 2.121L19 42.243l2.121-2.122L23.243 38z" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市次渠镇通州区</div></div></li><li class="nut-address-exist-item "><svg class="nut-icon nut-icon-Location " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Location" role="presentation"><path d="M533.33 1024s448-232.53 448-576c0-247.47-200.53-448-448-448s-448 200.53-448 448c0 343.47 448 576 448 576m181.12-206.72c-52.91 47.57-105.81 85.33-145.92 111.36a893.32 893.32 0 0 1-35.2 21.76 1148.76 1148.76 0 0 1-181.12-133.12C244.05 719.79 149.33 591.79 149.33 448c0-212.05 171.95-384 384-384s384 171.95 384 384c0 143.79-94.72 271.79-202.88 369.28M533.33 640a192 192 0 1 0-.02-384.02 192 192 0 0 0 .02 384.02m0-64c-70.61 0-128-57.39-128-128s57.39-128 128-128 128 57.39 128 128-57.39 128-128 128" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>钓鱼岛钓鱼岛全区</div></div></li><li class="nut-address-exist-item "><svg class="nut-icon nut-icon-Location " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" aria-labelledby="Location" role="presentation"><path d="M533.33 1024s448-232.53 448-576c0-247.47-200.53-448-448-448s-448 200.53-448 448c0 343.47 448 576 448 576m181.12-206.72c-52.91 47.57-105.81 85.33-145.92 111.36a893.32 893.32 0 0 1-35.2 21.76 1148.76 1148.76 0 0 1-181.12-133.12C244.05 719.79 149.33 591.79 149.33 448c0-212.05 171.95-384 384-384s384 171.95 384 384c0 143.79-94.72 271.79-202.88 369.28M533.33 640a192 192 0 1 0-.02-384.02 192 192 0 0 0 .02 384.02m0-64c-70.61 0-128-57.39-128-128s57.39-128 128-128 128 57.39 128 128-57.39 128-128 128" fill="currentColor"></path></svg><div class="nut-address-exist-item-info"><div>探探鱼</div><div>182****1718</div><div>北京市大兴区科创十一街18号院京东大厦</div></div></li></ul></div></div>"`;

src/packages/address/address.scss

@@ -67,10 +67,10 @@
       font-size: 12px;
       border-radius: 4px;
       margin-bottom: 7px;
-      /* #ifdef harmony*/
+      /* #ifdef harmony dynamic*/
       margin-right: 6px;
       /* #endif */
-      /* #ifndef harmony*/
+      /* #ifndef harmony dynamic*/
       margin-right: 7px;
       /* #endif */
       background-color: $color-background-sunken;

src/packages/avatar/avatar.taro.tsx

@@ -10,14 +10,14 @@ import classNames from 'classnames'
 import { User } from '@nutui/icons-react-taro'
 import { AvatarContext } from '@/packages/avatargroup/context'
 import { ComponentDefaults } from '@/utils/typings'
-import { harmony } from '@/utils/taro/platform'
+import { harmony, td } from '@/utils/taro/platform'
 import AvatarGroup from '@/packages/avatargroup/index.taro'
 import { pxTransform } from '@/utils/taro/px-transform'
 import { TaroAvatarProps } from '@/types'
 
 const defaultProps = {
   ...ComponentDefaults,
-  size: harmony() ? '40' : '',
+  size: harmony() || td() ? '40' : '',
   shape: 'round',
   icon: '',
   background: '#eee',

src/packages/avatar/demos/taro/demo4.tsx

@@ -1,20 +1,21 @@
 import React from 'react'
-import { Avatar, Cell, harmony } from '@nutui/nutui-react-taro'
+import { Avatar, Cell, harmony, td } from '@nutui/nutui-react-taro'
 import { User } from '@nutui/icons-react-taro'
 
 const Demo4 = () => {
   const styles = { marginRight: 30 }
+  const variableDisabled = harmony() || td()
   return (
     <Cell className="cell-avatar">
       <Avatar
         color="#ffffff"
-        background={`${harmony() ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
+        background={`${variableDisabled ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
         icon={<User />}
         style={styles}
       />
       <Avatar
-        color={`${harmony() ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
-        background={`${harmony() ? '#ffebf1' : 'var(--nutui-color-primary-light-pressed)'}`}
+        color={`${variableDisabled ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
+        background={`${variableDisabled ? '#ffebf1' : 'var(--nutui-color-primary-light-pressed)'}`}
       >
         U
       </Avatar>

src/packages/avatar/demos/taro/demo6.tsx

@@ -1,17 +1,18 @@
 import React from 'react'
-import { Avatar, Cell, harmony } from '@nutui/nutui-react-taro'
+import { Avatar, Cell, harmony, td } from '@nutui/nutui-react-taro'
 import { User } from '@nutui/icons-react-taro'
 
 const Demo6 = () => {
+  const variableDisabled = harmony() || td()
   return (
     <>
       <Cell>
         <Avatar.Group gap="-4">
           <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
           <Avatar icon={<User />} />
           <Avatar
-            color={`${harmony() ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
-            background={`${harmony() ? '#ffd6e1' : 'var(--nutui-brand-2)'}`}
+            color={`${variableDisabled ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
+            background={`${variableDisabled ? '#ffd6e1' : 'var(--nutui-brand-2)'}`}
           >
             U
           </Avatar>
@@ -22,8 +23,8 @@ const Demo6 = () => {
           <Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
           <Avatar icon={<User />} />
           <Avatar
-            color={`${harmony() ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
-            background={`${harmony() ? '#ffd6e1' : 'var(--nutui-brand-2)'}`}
+            color={`${variableDisabled ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
+            background={`${variableDisabled ? '#ffd6e1' : 'var(--nutui-brand-2)'}`}
           >
             U
           </Avatar>