Browse Source

组件ImageUpload支持多图同时选择上传

tags/v3.5.0
RuoYi 3 years ago
parent
commit
c43565ef43
  1. 5
      ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
  2. 15
      ruoyi-ui/src/components/ImageUpload/index.vue

5
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java

@ -125,10 +125,7 @@ public class ScheduleUtils
int count = StringUtils.countMatches(packageName, "."); int count = StringUtils.countMatches(packageName, ".");
if (count > 1) if (count > 1)
{ {
if (!StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR)) return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR);
{
return false;
}
} }
return true; return true;
} }

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

@ -1,6 +1,7 @@
<template> <template>
<div class="component-upload-image"> <div class="component-upload-image">
<el-upload <el-upload
multiple
:action="uploadImgUrl" :action="uploadImgUrl"
list-type="picture-card" list-type="picture-card"
:on-success="handleUploadSuccess" :on-success="handleUploadSuccess"
@ -70,6 +71,8 @@ export default {
}, },
data() { data() {
return { return {
number: 0,
uploadList: [],
dialogImageUrl: "", dialogImageUrl: "",
dialogVisible: false, dialogVisible: false,
hideUpload: false, hideUpload: false,
@ -119,9 +122,14 @@ export default {
}, },
// //
handleUploadSuccess(res) { handleUploadSuccess(res) {
this.fileList.push({ name: res.data.url, url: res.data.url }); this.uploadList.push({ name: res.data.url, url: res.data.url });
this.$emit("input", this.listToString(this.fileList)); if (this.uploadList.length === this.number) {
this.loading.close(); this.fileList = this.fileList.concat(this.uploadList);
this.uploadList = [];
this.number = 0;
this.$emit("input", this.listToString(this.fileList));
this.loading.close();
}
}, },
// loading // loading
handleBeforeUpload(file) { handleBeforeUpload(file) {
@ -158,6 +166,7 @@ export default {
text: "上传中", text: "上传中",
background: "rgba(0, 0, 0, 0.7)", background: "rgba(0, 0, 0, 0.7)",
}); });
this.number++;
}, },
// //
handleExceed() { handleExceed() {

Loading…
Cancel
Save