解决历史轨迹和历史状态查看失败原因看不了的问题

apache · Jun 29, 2017 · 02fdaee · 02fdaee
1 parent 8283acf
commit 02fdaee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...elastic-job-lite-console/src/main/resources/console/js/history/job_event_trace_history.js b/...elastic-job-lite-console/src/main/resources/console/js/history/job_event_trace_history.js
@@ -43,7 +43,8 @@ function splitFormatter(value) {
     var replacement = "...";
     if(null != value && value.length > maxLength) {
         var vauleDetail = value.substring(0 , maxLength - replacement.length) + replacement;
-        return '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value.replace(/\n/g,"<br/>") + '\')">' + vauleDetail + '</a>';
+        value = value.replace(/\n/g,"<br/>").replace(/\'/g, "\\'").replace(/\r/g,"<br/>");
+        return '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value + '\')">' + vauleDetail + '</a>';
     }
     return value;
 }
diff --git a/...lite/elastic-job-lite-console/src/main/resources/console/js/history/job_status_history.js b/...lite/elastic-job-lite-console/src/main/resources/console/js/history/job_status_history.js
@@ -29,7 +29,7 @@ function splitRemarkFormatter(value, row) {
     var replacement = "...";
     if(null != value && value.length > maxLength) {
         var valueDetail = value.substring(0 , maxLength - replacement.length) + replacement;
-        value = value.replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
+        value = value.replace(/\n/g,"<br/>").replace(/\'/g, "\\'").replace(/\r/g,"<br/>");
         var remarkHtml;
         if ("TASK_FAILED" === row.state || "TASK_ERROR" === row.state) {
             remarkHtml = '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value + '\')">' + valueDetail + '</a>';