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

树表格操作时保留ajaxParams初始参数

pull/383/MERGE
RuoYi 2022-04-22 10:04:01 +08:00
parent e4bc44115a
commit baa689b098
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js
View File

@ -182,7 +182,7 @@
$.ajax({ $.ajax({
type: options.type, type: options.type,
url: options.url, url: options.url,
data: parms ? parms : options.ajaxParams, data: $.extend(parms, options.ajaxParams),
dataType: "json", dataType: "json",
success: function(data, textStatus, jqXHR) { success: function(data, textStatus, jqXHR) {
data = calculateObjectValue(options, options.responseHandler, [data], data); data = calculateObjectValue(options, options.responseHandler, [data], data);
@ -728,7 +728,7 @@
$.ajax({ $.ajax({
type: options.type, type: options.type,
url: options.dataUrl, url: options.dataUrl,
data: parms ? parms : options.ajaxParams, data: $.extend(parms, options.ajaxParams),
dataType: "json", dataType: "json",
success: function(data, textStatus, jqXHR) { success: function(data, textStatus, jqXHR) {
$("#" + row_id + "_load").remove(); $("#" + row_id + "_load").remove();

2
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -647,7 +647,7 @@ var table = {
search: function(formId) { search: function(formId) {
var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
var params = $.common.formToJSON(currentId); var params = $.common.formToJSON(currentId);
$.bttTable.bootstrapTreeTable('refresh', params); $.bttTable.bootstrapTreeTable('refresh', $.extend(params, table.options.ajaxParams));
}, },
// 刷新 // 刷新
refresh: function() { refresh: function() {
@ -699,7 +699,7 @@ var table = {
} }
$("#" + tableId).bootstrapTable('refresh', params); $("#" + tableId).bootstrapTable('refresh', params);
} else if (table.options.type == table_type.bootstrapTreeTable) { } else if (table.options.type == table_type.bootstrapTreeTable) {
$("#" + tableId).bootstrapTreeTable('refresh', []); $("#" + tableId).bootstrapTreeTable('refresh', table.options.ajaxParams);
} }
if ($.common.isNotEmpty(startLayDate) && $.common.isNotEmpty(endLayDate)) { if ($.common.isNotEmpty(startLayDate) && $.common.isNotEmpty(endLayDate)) {
endLayDate.config.min.year = ''; endLayDate.config.min.year = '';