From 5d465ec782c6620bc339d7328e0155322bc82861 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 24 Aug 2021 15:02:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=9B=A2=E9=98=9F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BC=9A=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=9D=83=E9=99=90=EF=BC=8C=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E8=AE=BE=E7=BD=AE=E8=AE=BF=E9=97=AE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8D=95=E5=85=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Notice/Index.jsx         | 4 ++--
 src/forge/Notice/UndoEvent.jsx     | 2 +-
 src/forge/Team/Group/GroupForm.jsx | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/forge/Notice/Index.jsx b/src/forge/Notice/Index.jsx
index 63d09748..02f05a87 100644
--- a/src/forge/Notice/Index.jsx
+++ b/src/forge/Notice/Index.jsx
@@ -70,9 +70,9 @@ function Index(props){
   function deleteEvent(type,count) {
     let c = count;
     if(type==="apply"){
-      setTransferCount(transferCount-count);
-    }else if(type==="undo"){
       setApplyCount(applyCount-count);
+    }else if(type==="undo"){
+      setTransferCount(transferCount-count);
     }else{
       setMessagesCount(0);
       c = messagesCount;
diff --git a/src/forge/Notice/UndoEvent.jsx b/src/forge/Notice/UndoEvent.jsx
index d93a1f83..c8c579dc 100644
--- a/src/forge/Notice/UndoEvent.jsx
+++ b/src/forge/Notice/UndoEvent.jsx
@@ -53,7 +53,7 @@ function UndoEvent(props){
     Axios.post(url).then(result=>{
       if(result && result.data){
         getList();
-        props && props.deleteEvent("apply",1);
+        props && props.deleteEvent("undo",1);
       }
     }).catch(error=>{})
   }
diff --git a/src/forge/Team/Group/GroupForm.jsx b/src/forge/Team/Group/GroupForm.jsx
index 2eb8540f..1be7bdc0 100644
--- a/src/forge/Team/Group/GroupForm.jsx
+++ b/src/forge/Team/Group/GroupForm.jsx
@@ -202,7 +202,7 @@ export default Form.create()(
                 [],
                 <Checkbox checked={check_box} onChange={change_check_box_status} style={OptionStyle}>新建项目<span className="color-grey-8 ml10">(成员可以在组织中新建项目。创建者将自动获得新建的项目的管理员权限)</span></Checkbox>, false, 20,onwers ? "hide":""
               )}
-              {/* {helper(
+              {helper(
                 '版本库权限：',
                 "authorize",
                 [],
@@ -211,9 +211,9 @@ export default Form.create()(
                   <Radio value="write" style={addStyle}>写入权限<span className="color-grey-8 ml10">(成员可以查看和推送提交到团队项目)</span></Radio>
                   <Radio value="admin" style={OptionStyle}>管理员权限<span className="color-grey-8 ml10">(成员可以拉取和推送到团队项目同时可以添加协作者)</span></Radio>
                 </Radio.Group>, false, 20,onwers ? "hide":""
-              )} */}
+              )}
             </Form>
-            {/* <p className="required">允许访问项目单元：</p>
+            <p className="required">允许访问项目单元：</p>
             <AlignCenter className="mb10">
               <Switch checked={switch_box_code} onClick={switch_code_types} />
               <span className="ml30 color-grey-3">代码库<span className="color-grey-8 ml15">(查看源码、文件、提交和分支)</span></span>
@@ -230,7 +230,7 @@ export default Form.create()(
               <Switch checked={switch_box_release} onClick={switch_releas_types} />
               <span className="ml30 color-grey-3">版本发布<span className="color-grey-8 ml15">(跟踪项目版本和下载)</span></span>
             </AlignCenter>
-             */}
+            
              <Button type={"primary"} onClick={saveGroupFrom}>{groupId ? "更新团队设置" : "新建团队"}</Button>
             <Cancel className="ml30" onClick={() => cancelEdit()}><span className="pl30 pr30">取消</span></Cancel>
           </Div>

