github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修复页面存在多表格，回调函数res数据不正确问题

pull/197/MERGE
RuoYi 2020-08-17 10:00:26 +08:00
parent a4b0a7c0bb
commit 03174f1ead
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
View File

@ -51,7 +51,7 @@ public class CommonController
String filePath = Global.getDownloadPath() + fileName;
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
FileUtils.setAttachmentResponseHeader(response,realFileName);
FileUtils.setAttachmentResponseHeader(response, realFileName);
FileUtils.writeBytes(filePath, response.getOutputStream());
if (delete)
@ -105,7 +105,7 @@ public class CommonController
String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
FileUtils.setAttachmentResponseHeader(response,downloadName);
FileUtils.setAttachmentResponseHeader(response, downloadName);
FileUtils.writeBytes(downloadPath, response.getOutputStream());
}

4
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -162,8 +162,8 @@ var table = {
},
// 请求获取数据后处理回调函数
responseHandler: function(res) {
if (typeof table.options.responseHandler == "function") {
table.options.responseHandler(res);
if (typeof table.get(this.id).responseHandler == "function") {
table.get(this.id).responseHandler(res);
}
if (res.code == 0) {
if ($.common.isNotEmpty(table.options.sidePagination) && table.options.sidePagination == 'client') {