#4034 fix model related issues

Merged
chenshihai merged 6 commits from zouap into V20230410.patch 1 year ago
  1. +5
    -5
      templates/repo/cloudbrain/trainjob/show.tmpl
  2. +5
    -5
      templates/repo/grampus/trainjob/show.tmpl
  3. +12
    -14
      templates/repo/modelarts/trainjob/show.tmpl
  4. +5
    -5
      web_src/js/components/model/ModelSelect.vue
  5. +35
    -1
      web_src/vuepages/pages/modelmanage/graph/model-graph.css
  6. +1
    -0
      web_src/vuepages/pages/modelmanage/local/index.vue
  7. +5
    -1
      web_src/vuepages/pages/modelmanage/settings/index.vue

+ 5
- 5
templates/repo/cloudbrain/trainjob/show.tmpl View File

@@ -473,10 +473,9 @@
<input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
</div>
<div class="inline fields">
<label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
{{if eq $.Repository.IsPrivate false}}
<div class="inline fields">
<label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
<div class="field">
<div class="ui radio checkbox">
<input type="radio" name="isPrivate" checked="checked" value="false">
@@ -489,7 +488,8 @@
<label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
</div>
</div>
</div>
</div>
{{end}}
<div class="inline field">
<label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
<textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"


+ 5
- 5
templates/repo/grampus/trainjob/show.tmpl View File

@@ -527,10 +527,9 @@
<input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
</div>
<div class="inline fields">
<label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
{{if eq $.Repository.IsPrivate false}}
<div class="inline fields">
<label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
<div class="field">
<div class="ui radio checkbox">
<input type="radio" name="isPrivate" checked="checked" value="false">
@@ -543,7 +542,8 @@
<label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
</div>
</div>
</div>
</div>
{{end}}
<div class="inline field">
<label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
<textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"


+ 12
- 14
templates/repo/modelarts/trainjob/show.tmpl View File

@@ -529,22 +529,20 @@
placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
</div>
{{if eq $.Repository.IsPrivate false}}
<div class="inline fields">
<label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
<div class="field">
<div class="ui radio checkbox">
<input type="radio" name="isPrivate" checked="checked" value="false">
<label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
</div>
<div class="inline fields">
<label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
<div class="field">
<div class="ui radio checkbox">
<input type="radio" name="isPrivate" checked="checked" value="false">
<label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
</div>
<div class="field">
<div class="ui radio checkbox">
<input type="radio" name="isPrivate" value="true">
<label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
</div>
</div>
<div class="field">
<div class="ui radio checkbox">
<input type="radio" name="isPrivate" value="true">
<label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
</div>
</div>
</div>
{{end}}
<div class="inline field">


+ 5
- 5
web_src/js/components/model/ModelSelect.vue View File

@@ -20,14 +20,14 @@
<i class="el-icon-plus"></i>
<span>{{ $t('modelObj.model_select') }}</span>
</div>
<div style="display:flex;align-items:center;justify-content:center;margin-left:6px;">
<!-- <div style="display:flex;align-items:center;justify-content:center;margin-left:6px;">
<el-tooltip placement="top" effect="light">
<i class="question circle icon link" style="margin-top:-7px"></i>
<div slot="content">
<div style="width:200px;text-align:center;">{{ $t('modelObj.model_suport_file_tips') }}</div>
</div>
</el-tooltip>
</div>
</div> -->
<el-dialog class="model-dlg" :visible.sync="dlgShow" :title="$t('modelObj.model_select')" width="1000px" :modal="true"
:close-on-click-modal="false" :show-close="true" :destroy-on-close="false" :before-close="beforeClose" @open="open"
@closed="closed">
@@ -114,7 +114,7 @@

<script>

const supportCheckPointFileExt = ["ckpt", "pb", "h5", "json", "pkl", "pth", "t7", "pdparams", "onnx", "pbtxt", "keras", "mlmodel", "cfg", "pt"];
// const supportCheckPointFileExt = ["ckpt", "pb", "h5", "json", "pkl", "pth", "t7", "pdparams", "onnx", "pbtxt", "keras", "mlmodel", "cfg", "pt"];
export default {
name: "ModelSelect",
props: {
@@ -227,8 +227,8 @@ export default {
for (let j = 0, jLen = _children.length; j < jLen; j++) {
const file = _children[j];
if (file.IsDir) continue;
const arr = file.FileName.split('.');
if (!supportCheckPointFileExt.includes(arr[arr.length - 1])) continue;
// const arr = file.FileName.split('.');
// if (!supportCheckPointFileExt.includes(arr[arr.length - 1])) continue;
file._modelID = dataI.id;
file._modelName = dataI.name;
file._modelVersion = dataI.version;


+ 35
- 1
web_src/vuepages/pages/modelmanage/graph/model-graph.css View File

@@ -94,7 +94,7 @@
display: flex;
align-items: center;
justify-content: center;
padding: 10px;
padding: 2px 10px;
}

._tree-layout ._tree-node .name {
@@ -120,6 +120,16 @@
background: rgb(122, 184, 251);
}

._tree-layout ._tree-node.model-parent .name {
max-height: 100%;
overflow: hidden;
text-overflow: ellipsis;
word-break: break-all;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
}

._tree-layout ._tree-node.model-current {
border-style: none;
border-color: unset;
@@ -137,6 +147,13 @@

._tree-layout ._tree-node.model-current .name {
cursor: default;
max-height: 100%;
overflow: hidden;
text-overflow: ellipsis;
word-break: break-all;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 5;
}

._tree-layout ._tree-node.model-current .name:hover {
@@ -157,6 +174,16 @@
background: rgb(3, 102, 214);
}

._tree-layout ._tree-node.model-derive .name {
max-height: 100%;
overflow: hidden;
text-overflow: ellipsis;
word-break: break-all;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
}

._tree-layout ._tree-node.repo {
border-color: rgb(3, 102, 214);
border-width: 1px;
@@ -174,6 +201,13 @@

._tree-layout ._tree-node.repo .name {
color: #101010;
max-height: 100%;
overflow: hidden;
text-overflow: ellipsis;
word-break: break-all;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}

._tree-layout ._tree-node .descr {


+ 1
- 0
web_src/vuepages/pages/modelmanage/local/index.vue View File

@@ -131,6 +131,7 @@ export default {
this.state.label = list.slice(0, MAX_LABEL_COUNT).join(' ') + (hasEndSpace && list.length < MAX_LABEL_COUNT ? ' ' : '');
},
submit() {
this.state.name = this.state.name.trim();
if (!this.checkName()) {
// this.$message({
// type: 'info',


+ 5
- 1
web_src/vuepages/pages/modelmanage/settings/index.vue View File

@@ -125,7 +125,10 @@ export default {
if (this.backUrl) {
window.location.href = this.backUrl;
} else {
this.goDetail();
const list = window.location.href.split('/');
list.pop();
list.push('model_readme_tmpl');
window.location.href = list.join('/') + '?name=' + encodeURIComponent(this.modelName);
}
},
goDetail() {
@@ -135,6 +138,7 @@ export default {
window.location.href = list.join('/') + '?name=' + encodeURIComponent(this.state.name);
},
submit() {
this.state.name = this.state.name.trim();
if (!this.checkName()) {
this.$message({
type: 'info',


Loading…
Cancel
Save