Преглед изворни кода

任务日志列表交互优化,操作按钮合并为分割按钮;

xuxueli пре 6 година
родитељ
комит
0d1925fcbb
2 измењених фајлова са 38 додато и 27 уклоњено
  1. 1 0
      doc/XXL-JOB官方文档.md
  2. 37 27
      xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js

+ 1 - 0
doc/XXL-JOB官方文档.md Прегледај датотеку

1501
 - 14、调度组件销毁流程优化,先停止调度线程,然后等待时间轮内存量任务处理完成,最终销毁时间轮线程;
1501
 - 14、调度组件销毁流程优化,先停止调度线程,然后等待时间轮内存量任务处理完成,最终销毁时间轮线程;
1502
 - 15、执行器回调线程优化,回调地址为空时销毁问题修复;
1502
 - 15、执行器回调线程优化,回调地址为空时销毁问题修复;
1503
 - 16、任务日志主键调整为long,防止海量日志情况下数据溢出;
1503
 - 16、任务日志主键调整为long,防止海量日志情况下数据溢出;
1504
+- 17、任务日志列表交互优化,操作按钮合并为分割按钮;
1504
 
1505
 
1505
 
1506
 
1506
 ### 6.26 版本 v2.1.1 Release Notes[规划中]
1507
 ### 6.26 版本 v2.1.1 Release Notes[规划中]

+ 37 - 27
xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js Прегледај датотеку

