bri-components 1.6.1 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/controls/base/BriUpload/BriUpload.vue

@@ -23,7 +23,6 @@
         @dragover.prevent="dragOver = true"
         @dragleave.prevent="dragOver = false"
     >
-
         <!-- 编辑 -->
         <div
             v-if="!disabled"
@@ -104,18 +103,18 @@
     import uploadList from "./uploadList.vue";
 
     const prefixCls = "ivu-upload";
-    const imageType = ["jpg", "png", "gif", "jpeg", "tiff", "swf"];
-    const documentType = ["txt", "doc", "xls", "ppt", "docx", "xlsx", "pptx", "pdf", "xmind"];
-    const videoType = ["flv", "rmvb", "mp4", "mvb"];
-    const audioType = ["wma", "mp3", "m4a"];
-    const packageType = ["rar", "zip"];
-    const fileTypes = [
-        ...documentType,
-        ...imageType,
-        ...videoType,
-        ...audioType,
-        ...packageType
-    ];
+    const fileTypesMap = {
+        document: ["txt", "doc", "xls", "ppt", "docx", "xlsx", "pptx", "pdf", "xmind"],
+        image: ["jpg", "png", "gif", "jpeg", "tiff", "swf"],
+        video: ["flv", "rmvb", "mp4", "mvb"],
+        audio: ["wma", "mp3", "m4a"],
+        // text: ["log", "csv", "html", "json"],
+        package: ["rar", "zip"]
+    };
+    const allFileTypes = Object.entries(fileTypesMap).reduce((arr, fileTypeArr, fileTypeIndex, map) => [
+        ...arr,
+        ...fileTypeArr[1]
+    ], []);
 
     export default {
         name: "BriUpload",
@@ -146,20 +145,21 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _fileType: "file", // "file", "image"
+                    _fileType: "file", // "file", "image", "video"
                     _showMode: this.isHeightAuto ? "old" : "inline", // 宽度为100%、且不在表格字段里的 显示老版
 
                     _multiple: true,
                     _useType: "drag",
                     _maxSize: 1024 * 1024 * 2, // 根据四局要求，限制文件为2G
                     _format: [],
+                    _accept: [],
 
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
             },
             subType () {
-                return this.selfPropsObj._fileType;
+                return this.selfPropsObj._fileType || "file";
             },
             showMode () {
                 return this.isInTable
@@ -179,9 +179,13 @@
             },
             // 限制文件格式
             accept () {
-                return (this.subType === "image" ? imageType : fileTypes)
-                    .map(type => `.${type}`)
-                    .join();
+                const types = this.selfPropsObj._accept && this.selfPropsObj._accept.length
+                    ? this.selfPropsObj._accept
+                    : this.subType === "file"
+                        ? allFileTypes
+                        : fileTypesMap[this.subType];
+
+                return types.map(type => `.${type}`).join();
             },
             isShowEditIcon () {
                 // 因为编辑name 需要这三个参数，因此没有这三个参数时不显示此按钮
@@ -251,10 +255,7 @@
             },
             dealUpload (files) {
                 if (!this.disabled) {
-                    let postFiles = Array.prototype.slice.call(files);
-                    if (!this.multipleMode) {
-                        postFiles = postFiles.slice(0, 1);
-                    }
+                    let postFiles = this.multipleMode ? [...files] : [...files].slice(0, 1);
                     postFiles.forEach(fileItem => {
                         if (
                             (!this.format.length || this.format.some(item => item.toLocaleLowerCase() === fileItem.name.split(".").pop().toLocaleLowerCase())) &&

package/src/components/controls/base/BriUpload/uploadMixin.js

@@ -50,9 +50,7 @@ export default {
         handlePost (file, callback) {
             this.$https({
                 url: this.computedUrlModule,
-                params: {
-                    token: this.$route.query && this.$route.query.token
-                },
+                params: {},
                 callback: res => {
                     this.inputType = "file";
                     if (res.ossType === "ali-oss") {