diff --git a/app/admin/controller/Oplog.php b/app/admin/controller/Oplog.php index 5846737e9..f19e144cf 100644 --- a/app/admin/controller/Oplog.php +++ b/app/admin/controller/Oplog.php @@ -16,8 +16,10 @@ namespace app\admin\controller; +use Exception; use think\admin\Controller; use think\admin\service\AdminService; +use think\exception\HttpResponseException; /** * 系统日志管理 @@ -47,21 +49,22 @@ class Oplog extends Controller $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->like('action,node,content,username,geoip')->page(); + $query->like('action,node,content,username,geoip')->layTable(); } /** * 列表数据处理 * @auth true * @param array $data - * @throws \Exception + * @throws Exception */ protected function _index_page_filter(array &$data) { - $ip = new \Ip2Region(); + $region = new \Ip2Region(); foreach ($data as &$vo) { - $isp = $ip->btreeSearch($vo['geoip']); - $vo['isp'] = str_replace(['内网IP', '0', '|'], '', $isp['region'] ?? ''); + $isp = $region->btreeSearch($vo['geoip']); + $vo['geoisp'] = str_replace(['内网IP', '0', '|'], '', $isp['region'] ?? '') ?: '-'; + $vo['create_at'] = format_datetime($vo['create_at']); } } @@ -75,9 +78,9 @@ class Oplog extends Controller $this->_query($this->table)->empty(); sysoplog('系统运维管理', '成功清理所有日志数据'); $this->success('日志清理成功！'); - } catch (\think\exception\HttpResponseException $exception) { + } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error("日志清理失败，{$exception->getMessage()}"); } } @@ -89,7 +92,6 @@ class Oplog extends Controller */ public function remove() { - $this->_applyFormToken(); $this->_delete($this->table); } diff --git a/app/admin/view/oplog/index.html b/app/admin/view/oplog/index.html index 24f53c091..bc4a3d956 100644 --- a/app/admin/view/oplog/index.html +++ b/app/admin/view/oplog/index.html @@ -4,60 +4,34 @@ - - + {/block} {block name="content"}
{include file='oplog/index_search'} - - {notempty name='list'} - - - - - - - - - - - - {foreach $list as $key=>$vo} - - - - - - - - - {/foreach} - - {/notempty} -
- - 操作权限操作行为地理位置操作时间
- - - 操作账号：{$vo.username|default='-'}
- 操作节点：{$vo.node|default='-'} - 		-

{$vo.action|default='-'}

-

{$vo.content|default='-'}

- 		-

{$vo.geoip|default='-'}

-

{$vo.isp|default='-'}

