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 { this.Modifyloginvalue()}> - + {/* */} {!pathName || (pathName && pathName.indexOf("glcc") === -1) ? : } {/* */} 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" > - + {/* */} + 添加成员 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={} className='linkBox' + addonAfter={} className='linkBox' />
-
注:
+ {/*
注:
*/}
1、管理员可通过分享邀请链接的方式,邀请其他成员加入项目
- 2、若已勾选管理员审核选项,用户接收邀请后管理员可在个人主页中“待办事项”窗口审核成员审核信息,若不需要管理员审核,成员接收邀请后,将直接加入项目 + 2、若已勾选管理员审核选项,用户接收邀请后管理员可在个人主页中“待办事项”窗口审核成员审核信息,若不需要管理员审核,成员接收邀请后,将直接加入项目
+ 3、当前邀请链接有效期为三天
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{