From 156b2fd5e3768faae7204902539aef0c7a2fae1b Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 12 Dec 2022 16:05:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89+=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Team/Setting/TeamSettingCommon.jsx | 19 +++++++++++++++++--
 src/modules/tpm/TPMIndexHOC.js               |  6 ++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx
index 4c43d8ee..6cd64962 100644
--- a/src/forge/Team/Setting/TeamSettingCommon.jsx
+++ b/src/forge/Team/Setting/TeamSettingCommon.jsx
@@ -25,8 +25,9 @@ export default Form.create()(
     const [ password , setPassword ] = useState(undefined);
     const [ passwordFlag , setPasswordFlag ] = useState(false);
     const [ visible , setVisible ] = useState(false);
+    const [ privacyVisible , setPrivacyVisible ] = useState(false);
     const [ descNum , setDescNum ] = useState(0);
-    const { getFieldDecorator , validateFields , setFieldsValue } = form;
+    const { getFieldDecorator , validateFields , setFieldsValue , getFieldsValue} = form;
 
     useEffect(()=>{
       if(organizeDetail){
@@ -109,10 +110,24 @@ export default Form.create()(
       callback();
     }
     
+    function changeVisibility(e){
+      if(e.target.value === "privacy"){
+        setPrivacyVisible(true);
+      }
+    }
+    function concelChangePrivacy(){
+      setPrivacyVisible(false);
+      setFieldsValue({
+        visibility:organizeDetail && organizeDetail.visibility
+      })
+    }
     return(
       <div>
         <WhiteBack>
           <Title>基本设置</Title>
+          <Modals visible={privacyVisible} okText={"确认"} cancelText={"取消"} onCancel={concelChangePrivacy} onOk={()=>setPrivacyVisible(false)}> 
+            <p className="font-16 edu-txt-center">设置私有后，该组织内所有仓库将更改为私有仓库，确认更改？</p>
+          </Modals>
           <Div>
             <Form>
               {helper(
@@ -161,7 +176,7 @@ export default Form.create()(
                 '可见性：',
                 "visibility",
                 [],
-                <Radio.Group>
+                <Radio.Group onChange={changeVisibility}>
                   <Radio value="common" style={radioStyle}>公开</Radio>
                   <Radio value="limited" style={radioStyle}>受限<span>（仅对登录用户可见）</span></Radio>
                   <Radio value="privacy" style={radioStyle}>私有<span>（仅对组织成员可见）</span></Radio>
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index 0489fd03..b432451b 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -172,7 +172,7 @@ export function TPMIndexHOC(WrappedComponent) {
 						tpmLoading: false,
 						completeProfile:response.data.profile_completed
 					})
-					if(response.data && response.data.login){
+					if(response.data.login){
 						if(response.data.need_edit_info){
 							this.setState({
 								giteaVisible:true,
@@ -180,7 +180,9 @@ export function TPMIndexHOC(WrappedComponent) {
 							})
 						}
 						// 如果处于登录状态，且刚刚打开，那么跳到个人主页
-						if(this.props.match.path === "/" && this.props.history.length===2){
+						// let hrefStr = this.props.match.path === "/login" || this.props.match.path === "/register" || this.props.match.path === "/resetPassword";
+						// console.log("111:",hrefStr,this.props.match.path);
+						if((this.props.match.path === "/" && this.props.history.length===2)){
 							this.props.history.push(`/${response.data.login}`)
 						}
 						if(!response.data.phone){