From 0d1925fcbbfa3afca1faeeb4d9df60a175577eb9 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Sat, 6 Jul 2019 19:47:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96=EF=BC=8C=E6=93=8D?=
=?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE=E5=90=88=E5=B9=B6=E4=B8=BA=E5=88=86?=
=?UTF-8?q?=E5=89=B2=E6=8C=89=E9=92=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/XXL-JOB官方文档.md | 1 +
.../resources/static/js/jobinfo.index.1.js | 64 +++++++++++--------
2 files changed, 38 insertions(+), 27 deletions(-)
diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
index 40393da9..87879e44 100644
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@@ -1501,6 +1501,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
- 14、调度组件销毁流程优化，先停止调度线程，然后等待时间轮内存量任务处理完成，最终销毁时间轮线程；
- 15、执行器回调线程优化，回调地址为空时销毁问题修复；
- 16、任务日志主键调整为long，防止海量日志情况下数据溢出；
+- 17、任务日志列表交互优化，操作按钮合并为分割按钮；
### 6.26 版本 v2.1.1 Release Notes[规划中]
diff --git a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
index 01096a0f..c2204206 100644
--- a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
+++ b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
@@ -33,7 +33,6 @@ $(function() {
{
"data": 'jobGroup',
"visible" : false,
- "width":'20%',
"render": function ( data, type, row ) {
var groupMenu = $("#jobGroup").find("option");
for ( var index in $("#jobGroup").find("option")) {
@@ -100,37 +99,48 @@ $(function() {
},
{
"data": I18n.system_opt ,
- "width":'15%',
+ "width":'10%',
"render": function ( data, type, row ) {
return function(){
- // status
- var start_stop = "";
+
+ // status
+ var start_stop_div = "";
if (1 == row.triggerStatus ) {
- start_stop = ' ';
+ start_stop_div = ''+ I18n.jobinfo_opt_stop +'\n';
} else {
- start_stop = ' ';
- }
+ start_stop_div = ''+ I18n.jobinfo_opt_start +'\n';
+ }
- // log url
- var logUrl = base_url +'/joblog?jobId='+ row.id;
-
- // log url
- var codeBtn = "";
+ // log url
+ var logHref = base_url +'/joblog?jobId='+ row.id;
+
+ // log url
+ var codeBtn = "";
if ('BEAN' != row.glueType) {
- var codeUrl = base_url +'/jobcode?jobId='+ row.id;
- codeBtn = ' '
- }
+ var codeUrl = base_url +'/jobcode?jobId='+ row.id;
+ codeBtn = 'GLUE IDE\n';
+ }
- // html
+ // data
tableData['key'+row.id] = row;
- var html = ''+
- ' '+
- start_stop +
- '
'+
- ' '+
- codeBtn +
- ' '+
- '
';
+
+ // opt
+ var html = '\n' +
+ ' \n' +
+ ' \n' +
+ ' \n' +
+ '
';
return html;
};
@@ -201,7 +211,7 @@ $(function() {
return;
}
- var id = $(this).parent('p').attr("id");
+ var id = $(this).parents('ul').attr("_id");
layer.confirm( I18n.system_ok + typeName + '?', {
icon: 3,
@@ -234,7 +244,7 @@ $(function() {
// job trigger
$("#job_list").on('click', '.job_trigger',function() {
- var id = $(this).parent('p').attr("id");
+ var id = $(this).parents('ul').attr("_id");
var row = tableData['key'+id];
$("#jobTriggerModal .form input[name='id']").val( row.id );
@@ -404,7 +414,7 @@ $(function() {
// update
$("#job_list").on('click', '.update',function() {
- var id = $(this).parent('p').attr("id");
+ var id = $(this).parents('ul').attr("_id");
var row = tableData['key'+id];
// base data