mkm/dev_oa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化右开页面关闭效果

Browse Source
This commit is contained in:
hdm 2022-06-11 19:14:53 +08:00
parent 5b05826549
commit ff5b60eb4b
43 changed files with 70 additions and 201 deletions

5
app/article/view/index/add.html

@ -129,10 +129,7 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
tool.post("/article/index/add", data.field, callback);

5
app/article/view/index/edit.html

@ -132,10 +132,7 @@ const moduleInit = ['tool','tagpicker','tinymce'];
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
tool.post("/article/index/add", data.field, callback);

5
app/finance/view/invoice/add.html

@ -400,10 +400,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success:function(e){
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
})

7
app/home/view/cate/flow_type_add.html

@ -51,7 +51,7 @@
<option value="5" {eq name="$detail.type" value="5"}selected=""{/eq}>其他</option>
<option value="6" {eq name="$detail.type" value="6"}selected=""{/eq}>报销</option>
<option value="7" {eq name="$detail.type" value="7"}selected=""{/eq}>发票</option>
<option value="7" {eq name="$detail.type" value="8"}selected=""{/eq}>合同</option>
<option value="8" {eq name="$detail.type" value="8"}selected=""{/eq}>合同</option>
</select>
</td>
<td class="layui-td-gray">名称<font>*</font></td>
@ -92,10 +92,7 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function () {
parent.layui.tool.close();
parent.layui.pageTable.reload();
}, 1000);
parent.layui.tool.close(1000);
}
}
tool.post("/home/cate/flow_type_add", data.field, callback);

5
app/home/view/conf/add.html

@ -62,10 +62,7 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function () {
parent.layui.tool.close();
parent.layui.pageTable.reload();
}, 1000);
parent.layui.tool.close(1000);
}
}
tool.post("/home/conf/add", data.field, callback);

4
app/home/view/conf/email.html

@ -100,9 +100,7 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function () {
parent.layui.tool.close();
}, 1000);
parent.layui.tool.close(1000);
}
}
tool.post("/home/conf/edit", data.field, callback);

25
app/home/view/conf/other.html

@ -18,25 +18,6 @@
class="layui-input" {notempty name="$config.version" } value="{$config.version}" {/notempty}>
</td>
</tr>
<tr>
<td class="layui-td-gray-3">系统文本编辑器</td>
<td colspan="3">
{empty name="$config.editor"}
<input type="radio" name="editor" value="1" title="富文本编辑器(TinyMCE)" checked>
<input type="radio" name="editor" value="2" title="Markdown编辑器(Editor.md)">
{else/}
<input type="radio" name="editor" value="1" title="富文本编辑器(TinyMCE)" {eq name="$config.editor" value="1"
}checked{/eq}>
<input type="radio" name="editor" value="2" title="Markdown编辑器(Editor.md)" {eq name="$config.editor"
value="2" }checked{/eq}>
{/empty}
</td>
</tr>
<tr>
<td colspan="4">
<span style="margin-left:20px; color: red">注意：切换编辑器后，文章内容对应的文本内容可能需要重新编辑。</span>
</td>
</tr>
</table>
<div class="py-3">
@ -58,12 +39,10 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function () {
parent.layui.tool.close();
}, 1000);
parent.layui.tool.close(1000);
}
}
tool.post("/admin/conf/edit", data.field, callback);
tool.post("/home/conf/edit", data.field, callback);
return false;
});
}

4
app/home/view/conf/token.html

@ -60,9 +60,7 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function () {
parent.layui.tool.close();
}, 1000);
parent.layui.tool.close(1000);
}
}
tool.post("/home/conf/edit", data.field, callback);

4
app/home/view/conf/web.html

@ -112,9 +112,7 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function () {
parent.layui.tool.close();
}, 1000);
parent.layui.tool.close(1000);
}
}
tool.post("/home/conf/edit", data.field, callback);

5
app/home/view/flow/add.html

@ -250,10 +250,7 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function () {
parent.layui.tool.close();
parent.layui.pageTable.reload();
}, 1000);
parent.layui.tool.close(1000);
}
}
tool.post("/home/flow/add", data.field, callback);

5
app/home/view/role/add.html

@ -100,10 +100,7 @@
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
});

10
app/message/view/index/add.html

@ -197,10 +197,7 @@
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
})
@ -230,10 +227,7 @@
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/message/view/index/read.html

@ -110,5 +110,10 @@
{block name="script"}
<script>
const moduleInit = ['tool'];
function gouguInit() {
if (parent.layui.pageTable) {
parent.layui.pageTable.reload();
}
}
</script>
{/block}

10
app/message/view/index/reply.html

@ -150,10 +150,7 @@
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
})
@ -184,10 +181,7 @@
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/note/view/index/add.html

@ -111,10 +111,7 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
tool.post("/note/index/add", data.field, callback);

