From a93b55b8d224051ce157effa1274d5d0c19112c7 Mon Sep 17 00:00:00 2001 From: liuzx Date: Mon, 25 Apr 2022 15:06:46 +0800 Subject: [PATCH 1/3] fix-bug --- modules/cloudbrain/cloudbrain.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/cloudbrain/cloudbrain.go b/modules/cloudbrain/cloudbrain.go index eaf680c65..f1d3cb344 100755 --- a/modules/cloudbrain/cloudbrain.go +++ b/modules/cloudbrain/cloudbrain.go @@ -475,6 +475,7 @@ func RestartTask(ctx *context.Context, task *models.Cloudbrain, newID *string) e ComputeResource: task.ComputeResource, CreatedUnix: createTime, UpdatedUnix: createTime, + BranchName: task.BranchName, } err = models.RestartCloudbrain(task, newTask) From 935ea6dbac99e12177b60fa633accff282609f2d Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 25 Apr 2022 18:14:56 +0800 Subject: [PATCH 2/3] fix issue --- templates/repo/modelarts/trainjob/show.tmpl | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 36d1529c2..446e8b9f3 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -430,7 +430,7 @@ td, th { -
+

@@ -836,7 +836,21 @@ td, th {
             html += "
" $(`#dir_list${version_name}`).append(html) } + function debounce(fn,delay){ + let timer; + return (...args) => { + // 判断定时器是否存在,清除定时器 + if (timer) { + clearTimeout(timer); + } + // 重新调用setTimeout + timer = setTimeout(() => { + fn.apply(this, args); + }, delay); + }; + } + const fn = debounce(logScroll, 500) function logScroll(version_name) { let container = document.querySelector(`#log${version_name}`) let scrollTop = container.scrollTop @@ -867,7 +881,6 @@ td, th { }); } if([0,1,2,3,4,5,6,7,8,9,10].includes(scrollTop) && 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){ @@ -887,6 +900,7 @@ td, th { } function scrollAnimation(dom, currentY, targetY, currentX) { let needScrollTop = targetY - currentY; + console.log("---------",needScrollTop) let _currentY = currentY; setTimeout(() => { // 一次调用滑动帧数,每次调用会不一样 @@ -894,12 +908,12 @@ td, th { const dist = Math.ceil(needScrollTop / 10); _currentY += dist; //移动一个十分之一 - dom.scrollTo(currentX || 0, _currentY); + dom.scrollTo(currentX || 0, _currentY,'smooth'); // 如果移动幅度小于十个像素,直接移动,否则递归调用,实现动画效果 if (needScrollTop > 10 || needScrollTop < -10) { scrollAnimation(dom, _currentY, targetY) } else { - dom.scrollTo(0, targetY) + dom.scrollTo(0, targetY,'smooth') } }, 1) } From 8a6a9cfbeba528d58fb1234d3baf98dd14f97216 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 25 Apr 2022 18:16:24 +0800 Subject: [PATCH 3/3] fix issue --- templates/repo/modelarts/trainjob/show.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 446e8b9f3..3b370b26d 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -900,7 +900,6 @@ td, th { } function scrollAnimation(dom, currentY, targetY, currentX) { let needScrollTop = targetY - currentY; - console.log("---------",needScrollTop) let _currentY = currentY; setTimeout(() => { // 一次调用滑动帧数,每次调用会不一样