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

9
public/static/css/center.css
View File

@@ -580,10 +580,10 @@ a[lay-event="del"] {
#content #cardInfoList .cardInfoUsers li {
display: inline-block;
width: 92px;
width: 89px;
text-align: center;
overflow: hidden;
margin: 2px 0px;
margin: 2px 0;
}
#content #cardInfoList .cardInfoUsers li img.media-object {
@@ -792,14 +792,13 @@ a[lay-event="del"] {
}
#content .vip-coupon-row {
overflow: auto;
overflow: hidden;
white-space: nowrap;
}
#content .vip-coupon-item {
padding: 0 10px;
margin-top: 20px;
padding-right: 15px;
padding: 0 15px 0 10px;
display: inline-block;
border-right: 1px solid rgba(0,0,0,.16);
}

44
public/static/system/module/admin.js
View File

@@ -739,7 +739,6 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
}
}
if (res.code === 200) {
switch (reload) {
@@ -754,10 +753,17 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
break;
default:
}
tableThis ?
tableThis.update(JSON.parse(JSON.stringify(post.field))) :
table.reloadData("lay-tableList");
try {
tableThis ?
tableThis.update(JSON.parse(JSON.stringify(post.field))) :
table.reloadData("lay-tableList");
} catch (error) {
/**
* 如果使用第三方组件在table显示或元素为DIY数据结构
* 则在这里可能会出现错误，这里不做处理，如果有需求可自行在页面实现数据回显到table行的逻辑
*/
layer.info(error);
}
layer.msg(res.msg);
admin.event.closeDialog(othat);
} else {
@@ -1135,7 +1141,7 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
callback = $(elem).attr('callback') || undefined,
blobSlice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
var uploadFiles = {
let uploadFiles = {
normal: function (res, name) {
$('input.' + name).prop('value', res.url);
$('img.' + name).prop('src', res.url);
@@ -1148,7 +1154,6 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
$(elem).find('p,i,hr').addClass('layui-hide');
},
multiple: function (res, name) {
let boxList = $(that).parents('.layui-imagesbox').find('.layui-input-inline');
let length = boxList.length;
$(this).parents('form').find('input#' + name + '_clear').remove();
@@ -1162,7 +1167,6 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
html += '<input type="text" name="' + name + '[' + (length - 1) + '][title]" class="layui-input" placeholder="图片简介">';
html += '<span class="layui-badge layui-badge-red" onclick="layui.$(this).parent().remove();">删除</span></div>';
$(elem).parent().before(html);
}
}
@@ -1250,16 +1254,10 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
that.prop("disabled", true);
}, done: function (res, indexObj, fileObj) {
that.prop("disabled", false);
if (typeof callback != 'undefined') {
return admin.callbackfunc(this.item, {res: res, index: indexObj, file: fileObj});
}
/**
* 处理分片回调
*/
if (typeof res.index != 'undefined'
&& typeof res.chunkId != 'undefined') {
if (typeof res.index != 'undefined' && typeof res.chunkId != 'undefined') {
if (res.code !== 200) {
layer.closeAll();
@@ -1318,12 +1316,18 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
return false;
}
if (res.code === 200 && res.url) {
if (typeof res.chunkId !== 'undefined') {
layer.close(window[res.chunkId]);
}
that.prop("disabled", false);
// 关闭分片上传进度条
if (typeof res.chunkId !== 'undefined') {
layer.close(window[res.chunkId]);
}
// 执行自定义回调
if (typeof callback != 'undefined') {
return admin.callbackfunc(this.item, {res: res, index: indexObj, file: fileObj});
} else if (res.code === 200) {
layer.msg(res.msg);
// 执行默认上传成功回调
uploadFiles[type](res, name);
} else {
layer.error(res.msg);
@@ -1481,7 +1485,7 @@ layui.define(['jquery', 'i18n', 'element', 'layer', 'form', 'rate', 'table', 'sl
form.on('radio(radioStatus)', function (data) {
var display = $(this).data('display');
if (display != null && display !== 'undefined') {
(data.value === 1) ? $('.' + display).show() : $('.' + display).hide();
(data.value == 1) ? $('.' + display).show() : $('.' + display).hide();
}
})