- 		- 日期：{$vo.create_at|format_datetime|str_replace=' ','
时间：',###|raw} - 		- - 删 除 - -
- {empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} +
{/block} + +{block name='script'} + +{/block} \ No newline at end of file diff --git a/public/static/admin.js b/public/static/admin.js index 97a175620..08479d024 100644 --- a/public/static/admin.js +++ b/public/static/admin.js @@ -102,16 +102,34 @@ $(function () { /*! 读取 data-rule 绑定 table 值 */ function applyRuleValue(elem, data) { - var rule = elem.dataset.value || (function (rule, array) { - $(elem.dataset.target || 'input[type=checkbox].list-check-box').map(function () { - this.checked && array.push(this.value); + // 新 tableId 规则兼容处理 + if (elem.dataset.tableId && elem.dataset.rule) { + var idx1, idx2, temp, regx, field, rule = {}; + var json = layui.table.checkStatus(elem.dataset.tableId).data; + layui.each(elem.dataset.rule.split(';'), function (idx, item, attr) { + (attr = item.split('#', 2)), rule[attr[0]] = attr[1]; }); - return array.length > 0 ? rule.replace('{key}', array.join(',')) : ''; - })(elem.dataset.rule || '', []) || ''; - if (rule.length < 1) return $.msg.tips('请选择需要更改的数据！'), false; - return rule.split(';').forEach(function (item) { - data[item.split('#')[0]] = item.split('#')[1]; - }), data; + for (idx1 in rule) { + temp = [], regx = new RegExp(/^{(.*?)}$/); + if (regx.test(rule[idx1]) && (field = rule[idx1].replace(regx, '$1'))) { + for (idx2 in json) if (json[idx2][field]) temp.push(json[idx2][field]); + if (temp.length < 1) return $.msg.tips('请选择需要更改的数据！'), false; + data[idx1] = temp.join(','); + } + } + return data; + } else { + var value = elem.dataset.value || (function (rule, array) { + $(elem.dataset.target || 'input[type=checkbox].list-check-box').map(function () { + this.checked && array.push(this.value); + }); + return array.length > 0 ? rule.replace('{key}', array.join(',')) : ''; + })(elem.dataset.rule || '', []) || ''; + if (value.length < 1) return $.msg.tips('请选择需要更改的数据！'), false; + return value.split(';').forEach(function (item) { + data[item.split('#')[0]] = item.split('#')[1]; + }), data; + } } /*! 消息组件实例 */ @@ -633,6 +651,60 @@ $(function () { }); } + /*! 组件 LayUI table 功能封装 */ + $.fn.layTable = function (options) { + return this.each(function (idx, elem) { + // 拦截异常标签对象 + if (this.nodeName !== 'TABLE') return new Error('It is not a table tag.'); + // 动态初始化数据表 + this.id = this.id || 't' + Math.random().toString().replace('0.', ''); + this.dataset.filter = this.getAttribute('lay-filter') || this.id; + this.setAttribute('lay-filter', this.dataset.filter); + // 标准化请求参数，初始化排序参数，表格插件初始化参数 + var data = {}, sort = options.initSort || options.sort || {}, option = { + id: elem.id, elem: elem, url: options.url || elem.dataset.url || '', where: getWhere(), + limit: options.limit || 15, cols: options.cols || [[]], page: options.page !== false, + }; + // 延用工具条配置 + if (options.title) option.title = options.title; + if (options.toolbar) option.toolbar = options.toolbar; + if (options.defaultToolbar) option.defaultToolbar = top.defaultToolbar; + if (sort.field && sort.type) option.initSort = sort; + // 实例化表单组件 + layui.table.render(option); + // 排序事件处理 + layui.table.on('sort(' + this.dataset.filter + ')', function (object) { + (sort = object), $(elem).trigger('reload') + }); + // 绑定选择项对象 + var checked = options.checked || this.dataset.targetChecked; + if (checked) $body.find(checked).map(function () { + $(this).attr('data-table-id', elem.id); + }); + // 搜索表单处理 + var search = options.search || this.dataset.targetSearch; + if (search) $body.off('submit', 'form.form-search').on('submit', search, function () { + (data.page = 1), (data = $.extend(data, $(this).formToJson())), $(elem).trigger('reload'); + }); + // 绑定重载事件 + $(this).bind('reload', function () { + var config = {where: getWhere()}; + if (sort.field && sort.type) config.initSort = sort; + layui.table.reload(elem.id, config); + }); + + // 获取查询数据 + function getWhere() { + data['output'] = 'layui.table'; + if (sort.field && sort.type) { + data['_order_'] = sort.type; + data['_field_'] = sort.field; + } + return data; + } + }); + } + /*! 注册 data-serach 表单搜索行为 */ onEvent('submit', 'form.form-search', function () { var url = $(this).attr('action').replace(/&?page=\d+/g, ''); @@ -723,7 +795,12 @@ $(function () { (function (confirm, callable) { confirm ? $.msg.confirm(confirm, callable) : callable(); })(emap.confirm, function () { - $.form.load(emap.action, data, emap.method || 'post', false, load, tips, emap.time) + var callable = !emap.tableId ? false : function (ret) { + if (ret.code > 0) return $.msg.success(ret.info, 3, function () { + $('#' + emap.tableId).trigger('reload'); + }), false; + } + $.form.load(emap.action, data, emap.method || 'post', callable, load, tips, emap.time) }); });