From ac8d4d54dd5d8d0658aec0a55633f3ae8836d508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <hetongchong@csxjy.com>
Date: Mon, 27 Jun 2022 09:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=ADglcc=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E5=8F=8A=E5=BE=AE=E8=B0=83=E9=82=80=E8=AF=B7=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                                      |  4 ++--
 src/forge/Component/AddMember.jsx               |  3 ++-
 src/forge/Settings/CollaboratorMemberByLink.jsx |  9 ++++++---
 src/forge/Settings/setting.scss                 | 17 +++++++++++++++--
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/App.js b/src/App.js
index 9f794a180..2d17a1864 100644
--- a/src/App.js
+++ b/src/App.js
@@ -18,7 +18,7 @@ import moment from 'moment'
 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
 import SiderBar from './forge/Component/SiderBar';
 import SiderBarHelp from './glcc/siderBarHelp';
-import GlccModal from './modules/glccModal';
+// import GlccModal from './modules/glccModal';
 
 import { SnackbarHOC } from 'educoder';
 import { initAxiosInterceptors } from './AppConfig'
@@ -293,7 +293,7 @@ class App extends Component {
         <ConfigProvider locale={zhCN}>
           <MuiThemeProvider theme={theme}>
             <LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
-            <GlccModal />
+            {/* <GlccModal /> */}
             {!pathName || (pathName && pathName.indexOf("glcc") === -1) ? <SiderBar /> : <SiderBarHelp/>}
             {/* <Router> */}
             <Switch>
diff --git a/src/forge/Component/AddMember.jsx b/src/forge/Component/AddMember.jsx
index 62b87cbdf..adbbabdda 100644
--- a/src/forge/Component/AddMember.jsx
+++ b/src/forge/Component/AddMember.jsx
@@ -92,7 +92,8 @@ function AddMember({getID,login,showNotification}){
         onClick={addCollaborator}
         className="ml15"
       >
-        <Icon type="plus" size="16"></Icon>
+        {/* <Icon type="plus" size="16"></Icon> */}
+        <i className="iconfont icon-tianjiafangda mr3"></i>
         添加成员
       </Button>
     </div>
diff --git a/src/forge/Settings/CollaboratorMemberByLink.jsx b/src/forge/Settings/CollaboratorMemberByLink.jsx
index ea34ec8fd..4d6f9c7bd 100644
--- a/src/forge/Settings/CollaboratorMemberByLink.jsx
+++ b/src/forge/Settings/CollaboratorMemberByLink.jsx
@@ -58,6 +58,8 @@ function CollaboratorMemberByLink({ projectsId, owner, project_id, author, showN
     if (document.execCommand('copy')) {
       document.execCommand('copy');
       setCopy(true);
+      // copyEle.blur();
+      document.getSelection().removeAllRanges();
     }
   }
 
@@ -77,13 +79,14 @@ function CollaboratorMemberByLink({ projectsId, owner, project_id, author, showN
         id="inviteUrl"
         value={inviteUrl}
         readOnly
-        addonAfter={<Button type='primary' onClick={inviteClick}>{copy ? '复制成功' : '复制链接'}</Button>} className='linkBox'
+        addonAfter={<Button type='primary' className={`${copy?'success':''}`} onClick={inviteClick}>{copy ? '复制成功' : '复制链接'}</Button>} className='linkBox'
       />
       <div className='tipBox mt25'>
-        <div>注: </div>
+        {/* <div>注: </div> */}
         <div className='ml5'>
           1、管理员可通过分享邀请链接的方式，邀请其他成员加入项目<br />
-          2、若已勾选管理员审核选项，用户接收邀请后管理员可在个人主页中“待办事项”窗口审核成员审核信息，若不需要管理员审核，成员接收邀请后，将直接加入项目
+          2、若已勾选管理员审核选项，用户接收邀请后管理员可在个人主页中“待办事项”窗口审核成员审核信息，若不需要管理员审核，成员接收邀请后，将直接加入项目<br />
+          3、当前邀请链接有效期为三天
         </div>
       </div>
     </div>
diff --git a/src/forge/Settings/setting.scss b/src/forge/Settings/setting.scss
index 74d3edf43..b859fd661 100644
--- a/src/forge/Settings/setting.scss
+++ b/src/forge/Settings/setting.scss
@@ -65,6 +65,15 @@
 }
 .addPanel{
   display: flex;
+
+  .icon-tianjiafangda{
+    font-size: 16px !important;
+    font-weight: bold;
+    &+span{
+      position: relative;
+      top:-1px;
+    }
+  }
 }
 .red_btn{
   display: block;
@@ -255,11 +264,15 @@
     color:#151d40;
   }
   .tipBox{
-    background-color:rgba(199, 209, 255, 0.17);
+    // background-color:rgba(199, 209, 255, 0.17);
     color:#7e849e;
-    padding: 20px 150px 20px 25px;
+    // padding: 20px 150px 20px 25px;
     display: flex;
   }
+  .success{
+    background-color: #36cacf;
+    border-color: #36cacf;
+  }
   .linkBox{
     width: 55%;
     .ant-input-group-addon{