Merge pull request '代码库二级页面改版' (#146) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

src/forge/Branch/SelectOverlay.jsx

@@ -53,8 +53,10 @@ function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owne
     setIsSpin(true);
     if(e.key === "branch"){
       getBranchs(projectsId,owner);
+      setNav(0);
     }else{
       getTags(projectsId,owner);
+      setNav(1);
     }
   }
 

src/forge/Main/Diff.jsx

@@ -91,7 +91,7 @@ export default (props) => {
                 {commit && commit.message &&
                   <RenderHtml className="task-hide" value={commit.message}/>
                 }
-                <Link to={`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`}><i className="iconfont icon-fenzhi2 font-18"></i>{data.branch}</Link>
+                <Link to={`/${owner}/${projectsId}/tree/${data.branch}`}><i className="iconfont icon-fenzhi2 font-18"></i>{data.branch}</Link>
               </div>
               <Button type="primary" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="btnblue" style={{height:"36px"}}>浏览文件</Button>
             </div>

src/forge/Main/Index.scss

@@ -271,8 +271,10 @@
           word-wrap:break-word;
           .markdown-body{
             line-height: 10px;
+            font-size: 14px;
             & p {
-              margin: 0px 0px !important;
+              margin: 1px 0px  0px !important;
+              font-size: 14px !important;
             }
             & ol,ul{
               padding-bottom: 3px;