From a52a8a1a258245c9f67cbc860145925ca7551316 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Mon, 18 Sep 2017 21:15:05 +0800
Subject: [PATCH] 修复搜索时部分参数被过滤的BUG
---
public/assets/js/bootstrap-table-commonsearch.js | 4 ++--
public/assets/js/require-backend.min.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/public/assets/js/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js
index 731220c..d943626 100644
--- a/public/assets/js/bootstrap-table-commonsearch.js
+++ b/public/assets/js/bootstrap-table-commonsearch.js
@@ -367,8 +367,8 @@
var params = getQueryParams(this.options.queryParams({}), searchQuery, true);
this.trigger('common-search', this, params, searchQuery);
this.options.pageNumber = 1;
- this.options.queryParams = function () {
- return params;
+ this.options.queryParams = function (options) {
+ return $.extend({}, options, params);
};
this.refresh({query: params});
};
diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js
index 8865483..66c332a 100644
--- a/public/assets/js/require-backend.min.js
+++ b/public/assets/js/require-backend.min.js
@@ -9275,8 +9275,8 @@ return d.keepInvalid=a,l},l.datepickerInput=function(a){if(0===arguments.length)
var params = getQueryParams(this.options.queryParams({}), searchQuery, true);
this.trigger('common-search', this, params, searchQuery);
this.options.pageNumber = 1;
- this.options.queryParams = function () {
- return params;
+ this.options.queryParams = function (options) {
+ return $.extend({}, options, params);
};
this.refresh({query: params});
};
--
libgit2 0.24.0