From 88d9e2f721a1596c6e0e384aa8e1da5be3aa27dc Mon Sep 17 00:00:00 2001
From: PPPSCN <35696959@qq.com>
Date: Mon, 8 May 2017 20:27:59 +0800
Subject: [PATCH] 修复高级搜索和普通查询无法翻页的bug

---
 public/assets/js/bootstrap-table-advancedsearch.js | 11 +++++++++++
 public/assets/js/bootstrap-table-commonsearch.js   | 11 +++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/public/assets/js/bootstrap-table-advancedsearch.js b/public/assets/js/bootstrap-table-advancedsearch.js
index 4474012..5e45996 100644
--- a/public/assets/js/bootstrap-table-advancedsearch.js
+++ b/public/assets/js/bootstrap-table-advancedsearch.js
@@ -272,6 +272,17 @@
             });
             // 追加查询关键字
             this.options.pageNumber = 1;
+            this.options.queryParams = function (params) {
+                return {
+                    search: params.search,
+                    sort: params.sort,
+                    order: params.order,
+                    filter: JSON.stringify(filter),
+                    op: JSON.stringify(op),
+                    offset: params.offset,
+                    limit: params.limit,
+                };
+            };
             this.refresh({query: {filter: JSON.stringify(filter), op: JSON.stringify(op)}});
 
         } else {
diff --git a/public/assets/js/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js
index 1f03d75..faba564 100644
--- a/public/assets/js/bootstrap-table-commonsearch.js
+++ b/public/assets/js/bootstrap-table-commonsearch.js
@@ -301,6 +301,17 @@
             });
             // 追加查询关键字
             this.options.pageNumber = 1;
+            this.options.queryParams = function (params) {
+                return {
+                    search: params.search,
+                    sort: params.sort,
+                    order: params.order,
+                    filter: JSON.stringify(filter),
+                    op: JSON.stringify(op),
+                    offset: params.offset,
+                    limit: params.limit,
+                };
+            };
             this.refresh({query: {filter: JSON.stringify(filter), op: JSON.stringify(op)}});
 
         } else {
--
libgit2 0.24.0