Pre Merge pull request !401 from D哥/N/A

ruoyi-ui/src/components/FileUpload/index.vue

@@ -5,7 +5,6 @@
       :action="uploadFileUrl"
       :before-upload="handleBeforeUpload"
       :file-list="fileList"
-      :data="data"
       :limit="limit"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
@@ -49,15 +48,6 @@ export default {
   props: {
     // 值
     value: [String, Object, Array],
-    // 上传接口地址
-    action: {
-      type: String,
-      default: "/file/upload"
-    },
-    // 上传携带的参数
-    data: {
-      type: Object
-    },
     // 数量限制
     limit: {
       type: Number,
@@ -88,7 +78,7 @@ export default {
     return {
       number: 0,
       uploadList: [],
-      uploadFileUrl: process.env.VUE_APP_BASE_API + this.action, // 上传文件服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传文件服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },
@@ -162,7 +152,7 @@ export default {
     // 上传失败
     handleUploadError(err) {
       this.$modal.msgError("上传文件失败，请重试");
-      this.$modal.closeLoading();
+      this.$modal.closeLoading()
     },
     // 上传成功回调
     handleUploadSuccess(res, file) {

ruoyi-ui/src/components/ImageUpload/index.vue

@@ -6,7 +6,6 @@
       list-type="picture-card"
       :on-success="handleUploadSuccess"
       :before-upload="handleBeforeUpload"
-      :data="data"
       :limit="limit"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
@@ -49,15 +48,6 @@ import { getToken } from "@/utils/auth";
 export default {
   props: {
     value: [String, Object, Array],
-    // 上传接口地址
-    action: {
-      type: String,
-      default: "/file/upload"
-    },
-    // 上传携带的参数
-    data: {
-      type: Object
-    },
     // 图片数量限制
     limit: {
       type: Number,
@@ -86,7 +76,7 @@ export default {
       dialogImageUrl: "",
       dialogVisible: false,
       hideUpload: false,
-      uploadImgUrl: process.env.VUE_APP_BASE_API + this.action, // 上传的图片服务器地址
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },