diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index bca6ca82d..9b2a6af8c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -81,6 +81,7 @@ public class CommonController String url = serverConfig.getUrl() + fileName; AjaxResult ajax = AjaxResult.success(); ajax.put("fileName", fileName); + ajax.put("originalFilename", file.getOriginalFilename()); ajax.put("url", url); return ajax; } diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js index 0fee47b52..06e0c90dd 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js @@ -458,11 +458,12 @@ $.ajaxSetup({ //上传文件 -function uploadFile(async, id) { +function uploadFile(async, filePathId, fileNameId) { + let res = -1; var formData = new FormData(); if ($('#filePath')[0].files[0] == null) { $.modal.alertWarning("请先选择文件路径"); - return false; + return res; } formData.append('fileName', $("#fileName").val()); formData.append('file', $('#filePath')[0].files[0]); @@ -477,15 +478,23 @@ function uploadFile(async, id) { async: async, success: function(result) { if (result.code == web_status.SUCCESS && id) { - $('#' + id).val(result.url); + if (filePathId) { + $('#' + filePathId).val(result.url); + } + if (fileNameId) { + $('#' + fileNameId).val(result.fileName); + } + } else { $.modal.alertError(result.msg); - return; } + + res = result.code; }, error: function(error) { $.modal.alertWarning("图片上传失败。"); - return; } }); + + return res; } \ No newline at end of file diff --git a/ruoyi-front/src/main/resources/templates/front/cases/add.html b/ruoyi-front/src/main/resources/templates/front/cases/add.html index b0f13878a..1d45864ff 100644 --- a/ruoyi-front/src/main/resources/templates/front/cases/add.html +++ b/ruoyi-front/src/main/resources/templates/front/cases/add.html @@ -65,7 +65,10 @@ function submitHandler() { if ($.validate.form()) { //同步上传图片,并且将上传图片返回的地址,赋值到pictureUrl对应的隐藏域上 - uploadFile(false, "pictureUrl"); + let result = uploadFile(false, "pictureUrl"); + if (result != web_status.SUCCESS) { + return; + } $.operate.save(prefix + "/add", $("#form-cases-add").serialize()); } } diff --git a/ruoyi-front/src/main/resources/templates/front/cases/edit.html b/ruoyi-front/src/main/resources/templates/front/cases/edit.html index fefd270a6..3b4c61382 100644 --- a/ruoyi-front/src/main/resources/templates/front/cases/edit.html +++ b/ruoyi-front/src/main/resources/templates/front/cases/edit.html @@ -66,7 +66,10 @@ function submitHandler() { if ($.validate.form()) { //同步上传图片,并且将上传图片返回的地址,赋值到pictureUrl对应的隐藏域上 - uploadFile(false, "pictureUrl"); + let result = uploadFile(false, "pictureUrl"); + if (result != web_status.SUCCESS) { + return; + } $.operate.save(prefix + "/edit", $('#form-cases-edit').serialize()); } } diff --git a/ruoyi-front/src/main/resources/templates/front/contract_template/add.html b/ruoyi-front/src/main/resources/templates/front/contract_template/add.html index 17f46ba13..49c8e8ac5 100644 --- a/ruoyi-front/src/main/resources/templates/front/contract_template/add.html +++ b/ruoyi-front/src/main/resources/templates/front/contract_template/add.html @@ -39,6 +39,7 @@