Merge branch 'next' of https://github.com/jdf2e/nutui into next

CHANGELOG.md

@@ -1,3 +1,18 @@
+## v3.3.1
+
+`2022-12-16`
+
+小程序版本依赖 Taro ^3.5.6
+
+* :zap: feat(imagepreview、infiniteloading、tabs、tabbar): 优化内部逻辑 @nutui-team
+* :zap: feat(picker): 新增 showOkText、showCancelText (#1933) @yangxiaolu1993
+* :bug: fix(price): add new props strike-through (#1934)(#1907) @Drjingfubo
+* :bug: fix(tabs): taro env sticky tips bug #1889 @richard1015
+* :bug: fix(price): taro h5 style problem (#1944)  @Drjingfubo
+* :bug: fix(menu): 修正自定义图标文档错误 、设置class-prefix不生效问题 (#1942) @yangjinjun3
+* :bug: fix: range 组件Taro H5修改 (#1915) @lkjh3214
+
+
 ## v3.3.0
 
 `2022-12-02`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "京东风格的轻量级移动端 Vue2、Vue3 组件库（支持小程序开发）",
   "main": "dist/nutui.umd.js",
   "module": "dist/nutui.es.js",
@@ -74,7 +74,6 @@
     }
   },
   "dependencies": {
-    "@tarojs/components": "3.5.6",
     "consola": "2.15.3",
     "sass": "^1.50.0",
     "vscode": "^1.1.37",
@@ -84,6 +83,7 @@
     "@commitlint/cli": "^10.0.0",
     "@commitlint/config-conventional": "^10.0.0",
     "@tarojs/taro": "3.5.6",
+    "@tarojs/components": "3.5.6",
     "@types/jest": "^26.0.22",
     "@types/node": "^17.0.16",
     "@typescript-eslint/eslint-plugin": "^4.20.0",

src/packages/__VUE/avatar/doc.en-US.md

@@ -212,7 +212,7 @@ Icon and letter types can have custom colors and background colors
 | -------- | ---------------------------------------------------------------- | ------ | ------ |
 | max-count     | Max avatars to show   | String ｜ Number | - |
 | max-content  | When the number of avatars exceeds, a avatar folding element will appear，The content of this element can be `...`、`more`、`+N` | String | +N |
-| size         | The size of the avatar，eg `large`、`normal`、`small`，支持直接输入数字   | String ｜ Number | normal  |
+| size         | The size of the avatar，eg `large`、`normal`、`small`   | String ｜ Number | normal  |
 | shape        | The shape of avatar，eg `square`、`round`            | String | round  |
 | max-color    | The colors of Icon and letter types     | String | #666 |
 | max-bgColor  | The background colors of Icon and letter types        | String | #eee   |

src/packages/__VUE/infiniteloading/doc.en-US.md

@@ -259,9 +259,9 @@ Scrolling to the bottom of the list automatically loads more data.
 | container-id     | When useWindow is false, set the node ID by default                                                                | String  | `''`             |
 | load-more-txt    | "No more" text                                                                                                     | String  | 'Oops, this is the bottom'|
 | is-open-refresh  | Enable pull refresh                                                                                                | Boolean | `false`          |
-| pull-icon        | Pull refresh[图标名称](#/zh-CN/component/icon)                                                                                       | String  | <img src="https://img10.360buyimg.com/imagetools/jfs/t1/169863/6/4565/6306/60125948E7e92774e/40b3a0cf42852bcb.png" width=40/>                |
+| pull-icon        | Pull refresh [icon name](#/zh-CN/component/icon)                                                                                       | String  | <img src="https://img10.360buyimg.com/imagetools/jfs/t1/169863/6/4565/6306/60125948E7e92774e/40b3a0cf42852bcb.png" width=40/>                |
 | pull-txt         | Pull refresh text                                                                                                   | String  |`Loose to refresh`|
-| load-icon        | Pull on loading[图标名称](#/zh-CN/component/icon)                                                                                    | String | <img src="https://img10.360buyimg.com/imagetools/jfs/t1/169863/6/4565/6306/60125948E7e92774e/40b3a0cf42852bcb.png" width=40 />                |
+| load-icon        | Pull on loading [icon name](#/zh-CN/component/icon)                                                                                    | String | <img src="https://img10.360buyimg.com/imagetools/jfs/t1/169863/6/4565/6306/60125948E7e92774e/40b3a0cf42852bcb.png" width=40 />                |
 | load-txt         | Pull on loading text                                                                                                | String  | `Loading...`      |
 
 ### Events

src/packages/__VUE/popover/doc.en-US.md

@@ -286,7 +286,7 @@ export default {
 
 ### custom target 
 
-Popover 提供了 `targetId` 属性，用于匹配目标元素，在目标元素上添加对应的 id 值即可
+Popover provides the 'targetId' attribute to match the target element by adding the corresponding id value to the target element
 
 :::demo
 ```html

src/packages/__VUE/uploader/doc.en-US.md

@@ -8,12 +8,13 @@ Used to upload local pictures or files to the server.
 
 ``` javascript
 import { createApp } from 'vue';
-import { Uploader,Icon,Progress } from '@nutui/nutui';
+import { Uploader,Icon,Progress,Button } from '@nutui/nutui';
 
 const app = createApp();
 app.use(Uploader);
 app.use(Icon);
 app.use(Progress);
+app.use(Button);
 
 ```
 
@@ -424,4 +425,4 @@ Use [ref](https://vuejs.org/guide/essentials/template-refs.html#template-refs) t
 | Name             | Description                                                                                 | Arguments | Return value |
 |------------------|---------------------------------------------------------------------------------------------|-----------|--------------|
 | submit           | Manual upload mode, perform upload operation                                                | -         | -            |
-| clearUploadQueue | Empty the selected file queue (this method is generally used when uploading in manual mode) | index         | -            |
+| clearUploadQueue | Empty the selected file queue (this method is generally used when uploading in manual mode) | index         | -            |

src/packages/__VUE/uploader/doc.md

@@ -8,12 +8,13 @@
 
 ``` javascript
 import { createApp } from 'vue';
-import { Uploader,Icon,Progress } from '@nutui/nutui';
+import { Uploader,Icon,Progress,Button } from '@nutui/nutui';
 
 const app = createApp();
 app.use(Uploader);
 app.use(Icon);
 app.use(Progress);
+app.use(Button);
 
 ```
 
@@ -425,4 +426,4 @@ export default {
 | 方法名           | 说明                                                       | 参数  | 返回值 |
 |------------------|------------------------------------------------------------|-------|--------|
 | submit           | 手动上传模式，执行上传操作                                 | -     | -      |
-| clearUploadQueue | 清空已选择的文件队列（该方法一般配合在手动模式上传时使用） | index | -      |
+| clearUploadQueue | 清空已选择的文件队列（该方法一般配合在手动模式上传时使用） | index | -      |

src/packages/__VUE/uploader/doc.taro.md

@@ -8,12 +8,13 @@
 
 ``` javascript
 import { createApp } from 'vue';
-import { Uploader,Icon,Progress } from '@nutui/nutui-taro';
+import { Uploader,Icon,Progress,Button } from '@nutui/nutui-taro';
 
 const app = createApp();
 app.use(Uploader);
 app.use(Icon);
 app.use(Progress);
+app.use(Button);
 
 ```
 
@@ -289,4 +290,4 @@ setup() {
 | 方法名           | 说明                                                       | 参数  | 返回值 |
 |------------------|------------------------------------------------------------|-------|--------|
 | submit           | 手动上传模式，执行上传操作                                 | -     | -      |
-| clearUploadQueue | 清空已选择的文件队列（该方法一般配合在手动模式上传时使用） | index | -      |
+| clearUploadQueue | 清空已选择的文件队列（该方法一般配合在手动模式上传时使用） | index | -      |