From 411b551f36b64dde0d1bff7f78eaf76b1bb28dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Thu, 2 Feb 2023 15:36:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96md=E7=BC=96=E8=BE=91=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BA=EF=BC=8C=E4=BC=98=E5=8C=96cloudIDE?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E8=B7=B3=E8=BD=AC=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?PR=E5=8F=AF=E8=B7=B3=E8=BD=ACIDE=E7=9A=84=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/editormd/editormd.min.js                  | 13 ++++++-------
 src/App.css                                         |  2 +-
 src/forge/Main/CoderDepot.jsx                       |  2 +-
 src/forge/Merge/MessageCount.js                     |  2 +-
 src/forge/Merge/merge.css                           |  1 +
 .../tpm/challengesnew/css/TPMchallengesnew.css      |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/public/js/editormd/editormd.min.js b/public/js/editormd/editormd.min.js
index 758c2fcc..d4173f50 100755
--- a/public/js/editormd/editormd.min.js
+++ b/public/js/editormd/editormd.min.js
@@ -831,7 +831,7 @@
                 if (scrollTop === 0) {
                     preview.scrollTop(0);
                 }
-                else if (scrollTop + height >= cmScroll.scrollHeight - 16) {
+                else if (scrollTop + height >= cmScroll.scrollHeight - 30) {
                     preview.scrollTop(preview[0].scrollHeight);
                 }
                 else {
@@ -1471,7 +1471,6 @@
             var preview = $this.preview;
             var codeMirror = $this.codeMirror;
             var codeView = codeMirror.find(".CodeMirror-scroll");
-
             var height = codeView.height();
             var scrollTop = codeView.scrollTop();
             var percent = (scrollTop / codeView[0].scrollHeight);
@@ -1483,11 +1482,11 @@
 
             var tocMenuHeight = preview.find(".editormd-toc-menu").height();
             tocMenuHeight = (!tocMenuHeight) ? 0 : tocMenuHeight;
-
+            
             if (scrollTop === 0) {
                 preview.scrollTop(0);
             }
-            else if (scrollTop + height >= codeView[0].scrollHeight - 16) {
+            else if (scrollTop + height >= codeView[0].scrollHeight - 30) {
                 preview.scrollTop(preview[0].scrollHeight);
             }
             else {
@@ -1595,8 +1594,8 @@
                 codeMirror.find(".CodeMirror-scroll").bind(mouseOrTouch("scroll", "touchmove"), function (event) {
                     var height = $(this).height();
                     var scrollTop = $(this).scrollTop();
-                    var percent = (scrollTop / $(this)[0].scrollHeight);
-
+                    var percent = (scrollTop / ($(this)[0].scrollHeight-100));
+                    console.log(percent);
                     var tocHeight = 0;
 
                     preview.find(".markdown-toc-list").each(function () {
@@ -1609,7 +1608,7 @@
                     if (scrollTop === 0) {
                         preview.scrollTop(0);
                     }
-                    else if (scrollTop + height >= $(this)[0].scrollHeight - 16) {
+                    else if (scrollTop + height >= $(this)[0].scrollHeight - 30) {
                         preview.scrollTop(preview[0].scrollHeight);
                     }
                     else {
diff --git a/src/App.css b/src/App.css
index 02f6395e..b75e2e84 100644
--- a/src/App.css
+++ b/src/App.css
@@ -76,7 +76,7 @@ body {
 }
 /* md多空格 */
 .markdown-body p {
-  margin:10px 0px!important;
+  /* margin:10px 0px!important; */
   font-size: 16px !important;
   white-space: pre-wrap;
 }
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index fd6b6661..51df3a40 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -492,7 +492,7 @@ function CoderDepot(props){
                       }
                       {
                         checkIfLogin && checkIfLogin()?
-                        <a className='newBtn' onClick={()=>eventTrack(`/${owner}/${projectsId}/webIDE/tree/${defaultBranch}`)}>Web IDE <div className='newBtnImg'></div></a>
+                        <a className='newBtn' onClick={()=>eventTrack(`/${owner}/${projectsId}/webIDE/tree/${branchName||defaultBranch}`)}>Web IDE <div className='newBtnImg'></div></a>
                         :
                         <a className='newBtn' onClick={()=>{showLoginDialog(`/${owner}/${projectsId}`)}}>Web IDE <div className='newBtnImg'></div></a>
                       }
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 3a3db57a..012cbacc 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -493,7 +493,7 @@ class MessageCount extends Component {
                           </Button>
                         )}
 
-                    {operate && (
+                    {userLogin && projectDetail && permission && (
                       <Button
                         type="blue"
                         ghost
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index 409ad107..c5b360c3 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -185,6 +185,7 @@ form .ant-cascader-picker, form .ant-select {
 .linesContent > p{
   flex:1;
   word-break: break-all;
+  white-space: pre;
 }
 .linesContent .lines{
   display: flex;
diff --git a/src/modules/tpm/challengesnew/css/TPMchallengesnew.css b/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
index d09ef1e3..a525079c 100644
--- a/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
+++ b/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
@@ -1,4 +1,4 @@
-.CodeMirror-scroll {
+.CodeMirror .CodeMirror-scroll {
   overflow: auto !important;
   margin-bottom: -30px;
   margin-right: -30px;