Home Explore Help
Register Sign In
kerryzhang
/
xxl-job
Watch 1
Star 1
Fork 1
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #1064 from ChunMengLu/master

许雪里 5 years ago
parent
99e7bfc66c 0741456510
commit
2b708f204f
No account linked to committer's email
2 changed files with 103 additions and 99 deletions
Split View Show Diff Stats
  1. 39 35
      xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
  2. 64 64
      xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js

+ 39 - 35
xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js View File 

@@ -3,7 +3,7 @@ $(function() {
3 3 
 	// init date tables
4 4 
 	var jobTable = $("#job_list").dataTable({
5 5 
 		"deferRender": true,
6 
-		"processing" : true,
6 
+		"processing" : true,
7 7 
 	    "serverSide": true,
8 8 
 		"ajax": {
9 9 
 			url: base_url + "/jobinfo/pageList",
 
@@ -30,8 +30,8 @@ $(function() {
30 30 
 						"visible" : true,
31 31 
 						"width":'7%'
32 32 
 					},
33 
-	                {
34 
-	                	"data": 'jobGroup',
33 
+	                {
34 
+	                	"data": 'jobGroup',
35 35 
 	                	"visible" : false,
36 36 
 	                	"render": function ( data, type, row ) {
37 37 
 	            			var groupMenu = $("#jobGroup").find("option");
 
@@ -67,23 +67,23 @@ $(function() {
67 67 
 						"visible" : true,
68 68 
 						"width":'13%'
69 69 
 					},
70 
-	                {
71 
-	                	"data": 'addTime',
72 
-	                	"visible" : false,
70 
+	                {
71 
+	                	"data": 'addTime',
72 
+	                	"visible" : false,
73 73 
 	                	"render": function ( data, type, row ) {
74 74 
 	                		return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
75 75 
 	                	}
76 76 
 	                },
77 
-	                {
78 
-	                	"data": 'updateTime',
79 
-	                	"visible" : false,
77 
+	                {
78 
+	                	"data": 'updateTime',
79 
+	                	"visible" : false,
80 80 
 	                	"render": function ( data, type, row ) {
81 81 
 	                		return data?moment(new Date(data)).format("YYYY-MM-DD HH:mm:ss"):"";
82 82 
 	                	}
83 83 
 	                },
84 84 
 	                { "data": 'author', "visible" : true, "width":'10%'},
85 85 
 	                { "data": 'alarmEmail', "visible" : false},
86 
-	                {
86 
+	                {
87 87 
 	                	"data": 'triggerStatus',
88 88 
 						"width":'10%',
89 89 
 	                	"visible" : true,
 
@@ -181,14 +181,14 @@ $(function() {
181 181 
 	$('#searchBtn').on('click', function(){
182 182 
 		jobTable.fnDraw();
183 183 
 	});
184 
-
184 
+
185 185 
 	// jobGroup change
186 186 
 	$('#jobGroup').on('change', function(){
187 187 
         //reload
188 188 
         var jobGroup = $('#jobGroup').val();
189 189 
         window.location.href = base_url + "/jobinfo?jobGroup=" + jobGroup;
190 190 
     });
191 
-
191 
+
192 192 
 	// job operate
193 193 
 	$("#job_list").on('click', '.job_operate',function() {
194 194 
 		var typeName;
 
@@ -211,7 +211,7 @@ $(function() {
211 211 
 		} else {
212 212 
 			return;
213 213 
 		}
214 
-
214 
+
215 215 
 		var id = $(this).parents('ul').attr("_id");
216 216
217 217 
 		layer.confirm( I18n.system_ok + typeName + '?', {
 
@@ -319,14 +319,14 @@ $(function() {
319 319 
 	$(".add").click(function(){
320 320
321 321 
 		// init
322 
-        //$("#addModal .form input[name='jobCron']").cronGen({});
322 
+        $("#addModal .form input[name='jobCron']").cronGen({});
323 323
324 324 
 		$('#addModal').modal({backdrop: false, keyboard: false}).modal('show');
325 325 
 	});
326 326 
 	var addModalValidate = $("#addModal .form").validate({
327 
-		errorElement : 'span',
327 
+		errorElement : 'span',
328 328 
         errorClass : 'help-block',
329 
-        focusInvalid : true,
329 
+        focusInvalid : true,
330 330 
         rules : {
331 331 
 			jobDesc : {
332 332 
 				required : true,
 
@@ -344,8 +344,8 @@ $(function() {
344 344 
             executorFailRetryCount : {
345 345 
                 digits:true
346 346 
             }
347 
-        },
348 
-        messages : {
347 
+        },
348 
+        messages : {
349 349 
             jobDesc : {
350 350 
             	required : I18n.system_please_input + I18n.jobinfo_field_jobdesc
351 351 
             },
 
@@ -362,15 +362,15 @@ $(function() {
362 362 
                 digits: I18n.system_please_input + I18n.system_digits
363 363 
             }
364 364 
         },
365 
-		highlight : function(element) {
366 
-            $(element).closest('.form-group').addClass('has-error');
365 
+		highlight : function(element) {
366 
+            $(element).closest('.form-group').addClass('has-error');
367 367 
         },
368 
-        success : function(label) {
369 
-            label.closest('.form-group').removeClass('has-error');
370 
-            label.remove();
368 
+        success : function(label) {
369 
+            label.closest('.form-group').removeClass('has-error');
370 
+            label.remove();
371 371 
         },
372 
-        errorPlacement : function(error, element) {
373 
-            element.parent('div').append(error);
372 
+        errorPlacement : function(error, element) {
373 
+            element.parent('div').append(error);
374 374 
         },
375 375 
         submitHandler : function(form) {
376 376 
 
@@ -414,6 +414,8 @@ $(function() {
414 414 
 	$("#addModal").on('hide.bs.modal', function () {
415 415 
 		$("#addModal .form")[0].reset();
416 416 
 		addModalValidate.resetForm();
417 
+		// 清理 cronGen
418 
+		$("input[name=jobCron]").show().siblings().remove();
417 419 
 		$("#addModal .form .form-group").removeClass("has-error");
418 420 
 		$(".remote_panel").show();	// remote
419 421 
 
@@ -446,7 +448,7 @@ $(function() {
446 448 
 		} else if ('GLUE_PHP'==glueType){
447 449 
             $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_php").val() );
448 450 
         } else if ('GLUE_NODEJS'==glueType){
449 
-			$("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_nodejs").val() );
451 
+			$("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_nodejs").val() );
450 452 
 		} else if ('GLUE_POWERSHELL'==glueType){
451 453 
             $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_powershell").val() );
452 454 
         } else {
 
@@ -479,13 +481,13 @@ $(function() {
479 481 
         $("#updateModal .form select[name=glueType]").change();
480 482
481 483 
         // init
482 
-        //$("#updateModal .form input[name='jobCron']").cronGen({});
484 
+        $("#updateModal .form input[name='jobCron']").cronGen({});
483 485
484 486 
 		// show
485 487 
 		$('#updateModal').modal({backdrop: false, keyboard: false}).modal('show');
486 488 
 	});
487 489 
 	var updateModalValidate = $("#updateModal .form").validate({
488 
-		errorElement : 'span',
490 
+		errorElement : 'span',
489 491 
         errorClass : 'help-block',
490 492 
         focusInvalid : true,
491 493 
 
@@ -525,14 +527,14 @@ $(function() {
525 527 
             }
526 528 
 		},
527 529 
 		highlight : function(element) {
528 
-            $(element).closest('.form-group').addClass('has-error');
530 
+            $(element).closest('.form-group').addClass('has-error');
529 531 
         },
530 
-        success : function(label) {
531 
-            label.closest('.form-group').removeClass('has-error');
532 
-            label.remove();
532 
+        success : function(label) {
533 
+            label.closest('.form-group').removeClass('has-error');
534 
+            label.remove();
533 535 
         },
534 
-        errorPlacement : function(error, element) {
535 
-            element.parent('div').append(error);
536 
+        errorPlacement : function(error, element) {
537 
+            element.parent('div').append(error);
536 538 
         },
537 539 
         submitHandler : function(form) {
538 540 
 
@@ -574,7 +576,9 @@ $(function() {
574 576 
 		}
575 577 
 	});
576 578 
 	$("#updateModal").on('hide.bs.modal', function () {
577 
-		$("#updateModal .form")[0].reset()
579 
+		$("#updateModal .form")[0].reset();
580 
+		// 清理 cronGen
581 
+		$("input[name=jobCron]").show().siblings().remove();
578 582 
 	});
579 583
580 584 
     /**

+ 64 - 64
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js View File 

@@ -1,5 +1,5 @@
1 1 
 (function ($) {
2 
-    var resultsName = "";
2 
+    // var resultsName = "";
3 3 
     var inputElement;
4 4 
     var displayElement;
5 5 
     $.fn.extend({
 
@@ -34,7 +34,7 @@
34 34 
             $("<input/>",{type : "radio", value : "1", name : "second"}).appendTo(seconds1);
35 35 
             $(seconds1).append("每秒 允许的通配符[, - * /]");
36 36 
             $(seconds1).appendTo(secondsTab);
37 
-
37 
+
38 38 
             var seconds2 = $("<div/>",{"class":"line"});
39 39 
             $("<input/>",{type : "radio", value : "2", name : "second"}).appendTo(seconds2);
40 40 
             $(seconds2).append("周期 从");
 
@@ -43,7 +43,7 @@
43 43 
             $("<input/>",{type : "text", id : "secondEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(seconds2);
44 44 
             $(seconds2).append("秒");
45 45 
             $(seconds2).appendTo(secondsTab);
46 
-
46 
+
47 47 
             var seconds3 = $("<div/>",{"class":"line"});
48 48 
             $("<input/>",{type : "radio", value : "3", name : "second"}).appendTo(seconds3);
49 49 
             $(seconds3).append("从");
 
@@ -52,12 +52,12 @@
52 52 
             $("<input/>",{type : "text", id : "secondEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(seconds3);
53 53 
             $(seconds3).append("秒执行一次");
54 54 
             $(seconds3).appendTo(secondsTab);
55 
-
55 
+
56 56 
             var seconds4 = $("<div/>",{"class":"line"});
57 57 
             $("<input/>",{type : "radio", value : "4", name : "second", id: "sencond_appoint"}).appendTo(seconds4);
58 58 
             $(seconds4).append("指定");
59 59 
             $(seconds4).appendTo(secondsTab);
60 
-
60 
+
61 61 
             $(secondsTab).append('<div class="imp secondList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="0">00<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="1">01<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="2">02<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="3">03<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="4">04<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="5">05<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="6">06<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="7">07<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="8">08<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="9">09</div>');
62 62 
             $(secondsTab).append('<div class="imp secondList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="10">10<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="11">11<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="12">12<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="13">13<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="14">14<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="15">15<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="16">16<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="17">17<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="18">18<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="19">19</div>');
63 63 
             $(secondsTab).append('<div class="imp secondList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="20">20<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="21">21<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="22">22<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="23">23<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="24">24<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="25">25<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="26">26<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="27">27<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="28">28<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="29">29</div>');
 
@@ -66,15 +66,15 @@
66 66 
             $(secondsTab).append('<div class="imp secondList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="50">50<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="51">51<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="52">52<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="53">53<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="54">54<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="55">55<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="56">56<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="57">57<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="58">58<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="59">59</div>');
67 67 
             $("<input/>",{type : "hidden", id : "secondHidden"}).appendTo(secondsTab);
68 68 
             $(secondsTab).appendTo(tabContent);
69 
-
69 
+
70 70 
             //creating the minutesTab
71 71 
             var minutesTab = $("<div/>", { "class": "tab-pane", id: "Minutes" });
72 
-
72 
+
73 73 
             var minutes1 = $("<div/>",{"class":"line"});
74 74 
             $("<input/>",{type : "radio", value : "1", name : "min"}).appendTo(minutes1);
75 75 
             $(minutes1).append("每分钟 允许的通配符[, - * /]");
76 76 
             $(minutes1).appendTo(minutesTab);
77 
-
77 
+
78 78 
             var minutes2 = $("<div/>",{"class":"line"});
79 79 
             $("<input/>",{type : "radio", value : "2", name : "min"}).appendTo(minutes2);
80 80 
             $(minutes2).append("周期 从");
 
@@ -83,7 +83,7 @@
83 83 
             $("<input/>",{type : "text", id : "minEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(minutes2);
84 84 
             $(minutes2).append("分钟");
85 85 
             $(minutes2).appendTo(minutesTab);
86 
-
86 
+
87 87 
             var minutes3 = $("<div/>",{"class":"line"});
88 88 
             $("<input/>",{type : "radio", value : "3", name : "min"}).appendTo(minutes3);
89 89 
             $(minutes3).append("从");
 
@@ -92,12 +92,12 @@
92 92 
             $("<input/>",{type : "text", id : "minEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(minutes3);
93 93 
             $(minutes3).append("分钟执行一次");
94 94 
             $(minutes3).appendTo(minutesTab);
95 
-
95 
+
96 96 
             var minutes4 = $("<div/>",{"class":"line"});
97 97 
             $("<input/>",{type : "radio", value : "4", name : "min", id: "min_appoint"}).appendTo(minutes4);
98 98 
             $(minutes4).append("指定");
99 99 
             $(minutes4).appendTo(minutesTab);
100 
-
100 
+
101 101 
             $(minutesTab).append('<div class="imp minList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="0">00<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="1">01<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="2">02<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="3">03<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="4">04<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="5">05<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="6">06<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="7">07<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="8">08<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="9">09</div>');
102 102 
             $(minutesTab).append('<div class="imp minList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="10">10<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="11">11<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="12">12<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="13">13<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="14">14<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="15">15<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="16">16<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="17">17<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="18">18<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="19">19</div>');
103 103 
             $(minutesTab).append('<div class="imp minList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="20">20<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="21">21<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="22">22<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="23">23<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="24">24<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="25">25<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="26">26<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="27">27<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="28">28<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="29">29</div>');
 
@@ -106,7 +106,7 @@
106 106 
             $(minutesTab).append('<div class="imp minList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="50">50<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="51">51<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="52">52<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="53">53<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="54">54<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="55">55<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="56">56<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="57">57<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="58">58<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="59">59</div>');
107 107 
             $("<input/>",{type : "hidden", id : "minHidden"}).appendTo(minutesTab);
108 108 
             $(minutesTab).appendTo(tabContent);
109 
-
109 
+
110 110 
             //creating the hourlyTab
111 111 
             var hourlyTab = $("<div/>", { "class": "tab-pane", id: "Hourly" });
112 112 
 
@@ -114,7 +114,7 @@
114 114 
             $("<input/>",{type : "radio", value : "1", name : "hour"}).appendTo(hourly1);
115 115 
             $(hourly1).append("每小时 允许的通配符[, - * /]");
116 116 
             $(hourly1).appendTo(hourlyTab);
117 
-
117 
+
118 118 
             var hourly2 = $("<div/>",{"class":"line"});
119 119 
             $("<input/>",{type : "radio", value : "2", name : "hour"}).appendTo(hourly2);
120 120 
             $(hourly2).append("周期 从");
 
@@ -123,7 +123,7 @@
123 123 
             $("<input/>",{type : "text", id : "hourEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(hourly2);
124 124 
             $(hourly2).append("小时");
125 125 
             $(hourly2).appendTo(hourlyTab);
126 
-
126 
+
127 127 
             var hourly3 = $("<div/>",{"class":"line"});
128 128 
             $("<input/>",{type : "radio", value : "3", name : "hour"}).appendTo(hourly3);
129 129 
             $(hourly3).append("从");
 
@@ -132,19 +132,19 @@
132 132 
             $("<input/>",{type : "text", id : "hourEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(hourly3);
133 133 
             $(hourly3).append("小时执行一次");
134 134 
             $(hourly3).appendTo(hourlyTab);
135 
-
135 
+
136 136 
             var hourly4 = $("<div/>",{"class":"line"});
137 137 
             $("<input/>",{type : "radio", value : "4", name : "hour", id: "hour_appoint"}).appendTo(hourly4);
138 138 
             $(hourly4).append("指定");
139 139 
             $(hourly4).appendTo(hourlyTab);
140 
-
140 
+
141 141 
             $(hourlyTab).append('<div class="imp hourList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="0">00<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="1">01<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="2">02<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="3">03<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="4">04<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="5">05</div>');
142 142 
             $(hourlyTab).append('<div class="imp hourList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="6">06<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="7">07<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="8">08<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="9">09<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="10">10<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="11">11</div>');
143 143 
             $(hourlyTab).append('<div class="imp hourList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="12">12<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="13">13<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="14">14<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="15">15<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="16">16<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="17">17</div>');
144 144 
             $(hourlyTab).append('<div class="imp hourList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="18">18<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="19">19<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="20">20<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="21">21<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="22">22<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="23">23</div>');
145 145 
             $("<input/>",{type : "hidden", id : "hourHidden"}).appendTo(hourlyTab);
146 146 
             $(hourlyTab).appendTo(tabContent);
147 
-
147 
+
148 148
149 149 
             //creating the dailyTab
150 150 
             var dailyTab = $("<div/>", { "class": "tab-pane", id: "Daily" });
 
@@ -153,12 +153,12 @@
153 153 
             $("<input/>",{type : "radio", value : "1", name : "day"}).appendTo(daily1);
154 154 
             $(daily1).append("每天 允许的通配符[, - * / L W]");
155 155 
             $(daily1).appendTo(dailyTab);
156 
-
156 
+
157 157 
             var daily5 = $("<div/>",{"class":"line"});
158 158 
             $("<input/>",{type : "radio", value : "2", name : "day"}).appendTo(daily5);
159 159 
             $(daily5).append("不指定");
160 160 
             $(daily5).appendTo(dailyTab);
161 
-
161 
+
162 162 
             var daily2 = $("<div/>",{"class":"line"});
163 163 
             $("<input/>",{type : "radio", value : "3", name : "day"}).appendTo(daily2);
164 164 
             $(daily2).append("周期 从");
 
@@ -167,7 +167,7 @@
167 167 
             $("<input/>",{type : "text", id : "dayEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(daily2);
168 168 
             $(daily2).append("日");
169 169 
             $(daily2).appendTo(dailyTab);
170 
-
170 
+
171 171 
             var daily3 = $("<div/>",{"class":"line"});
172 172 
             $("<input/>",{type : "radio", value : "4", name : "day"}).appendTo(daily3);
173 173 
             $(daily3).append("从");
 
@@ -176,32 +176,32 @@
176 176 
             $("<input/>",{type : "text", id : "dayEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(daily3);
177 177 
             $(daily3).append("天执行一次");
178 178 
             $(daily3).appendTo(dailyTab);
179 
-
179 
+
180 180 
             var daily6 = $("<div/>",{"class":"line"});
181 181 
             $("<input/>",{type : "radio", value : "5", name : "day"}).appendTo(daily6);
182 182 
             $(daily6).append("每月");
183 183 
             $("<input/>",{type : "text", id : "dayStart_2", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(daily6);
184 184 
             $(daily6).append("号最近的那个工作日");
185 185 
             $(daily6).appendTo(dailyTab);
186 
-
186 
+
187 187 
             var daily7 = $("<div/>",{"class":"line"});
188 188 
             $("<input/>",{type : "radio", value : "6", name : "day"}).appendTo(daily7);
189 189 
             $(daily7).append("本月最后一天");
190 190 
             $(daily7).appendTo(dailyTab);
191 
-
191 
+
192 192 
             var daily4 = $("<div/>",{"class":"line"});
193 193 
             $("<input/>",{type : "radio", value : "7", name : "day", id: "day_appoint"}).appendTo(daily4);
194 194 
             $(daily4).append("指定");
195 195 
             $(daily4).appendTo(dailyTab);
196 
-
196 
+
197 197 
             $(dailyTab).append('<div class="imp dayList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="1">01<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="2">02<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="3">03<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="4">04<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="5">05<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="6">06<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="7">07<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="8">08<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="9">09<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="10">10</div>');
198 198 
             $(dailyTab).append('<div class="imp dayList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="11">11<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="12">12<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="13">13<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="14">14<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="15">15<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="16">16<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="17">17<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="18">18<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="19">19<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="20">20</div>');
199 199 
             $(dailyTab).append('<div class="imp dayList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="21">21<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="22">22<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="23">23<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="24">24<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="25">25<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="26">26<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="27">27<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="28">28<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="29">29<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="30">30</div>');
200 200 
             $(dailyTab).append('<div class="imp dayList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="31">31</div>');
201 201 
             $("<input/>",{type : "hidden", id : "dayHidden"}).appendTo(dailyTab);
202 202 
             $(dailyTab).appendTo(tabContent);
203 
-
204 
-
203 
+
204 
+
205 205 
             //creating the monthlyTab
206 206 
             var monthlyTab = $("<div/>", { "class": "tab-pane", id: "Monthly" });
207 207 
 
@@ -209,12 +209,12 @@
209 209 
             $("<input/>",{type : "radio", value : "1", name : "month"}).appendTo(monthly1);
210 210 
             $(monthly1).append("每月 允许的通配符[, - * /]");
211 211 
             $(monthly1).appendTo(monthlyTab);
212 
-
212 
+
213 213 
             var monthly2 = $("<div/>",{"class":"line"});
214 214 
             $("<input/>",{type : "radio", value : "2", name : "month"}).appendTo(monthly2);
215 215 
             $(monthly2).append("不指定");
216 216 
             $(monthly2).appendTo(monthlyTab);
217 
-
217 
+
218 218 
             var monthly3 = $("<div/>",{"class":"line"});
219 219 
             $("<input/>",{type : "radio", value : "3", name : "month"}).appendTo(monthly3);
220 220 
             $(monthly3).append("周期 从");
 
@@ -223,7 +223,7 @@
223 223 
             $("<input/>",{type : "text", id : "monthEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(monthly3);
224 224 
             $(monthly3).append("月");
225 225 
             $(monthly3).appendTo(monthlyTab);
226 
-
226 
+
227 227 
             var monthly4 = $("<div/>",{"class":"line"});
228 228 
             $("<input/>",{type : "radio", value : "4", name : "month"}).appendTo(monthly4);
229 229 
             $(monthly4).append("从");
 
@@ -232,12 +232,12 @@
232 232 
             $("<input/>",{type : "text", id : "monthEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(monthly4);
233 233 
             $(monthly4).append("月执行一次");
234 234 
             $(monthly4).appendTo(monthlyTab);
235 
-
235 
+
236 236 
             var monthly5 = $("<div/>",{"class":"line"});
237 237 
             $("<input/>",{type : "radio", value : "5", name : "month", id: "month_appoint"}).appendTo(monthly5);
238 238 
             $(monthly5).append("指定");
239 239 
             $(monthly5).appendTo(monthlyTab);
240 
-
240 
+
241 241 
             $(monthlyTab).append('<div class="imp monthList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="1">01<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="2">02<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="3">03<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="4">04<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="5">05<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="6">06</div>');
242 242 
             $(monthlyTab).append('<div class="imp monthList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="7">07<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="8">08<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="9">09<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="10">10<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="11">11<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="12">12</div>');
243 243 
             $("<input/>",{type : "hidden", id : "monthHidden"}).appendTo(monthlyTab);
 
@@ -245,17 +245,17 @@
245 245
246 246 
             //creating the weeklyTab
247 247 
             var weeklyTab = $("<div/>", { "class": "tab-pane", id: "Weekly" });
248 
-
248 
+
249 249 
             var weekly1 = $("<div/>",{"class":"line"});
250 250 
             $("<input/>",{type : "radio", value : "1", name : "week"}).appendTo(weekly1);
251 251 
             $(weekly1).append("每周 允许的通配符[, - * / L #]");
252 252 
             $(weekly1).appendTo(weeklyTab);
253 
-
253 
+
254 254 
             var weekly2 = $("<div/>",{"class":"line"});
255 255 
             $("<input/>",{type : "radio", value : "2", name : "week"}).appendTo(weekly2);
256 256 
             $(weekly2).append("不指定");
257 257 
             $(weekly2).appendTo(weeklyTab);
258 
-
258 
+
259 259 
             var weekly3 = $("<div/>",{"class":"line"});
260 260 
             $("<input/>",{type : "radio", value : "3", name : "week"}).appendTo(weekly3);
261 261 
             $(weekly3).append("周期 从星期");
 
@@ -263,7 +263,7 @@
263 263 
             $(weekly3).append("-");
264 264 
             $("<input/>",{type : "text", id : "weekEnd_0", value : "2", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly3);
265 265 
             $(weekly3).appendTo(weeklyTab);
266 
-
266 
+
267 267 
             var weekly4 = $("<div/>",{"class":"line"});
268 268 
             $("<input/>",{type : "radio", value : "4", name : "week"}).appendTo(weekly4);
269 269 
             $(weekly4).append("第");
 
@@ -271,36 +271,36 @@
271 271 
             $(weekly4).append("周的星期");
272 272 
             $("<input/>",{type : "text", id : "weekEnd_1", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly4);
273 273 
             $(weekly4).appendTo(weeklyTab);
274 
-
274 
+
275 275 
             var weekly5 = $("<div/>",{"class":"line"});
276 276 
             $("<input/>",{type : "radio", value : "5", name : "week"}).appendTo(weekly5);
277 277 
             $(weekly5).append("本月最后一个星期");
278 278 
             $("<input/>",{type : "text", id : "weekStart_2", value : "1", style:"width:35px; height:20px; text-align: center; margin: 0 3px;"}).appendTo(weekly5);
279 279 
             $(weekly5).appendTo(weeklyTab);
280 
-
280 
+
281 281 
             var weekly6 = $("<div/>",{"class":"line"});
282 282 
             $("<input/>",{type : "radio", value : "6", name : "week", id: "week_appoint"}).appendTo(weekly6);
283 283 
             $(weekly6).append("指定");
284 284 
             $(weekly6).appendTo(weeklyTab);
285 
-
285 
+
286 286 
             $(weeklyTab).append('<div class="imp weekList"><input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="1">1<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="2">2<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="3">3<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="4">4<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="5">5<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="6">6<input type="checkbox" disabled="disabled" style="margin-left: 5px"  value="7">7</div>');
287 
-
287 
+
288 288 
             $("<input/>",{type : "hidden", id : "weekHidden"}).appendTo(weeklyTab);
289 289 
             $(weeklyTab).appendTo(tabContent);
290 290
291 291 
             //creating the yearlyTab
292 292 
             var yearlyTab = $("<div/>", { "class": "tab-pane", id: "Yearly" });
293 
-
293 
+
294 294 
             var yearly1 = $("<div/>",{"class":"line"});
295 295 
             $("<input/>",{type : "radio", value : "1", name : "year"}).appendTo(yearly1);
296 296 
             $(yearly1).append("不指定 允许的通配符[, - * /] 非必填");
297 297 
             $(yearly1).appendTo(yearlyTab);
298 
-
298 
+
299 299 
             var yearly3 = $("<div/>",{"class":"line"});
300 300 
             $("<input/>",{type : "radio", value : "2", name : "year"}).appendTo(yearly3);
301 301 
             $(yearly3).append("每年");
302 302 
             $(yearly3).appendTo(yearlyTab);
303 
-
303 
+
304 304 
             var yearly2 = $("<div/>",{"class":"line"});
305 305 
             $("<input/>",{type : "radio", value : "3", name : "year"}).appendTo(yearly2);
306 306 
             $(yearly2).append("周期从");
 
@@ -311,18 +311,18 @@
311 311 
             $(yearly2).appendTo(yearlyTab);
312 312 
             $("<input/>",{type : "hidden", id : "yearHidden"}).appendTo(yearlyTab);
313 313 
             $(yearlyTab).appendTo(tabContent);
314 
-
314 
+
315 315 
             $(tabContent).appendTo(span12);
316 316
317 
-            //creating the button and results input
318 
-            resultsName = $(this).prop("id");
319 
-            $(this).prop("name", resultsName);
317 
+            //creating the button and results input
318 
+            // resultsName = $(this).prop("id");
319 
+            // $(this).prop("name", resultsName);
320 320
321 321 
             $(span12).appendTo(row);
322 322 
             $(row).appendTo(container);
323 323 
             $(container).appendTo(mainDiv);
324 324 
             $(cronContainer).append(mainDiv);
325 
-
325 
+
326 326 
             var that = $(this);
327 327
328 328 
             // Hide the original input
 
@@ -355,18 +355,18 @@
355 355
356 356 
             }).on('click', function (e) {
357 357 
                 e.preventDefault();
358 
-
358 
+
359 359 
                 //fillDataOfMinutesAndHoursSelectOptions();
360 360 
                 //fillDayWeekInMonth();
361 361 
                 //fillInWeekDays();
362 362 
                 //fillInMonths();
363 
-
363 
+
364 364 
                 $.fn.cronGen.tools.cronParse(inputElement.val());
365 
-
365 
+
366 366 
                 //绑定指定事件
367 367 
                 $.fn.cronGen.tools.initChangeEvent();
368 
-
369 
-
368 
+
369 
+
370 370 
                 $('#CronGenTabs a').click(function (e) {
371 371 
                     e.preventDefault();
372 372 
                     $(this).tab('show');
 
@@ -711,7 +711,7 @@
711 711 
                     secondList.eq(0).change();
712 712 
                 }
713 713 
             });
714 
-
714 
+
715 715 
             secondList.change(function() {
716 716 
                 var sencond_appoint = $("#sencond_appoint").prop("checked");
717 717 
                 if (sencond_appoint) {
 
@@ -723,14 +723,14 @@
723 723 
                     });
724 724 
                     var val = "?";
725 725 
                     if (vals.length > 0 && vals.length < 59) {
726 
-                        val = vals.join(",");
726 
+                        val = vals.join(",");
727 727 
                     }else if(vals.length == 59){
728 728 
                         val = "*";
729 729 
                     }
730 730 
                     $("#secondHidden").val(val);
731 731 
                 }
732 732 
             });
733 
-
733 
+
734 734 
             var minList = $(".minList").children();
735 735 
             $("#min_appoint").click(function(){
736 736 
                 if (this.checked) {
 
@@ -740,7 +740,7 @@
740 740 
                     minList.eq(0).change();
741 741 
                 }
742 742 
             });
743 
-
743 
+
744 744 
             minList.change(function() {
745 745 
                 var min_appoint = $("#min_appoint").prop("checked");
746 746 
                 if (min_appoint) {
 
@@ -759,7 +759,7 @@
759 759 
                     $("#minHidden").val(val);
760 760 
                 }
761 761 
             });
762 
-
762 
+
763 763 
             var hourList = $(".hourList").children();
764 764 
             $("#hour_appoint").click(function(){
765 765 
                 if (this.checked) {
 
@@ -769,7 +769,7 @@
769 769 
                     hourList.eq(0).change();
770 770 
                 }
771 771 
             });
772 
-
772 
+
773 773 
             hourList.change(function() {
774 774 
                 var hour_appoint = $("#hour_appoint").prop("checked");
775 775 
                 if (hour_appoint) {
 
@@ -788,7 +788,7 @@
788 788 
                     $("#hourHidden").val(val);
789 789 
                 }
790 790 
             });
791 
-
791 
+
792 792 
             var dayList = $(".dayList").children();
793 793 
             $("#day_appoint").click(function(){
794 794 
                 if (this.checked) {
 
@@ -798,7 +798,7 @@
798 798 
                     dayList.eq(0).change();
799 799 
                 }
800 800 
             });
801 
-
801 
+
802 802 
             dayList.change(function() {
803 803 
                 var day_appoint = $("#day_appoint").prop("checked");
804 804 
                 if (day_appoint) {
 
@@ -817,7 +817,7 @@
817 817 
                    $("#dayHidden").val(val);
818 818 
                 }
819 819 
             });
820 
-
820 
+
821 821 
             var monthList = $(".monthList").children();
822 822 
             $("#month_appoint").click(function(){
823 823 
                 if (this.checked) {
 
@@ -827,7 +827,7 @@
827 827 
                     monthList.eq(0).change();
828 828 
                 }
829 829 
             });
830 
-
830 
+
831 831 
             monthList.change(function() {
832 832 
                 var month_appoint = $("#month_appoint").prop("checked");
833 833 
                 if (month_appoint) {
 
@@ -846,7 +846,7 @@
846 846 
                     $("#monthHidden").val(val);
847 847 
                 }
848 848 
             });
849 
-
849 
+
850 850 
             var weekList = $(".weekList").children();
851 851 
             $("#week_appoint").click(function(){
852 852 
                 if (this.checked) {
 
@@ -856,7 +856,7 @@
856 856 
                     weekList.eq(0).change();
857 857 
                 }
858 858 
             });
859 
-
859 
+
860 860 
             weekList.change(function() {
861 861 
                 var week_appoint = $("#week_appoint").prop("checked");
862 862 
                 if (week_appoint) {