blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

同步更新代码

Browse Source
This commit is contained in:
邹景立 2023-03-12 23:36:32 +08:00
parent 24bc869f07
commit da79e89a9e
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/controller/Oplog.php
View File

@ -52,7 +52,6 @@ class Oplog extends Controller
/** /**
* 列表数据处理 * 列表数据处理
* @auth true
* @param array $data * @param array $data
* @throws \Exception * @throws \Exception
*/ */
@ -60,8 +59,7 @@ class Oplog extends Controller
{ {
$region = new Ip2Region(); $region = new Ip2Region();
foreach ($data as &$vo) { foreach ($data as &$vo) {
$isp = $region->btreeSearch($vo['geoip']); $vo['geoisp'] = $region->simple($vo['geoip']);
$vo['geoisp'] = str_replace(['内网IP', '0', '|'], '', $isp['region'] ?? '') ?: '-';
} }
} }

17
public/static/plugs/admin/validate.js
View File

@ -79,18 +79,17 @@ define(function () {
return this.insertError($(el).removeClass('validate-error')).removeClass('layui-anim-fadein').css({width: '30px'}).html(''); return this.insertError($(el).removeClass('validate-error')).removeClass('layui-anim-fadein').css({width: '30px'}).html('');
}; };
this.insertError = function (el) { this.insertError = function (el) {
if ($(el).data('input-vali-tags')) return $(el).data('input-vali-tags'); return (function ($el) {
var $html = $('<span class="absolute block layui-anim text-center font-s12 notselect" style="color:#A44;z-index:2"></span>'); return $el.data('vali-tags').css({top: $el.position().top + 'px'});
var $next = $(el).nextAll('.input-right-icon'), right = ($next ? $next.width() + parseFloat($next.css('right') || '0') : 0) + 10; })($(el), $(el).data('vali-tags') || function ($el, $next) {
var style = {top: $(el).position().top + 'px', right: right + 'px', lineHeight: el.nodeName === 'TEXTAREA' ? '32px' : $(el).css('height')}; $el.data('vali-tags', $('<span class="layui-anim notselect" style="display:block;position:absolute;text-align:center;color:#c44;font-size:12px;z-index:2"></span>').css({
$(el).data('input-vali-tags', $html.css(style).insertAfter(el)); lineHeight: el.nodeName === 'TEXTAREA' ? '32px' : $el.css('height'), right: (($next ? $next.width() + parseFloat($next.css('right') || 0) : 0) + 10) + 'px',
return $html; }).insertAfter(el));
}($(el), $(el).nextAll('.input-right-icon')));
}; };
/*! 预埋异常标签*/ /*! 预埋异常标签*/
this.form.find(this.tags).each(function (i, el) { this.form.find(this.tags).each(function (i, el) {
that.hasCheck(this) && setTimeout(function () { that.hasCheck(this) && that.hideError(el, '');
that.hideError(el, '');
}, 250);
}); });
/*! 表单元素验证 */ /*! 表单元素验证 */
this.form.attr({onsubmit: 'return false', novalidate: 'novalidate', autocomplete: 'off'}).on('keydown', this.tags, function () { this.form.attr({onsubmit: 'return false', novalidate: 'novalidate', autocomplete: 'off'}).on('keydown', this.tags, function () {

2
public/static/plugs/layui/css/layui.css
View File

File diff suppressed because one or more lines are too long

2
public/static/plugs/layui/layui.js
View File

File diff suppressed because one or more lines are too long