From 158dc25c342efaebb41c2a043fb7a3bd69eeebdf Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Wed, 1 Dec 2021 17:12:16 +0800
Subject: [PATCH] fix issue

---
 templates/repo/modelarts/trainjob/show.tmpl        | 7 +++++--
 templates/repo/modelarts/trainjob/version_new.tmpl | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index a3fdddf38..cd85057de 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -474,6 +474,7 @@ td, th {
 
 <script>
     console.log({{.version_list_task}})
+    console.log({{.}})
     $('.menu .item').tab()
     // $('.ui.style.accordion').accordion();
 
@@ -709,11 +710,13 @@ td, th {
     }
     
     function logScroll(version_name) {
+       
         let container = document.querySelector(`#log${version_name}`)
         let scrollTop = container.scrollTop
         let scrollHeight = container.scrollHeight
         let clientHeight = container.clientHeight
-        if(parseInt(scrollTop)  + clientHeight == scrollHeight || parseInt(scrollTop)  + clientHeight +1 == scrollHeight || parseInt(scrollTop)  + clientHeight - 1 == scrollHeight){
+        let scrollLeft = container.scrollLeft
+        if((parseInt(scrollTop)  + clientHeight == scrollHeight || parseInt(scrollTop)  + clientHeight +1 == scrollHeight || parseInt(scrollTop)  + clientHeight - 1 == scrollHeight) && (scrollLeft===0)){
             let end_line = $(`#log${version_name} input[name=end_line]`).val()
             $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${end_line}&lines=50&order=desc`, (data) => {
                 if (data.Lines == 0){
@@ -736,7 +739,7 @@ td, th {
                 console.log(err);
             });
         }
-        if(scrollTop == 0){
+        if(scrollTop == 0 && scrollLeft==0){
             let start_line = $(`#log${version_name} input[name=start_line]`).val()
             $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?version_name=${version_name}&base_line=${start_line}&lines=50&order=asc`, (data) => {
                 if (data.Lines == 0){
diff --git a/templates/repo/modelarts/trainjob/version_new.tmpl b/templates/repo/modelarts/trainjob/version_new.tmpl
index 00086dd8b..18fcd844e 100644
--- a/templates/repo/modelarts/trainjob/version_new.tmpl
+++ b/templates/repo/modelarts/trainjob/version_new.tmpl
@@ -346,7 +346,7 @@
 {{template "base/footer" .}}
 
 <script>
-    let url_href = location.pathname.split('create_version')[0]
+    let url_href = location.pathname.split('/create_version')[0]
     let url_post = location.pathname
     let version_name = location.search.split('?version_name=')[1]
     $("#parents_version").val(version_name)