Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router_v2

public/css/edu-purge.css

@@ -1949,9 +1949,7 @@ a.decoration {
 }
 
 .mr20 {
-  margin-right: 10px;
-  margin-left: 10px;
-  float: left;
+  margin-right: 20px;
 }
 
 .mr25 {
@@ -1959,7 +1957,7 @@ a.decoration {
 }
 
 .mr30 {
-  margin-right: 10px;
+  margin-right: 30px;
 }
 
 .mr35 {

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/CoderDepot.jsx

@@ -402,7 +402,7 @@ function CoderDepot(props){
                             getPathUrl={getPathUrl}
                         />
                         :
-                        <div>
+                        <React.Fragment>
                           <AlignCenter className="mr20">
                             <Link to={`/${owner}/${projectsId}/branches`} className="iconBtn">
                               <i className="iconfont icon-master_icon font-16"></i>
@@ -417,7 +417,7 @@ function CoderDepot(props){
                                   <span>{projectDetail && projectDetail.tags && projectDetail.tags.total_count}</span>
                               </Link>
                           </AlignCenter>
-                        </div>
+                        </React.Fragment>
                       }
                     </AlignCenter>
                     <AlignCenter className="depotBtn">

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

@@ -195,7 +195,7 @@
         width: 40px;
         height: 40px;
       }
-      &:nth-child(5){
+      &:nth-child(5n){
         margin-right: 0px;
       }
     }
@@ -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;

src/forge/Main/tag/Index.jsx

@@ -119,8 +119,8 @@ function Tags(props) {
   return(
     <div>
       <SubMenu tab={"tags"} projectsId={projectsId} owner={owner}/>
-      <div className="tagSpin">
       <Spin spinning={isSpin}>
+        <div className="tagSpin">
           {
             source && source.length > 0 &&
             <Table 
@@ -130,8 +130,8 @@ function Tags(props) {
           {
             source && source.length === 0 && <Nonedata _html={'暂无数据~'}/>
           }
-        </Spin>
         </div>
+      </Spin>
     </div>
   )
 }

src/forge/Main/tag/Index.scss

@@ -39,10 +39,6 @@
 }
 .tagSpin{
   min-height: 300px;
-  text-align: center;
-  display: flex;
-  align-items: center;
-  justify-content: center;
 }
 .tagBranch{
   padding-right: 15px;

src/forge/Settings/Setting.js

@@ -153,15 +153,20 @@ class Setting extends Component {
       name: values.project_name,
       description: values.project_description,
       private: private_check,
+      identifier:values.project_identifier,
       ...values,
     }).then((result) => {
       if (result) {
-        this.props.showNotification(`仓库信息修改成功！`);
-        const { getDetail } = this.props;
-        getDetail && getDetail();
         this.setState({
           loading:false
         })
+        this.props.showNotification(`仓库信息修改成功！`);
+        // if(values.project_identifier !== projectsId){
+        //   this.props.history.push(`/${owner}/${values.project_identifier}/settings`);
+        // }else{
+        // }
+          const { getDetail } = this.props;
+          getDetail && getDetail();
       }
     }).catch((error) => {
       console.log(error);
@@ -283,6 +288,18 @@ class Setting extends Component {
                   )}
                 </Form.Item>
               </div>
+              {/* <Form.Item label="项目标识 (项目url标识部分，更改项目标识将导致原仓库地址失效)">
+                {getFieldDecorator("project_identifier", {
+                  rules: [
+                    {
+                      required: true,
+                      message: "请输入项目标识",
+                    },
+                  ],
+                })(
+                  <Input placeholder="项目标识请使用与项目相关的英文关键字" maxLength="100" />
+                )}
+              </Form.Item> */}
               <Form.Item label="项目简介">
                 {getFieldDecorator("project_description", {
                   rules: [],