33
 	                { 
33
 	                { 
34
 	                	"data": 'jobGroup', 
34
 	                	"data": 'jobGroup', 
35
 	                	"visible" : false,
35
 	                	"visible" : false,
36
-						"width":'20%',
37
 	                	"render": function ( data, type, row ) {
36
 	                	"render": function ( data, type, row ) {
38
 	            			var groupMenu = $("#jobGroup").find("option");
37
 	            			var groupMenu = $("#jobGroup").find("option");
39
 	            			for ( var index in $("#jobGroup").find("option")) {
38
 	            			for ( var index in $("#jobGroup").find("option")) {
100
 	                },
99
 	                },
101
 	                {
100
 	                {
102
 						"data": I18n.system_opt ,
101
 						"data": I18n.system_opt ,
103
-						"width":'15%',
102
+						"width":'10%',
104
 	                	"render": function ( data, type, row ) {
103
 	                	"render": function ( data, type, row ) {
105
 	                		return function(){
104
 	                		return function(){
106
-	                			// status
107
-	                			var start_stop = "";
105
+
106
+                                // status
107
+                                var start_stop_div = "";
108
                                 if (1 == row.triggerStatus ) {
108
                                 if (1 == row.triggerStatus ) {
109
-                                    start_stop = '<button class="btn btn-primary btn-xs job_operate" _type="job_pause" type="button">'+ I18n.jobinfo_opt_stop +'</button>  ';
109
+                                    start_stop_div = '<li><a href="javascript:void(0);" class="job_operate" _type="job_pause" >'+ I18n.jobinfo_opt_stop +'</a></li>\n';
110
                                 } else {
110
                                 } else {
111
-                                    start_stop = '<button class="btn btn-primary btn-xs job_operate" _type="job_resume" type="button">'+ I18n.jobinfo_opt_start +'</button>  ';
112
-								}
111
+                                    start_stop_div = '<li><a href="javascript:void(0);" class="job_operate" _type="job_resume" >'+ I18n.jobinfo_opt_start +'</a></li>\n';
112
+                                }
113
 
113
 
114
-	                			// log url
115
-	                			var logUrl = base_url +'/joblog?jobId='+ row.id;
116
-	                			
117
-	                			// log url
118
-	                			var codeBtn = "";
114
+                                // log url
115
+                                var logHref = base_url +'/joblog?jobId='+ row.id;
116
+
117
+                                // log url
118
+                                var codeBtn = "";
119
                                 if ('BEAN' != row.glueType) {
119
                                 if ('BEAN' != row.glueType) {
120
-									var codeUrl = base_url +'/jobcode?jobId='+ row.id;
121
-									codeBtn = '<a href="'+ codeUrl +'" target="_blank" > <button class="btn btn-warning btn-xs" type="button" >GLUE</button> </a> '
122
-								}
120
+                                    var codeUrl = base_url +'/jobcode?jobId='+ row.id;
121
+                                    codeBtn = '<li><a href="'+ codeUrl +'" target="_blank" >GLUE IDE</a></li>\n';
122
+                                }
123
 
123
 
124
-								// html
124
+                                // data
125
                                 tableData['key'+row.id] = row;
125
                                 tableData['key'+row.id] = row;
126
-								var html = '<p id="'+ row.id +'" >'+
127
-									'<button class="btn btn-primary btn-xs job_trigger" type="button">'+ I18n.jobinfo_opt_run +'</button>  '+
128
-                                    start_stop +
129
-									'<a href="'+ logUrl +'"> <button class="btn btn-primary btn-xs" type="job_del" type="button" >'+ I18n.jobinfo_opt_log +'</button> </a> <br>  '+
130
-									'<button class="btn btn-warning btn-xs update" type="button">'+ I18n.system_opt_edit +'</button>  '+
131
-									codeBtn +
132
-									'<button class="btn btn-danger btn-xs job_operate" _type="job_del" type="button">'+ I18n.system_opt_del +'</button>  '+
133
-									'</p>';
126
+
127
+                                // opt
128
+                                var html = '<div class="btn-group">\n' +
129
+                                    '     <button type="button" class="btn btn-primary btn-sm">'+ I18n.system_opt +'</button>\n' +
130
+                                    '     <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">\n' +
131
+                                    '       <span class="caret"></span>\n' +
132
+                                    '       <span class="sr-only">Toggle Dropdown</span>\n' +
133
+                                    '     </button>\n' +
134
+                                    '     <ul class="dropdown-menu" role="menu" _id="'+ row.id +'" >\n' +
135
+                                    '       <li><a href="javascript:void(0);" class="job_trigger" >'+ I18n.jobinfo_opt_run +'</a></li>\n' +
136
+                                    start_stop_div +
137
+                                    '       <li><a href="'+ logHref +'">'+ I18n.jobinfo_opt_log +'</a></li>\n' +
138
+                                    '       <li class="divider"></li>\n' +
139
+                                    '       <li><a href="javascript:void(0);" class="update" >'+ I18n.system_opt_edit +'</a></li>\n' +
140
+                                    codeBtn +
141
+                                    '       <li><a href="javascript:void(0);" class="job_operate" _type="job_del" >'+ I18n.system_opt_del +'</a></li>\n' +
142
+                                    '     </ul>\n' +
143
+                                    '   </div>';
134
 
144
 
135
 	                			return html;
145
 	                			return html;
136
 							};
146
 							};
201
 			return;
211
 			return;
202
 		}
212
 		}
203
 		
213
 		
204
-		var id = $(this).parent('p').attr("id");
214
+		var id = $(this).parents('ul').attr("_id");
205
 
215
 
206
 		layer.confirm( I18n.system_ok + typeName + '?', {
216
 		layer.confirm( I18n.system_ok + typeName + '?', {
207
 			icon: 3,
217
 			icon: 3,
234
 
244
 
235
     // job trigger
245
     // job trigger
236
     $("#job_list").on('click', '.job_trigger',function() {
246
     $("#job_list").on('click', '.job_trigger',function() {
237
-        var id = $(this).parent('p').attr("id");
247
+        var id = $(this).parents('ul').attr("_id");
238
         var row = tableData['key'+id];
248
         var row = tableData['key'+id];
239
 
249
 
240
         $("#jobTriggerModal .form input[name='id']").val( row.id );
250
         $("#jobTriggerModal .form input[name='id']").val( row.id );
404
 	// update
414
 	// update
405
 	$("#job_list").on('click', '.update',function() {
415
 	$("#job_list").on('click', '.update',function() {
406
 
416
 
407
-        var id = $(this).parent('p').attr("id");
417
+        var id = $(this).parents('ul').attr("_id");
408
         var row = tableData['key'+id];
418
         var row = tableData['key'+id];
409
 
419
 
410
 		// base data
420
 		// base data