From dfa9b3d8352b1730b5d22616cd3c237dcc174392 Mon Sep 17 00:00:00 2001 From: caishi Date: Mon, 18 Oct 2021 15:48:31 +0800 Subject: [PATCH 1/5] issue --- src/forge/Main/tree/Index.scss | 7 ++++++- src/forge/Merge/CreateMerge.js | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 c335d79f..9d8da7d3 100644 --- a/src/forge/Merge/CreateMerge.js +++ b/src/forge/Merge/CreateMerge.js @@ -369,6 +369,7 @@ class CreateMerge extends Component { onSelect={(e) => this.selectBrach('pull', e)} showSearch className="merge-flex1 flex1" + dropdownMatchSelectWidth={false} > {this.renderBrances(pullBranches)} @@ -395,6 +396,7 @@ class CreateMerge extends Component { onSelect={(e) => this.selectBrach('merge', e)} showSearch className="merge-flex1 flex1" + dropdownMatchSelectWidth={false} > {this.renderBrances(mergeBranches)} From 2c867f98566a2def04183f9d400d0ff6a48faf50 Mon Sep 17 00:00:00 2001 From: caishi Date: Wed, 20 Oct 2021 11:05:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?cookie=E8=AE=BE=E7=BD=AEpath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Component/NoticeModal/SystemNotice.jsx | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/forge/Component/NoticeModal/SystemNotice.jsx b/src/forge/Component/NoticeModal/SystemNotice.jsx index 917b87c8..817d7b8e 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')) ; + + // 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,path:"/" }); + setVisible(false); } From 76c2d205eb6799fcb9a0eb4cc7403668cc0879e6 Mon Sep 17 00:00:00 2001 From: caishi Date: Wed, 20 Oct 2021 11:06:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?cookie=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Component/NoticeModal/SystemNotice.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/Component/NoticeModal/SystemNotice.jsx b/src/forge/Component/NoticeModal/SystemNotice.jsx index 817d7b8e..1560c1ff 100644 --- a/src/forge/Component/NoticeModal/SystemNotice.jsx +++ b/src/forge/Component/NoticeModal/SystemNotice.jsx @@ -17,8 +17,8 @@ function SystemNotice({system_notification,history}){ function sureContinue() { cookie.remove('notice_stage'); - // let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天 - let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟 + 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,path:"/" }); setVisible(false); From d47c725b96bf3bc92850957c9e2f14e45d679179 Mon Sep 17 00:00:00 2001 From: caishi Date: Wed, 20 Oct 2021 15:25:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?pr=E5=88=86=E6=94=AF=E8=BF=87=E9=95=BF?= =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=97=B6=E5=BA=94=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/CreateMerge.js | 4 ++-- src/forge/Merge/merge.css | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js index 2659f2e8..b039c634 100644 --- a/src/forge/Merge/CreateMerge.js +++ b/src/forge/Merge/CreateMerge.js @@ -367,7 +367,7 @@ class CreateMerge extends Component { value={pull} onSelect={(e) => this.selectBrach('pull', e)} showSearch - className="merge-flex1 flex1" + className="merge-flex1 flex1 matchwidth" dropdownMatchSelectWidth={false} > {this.renderBrances(pullBranches)} @@ -394,7 +394,7 @@ class CreateMerge extends Component { value={merge} onSelect={(e) => this.selectBrach('merge', e)} showSearch - className="merge-flex1 flex1" + className="merge-flex1 flex1 matchwidth" dropdownMatchSelectWidth={false} > {this.renderBrances(mergeBranches)} diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css index 3ea2620c..1d635028 100644 --- a/src/forge/Merge/merge.css +++ b/src/forge/Merge/merge.css @@ -213,4 +213,8 @@ form .ant-cascader-picker, form .ant-select { .mergeRequest .folders{ /* width: 72rem; */ width: 100%; - } \ No newline at end of file + } + + .matchwidth .ant-select-selection__rendered{ + max-width: 200px; + } \ No newline at end of file From 057881097d79a4607088d0a384a8bd0a6dbe3310 Mon Sep 17 00:00:00 2001 From: caishi Date: Wed, 20 Oct 2021 16:26:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?pr=20=E5=88=86=E6=94=AF=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/CreateMerge.js | 2 ++ src/forge/Merge/MergeItem.js | 4 ++-- src/forge/Merge/MessageCount.js | 4 ++-- src/forge/Merge/UpdateMerge.js | 8 ++++---- src/forge/Merge/merge.css | 7 ++++++- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js index b039c634..d7a32009 100644 --- a/src/forge/Merge/CreateMerge.js +++ b/src/forge/Merge/CreateMerge.js @@ -369,6 +369,7 @@ class CreateMerge extends Component { showSearch className="merge-flex1 flex1 matchwidth" dropdownMatchSelectWidth={false} + dropdownClassName="overlihide" > {this.renderBrances(pullBranches)} @@ -396,6 +397,7 @@ class CreateMerge extends Component { showSearch 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 1d635028..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%; @@ -216,5 +217,9 @@ form .ant-cascader-picker, form .ant-select { } .matchwidth .ant-select-selection__rendered{ - max-width: 200px; + width: 200px; + } + .overlihide li{ + max-width: 450px; + } \ No newline at end of file