From a52a8a1a258245c9f67cbc860145925ca7551316 Mon Sep 17 00:00:00 2001 From: Karson Date: Mon, 18 Sep 2017 21:15:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2=E6=97=B6?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=8F=82=E6=95=B0=E8=A2=AB=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 731220c6..d9436269 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 8865483c..66c332ab 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}); };