From f008690b00c05b81a60d2ef5fd7de5cb64206ce4 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 18 Apr 2022 10:46:12 +0800 Subject: [PATCH 1/6] fix issu --- templates/repo/modelarts/trainjob/show.tmpl | 34 ++++++++++++++++++++- web_src/less/openi.less | 17 +++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 0b420c484a..dea9b6aa07 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -420,7 +420,13 @@ td, th {
-
+
+ + + + + + @@ -879,4 +885,30 @@ td, th { }); } } + function scrollAnimation(dom, currentY, targetY, currentX) { + let needScrollTop = targetY - currentY; + let _currentY = currentY; + let context = this; + setTimeout(() => { + // 一次调用滑动帧数，每次调用会不一样 + //取总距离的十分之一 + const dist = Math.ceil(needScrollTop / 10); + _currentY += dist; + //移动一个十分之一 + + dom.scrollTo(currentX || 0, _currentY); + // 如果移动幅度小于十个像素，直接移动，否则递归调用，实现动画效果 + if (needScrollTop > 10 || needScrollTop < -10) { + context.scrollAnimation(dom, _currentY, targetY) + } else { + dom.scrollTo(_currentY, targetY) + } + }, 1) + } + function scrollTop(){ + let logContentDom = document.querySelector('.log'), context = this; + if(!logContentDom) + return + scrollAnimation(logContentDom, logContentDom.scrollTop, 0); + } diff --git a/web_src/less/openi.less b/web_src/less/openi.less index c195bac38d..31a8932c09 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -250,6 +250,23 @@ footer .column{margin-bottom:0!important; padding-bottom:0!important;} .CREATING, .STOPPING, .DELETING, .STARTING, i.WAITING ,.INIT,.KILLING{display:inline-block;background-image:url('/img/loading.gif');background-repeat:no-repeat;width:16px;height:16px;background-size:16px 16px;margin-right:5px;} i.COMPLETED,i.SUCCEEDED{display:inline-block;width:18px;height:18px;background:url("/img/icons.svg");background-position: -496px -52px;background-position: -441px -52px;} +.icon-to-bottom{ + background:url("/img/icons.svg"); + background-position: -574px -208px; + width: 30px; + height: 30px; + display: inline-block; +} +.icon-to-top{ + background:url("/img/icons.svg"); + background-position: -540px -208px; + width: 30px; + height: 30px; + display: inline-block; +} + + + .text_over{ overflow: hidden; text-overflow: ellipsis; -- 2.34.1 From 0d210ca9c2c9a45a05f9f2b25074b65c88bd997a Mon Sep 17 00:00:00 2001 From: liuzx Date: Tue, 19 Apr 2022 10:23:48 +0800 Subject: [PATCH 2/6] fix-1960 --- routers/user/home.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/user/home.go b/routers/user/home.go index 9c7bed2df9..d92bc31c6a 100755 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -804,6 +804,7 @@ func Cloudbrains(ctx *context.Context) { repos, _, err := models.SearchRepository(&models.SearchRepoOptions{ Actor: ctx.User, OwnerID: ctxUser.ID, + Private: true, }) if err != nil { ctx.ServerError("SearchRepository", err) -- 2.34.1 From ebe56325ff92ca63bd058a2c054c9a6c5de86dcf Mon Sep 17 00:00:00 2001 From: liuzx Date: Tue, 19 Apr 2022 16:15:13 +0800 Subject: [PATCH 3/6] fix-1656-patch1 --- models/cloudbrain.go | 4 ++-- routers/api/v1/repo/cloudbrain_dashboard.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 0465faf9ad..45ed52bd58 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1629,12 +1629,12 @@ func CloudbrainAll(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) { var err error condition := "cloudbrain.user_id = `user`.id" if len(opts.Keyword) == 0 { - count, err = sess.Where(cond).Count(new(Cloudbrain)) + count, err = sess.Unscoped().Where(cond).Count(new(Cloudbrain)) } else { lowerKeyWord := strings.ToLower(opts.Keyword) cond = cond.And(builder.Or(builder.Like{"LOWER(cloudbrain.job_name)", lowerKeyWord}, builder.Like{"LOWER(cloudbrain.display_job_name)", lowerKeyWord}, builder.Like{"`user`.lower_name", lowerKeyWord})) - count, err = sess.Table(&Cloudbrain{}).Where(cond). + count, err = sess.Table(&Cloudbrain{}).Unscoped().Where(cond). Join("left", "`user`", condition).Count(new(CloudbrainInfo)) } diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index b979729a81..2090a2cf2c 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -23,7 +23,7 @@ func DownloadCloudBrainBoard(ctx *context.Context) { _, total, err := models.CloudbrainAll(&models.CloudbrainsOptions{ ListOptions: models.ListOptions{ Page: page, - PageSize: 1, + PageSize: pageSize, }, Type: models.TypeCloudBrainAll, NeedRepoInfo: false, -- 2.34.1 From bda8bed80bc8ff4c1e5f74e2dbe2fe6cf4fa3d98 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 20 Apr 2022 17:18:42 +0800 Subject: [PATCH 4/6] fix issue --- templates/admin/cloudbrain/list.tmpl | 2 +- templates/user/dashboard/cloudbrains.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 35c08eeef4..0c87d419a7 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -164,7 +164,7 @@
{{$.CsrfTokenHtml}} - + {{$.i18n.Tr "repo.delete"}}
diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index ba8ec10f8c..fb3e0f81b1 100644 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -149,7 +149,7 @@
{{$.CsrfTokenHtml}} - + {{$.i18n.Tr "repo.delete"}}
-- 2.34.1 From 66690f51a9960d198b3681b05e052e979de6020d Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 20 Apr 2022 17:23:28 +0800 Subject: [PATCH 5/6] fix issue --- templates/repo/modelarts/trainjob/show.tmpl | 34 +-------------------- web_src/less/openi.less | 17 ----------- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index dea9b6aa07..0b420c484a 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -420,13 +420,7 @@ td, th {
-
- - - - - - +
@@ -885,30 +879,4 @@ td, th { }); } } - function scrollAnimation(dom, currentY, targetY, currentX) { - let needScrollTop = targetY - currentY; - let _currentY = currentY; - let context = this; - setTimeout(() => { - // 一次调用滑动帧数，每次调用会不一样 - //取总距离的十分之一 - const dist = Math.ceil(needScrollTop / 10); - _currentY += dist; - //移动一个十分之一 - - dom.scrollTo(currentX || 0, _currentY); - // 如果移动幅度小于十个像素，直接移动，否则递归调用，实现动画效果 - if (needScrollTop > 10 || needScrollTop < -10) { - context.scrollAnimation(dom, _currentY, targetY) - } else { - dom.scrollTo(_currentY, targetY) - } - }, 1) - } - function scrollTop(){ - let logContentDom = document.querySelector('.log'), context = this; - if(!logContentDom) - return - scrollAnimation(logContentDom, logContentDom.scrollTop, 0); - } diff --git a/web_src/less/openi.less b/web_src/less/openi.less index 31a8932c09..c195bac38d 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -250,23 +250,6 @@ footer .column{margin-bottom:0!important; padding-bottom:0!important;} .CREATING, .STOPPING, .DELETING, .STARTING, i.WAITING ,.INIT,.KILLING{display:inline-block;background-image:url('/img/loading.gif');background-repeat:no-repeat;width:16px;height:16px;background-size:16px 16px;margin-right:5px;} i.COMPLETED,i.SUCCEEDED{display:inline-block;width:18px;height:18px;background:url("/img/icons.svg");background-position: -496px -52px;background-position: -441px -52px;} -.icon-to-bottom{ - background:url("/img/icons.svg"); - background-position: -574px -208px; - width: 30px; - height: 30px; - display: inline-block; -} -.icon-to-top{ - background:url("/img/icons.svg"); - background-position: -540px -208px; - width: 30px; - height: 30px; - display: inline-block; -} - - - .text_over{ overflow: hidden; text-overflow: ellipsis; -- 2.34.1 From 769ea8542a16515c5218e5bf45b02d521992165c Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 20 Apr 2022 17:46:12 +0800 Subject: [PATCH 6/6] fix issue --- templates/admin/cloudbrain/list.tmpl | 2 +- templates/user/dashboard/cloudbrains.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 0c87d419a7..cf5df847c6 100755 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -162,7 +162,7 @@ {{end}}
-
+ {{$.CsrfTokenHtml}} {{$.i18n.Tr "repo.delete"}} diff --git a/templates/user/dashboard/cloudbrains.tmpl b/templates/user/dashboard/cloudbrains.tmpl index fb3e0f81b1..0b0776c9b3 100644 --- a/templates/user/dashboard/cloudbrains.tmpl +++ b/templates/user/dashboard/cloudbrains.tmpl @@ -147,7 +147,7 @@ {{end}}
- + {{$.CsrfTokenHtml}} {{$.i18n.Tr "repo.delete"}} -- 2.34.1