From e4ab1b4fc2482a9b85f81fc74e45fb8f9b6dae04 Mon Sep 17 00:00:00 2001 From: liuzx Date: Mon, 30 May 2022 11:43:42 +0800 Subject: [PATCH 1/8] fix-2139 --- routers/repo/modelarts.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index e099a19ff..95ca8df62 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -764,6 +764,7 @@ func trainJobErrorNewDataPrepare(ctx *context.Context, form auth.CreateModelArts ctx.Data["bootFile"] = form.BootFile ctx.Data["uuid"] = form.Attachment ctx.Data["branch_name"] = form.BranchName + ctx.Data["cloudbraintype"] = models.TypeCloudBrainTwo return nil } @@ -954,6 +955,7 @@ func versionErrorDataPrepare(ctx *context.Context, form auth.CreateModelArtsTrai return err } ctx.Data["config_list"] = configList.ParaConfigs + ctx.Data["cloudbraintype"] = models.TypeCloudBrainTwo return nil } @@ -2175,6 +2177,7 @@ func inferenceJobErrorNewDataPrepare(ctx *context.Context, form auth.CreateModel ctx.Data["model_version"] = form.ModelVersion ctx.Data["ckpt_name"] = form.CkptName ctx.Data["train_url"] = form.TrainUrl + ctx.Data["cloudbraintype"] = models.TypeCloudBrainTwo return nil } From d72f94943a3fc2ad1af000ff6ec6381157a4c8af Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 30 May 2022 16:26:01 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/repo/datasets/index.tmpl | 42 ++++++++++++++++++++++++---------- web_src/js/index.js | 46 ++++++++++++++++++++++++++++++++++---- web_src/less/openi.less | 16 +++++++------ 3 files changed, 81 insertions(+), 23 deletions(-) diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl index 4cc84bbe8..74448406f 100755 --- a/templates/repo/datasets/index.tmpl +++ b/templates/repo/datasets/index.tmpl @@ -118,6 +118,20 @@ .diy-popper { max-width: 400px; } + + .ascending { + width: 0; + height: 0; + border: 5px solid transparent; + border-bottom-color: #c0c4cc; + } + + .descending { + width: 0; + height: 0; + border: 5px solid transparent; + border-top-color: #c0c4cc; + }
{{template "repo/header" .}} @@ -213,21 +227,24 @@
-
+
{{$.i18n.Tr "dataset.dataset_file_name"}} - - + +
+ style="width: 7.25% !important;cursor: pointer;"> {{$.i18n.Tr "repo.model.manage.size"}} - - + +
@@ -239,12 +256,13 @@
{{$.i18n.Tr "repo.cloudbrain_creator"}}
-
+
{{$.i18n.Tr "dataset.dataset_upload_time"}} - - + +
diff --git a/web_src/js/index.js b/web_src/js/index.js index b9e7165cf..bcc995836 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -4080,16 +4080,54 @@ function initVueDataset() { location.href = `${location.href}&sort=${dom}Asc` } else if (params.get('sort') === `${dom}Desc` || params.get('sort').indexOf(`${dom}`) === -1) { - params.delete('sort') - let asc = params.toString() + `&sort=${dom}Asc` + params.set("sort", `${dom}Asc`) + let asc = params.toString() location.search = asc } else { - params.delete('sort') - let desc = params.toString() + `&sort=${dom}Desc` + params.set("sort", `${dom}Desc`) + let desc = params.toString() location.search = desc } }, + sortIcon(dom, sort) { + const params = new URLSearchParams(location.search) + if (sort === "up") { + + if (params.toString() === '') { + location.href = `${location.href}?sort=${dom}Asc` + } + else if (!params.get('sort')) { + location.href = `${location.href}&sort=${dom}Asc` + } else if (params.get('sort').indexOf(`${dom}`) === -1) { + params.set("sort", `${dom}Asc`) + let asc = params.toString() + location.search = asc + } else { + params.delete('sort') + location.search = params.toString() + } + } + else if (sort === "down") { + if (params.toString() === '') { + location.href = `${location.href}?sort=${dom}Desc` + } + else if (!params.get('sort')) { + location.href = `${location.href}&sort=${dom}Desc` + } + else if (params.get('sort').indexOf(`${dom}`) === -1) { + params.set("sort", `${dom}Desc`) + let asc = params.toString() + location.search = asc + } else { + params.delete('sort') + location.search = params.toString() + } + + + } + + }, setPrivate(uuid, privateFlag, index) { const params = { _csrf: csrf, file: uuid, is_private: privateFlag } this.$axios.post('/attachments/private', this.qs.stringify(params)).then((res) => { diff --git a/web_src/less/openi.less b/web_src/less/openi.less index 40b55e012..5ff09544a 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -1079,17 +1079,19 @@ display: block; .row .sort-caret-up { position: absolute; top: 5px; - color: #c0c4cc; - font-size: 18px; + } .row .sort-caret-down { position: absolute; - bottom: 3px; - color: #c0c4cc; - font-size: 18px; + bottom: 5px; + + } + +.row .active-up-sort { + border-bottom-color: #409eff; } -.row .active-sort { - color: #409eff !important; + .row .active-down-sort { + border-top-color: #409eff; } \ No newline at end of file From 22cb0c6653e82484aff1055349508d8d6a3a47a2 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 30 May 2022 16:40:16 +0800 Subject: [PATCH 3/8] fix issue --- web_src/js/components/BrainAnalysis.vue | 141 +++++++++++++++++--------------- 1 file changed, 74 insertions(+), 67 deletions(-) diff --git a/web_src/js/components/BrainAnalysis.vue b/web_src/js/components/BrainAnalysis.vue index 4950c3241..69d02548a 100644 --- a/web_src/js/components/BrainAnalysis.vue +++ b/web_src/js/components/BrainAnalysis.vue @@ -1,86 +1,93 @@ - - - - + .btnLast { + line-height: 1.5; + margin: -3.5px; + border: 1px solid rgba(22, 132, 252, 100); + /* border-right: none; */ + background: #FFFF; + color: #1684FC; + width: 60px; + height: 30px; + border-radius: 0px 4px 4px 0px; + } + \ No newline at end of file From 12947c2689cdcf0510b22dd21b22d4f73e4be259 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 30 May 2022 17:58:25 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/base/footer.tmpl | 7 ++++--- templates/home.tmpl | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index ebf74f7b8..f67d373db 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -40,14 +40,15 @@ {{if .RequireTribute}} {{end}} - +{{if .PageIsHome}} + + +{{end}} {{template "custom/footer" .}} {{if .PageIsHome}} - - diff --git a/templates/home.tmpl b/templates/home.tmpl index 0f71b719c..f7775f37e 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -31,7 +31,7 @@ -
调试任务 #31412022050816002
+
From 629b68e961921950d3e5ab9bbada5ff4e9b3ed07 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 30 May 2022 18:05:57 +0800 Subject: [PATCH 5/8] fix issue --- web_src/js/index.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index bcc995836..ed8fb3473 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -4093,19 +4093,18 @@ function initVueDataset() { sortIcon(dom, sort) { const params = new URLSearchParams(location.search) if (sort === "up") { - if (params.toString() === '') { location.href = `${location.href}?sort=${dom}Asc` } else if (!params.get('sort')) { location.href = `${location.href}&sort=${dom}Asc` - } else if (params.get('sort').indexOf(`${dom}`) === -1) { + } else if (params.get('sort') && params.get('sort').indexOf(`${dom}Asc`) !== -1) { + params.delete('sort') + location.search = params.toString() + } else { params.set("sort", `${dom}Asc`) let asc = params.toString() location.search = asc - } else { - params.delete('sort') - location.search = params.toString() } } else if (sort === "down") { @@ -4115,13 +4114,13 @@ function initVueDataset() { else if (!params.get('sort')) { location.href = `${location.href}&sort=${dom}Desc` } - else if (params.get('sort').indexOf(`${dom}`) === -1) { + else if (params.get('sort') && params.get('sort').indexOf(`${dom}Desc`) !== -1) { + params.delete('sort') + location.search = params.toString() + } else { params.set("sort", `${dom}Desc`) let asc = params.toString() location.search = asc - } else { - params.delete('sort') - location.search = params.toString() } From b5d8ed3c768483f392c2af0263ae82c1f8fab84a Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 31 May 2022 08:55:34 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- custom/public/rotation3D/rotation3D.js | 16 ++++++++-------- package-lock.json | 2 +- templates/base/footer.tmpl | 7 ++----- templates/home.tmpl | 3 ++- web_src/js/index.js | 2 +- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/custom/public/rotation3D/rotation3D.js b/custom/public/rotation3D/rotation3D.js index 8ec5b6938..770295153 100644 --- a/custom/public/rotation3D/rotation3D.js +++ b/custom/public/rotation3D/rotation3D.js @@ -154,7 +154,7 @@ var Rotation3D = window.Rotation3D = function (_opts) { * y y起点 + (尺寸 * 正弦 * y压缩) - 元素宽度一半 */ Rotation3D.prototype.itemStyle = function($item, index, rotation) { - console.log("itemStyle=" + rotation + " index=" + index); + //console.log("itemStyle=" + rotation + " index=" + index); var parseSXY = circleMath.parseSXY(rotation, this); var scale = parseSXY.scale; var x = parseSXY.x; @@ -219,7 +219,7 @@ Rotation3D.prototype.itemStyle = function($item, index, rotation) { */ Rotation3D.prototype.lineStyle = function($line, index, rotation) { var rotate = circleMath.parseRotate(rotation, this) - console.log("lineStyle=" + rotation + " index=" + index); + //console.log("lineStyle=" + rotation + " index=" + index); $line.css({ transform: 'rotate(' + rotate + 'deg)', @@ -235,7 +235,7 @@ Rotation3D.prototype.lineStyle = function($line, index, rotation) { Rotation3D.prototype.goTo = function (index) { var self = this; this.currenIndex = index; - console.log('goTo currenIndex', index); + //console.log('goTo currenIndex', index); /** * 1.计算floatIndex,用于控死amdiff */ @@ -319,7 +319,7 @@ Rotation3D.prototype.onAutoPlay = function () { if (self.currenIndex < 0) { self.currenIndex = self.length - 1 } - console.log("autoPlayTimer...."); + //console.log("autoPlayTimer...."); self.goTo(self.currenIndex); self.currenIndex--; //倒叙 }, this.autoPlayDelay) @@ -331,12 +331,12 @@ Rotation3D.prototype.onAutoPlay = function () { Rotation3D.prototype.onDrag = function () { var self = this; var startX, startY, moveX, moveY, endX, endY; - console.log("onDrag...."); + //console.log("onDrag...."); // 拖拽：三个事件-按下 移动 抬起 //按下 this.$rotation.mousedown(function (e) { startX = e.pageX; startY = e.pageY; - console.log("mousedown...."); + //console.log("mousedown...."); // 移动 $(document).mousemove(function (e) { // console.log('移动'); @@ -348,10 +348,10 @@ Rotation3D.prototype.onDrag = function () { $(document).mouseup(function (e) { endX = e.pageX; endY = e.pageY; moveX = endX - startX; moveY = endY - startY; - console.log("mouseup...."); + //console.log("mouseup...."); // 每40旋转一步 var moveIndex = parseInt(Math.abs(moveX) / 50) - console.log('moveIndex',moveIndex) + //console.log('moveIndex',moveIndex) if (moveIndex > 0) { // console.log(moveX<0 ? '向左' : '向右') if (moveX < 0) { //向左 diff --git a/package-lock.json b/package-lock.json index d65d6b49a..9233b813b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5439,7 +5439,7 @@ "gulp-tap": "^1.0.1", "gulp-uglify": "^3.0.1", "inquirer": "^6.2.1", - "jquery": "^3.5.1", + "jquery": "^3.4.0", "less": "^3.7.0", "map-stream": "^0.1.0", "merge-stream": "^2.0.0", diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index f67d373db..c16cf1ae4 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -12,7 +12,7 @@ {{template "base/footer_content" .}} - + @@ -41,15 +41,12 @@ {{end}} {{if .PageIsHome}} - - + {{end}} - {{template "custom/footer" .}} {{if .PageIsHome}} -
- + + {{template "base/footer" .}} diff --git a/web_src/js/index.js b/web_src/js/index.js index 1c5cfc228..ed8fb3473 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -4959,7 +4959,7 @@ window.onOAuthLoginClick = function () { // Pull SVGs via AJAX to workaround CORS issues with tags // https://css-tricks.com/ajaxing-svg-sprite/ $.get(`${window.config.StaticUrlPrefix}/img/svg/icons.svg`, (data) => { - const div = document.createElementNS('div'); + const div = document.createElement('div'); div.style.display = 'none'; div.innerHTML = new XMLSerializer().serializeToString(data.documentElement); document.body.insertBefore(div, document.body.childNodes[0]); From 449db022c7a620e8309f759d940aa58dd62e50f5 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 31 May 2022 09:05:13 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- public/home/home.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index 33c7edc47..168224c34 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -206,17 +206,17 @@ function refresh3DInfo(record){ //cloudbrain one var lines = $('.rotation3D__line'); var span = $('.rotation3D__line').find("span")[0]; - console.log(span); + //console.log(span); span.innerText =record.RefName; //$('.rotation3D__line').find("span").eq(0).text(record.RefName) - console.log("cloudbrain one line length=" + lines.length); + //console.log("cloudbrain one line length=" + lines.length); //lines[0].find("span").text(record.RefName); }else if(record.OpType == "26" || record.OpType == "27" || record.OpType == "28"){ //cloudbrain two var lines = $('.rotation3D__line'); - console.log("cloudbrain two line length=" + lines.length); + //console.log("cloudbrain two line length=" + lines.length); var span = $('.rotation3D__line').find("span")[1]; - console.log(span); + //console.log(span); span.innerText =record.RefName; //$('.rotation3D__line').find("span").eq(1).text(record.RefName) //lines[1].find("span").text(record.RefName); From f16d9d03eb2e2918410dffa1a3986afe7fa12339 Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Tue, 31 May 2022 09:48:46 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=BC=A9=E5=B0=8F=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=BB=91=E8=89=B2=E8=83=8C=E6=99=AF=E8=8C=83?= =?UTF-8?q?=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- custom/public/css/git.openi.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom/public/css/git.openi.css b/custom/public/css/git.openi.css index 7d05d503b..92a5cb20c 100644 --- a/custom/public/css/git.openi.css +++ b/custom/public/css/git.openi.css @@ -145,7 +145,7 @@ position: relative; z-index: 9; bottom: -9em; - width: 540px; + width: 500px; } #homenews > p{ color: #BBBBBB;