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

jd/generate-unplugin-deps.cjs

@@ -114,7 +114,8 @@ styleMap.forEach((value, key) => {
   // gen style
   const outputStyleMjs = `${deps
     .map((component) => {
-      return `import '../${component.toLowerCase()}/index.scss';\n`;
+      return `import '../${component.toLowerCase()}/index.scss';
+import '../../styles/reset.css';\n`;
     })
     .reverse()
     .join('')}import './index.scss';\n`;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "4.0.0-beta.15",
+  "version": "4.0.0-beta.16",
   "description": "京东风格的轻量级移动端 Vue2、Vue3 组件库（支持小程序开发）",
   "main": "dist/nutui.umd.cjs",
   "module": "dist/nutui.es.js",

publish/nutui-taro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui-taro",
-  "version": "4.0.0-beta.15",
+  "version": "4.0.0-beta.16",
   "description": "京东风格的轻量级移动端 Vue2、Vue3 组件库（支持小程序开发）",
   "main": "dist/nutui.umd.cjs",
   "module": "dist/nutui.es.js",
@@ -48,7 +48,7 @@
     }
   },
   "dependencies": {
-    "@nutui/icons-vue-taro": "^0.0.4",
+    "@nutui/icons-vue-taro": "^0.0.5",
     "sass": "^1.50.0"
   },
   "devDependencies": {},

publish/nutui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "4.0.0-beta.15",
+  "version": "4.0.0-beta.16",
   "description": "京东风格的轻量级移动端 Vue2、Vue3 组件库（支持小程序开发）",
   "main": "dist/nutui.umd.cjs",
   "module": "dist/nutui.es.js",
@@ -36,7 +36,7 @@
     "publish:beta": "npm publish --tag=beta"
   },
   "dependencies": {
-    "@nutui/icons-vue": "^0.0.20",
+    "@nutui/icons-vue": "^0.0.23",
     "sass": "^1.50.0"
   },
   "devDependencies": {},

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

