From 69c28ca76450714fb17839f406973861a415d240 Mon Sep 17 00:00:00 2001
From: PPPSCN <35696959@qq.com>
Date: Fri, 5 May 2017 15:47:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4bootstrap-table=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/controller/Backend.php | 2 +-
 public/assets/js/require-table.js         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php
index b379b1f5..82a22729 100644
--- a/application/common/controller/Backend.php
+++ b/application/common/controller/Backend.php
@@ -162,7 +162,7 @@ class Backend extends Controller
         $sort = $this->request->get("sort", "id");
         $order = $this->request->get("order", "DESC");
         $offset = $this->request->get("offset", 0);
-        $limit = $this->request->get("limit", 10);
+        $limit = $this->request->get("limit", 0);
         $filter = json_decode($filter, TRUE);
         $op = json_decode($op, TRUE);
         $filter = $filter ? $filter : [];
diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js
index 4a1decbd..4d212af8 100644
--- a/public/assets/js/require-table.js
+++ b/public/assets/js/require-table.js
@@ -9,9 +9,14 @@ define(['jquery', 'bootstrap', 'backend', 'config', 'toastr', 'moment', 'bootstr
             method: 'get',
             toolbar: "#toolbar",
             search: true,
+            cache: false,
             advancedSearch: true,
             idTable: 'advancedTable',
             showExport: true,
+            exportDataType: "all",
+            exportTypes: ['json', 'xml', 'csv', 'txt', 'doc', 'excel'],
+            pageSize: 10,
+            pageList: [10, 25, 50, 'All'],
             pagination: true,
             clickToSelect: true,
             showRefresh: false,