关闭glcc弹框及微调邀请样式 #406

Merged
tongChong merged 1 commits from tongChong/forgeplus-react:feature_invite into gitlink_server 2022-06-27 10:00:37 +08:00
4 changed files with 25 additions and 8 deletions

View File

@ -18,7 +18,7 @@ import moment from 'moment'
import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles'; import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
import SiderBar from './forge/Component/SiderBar'; import SiderBar from './forge/Component/SiderBar';
import SiderBarHelp from './glcc/siderBarHelp'; import SiderBarHelp from './glcc/siderBarHelp';
import GlccModal from './modules/glccModal'; // import GlccModal from './modules/glccModal';
import { SnackbarHOC } from 'educoder'; import { SnackbarHOC } from 'educoder';
import { initAxiosInterceptors } from './AppConfig' import { initAxiosInterceptors } from './AppConfig'
@ -293,7 +293,7 @@ class App extends Component {
<ConfigProvider locale={zhCN}> <ConfigProvider locale={zhCN}>
<MuiThemeProvider theme={theme}> <MuiThemeProvider theme={theme}>
<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog> <LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
<GlccModal /> {/* <GlccModal /> */}
{!pathName || (pathName && pathName.indexOf("glcc") === -1) ? <SiderBar /> : <SiderBarHelp/>} {!pathName || (pathName && pathName.indexOf("glcc") === -1) ? <SiderBar /> : <SiderBarHelp/>}
{/* <Router> */} {/* <Router> */}
<Switch> <Switch>

View File

@ -92,7 +92,8 @@ function AddMember({getID,login,showNotification}){
onClick={addCollaborator} onClick={addCollaborator}
className="ml15" className="ml15"
> >
<Icon type="plus" size="16"></Icon> {/* <Icon type="plus" size="16"></Icon> */}
<i className="iconfont icon-tianjiafangda mr3"></i>
添加成员 添加成员
</Button> </Button>
</div> </div>

View File

@ -58,6 +58,8 @@ function CollaboratorMemberByLink({ projectsId, owner, project_id, author, showN
if (document.execCommand('copy')) { if (document.execCommand('copy')) {
document.execCommand('copy'); document.execCommand('copy');
setCopy(true); setCopy(true);
// copyEle.blur();
document.getSelection().removeAllRanges();
} }
} }
@ -77,13 +79,14 @@ function CollaboratorMemberByLink({ projectsId, owner, project_id, author, showN
id="inviteUrl" id="inviteUrl"
value={inviteUrl} value={inviteUrl}
readOnly 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 className='tipBox mt25'>
<div>: </div> {/* <div>注: </div> */}
<div className='ml5'> <div className='ml5'>
1管理员可通过分享邀请链接的方式邀请其他成员加入项目<br /> 1管理员可通过分享邀请链接的方式邀请其他成员加入项目<br />
2若已勾选管理员审核选项用户接收邀请后管理员可在个人主页中待办事项窗口审核成员审核信息若不需要管理员审核成员接收邀请后将直接加入项目 2若已勾选管理员审核选项用户接收邀请后管理员可在个人主页中待办事项窗口审核成员审核信息若不需要管理员审核成员接收邀请后将直接加入项目<br />
3当前邀请链接有效期为三天
</div> </div>
</div> </div>
</div> </div>

View File

@ -65,6 +65,15 @@
} }
.addPanel{ .addPanel{
display: flex; display: flex;
.icon-tianjiafangda{
font-size: 16px !important;
font-weight: bold;
&+span{
position: relative;
top:-1px;
}
}
} }
.red_btn{ .red_btn{
display: block; display: block;
@ -255,11 +264,15 @@
color:#151d40; color:#151d40;
} }
.tipBox{ .tipBox{
background-color:rgba(199, 209, 255, 0.17); // background-color:rgba(199, 209, 255, 0.17);
color:#7e849e; color:#7e849e;
padding: 20px 150px 20px 25px; // padding: 20px 150px 20px 25px;
display: flex; display: flex;
} }
.success{
background-color: #36cacf;
border-color: #36cacf;
}
.linkBox{ .linkBox{
width: 55%; width: 55%;
.ant-input-group-addon{ .ant-input-group-addon{