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 01/11] 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)}
                   </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 a2c5c1ea6f0187d433a5f5fd55aed68b515bd1d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 18 Oct 2021 16:54:16 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/SecuritySetting/Index.jsx           |  26 ++--
 .../SecuritySetting/notice/manager/Index.jsx  | 130 +++++++-----------
 2 files changed, 59 insertions(+), 97 deletions(-)

diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index f897dea1..d9fa1bfa 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -63,7 +63,7 @@ function Index(props){
             {notice_url && <ul className="securityUl ul-border-buttom">
               <li>消息通知</li>
               <li className={(pathname.indexOf("/settings/notice")>-1 && pathname.indexOf("/settings/notice/config") == -1) || pathname.indexOf("/settings/notice/privateLetter")>-1 ?"active":""}><Link to={"/settings/notice"}><i className="iconfont icon-wodetongzhi"></i><span className="text-shodow-bold">我的通知</span></Link></li>
-              {/* <li className={pathname.indexOf("/settings/notice/config")>-1 ?"active":""}><Link to={'/settings/notice/config'}><i className="iconfont icon-tongzhiguanli"></i><span className="text-shodow-bold">通知管理</span></Link></li> */}
+              <li className={pathname.indexOf("/settings/notice/config")>-1 ?"active":""}><Link to={'/settings/notice/config'}><i className="iconfont icon-tongzhiguanli"></i><span className="text-shodow-bold">通知管理</span></Link></li>
             </ul>}
             <ul className="securityUl">
               <li>安全设置</li>
@@ -73,18 +73,24 @@ function Index(props){
           <LongWidth>
             <Gap>
               <Switch>
-                <Route
-                  path="/settings/notice"
-                  render={(p) => (
-                    <MyNoticeIndex {...props} {...p}/>
-                  )}
-                ></Route>
                 <Route
                   path="/settings/notice/config"
                   render={(p) => (
                     <NoticeManager {...props} {...p}/>
                   )}
                 ></Route>
+                <Route
+                  path="/settings/notice/privateLetter"
+                  render={(p)=>(
+                    <PrivateLetter{...props} {...p}/>
+                  )}
+                ></Route>
+                <Route
+                  path="/settings/notice"
+                  render={(p) => (
+                    <MyNoticeIndex {...props} {...p}/>
+                  )}
+                ></Route>
                 <Route
                   path="/settings/SSH/new"
                   render={(p) => (
@@ -103,12 +109,6 @@ function Index(props){
                     <SSHIndex {...props} {...p}/>
                   )}
                 ></Route>
-                <Route
-                  path="/settings/notice/privateLetter"
-                  render={(p)=>(
-                    <PrivateLetter{...props} {...p}/>
-                  )}
-                ></Route>
               </Switch>
             </Gap>
           </LongWidth>
diff --git a/src/forge/SecuritySetting/notice/manager/Index.jsx b/src/forge/SecuritySetting/notice/manager/Index.jsx
index ebe84bea..da1aac8d 100644
--- a/src/forge/SecuritySetting/notice/manager/Index.jsx
+++ b/src/forge/SecuritySetting/notice/manager/Index.jsx
@@ -1,10 +1,36 @@
-import { Button, Checkbox } from "antd";
-import React from "react";
-
+import { Checkbox } from "antd";
+import React, { useEffect, useState } from "react";
+import axios from 'axios';
 import './Index.scss';
 
 function NoticeManager(props){
+  const {current_user} = props;
 
+  const [settingTypes, setSettingTypes] = useState();
+  const [userNotification, setUserNotification] = useState();
+  const [userEmail, setUserEmail] = useState();
+
+  function getUserSettings(){
+    axios.get(`/users/${current_user.login}/template_message_settings.json`).then((response)=>{
+      if(response && response.status === 200 ){
+        setUserEmail(response.data.email_body);
+        setUserNotification(response.data.notification_body);
+      }
+    })
+  }
+
+  useEffect(()=>{
+    axios.get("/template_message_settings.json").then((response)=>{
+      if(response && response.status === 200 ){
+        setSettingTypes(response.data.setting_types);
+      }
+    })
+    getUserSettings();
+  },[])
+
+  console.log('settingTypes',settingTypes);
+  console.log('userNotification',userNotification,'userEmail',userEmail);
+  console.log(userNotification.ins)
   return(
     <div className="notice01">
       <div className="sshHead">
@@ -12,87 +38,23 @@ function NoticeManager(props){
       </div>
       <div>
         <span className="notice-manager-tip">您可以通过通知管理来选择接受通知的方式</span>
-        <div className="manager-cont-top">
-          我创建或负责的
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">易修状态变更</div>
-          <Checkbox defaultChecked='true' disabled>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">易修截止日期到达最后一天</div>
-          <Checkbox defaultChecked='true' disabled>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">合并请求状态变更</div>
-          <Checkbox defaultChecked='true' disabled>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">易修有新的评论</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">合并请求有新的评论</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-
-        <div className="manager-cont-top">
-          我管理的仓库
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">被关注</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">被点赞</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">被复刻</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">有新的里程碑</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-
-        <div className="manager-cont-top">
-          我关注的仓库
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">被删除</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">被转移</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">有新的易修</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">有新的合并请求</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">有新的版本发布</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
+        {settingTypes && settingTypes.map((item,key)=>{
+          return(
+            item.type_name && <div>
+              <div className="manager-cont-top">{item.type_name}</div>
+              {item.settings.map((i, k) => {
+                console.log(userNotification.get(item.type.substring(item.type.indexOf("::")+2)+"::"+i.key));
+                return (
+                  <div className="manager-cont">
+                    <div className="manager-cont-title">{i.name}</div>
+                    <Checkbox defaultChecked='true' disabled = {i.notification_disabled}>站内信</Checkbox>
+                    <Checkbox disabled = {i.email_disabled}>邮件</Checkbox>
+                  </div>
+                )
+              })}
+            </div>
+          )
+        })}
       </div>
     </div>
   )

From 11b92ac52bce6a93bd8d0a20ded2687febf0513d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 19 Oct 2021 09:00:00 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/SecuritySetting/notice/manager/Index.jsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/forge/SecuritySetting/notice/manager/Index.jsx b/src/forge/SecuritySetting/notice/manager/Index.jsx
index da1aac8d..d45dc371 100644
--- a/src/forge/SecuritySetting/notice/manager/Index.jsx
+++ b/src/forge/SecuritySetting/notice/manager/Index.jsx
@@ -30,7 +30,6 @@ function NoticeManager(props){
 
   console.log('settingTypes',settingTypes);
   console.log('userNotification',userNotification,'userEmail',userEmail);
-  console.log(userNotification.ins)
   return(
     <div className="notice01">
       <div className="sshHead">
@@ -43,12 +42,12 @@ function NoticeManager(props){
             item.type_name && <div>
               <div className="manager-cont-top">{item.type_name}</div>
               {item.settings.map((i, k) => {
-                console.log(userNotification.get(item.type.substring(item.type.indexOf("::")+2)+"::"+i.key));
+                // console.log(userEmail[item.type.substring(item.type.indexOf("::")+2)+"::"+i.key]);
                 return (
                   <div className="manager-cont">
                     <div className="manager-cont-title">{i.name}</div>
-                    <Checkbox defaultChecked='true' disabled = {i.notification_disabled}>站内信</Checkbox>
-                    <Checkbox disabled = {i.email_disabled}>邮件</Checkbox>
+                    <Checkbox defaultChecked='true' defaultChecked = {i.notification_disabled} checked={userNotification[item.type.substring(item.type.indexOf("::")+2)+"::"+i.key]}>站内信</Checkbox>
+                    <Checkbox disabled = {i.email_disabled} defaultChecked={userEmail[item.type.substring(item.type.indexOf("::")+2)+"::"+i.key]}>邮件</Checkbox>
                   </div>
                 )
               })}

From fe1bacb98417a88453e9b72f48e48b462133716b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 19 Oct 2021 10:26:36 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86+?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9F=BA=E6=9C=AC=E8=B5=84=E6=96=99=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84consolo=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SecuritySetting/notice/manager/Index.jsx  | 46 +++++++++++--------
 src/forge/users/Material/Base.jsx             |  1 -
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/forge/SecuritySetting/notice/manager/Index.jsx b/src/forge/SecuritySetting/notice/manager/Index.jsx
index d45dc371..ca16f25e 100644
--- a/src/forge/SecuritySetting/notice/manager/Index.jsx
+++ b/src/forge/SecuritySetting/notice/manager/Index.jsx
@@ -10,26 +10,36 @@ function NoticeManager(props){
   const [userNotification, setUserNotification] = useState();
   const [userEmail, setUserEmail] = useState();
 
-  function getUserSettings(){
+  function onChange(type,e,setting){
+    let notification_body = userNotification;
+    let email_body = userEmail;
+    if(type){//站内信
+      notification_body[setting] = e.target.checked;
+    }else{//邮件
+      email_body[setting] = e.target.checked;
+    }
+    axios.post(`/users/${current_user.login}/template_message_settings/update_setting.json`,{
+      setting:{
+        notification_body:notification_body,
+        email_body:email_body
+      }
+    })
+  }
+
+  useEffect(()=>{
+    axios.get("/template_message_settings.json").then(response => {
+      if (response && response.status === 200) {
+        setSettingTypes(response.data.setting_types);
+      }
+    })
     axios.get(`/users/${current_user.login}/template_message_settings.json`).then((response)=>{
       if(response && response.status === 200 ){
         setUserEmail(response.data.email_body);
         setUserNotification(response.data.notification_body);
       }
     })
-  }
-
-  useEffect(()=>{
-    axios.get("/template_message_settings.json").then((response)=>{
-      if(response && response.status === 200 ){
-        setSettingTypes(response.data.setting_types);
-      }
-    })
-    getUserSettings();
   },[])
 
-  console.log('settingTypes',settingTypes);
-  console.log('userNotification',userNotification,'userEmail',userEmail);
   return(
     <div className="notice01">
       <div className="sshHead">
@@ -37,17 +47,17 @@ function NoticeManager(props){
       </div>
       <div>
         <span className="notice-manager-tip">您可以通过通知管理来选择接受通知的方式</span>
-        {settingTypes && settingTypes.map((item,key)=>{
+        {settingTypes && userNotification && userEmail && settingTypes.map((item,key)=>{
           return(
-            item.type_name && <div>
+            item.type_name && <div key={key}>
               <div className="manager-cont-top">{item.type_name}</div>
               {item.settings.map((i, k) => {
-                // console.log(userEmail[item.type.substring(item.type.indexOf("::")+2)+"::"+i.key]);
+                const setting = item.type.substring(item.type.indexOf("::")+2)+"::"+i.key;
                 return (
-                  <div className="manager-cont">
+                  <div className="manager-cont" key={k}>
                     <div className="manager-cont-title">{i.name}</div>
-                    <Checkbox defaultChecked='true' defaultChecked = {i.notification_disabled} checked={userNotification[item.type.substring(item.type.indexOf("::")+2)+"::"+i.key]}>站内信</Checkbox>
-                    <Checkbox disabled = {i.email_disabled} defaultChecked={userEmail[item.type.substring(item.type.indexOf("::")+2)+"::"+i.key]}>邮件</Checkbox>
+                    <Checkbox disabled = {i.notification_disabled} defaultChecked={userNotification[setting]} onChange={(e)=>{onChange(true,e,setting)}}>站内信</Checkbox>
+                    <Checkbox disabled = {i.email_disabled} defaultChecked={userEmail[setting]} onChange={(e)=>{onChange(false,e,setting)}}>邮件</Checkbox>
                   </div>
                 )
               })}
diff --git a/src/forge/users/Material/Base.jsx b/src/forge/users/Material/Base.jsx
index f9707ab0..61a9d6f1 100644
--- a/src/forge/users/Material/Base.jsx
+++ b/src/forge/users/Material/Base.jsx
@@ -11,7 +11,6 @@ export default Form.create()(
     const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form;
     // const { username } = props && props.match && props.match.params;
     const { resetUserInfo , current_user } = props;
-    console.log(props);
 
     useEffect(()=>{
       if(current_user && current_user.login){

From 31af77e7040670d30877d24976186f38b960f788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 19 Oct 2021 10:45:15 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SecuritySetting/notice/manager/Index.jsx  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/forge/SecuritySetting/notice/manager/Index.jsx b/src/forge/SecuritySetting/notice/manager/Index.jsx
index ca16f25e..5ba82d60 100644
--- a/src/forge/SecuritySetting/notice/manager/Index.jsx
+++ b/src/forge/SecuritySetting/notice/manager/Index.jsx
@@ -23,6 +23,19 @@ function NoticeManager(props){
         notification_body:notification_body,
         email_body:email_body
       }
+    }).then(response=>{
+      if(response && response.status === 0){
+        getUserSettings();
+      }
+    })
+  }
+
+  function getUserSettings(){
+    axios.get(`/users/${current_user.login}/template_message_settings.json`).then((response)=>{
+      if(response && response.status === 200 ){
+        setUserEmail(response.data.email_body);
+        setUserNotification(response.data.notification_body);
+      }
     })
   }
 
@@ -32,12 +45,7 @@ function NoticeManager(props){
         setSettingTypes(response.data.setting_types);
       }
     })
-    axios.get(`/users/${current_user.login}/template_message_settings.json`).then((response)=>{
-      if(response && response.status === 200 ){
-        setUserEmail(response.data.email_body);
-        setUserNotification(response.data.notification_body);
-      }
-    })
+    getUserSettings();
   },[])
 
   return(

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 06/11] =?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 <c_15243705227@sina.com>
Date: Wed, 20 Oct 2021 11:06:49 +0800
Subject: [PATCH 07/11] =?UTF-8?q?cookie=E8=AE=BE=E7=BD=AE=E6=97=B6?=
 =?UTF-8?q?=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 <c_15243705227@sina.com>
Date: Wed, 20 Oct 2021 15:25:35 +0800
Subject: [PATCH 08/11] =?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 <c_15243705227@sina.com>
Date: Wed, 20 Oct 2021 16:26:23 +0800
Subject: [PATCH 09/11] =?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)}
                   </Select>
@@ -396,6 +397,7 @@ class CreateMerge extends Component {
                       showSearch
                       className="merge-flex1 flex1 matchwidth"
                       dropdownMatchSelectWidth={false}
+                      dropdownClassName="overlihide"
                     >
                       {this.renderBrances(mergeBranches)}
                     </Select>
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 {
                         <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}
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 {
                         <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>
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 {
                     <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>{" "}
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

From 13c58faad85f4d2619704bc78ed569337bb26218 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Thu, 21 Oct 2021 10:37:10 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3-=E6=A0=B9=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=AF=B9=E5=BA=94=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Branch/SelectOverlay.jsx | 20 ++++++--------------
 src/forge/Main/CoderDepot.jsx      |  4 ++--
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/forge/Branch/SelectOverlay.jsx b/src/forge/Branch/SelectOverlay.jsx
index e9c4aae4..0be56732 100644
--- a/src/forge/Branch/SelectOverlay.jsx
+++ b/src/forge/Branch/SelectOverlay.jsx
@@ -2,7 +2,7 @@ import React , { useState , useEffect } from 'react';
 import { Input , Spin , Menu } from 'antd';
 import { getBranch , getTag } from '../GetData/getData';
 
-function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owner , visible }) {
+function SelectOverlay({ changeBranch , tagflag , projectsId , owner , visible }) {
   const [ inputValue , setInputValue] = useState(undefined);
   const [ nav , setNav ] = useState(0);
   const [ isSpin , setIsSpin ] = useState(true);
@@ -11,21 +11,13 @@ function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owne
   const [ datas , setDatas ] = useState(undefined);
   const [ keys ,setKeys] = useState("branch");
 
-  // useEffect(()=>{
-  //   if(visible){
-  //     setKeys("branch");
-  //     getBranchs(projectsId,owner);
-  //     setIsSpin(true);
-  //   }
-  // },[visible])
-
   useEffect(()=>{
-    if(branchList){
-      setData(branchList);
-      setDatas(branchList);
-      setIsSpin(false);
+    if(visible){
+      setKeys("branch");
+      getBranchs(projectsId,owner);
+      setIsSpin(true);
     }
-  },[branchList])
+  },[visible])
 
   async function getBranchs(id,owner){
     let result = await getBranch(id,owner);
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 8dd5e468..f50c134a 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -407,14 +407,14 @@ function CoderDepot(props){
                             <Link to={`/${owner}/${projectsId}/branches`} className="iconBtn">
                               <i className="iconfont icon-master_icon font-16"></i>
                               <span>分支</span>
-                              <span>{projectDetail && projectDetail.branches && projectDetail.branches.total_count}</span>
+                              <span>{projectDetail && projectDetail.branches_count}</span>
                             </Link>
                           </AlignCenter>
                           <AlignCenter className="mr20">
                               <Link to={`/${owner}/${projectsId}/tags`} className="iconBtn">
                                   <i className="iconfont icon-biaoqianicon font-16"></i>
                                   <span>标签</span>
-                                  <span>{projectDetail && projectDetail.tags && projectDetail.tags.total_count}</span>
+                                  <span>{projectDetail && projectDetail.tags_count}</span>
                               </Link>
                           </AlignCenter>
                         </React.Fragment>

From cc62bde5b48dd34e5dc330c301e1acc24fb7cdd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 21 Oct 2021 11:02:15 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=20=E6=8F=90=E4=BA=A4=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A4=9A=E8=A1=8C=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/list.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss
index 83b4d5ee..59589fb6 100644
--- a/src/forge/Main/list.scss
+++ b/src/forge/Main/list.scss
@@ -734,7 +734,9 @@ a.color-grey-ccc:hover{
       border: 1px solid rgba(42, 97, 255, 0.23);
       border-radius: 4px;
       margin-left: 16px;
-      align-items: center;
+      & .treecopy{
+        margin-top: 20px;
+      }
       & .markdown-body table{
         background: #FAFCFF;
       }