diff --git a/app/common/controller/AdminController.php b/app/common/controller/AdminController.php index 8bf8c6a..d61ab96 100644 --- a/app/common/controller/AdminController.php +++ b/app/common/controller/AdminController.php @@ -212,7 +212,7 @@ class AdminController extends BaseController */ protected function buildTableParames($excludeFields = []) { - $get = $this->request->get('', null, null); + $get = $this->request->get('', null, []); $page = isset($get['page']) && !empty($get['page']) ? $get['page'] : 1; $limit = isset($get['limit']) && !empty($get['limit']) ? $get['limit'] : 15; $group = isset($get['group']) && !empty($get['group']) ? $get['group'] : null; diff --git a/public/static/admin/js/system/admin.js b/public/static/admin/js/system/admin.js index 26ab947..6070808 100644 --- a/public/static/admin/js/system/admin.js +++ b/public/static/admin/js/system/admin.js @@ -47,6 +47,7 @@ define(["jquery", "easy-admin"], function ($, ea) { 'edit', [{ text: '设置密码', + titleField: 'username', url: init.password_url, method: 'open', auth: 'password', diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js index 645838f..ba9d587 100644 --- a/public/static/plugs/easy-admin/easy-admin.js +++ b/public/static/plugs/easy-admin/easy-admin.js @@ -778,15 +778,24 @@ define(["jquery", "ckeditor", 'miniTheme', 'tableData', 'citypicker', 'tagInput' operat.title = operat.title || operat.text; operat.text = operat.text || operat.title; - var titleEndfix = ''; if (typeof operat.titleField == 'function') { - titleEndfix = operat.titleField(data) + console.log(operat.titleField(data, operat)); + titleEndfix = operat.titleField(data, operat) + } else if (data[operat.titleField]) { titleEndfix = '-' + data[operat.titleField]; } + if (typeof operat.text == 'function') { + operat.text = operat.text(data, operat) + } + + if (typeof operat.title == 'function') { + operat.title = operat.title(data, operat) + } + var formatOperat = operat; formatOperat.icon = formatOperat.icon !== '' ? ' ' : ''; formatOperat.class = formatOperat.class !== '' ? 'class="' + formatOperat.class + '" ' : '';