From b578383e8d02f09afb076a60a9c0ecf77fefc753 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Tue, 12 Oct 2021 17:15:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86=E6=9A=82=E6=97=B6=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/edu-purge.css      |  6 ++----
 src/forge/Main/Index.scss     |  2 +-
 src/forge/Settings/Setting.js | 23 ++++++++++++++++++++---
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index 603513339..1ec104461 100644
--- a/public/css/edu-purge.css
+++ b/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 {
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index a42bfec50..4ec6a7cb6 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -195,7 +195,7 @@
         width: 40px;
         height: 40px;
       }
-      &:nth-child(5){
+      &:nth-child(5n){
         margin-right: 0px;
       }
     }
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index b1af2f998..ec9f80c83 100644
--- a/src/forge/Settings/Setting.js
+++ b/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: [],

From 1fbe6671b1e0b77c3c33799d437eb740343dbc9b Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Tue, 12 Oct 2021 17:32:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderDepot.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index c86e31d94..f2e4e149a 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/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">

From 94ceec26e98ea7c50d2d7b13dac8e19eac27e192 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Tue, 12 Oct 2021 18:03:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/tag/Index.jsx  | 26 +++++++++++++-------------
 src/forge/Main/tag/Index.scss |  4 ----
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index 6a111b454..0fd40b1f4 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -119,19 +119,19 @@ function Tags(props) {
   return(
     <div>
       <SubMenu tab={"tags"} projectsId={projectsId} owner={owner}/>
-      <div className="tagSpin">
-        <Spin spinning={isSpin}>
-        {
-          source && source.length > 0 &&
-          <Table 
-            className="tagTable"
-            dataSource={source} columns={columns} pagination={false}></Table>
-        }
-        {
-          source && source.length === 0 && <Nonedata _html={'暂无数据~'}/>
-        }
-        </Spin>
-      </div>
+      <Spin spinning={isSpin}>
+        <div className="tagSpin">
+          {
+            source && source.length > 0 &&
+            <Table 
+              className="tagTable"
+              dataSource={source} columns={columns} pagination={false}></Table>
+          }
+          {
+            source && source.length === 0 && <Nonedata _html={'暂无数据~'}/>
+          }
+        </div>
+      </Spin>
     </div>
   )
 }
diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss
index 70e83a837..6adba91e3 100644
--- a/src/forge/Main/tag/Index.scss
+++ b/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;