浏览代码

修复搜索时部分参数被过滤的BUG

Karson 8 年之前
父节点
当前提交
a52a8a1a25
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      public/assets/js/bootstrap-table-commonsearch.js
  2. 2 2
      public/assets/js/require-backend.min.js

+ 2 - 2
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});
     };

+ 2 - 2
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});
     };