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

package.json

@@ -75,6 +75,7 @@
   },
   "dependencies": {
     "@tarojs/components": "3.5.6",
+    "consola": "2.15.3",
     "sass": "^1.50.0",
     "vscode": "^1.1.37",
     "vue-router": "^4.0.12"

src/packages/__VUE/cascader/__tests__/cascader.spec.ts

@@ -7,6 +7,7 @@ import Popup from '../../popup/index.vue';
 import Icon from '../../icon/index.vue';
 import Tabs from '../../tabs/index.vue';
 import TabPane from '../../tabpane/index.vue';
+import Sticky from '../../sticky/index.vue';
 
 const mountCascader = (options = {}) =>
   mount(Cascader, {
@@ -16,7 +17,8 @@ const mountCascader = (options = {}) =>
         [Popup.name]: Popup,
         [Icon.name]: Icon,
         [TabPane.name]: TabPane,
-        [Tabs.name]: Tabs
+        [Tabs.name]: Tabs,
+        [Sticky.name]: Sticky
       },
       stubs: {
         teleport: true

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

@@ -208,8 +208,8 @@ You can center the left and right contents of the cell vertically through the 'c
 | desc                    | Description                                                                                              | String           | -                |
 | desc-text-align         | Right description text alignment [text-align](https://www.w3school.com.cn/cssref/pr_text_text-align.asp) | String           | right            |
 | is-link                 | Whether to show the right arrow and turn on click feedback                                               | Boolean          | false            |
-| icon                    | Left [icon name](#/icon) or image url                                                                    | String           | -                |
-| right-icon`v3.2.1`      | Right [icon name](#/icon) or image url                                                                   | String           | right            |
+| icon                    | Left [icon name](#/en-US/component/icon) or image url                                                                    | String           | -                |
+| right-icon`v3.2.1`      | Right [icon name](#/en-US/component/icon) or image url                                                                   | String           | right            |
 | round-radius            | Corner radius                                                                                            | Number           | 6px              |
 | url                     | Link URL                                                                                                 | String           | -                |
 | to                      | Target route of the link, same as to of vue-router                                                       | String ｜ Object | -                |

src/packages/__VUE/cell/doc.md

@@ -211,8 +211,8 @@ app.use(Icon)
 | desc                    | 右侧描述                                                                                       | String           | -                |
 | desc-text-align         | 右侧描述文本对齐方式 [text-align](https://www.w3school.com.cn/cssref/pr_text_text-align.asp)   | String           | right            |
 | is-link                 | 是否展示右侧箭头并开启点击反馈                                                                 | Boolean          | false            |
-| icon                    | 左侧 [图标名称](#/icon) 或图片链接                                                             | String           | -                |
-| right-icon`v3.2.1`      | 右侧箭头 [图标名称](#/icon) 或图片链接                                                         | String           | right            |
+| icon                    | 左侧 [图标名称](#/zh-CN/component/icon) 或图片链接                                                             | String           | -                |
+| right-icon`v3.2.1`      | 右侧箭头 [图标名称](#/zh-CN/component/icon) 或图片链接                                                         | String           | right            |
 | round-radius            | 圆角半径                                                                                       | Number           | 6px              |
 | url `小程序不支持`      | 点击后跳转的链接地址                                                                           | String           | -                |
 | to `小程序不支持`       | 点击后跳转的目标路由对象，同 vue-router 的 [to 属性](https://router.vuejs.org/zh/api/#to) 属性 | String ｜ Object | -                |

src/packages/__VUE/checkbox/doc.md

@@ -381,10 +381,10 @@ app.use(Icon);
 | v-model | 是否处于选中状态 | Boolean | `false`
 | disabled | 是否禁用选择 | Boolean | `false`
 | text-position | 文本所在的位置，可选值：`left`,`right` | String | `right`
-| icon-size | [图标尺寸](#/icon) | String、Number | `18`
-| icon-name | [图标名称](#/icon)，选中前(建议和`icon-active-name`一起修改) | String | `'check-normal'`
-| icon-active-name | [图标名称](#/icon)，选中后(建议和`icon-name`一起修改) | String | `'checked'`
-| icon-indeterminate-name | [图标名称](#/icon)，半选状态 | String | `'check-disabled'`
+| icon-size | [图标尺寸](#/zh-CN/component/icon) | String、Number | `18`
+| icon-name | [图标名称](#/zh-CN/component/icon)，选中前(建议和`icon-active-name`一起修改) | String | `'check-normal'`
+| icon-active-name | [图标名称](#/zh-CN/component/icon)，选中后(建议和`icon-name`一起修改) | String | `'checked'`
+| icon-indeterminate-name | [图标名称](#/zh-CN/component/icon)，半选状态 | String | `'check-disabled'`
 | icon-class-prefix | 自定义 icon 类名前缀，用于使用自定义图标        | String                  | `nut-icon` |
 | icon-font-class-name | 自定义 icon 字体基础类名        | String                  | `nutui-iconfont` |
 | label | 复选框的文本内容 | String | -

src/packages/__VUE/ellipsis/__tests__/__snapshots__/ellipsis.spec.ts.snap

@@ -4,7 +4,7 @@ exports[`Ellipsis Props Direction Middle 1`] = `
 "<view class=\\"nut-ellipsis\\">
   <!--v-if-->
   <view>NutUI3.0上线后我们研发团队...
-    <!--v-if--> ...UI 中增加小程序多端适配的能力。
+    <!--v-if-->...UI 中增加小程序多端适配的能力。
   </view>
   <!--v-if-->
 </view>"
@@ -14,7 +14,7 @@ exports[`Ellipsis Props Direction Start 1`] = `
 "<view class=\\"nut-ellipsis\\">
   <!--v-if-->
   <view>
-    <!--v-if--> ...多的开发者带来便利，我们决定在 NutUI 中增加小程序多端适配的能力。
+    <!--v-if-->...多的开发者带来便利，我们决定在 NutUI 中增加小程序多端适配的能力。
   </view>
   <!--v-if-->
 </view>"
@@ -24,7 +24,7 @@ exports[`Ellipsis Props Rows 1`] = `
 "<view class=\\"nut-ellipsis\\">
   <!--v-if-->
   <view>
-    <!--v-if--> ... 的相关组件，但是在跨端小程序的开发过程中，发现没有合适的组件库可以支持多端开发。为了填补这一空白，同时为了优化开发者体验，让 NutUI 能够为更多的开发者带来便利，我们决定在 NutUI 中增加小程序多端适配的能力。
+    <!--v-if-->... 的相关组件，但是在跨端小程序的开发过程中，发现没有合适的组件库可以支持多端开发。为了填补这一空白，同时为了优化开发者体验，让 NutUI 能够为更多的开发者带来便利，我们决定在 NutUI 中增加小程序多端适配的能力。
   </view>
   <!--v-if-->
 </view>"

src/packages/__VUE/grid/doc.md

@@ -178,7 +178,7 @@ app.use(GridItem);
 | 参数                  | 说明                                                                                     | 类型               | 默认值      |
 |----------------------|-----------------------------------------------------------------------------------------|--------------------|------------|
 | text                 | 文字                                                                                     | string             | -          |
-| icon                 | [图标名称](#/icon) 或图片链接                                                              | string             | -          |
+| icon                 | [图标名称](#/zh-CN/component/icon) 或图片链接                                                              | string             | -          |
 | icon-size            | 图标大小，如 `20px` `2em` `2rem`                                                          | number \| string   | `28px`     |
 | icon-color           | 图标颜色                                                                                  | string            | -           |
 | url `小程序不支持`     | 点击后跳转的链接地址                                                                        | string            | -           |

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

@@ -257,9 +257,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[图标名称](#/icon)                                                                                       | String  | <img src="https://img10.360buyimg.com/imagetools/jfs/t1/169863/6/4565/6306/60125948E7e92774e/40b3a0cf42852bcb.png" width=40/>                |
+| 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-txt         | Pull refresh text                                                                                                   | String  |`Loose to refresh`|
-| load-icon        | Pull on loading[图标名称](#/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[图标名称](#/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/infiniteloading/doc.md

@@ -252,9 +252,9 @@
 | container-id          | 在 useWindow 属性为 false 的时候，自定义设置节点ID                        | String | `''`            |
 | load-more-txt          | “没有更多数”据展示文案                        | String | `'哎呀，这里是底部了啦'`            |
 | is-open-refresh        | 是否开启下拉刷新                         | Boolean | `false`                |
-| pull-icon        | 下拉刷新[图标名称](#/icon)                        | String | <img src="https://img10.360buyimg.com/imagetools/jfs/t1/169863/6/4565/6306/60125948E7e92774e/40b3a0cf42852bcb.png" width=40/>                |
+| pull-icon        | 下拉刷新[图标名称](#/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        | 下拉刷新提示文案                         | String | `松手刷新`                |
-| load-icon        | 上拉加载[图标名称](#/icon)                       | String | <img src="https://img10.360buyimg.com/imagetools/jfs/t1/169863/6/4565/6306/60125948E7e92774e/40b3a0cf42852bcb.png" width=40 />                |
+| load-icon        | 上拉加载[图标名称](#/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        | 上拉加载提示文案                         | String | `加载中...`                |
 
 ### Events

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

@@ -100,9 +100,9 @@ setup() {
 | container-id          | 必填，设置滚动节点ID                        | String | `''`            |
 | load-more-txt          | “没有更多数”据展示文案                        | String | `'哎呀，这里是底部了啦'`            |
 | is-open-refresh        | 是否开启下拉刷新                         | Boolean | `false`                |
-| pull-icon        | 下拉刷新[图标名称](#/icon)                        | String | <img src="https://img10.360buyimg.com/imagetools/jfs/t1/169863/6/4565/6306/60125948E7e92774e/40b3a0cf42852bcb.png" width=40/>                |
+| pull-icon        | 下拉刷新[图标名称](#/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        | 下拉刷新提示文案                         | String | `松手刷新`                |
-| load-icon        | 上拉加载[图标名称](#/icon)                       | Boolean | <img src="https://img10.360buyimg.com/imagetools/jfs/t1/169863/6/4565/6306/60125948E7e92774e/40b3a0cf42852bcb.png" width=40 />                |
+| load-icon        | 上拉加载[图标名称](#/zh-CN/component/icon)                       | Boolean | <img src="https://img10.360buyimg.com/imagetools/jfs/t1/169863/6/4565/6306/60125948E7e92774e/40b3a0cf42852bcb.png" width=40 />                |
 | load-txt        | 上拉加载提示文案                         | String | `加载中...`                |
 
 ### Events

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

@@ -172,6 +172,7 @@ The user can enter content in the text box. Configure the icons on both sides of
       const state = reactive({
         showIcon: '',
         required: '',
+        clear:''
       });
       return {
         state
@@ -498,10 +499,10 @@ The user can enter content in the text box. Configure the icons on both sides of
 | autofocus    | Whether to auto focus, unsupported in iOS     | Boolean        | `false` |
 | max-length   | Max length of value                  | String、Number  | -       |
 | clearable    | Whether to be clearable              | Boolean        | `false`  |
-| clear-icon   | Clear Icon name, [name of icon](#/icon)           | String        | `mask-close`  |
+| clear-icon   | Clear Icon name, [name of icon](#/en-US/component/icon)           | String        | `mask-close`  |
 | clear-size   | Clear Icon `font-size`               | String        | `14`  |
-| left-icon    | Left side Icon name, [name of icon](#/icon) | String        | - |
-| right-icon   | Right side Icon name, [name of icon](#/icon) | String        | - |
+| left-icon    | Left side Icon name, [name of icon](#/en-US/component/icon) | String        | - |
+| right-icon   | Right side Icon name, [name of icon](#/en-US/component/icon) | String        | - |
 | left-icon-size    | Left side Icon `font-size`    | String        | `14`  |
 | right-icon-size   | Right side Icon `font-size`   | String        | `14`  |
 | show-word-limit | Whether to show word limit, need to set the `max-length` prop | Boolean | `false`  |

src/packages/__VUE/input/doc.md

@@ -172,6 +172,7 @@ app.use(Icon);
       const state = reactive({
         showIcon: '',
         required: '',
+        clear:''
       });
       return {
         state
@@ -499,10 +500,10 @@ app.use(Icon);
 | autofocus    | 是否自动获得焦点，iOS 系统不支持该属性     | Boolean        | `false` |
 | max-length      | 限制最长输入字符                       | String、Number  | -       |
 | clearable    | 展示清除 Icon                         | Boolean        | `false`  |
-| clear-icon   | 清除图标 Icon 名称或图片链接，[可参考 Icon 组件的 name 属性](#/icon)   | String        | `mask-close`  |
+| clear-icon   | 清除图标 Icon 名称或图片链接，[可参考 Icon 组件的 name 属性](#/zh-CN/component/icon)   | String        | `mask-close`  |
 | clear-size   | 清除图标的 `font-size` 大小           | String        | `14`  |
-| left-icon    | 左侧 Icon 名称或图片链接，[可参考 Icon 组件的 name 属性](#/icon) | String        | - |
-| right-icon   | 右侧 Icon 名称或图片链接，[可参考 Icon 组件的 name 属性](#/icon) | String        | - |
+| left-icon    | 左侧 Icon 名称或图片链接，[可参考 Icon 组件的 name 属性](#/zh-CN/component/icon) | String        | - |
+| right-icon   | 右侧 Icon 名称或图片链接，[可参考 Icon 组件的 name 属性](#/zh-CN/component/icon) | String        | - |
 | left-icon-size    | 左侧 Icon 的 `font-size` 大小           | String        | `14`  |
 | right-icon-size   | 右侧 Icon 的 `font-size` 大小           | String        | `14`  |
 | show-word-limit | 是否显示限制最长输入字符，需要设置 `max-length` 属性 | Boolean | `false`  |

src/packages/__VUE/radio/doc.md

@@ -206,9 +206,9 @@ app.use(Icon);
 | 字段             | 说明                                                         | 类型                    | 默认值            |
 |------------------|--------------------------------------------------------------|-------------------------|-------------------|
 | disabled         | 是否禁用选择                                                 | Boolean                 | `false`           |
-| icon-size        | [图标尺寸](#/icon)                                           | String、Number          | `18`              |
-| icon-name        | [图标名称](#/icon)，选中前(建议和`icon-active-name`一起修改) | String                  | `'check-normal'`  |
-| icon-active-name | [图标名称](#/icon)，选中后(建议和`icon-name`一起修改)        | String                  | `'check-checked'` |
+| icon-size        | [图标尺寸](#/zh-CN/component/icon)                                           | String、Number          | `18`              |
+| icon-name        | [图标名称](#/zh-CN/component/icon)，选中前(建议和`icon-active-name`一起修改) | String                  | `'check-normal'`  |
+| icon-active-name | [图标名称](#/zh-CN/component/icon)，选中后(建议和`icon-name`一起修改)        | String                  | `'check-checked'` |
 | icon-class-prefix | 自定义 icon 类名前缀，用于使用自定义图标        | String                  | `nut-icon` |
 | icon-font-class-name | 自定义 icon 字体基础类名        | String                  | `nutui-iconfont` |
 | label            | 单选框标识                                                   | String、Number、Boolean | -                 |

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

@@ -204,8 +204,8 @@ export default {
 | icon-size          | Star size                                                                        | Number  | 18               |
 | active-color       | Icon selection color                                                             | String  | #fa200c          |
 | void-color         | Icon unselected color                                                            | String  | #ccc             |
-| unchecked-icon     | Use icon (unchecked)[icon name](#/icon)                                          | String  | star-n           |
-| checked-icon       | Use icon (checked)[icon name](#/icon)                                            | String  | star-fill-n      |
+| unchecked-icon     | Use icon (unchecked)[icon name](#/en-US/component/icon)                                          | String  | star-n           |
+| checked-icon       | Use icon (checked)[icon name](#/en-US/component/icon)                                            | String  | star-fill-n      |
 | font-class-name    | Custom icon font base class name                                                 | String  | `nutui-iconfont` |
 | class-prefix       | Custom icon class name prefix for using custom icons                             | String  | `nut-icon`       |
 | allow-half         | half star                                                                        | Boolean | false            |

src/packages/__VUE/rate/doc.md

@@ -205,8 +205,8 @@ export default {
 | icon-size                          | star 大小                                 | Number  | 18               |
 | active-color                       | 图标选中颜色                              | String  | #fa200c          |
 | void-color                         | 图标未选中颜色                            | String  | #ccc             |
-| unchecked-icon                     | 使用图标(未选中)[图标名称](#/icon)        | String  | star-n           |
-| checked-icon                       | 使用图标(选中)[图标名称](#/icon)          | String  | star-fill-n      |
+| unchecked-icon                     | 使用图标(未选中)[图标名称](#/zh-CN/component/icon)        | String  | star-n           |
+| checked-icon                       | 使用图标(选中)[图标名称](#/zh-CN/component/icon)          | String  | star-fill-n      |
 | font-class-name                    | 自定义icon 字体基础类名                   | String  | `nutui-iconfont` |
 | class-prefix                       | 自定义icon 类名前缀，用于使用自定义图标   | String  | `nut-icon`       |
 | allow-half                         | 是否半星                                  | Boolean | false            |

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

@@ -169,9 +169,9 @@ app.use(Switch);
 | v-model        | Status of Switch       | Boolean ｜ String ｜ Number | `false`  |
 | disable        | Disable status         | Boolean | `false`               |
 | loading        | Loading status         | Boolean | `false`               |
-| name           | [Name of icon](#/icon) | String | `loading`               |
-| color          | [Color of icon](#/icon)，only takes effect in `loading` state | String | -     |
-| size           | [Size of icon](#/icon)，only takes effect in `loading` state  | String ｜ Number | `12px`   |
+| name           | [Name of icon](#/en-US/component/icon) | String | `loading`               |
+| color          | [Color of icon](#/en-US/component/icon)，only takes effect in `loading` state | String | -     |
+| size           | [Size of icon](#/en-US/component/icon)，only takes effect in `loading` state  | String ｜ Number | `12px`   |
 | active-color   | Background color when active | String  | `#fa2c19`    |
 | inactive-color | Background color when inactive | String  | `#ebebeb` | 
 | active-text    | Word description when active   | String  | -         |

src/packages/__VUE/switch/doc.md

@@ -169,9 +169,9 @@ app.use(Switch);
 | v-model        | 开关状态         | Boolean ｜ String ｜ Number | `false`               |
 | disable        | 禁用状态         | Boolean | `false`               |
 | loading        | 加载状态         | Boolean | `false`               |
-| name        | [图标名称](#/icon)         | String | `loading`               |
-| color        | [图标颜色](#/icon)，仅在`loading`状态下生效          | String | -               |
-| size        | [图标尺寸](#/icon)，仅在`loading`状态下生效          | String ｜ Number | `12px`               |
+| name        | [图标名称](#/zh-CN/component/icon)         | String | `loading`               |
+| color        | [图标颜色](#/zh-CN/component/icon)，仅在`loading`状态下生效          | String | -               |
+| size        | [图标尺寸](#/zh-CN/component/icon)，仅在`loading`状态下生效          | String ｜ Number | `12px`               |
 | active-color   | 打开时的背景颜色 | String  | `#fa2c19`    |
 | inactive-color | 关闭时的背景颜色 | String  | `#ebebeb` |
 | active-text    | 打开时文字描述   | String  | -                     |

src/packages/__VUE/tabbar/doc.md

@@ -267,7 +267,7 @@ app.use(TabbarItem);
 |-----------|-------------------------------------------|--------|--------|
 | tab-title | 标签页的标题                              | string | --    |
 | name| 标签名称，作为匹配的标识符                             | string | 当前标签的索引值   |
-| icon      | 标签页显示的[图标名称](#/icon)  | string | --     |
+| icon      | 标签页显示的[图标名称](#/zh-CN/component/icon)  | string | --     |
 | font-class-name | 自定义icon 字体基础类名     | string           | `nutui-iconfont` |
 | class-prefix | 自定义icon 类名前缀，用于使用自定义图标     | string           | `nut-icon` |
 | img      | 标签页显示图片链接 | String | --     |

src/packages/__VUE/uploader/__tests__/__snapshots__/index.spec.ts.snap

@@ -1,5 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`delete-icon prop 1`] = `
+"<view class=\\"nut-uploader\\">
+  <!--v-if-->
+  <view class=\\"nut-uploader__upload picture\\"><i class=\\"nutui-iconfont nut-icon nut-icon-photograph\\" style=\\"color: rgb(128, 128, 128);\\" src=\\"\\"></i><input class=\\"nut-uploader__input\\" type=\\"file\\" accept=\\"*\\" name=\\"file\\"></view>
+</view>"
+`;
+
 exports[`render preview image 1`] = `
 "<view class=\\"nut-uploader\\" modelvalue=\\"[object Object],[object Object],[object Object]\\">
   <!--v-if-->

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

@@ -380,8 +380,8 @@ export default {
 | accept            | File types that can be accepted. See [input accept Attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/file#accept)       | String                            | *                |
 | headers           | Set request headers                                                                                                                              | Object                            | {}               |
 | data              | Uploading extra params or function which can return uploading extra params                                                                       | Object                            | {}               |
-| upload-icon       | Upload area [icon name](#/icon) or image link                                                                                                    | String                            | "photograph"     |
-| upload-icon-size  | Upload area [icon size] (#/icon) size, such as `20px` `2em` `2rem`                                                                               | String or Number                  | -                |
+| upload-icon       | Upload area [icon name](#/en-US/component/icon) or image link                                                                                                    | String                            | "photograph"     |
+| upload-icon-size  | Upload area [icon size] (#/en-US/component/icon) size, such as `20px` `2em` `2rem`                                                                               | String or Number                  | -                |
 | xhr-state         | The success status (status) value of the interface response                                                                                      | Number                            | 200              |
 | with-credentials  | The ajax upload with cookie sent                                                                                                                 | Boolean                           | false            |
 | multiple          | Whether to support multiple file selection                                                                                                       | Boolean                           | false            |

src/packages/__VUE/uploader/doc.md

@@ -380,8 +380,8 @@ export default {
 | accept                    | 允许上传的文件类型，[详细说明](https://developer.mozilla.org/zh-CN/docs/Web/HTML/Element/Input/file#%E9%99%90%E5%88%B6%E5%85%81%E8%AE%B8%E7%9A%84%E6%96%87%E4%BB%B6%E7%B1%BB%E5%9E%8B) | String                            | *                |
 | headers                   | 设置上传的请求头部                                                                                                                                                                     | Object                            | {}               |
 | data                      | 附加上传的信息 formData                                                                                                                                                                | Object                            | {}               |
-| upload-icon               | 上传区域[图标名称](#/icon)或图片链接                                                                                                                                                   | String                            | "photograph"     |
-| upload-icon-size          | 上传区域[图标尺寸](#/icon)大小，如 `20px` `2em` `2rem`                                                                                                                                 | String or Number                  | -                |
+| upload-icon               | 上传区域[图标名称](#/zh-CN/component/icon)或图片链接                                                                                                                                                   | String                            | "photograph"     |
+| upload-icon-size          | 上传区域[图标尺寸](#/zh-CN/component/icon)大小，如 `20px` `2em` `2rem`                                                                                                                                 | String or Number                  | -                |
 | xhr-state                 | 接口响应的成功状态（status）值                                                                                                                                                         | Number                            | 200              |
 | with-credentials          | 支持发送 cookie 凭证信息                                                                                                                                                               | Boolean                           | false            |
 | multiple                  | 是否支持文件多选                                                                                                                                                                       | Boolean                           | false            |

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

@@ -246,8 +246,8 @@ setup() {
 | size-type                 | 是否压缩所选文件[详细说明](https://developers.weixin.qq.com/miniprogram/dev/api/media/image/wx.chooseImage.html)       | String                            | ['original','compressed'] |
 | headers                   | 设置上传的请求头部                                                                                                     | Object                            | {}                        |
 | data                      | 附加上传的信息 formData                                                                                                | Object                            | {}                        |
-| upload-icon               | 上传区域[图标名称](#/icon)或图片链接                                                                                   | String                            | "photograph"              |
-| upload-icon-size          | 上传区域[图标尺寸](#/icon)大小，如 `20px` `2em` `2rem`                                                                 | String or Number                  | -                         |
+| upload-icon               | 上传区域[图标名称](#/zh-CN/component/icon)或图片链接                                                                                   | String                            | "photograph"              |
+| upload-icon-size          | 上传区域[图标尺寸](#/zh-CN/component/icon)大小，如 `20px` `2em` `2rem`                                                                 | String or Number                  | -                         |
 | xhr-state                 | 接口响应的成功状态（status）值                                                                                         | Number                            | 200                       |
 | disabled                  | 是否禁用文件上传                                                                                                       | Boolean                           | false                     |
 | multiple`v2.3.4`                  | 是否支持文件多选                                                                                                       | Boolean                           | true            |

src/packages/styles/font/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon nutui-iconfont">&#xe6cd;</span>
+                <div class="name">close_fill</div>
+                <div class="code-name">&amp;#xe6cd;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon nutui-iconfont">&#xe6c9;</span>
                 <div class="name">常用_返回</div>
                 <div class="code-name">&amp;#xe6c9;</div>
@@ -433,12 +439,6 @@
               </li>
           
             <li class="dib">
-              <span class="icon nutui-iconfont">&#xe69a;</span>
-                <div class="name">mask-close</div>
-                <div class="code-name">&amp;#xe69a;</div>
-              </li>
-          
-            <li class="dib">
               <span class="icon nutui-iconfont">&#xe699;</span>
                 <div class="name">circle-close</div>
                 <div class="code-name">&amp;#xe699;</div>
@@ -822,9 +822,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'nutui-iconfont';
-  src: url('iconfont.woff2?t=1667903871674') format('woff2'),
-       url('iconfont.woff?t=1667903871674') format('woff'),
-       url('iconfont.ttf?t=1667903871674') format('truetype');
+  src: url('iconfont.woff2?t=1668762221765') format('woff2'),
+       url('iconfont.woff?t=1668762221765') format('woff'),
+       url('iconfont.ttf?t=1668762221765') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -851,6 +851,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon nutui-iconfont nut-icon-mask-close"></span>
+            <div class="name">
+              close_fill
+            </div>
+            <div class="code-name">.nut-icon-mask-close
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon nutui-iconfont nut-icon-rect-left"></span>
             <div class="name">
               常用_返回
@@ -1418,15 +1427,6 @@
           </li>
           
           <li class="dib">
-            <span class="icon nutui-iconfont nut-icon-mask-close"></span>
-            <div class="name">
-              mask-close
-            </div>
-            <div class="code-name">.nut-icon-mask-close
-            </div>
-          </li>
-          
-          <li class="dib">
             <span class="icon nutui-iconfont nut-icon-circle-close"></span>
             <div class="name">
               circle-close
@@ -2004,6 +2004,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#nut-icon-mask-close"></use>
+                </svg>
+                <div class="name">close_fill</div>
+                <div class="code-name">#nut-icon-mask-close</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#nut-icon-rect-left"></use>
                 </svg>
                 <div class="name">常用_返回</div>
@@ -2508,14 +2516,6 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#nut-icon-mask-close"></use>
-                </svg>
-                <div class="name">mask-close</div>
-                <div class="code-name">#nut-icon-mask-close</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#nut-icon-circle-close"></use>
                 </svg>
                 <div class="name">circle-close</div>

src/packages/styles/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "nutui-iconfont"; /* Project id 2166874 */
-  src: url('iconfont.woff2?t=1667903871674') format('woff2'),
-       url('iconfont.woff?t=1667903871674') format('woff'),
-       url('iconfont.ttf?t=1667903871674') format('truetype');
+  src: url('iconfont.woff2?t=1668762221765') format('woff2'),
+       url('iconfont.woff?t=1668762221765') format('woff'),
+       url('iconfont.ttf?t=1668762221765') format('truetype');
 }
 
 .nutui-iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.nut-icon-mask-close:before {
+  content: "\e6cd";
+}
+
 .nut-icon-rect-left:before {
   content: "\e6c9";
 }
@@ -265,10 +269,6 @@
   content: "\e69b";
 }
 
-.nut-icon-mask-close:before {
-  content: "\e69a";
-}
-
 .nut-icon-circle-close:before {
   content: "\e699";
 }

src/packages/styles/font/iconfont.json

@@ -6,6 +6,13 @@
   "description": "nutui 3.0字体管理",
   "glyphs": [
     {
+      "icon_id": "257405",
+      "name": "close_fill",
+      "font_class": "mask-close",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
       "icon_id": "24330526",
       "name": "常用_返回",
       "font_class": "rect-left",
@@ -447,13 +454,6 @@
       "unicode_decimal": 59035
     },
     {
-      "icon_id": "18193248",
-      "name": "mask-close",
-      "font_class": "mask-close",
-      "unicode": "e69a",
-      "unicode_decimal": 59034
-    },
-    {
       "icon_id": "18193089",
       "name": "circle-close",
       "font_class": "circle-close",