|
@@ -33,7 +33,6 @@ $(function() {
|
33
|
33
|
{
|
34
|
34
|
"data": 'jobGroup',
|
35
|
35
|
"visible" : false,
|
36
|
|
- "width":'20%',
|
37
|
36
|
"render": function ( data, type, row ) {
|
38
|
37
|
var groupMenu = $("#jobGroup").find("option");
|
39
|
38
|
for ( var index in $("#jobGroup").find("option")) {
|
|
@@ -100,37 +99,48 @@ $(function() {
|
100
|
99
|
},
|
101
|
100
|
{
|
102
|
101
|
"data": I18n.system_opt ,
|
103
|
|
- "width":'15%',
|
|
102
|
+ "width":'10%',
|
104
|
103
|
"render": function ( data, type, row ) {
|
105
|
104
|
return function(){
|
106
|
|
- // status
|
107
|
|
- var start_stop = "";
|
|
105
|
+
|
|
106
|
+ // status
|
|
107
|
+ var start_stop_div = "";
|
108
|
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
|
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
|
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
|
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
|
145
|
return html;
|
136
|
146
|
};
|
|
@@ -201,7 +211,7 @@ $(function() {
|
201
|
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
|
216
|
layer.confirm( I18n.system_ok + typeName + '?', {
|
207
|
217
|
icon: 3,
|
|
@@ -234,7 +244,7 @@ $(function() {
|
234
|
244
|
|
235
|
245
|
// job trigger
|
236
|
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
|
248
|
var row = tableData['key'+id];
|
239
|
249
|
|
240
|
250
|
$("#jobTriggerModal .form input[name='id']").val( row.id );
|
|
@@ -404,7 +414,7 @@ $(function() {
|
404
|
414
|
// update
|
405
|
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
|
418
|
var row = tableData['key'+id];
|
409
|
419
|
|
410
|
420
|
// base data
|