Skip to content

Commit ce1996f

Browse files
committed
replace /r/n for history text display
1 parent f3397ad commit ce1996f

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_exec_details.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ function splitFormatter(value) {
4444
var replacement = "...";
4545
if(null != value && value.length > maxLength) {
4646
var vauleDetail = value.substring(0 , maxLength - replacement.length) + replacement;
47-
return '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value.replace(/\n/g,"<br/>") + '\')">' + vauleDetail + '</a>';
47+
value = value.replace(/\r\n/g,"<br/>").replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
48+
return '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value + '\')">' + vauleDetail + '</a>';
4849
}
4950
return value;
5051
}

elastic-job-cloud/elastic-job-cloud-scheduler/src/main/resources/console/js/history/job_exec_status.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function splitRemarkFormatter(value, row) {
3232
var replacement = "...";
3333
if(null != value && value.length > maxLength) {
3434
var valueDetail = value.substring(0 , maxLength - replacement.length) + replacement;
35-
value = value.replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
35+
value = value.replace(/\r\n/g,"<br/>").replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
3636
var remarkHtml;
3737
if ("TASK_FAILED" === row.state || "TASK_ERROR" === row.state) {
3838
remarkHtml = '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value + '\')">' + valueDetail + '</a>';

elastic-job-lite/elastic-job-lite-console/src/main/resources/console/js/history/job_event_trace_history.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ function splitFormatter(value) {
4343
var replacement = "...";
4444
if(null != value && value.length > maxLength) {
4545
var vauleDetail = value.substring(0 , maxLength - replacement.length) + replacement;
46-
return '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value.replace(/\n/g,"<br/>") + '\')">' + vauleDetail + '</a>';
46+
value = value.replace(/\r\n/g,"<br/>").replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
47+
return '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value + '\')">' + vauleDetail + '</a>';
4748
}
4849
return value;
4950
}

elastic-job-lite/elastic-job-lite-console/src/main/resources/console/js/history/job_status_history.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function splitRemarkFormatter(value, row) {
2929
var replacement = "...";
3030
if(null != value && value.length > maxLength) {
3131
var valueDetail = value.substring(0 , maxLength - replacement.length) + replacement;
32-
value = value.replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
32+
value = value.replace(/\r\n/g,"<br/>").replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
3333
var remarkHtml;
3434
if ("TASK_FAILED" === row.state || "TASK_ERROR" === row.state) {
3535
remarkHtml = '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value + '\')">' + valueDetail + '</a>';

0 commit comments

Comments
 (0)