优化右开页面关闭效果

app/admin/view/admin/add.html

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

app/admin/view/conf/add.html

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

app/admin/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("/admin/conf/edit", data.field, callback);

app/admin/view/conf/other.html

@@ -58,9 +58,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("/admin/conf/edit", data.field, callback);

app/admin/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("/admin/conf/edit", data.field, callback);

app/admin/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("/admin/conf/edit", data.field, callback);

app/admin/view/conf/wechat.html

@@ -93,9 +93,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("/admin/conf/edit", data.field, callback);

app/admin/view/keywords/add.html

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

app/admin/view/links/add.html

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

app/admin/view/nav/add.html

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

app/admin/view/role/add.html

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

app/admin/view/sitemap/add.html

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

app/admin/view/sitemap/sitemap_info_add.html

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

app/admin/view/slide/add.html

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

app/admin/view/slide/slide_info_add.html

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

app/admin/view/user/edit.html

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

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 () {
+		close: function (delay) {
-			$('#expressClose').click();
+			//延迟关闭，一般是在编辑完页面数据后需要自动关闭页面用到
+			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';