panxiang/swiftadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修复BUG/升级1.1.6版本

Browse Source
This commit is contained in:
Ying
2023-04-25 20:11:49 +08:00
parent 445e5f9662
commit 6a6866bbaf
2357 changed files with 456920 additions and 140567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/view/index/console.html
View File

@@ -26,7 +26,7 @@
<div class="layui-col-md8">
<img src="{$AdminLogin.face}" class="layui-admin-avatar">
<div class="layui-admin-content">
<span class="h4">早安，{$AdminLogin.nickname|default=$AdminLogin.name}，开始您一天的工作吧！</span>
<span class="h4">欢迎您，{$AdminLogin.nickname|default=$AdminLogin.name}，开始您一天的工作吧！</span>
<span>今日多云转阴，18℃ - 22℃，出门记得穿外套哦~</span>
</div>
</div>

114
app/admin/view/system/admin/center.html
View File

@@ -138,7 +138,7 @@
<div class="layui-card">
<div class="layui-card-body" style="padding: 25px;">
<div class="text-center layui-text">
<div class="user-info-head" id="imgHead" lay-upload="imgHead" data-url="{:url('/ajax/upload/')}?action=avatar" callback="imgHead">
<div class="user-info-head" id="imgHead" lay-upload="imgHead" data-size="1024" data-url="{:url('/Ajax/upload/')}" callback="imgHead">
<img src="{$data.face}" class="imgHead" />
</div>
<h2 style="padding-top: 20px;">{$data.nickname|default='没有昵称'}</h2>
@@ -281,94 +281,96 @@
<script>
layui.use(['admin'],function() {
var admin = layui.admin;
var jquery = layui.jquery;
admin.callback.imgHead = function(clickthis, colletction) {
let $ = layui.jquery;
let admin = layui.admin;
admin.callback.imgHead = function (clickthis, colletction) {
var res = colletction.res;
if (res.code === 200) { // 查找元素
jquery('.imgHead').attr('src',res.url);
// // 执行后端投递工作
// jquery.post('{:url("/system/admin/modify")}',{
// field: 'face'
// ,face: res.url
// },function(res) {
// layer.msg("{:__('上传成功')}");
// })
}
else {
$('.imgHead').attr('src', res.url);
// 执行后端投递工作
$.post('{:url("/system/admin/modify")}', {
field: 'face'
, face: res.url
}, function (res) {
layer.msg("{:__('上传成功')}");
})
} else {
layer.error(res.msg);
}
}
// 编辑签名
jquery('.userMood').dblclick(function() {
var that = jquery(this),
html = that.text(); that.hide();
jquery(that).parent().append('<input class="editMood layui-input" type="text" maxlength="12" value="' + html +'">');
$('.userMood').dblclick(function () {
var that = $(this),
html = that.text();
that.hide();
$(that).parent().append('<input class="editMood layui-input" type="text" maxlength="12" value="' + html + '">');
})
jquery('.layui-card-body').on('blur','.editMood',function() {
var that = jquery(this),
html = that.val(); that.remove();
jquery('.userMood').text(html);
jquery('.userMood').show();
jquery.post('{:url("/system/admin/modify")}',{
field: 'mood'
,mood: html
},function(res) {
})
$('.layui-card-body').on('blur', '.editMood', function () {
var that = $(this),
html = that.val();
that.remove();
$('.userMood').text(html);
$('.userMood').show();
$.post('{:url("/system/admin/modify")}', {
field: 'mood'
, mood: html
}, function (res) {
})
})
jquery('.layui-inputags').click(function(){
if (jquery('.editTags').length <= 0) {
jquery(this).parent().append('<input class="editTags layui-input" type="text" maxlength="10">');
$('.layui-inputags').click(function () {
if ($('.editTags').length <= 0) {
$(this).parent().append('<input class="editTags layui-input" type="text" maxlength="10">');
}
})
// 添加标签
jquery('.layui-card-body').on('blur','.editTags',function() {
var that = jquery(this),
html = that.val(); that.remove();
if (html == '') {
return;
}
jquery.post('{:url("/system/admin/modify")}',{
$('.layui-card-body').on('blur', '.editTags', function () {
var that = $(this),
html = that.val();
that.remove();
if (html === '') {
return;
}
$.post('{:url("/system/admin/modify")}', {
field: 'tags'
,tags: html
},function(res) {
if (res.code == 200) {
, tags: html
}, function (res) {
if (res.code === 200) {
var elem = '\n';
elem += '<span class="layui-badge layui-bg-gray">';
elem += '<i class="layui-icon layui-icon-close"></i>';
elem += html;
elem += '</span>';
jquery('.layui-badge-list').append(elem);
}else {
$('.layui-badge-list').append(elem);
} else {
layer.error(res.msg);
}
})
})
})
// 删除标签
jquery('.layui-card-body').on('click','.layui-badge-list i',function() {
var that = jquery(this),
html = that.parent('span').text();
jquery.post('{:url("/system/admin/modify")}',{
$('.layui-card-body').on('click', '.layui-badge-list i', function () {
var that = $(this),
html = that.parent('span').text();
$.post('{:url("/system/admin/modify")}', {
field: 'tags'
,del: 1
,tags: html
},function(res) {
if (res.code == 200) {
, del: 1
, tags: html
}, function (res) {
if (res.code === 200) {
that.parent('span').remove();
}else {
} else {
layer.error(res.msg);
}
})
})
})
layer.tips('双击心情可以编辑','.userMood',{
layer.tips('双击心情可以编辑', '.userMood', {
tips: [1, '#000']
})

6
app/admin/view/system/admin/index.html
View File

@@ -25,7 +25,7 @@
</style>
<div class="layui-col-md3">
<div class="layui-fluid" >
<div class="layui-card" style="height: 500px">
<div class="layui-card" style="padding-bottom: 20px">
<div class="layui-card-header layadmin-card-header-auto">
<h5> <i class="layui-icon layui-icon-user"></i> {:__('公司结构')}</h5>
</div>
@@ -185,9 +185,11 @@
</script>
<!-- // 列表编辑框 -->
<script type="text/html" id="tableBar">
<script type="text/html" id="tableBar">
<if (check_admin_auth(url("/system/admin/edit")))>
<a class="layui-table-text" data-title="{:__('编辑')} {{d.name}}" callback="edits" data-url="#adminforms" data-area="710px,550px" lay-event="edit" >{:__('编辑')}</a>
<div class="layui-divider layui-divider-vertical"></div>
</if>
<a class="layui-table-text" data-title="{:__('访问权限')}"
callback="rulecates" data-url="#authForms" data-area="300px" lay-event="rules" >{:__('权限')}</a>
<div class="layui-divider layui-divider-vertical"></div>

12
app/admin/view/system/dictionary/index.html
View File

@@ -50,7 +50,7 @@
<i class="layui-icon layui-icon-edit"></i>{:__('修改')}
</button>
<!-- // 删除所有 -->
<button class="layui-btn icon-btn layui-btn-danger" lay-batch="" data-table="lay-tree" data-url="{:url('/system/Dictionary/del')}" >
<button class="layui-btn icon-btn layui-btn-danger" lay-batch="" data-table="lay-tableGroup" data-url="{:url('/system/Dictionary/del')}" >
<i class="layui-icon layui-icon-delete"></i>{:__('删除')}
</button>
</div>
@@ -216,7 +216,6 @@
// 获取最后点击
if (obj.checked === true) {
window.tableElem = obj;
$('#editforms').find('.pid').attr('value',obj.data.id);
}
}
@@ -241,18 +240,15 @@
$.post(_pageUrl,
post.field, function(res){
if (res.code === 200) {
if (typeof window.tableElem !== 'undefined') {
window.tableElem.update(JSON.parse(JSON.stringify(post.field)))
} else {
table.reloadData('lay-tableGroup');
}
table.reloadData('lay-tableGroup');
table.reloadData('lay-tableList');
// 关闭当前窗口
layer.msg(res.msg);
layer.close(colletction.index);
pageThat.attr("disabled",true);
}
else {
layer.error(res.msg);
layer.error(res.msg,'error');
}
}, 'json');

5
app/admin/view/system/login_log/index.html
View File

@@ -75,7 +75,6 @@
</select>
</div>
<div class="layui-inline">
<div class="layui-form-label">{:__('账号')}</div>
<div class="layui-input-inline ">
@@ -87,6 +86,10 @@
<button class="layui-btn icon-btn" lay-filter="formSearch" lay-submit><i
class="layui-icon layui-icon-search"></i>{:__('搜索')}
</button>
<!-- // 默认导出 -->
<button class="layui-btn icon-btn" lay-ajax="" data-url="{:url('/system/LoginLog/export')}" data-jump="true" ><i
class="layui-icon layui-icon-export"></i>{:__('导出')}
</button>
<!-- // 删除所有 -->
<button class="layui-btn icon-btn layui-btn-danger" lay-batch="" data-table="lay-tableList" data-url="{:url('/system/LoginLog/del')}" >
<i class="layui-icon layui-icon-delete"></i>{:__('删除')}

2
app/admin/view/system/user/index.html
View File

@@ -90,7 +90,7 @@
</div>
<div class="layui-footer layui-form-item layui-center " >
<button class="layui-btn layui-btn-primary" type="button" sa-event="closePageDialog" >{:__('取消')}</button>
<button class="layui-btn" lay-add="{:url('/system/User/add')}" lay-edit="{:url('/system/User/edit')}" lay-filter="submitPage" lay-submit>{:__('提交')}</button>
<button class="layui-btn" lay-add="{:url('/system/User/add')}" lay-edit="{:url('/system/User/edit')}" lay-filter="submitPage" data-reload="self" lay-submit>{:__('提交')}</button>
</div>
</form>
</div>