From dfa9b3d8352b1730b5d22616cd3c237dcc174392 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Mon, 18 Oct 2021 15:48:31 +0800
Subject: [PATCH 1/3] 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 b077d9d..f65a1c6 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 c335d79..9d8da7d 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)}
                   </Select>
@@ -395,6 +396,7 @@ class CreateMerge extends Component {
                       onSelect={(e) => this.selectBrach('merge', e)}
                       showSearch
                       className="merge-flex1 flex1"
+                      dropdownMatchSelectWidth={false}
                     >
                       {this.renderBrances(mergeBranches)}
                     </Select>

From 2c867f98566a2def04183f9d400d0ff6a48faf50 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Wed, 20 Oct 2021 11:05:38 +0800
Subject: [PATCH 2/3] =?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 917b87c..817d7b8 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 <c_15243705227@sina.com>
Date: Wed, 20 Oct 2021 11:06:49 +0800
Subject: [PATCH 3/3] =?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 817d7b8..1560c1f 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);