mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-05 19:41:44 +08:00
同步更新插件代码
This commit is contained in:
邹景立
parent
5772c56005
commit
6f704873ee
@ -42,7 +42,7 @@ class Auth extends Controller
|
||||
SystemAuth::mQuery()->layTable(function () {
|
||||
$this->title = '系统权限管理';
|
||||
}, function (QueryHelper $query) {
|
||||
$query->dateBetween('create_at')->like('title,desc')->equal('status,utype');
|
||||
$query->like('title,desc')->equal('status,utype')->dateBetween('create_at');
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -16,7 +16,6 @@
|
||||
|
||||
namespace app\admin\controller;
|
||||
|
||||
use Exception;
|
||||
use Ip2Region;
|
||||
use think\admin\Controller;
|
||||
use think\admin\helper\QueryHelper;
|
||||
@ -75,7 +74,7 @@ class Oplog extends Controller
|
||||
$this->success('日志清理成功！');
|
||||
} catch (HttpResponseException $exception) {
|
||||
throw $exception;
|
||||
} catch (Exception $exception) {
|
||||
} catch (\Exception $exception) {
|
||||
trace_file($exception);
|
||||
$this->error("日志清理失败，{$exception->getMessage()}");
|
||||
}
|
||||
|
||||
@ -16,7 +16,6 @@
|
||||
|
||||
namespace app\admin\controller;
|
||||
|
||||
use Exception;
|
||||
use think\admin\Controller;
|
||||
use think\admin\helper\QueryHelper;
|
||||
use think\admin\model\SystemQueue;
|
||||
@ -90,7 +89,7 @@ class Queue extends Controller
|
||||
$this->success('任务重置成功！', $queue->code);
|
||||
} catch (HttpResponseException $exception) {
|
||||
throw $exception;
|
||||
} catch (Exception $exception) {
|
||||
} catch (\Exception $exception) {
|
||||
trace_file($exception);
|
||||
$this->error($exception->getMessage());
|
||||
}
|
||||
|
||||
@ -16,8 +16,6 @@
|
||||
|
||||
namespace app\admin\controller\api;
|
||||
|
||||
use Error;
|
||||
use Exception;
|
||||
use think\admin\Controller;
|
||||
use think\admin\service\AdminService;
|
||||
use think\admin\service\QueueService;
|
||||
@ -48,7 +46,7 @@ class Queue extends Controller
|
||||
}
|
||||
} catch (HttpResponseException $exception) {
|
||||
throw $exception;
|
||||
} catch (Exception $exception) {
|
||||
} catch (\Exception $exception) {
|
||||
trace_file($exception);
|
||||
$this->error($exception->getMessage());
|
||||
} else {
|
||||
@ -74,7 +72,7 @@ class Queue extends Controller
|
||||
}
|
||||
} catch (HttpResponseException $exception) {
|
||||
throw $exception;
|
||||
} catch (Exception $exception) {
|
||||
} catch (\Exception $exception) {
|
||||
trace_file($exception);
|
||||
$this->error($exception->getMessage());
|
||||
} else {
|
||||
@ -95,7 +93,7 @@ class Queue extends Controller
|
||||
} else {
|
||||
echo "<span class='color-red pointer' data-tips-text='{$message}'>未启动</span>";
|
||||
}
|
||||
} catch (Error|Exception $exception) {
|
||||
} catch (\Error|\Exception $exception) {
|
||||
echo "<span class='color-red pointer' data-tips-text='{$exception->getMessage()}'>异 常</span>";
|
||||
} else {
|
||||
echo "<span class='color-red pointer' data-tips-text='只有超级管理员才能操作！'>无权限</span>";
|
||||
|
||||
@ -127,6 +127,7 @@ define(['md5', 'notify'], function (SparkMD5, Notify, allowMime) {
|
||||
uploader.type = 'put';
|
||||
uploader.head['file-path'] = ret.data['filepath'];
|
||||
uploader.head['authorization'] = ret.data['authorization'];
|
||||
uploader.form = new FormData();
|
||||
} else if (ret.data.uptype === 'alioss') {
|
||||
uploader.form.append('policy', ret.data['policy']);
|
||||
uploader.form.append('signature', ret.data['signature']);
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<!--{/if}-->
|
||||
|
||||
<!--{if auth("remove")}-->
|
||||
<button data-action='{:url("remove")}' data-table-id="RoleTable" data-rule="id#{id}" data-confirm="确定要批量删除权限吗？" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</button>
|
||||
<button data-action='{:url("remove")}' data-rule="id#{id}" data-table-id="RoleTable" data-confirm="确定要批量删除权限吗？" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</button>
|
||||
<!--{/if}-->
|
||||
{/block}
|
||||
|
||||
|
||||
@ -24,11 +24,7 @@
|
||||
{field: 'id', title: 'ID', width: 80, align: 'center', sort: true},
|
||||
{field: 'name', title: '文件名称', width: '12%', align: 'center'},
|
||||
{field: 'hash', title: '文件哈希', width: '15%', align: 'center', templet: '<div><code>{{d.hash}}</code></div>'},
|
||||
{
|
||||
field: 'size', title: '文件大小', align: 'center', width: '7%', sort: true, templet: function (d) {
|
||||
return $.formatFileSize(d.size)
|
||||
}
|
||||
},
|
||||
{field: 'size', title: '文件大小', align: 'center', width: '7%', sort: true, templet: '<div>{{-$.formatFileSize(d.size)}}</div>'},
|
||||
{field: 'xext', title: '文件后缀', align: 'center', width: '7%', sort: true},
|
||||
{
|
||||
field: 'xurl', title: '查看文件', width: '7%', align: 'center', templet: function (d) {
|
||||
@ -51,7 +47,7 @@
|
||||
},
|
||||
{field: 'ctype', title: '存储方式', align: 'center', width: '10%'},
|
||||
{field: 'create_at', title: '上传时间', align: 'center', width: '15%', sort: true},
|
||||
{toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 140, fixed: 'right'}
|
||||
{toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 150, fixed: 'right'}
|
||||
]]
|
||||
});
|
||||
});
|
||||
|
||||
@ -86,9 +86,10 @@
|
||||
'<span class="pull-left layui-badge layui-badge-middle layui-bg-green">完成</span>',
|
||||
'<span class="pull-left layui-badge layui-badge-middle layui-bg-red">失败</span>',
|
||||
][d.status] || '') + '执行时间：';
|
||||
d.enter_time = d.enter_time || '', d.outer_time = d.outer_time || '0.0000';
|
||||
d.enter_time = d.enter_time || '';
|
||||
d.outer_time = d.outer_time || '0.0000';
|
||||
if (d.enter_time.length > 12) {
|
||||
d.html += d.enter_time.substring(12) + '<span class="color-desc"> ( 耗时 ' + d.outer_time + ' ) </span>';
|
||||
d.html += d.enter_time.substring(12) + '<span class="color-desc"> ( ' + d.outer_time + ' ) </span>';
|
||||
d.html += ' 已执行 <b class="color-blue">' + (d.attempts || 0) + '</b> 次';
|
||||
} else {
|
||||
d.html += '<span class="color-desc">任务未执行</span>'
|
||||
|
||||
2
public/static/plugs/ckeditor5/ckeditor.js
vendored
2
public/static/plugs/ckeditor5/ckeditor.js
vendored
File diff suppressed because one or more lines are too long
@ -956,29 +956,37 @@ input:not(.layui-hide,[type=hidden]) {
|
||||
height: 240px;
|
||||
}
|
||||
|
||||
.submit-button-loading {
|
||||
cursor: default;
|
||||
.layui-btn:not([type=button]) {
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
transform: scale(1);
|
||||
text-align: center;
|
||||
|
||||
&::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
&::after {
|
||||
filter: alpha(opacity=0);
|
||||
opacity: 0;
|
||||
content: '\e63d';
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
&.submit-button-loading {
|
||||
cursor: pointer;
|
||||
|
||||
&::before {
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
content: '';
|
||||
display: block;
|
||||
position: absolute;
|
||||
background: rgba(0, 0, 0, .1);
|
||||
background: rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
&::after {
|
||||
left: 50%;
|
||||
position: absolute;
|
||||
filter: alpha(opacity=100);
|
||||
opacity: 1;
|
||||
margin-left: -8px;
|
||||
|
||||
#iconLayout(15px);
|
||||
@ -995,6 +1003,7 @@ input:not(.layui-hide,[type=hidden]) {
|
||||
animation-iteration-count: infinite;
|
||||
-webkit-animation-iteration-count: infinite;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 图片选择器样式 */
|
||||
@ -1174,6 +1183,21 @@ label.think-checkbox {
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
margin: 8px 10px 8px 6px;
|
||||
|
||||
&[data-width] {
|
||||
width: 100px;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
&[data-width^="150"] {
|
||||
width: 150px;
|
||||
}
|
||||
|
||||
&[data-width^="200"] {
|
||||
width: 200px;
|
||||
}
|
||||
}
|
||||
|
||||
.think-radio,
|
||||
@ -1189,6 +1213,7 @@ label.think-checkbox {
|
||||
height: 18px;
|
||||
cursor: pointer;
|
||||
border: 1px solid @RadioBorderNormalColor;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
background: #fff;
|
||||
margin-right: 5px;
|
||||
@ -1503,7 +1528,7 @@ label.think-checkbox {
|
||||
|
||||
.font- {
|
||||
&code {
|
||||
font-family: 'Courier New', 'Lucida Console', Consolas, monospace
|
||||
font-family: 'Courier New', 'Lucida Console', 'Consolas', 'Helvetica Neue', 'Helvetica', 'PingFang SC', 'Tahoma', 'Arial', sans-serif
|
||||
}
|
||||
|
||||
&s10 {
|
||||
|
||||
@ -75,12 +75,11 @@ form.layui-form fieldset {
|
||||
}
|
||||
|
||||
.layui-btn {
|
||||
border: 1px solid #009688;
|
||||
border: 1px solid #16baaa;
|
||||
|
||||
&:hover:not(.layui-btn-disabled) {
|
||||
opacity: 1;
|
||||
filter: alpha(opacity=100);
|
||||
box-shadow: @ShadowInset;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
&-warm {
|
||||
@ -107,7 +106,7 @@ form.layui-form fieldset {
|
||||
border: 1px solid #098;
|
||||
overflow: hidden;
|
||||
background: #009688;
|
||||
line-height: 28px;
|
||||
line-height: 30px;
|
||||
border-radius: 2px;
|
||||
|
||||
+ .layui-btn {
|
||||
@ -115,8 +114,8 @@ form.layui-form fieldset {
|
||||
}
|
||||
|
||||
.layui-btn {
|
||||
height: 28px;
|
||||
line-height: 28px;
|
||||
height: 30px;
|
||||
line-height: 32px;
|
||||
border-width: 0 !important;
|
||||
border-radius: 0 !important;
|
||||
|
||||
@ -242,21 +241,30 @@ form.layui-form fieldset {
|
||||
|
||||
input.layui-input,
|
||||
.layui-btn.layui-btn-sm {
|
||||
height: 28px;
|
||||
line-height: 28px;
|
||||
height: 26px;
|
||||
box-sizing: border-box;
|
||||
line-height: 26px;
|
||||
}
|
||||
|
||||
.layui-btn.layui-btn-sm {
|
||||
margin-top: -1px;
|
||||
.input-right-icon {
|
||||
width: 28px;
|
||||
height: 26px;
|
||||
line-height: 26px;
|
||||
}
|
||||
|
||||
&[lay-size="lg"] {
|
||||
input.layui-input, .layui-btn.layui-btn-sm {
|
||||
input.layui-input,
|
||||
.layui-btn.layui-btn-sm {
|
||||
height: 38px;
|
||||
box-sizing: border-box;
|
||||
line-height: 38px;
|
||||
}
|
||||
|
||||
.input-right-icon {
|
||||
width: 38px;
|
||||
height: 36px;
|
||||
line-height: 36px;
|
||||
}
|
||||
}
|
||||
|
||||
.list-table-sort-td {
|
||||
@ -273,9 +281,9 @@ form.layui-form fieldset {
|
||||
input {
|
||||
width: 50px;
|
||||
color: #666;
|
||||
border: 1px solid @InputBorderNormalColor;
|
||||
padding: 2px;
|
||||
font-size: 9pt;
|
||||
border: 1px solid @InputBorderNormalColor;
|
||||
text-align: center;
|
||||
line-height: 18px
|
||||
}
|
||||
@ -303,6 +311,10 @@ form.layui-form fieldset {
|
||||
.layui-table-view {
|
||||
margin: 0;
|
||||
|
||||
.layui-form-switch {
|
||||
margin-top: -3px;
|
||||
}
|
||||
|
||||
.layui-table-page {
|
||||
.layui-laypage {
|
||||
.layui-laypage-prev,
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user