Browse Source

Merge pull request 'zpz-issue-1228' (#3473) from zpz-issue-1228 into V20221228

Reviewed-on: https://openi.pcl.ac.cn/OpenI/aiforge/pulls/3473
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>
fix-3169
chenshihai 2 years ago
parent
commit
aa5eb4e7e6
5 changed files with 8 additions and 4 deletions
  1. +1
    -1
      options/locale/locale_en-US.ini
  2. +1
    -1
      options/locale/locale_zh-CN.ini
  3. +3
    -0
      templates/repo/cloudbrain/show.tmpl
  4. +1
    -1
      web_src/less/openi.less
  5. +2
    -1
      web_src/vuepages/pages/notebook/debug/index.vue

+ 1
- 1
options/locale/locale_en-US.ini View File

@@ -1483,7 +1483,7 @@ blame = Blame
normal_view = Normal View normal_view = Normal View
line = line line = line
lines = lines lines = lines
notebook_open = Open in Notebook
notebook_open = Run Online


editor.new_file = New File editor.new_file = New File
editor.upload_file = Upload File editor.upload_file = Upload File


+ 1
- 1
options/locale/locale_zh-CN.ini View File

@@ -1501,7 +1501,7 @@ normal_view=普通视图
line=行 line=行
lines=行 lines=行


notebook_open = 在Notebook中打开
notebook_open = 在线运行


editor.new_file=新建文件 editor.new_file=新建文件
editor.upload_file=上传文件 editor.upload_file=上传文件


+ 3
- 0
templates/repo/cloudbrain/show.tmpl View File

@@ -111,7 +111,9 @@
<td class="ti-text-form-content"> <td class="ti-text-form-content">
<div class="text-span text-span-w" id="{{.VersionName}}-code"> <div class="text-span text-span-w" id="{{.VersionName}}-code">
{{.BranchName}} {{.BranchName}}
{{if not .BootFile}}
<span style="margin-left:1rem" class="ui label">{{SubStr .CommitID 0 10}}</span> <span style="margin-left:1rem" class="ui label">{{SubStr .CommitID 0 10}}</span>
{{end}}
</div> </div>
</td> </td>
</tr> </tr>
@@ -376,6 +378,7 @@
{{template "base/footer" .}} {{template "base/footer" .}}
<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script> <script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
<script> <script>
$('.menu .item').tab() $('.menu .item').tab()
$(document).ready(function () { $(document).ready(function () {
$('.ui.accordion').accordion({ selector: { trigger: '.icon' } }); $('.ui.accordion').accordion({ selector: { trigger: '.icon' } });


+ 1
- 1
web_src/less/openi.less View File

@@ -1455,7 +1455,7 @@ i.SUCCEEDED {
white-space: nowrap; white-space: nowrap;
} }
.text-span-new { .text-span-new {
width: 800px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
height: 20%; height: 20%;


+ 2
- 1
web_src/vuepages/pages/notebook/debug/index.vue View File

@@ -375,7 +375,7 @@ export default {
location.href=`${AppSubUrl}/authentication/wechat/bind` location.href=`${AppSubUrl}/authentication/wechat/bind`
} }
if(err.response.status===401){ if(err.response.status===401){
location.href=`${AppSubUrl}/user/login?redirect_to=${location.origin}${location.pathname}?type=login`
location.href=`${AppSubUrl}/user/login?redirect_to=${encodeURIComponent(location.origin+location.pathname + '?type=login&card='+ this.selectIndex)}`
return return
} }
this.btnStatus[index]=0 this.btnStatus[index]=0
@@ -445,6 +445,7 @@ export default {
if(new URLSearchParams(window.location.search).get("type")==='login'){ if(new URLSearchParams(window.location.search).get("type")==='login'){
that.getNotebookInfo() that.getNotebookInfo()
that.dialogVisible = true; that.dialogVisible = true;
that.selectIndex = Number(new URLSearchParams(window.location.search).get("card"))
} }
document document
.querySelector("#notebook-debug") .querySelector("#notebook-debug")


Loading…
Cancel
Save