forked from Gitlink/forgeplus-react
Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_notification_v2_noticeSettings
This commit is contained in:
commit
6435b09982
|
|
@ -12,26 +12,15 @@ function SystemNotice({system_notification,history}){
|
|||
if(system_notification && !cookie.load('notice_stage')){
|
||||
setVisible(true);
|
||||
}
|
||||
},[system_notification])
|
||||
},[system_notification,history.location])
|
||||
|
||||
function sureContinue() {
|
||||
// if(login && ( system_notification && system_notification.id )){
|
||||
// const url = `/users/${login}/system_notification_histories.json`;
|
||||
// axios.post(url,{
|
||||
// system_notification_id:system_notification.id
|
||||
// }).then(result=>{
|
||||
// if(result && result.status === 0){
|
||||
// setVisible(false);
|
||||
// hideSystemNotice();
|
||||
// }
|
||||
// }).catch(error=>{})
|
||||
// }
|
||||
console.log("cookies before:",cookie.load('notice_stage')) ;
|
||||
cookie.remove('notice_stage');
|
||||
|
||||
let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天
|
||||
// let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟
|
||||
cookie.save('notice_stage', true,{ expires: inFifteenMinutes });
|
||||
console.log("cookies after:",cookie.load('notice_stage')) ;
|
||||
cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" });
|
||||
|
||||
setVisible(false);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,9 +22,14 @@
|
|||
border-bottom: none;
|
||||
}
|
||||
.treeinfo{
|
||||
max-width: 399px;
|
||||
width: 399px;
|
||||
flex:1;
|
||||
flex-direction: column;
|
||||
&>a{
|
||||
display: block;
|
||||
width: 399px;
|
||||
|
||||
}
|
||||
a:hover{
|
||||
span{
|
||||
color: #466AFF!important;
|
||||
|
|
|
|||
|
|
@ -367,7 +367,9 @@ class CreateMerge extends Component {
|
|||
value={pull}
|
||||
onSelect={(e) => this.selectBrach('pull', e)}
|
||||
showSearch
|
||||
className="merge-flex1 flex1"
|
||||
className="merge-flex1 flex1 matchwidth"
|
||||
dropdownMatchSelectWidth={false}
|
||||
dropdownClassName="overlihide"
|
||||
>
|
||||
{this.renderBrances(pullBranches)}
|
||||
</Select>
|
||||
|
|
@ -393,7 +395,9 @@ class CreateMerge extends Component {
|
|||
value={merge}
|
||||
onSelect={(e) => this.selectBrach('merge', e)}
|
||||
showSearch
|
||||
className="merge-flex1 flex1"
|
||||
className="merge-flex1 flex1 matchwidth"
|
||||
dropdownMatchSelectWidth={false}
|
||||
dropdownClassName="overlihide"
|
||||
>
|
||||
{this.renderBrances(mergeBranches)}
|
||||
</Select>
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ class MergeItem extends Component {
|
|||
<Tag className="pr-branch-tag">
|
||||
<Link
|
||||
to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
|
||||
className="maxW200px hide-1 ver-middle"
|
||||
className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
|
||||
>
|
||||
{item.is_original
|
||||
? item.fork_project_user
|
||||
|
|
@ -134,7 +134,7 @@ class MergeItem extends Component {
|
|||
<Tag className="pr-branch-tag">
|
||||
<Link
|
||||
to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
|
||||
className="maxW200px hide-1 ver-middle"
|
||||
className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
|
||||
>
|
||||
{/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
|
||||
{project_author_name}:{item.pull_request_base}
|
||||
|
|
|
|||
|
|
@ -366,7 +366,7 @@ class MessageCount extends Component {
|
|||
<Tag className="pr-branch-tag">
|
||||
<Link
|
||||
to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
|
||||
className="ver-middle"
|
||||
className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: ${data.pull_request && data.pull_request.head}`}
|
||||
>
|
||||
{data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {data.pull_request && data.pull_request.head}
|
||||
</Link>
|
||||
|
|
@ -381,7 +381,7 @@ class MessageCount extends Component {
|
|||
<Tag className="pr-branch-tag">
|
||||
<Link
|
||||
to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
|
||||
className="ver-middle"
|
||||
className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`}
|
||||
>
|
||||
{data.issue.project_author_name}:{data.pull_request.base}
|
||||
</Link>
|
||||
|
|
|
|||
|
|
@ -64,12 +64,12 @@ class UpdateMerge extends Component {
|
|||
<div className="color-grey-3 mb10 fwb">源分支:</div>
|
||||
|
||||
<Input.Group compact className="display-flex">
|
||||
<Button className="merge-header-button maxW50 hide-1 task-hide">
|
||||
<Button className="merge-header-button flex1 maxW50 hide-1 task-hide" disabled>
|
||||
{data.is_original ? `${data.fork_project_user_name}/${data.fork_project_identifier}` : `${data.project_author}/${data.project_name}`}
|
||||
</Button>
|
||||
<Select
|
||||
defaultValue={data.is_original ? `${data.fork_project_user}:${pull}` : `${pull}`}
|
||||
className="minW50 merge-flex1 flex1"
|
||||
className="minW50 merge-flex1 flex1 matchwidth"
|
||||
disabled
|
||||
></Select>{" "}
|
||||
</Input.Group>{" "}
|
||||
|
|
@ -83,12 +83,12 @@ class UpdateMerge extends Component {
|
|||
<div>
|
||||
<div className="color-grey-3 mb10 fwb"> 目标分支 : </div>{" "}
|
||||
<Input.Group compact className="display-flex">
|
||||
<Button className="merge-header-button maxW50 hide-1 task-hide">
|
||||
<Button className="merge-header-button flex1 maxW50 hide-1 task-hide" disabled>
|
||||
{`${data.project_author}/${data.project_name}`}
|
||||
</Button>
|
||||
<Select
|
||||
defaultValue={data.is_original ? `${data.project_login}:${merge}` : `${merge}`}
|
||||
className="minW50 merge-flex1 flex1"
|
||||
className="minW50 merge-flex1 flex1 matchwidth"
|
||||
disabled
|
||||
></Select>{" "}
|
||||
</Input.Group>{" "}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ form .ant-cascader-picker, form .ant-select {
|
|||
}
|
||||
.merge-header-button{
|
||||
background:rgba(241,248,255,1);
|
||||
text-align: left;
|
||||
}
|
||||
.width70{
|
||||
width:70%;
|
||||
|
|
@ -213,4 +214,12 @@ form .ant-cascader-picker, form .ant-select {
|
|||
.mergeRequest .folders{
|
||||
/* width: 72rem; */
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.matchwidth .ant-select-selection__rendered{
|
||||
width: 200px;
|
||||
}
|
||||
.overlihide li{
|
||||
max-width: 450px;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue