From aa596bd80dfadd43a2e57b188fb491bffacd3b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Thu, 12 Aug 2021 16:51:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Auth.php | 14 +- app/admin/controller/Base.php | 3 +- app/admin/controller/Menu.php | 4 +- app/admin/controller/User.php | 2 - app/admin/model/SystemBase.php | 2 +- app/admin/model/SystemQueue.php | 14 + app/admin/model/SystemUser.php | 14 + app/admin/view/base/index.html | 2 +- app/admin/view/queue/index.html | 22 +- app/admin/view/queue/index_search.html | 4 +- app/admin/view/user/index_search.html | 2 +- app/admin/view/user/pass.html | 2 +- public/static/admin.js | 155 ++++++----- public/static/plugs/layui_exts/excel.js | 3 +- public/static/plugs/layui_exts/tableSelect.js | 255 ++++++++++++++++++ public/static/theme/css/console.config.less | 7 +- public/static/theme/css/console.css | 2 +- public/static/theme/css/console.css.map | 2 +- public/static/theme/css/console.custom.less | 181 +++++++++++-- public/static/theme/css/console.display.less | 144 +++------- public/static/theme/css/console.layout.less | 11 +- 21 files changed, 612 insertions(+), 233 deletions(-) create mode 100644 public/static/plugs/layui_exts/tableSelect.js diff --git a/app/admin/controller/Auth.php b/app/admin/controller/Auth.php index adeb29a6c..3d1ceefce 100644 --- a/app/admin/controller/Auth.php +++ b/app/admin/controller/Auth.php @@ -61,7 +61,6 @@ class Auth extends Controller */ public function add() { - $this->_applyFormToken(); $this->_form($this->table, 'form'); } @@ -74,7 +73,6 @@ class Auth extends Controller */ public function edit() { - $this->_applyFormToken(); $this->_form($this->table, 'form'); } @@ -116,11 +114,21 @@ class Auth extends Controller sysoplog('系统权限管理', "配置系统权限[{$map['auth']}]授权成功"); $this->success('访问权限修改成功！', 'javascript:history.back()'); } else { - $this->title = '权限配置节点'; $this->_form($this->table, 'apply'); } } + /** + * 表单后置数据处理 + * @param array $data + */ + protected function _apply_form_filter(array &$data) + { + if ($this->request->isGet()) { + $this->title = "编辑【{$data['title']}】授权"; + } + } + /** * 删除系统权限 * @auth true diff --git a/app/admin/controller/Base.php b/app/admin/controller/Base.php index 934cb7790..697a1ff04 100644 --- a/app/admin/controller/Base.php +++ b/app/admin/controller/Base.php @@ -48,7 +48,8 @@ class Base extends Controller $this->types = (new SystemBase)->types(); $this->type = input('get.type') ?: ($this->types[0] ?? '-'); }, function (QueryHelper $query) { - $query->where(['deleted' => 0])->equal('type')->like('code,name,status')->dateBetween('create_at'); + $query->where(['deleted' => 0])->equal('type'); + $query->like('code,name,status')->dateBetween('create_at'); }); } diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php index 2e1860404..b724f3b7a 100644 --- a/app/admin/controller/Menu.php +++ b/app/admin/controller/Menu.php @@ -171,7 +171,7 @@ class Menu extends Controller if ($result) { $id = $this->app->db->name($this->table)->getLastInsID(); sysoplog('系统菜单管理', "添加系统菜单[{$id}]成功"); - $this->success('系统菜单添加成功！', 'javascript:location.reload()'); + $this->success('系统菜单添加成功！'); } } @@ -184,7 +184,7 @@ class Menu extends Controller if ($result) { $id = input('id') ?: 0; sysoplog('系统菜单管理', "修改系统菜单[{$id}]成功"); - $this->success('系统菜单修改成功！', 'javascript:location.reload()'); + $this->success('系统菜单修改成功！'); } } diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index db6147a34..1253ebdaa 100644 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -96,7 +96,6 @@ class User extends Controller */ public function add() { - $this->_applyFormToken(); $this->_form($this->table, 'form'); } @@ -109,7 +108,6 @@ class User extends Controller */ public function edit() { - $this->_applyFormToken(); $this->_form($this->table, 'form'); } diff --git a/app/admin/model/SystemBase.php b/app/admin/model/SystemBase.php index 4f41f1e14..35a369131 100644 --- a/app/admin/model/SystemBase.php +++ b/app/admin/model/SystemBase.php @@ -37,7 +37,7 @@ class SystemBase extends Model public function items(string $type, array &$data = [], string $field = 'base_code', string $bind = 'base_info'): array { $map = ['status' => 1, 'deleted' => 0, 'type' => $type]; - $bases = $this->where($map)->order('sort desc,id desc')->column('code,name,content', 'code'); + $bases = $this->where($map)->order('sort desc,id asc')->column('code,name,content', 'code'); if (count($data) > 0) foreach ($data as &$vo) $vo[$bind] = $bases[$vo[$field]] ?? []; return $bases; } diff --git a/app/admin/model/SystemQueue.php b/app/admin/model/SystemQueue.php index 3c016da26..16a0e0954 100644 --- a/app/admin/model/SystemQueue.php +++ b/app/admin/model/SystemQueue.php @@ -1,5 +1,19 @@ 0) { return d.exec_time + ' ( 每 ' + d.loops_time + ' 秒 ) '; } else { @@ -82,8 +83,9 @@ } }, { - field: 'enter_time', title: '执行时间', minWidth: 180, templet: function (d) { - d.enter_time = d.enter_time || '', d.outer_time = d.outer_time || '0.0000'; + field: 'enter_time', title: '执行时间', minWidth: 175, templet: function (d) { + d.enter_time = d.enter_time || ''; + d.outer_time = d.outer_time || '0.0000'; if (d.enter_time.length > 12) { return d.enter_time.substr(12) + ' ( 耗时 ' + d.outer_time + ' )'; } else { @@ -94,7 +96,7 @@ {field: 'attempts', title: '执行次数', width: 95, align: 'center', sort: true, templet: "
{{d.attempts||0}}
"}, {field: 'exec_desc', title: '执行结果', minWidth: 180}, {field: 'create_at', title: '创建时间', minWidth: 170}, - {toolbar: '#toolbar', title: '操作面板', align: 'left', fixed: 'right', minWidth: 225} + {toolbar: '#toolbar', title: '操作面板', fixed: 'right', minWidth: 235} ]] }); }); @@ -102,13 +104,15 @@