From af2feeb34f90bdbdc64a7151b8071dbb5bb630b2 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 21 Apr 2021 16:55:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=BB=84=E7=BB=87-=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E8=B4=A6=E5=8F=B7=E6=AD=A3=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Head/Footer.jsx                | 79 ++++++++++++------------
 src/forge/Newfile/UserSubmitComponent.js |  2 +-
 src/forge/Newfile/m_editor.js            |  4 +-
 src/forge/Team/New.jsx                   |  6 +-
 src/modules/tpm/TPMIndex.css             |  2 +-
 5 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/src/forge/Head/Footer.jsx b/src/forge/Head/Footer.jsx
index 840d919b..8a69c2ad 100644
--- a/src/forge/Head/Footer.jsx
+++ b/src/forge/Head/Footer.jsx
@@ -18,45 +18,48 @@ function Footer(){
   }
 
   return(
-    <div className="newFooter edu-txt-center">
-      {value && showhtml(value)}
-      {/* <div className="footerInfos">
-        <ul>
-          <li>社区</li>
-          <li><a href={`/`} target="_blank">网站首页</a></li>
-          <li><a href={`https://www.trustie.net/agreement`} target="_blank">服务协议</a></li>
-          <li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
-          <li><a href={`https://forum.trustie.net/`} target="_blank">问吧交流</a></li>
-          <li><a href={`https://www.trustie.net/cooperation`} target="_blank">合作伙伴</a></li>
-        </ul>
-        <ul>
-          <li>支持与服务</li>
-          <li><a href={`https://forgeplus.trustie.net/docs/api`} target="_blank">API文档</a></li>
-          <li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
-          <li><a href={`https://git-scm.com`} target="_blank">Git常用命令</a></li>
-          <li><a href={`https://forum.trustie.net/forums/3080/detail`} target="_blank">DevOps使用文档</a></li>
-          <li><a href={`https://forgeplus.trustie.net/projects/jasder/forgeplus/tree/master/CHANGELOG.md`} target="_blank">日志更新</a></li>
-        </ul>
-        <ul>
-          <li>合作伙伴</li>
-          <li><a href={`http://www.sei.pku.edu.cn`} target="_blank">北京大学</a></li>
-          <li><a href={`http://scse.buaa.edu.cn`} target="_blank">北京航空航天大学</a></li>
-          <li><a href={`https://www.nju.edu.cn`} target="_blank">南京大学</a></li>
-          <li><a href={`https://www.xtu.edu.cn`} target="_blank">湘潭大学</a></li>
-          <li><a href={`http://www.iscas.ac.cn`} target="_blank">ISCAS</a></li>
-          <li><a href={`https://www.ucloud.cn`} target="_blank">UCloud优刻得</a></li>
-          <li><a href={`http://www.inforbus.com`} target="_blank">中创软件</a></li>
-          <li><a href={`https://www.inspur.com`} target="_blank">浪潮集团</a></li>
-          <li><a href={`http://www.copu.org.cn`} target="_blank">中国开源软件推进联盟</a></li>
-          <li><a href={`https://www.sjtu.edu.cn`} target="_blank">上海交通大学</a></li>
-        </ul>
-        <ul>
-          <li>合作伙伴</li>
-          <li><span>热线：</span></li>
-          <li><span>QQ群：1071514693</span></li>
-        </ul>
+    <div>
+      <div style={{height:"483px"}}></div>
+      <div className="newFooter edu-txt-center">
+        {value && showhtml(value)}
+        {/* <div className="footerInfos">
+          <ul>
+            <li>社区</li>
+            <li><a href={`/`} target="_blank">网站首页</a></li>
+            <li><a href={`https://www.trustie.net/agreement`} target="_blank">服务协议</a></li>
+            <li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
+            <li><a href={`https://forum.trustie.net/`} target="_blank">问吧交流</a></li>
+            <li><a href={`https://www.trustie.net/cooperation`} target="_blank">合作伙伴</a></li>
+          </ul>
+          <ul>
+            <li>支持与服务</li>
+            <li><a href={`https://forgeplus.trustie.net/docs/api`} target="_blank">API文档</a></li>
+            <li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
+            <li><a href={`https://git-scm.com`} target="_blank">Git常用命令</a></li>
+            <li><a href={`https://forum.trustie.net/forums/3080/detail`} target="_blank">DevOps使用文档</a></li>
+            <li><a href={`https://forgeplus.trustie.net/projects/jasder/forgeplus/tree/master/CHANGELOG.md`} target="_blank">日志更新</a></li>
+          </ul>
+          <ul>
+            <li>合作伙伴</li>
+            <li><a href={`http://www.sei.pku.edu.cn`} target="_blank">北京大学</a></li>
+            <li><a href={`http://scse.buaa.edu.cn`} target="_blank">北京航空航天大学</a></li>
+            <li><a href={`https://www.nju.edu.cn`} target="_blank">南京大学</a></li>
+            <li><a href={`https://www.xtu.edu.cn`} target="_blank">湘潭大学</a></li>
+            <li><a href={`http://www.iscas.ac.cn`} target="_blank">ISCAS</a></li>
+            <li><a href={`https://www.ucloud.cn`} target="_blank">UCloud优刻得</a></li>
+            <li><a href={`http://www.inforbus.com`} target="_blank">中创软件</a></li>
+            <li><a href={`https://www.inspur.com`} target="_blank">浪潮集团</a></li>
+            <li><a href={`http://www.copu.org.cn`} target="_blank">中国开源软件推进联盟</a></li>
+            <li><a href={`https://www.sjtu.edu.cn`} target="_blank">上海交通大学</a></li>
+          </ul>
+          <ul>
+            <li>合作伙伴</li>
+            <li><span>热线：</span></li>
+            <li><span>QQ群：1071514693</span></li>
+          </ul>
+        </div>
+        <p className="footerCopy">© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE <a href="https://beian.miit.gov.cn">湘ICP备 17009477号</a></p> */}
       </div>
-      <p className="footerCopy">© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE <a href="https://beian.miit.gov.cn">湘ICP备 17009477号</a></p> */}
     </div>
   )
 }
diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js
index 9883ce8f..6c921c9f 100644
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@@ -117,7 +117,7 @@ class UserSubmitComponent extends Component {
         <span className="df" style={{ alignItems: "center" }}>
           <Link to={`/users/${current_user && current_user.login}`} className="show-user-link" >
             <img
-              src={getImageUrl(`images/${current_user && current_user.image_url}`)}
+              src={getImageUrl(`/${current_user && current_user.image_url}`)}
               alt=""
               className="screwImg"
             />
diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index 4e2e6851..7f773d98 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -51,7 +51,7 @@ class m_editor extends Component {
     return (
       <React.Fragment>
         <div>
-          <div className="branchTable">
+          <div className="branchTable" style={{border:"1px solid #eee"}}>
             <Editor
               height="400px"
               language={language ? language : "plaintext"}
@@ -64,7 +64,7 @@ class m_editor extends Component {
             />
           </div>
             {!readOnly && (
-              <div style={{padding:"20px",marginTop:"20px",borderTop:"1px solid #d9d9d9"}}>
+              <div style={{marginTop:"20px"}}>
                 <UserSubmitComponent
                   {...this.props}
                   {...this.state}
diff --git a/src/forge/Team/New.jsx b/src/forge/Team/New.jsx
index cd3de57c..c7e48e8c 100644
--- a/src/forge/Team/New.jsx
+++ b/src/forge/Team/New.jsx
@@ -64,14 +64,14 @@ export default Form.create()(
       if(!value){
         callback();
       }
-      if(value && !value.match(/^[a-zA-Z][a-zA-Z\d]{3,14}$/)){
-        callback("只能使用英文字母和数字，以字母开头，长度为4到15个字符");
+      if(value && !value.match(/^[a-zA-Z][a-zA-Z0-9_-]{3,19}$/)){
+        callback("只能使用以字母开头，包含字母、数字、下划线、横杠等，长度4到20个字符");
       }
       callback();
     }
 
     return(
-        <div className="main">
+        <div className="main" style={{padding:"0px",border:"none"}}>
           <div className="teamBox">
             <p className="teamBox-title">新建组织</p>
             <Form className="teamBox-form">
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index 98db3919..565c6d9f 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -104,7 +104,7 @@ body>.-task-title {
 }
 
 .newContainer {
-  background: #f5f5f5;
+  background: #fff;
 }
 
 .ant-modal-title {