From cb4a9861842a70466d8866553477e78f399b849b Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Sat, 29 Jun 2019 11:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?=
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-backend.min.js   | 6 ++++--
 public/assets/js/require-table.js         | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php
index 719d7c5e..0ed0b081 100644
--- a/application/common/controller/Backend.php
+++ b/application/common/controller/Backend.php
@@ -254,7 +254,7 @@ class Backend extends Controller
         $search = $this->request->get("search", '');
         $filter = $this->request->get("filter", '');
         $op = $this->request->get("op", '', 'trim');
-        $sort = $this->request->get("sort", $this->model->getPk() ?: 'id');
+        $sort = $this->request->get("sort", !empty($this->model) && $this->model->getPk() ?: 'id');
         $order = $this->request->get("order", "DESC");
         $offset = $this->request->get("offset", 0);
         $limit = $this->request->get("limit", 0);
diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js
index dd3db231..b6aca287 100644
--- a/public/assets/js/require-backend.min.js
+++ b/public/assets/js/require-backend.min.js
@@ -10012,7 +10012,9 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
                         return __('Choose');
                     }
                 }, locales);
-                $.fn.bootstrapTable.defaults.exportTypes = defaults.exportTypes;
+                if (typeof defaults.exportTypes != 'undefined') {
+                    $.fn.bootstrapTable.defaults.exportTypes = defaults.exportTypes;
+                }
             },
             // 绑定事件
             bindevent: function (table) {
@@ -10081,7 +10083,7 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
                     var field = $(this).closest("ul").data("field");
                     var value = $(this).data("value");
                     $("select[name='" + field + "'] option[value='" + value + "']", table.closest(".bootstrap-table").find(".commonsearch-table")).prop("selected", true);
-                    table.bootstrapTable('refresh', {pageNumber:1});
+                    table.bootstrapTable('refresh', {pageNumber: 1});
                     return false;
                 });
                 // 刷新按钮事件
diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js
index 34f5e605..7462d592 100644
--- a/public/assets/js/require-table.js
+++ b/public/assets/js/require-table.js
@@ -103,7 +103,9 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                         return __('Choose');
                     }
                 }, locales);
-                $.fn.bootstrapTable.defaults.exportTypes = defaults.exportTypes;
+                if (typeof defaults.exportTypes != 'undefined') {
+                    $.fn.bootstrapTable.defaults.exportTypes = defaults.exportTypes;
+                }
             },
             // 绑定事件
             bindevent: function (table) {
@@ -172,7 +174,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                     var field = $(this).closest("ul").data("field");
                     var value = $(this).data("value");
                     $("select[name='" + field + "'] option[value='" + value + "']", table.closest(".bootstrap-table").find(".commonsearch-table")).prop("selected", true);
-                    table.bootstrapTable('refresh', {pageNumber:1});
+                    table.bootstrapTable('refresh', {pageNumber: 1});
                     return false;
                 });
                 // 刷新按钮事件