Merge branch 'train-job' of git.openi.org.cn:OpenI/aiforge into train-job

templates/repo/modelarts/trainjob/index.tmpl

@@ -214,7 +214,7 @@
                 const jobID = data.JobID
                 const status = data.JobStatus
                 $('#' + jobID).text(status)
-                    // console.log(data)
+                // console.log(data)
             }).fail(function(err) {
                 console.log(err);
             });

templates/repo/modelarts/trainjob/show.tmpl

@@ -113,22 +113,24 @@
                                     </div>
                                 </div>
                                 <div class="ui bottom attached tab segment" data-tab="logs">
-                                    <form class="ui form" action="{{$.Link}}/log" method="get">
+                                    <div class="ui message" style="display: none;">
+                                        <div class="header">
+                                        </div>
+                                    </div>
                                         <div class="ui top attached segment" style="background: #f0f0f0;">
                                             <div class="center aligned">
                                                 <label>{{$.i18n.Tr "repo.modelarts.log"}}:</label>
                                                 <span class="fitted file_name">{{.log_file_name}}</span>
-                                                <span class="fitted start_line">{{.log.StartLine}}</span>
-                                                <span class="fitted end_line">{{.log.EndLine}}</span>
                                                 <input type="hidden" name="file_name" value={{.log_file_name}}>
-                                                <input type="hidden" name="base_line" value="">
-                                                <input type="hidden" name="order" value="">
+                                                <input type="hidden"  name="start_line" value={{.log.StartLine}}>
+                                                <input type="hidden"  name="end_line" value={{.log.EndLine}}>
                                             </div>
                                         </div>
                                         <div class="ui attached segment log" style="height: 300px !important; overflow: auto;">
                                             <pre>{{.log.Content}}</pre>
                                         </div>
-                                    </form>
+                                        
+                                   </div>
                                 </div>
                         </div>
                     </div>
@@ -143,23 +145,56 @@
     $('.menu .item').tab()
     $('.ui.style.accordion').accordion();
 
+    var userName
+    var repoPath
+    var jobID
+    $(document).ready(function(){
+        var url = window.location.href;
+        var urlArr = url.split('/')
+        userName = urlArr.slice(-5)[0]
+        repoPath = urlArr.slice(-4)[0]
+        jobID = urlArr.slice(-1)[0]
+    })
+    
     $(".log").scroll(function () {
-        var scrollTop = $(this)[0].scrollTop;   // 滚动条Y轴的滚动距离
+        var scrollTop = $(this)[0].scrollTop;   // 滚动距离
         var scrollHeight = $(this)[0].scrollHeight;  // 文档高度
         var divHeight = $(this).height();   // 可视区高度
+        var file_name = $('input[name=file_name]').val()
 
-        var start_line = $('.fitted.start_line').text()
-        var end_line = $('.fitted.end_line').text()
-
-        if(scrollTop + divHeight + 50 >= scrollHeight){
-            $('input[name=base_line]').val(end_line)
-            $('input[name=order]').val("asc")
-            $('.ui.form').submit()
+        if(parseInt(scrollTop) + divHeight + 29 == scrollHeight){
+            var end_line = $('input[name=end_line]').val()
+            $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?file_name=${file_name}&base_line=${end_line}&order=asc`, (data) => {
+                if (data.lines == 0){
+                    $('.header').text('您已翻阅至日志底部')
+                    $('.message').css('display', 'block')
+                    setTimeout(function(){
+                        $('.message').css('display', 'none')     
+                    }, 1000)
+                }else{
+                    $('input[name=end_line]').val(data.EndLine)
+                    $('.log').append('<pre>' + data.Content  + '</pre>') 
+                }
+            }).fail(function(err) {
+                console.log(err);
+            });
         }
         if(scrollTop == 0){
-            $('input[name=base_line]').val(start_line)
-            $('input[name=order]').val("desc")
-            $('.ui.form').submit()
+            var start_line = $('input[name=start_line]').val()
+            $.get(`/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/log?file_name=${file_name}&base_line=${start_line}&order=desc`, (data) => {
+                if (data.lines == 0){
+                    $('.header').text('您已翻阅至日志底部')
+                    $('.message').css('display', 'block')
+                    setTimeout(function(){
+                        $('.message').css('display', 'none')     
+                    }, 1000)
+                }else{
+                    $('input[name=start_line]').val(data.StartLine)   //如果变动就改变所对应的值
+                    $(".log").prepend('<pre>' + data.Content + '/pre')
+                }
+            }).fail(function(err) {
+                console.log(err);
+            });
         }
     })
 </script>