Index: arms/html/searchEngine/content-container.html =================================================================== diff -u -r5132b42e958a7e40da45d8bcbcf3e08b70a69e86 -ra6b4b3a5a48c93972d4392b32acba2230e2781d0 --- arms/html/searchEngine/content-container.html (.../content-container.html) (revision 5132b42e958a7e40da45d8bcbcf3e08b70a69e86) +++ arms/html/searchEngine/content-container.html (.../content-container.html) (revision a6b4b3a5a48c93972d4392b32acba2230e2781d0) @@ -448,7 +448,7 @@
+ style="margin: 10px 5px; border-bottom: 1px;">
- @@ -1135,32 +1092,28 @@
  • ✔ _id : + id="detail_id_log"> mock_id
  • ✔ _index : + id="detail_index_log"> fluentD-2024-02-14
  • ✔ _score : + id="detail_score_log"> -
  • ✔ _type : + id="detail_type_log"> fluentD_type
    • @@ -1188,42 +1141,37 @@
  • ✔ 로그명 : + id="detail_modal_logname_log"> 4
  • ✔ timestamp : + id="detail_modal_timestamp_log"> 4
  • ✔ source : + id="detail_modal_source_log"> 4
  • ✔ container_id (12자리) : + id="detail_modal_container_id_log"> 4
  • ✔ container_name : + id="detail_modal_container_name_log"> 4
    • @@ -1238,25 +1186,27 @@ style="overflow: hidden">

    - - - 로그 정보 - + + + 로그 정보 +

    - + 
    +																												
+																												
+
    Index: arms/js/searchEngine.js =================================================================== diff -u -r1b5d1825e7047437506d5eae0069d86423eda05b -ra6b4b3a5a48c93972d4392b32acba2230e2781d0 --- arms/js/searchEngine.js (.../searchEngine.js) (revision 1b5d1825e7047437506d5eae0069d86423eda05b) +++ arms/js/searchEngine.js (.../searchEngine.js) (revision a6b4b3a5a48c93972d4392b32acba2230e2781d0) @@ -29,6 +29,7 @@ [ "../reference/lightblue4/docs/lib/slimScroll/jquery.slimscroll.min.js", "../reference/jquery-plugins/unityping-0.1.0/dist/jquery.unityping.min.js", + "../reference/lightblue4/docs/lib/nvd3/build/nv.d3.min.js", "../reference/lightblue4/docs/lib/widgster/widgster.js" ], @@ -47,8 +48,16 @@ "../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/pdfmake.min.js" ], [ + "../reference/jquery-plugins/highlight.js-11.9.0/highlight.js/highlight.min.js", + "../reference/jquery-plugins/highlight.js-11.9.0/src/styles/arta.css", + "css/searchEngine.css", - "js/searchEngine/searchApiModule.js" + "js/searchEngine/searchApiModule.js", + //날짜 검색 + "../reference/light-blue/lib/bootstrap-datepicker.js", + "../reference/jquery-plugins/datetimepicker-2.5.20/build/jquery.datetimepicker.min.css", + "../reference/jquery-plugins/datetimepicker-2.5.20/build/jquery.datetimepicker.full.min.js", + ] // 추가적인 플러그인 그룹들을 이곳에 추가하면 됩니다. ]; @@ -67,25 +76,8 @@ document.head.appendChild(script); }, 2000); // 2초 후에 실행됩니다. - // --- 에디터 설정 --- // - var waitCKEDITOR = setInterval(function () { - try { - if (window.CKEDITOR) { - if(window.CKEDITOR.status == "loaded"){ - // 모달의 에디터를 각 모달 종류마다 해야하는지 검토. - CKEDITOR.replace("modal_detail_log",{ skin: "office2013" }); - CKEDITOR.replace("modal_detail_log_jiraissue",{ skin: "office2013" }); - CKEDITOR.replace("modal_detail_log_log",{ skin: "office2013" }); - // 추가로 에디터 설정이 필요한 경우 여기에 추가 - clearInterval(waitCKEDITOR); - } - } - } catch (err) { - console.log("CKEDITOR 로드가 완료되지 않아서 초기화 재시도 중..."); - } - }, 313 /*milli*/); - - + //highlight.js 설정. + hljs.highlightAll(); eventListenersActivator(); //페이지 로드 시 - 상단 검색 확인 checkQueryStringOnUrl(); Index: arms/js/searchEngine/searchApiModule.js =================================================================== diff -u -r5132b42e958a7e40da45d8bcbcf3e08b70a69e86 -ra6b4b3a5a48c93972d4392b32acba2230e2781d0 --- arms/js/searchEngine/searchApiModule.js (.../searchApiModule.js) (revision 5132b42e958a7e40da45d8bcbcf3e08b70a69e86) +++ arms/js/searchEngine/searchApiModule.js (.../searchApiModule.js) (revision a6b4b3a5a48c93972d4392b32acba2230e2781d0) @@ -68,7 +68,8 @@ let hits_total = 0; if(hitsTotal) { hits_total = hitsTotal; - $("#"+search_section+"_section .search_results_total").text("'총 "+hitsTotal+"건'"); + let total_text = (hitsTotal >= 10000 ? " 10000건 이상" : "'총"+hits_total+"건'"); + $("#"+search_section+"_section .search_results_total").text(total_text); $("#"+search_section+"_section .search_results_total").css("color","#a4c6ff"); } else { $("#"+search_section+"_section .search_results_total").text("0건"); @@ -250,7 +251,12 @@ } else { $("#search_detail_modal_jiraissue #detail_modal_assignee_name_jiraissue").text("담당자 정보 없음"); } - CKEDITOR.instances.modal_detail_log_jiraissue.setData(JSON.stringify(targetData)); + + $("#search_detail_modal_jiraissue #modal_detail_log_jiraissue").html(""); + var stringify = JSON.stringify(targetData, undefined, 4); + var prettify = hljs.highlight(stringify,{language : "JSON" }).value; + + $("#search_detail_modal_jiraissue #modal_detail_log_jiraissue").html(prettify); } else if (search_section === "log") { $("#search_detail_modal_log #detail_id_log").text(targetData["id"]); @@ -264,7 +270,11 @@ $("#search_detail_modal_log #detail_modal_container_id_log").text(targetData["content"]["container_id"] === null? "-" : targetData["content"]["container_id"].substring(0,12)); $("#search_detail_modal_log #detail_modal_container_name_log").text(targetData["content"]["container_name"]); - CKEDITOR.instances.modal_detail_log_log.setData(JSON.stringify(targetData["content"]["log"])); + $("#search_detail_modal_log #modal_detail_log_log").html(""); + var stringify = JSON.stringify(targetData["content"], undefined, 4); + var prettify = hljs.highlight(stringify,{language : "JSON" }).value; + $("#search_detail_modal_log #modal_detail_log_log").html(prettify); + } };