diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 2ad850b..3a83b3a 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -5,6 +5,7 @@ :action="uploadFileUrl" :before-upload="handleBeforeUpload" :file-list="fileList" + :data="data" :limit="limit" :on-error="handleUploadError" :on-exceed="handleExceed" @@ -44,6 +45,15 @@ import { getToken } from "@/utils/auth"; const props = defineProps({ modelValue: [String, Object, Array], + // 上传接口地址 + action: { + type: String, + default: "/common/upload" + }, + // 上传携带的参数 + data: { + type: Object + }, // 数量限制 limit: { type: Number, @@ -76,7 +86,7 @@ const emit = defineEmits(); const number = ref(0); const uploadList = ref([]); const baseUrl = import.meta.env.VITE_APP_BASE_API; -const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传文件服务器地址 +const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action); // 上传文件服务器地址 const headers = ref({ Authorization: "Bearer " + getToken() }); const fileList = ref([]); const showTip = computed( @@ -140,6 +150,7 @@ function handleExceed() { // 上传失败 function handleUploadError(err) { proxy.$modal.msgError("上传文件失败"); + proxy.$modal.closeLoading(); } // 上传成功回调 diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 90999e1..2bedc33 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -6,6 +6,7 @@ list-type="picture-card" :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload" + :data="data" :limit="limit" :on-error="handleUploadError" :on-exceed="handleExceed" @@ -51,6 +52,15 @@ import { isExternal } from "@/utils/validate"; const props = defineProps({ modelValue: [String, Object, Array], + // 上传接口地址 + action: { + type: String, + default: "/common/upload" + }, + // 上传携带的参数 + data: { + type: Object + }, // 图片数量限制 limit: { type: Number, @@ -80,7 +90,7 @@ const uploadList = ref([]); const dialogImageUrl = ref(""); const dialogVisible = ref(false); const baseUrl = import.meta.env.VITE_APP_BASE_API; -const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址 +const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action); // 上传的图片服务器地址 const headers = ref({ Authorization: "Bearer " + getToken() }); const fileList = ref([]); const showTip = computed(