5
app/oa/view/approve/add.html

@ -404,10 +404,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_caigou.html

@ -259,10 +259,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_chuchai.html

@ -366,10 +366,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_fukuan.html

@ -294,10 +294,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_gongwen.html

@ -173,10 +173,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_huiyishi.html

@ -272,10 +272,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_huodong.html

@ -386,10 +386,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_jiaban.html

@ -421,10 +421,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_jiangli.html

@ -247,10 +247,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_jiekuan.html

@ -190,10 +190,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_lizhi.html

@ -289,10 +289,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_qingjia.html

@ -492,10 +492,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_ruzhi.html

@ -196,10 +196,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_tongyong.html

@ -235,10 +235,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_waichu.html

@ -465,10 +465,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_weixiu.html

@ -259,10 +259,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_yongche.html

@ -445,10 +445,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_yongcheguihai.html

@ -164,10 +164,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_yongzhang.html

@ -290,10 +290,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_zhaopin.html

@ -290,10 +290,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_zhuangang.html

@ -329,10 +329,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/oa/view/approve/add_zhuanzheng.html

@ -274,10 +274,7 @@ const moduleInit = ['tool','formSelects','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

10
app/oa/view/approve/view_script.html

@ -211,10 +211,7 @@ const moduleInit = ['tool','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})
@ -242,10 +239,7 @@ const moduleInit = ['tool','employeepicker'];
success: function (e) {
layer.msg(e.msg);
if (e.code == 0) {
setTimeout(function(){
parent.layui.tool.close();
parent.layui.pageTable.reload();
},1000);
parent.layui.tool.close(1000);
}
}
})

5
app/user/view/personal/change_add.html

@ -133,10 +133,7 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
tool.post("/user/personal/change_add", data.field, callback);

5
app/user/view/personal/leave_add.html

@ -172,10 +172,7 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
tool.post("/user/personal/leave_add", data.field, callback);

5
app/user/view/position/add.html

@ -104,10 +104,7 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
tool.post("/user/position/add", data.field, callback);

5
app/user/view/user/add.html

@ -224,10 +224,7 @@
let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) {
parent.layui.pageTable.reload();
setTimeout(function(){
parent.layui.tool.close();
},1000);
parent.layui.tool.close(1000);
}
}
tool.post("/user/user/add", data.field, callback);

27
public/static/assets/gougu/module/tool.js

@ -2,6 +2,7 @@ layui.define([], function (exports) {
var MOD_NAME = 'tool';
var tool = {
loading: false,
//右侧iframe的方式打开页面，参考勾股CMS、勾股OA
side: function (url, width) {
var sideWidth = window.innerWidth > 1280 ? '1200px' : '996px';
if (width && width > 0) {
@ -16,7 +17,6 @@ layui.define([], function (exports) {
content: url,
area: [sideWidth, '100%'],
success: function (obj, index) {
console.log(index);
if ($('#expressClose').length < 1) {
var btn = '<div id="expressClose" class="express-close" title="关闭">关闭</div>';
obj.append(btn);
@ -27,6 +27,9 @@ layui.define([], function (exports) {
$('body').removeClass('right-open');
$('.layui-anim-rl').remove();
$('.layui-layer-shade').remove();
if (layui.pageTable) {
layui.pageTable.resize();
}
})
})
$(window).resize(function () {
@ -37,6 +40,7 @@ layui.define([], function (exports) {
}
})
},
//右侧ajax请求的方式打开页面参考勾股DEV
open: function (url, width) {
let that = this;
if (that.loading == true) {
@ -44,7 +48,7 @@ layui.define([], function (exports) {
}
that.loading = true;
if (width == 0) {
width = window.innerWidth > 1280 ? '1220px' : '1080px';
width = window.innerWidth > 1280 ? '1200px' : '996px';
}
$.ajax({
url: url,
@ -69,13 +73,10 @@ layui.define([], function (exports) {
$('#expressLayer').animate({ 'right': '-100%' }, 100, 'linear', function () {
$('#expressLayer').remove();
$('#expressMask').remove();
if (layui.pageTable) {
layui.pageTable.resize();
}
})
})
$(window).resize(function () {
width = window.innerWidth > 1280 ? '1200' : '1000';
width = window.innerWidth > 1280 ? '1200' : '996';
$('#expressLayer').width(width);
})
}
@ -139,8 +140,18 @@ layui.define([], function (exports) {
}
});
},
close: function () {
$('#expressClose').click();
close: function (delay) {
//延迟关闭，一般是在编辑完页面数据后需要自动关闭页面用到
if(delay && delay>0){
setTimeout(function () {
$('#expressClose').click();
}, delay);
}else{
$('#expressClose').click();
}
if (layui.pageTable) {
layui.pageTable.reload();
}
},
ajax: function (options, callback) {
var format = 'json';