xianniu-ui 0.8.33 → 0.8.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.8.33",
+  "version": "0.8.34",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {

package/packages/import/main.vue

@@ -114,6 +114,7 @@ export default {
       oss: null,
       client: null,
       successFiles: [],
+      count: 0,
     };
   },
   created() {
@@ -130,6 +131,7 @@ export default {
         this.abort();
         this.fileList = [];
         this.successFiles = [];
+        this.count = 0;
       }
       this.$emit("update:show", false);
     },
@@ -172,10 +174,9 @@ export default {
             .upload(file)
             .then((res) => {
               this.successFiles.push(res);
-              this.$emit("on-success", this.successFiles);
+              this.$emit("on-success", res);
             })
-            .catch(() => {
-            });
+            .catch(() => {});
         }
       } catch (error) {
         file.onError();
@@ -211,13 +212,18 @@ export default {
           if (!this.fileList.length) {
             return this.$message.warning("请选择要上传的文件");
           }
-          this.submit();
+          if (this.autoUpload) {
+            this.submit();
+          }
         });
       } else {
         if (!this.fileList.length) {
           return this.$message.warning("请选择要上传的文件");
         }
-        this.submit();
+        if (this.autoUpload) {
+          this.submit();
+        }
+        this.$emit("on-confirm", this.successFiles);
       }
     },
     isPromise(obj) {

package/packages/style/src/upload.scss

@@ -148,6 +148,13 @@
             width: 50%;
         }
     }
+    .el-upload--list{
+        width: 100%;
+    }
+    .el-upload-dragger{
+        width: 100%;
+        height: 100%;
+    }
 }
 .xn-idcard {
     position: relative;

package/packages/upload/main.vue

@@ -18,6 +18,7 @@
     :style="{ ...styles,...idCardSizeData }"
     :on-exceed="onExceed"
     :on-change="onChange"
+    :on-preview="onPreviewFile"
   >
     <template v-if="listType === 'idcard'">
       <template slot="trigger">
@@ -297,18 +298,17 @@ export default {
         .then((res) => {
           this.successFiles.push(res);
           this.$emit("update:fileList", this.successFiles);
+          this.$emit("on-file", this.res);
           this.$emit("on-success", this.successFiles);
           this.$emit("on-uploaded", true);
           this.isUploading = false;
         })
-        .catch((err) => {
-          console.log(err);
+        .catch(() => {
           this.$emit("update:fileList", this.successFiles);
         });
     },
 
-    onError(err) {
-      console.log(err);
+    onError() {
       this.$message.error("上传失败，请重试");
     },
     onSubmitUpload() {
@@ -357,6 +357,15 @@ export default {
     abortUpload() {
       return this.oss.oss.cancel();
     },
+    onPreviewFile(file){
+      if(file.isAV === 1){
+        this.handleAVPreview(file)
+      }else if(file.imgFlag === 1){
+        this.handlePictureCardPreview(file)
+      }else{
+        this.handleDownload(file)
+      }
+    }
   },
 };
 </script>