#2120 fix-issue

Merged
wangjr merged 3 commits from fix-1985 into V20220519 2 years ago
  1. +8
    -1
      templates/admin/cloudbrain/list.tmpl
  2. +0
    -27
      templates/repo/view_list.tmpl
  3. +1
    -1
      web_src/js/features/contexmenu.js
  4. +26
    -0
      web_src/less/openi.less

+ 8
- 1
templates/admin/cloudbrain/list.tmpl View File

@@ -79,13 +79,20 @@
{{end}}
<!-- {{$JobID}} -->
<div class="two wide column nowrap">
{{if or (eq .JobType "DEBUG") (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}
{{if eq .JobType "DEBUG"}}
<a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain/{{$JobID}}{{else}}/modelarts/notebook/{{$JobID}}{{end}}"
title="{{.DisplayJobName}}" style="font-size: 14px;">
<span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a>
{{else if or (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}
<a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/cloudbrain/benchmark/{{$JobID}}"
title="{{.DisplayJobName}}" style="font-size: 14px;">
<span class="fitted"
style="width: 90%;vertical-align: middle;">{{.DisplayJobName}}</span>
</a>
{{else if eq .JobType "INFERENCE"}}
<a class="title"
href="{{AppSubUrl}}/{{.Repo.OwnerName}}/{{.Repo.Name}}/modelarts/inference-job/{{$JobID}}"


+ 0
- 27
templates/repo/view_list.tmpl View File

@@ -1,30 +1,3 @@
<style>
.context-menu {
z-index: 99;
position: absolute;
padding: 0;
border-radius: 4px;
border: 1px solid #e3e9ed;
-webkit-box-shadow: none;
box-shadow: none;
background: #fff;
display: none !important;
}

.context-menu.active {
display: block !important;
}

.context-menu-operation {
padding: 5px !important;
line-height: 1.78 !important;
}

.context-menu-icon {
float: left !important;
margin: 0px 5px 0px 0px !important;
}
</style>
<div id="mask">
<div id="loadingPage">
<div class="rect1"></div>


+ 1
- 1
web_src/js/features/contexmenu.js View File

@@ -92,7 +92,7 @@ export default async function initContextMenu() {
class Menu {
constructor(param) {
this.target = document.createElement('div')
this.target.classList.add("ui", "menu", "compact", "vertical", "context-menu")
this.target.classList.add("ui", "menu", "compact", "vertical", "context-menu-click")
this.data = param.data
this.active = false
this.clickZ = this.click.bind(this)


+ 26
- 0
web_src/less/openi.less View File

@@ -1025,4 +1025,30 @@ display: block;
z-index: 9999;
width:150;
height: 80;
}

.context-menu-click {
z-index: 99;
position: absolute;
padding: 0;
border-radius: 4px;
border: 1px solid #e3e9ed;
-webkit-box-shadow: none;
box-shadow: none;
background: #fff;
display: none !important;
}

.context-menu-click.active {
display: block !important;
}

.context-menu-operation {
padding: 5px !important;
line-height: 1.78 !important;
}

.context-menu-icon {
float: left !important;
margin: 0px 5px 0px 0px !important;
}

Loading…
Cancel
Save