弹框组件统一替换为layer；

cc-ohayou · May 8, 2017 · aeb1df7 · aeb1df7
1 parent 00cd63c
commit aeb1df7
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -814,6 +814,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
 - 4、JettyServer关闭逻辑优化，修复执行器无法正常关闭导致端口占用和频繁打印c3p0日志的问题；
 - 5、JobHandler中开启子线程时，支持子线程输出执行日志并通过Rolling查看。
 - 6、任务日志清理功能；
+- 7、弹框组件统一替换为layer；
 
 #### TODO LIST
 - 1、任务并行触发处理规则：单机串行队列（默认）、单机并行、串行忽略、单机覆盖；

diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
@@ -19,7 +19,11 @@ $(function() {
                         $("#jobId").find("option[value='" + $("#jobId").attr("paramVal") + "']").attr("selected",true);
                     }
 				} else {
-					ComAlertTec.show(data.msg);
+					layer.open({
+						title: '系统提示',
+						content: (data.msg || "接口异常"),
+						icon: '2'
+					});
 				}
 			},
 		});
@@ -188,12 +192,6 @@ $(function() {
 		}
 	});
 
-	// 任务数据
-	$('#joblog_list').on('click', '.logMsg', function(){
-		var msg = $(this).find('span').html();
-		ComAlert.show(2, msg);
-	});
-
 	// 日志弹框提示
 	$('#joblog_list').on('click', '.logTips', function(){
 		var msg = $(this).find('span').html();
@@ -211,45 +209,43 @@ $(function() {
 
 		window.open(base_url + '/joblog/logDetailPage?id=' + _id);
 		return;
-
-		/*
-		$.ajax({
-			type : 'POST',
-			url : base_url + '/joblog/logDetail',
-			data : {"id":_id},
-			dataType : "json",
-			success : function(data){
-				if (data.code == 200) {
-					ComAlertTec.show('<pre style="color: white;background-color: black;width2:'+ $(window).width()*2/3 +'px;" >'+ data.content +'</pre>');
-				} else {
-					ComAlertTec.show(data.msg);
-				}
-			},
-		});
-		*/
 	});
 
 	/**
 	 * 终止任务
 	 */
 	$('#joblog_list').on('click', '.logKill', function(){
 		var _id = $(this).attr('_id');
-		ComConfirm.show("确认主动终止任务?", function(){
-			$.ajax({
-				type : 'POST',
-				url : base_url + '/joblog/logKill',
-				data : {"id":_id},
-				dataType : "json",
-				success : function(data){
-					if (data.code == 200) {
-						ComAlert.show(1, '操作成功');
-						logTable.fnDraw();
-					} else {
-						ComAlert.show(2, data.msg);
-					}
-				},
-			});
-		});
+
+        layer.confirm('确认主动终止任务?', {icon: 3, title:'系统提示'}, function(index){
+            layer.close(index);
+
+            $.ajax({
+                type : 'POST',
+                url : base_url + '/joblog/logKill',
+                data : {"id":_id},
+                dataType : "json",
+                success : function(data){
+                    if (data.code == 200) {
+                        layer.open({
+                            title: '系统提示',
+                            content: '操作成功',
+                            icon: '1',
+                            end: function(layero, index){
+                                logTable.fnDraw();
+                            }
+                        });
+                    } else {
+                        layer.open({
+                            title: '系统提示',
+                            content: (data.msg || "操作失败"),
+                            icon: '2'
+                        });
+                    }
+                },
+            });
+        });
+
 	});
 
 	/**
@@ -298,3 +294,41 @@ $(function() {
 	});
 
 });
+
+
+// 提示-科技主题
+var ComAlertTec = {
+	html:function(){
+		var html =
+			'<div class="modal fade" id="ComAlertTec" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">' +
+			'<div class="modal-dialog">' +
+			'<div class="modal-content-tec">' +
+			'<div class="modal-body"><div class="alert" style="color:#fff;"></div></div>' +
+			'<div class="modal-footer">' +
+			'<div class="text-center" >' +
+			'<button type="button" class="btn btn-info ok" data-dismiss="modal" >确认</button>' +
+			'</div>' +
+			'</div>' +
+			'</div>' +
+			'</div>' +
+			'</div>';
+		return html;
+	},
+	show:function(msg, callback){
+		// dom init
+		if ($('#ComAlertTec').length == 0){
+			$('body').append(ComAlertTec.html());
+		}
+
+		// 弹框初始
+		$('#ComAlertTec .alert').html(msg);
+		$('#ComAlertTec').modal('show');
+
+		$('#ComAlertTec .ok').click(function(){
+			$('#ComAlertTec').modal('hide');
+			if(typeof callback == 'function') {
+				callback();
+			}
+		});
+	}
+};
diff --git a/xxl-job-admin/src/main/webapp/static/js/xxl.alert.1.js b/xxl-job-admin/src/main/webapp/static/js/xxl.alert.1.js
@@ -96,39 +96,3 @@ var ComConfirm = {
         });
     }
 };
-// 提示-科技主题
-var ComAlertTec = {
-    html:function(){
-        var html =
-            '<div class="modal fade" id="ComAlertTec" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">' +
-                '<div class="modal-dialog">' +
-                    '<div class="modal-content-tec">' +
-                        '<div class="modal-body"><div class="alert" style="color:#fff;"></div></div>' +
-                        '<div class="modal-footer">' +
-                            '<div class="text-center" >' +
-                                '<button type="button" class="btn btn-info ok" data-dismiss="modal" >确认</button>' +
-                            '</div>' +
-                        '</div>' +
-                    '</div>' +
-                '</div>' +
-            '</div>';
-        return html;
-    },
-    show:function(msg, callback){
-        // dom init
-        if ($('#ComAlertTec').length == 0){
-            $('body').append(ComAlertTec.html());
-        }
-
-        // 弹框初始
-        $('#ComAlertTec .alert').html(msg);
-        $('#ComAlertTec').modal('show');
-
-        $('#ComAlertTec .ok').click(function(){
-            $('#ComAlertTec').modal('hide');
-            if(typeof callback == 'function') {
-                callback();
-            }
-        });
-    }
-};