Merge branch 'v2-dev' of https://github.com/jdf2e/nutui into v2-dev

.github/workflows/preview.yml

@@ -1,6 +1,6 @@
 name: 🔂 Surge PR Preview
 
-on: [push, pull_request]
+on: [push, pull_request_target]
 
 jobs:
   preview:

src/packages/address/address.vue

@@ -311,10 +311,6 @@ export default {
         this.$emit('closeMask', { closeWay: this.closeWay });
         this.$emit('close-mask', { closeWay: this.closeWay });
       }
-
-      setTimeout(() => {
-        that.showModule = 'type';
-      }, 500);
     },
     // 手动关闭 点击叉号(cross)，或者蒙层(mask)
     handClose(type = 'self') {

src/packages/slider/demo.vue

@@ -7,7 +7,7 @@
     <div>
       <nut-cell>
         <span slot="title">
-          <nut-slider v-model="val1" :range="[0, 10]"></nut-slider>
+          <nut-slider v-model="val1" @change="changeFn($event)" :range="[0, 10]"></nut-slider>
         </span>
       </nut-cell>
       <nut-cell>
@@ -84,7 +84,11 @@ export default {
       val6: 0
     };
   },
-  methods: {}
+  methods: {
+    changeFn(event) {
+      console.log(event);
+    }
+  }
 };
 </script>
 

src/packages/slider/doc.md

@@ -80,3 +80,10 @@
 | showLabelAlways | 是否一直展示标签 | Boolean | false
 | showRangeTxt | 两端是否展示可选取范围 | Boolean | false
 | stage | 分段数 | Number/String | -
+
+## Event
+
+| 名称 | 说明 | 回调参数 
+|----- | ----- | ----- 
+| change | 滑动时触发函数 | value
+

src/packages/slider/slider.vue

@@ -97,6 +97,7 @@ export default {
     setVal(posi) {
       const trans = (posi / this.box.clientWidth) * this.total;
       this.current = Math.round(trans / this.cell) * this.cell + this.range[0];
+      this.$emit('change', this.current);
       this.$emit('input', this.current);
     },
     valToPosi() {

src/packages/uploader/doc.md

@@ -210,6 +210,7 @@ test($ev){
 |----- | ----- | ----- | ----- 
 | name | input name的名称 | String | ""
 | url | 上传服务器的接口地址 | String | -
+| multiple | 是否支持多选 | Boolean | false
 | isPreview | 是否需要预览 | Boolean | false
 | clearInput | 是否需要清空input内容，设为true支持重复选择上传同一个文件 | Boolean | false
 | maxSize | 可以设定最大上传文件的大小（字节） | Number | 5242880

src/packages/uploader/uploader.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="nut-uploader">
     <slot></slot>
-    <input type="file" :name="name" @change="upload($event)" class="uploader" :multiple="multiple" :disabled="disabled" :accept="acceptType" />
+    <input v-if="multiple" type="file" :name="name" @change="upload($event)" class="uploader" multiple :disabled="disabled" :accept="acceptType" />
+    <input v-else type="file" :name="name" @change="upload($event)" class="uploader" :disabled="disabled" :accept="acceptType" />
   </div>
 </template>
 <script>