From b426fb7a65df0a9fad76e22ac2c89a304c4677d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Sun, 25 Jul 2021 22:49:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=A1=B9=E7=9B=AE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Auth.php | 4 +- app/admin/controller/Oplog.php | 3 +- app/admin/view/auth/form.html | 12 +- app/admin/view/auth/index.html | 120 ++++++++++--------- app/admin/view/auth/index_search.html | 3 +- app/admin/view/config/index.html | 12 +- app/admin/view/config/storage-alioss.html | 2 +- app/admin/view/config/storage-local.html | 2 +- app/admin/view/config/storage-qiniu.html | 2 +- app/admin/view/config/storage-txcos.html | 2 +- app/admin/view/config/system.html | 2 +- app/admin/view/index/index-left.html | 4 +- app/admin/view/main.html | 6 +- app/admin/view/menu/form.html | 2 +- app/admin/view/menu/index.html | 2 +- app/admin/view/module/change.html | 2 +- app/admin/view/module/index_search.html | 2 +- app/admin/view/oplog/index.html | 4 +- app/admin/view/oplog/index_search.html | 2 +- app/admin/view/queue/index.html | 2 +- app/admin/view/queue/index_search.html | 2 +- app/admin/view/user/form.html | 4 +- app/admin/view/user/index.html | 2 +- app/admin/view/user/index_search.html | 3 +- app/admin/view/user/pass.html | 4 +- public/index.php | 2 + public/static/admin.js | 70 ++++++----- public/static/theme/css/console.config.less | 2 + public/static/theme/css/console.css | 2 +- public/static/theme/css/console.css.map | 2 +- public/static/theme/css/console.display.less | 49 ++++++-- public/static/theme/css/console.layout.less | 40 +++---- think | 6 +- 33 files changed, 211 insertions(+), 167 deletions(-) diff --git a/app/admin/controller/Auth.php b/app/admin/controller/Auth.php index 1826e218c..c18441bea 100644 --- a/app/admin/controller/Auth.php +++ b/app/admin/controller/Auth.php @@ -45,7 +45,7 @@ class Auth extends Controller { $this->title = '系统权限管理'; $query = $this->_query($this->table)->dateBetween('create_at'); - $query->like('title,desc')->equal('status')->order('sort desc,id desc')->page(); + $query->like('title,desc')->equal('status')->layTable(); } /** @@ -81,7 +81,6 @@ class Auth extends Controller */ public function state() { - $this->_applyFormToken(); $this->_save($this->table, $this->_vali([ 'status.in:0,1' => '状态值范围异常！', 'status.require' => '状态值不能为空！', @@ -125,7 +124,6 @@ class Auth extends Controller */ public function remove() { - $this->_applyFormToken(); $this->_delete($this->table); } diff --git a/app/admin/controller/Oplog.php b/app/admin/controller/Oplog.php index f19e144cf..f9e86be9c 100644 --- a/app/admin/controller/Oplog.php +++ b/app/admin/controller/Oplog.php @@ -48,7 +48,8 @@ class Oplog extends Controller $this->title = '系统日志管理'; $this->isSupper = AdminService::instance()->isSuper(); $this->actions = $this->app->db->name($this->table)->distinct(true)->column('action'); - $query = $this->_query($this->table)->dateBetween('create_at')->order('id desc'); + // 数据列表处理 + $query = $this->_query($this->table)->dateBetween('create_at'); $query->like('action,node,content,username,geoip')->layTable(); } diff --git a/app/admin/view/auth/form.html b/app/admin/view/auth/form.html index e9706e46a..c895e211e 100644 --- a/app/admin/view/auth/form.html +++ b/app/admin/view/auth/form.html @@ -1,18 +1,18 @@ -
+
diff --git a/app/admin/view/auth/index.html b/app/admin/view/auth/index.html index 6f04091a0..6bfe7d04a 100644 --- a/app/admin/view/auth/index.html +++ b/app/admin/view/auth/index.html @@ -1,4 +1,4 @@ -{extend name='main'} +{extend name='table'} {block name="button"} @@ -6,67 +6,73 @@ - + {/block} {block name="content"}
{include file='auth/index_search'} - - {notempty name='list'} - - - - - - - - - - - - {/notempty} - - {foreach $list as $key => $vo} - - - - - - - - - - {/foreach} - -
- - - - 权限名称权限描述创建时间使用状态
- - - - {$vo.title|default='-'}{$vo.desc|default="没有写描述哦！"}{$vo.create_at|format_datetime}{eq name='vo.status' value='0'}已禁用{else}已激活{/eq} - - 编 辑 - - - - 授 权 - - - - 禁 用 - - 激 活 - - - - 删 除 - -
- {empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} +
+{/block} + +{block name='script'} + + + + + + + + + + {/block} \ No newline at end of file diff --git a/app/admin/view/auth/index_search.html b/app/admin/view/auth/index_search.html index d092100fb..cf2d04ddc 100644 --- a/app/admin/view/auth/index_search.html +++ b/app/admin/view/auth/index_search.html @@ -1,6 +1,7 @@
条件搜索 - + +
diff --git a/app/admin/view/config/index.html b/app/admin/view/config/index.html index ee10e59b9..28a57e802 100644 --- a/app/admin/view/config/index.html +++ b/app/admin/view/config/index.html @@ -119,27 +119,27 @@ - + - + - + - + - + - + diff --git a/app/admin/view/config/storage-alioss.html b/app/admin/view/config/storage-alioss.html index d5e5917e7..a819600af 100644 --- a/app/admin/view/config/storage-alioss.html +++ b/app/admin/view/config/storage-alioss.html @@ -1,4 +1,4 @@ - +
diff --git a/app/admin/view/config/storage-local.html b/app/admin/view/config/storage-local.html index f172dda0f..9d55964ea 100644 --- a/app/admin/view/config/storage-local.html +++ b/app/admin/view/config/storage-local.html @@ -1,4 +1,4 @@ - +
diff --git a/app/admin/view/config/storage-qiniu.html b/app/admin/view/config/storage-qiniu.html index cf2177f23..9b60c76ab 100644 --- a/app/admin/view/config/storage-qiniu.html +++ b/app/admin/view/config/storage-qiniu.html @@ -1,4 +1,4 @@ - +
diff --git a/app/admin/view/config/storage-txcos.html b/app/admin/view/config/storage-txcos.html index 72127db19..8f0817b42 100644 --- a/app/admin/view/config/storage-txcos.html +++ b/app/admin/view/config/storage-txcos.html @@ -1,4 +1,4 @@ - +
diff --git a/app/admin/view/config/system.html b/app/admin/view/config/system.html index a13c356fd..0417031da 100644 --- a/app/admin/view/config/system.html +++ b/app/admin/view/config/system.html @@ -1,4 +1,4 @@ - +
diff --git a/app/admin/view/index/index-left.html b/app/admin/view/index/index-left.html index 85bcc48ca..ce89d2d32 100644 --- a/app/admin/view/index/index-left.html +++ b/app/admin/view/index/index-left.html @@ -11,7 +11,7 @@ {foreach $one.sub as $two}{empty name='two.sub'}
  • - + {$two.title|default=''}
    • @@ -25,7 +25,7 @@ {foreach $two.sub as $thr}
    - + {$thr.title|default=''}
    diff --git a/app/admin/view/main.html b/app/admin/view/main.html index 2f52b14dc..12d21462f 100644 --- a/app/admin/view/main.html +++ b/app/admin/view/main.html @@ -1,11 +1,13 @@
    {block name='style'}{/block} - {block name='header'}{notempty name='title'} + {block name='header'} + {notempty name='title'}
    {$title|default=''}
    {block name='button'}{/block}
    - {/notempty}{/block} + {/notempty} + {/block}
    {block name='content'}{/block} diff --git a/app/admin/view/menu/form.html b/app/admin/view/menu/form.html index 31c670ff6..c7faac4ac 100644 --- a/app/admin/view/menu/form.html +++ b/app/admin/view/menu/form.html @@ -1,4 +1,4 @@ - +
    diff --git a/app/admin/view/menu/index.html b/app/admin/view/menu/index.html index e6d0a8b33..7fcc67df8 100644 --- a/app/admin/view/menu/index.html +++ b/app/admin/view/menu/index.html @@ -50,7 +50,7 @@
    diff --git a/app/admin/view/module/change.html b/app/admin/view/module/change.html index 048c6f3a4..886c21a31 100644 --- a/app/admin/view/module/change.html +++ b/app/admin/view/module/change.html @@ -1,4 +1,4 @@ - +
    diff --git a/app/admin/view/module/index_search.html b/app/admin/view/module/index_search.html index c148825bc..a8bef409e 100644 --- a/app/admin/view/module/index_search.html +++ b/app/admin/view/module/index_search.html @@ -1,6 +1,6 @@
    条件搜索 - +
    diff --git a/app/admin/view/oplog/index.html b/app/admin/view/oplog/index.html index 47e51695d..15cda4e24 100644 --- a/app/admin/view/oplog/index.html +++ b/app/admin/view/oplog/index.html @@ -33,13 +33,13 @@ {field: 'create_at', title: '操作时间', sort: true}, {toolbar: '#toolbar', align: 'center'} ]] - }); + }).trigger('setFullHeight'); }); {/block} \ No newline at end of file diff --git a/app/admin/view/oplog/index_search.html b/app/admin/view/oplog/index_search.html index 14d2960e6..23362095d 100644 --- a/app/admin/view/oplog/index_search.html +++ b/app/admin/view/oplog/index_search.html @@ -1,6 +1,6 @@
    条件搜索 - +
    {include file='queue/index_search'} -
    核心框架核心框架 ThinkPHP Version {$app->version()}
    管理程序管理程序 ThinkAdmin Version {$version|default='6.0.0'}
    服务器信息服务器信息 {:php_uname()}
    服务器软件服务器软件 {$request->server('SERVER_SOFTWARE',php_sapi_name())}
    PHP 版本PHP 版本 PHP Version {$Think.const.PHP_VERSION}
    MySQL 版本MySQL 版本 MySQL Version {$app->db->query('SELECT VERSION()')[0]['VERSION()']}
    - + {$vo.spl|raw}{$vo.title}
    +
    {notempty name='list'} diff --git a/app/admin/view/queue/index_search.html b/app/admin/view/queue/index_search.html index cd5082e12..33e13d7a5 100644 --- a/app/admin/view/queue/index_search.html +++ b/app/admin/view/queue/index_search.html @@ -13,7 +13,7 @@
    条件搜索 - +
    - +
    diff --git a/app/admin/view/user/index_search.html b/app/admin/view/user/index_search.html index 448ce5038..d0f7fe40d 100644 --- a/app/admin/view/user/index_search.html +++ b/app/admin/view/user/index_search.html @@ -1,6 +1,6 @@
    条件搜索 - +
    +
    diff --git a/app/admin/view/user/pass.html b/app/admin/view/user/pass.html index 3de541946..f01eccf7d 100644 --- a/app/admin/view/user/pass.html +++ b/app/admin/view/user/pass.html @@ -1,11 +1,11 @@ -
    +