diff --git a/src/forge/Component/NoticeModal/SystemNotice.jsx b/src/forge/Component/NoticeModal/SystemNotice.jsx index 917b87c8..1560c1ff 100644 --- a/src/forge/Component/NoticeModal/SystemNotice.jsx +++ b/src/forge/Component/NoticeModal/SystemNotice.jsx @@ -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); } diff --git a/src/forge/Main/tree/Index.scss b/src/forge/Main/tree/Index.scss index b077d9de..f65a1c68 100644 --- a/src/forge/Main/tree/Index.scss +++ b/src/forge/Main/tree/Index.scss @@ -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; diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js index b766c023..d7a32009 100644 --- a/src/forge/Merge/CreateMerge.js +++ b/src/forge/Merge/CreateMerge.js @@ -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)} @@ -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)} diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index f1afabf9..61477c14 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -110,7 +110,7 @@ class MergeItem extends Component { {item.is_original ? item.fork_project_user @@ -134,7 +134,7 @@ class MergeItem extends Component { {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */} {project_author_name}:{item.pull_request_base} diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index e2dabd86..6d01e8a3 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -366,7 +366,7 @@ class MessageCount extends Component { {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {data.pull_request && data.pull_request.head} @@ -381,7 +381,7 @@ class MessageCount extends Component { {data.issue.project_author_name}:{data.pull_request.base} diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js index 001bedd5..8918db6e 100644 --- a/src/forge/Merge/UpdateMerge.js +++ b/src/forge/Merge/UpdateMerge.js @@ -64,12 +64,12 @@ class UpdateMerge extends Component {
源分支:
- {" "} {" "} @@ -83,12 +83,12 @@ class UpdateMerge extends Component {
目标分支 :
{" "} - {" "} {" "} diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css index 3ea2620c..d61543b4 100644 --- a/src/forge/Merge/merge.css +++ b/src/forge/Merge/merge.css @@ -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%; - } \ No newline at end of file + } + + .matchwidth .ant-select-selection__rendered{ + width: 200px; + } + .overlihide li{ + max-width: 450px; + + } \ No newline at end of file