Merge pull request '通知公告弹框bug以及pr页面下拉弹框的宽度' (#192) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

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 });
+    cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" });
-    console.log("cookies after:",cookie.load('notice_stage')) ;
+
     setVisible(false);
   }
 

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;

src/forge/Merge/CreateMerge.js

@@ -368,6 +368,7 @@ class CreateMerge extends Component {
                     onSelect={(e) => this.selectBrach('pull', e)}
                     showSearch
                     className="merge-flex1 flex1"
+                    dropdownMatchSelectWidth={false}
                   >
                     {this.renderBrances(pullBranches)}
                   </Select>
@@ -394,6 +395,7 @@ class CreateMerge extends Component {
                       onSelect={(e) => this.selectBrach('merge', e)}
                       showSearch
                       className="merge-flex1 flex1"
+                      dropdownMatchSelectWidth={false}
                     >
                       {this.renderBrances(mergeBranches)}
                     </Select>