mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

修复表格导出下拉列表显示

pull/133/MERGE
Karson 2019-06-29 11:02:34 +08:00
parent 8c76ac77a4
commit cb4a986184
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/common/controller/Backend.php
View File

@ -254,7 +254,7 @@ class Backend extends Controller
$search = $this->request->get("search", ''); $search = $this->request->get("search", '');
$filter = $this->request->get("filter", ''); $filter = $this->request->get("filter", '');
$op = $this->request->get("op", '', 'trim'); $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"); $order = $this->request->get("order", "DESC");
$offset = $this->request->get("offset", 0); $offset = $this->request->get("offset", 0);
$limit = $this->request->get("limit", 0); $limit = $this->request->get("limit", 0);

2
public/assets/js/require-backend.min.js vendored
View File

@ -10012,7 +10012,9 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
return __('Choose'); return __('Choose');
} }
}, locales); }, locales);
if (typeof defaults.exportTypes != 'undefined') {
$.fn.bootstrapTable.defaults.exportTypes = defaults.exportTypes; $.fn.bootstrapTable.defaults.exportTypes = defaults.exportTypes;
}
}, },
// 绑定事件 // 绑定事件
bindevent: function (table) { bindevent: function (table) {

2
public/assets/js/require-table.js
View File

@ -103,7 +103,9 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
return __('Choose'); return __('Choose');
} }
}, locales); }, locales);
if (typeof defaults.exportTypes != 'undefined') {
$.fn.bootstrapTable.defaults.exportTypes = defaults.exportTypes; $.fn.bootstrapTable.defaults.exportTypes = defaults.exportTypes;
}
}, },
// 绑定事件 // 绑定事件
bindevent: function (table) { bindevent: function (table) {