@@ -66,19 +66,19 @@ test('color props', async () => {
 // test('url props', () => {
 //   const wrapper = mount(Avatar, {
 //     props: {
-//       url: 'https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png'
+//       url: 'https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png'
 //     }
 //   });
 //   const img: any = wrapper.find('img');
 //   expect(img.attributes().src).toBe(
-//     'https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png'
+//     'https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png'
 //   );
 // });
 
 // test('alt props', () => {
 //   const wrapper = mount(Avatar, {
 //     props: {
-//       url: 'https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png',
+//       url: 'https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png',
 //       alt: '我是alt'
 //     }
 //   });

src/packages/__VUE/avatar/demo.vue

@@ -4,17 +4,17 @@
     <nut-cell>
       <nut-avatar size="large">
         <img
-          src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png"
+          src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png"
         />
       </nut-avatar>
       <nut-avatar size="normal">
         <img
-          src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png"
+          src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png"
         />
       </nut-avatar>
       <nut-avatar size="small">
         <img
-          src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png"
+          src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png"
         />
       </nut-avatar>
     </nut-cell>
@@ -27,7 +27,7 @@
     <nut-cell>
       <nut-avatar>
         <img
-          src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png"
+          src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png"
         />
       </nut-avatar>
       <nut-avatar><My /></nut-avatar>

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

@@ -23,13 +23,13 @@ Support three sizes：small、normal、large
 ```html
 <template>
   <nut-avatar size="large">
-    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
+    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
   </nut-avatar>
   <nut-avatar size="normal">
-    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
+    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
   </nut-avatar>
   <nut-avatar size="small">
-    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
+    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
   </nut-avatar>
 </template>
 ```

src/packages/__VUE/avatar/doc.md

@@ -23,13 +23,13 @@ app.use(Avatar);
 ```html
 <template>
   <nut-avatar size="large">
-    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
+    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
   </nut-avatar>
   <nut-avatar size="normal">
-    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
+    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
   </nut-avatar>
   <nut-avatar size="small">
-    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
+    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
   </nut-avatar>
 </template>
 ```

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

@@ -23,13 +23,13 @@ app.use(Avatar);
 ```html
 <template>
   <nut-avatar size="large">
-    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
+    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
   </nut-avatar>
   <nut-avatar size="normal">
-    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
+    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
   </nut-avatar>
   <nut-avatar size="small">
-    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
+    <img src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png" />
   </nut-avatar>
 </template>
 ```

src/packages/__VUE/avatar/index.scss

@@ -36,7 +36,7 @@
 }
 .nut-avatar-round {
   border-radius: 50%;
-  overflow: hidden;
+  // overflow: hidden;
 }
 .nut-avatar-square {
   border-radius: $avatar-square;

src/packages/__VUE/avatargroup/index.scss

@@ -2,7 +2,7 @@
   background-size: 100% 100%;
   background-repeat: no-repeat;
   background-position: center center;
-  display: inline-block;
+  display: flex;
   position: relative;
   flex: 0 0 auto; // 防止被压缩
   .nut-avatar {

src/packages/__VUE/cell/doc.md

@@ -16,7 +16,7 @@ app.use(Cell);
 app.use(CellGroup);
 ```
 
-### 基本用法
+### 基础用法
 
 :::demo
 

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

@@ -16,7 +16,7 @@ app.use(Cell);
 app.use(CellGroup);
 ```
 
-### 基本用法
+### 基础用法
 
 :::demo
 

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

@@ -94,15 +94,15 @@ The ConfigProvider component provides the ability to override CSS variables. You
     </nut-config-provider>
 </template>
 <script lang="ts">
-  import { ref } from 'vue';
+  import { ref, reactive } from 'vue';
   export default {
     setup() {
       const range = ref(30);
-     const themeVars = {
+     const themeVars = reactive({
           primaryColor:'green',
           primaryColorEnd:'green',
           activeColor:'rgba(0,128,0,0.15)'
-      };
+      });
       // Of course, you can also choose to use component variables to replace. If both basic variables and component variables are set, the component variables will overwrite the basic variables
       //  const themeVars = {
       //   rangeBgColor: 'rgba(25,137,250,0.15)',

src/packages/__VUE/configprovider/doc.md

@@ -95,14 +95,14 @@ app.use(ConfigProvider);
     </nut-config-provider>
 </template>
 <script lang="ts">
-  import { ref } from 'vue';
+  import { ref, reactive } from 'vue';
   export default {
     setup() {
       const range = ref(30);
-      const themeVars = {
+      const themeVars = reactive({
           primaryColor:'#008000',
           primaryColorEnd:'#008000',
-      };
+      });
       // 当然，你也可以选择使用组件变量去替换，如果同时设置了基础变量和组件变量，组件变量会覆盖基础变量。
       //  const themeVars = {
       //   rangeBgColor: 'rgba(25,137,250,0.15)',

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

@@ -95,14 +95,14 @@ page {
     </nut-config-provider>
 </template>
 <script lang="ts">
-  import { ref } from 'vue';
+  import { ref, reactive } from 'vue';
   export default {
     setup() {
       const range = ref(30);
-      const themeVars = {
+      const themeVars = reactive({
           primaryColor:'#008000',
           primaryColorEnd:'#008000',
-      };
+      });
       // 当然，你也可以选择使用组件变量去替换，如果同时设置了基础变量和组件变量，组件变量会覆盖基础变量。
       //  const themeVars = {
       //   rangeBgColor: 'rgba(25,137,250,0.15)',

src/packages/__VUE/countup/doc.md

@@ -143,7 +143,7 @@ export default {
 |----- | ----- | ----- | ----- 
 | init-num | 初始数字 | number | `0`
 | end-num | 结束数字 | number | `0`
-| speed | 间隔数字，目前仅支持基本用法 | number | `1`
+| speed | 间隔数字，目前仅支持基础用法 | number | `1`
 | to-fixed | 保留小数点后几位 | number | `以传入的数字为准`
 | start-flag | 触发数字滚动的标识 | boolean | `true`
 | during | 滚动一次运行时间 | number | `1000`

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

@@ -134,7 +134,7 @@ export default {
 |----- | ----- | ----- | ----- 
 | init-num | 初始数字 | number | `0`
 | end-num | 结束数字 | number | `0`
-| speed | 间隔数字，目前仅支持基本用法 | number | `1`
+| speed | 间隔数字，目前仅支持基础用法 | number | `1`
 | to-fixed | 保留小数点后几位 | number | `以传入的数字为准`
 | start-flag | 触发数字滚动的标识 | boolean | `true`
 | during | 滚动一次运行时间 | number | `1000`

src/packages/__VUE/grid/demo.vue

@@ -12,6 +12,7 @@
       <nut-grid-item :text="translate('text')"><Dongdong /></nut-grid-item>
     </nut-grid>
 
+    <h2>{{ translate('columnNum') }}</h2>
     <nut-grid :column-num="3">
       <nut-grid-item :text="translate('text')"><Dongdong /></nut-grid-item>
       <nut-grid-item :text="translate('text')"><Dongdong /></nut-grid-item>

src/packages/__VUE/radio/doc.md

@@ -23,7 +23,7 @@ app.use(Checklist);
 
 ```html
 <template>
-  <nut-cell-group title="基本用法">
+  <nut-cell-group title="基础用法">
     <nut-cell>
       <nut-radio-group v-model="radioVal">
         <nut-radio label="1">选项1</nut-radio>

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

@@ -23,7 +23,7 @@ app.use(Checklist);
 
 ```html
 <template>
-  <nut-cell-group title="基本用法">
+  <nut-cell-group title="基础用法">
     <nut-cell>
       <nut-radio-group v-model="radioVal">
         <nut-radio label="1">选项1</nut-radio>

src/packages/__VUE/sku/doc.md

@@ -19,7 +19,7 @@ app.use(Sku);
 :::demo
 ```html
 <template>
-  <nut-cell :title="`基本用法`" desc="" @click="base = true"></nut-cell>
+  <nut-cell :title="`基础用法`" desc="" @click="base = true"></nut-cell>
   <nut-sku
     v-model:visible="base"
     :sku="sku"

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

@@ -19,7 +19,7 @@ app.use(Sku);
 :::demo
 ```html
 <template>
-  <nut-cell :title="`基本用法`" desc="" @click="base = true"></nut-cell>
+  <nut-cell :title="`基础用法`" desc="" @click="base = true"></nut-cell>
   <nut-sku
     v-model:visible="base"
     :sku="sku"

src/packages/__VUE/table/doc.md

@@ -14,7 +14,7 @@ const app = createApp();
 app.use(Table);
 ```
 
-### 基础使用
+### 基础用法
 
 :::demo
 

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

@@ -14,7 +14,7 @@ const app = createApp();
 app.use(Table);
 ```
 
-### 基础使用
+### 基础用法
 
 :::demo
 

src/packages/__VUE/uploader/doc.md

@@ -370,7 +370,7 @@ export default {
 | is-preview        | 是否上传成功后展示预览图                                                                                               | boolean                                    | `true`             |
 | is-deletable      | 是否展示删除按钮                                                                                                       | boolean                                    | `true`             |
 | method            | 上传请求的 http method                                                                                                 | string                                     | `"post"`           |
-| list-type         | 上传列表的内建样式，支持两种基本样式 picture、list                                                                     | string                                     | `"picture"`        |
+| list-type         | 上传列表的内建样式，支持两种基础样式 picture、list                                                                     | string                                     | `"picture"`        |
 | capture           | 图片[选取模式](https://developer.mozilla.org/zh-CN/docs/Web/HTML/Element/input#htmlattrdefcapture)，直接调起摄像头     | string                                     | `false`            |
 | maximize          | 可以设定最大上传文件的大小（字节）                                                                                     | number \| string                           | `Number.MAX_VALUE` |
 | maximum           | 文件上传数量限制                                                                                                       | number \| string                           | `1`                |

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

@@ -242,7 +242,7 @@ setup() {
 | is-preview        | 是否上传成功后展示预览图                                                                                         | boolean                           | `true`                      |
 | is-deletable      | 是否展示删除按钮                                                                                                 | boolean                           | `true`                      |
 | method            | 上传请求的 http method                                                                                           | string                            | `post`                    |
-| list-type         | 上传列表的内建样式，支持两种基本样式 `picture`、`list`                                                               | string                            | `picture`                 |
+| list-type         | 上传列表的内建样式，支持两种基础样式 `picture`、`list`                                                               | string                            | `picture`                 |
 | source-type       | [选择图片的来源](https://developers.weixin.qq.com/miniprogram/dev/api/media/image/wx.chooseImage.html)           | string                            | `['album','camera']`        |
 | maximize          | 可以设定最大上传文件的大小（字节）                                                                               | number \| string                  | `9`                         |
 | maximum           | 文件上传数量限制                                                                                                 | number \| string                  | `1`                         |

src/packages/styles/reset.css

@@ -0,0 +1,3 @@
+html {
+  -webkit-tap-highlight-color: transparent;
+}

src/sites/mobile-taro/vue/src/exhibition/pages/avatar/index.vue

@@ -5,17 +5,17 @@
     <nut-cell>
       <nut-avatar size="large">
         <img
-          src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png"
+          src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png"
         />
       </nut-avatar>
       <nut-avatar size="normal">
         <img
-          src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png"
+          src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png"
         />
       </nut-avatar>
       <nut-avatar size="small">
         <img
-          src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png"
+          src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png"
         />
       </nut-avatar>
     </nut-cell>
@@ -28,7 +28,7 @@
     <nut-cell>
       <nut-avatar>
         <img
-          src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png"
+          src="https://img12.360buyimg.com/imagetools/jfs/t1/196430/38/8105/14329/60c806a4Ed506298a/e6de9fb7b8490f38.png"
         />
       </nut-avatar>
       <nut-avatar><My /></nut-avatar>