From 037a79de6711a52a5b0eafd1f03e4f49ca202c64 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 7 May 2021 17:33:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?detail+=E5=90=8C=E6=AD=A5=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?type=3D2=E7=9A=84=E6=89=8D=E4=B8=8D=E9=9C=80=E8=A6=81=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/About/Index.jsx              | 2 +-
 src/forge/Main/Index.scss              | 2 +-
 src/forge/Main/IndexItem.js            | 9 ++++++---
 src/forge/Main/sub/UpdateDescModal.jsx | 2 +-
 src/forge/Settings/Setting.js          | 3 ++-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/forge/About/Index.jsx b/src/forge/About/Index.jsx
index 5956a7c6..b36b815c 100644
--- a/src/forge/About/Index.jsx
+++ b/src/forge/About/Index.jsx
@@ -117,7 +117,7 @@ function Index(props){
             {content ? 
               <RenderHtml className="break_word_comments imageLayerParent" value={content} url={props.history.location}/>
               :
-              <div>暂无简介~</div>
+              <div>暂无概览~</div>
             }
             {attachments && attachments.length > 0 &&
               <Attachments
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 8d074b65..58ea6446 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -227,7 +227,7 @@
           margin-bottom: 0px!important;
         }
       }
-      li{
+      & > li{
         height: 42px;
         display: flex;
         justify-content: space-between;
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index b3ac2a50..9b6a78c1 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import { Tooltip } from 'antd';
 import { getImageUrl } from 'educoder';
+import { AlignCenter } from '../Component/layout';
 import { Link } from 'react-router-dom';
 import '../css/index.scss';
 import Nodata from '../Nodata';
@@ -33,8 +34,10 @@ class IndexItem extends Component {
               }
               <div className="p-r-Infos">
                 <div className="p-r-name">
-                  <Link to={`/projects/${item.author.login}/${item.identifier}`} className="hide-1 color-grey-3 font-18 task-hide " style={{ whiteSpace: "wrap", display: 'flex', width: 400 }}>
-                    {item.author.name}/{item.name}
+                  <AlignCenter>
+                    <Link to={`/projects/${item.author.login}/${item.identifier}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 490 }}>
+                      {item.author.name}/{item.name}
+                    </Link>
                     {
                       item.forked_from_project_id ?
                         <span className="ml5">
@@ -52,7 +55,7 @@ class IndexItem extends Component {
                         <i className="iconfont icon-jingxiang font-18 color-green" />
                       </span>:""
                     }
-                  </Link>
+                  </AlignCenter>
                   <span className="p-r-tags">
                     <span className="pariseTag"><img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}</span>
                     <span><i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}</span>
diff --git a/src/forge/Main/sub/UpdateDescModal.jsx b/src/forge/Main/sub/UpdateDescModal.jsx
index cae9c36d..5039123a 100644
--- a/src/forge/Main/sub/UpdateDescModal.jsx
+++ b/src/forge/Main/sub/UpdateDescModal.jsx
@@ -39,7 +39,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
           {getFieldDecorator("desc",{
             rules:[]
           })(
-            <TextArea placeholder="项目简介" rows={4} maxLength={200}/>
+            <TextArea placeholder="请输入项目简介" rows={4} maxLength={200}/>
           )}
         </Form.Item>
         <Form.Item label="website">
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index b82b4641..7e31a98f 100644
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@@ -232,6 +232,7 @@ class Setting extends Component {
 
     const { CategoryList, LanguageList, private_check ,loading , divertVisible , is_transfering, transfer } = this.state;
     let mirror = projectDetail && projectDetail.mirror;
+    let type = projectDetail && projectDetail.type;
     return (
       <div>
         <DivertModal 
@@ -311,7 +312,7 @@ class Setting extends Component {
                           <Checkbox 
                             key={key} 
                             value={item.index} 
-                            disabled={item.index === "home" || item.index === "activity" || item.index === "code" || (mirror && item.index === "pulls")}
+                            disabled={item.index === "home" || item.index === "activity" || item.index === "code" || (mirror && (type && type===2) && item.index === "pulls")}
                           >{item.name}</Checkbox>
                         )
                       })

From af8872176c422a9f0598eb445639a54b958e093a Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 8 May 2021 14:24:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82-url=E5=9C=B0=E5=9D=80=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AppConfig.js             | 2 +-
 src/forge/Merge/MergeItem.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index bd24bb7d..034612ec 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -58,7 +58,7 @@ export function initAxiosInterceptors(props) {
     },
     err => {
       return Promise.reject(err);
-    });
+  });
 
   axios.interceptors.response.use(function (response) {
     if (response === undefined) {
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 3b3504da..0873f5da 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -178,7 +178,7 @@ class MergeItem extends Component {
                       >
                         <div className="grid-item mr15 color-grey-9">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/merge/${item.pull_request_id}/updatemerge`}
+                            to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
                             className="color-grey-9"
                           >
                             <i className="iconfont icon-bianji3 font-14 mr5"></i>

From 202081bbeb7a99665e5d99d716518df4447a4149 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 8 May 2021 16:53:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Component/Releases.jsx | 2 +-
 src/forge/Order/order.js         | 2 +-
 src/forge/Version/version.js     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx
index 3dc8cf02..501c6b63 100644
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@@ -24,7 +24,7 @@ function Releases({owner,projectsId,releaseVersions}){
               <i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i>
               <div>
                 <p className="font-16 color-grey-6">
-                  <Link to={`/projects/${owner}/${projectsId}/releases/8/update`}>{item.name}</Link>
+                  <Link to={`/projects/${owner}/${projectsId}/releases`}>{item.name}</Link>
                   <span className="font-12 laterest ml5">最新</span>
                 </p>
                 <p className="color-grey-9 font-13">{item.created_at}</p>
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 8875aa85..81c1e511 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -834,7 +834,7 @@ class order extends Component {
             )}
           {
             search_count > select_params.limit ?
-            <div className="mt30 mb10 edu-txt-center">
+            <div className="mt30 mb30 edu-txt-center">
               <Pagination
                 simple
                 defaultCurrent={select_params.page}
diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js
index 14c3d6e3..99223e1d 100644
--- a/src/forge/Version/version.js
+++ b/src/forge/Version/version.js
@@ -103,8 +103,8 @@ class version extends Component {
     const { data , releases , isSpin } = this.state
 
     return (
-      <div className="main" style={{paddingTop:"0px"}}>
-        <div className="topWrapper">
+      <div className="main" style={{padding:"0px"}}>
+        <div className="topWrapper" style={{padding:"15px 20px"}}>
           <span className="font-18 color-grey-3">版本发布</span>
           {
             data && data.user_permission ?
@@ -113,7 +113,7 @@ class version extends Component {
           }
         </div>
         <div className="releasesVersion">
-          <Spin spinning={isSpin}><div style={{minHeight:"300px"}}>{this.renderList(releases)}</div></Spin>
+          <Spin spinning={isSpin}><div>{this.renderList(releases)}</div></Spin>
         </div>
       </div>
     )