Merge pull request '代码库二级页面改版-提交' (#29) from durian/forgeplus-react:feature_repo_second_page_xiesi into feature_repo_second_page

package-lock.json

@@ -3425,9 +3425,9 @@
       "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
     },
     "clipboard": {
-      "version": "2.0.6",
+      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
-      "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==",
+      "integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
       "requires": {
         "good-listener": "^1.2.2",
         "select": "^1.1.2",
@@ -7240,8 +7240,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -7262,14 +7261,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -7284,20 +7281,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -7414,8 +7408,7 @@
         "inherits": {
           "version": "2.0.4",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -7427,7 +7420,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -7442,7 +7434,6 @@
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -7450,14 +7441,12 @@
         "minimist": {
           "version": "1.2.5",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
           "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -7476,7 +7465,6 @@
           "version": "0.5.3",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz",
           "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
-          "optional": true,
           "requires": {
             "minimist": "^1.2.5"
           }
@@ -7538,8 +7526,7 @@
         "npm-normalize-package-bin": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
-          "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
+          "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
-          "optional": true
         },
         "npm-packlist": {
           "version": "1.4.8",
@@ -7567,8 +7554,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -7580,7 +7566,6 @@
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -7658,8 +7643,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -7695,7 +7679,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -7715,7 +7698,6 @@
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7759,14 +7741,12 @@
         "wrappy": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-          "optional": true
         }
       }
     },

package.json

@@ -22,7 +22,7 @@
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "1.1.3",
     "classnames": "^2.2.5",
-    "clipboard": "^2.0.6",
+    "clipboard": "^2.0.8",
     "code-prettify": "^0.1.0",
     "codemirror": "^5.53.0",
     "connected-react-router": "4.4.1",

public/css/edu-purge.css

@@ -2474,7 +2474,7 @@ a:hover{
 .color-grey-B3 {
   color: #B3B3B3 !important;
 }
-`
+
 .color-grey-B4 {
   color: #B4B4B4 !important;
 }

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1631692103587') format('woff2'),
+  src: url('iconfont.woff2?t=1632447048516') format('woff2'),
-       url('iconfont.woff?t=1631692103587') format('woff'),
+       url('iconfont.woff?t=1632447048516') format('woff'),
-       url('iconfont.ttf?t=1631692103587') format('truetype');
+       url('iconfont.ttf?t=1632447048516') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-wenjianicon:before {
+  content: "\e8dc";
+}
+
+.icon-a-yuanquan2x:before {
+  content: "\e8db";
+}
+
+.icon-xiangmubiaoqian:before {
+  content: "\e8da";
+}
+
 .icon-icon:before {
   content: "\e8ce";
 }

public/css/iconfont.json

@@ -5,6 +5,27 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "24567893",
+      "name": "文件icon",
+      "font_class": "wenjianicon",
+      "unicode": "e8dc",
+      "unicode_decimal": 59612
+    },
+    {
+      "icon_id": "24527422",
+      "name": "圆圈@2x",
+      "font_class": "a-yuanquan2x",
+      "unicode": "e8db",
+      "unicode_decimal": 59611
+    },
+    {
+      "icon_id": "24378423",
+      "name": "项目标签",
+      "font_class": "xiangmubiaoqian",
+      "unicode": "e8da",
+      "unicode_decimal": 59610
+    },
     {
       "icon_id": "24368060",
       "name": "icon",

src/forge/Component/User.jsx

@@ -15,6 +15,7 @@ export default ({ url , name , column  , id , login })=>{
     ${!column && `
       & span{
         margin-left:8px;
+        font-weight: bold;
       }`
     }
   `;

src/forge/Main/CoderDepot.jsx

@@ -190,6 +190,7 @@ function CoderDepot(props){
         setLastCommit(c && c.commit);
         setLastCommitAuthor(c && c.committer);
         setMainFlag(false);
+        setReadOnly(true);
         setReadOnly(!editReadme);
         setHide(true);
       }

src/forge/Main/CoderRootCommit.js

@@ -1,13 +1,17 @@
 import React , { Component } from 'react';
-import { Spin , Pagination } from 'antd';
+import { Spin , Pagination, Timeline } from 'antd';
 import { getImageUrl } from 'educoder';
 import { truncateCommitId } from '../common/util';
 import { AlignTop } from '../Component/layout';
 import SelectBranch from '../Branch/Select';
 import Nodata from '../Nodata';
 
+import Tree from './img/tree.png';
 import axios from 'axios';
 import {Link} from "react-router-dom";
+import CopyTool from '../Component/CopyTool';
+
+import './tree/Index.scss'
 
 function returnbar(str){
   if(str && str.length>0 && str.indexOf("%2F")>-1){
@@ -15,13 +19,14 @@ function returnbar(str){
   }
   return str;
 }
+//代码库--提交页面
 class CoderRootCommit extends Component{
   constructor(props){
     super(props)
     this.state={
       commitDatas:undefined,
       dataCount:undefined,
-      limit:20,
+      limit:10,
       page:1,
       isSpining:false,
       branchList:undefined
@@ -63,7 +68,6 @@ class CoderRootCommit extends Component{
     this.setState({
       isSpining:true
     })
-    console.log(returnbar(branch));
     const { projectsId , owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/commits.json`;
     axios.get(url,{
@@ -107,6 +111,9 @@ class CoderRootCommit extends Component{
   ChangePage=(page)=>{
     const { branchName } = this.props.match.params;
     const { limit } = this.state;
+    this.setState({
+      page: page
+    })
     this.getCommitList(branchName , page , limit);
   }
   render(){
@@ -129,42 +136,50 @@ class CoderRootCommit extends Component{
             ></SelectBranch>
           </div>
           <Spin spinning={isSpining}>
-            <div className="commonBox">
+            <Timeline className="commitList">
-              <div className="commonBox-title">
+              {
-                <div className="f-wrap-between" style={{alignItems:"center"}}>
+                commitDatas && commitDatas.length > 0 && commitDatas.map((item,k)=>{
-                  <span className="font-16">{dataCount}次提交代码({branch})</span>
+                  return(
-                </div>
+                    <Timeline.Item key={k} dot={page ===1 && k===0 ?<span className="new-conmmit">最新</span>:<i className="iconfont icon-a-yuanquan2x"></i>}>
-              </div>
+                      <div className="commitList-item f-wrap-between">
-              <div className="commitList">
+                        <div>
-                {
+                          <AlignTop>
-                  commitDatas && commitDatas.length > 0 && commitDatas.map((item,k)=>{
+                            <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${branch}`} className="commitDesc font-14 color-grey-3 font-bd">{item.message}</Link>
-                    return(
+                          </AlignTop>
-                      <div key={k}>
+                          <p className="f-wrap-alignCenter mt15">
-                        <AlignTop>
+                            {
-                          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
+                              item.id ?
-                          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
+                              <Link to={`/${item.login}`} className="show-user-link">
-                        </AlignTop>
+                                {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr8 radius"/>:""}
-                        <p className="f-wrap-alignCenter mt15">
+                                <label className="font-14 color-grey-3" style={{verticalAlign:'middle'}}><label className="font-bd">{item.name ?`${item.name}  `:""}</label>提交于 {item.time_from_now}</label>
-                          {
+                              </Link>:
-                            item.id ?
+                              <span className="show-user-link">
-                            <Link to={`/${item.login}`} className="show-user-link">
+                                {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr8 radius"/>:""}
-                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
+                                <label className="font-14 color-grey-3" style={{verticalAlign:'middle'}}><label className="font-bd">{item.name ?`${item.name}  `:""}</label>提交于 {item.time_from_now}</label>
-                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
+                              </span>
-                            </Link>:
+                            }
-                            <span className="show-user-link">
+                          </p>
-                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
+                        </div>
-                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
+                        <div>
-                            </span>
+                          <div className="treecopy">
-                          }
+                            <div className="shadow">
-                          
+                              <span className="treecopy-cont">
-                        </p> 
+                                <img src={Tree} alt="sha" width={"16px"}/>
+                                <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${branch}`}>{truncateCommitId(`${item.sha}`)}</Link>
+                                <input type="text" id={`value${k}`} value={`${truncateCommitId(`${item.sha}`)}`}/>
+                              </span>
+                              <CopyTool beforeText="复制commit id" afterText="复制成功" inputId={`value${k}`}/>
+                            </div>
+                            <button className="btn-83" onClick={()=>{window.location.href=`/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}`}}>浏览文件</button>
+                          </div>
+                        </div>
                       </div>
-                    )
+                    </Timeline.Item>
-                  })
+                  )
-                }
+                })
-                {commitDatas && commitDatas.length === 0 && <Nodata _html="暂无数据"/>}
+              }
-              </div>
+              {commitDatas && commitDatas.length === 0 && <Nodata _html="暂无数据"/>}
-            </div>
+            </Timeline>
             {
               dataCount > limit ?
                 <div className="edu-txt-center pt30 mb30">

src/forge/Main/CoderRootIndex.js

@@ -108,7 +108,7 @@ class CoderRootIndex extends Component{
               () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
             }
           ></Route>
-          <Route path="/:owner/:projectsId/commits/:sha"
+          <Route path="/:owner/:projectsId/commits/:sha/:branchName"
             render={
               (props) => (<Diff {...this.props} {...props} {...this.state}/>)
             }

src/forge/Main/Diff.jsx

@@ -5,24 +5,42 @@ import { truncateCommitId } from '../common/util';
 import { getImageUrl } from 'educoder';
 import Files from '../Merge/Files';
 
+import Tree from "./img/tree.png";
 import User from "../Component/User";
-import Keys from "../Component/Keys";
 
 import axios from "axios";
 
 const Infos = styled.div`
-  border: 1px solid #dddddd;
+  border: 1px solid #FAFCFF;
   margin-bottom:15px;
   & .commitinfos {
     background-color: #f1f8ff;
-    border-bottom: 1px solid #ddd;
+    border: 1px solid rgba(42, 97, 255, 0.23);
-    padding: 20px;
+    border-radius: 3px 3px 0px 0px;
+    padding: 10px 8px 10px 16px;
+    & .f-wrap-between{
+      align-items: center;
+    }
+    & .task-hide{
+      width: 65rem;
+      overflow:hidden;
+      white-space:normal;
+      word-break:break-all;
+      font-weight: bold;
+      color: #333333;
+      font-size: 16px;
+    }
   }
   & > .f-wrap-between {
-    padding: 10px 20px;
+    padding: 14px 8px 14px 16px;
+    border-radius: 3px 3px 0px 0px;
+    border: 1px solid #D0D0D0;
+    .df{
+      align-items: center;
+    }
   }
 `;
-
+//提交详情页
 export default ({ match , history }) => {
   const [data, setData] = useState({undefined});
   const [commit, setCommit] = useState(undefined);
@@ -30,7 +48,7 @@ export default ({ match , history }) => {
   const [committer, setCommitter] = useState(undefined);
   const [isSpin, setIsSpin] = useState(true);
 
-  const { sha , projectsId, owner } = match.params;
+  const { sha , projectsId, owner, branchName } = match.params;
   useEffect(() => {
     if (projectsId && owner && sha) {
       const url = `/${owner}/${projectsId}/commits/${sha}.json`;
@@ -50,16 +68,20 @@ export default ({ match , history }) => {
         });
     }
   }, [projectsId , owner, sha]);
+  
   return (
     <div className="main" style={{padding:"0px",border:"none"}}>
       <Spin spinning={isSpin}>
         <Infos>
           <div className="commitinfos">
             <div className="f-wrap-between">
+              <div>
               {commit && commit.message &&
-                <pre className="task-hide" style={{marginBottom:"0px",height:"28px",whiteSpace:"pre-wrap"}}>{commit.message}</pre>
+                <pre className="task-hide">{commit.message}</pre>
               }
-              <Button type="primary" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
+              <i className="iconfont icon-fenzhi2 font-18"></i>{branchName}
+              </div>
+              <Button type="primary" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="btnblue" style={{height:"36px"}}>浏览文件</Button>
             </div>
           </div>
           <div className="f-wrap-between" style={{ alignItems: "center" }}>
@@ -68,17 +90,25 @@ export default ({ match , history }) => {
                 url={(committer && getImageUrl(`/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
                 name={committer && committer.name}
               />
-              {committer && committer.time_from_now && <li className="ml20 mt2">{committer.time_from_now}</li>}
+              {commit && commit.time_from_now && <li className="ml4">提交于{commit.time_from_now}</li>}
             </ul>
             <li className="df">
               {
                 parents && parents.length > 0 && parents.map((item,key)=>{
                   return(
-                    <Keys title="父节点" value={truncateCommitId(item.sha)} key={key} className="mr20"></Keys>
+                    <div className="ml40 f-wrap-alignCenter">
+                      <label className="mr8">父节点</label>
+                      <img src={Tree} alt="sha" width={"16px"} className="mr4"/>
+                      <span>{truncateCommitId(item.sha)}</span>
+                    </div>
                   )
                 })
               }
-              <Keys title="当前节点" value={truncateCommitId(sha)}></Keys>
+              <div className="ml40 f-wrap-alignCenter">
+                <label className="mr8">当前节点</label>
+                <img src={Tree} alt="sha" width={"16px"} className="mr4"/>
+                <span>{truncateCommitId(sha)}</span>
+              </div>
             </li>
           </div>
         </Infos>

src/forge/Main/Index.scss

@@ -402,6 +402,16 @@
   cursor: pointer;
   background: #FAFBFC;
   border-radius: 4px;
+  .ant-dropdown-menu-item{
+    border-radius: 8px;
+    text-align: left!important;
+    a{
+      width: 350px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
   border: 1px solid #D0D0D0;
   font-size: 15px;
   font-weight: normal;

src/forge/Main/list.scss

@@ -718,12 +718,76 @@ a.color-grey-ccc:hover{
   padding:0px 30px;
   min-height: 400px;
 }
-.commitList > div{
+
-  border-bottom: 1px solid #EEEEEE;
+.main{
-  padding:16px 0px;
+  margin: 30px auto;
-}
+  .ant-timeline{
-.commitList > div:last-child{
+    margin-top: 28px;
-  border-bottom: none;
+    .commitList-item{
+      position: relative;
+      padding: 20px 20px;
+      background: #FAFCFF;
+      border: 1px solid rgba(42, 97, 255, 0.23);
+      border-radius: 4px;
+      margin-left: 16px;
+      align-items: center;
+      &:after,&:before{
+        content: "";
+        position: absolute; 
+        left: -10px; 
+        top: 10px;
+        border-top: 6px solid transparent; 
+        border-bottom: 6px solid transparent; 
+        border-right: 10px solid rgba(42, 97, 255, 0.23);
+      }
+      &:after{
+        left: -8px; 
+        border-right: 10px solid #FAFCFF;
+        &:hover{
+          border-right: 10px solid #EEF6FF;
+        }
+      }
+      &:hover{
+        background: #EEF6FF;
+        border: 1px solid rgba(42, 97, 255, 0.58);
+        &:after{
+          border-right: 10px solid #EEF6FF;
+        }
+        &:before{
+          border-right: 10px solid rgba(42, 97, 255, 0.58);
+        }
+      }
+      .treecopy-cont{
+        padding: 4px 15px;
+      }
+      .btn-83{
+        margin-left: 20px;
+      }
+    }
+    .ant-timeline-item{
+      padding: 8px 0 20px;
+    }
+    .ant-timeline-item-tail{
+      height: calc(100% - 20px);
+      border-left: 2px solid #EEEEEE;
+      top: 12px;
+      &:after{
+        content: ' ';
+        height: 0;
+        position: absolute;
+        width: 0;
+        border: 7px solid  transparent;
+        border-top-color: #EEEEEE;
+        top: 100%;
+        left: 50%;
+        margin-left: -8px;
+      }
+    }
+    .ant-timeline-item-head-custom{
+      top:20px;
+      padding: 0 1px;
+    }
+  }
 }
 
 

src/forge/Main/sub/DetailBanner.jsx

@@ -86,7 +86,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                     </li>
                     :""
                   }
-                  {
+                  {/* {
                     item.menu_name === "resources" &&
                     <li className={pathname==="source" ? "active" : ""}>
                       <Link to={{ pathname: `/${owner}/${projectsId}/source`, state }}>
@@ -95,7 +95,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                         {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
                       </Link>
                     </li>
-                  }
+                  } */}
                   {
                     item.menu_name === "versions" &&
                     <li className={pathname==="milestones" ? "active" : ""}>

src/forge/Main/tree/Index.scss

@@ -34,48 +34,61 @@
         margin-right: 5px;
       }
     }
-    .treecopy{
-      flex:1;
-      display: flex;  
-      justify-content: center;      
-      &>div{
-        height: 32px;
-        background: #FAFBFC;
-        border-radius: 4px;
-        border: 1px solid #D0D0D0;
-        position: relative;
-        z-index: 1;
-        display: flex;
-        align-items: center;
-        &>span{
-          padding:0px 15px;
-          border-right: 1px solid rgba(153, 153, 153, 0.4);
-          height: 100%;
-          img{
-            margin-right: 4px;
-          }
-          a{
-            color: #466AFF;
-            &:hover{
-              text-decoration: underline;
-            }
-          }
-        }
-        &>i{
-          margin:0px 12px;
-          color: #333!important;
-        }
-        input{
-          position: absolute;
-          z-index: 0;
-          opacity: 0;
-          top: 32px;
-        }
-      }
-    }
     .treeabout{
       flex:1;
       text-align: right;
     }
   }
+}
+.treecopy{
+  flex:1;
+  display: flex;  
+  justify-content: center;      
+  &>div{
+    height: 32px;
+    background: #FAFBFC;
+    border-radius: 4px;
+    border: 1px solid #D0D0D0;
+    position: relative;
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    &>span{
+      padding:0px 15px;
+      border-right: 1px solid rgba(153, 153, 153, 0.4);
+      height: 100%;
+      img{
+        margin-right: 4px;
+      }
+      a{
+        color: #466AFF;
+        &:hover{
+          text-decoration: underline;
+        }
+      }
+    }
+    &>i{
+      margin:0px 12px;
+      color: #333!important;
+    }
+    input{
+      position: absolute;
+      z-index: 0;
+      opacity: 0;
+      top: 32px;
+    }
+  }
+}
+.new-conmmit{
+  width: 30px;
+  height: 18px;
+  line-height: 18px;
+  display: block;
+  background: #FF6832;
+  color: white;
+  font-size: 12px;
+  border-radius: 4px;
+}
+.icon-a-yuanquan2x{
+  color: #466AFF;
 }

src/forge/Merge/Files.jsx

@@ -1,11 +1,15 @@
 import React ,{useEffect,useState } from 'react';
 import { truncateCommitId } from '../common/util';
 import { AlignCenter , FlexAJ } from '../Component/layout';
-import { Button } from 'antd';
+import { Button, Tooltip,Progress, Popover, Anchor } from 'antd';
 import './merge.css';
+import './Index.scss';
+
+const {Link} =Anchor;
 
 function Files({data,history,owner,projectsId}){
   const [ files , setFiles ] = useState(data && data.files);
+  const [ copyfileTipTitle, setCopyfileTipTitle] = useState("复制文件路径");
 
   useEffect(()=>{
     if(data){
@@ -22,35 +26,82 @@ function Files({data,history,owner,projectsId}){
     }
   }
 
+  function copyFileName(fileName){
+    var copyCont = document.createElement('input');
+    copyCont.defaultValue = fileName;
+    document.body.appendChild(copyCont);
+    copyCont.select(); // 选择对象
+    document.execCommand("Copy"); // 执行浏览器复制命令
+    copyCont.className = 'copyCont';
+    copyCont.style.display='none';
+    setCopyfileTipTitle("复制成功");
+  }
+
+  const folderOpen = (
+  <Anchor showInkInFixed={false}>
+    <div className="folderList">
+        {files && files.length>1 && files.map((item, key) => {
+          return (
+            <Link href={`#value${key}`} title=
+              {<FlexAJ className="filesInfo" key={key} onClick={() => {item.flag && showDown(item.flag, key, item.isBin);}}>
+                <AlignCenter>
+                  <i className="iconfont icon-wenjianicon mr4"></i>
+                  {/* {!item.isBin ? <i className={!item.flag ? "iconfont icon-sanjiaoxing-down color-grey-9 mt4" : "iconfont icon-triangle font-15 color-grey-9 mt4"} onClick={() => showDown(item.flag, key, item.isBin)}></i> : ""} */}
+                  <span className="cursor-pointer" data-clipboard-text={item.name}>{item.name}</span>
+                </AlignCenter>
+                <div className="see-file">
+                  <Tooltip placement="top" title={`${item.addition+item.deletion}处更改：${item.addition>0?item.addition+"处添加":""}${item.addition>0 && item.deletion>0 ?"和":""}${item.deletion>0?item.deletion+"处删除":""}`}>
+                    <Progress showInfo = {false} strokeColor = "#2DB44D" size="small" percent={item.addition/(item.addition+item.deletion)*100} />
+                    {item.addition >0 && <span className="color-green ml10">+{item.addition}</span>}
+                    {item.deletion >0 && <span className="color-red ml10">-{item.deletion}</span>}
+                  </Tooltip>
+                </div>
+              </FlexAJ>}
+            />
+          )
+        })}
+      </div>
+    </Anchor>
+  )
+
   return(
     <div>
-      <AlignCenter className="color-grey-9 pb10" style={{borderBottom:"1px solid #eee"}}>
+      <AlignCenter className="color-grey-9 pb10">
-        <i className="iconfont icon-sanjiaoxing-down mr5"></i>
+        <i className="iconfont icon-triangle mr5 font-16"></i>
-        <span>
+        <Popover content={folderOpen} placement="bottomLeft" className="popover-file">
-          共有<span className="color-grey-3"> {data && data.files_count} 个文件被更改</span>，包括
+          <span className="color-grey-6" style={{cursor:"pointer"}}>
+          共有<span className="color-grey-3"> {data && data.files_count} 个文件 </span>被更改，包括
           { data && data.total_addition ? <span className="color-green"> {data && data.total_addition} 次插入</span>:"" }
           { data && data.total_addition && data.total_deletion ? " 和 ":""}
           { data && data.total_deletion ? <span className="color-red"> {data && data.total_deletion} 次删除</span>:""}
-        </span>
+          </span>
+        </Popover>
       </AlignCenter>
       {
         files && files.length>0 &&
-        <div>
+        <div className="fileList">
           {
             files.map((item,key)=>{
               return(
-                <div className="files" key={key}>
+                <div className="files" key={key} id= {`value${key}`}>
-                  <FlexAJ className="filesInfo" style={{cursor:item.isBin ? "default":"pointer"}} onClick={()=>showDown(item.flag,key,item.isBin)}>
+                  <FlexAJ className="filesInfo">
                     <AlignCenter>
-                      {!item.isBin ? <i className={!item.flag?"iconfont icon-xiajiantou font-16 mr15 color-grey-9":"iconfont icon-youjiantou font-16 mr15 color-grey-9"}></i>:""}
+                      {!item.isBin ? <i className={!item.flag?"iconfont icon-sanjiaoxing-down color-grey-9 mt4":"iconfont icon-triangle font-15 color-grey-9 mt4"} onClick={()=>showDown(item.flag,key,item.isBin)}></i>:""}
-                      <i className="iconfont icon-wenjia font-16 mr8 color-grey-9"></i>
+                      <span className="cursor-pointer" data-clipboard-text={item.name} onClick={()=>showDown(item.flag,key,item.isBin)}>{item.name}</span>
-                      <span>{item.name}</span>
+                      <Tooltip
+                        title={copyfileTipTitle}
+                        onVisibleChange={()=>setCopyfileTipTitle("复制文件路径")}
+                      >
+                        <i className="iconfont icon-fuzhiicon ml6" onClick={()=>copyFileName(item.name)}></i>
+                      </Tooltip>
                     </AlignCenter>
-                    <span>
+                    <div className="see-file">
-                      <Button className="mr20" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button>
+                      <Tooltip placement="top" title={`${item.addition+item.deletion}处更改：${item.addition>0?item.addition+"处添加":""}${item.addition>0 && item.deletion>0 ?"和":""}${item.deletion>0?item.deletion+"处删除":""}`}>
-                      <span className="color-green">+{item.addition}</span>
+                        <Progress showInfo = {false} strokeColor = "#2DB44D" size="small" percent={item.addition/(item.addition+item.deletion)*100} />
-                      <span className="color-red ml20">-{item.deletion}</span>
+                        <span className="ml10">{item.addition+item.deletion}处</span>
-                    </span>
+                      </Tooltip>
+                      <span className="see-file-btn" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</span>
+                    </div>
                   </FlexAJ>
                   {
                     item.sections && item.sections.length >= 1 && !item.flag &&

src/forge/Merge/Index.scss

@@ -18,4 +18,78 @@
 .pr_tags_closed{
   border:1px solid #FA6400;
   color: #FA6400;
+}
+
+.color-grey-3{
+  font-weight: bold;
+}
+.invisable{
+  display: none;
+}
+.fileList{
+  .sc-bxivhb{
+    width: 55rem;
+  }
+  .see-file{
+    width: 15rem;
+    .ml10{
+      display: inline-block;
+      width: 5rem;
+      cursor: default;
+    }
+    span{
+      width: 7%;
+    }
+  }
+}
+.filesInfo{
+  background: #FAFCFF;
+  border-color:rgba(42, 97, 255, 0.23);
+  .ant-progress-line {
+    width: 5rem;
+  }
+  .ant-progress-inner{
+    background-color: #D14A4A;
+  }
+}
+.ant-popover-arrow,.ant-anchor-ink-ball {
+  display: none;
+}
+.ant-popover-inner {
+  margin-left: -21px;
+  background: #FFF;
+}
+.ant-anchor-link,.ant-popover-inner-content{
+  padding: 0 0;
+}
+.ant-anchor-wrapper,.ant-anchor{
+  margin-left: 0;
+  padding-left: 0;
+}
+.ant-anchor-link-active > .ant-anchor-link-title {
+  color: #466AFF;
+}
+.ant-popover-inner-content{
+  color: #333333;
+  width: 75rem;
+  .folderList{
+    max-height: 280px;
+    overflow:auto;
+    .files{
+      border: 0px;
+    }
+    .filesInfo {
+      padding: 10px 18px 10px 15px;
+      height: 55px;
+      background: #FFF;
+      border-bottom: 1px solid #EEEEEE;
+      &:hover{
+        background: #F3F4F6;
+      }
+      .color-green,.color-red{
+        width: 3%;
+        text-align: right;
+      }
+    }
+  }
 }

src/forge/Merge/merge.css

@@ -152,13 +152,23 @@ form .ant-cascader-picker, form .ant-select {
   margin-top: 15px;
   border-radius: 2px;
 }
+.see-file-btn{
+  color: #466AFF;
+  cursor: pointer;
+}
 .filesInfo{
   padding:10px 15px;
   background-color: #fafafa;
 }
+.filesInfo .cursor-pointer{
+  cursor: pointer;
+}
 .filesContent{
   border-top: 1px solid #ddd;
 }
+.icon-fuzhiicon:hover{
+  color: #466AFF;
+}
 .linesContent{
   display: flex;
   min-height: 30px;

src/forge/Settings/Setting.js

@@ -16,7 +16,7 @@ const menu = [
   {name:"合并请求",index:"pulls"},
   {name:"Wiki",index:"wiki"},
   {name:"工作流(beta版)",index:"devops"},
-  {name:"资源库",index:"resources"},
+  // {name:"资源库",index:"resources"},
   {name:"里程碑",index:"versions"},
   {name:"动态",index:"activity"},
 ]

src/forge/Team/Setting/TeamSettingCommon.jsx

@@ -122,7 +122,11 @@ export default Form.create()(
                     validator:checkname
                   }
                 ],
+<<<<<<< HEAD
+                <Input placeholder="请输入组织账号" disabled/>,true
+=======
                 <Input placeholder="请输入组织账号" maxLength={100} disabled/>,true
+>>>>>>> 465ae57b071299c682f2c8d57d3380aa647c7d23
               )}
               {helper(
                 "组织名称：",

src/forge/css/index.scss

@@ -91,11 +91,14 @@ ul,ol,dl{
 }
 .commitDesc{
   flex:1;
-  margin-left:20px;
+  line-height:20px;
-  font-size:16px;
-  color:#333;
-  line-height:26px;
   word-break: break-all;
+  width: 48rem;
+  overflow: hidden;
+  white-space: normal;
+  &:hover{
+    text-decoration: underline;
+  }
 }
 
 .normalBox{
@@ -297,17 +300,31 @@ form{
   border-radius: 5px;
   font-weight: 500;
   color: #333333!important;
-  &:hover,&:active{
+  &:hover{
     background: #F3F4F6;
     color: #333333!important;
   }
+  &:active{
+    background: #D0D0D0;
+    color: #333333!important;
+  }
+}
+.shadow{
+  &:hover{
+    background: #F3F4F6;
+  }
+  &:active{
+    background: #D0D0D0;
+  }
 }
 a.hover:hover{
   text-decoration: underline;
 }
 button.ant-btn-primary.btnblue{
   background-color:rgba(70, 106, 255, 1);
+  border-color:rgba(70, 106, 255, 1);
   &:hover{
     background-color:rgba(70, 106, 255, 0.85);
+    border-color:rgba(70, 106, 255, 0.85);
   }
 }