Merge remote-tracking branch 'origin/V20221228' into dev-csh

options/locale/locale_en-US.ini

@@ -1483,7 +1483,7 @@ blame = Blame
 normal_view = Normal View
 line = line
 lines = lines
-notebook_open = Open in Notebook
+notebook_open = Run Online
 
 editor.new_file = New File
 editor.upload_file = Upload File

options/locale/locale_zh-CN.ini

@@ -1501,7 +1501,7 @@ normal_view=普通视图
 line=行
 lines=行
 
-notebook_open = 在Notebook中打开
+notebook_open = 在线运行
 
 editor.new_file=新建文件
 editor.upload_file=上传文件

templates/repo/cloudbrain/show.tmpl

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

web_src/less/openi.less

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

web_src/vuepages/pages/notebook/debug/index.vue

@@ -375,7 +375,7 @@ export default {
             location.href=`${AppSubUrl}/authentication/wechat/bind`
           }
           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
           }
             this.btnStatus[index]=0
@@ -445,6 +445,7 @@ export default {
     if(new URLSearchParams(window.location.search).get("type")==='login'){
       that.getNotebookInfo()
       that.dialogVisible = true;
+      that.selectIndex = Number(new URLSearchParams(window.location.search).get("card"))
     }
     document
       .querySelector("#notebook-debug")