Jeecg-Boot 2.1.4 版本发布 | 重构较大,较多新功能

ant-design-vue-jeecg/src/components/jeecg/JUpload.vue

@@ -4,11 +4,12 @@
     :multiple="true"
     :action="uploadAction"
     :headers="headers"
-    :data="{'isup':1,'bizPath':bizPath}"
+    :data="{'biz':bizPath}"
     :fileList="fileList"
     :beforeUpload="beforeUpload"
     @change="handleChange"
-    :disabled="disabled">
+    :disabled="disabled"
+    :returnUrl="returnUrl">
     <a-button>
       <a-icon type="upload" />{{ text }}
     </a-button>
@@ -19,6 +20,7 @@
 
   import Vue from 'vue'
   import { ACCESS_TOKEN } from "@/store/mutation-types"
+  import { getFileAccessHttpUrl } from '@/api/manage';
 
   const FILE_TYPE_ALL = "all"
   const FILE_TYPE_IMG = "image"
@@ -38,9 +40,10 @@
     data(){
       return {
         uploadAction:window._CONFIG['domianURL']+"/sys/common/upload",
-        urlDownload:window._CONFIG['domianURL'] + "/sys/common/download/",
+        urlDownload:window._CONFIG['staticDomainURL'],
         headers:{},
-        fileList: []
+        fileList: [],
+        newFileList: [],
       }
     },
     props:{
@@ -77,11 +80,25 @@
         required: false,
         default: false
       },
+      /**
+       * update -- author:lvdandan -- date:20190219 -- for:Jupload组件增加是否返回url，
+       * true：仅返回url
+       * false：返回fileName filePath fileSize
+       */
+      returnUrl:{
+        type:Boolean,
+        required:false,
+        default: true
+      },
     },
     watch:{
       value(val){
         if (val instanceof Array) {
-          this.initFileList(val.join(','))
+          if(this.returnUrl){
+            this.initFileList(val.join(','))
+          }else{
+            this.initFileListArr(val);
+          }
         } else {
           this.initFileList(val)
         }
@@ -93,6 +110,26 @@
     },
 
     methods:{
+      initFileListArr(val){
+        if(!val || val.length==0){
+          this.fileList = [];
+          return;
+        }
+        let fileList = [];
+        for(var a=0;a<val.length;a++){
+          fileList.push({
+            uid:uidGenerator(),
+            name:val[a].fileName,
+            status: 'done',
+            url: val[a].filePath,
+            response:{
+              status:"history",
+              message:val[a].filePath
+            }
+          })
+        }
+        this.fileList = fileList
+      },
       initFileList(paths){
         if(!paths || paths.length==0){
           //return [];
@@ -104,11 +141,12 @@
         let fileList = [];
         let arr = paths.split(",")
         for(var a=0;a<arr.length;a++){
+          let url = getFileAccessHttpUrl(arr[a],this.urlDownload,"http");
           fileList.push({
             uid:uidGenerator(),
             name:getFileName(arr[a]),
             status: 'done',
-            url: this.urlDownload+arr[a],
+            url: url,
             response:{
               status:"history",
               message:arr[a]
@@ -156,12 +194,13 @@
           if(info.file.response.success){
             fileList = fileList.map((file) => {
               if (file.response) {
-                file.url = this.urlDownload+file.response.message;
+                let reUrl = file.response.message;
+                file.url = getFileAccessHttpUrl(reUrl,this.urlDownload,"http");
               }
               return file;
             });
           }
-          this.$message.success(`${info.file.name} 上传成功!`);
+          //this.$message.success(`${info.file.name} 上传成功!`);
         }else if (info.file.status === 'error') {
           this.$message.error(`${info.file.name} 上传失败.`);
         }else if(info.file.status === 'removed'){
@@ -169,7 +208,26 @@
         }
         this.fileList = fileList
         if(info.file.status==='done' || info.file.status === 'removed'){
-          this.handlePathChange()
+          //returnUrl为true时仅返回文件路径
+          if(this.returnUrl){
+            this.handlePathChange()
+          }else{
+            //returnUrl为false时返回文件名称、文件路径及文件大小
+            fileList = fileList.filter((file) => {
+              if (file.response) {
+                return file.response.success === true;
+              }
+              return false;
+            }).map((file) => {
+              var fileJson = {
+                fileName:file.name,
+                filePath:file.url,
+                fileSize:file.size
+              };
+              this.newFileList.push(fileJson);
+              this.$emit('change', this.newFileList);
+            });
+          }
         }
       },
       handleDelete(file){