From 061fa0ee71d83e18ec26c64eb0359686a3ff2141 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 24 Aug 2021 16:14:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=9B=A2=E9=98=9F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=8D=95=E5=85=83wiki?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Team/Group/GroupForm.jsx | 57 +++++++++++++++++++-----------
 src/forge/Team/Index.scss          |  2 +-
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/forge/Team/Group/GroupForm.jsx b/src/forge/Team/Group/GroupForm.jsx
index 1be7bdc0..e27161e0 100644
--- a/src/forge/Team/Group/GroupForm.jsx
+++ b/src/forge/Team/Group/GroupForm.jsx
@@ -24,21 +24,24 @@ export default Form.create()(
     const [check_box, setCheckBox] = useState(false);
     const [switch_box, setSwtichBox] = useState([]);
     const [onwers, setOnwers] = useState(false);
+    const [auth, setAuth] = useState("");
     const [ descNum , setDescNum ] = useState(0);
     const [switch_box_code, setSwtichBoxCode] = useState(false);
     const [switch_box_pull, setSwtichBoxPull] = useState(false);
     const [switch_box_issue, setSwtichBoxIssue] = useState(false);
     const [switch_box_release, setSwtichBoxRelease] = useState(false);
+    const [switch_box_wiki, setSwtichBoxWiki] = useState(false);
     const { getFieldDecorator, validateFields, setFieldsValue } = form;
     const { OIdentifier, groupId } = match.params;
 
     useEffect(() => {
       if (GroupDetail) {
         setOnwers(GroupDetail.authorize === "owner");
+        setAuth(GroupDetail.authorize);
         setCheckBox(GroupDetail.can_create_org_project)
         setSwtichBox(GroupDetail.units)
         setFieldsValue({
-          ...GroupDetail
+          ...GroupDetail,
         })
         setDescNum(GroupDetail.description ? GroupDetail.description.length : 0);
       }
@@ -50,6 +53,7 @@ export default Form.create()(
         setSwtichBoxPull(switch_checked("pulls"))
         setSwtichBoxIssue(switch_checked("issues"))
         setSwtichBoxRelease(switch_checked("releases"))
+        setSwtichBoxWiki(switch_checked("wiki"))
       }
     }, [switch_box])
 
@@ -132,6 +136,11 @@ export default Form.create()(
       setSwtichBoxRelease(checked)
     }
 
+    function switch_wiki_types(checked, event) {
+      switch_unit_types(checked, "wiki");
+      setSwtichBoxWiki(checked);
+    }
+
     function cancelEdit(){
       if(groupId){
         history.push(`/organize/${OIdentifier}/group/${groupId}`);
@@ -140,6 +149,9 @@ export default Form.create()(
       }
     }
 
+    function changeAuth(params) {
+      setAuth(params.target.value)
+    }
 
     function checkname(rule, value, callback){
       if(!value){
@@ -206,31 +218,36 @@ export default Form.create()(
                 '版本库权限：',
                 "authorize",
                 [],
-                <Radio.Group>
+                <Radio.Group onChange={changeAuth}>
                   <Radio value="read" style={addStyle}>读取权限<span className="color-grey-8 ml10">(成员可以查看和克隆团队项目)</span></Radio>
                   <Radio value="write" style={addStyle}>写入权限<span className="color-grey-8 ml10">(成员可以查看和推送提交到团队项目)</span></Radio>
                   <Radio value="admin" style={OptionStyle}>管理员权限<span className="color-grey-8 ml10">(成员可以拉取和推送到团队项目同时可以添加协作者)</span></Radio>
                 </Radio.Group>, false, 20,onwers ? "hide":""
               )}
             </Form>
-            <p className="required">允许访问项目单元：</p>
-            <AlignCenter className="mb10">
-              <Switch checked={switch_box_code} onClick={switch_code_types} />
-              <span className="ml30 color-grey-3">代码库<span className="color-grey-8 ml15">(查看源码、文件、提交和分支)</span></span>
-            </AlignCenter>
-            <AlignCenter className="mb10">
-              <Switch checked={switch_box_issue} onClick={switch_issue_types} />
-              <span className="ml30 color-grey-3">任务<span className="color-grey-8 ml15">(组织 bug 报告、任务和里程碑)</span></span>
-            </AlignCenter>
-            <AlignCenter className="mb10">
-              <Switch checked={switch_box_pull} onClick={switch_pull_types} />
-              <span className="ml30 color-grey-3">合并请求<span className="color-grey-8 ml15">(启用合并请求和代码评审)</span></span>
-            </AlignCenter>
-            <AlignCenter className="mb20">
-              <Switch checked={switch_box_release} onClick={switch_releas_types} />
-              <span className="ml30 color-grey-3">版本发布<span className="color-grey-8 ml15">(跟踪项目版本和下载)</span></span>
-            </AlignCenter>
-            
+            <div className={(auth!=="owner" && auth !=="admin") ? "" :"hide"}>
+              <p className="required">允许访问项目单元：</p>
+              <AlignCenter className="mb10">
+                <Switch checked={switch_box_code} onClick={switch_code_types} />
+                <span className="ml30 color-grey-3">代码库<span className="color-grey-8 ml15">(查看源码、文件、提交和分支)</span></span>
+              </AlignCenter>
+              <AlignCenter className="mb10">
+                <Switch checked={switch_box_issue} onClick={switch_issue_types} />
+                <span className="ml30 color-grey-3">任务<span className="color-grey-8 ml15">(组织 bug 报告、任务和里程碑)</span></span>
+              </AlignCenter>
+              <AlignCenter className="mb10">
+                <Switch checked={switch_box_pull} onClick={switch_pull_types} />
+                <span className="ml30 color-grey-3">合并请求<span className="color-grey-8 ml15">(启用合并请求和代码评审)</span></span>
+              </AlignCenter>
+              <AlignCenter className="mb20">
+                <Switch checked={switch_box_release} onClick={switch_releas_types} />
+                <span className="ml30 color-grey-3">版本发布<span className="color-grey-8 ml15">(跟踪项目版本和下载)</span></span>
+              </AlignCenter>
+              <AlignCenter className="mb20">
+                <Switch checked={switch_box_wiki} onClick={switch_wiki_types} />
+                <span className="ml30 color-grey-3">wiki<span className="color-grey-8 ml15">(编辑此仓库的相关文档说明)</span></span>
+              </AlignCenter>
+            </div>
              <Button type={"primary"} onClick={saveGroupFrom}>{groupId ? "更新团队设置" : "新建团队"}</Button>
             <Cancel className="ml30" onClick={() => cancelEdit()}><span className="pl30 pr30">取消</span></Cancel>
           </Div>
diff --git a/src/forge/Team/Index.scss b/src/forge/Team/Index.scss
index a046f99d..11237973 100644
--- a/src/forge/Team/Index.scss
+++ b/src/forge/Team/Index.scss
@@ -368,5 +368,5 @@
   }
 }
 .hide{
-  display: hidden;
+  display: none;
 }
\ No newline at end of file