Merge pull request '组织团队（新增和设置）权限' (#21) from caishi/forgeplus-react:pre_develop into pre_develop_dev

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;

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=>{})
   }

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){
@@ -202,35 +214,40 @@ 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",
                 [],
-                <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>
+            <div className={(auth!=="owner" && auth !=="admin") ? "" :"hide"}>
-            <AlignCenter className="mb10">
+              <p className="required">允许访问项目单元：</p>
-              <Switch checked={switch_box_code} onClick={switch_code_types} />
+              <AlignCenter className="mb10">
-              <span className="ml30 color-grey-3">代码库<span className="color-grey-8 ml15">(查看源码、文件、提交和分支)</span></span>
+                <Switch checked={switch_box_code} onClick={switch_code_types} />
-            </AlignCenter>
+                <span className="ml30 color-grey-3">代码库<span className="color-grey-8 ml15">(查看源码、文件、提交和分支)</span></span>
-            <AlignCenter className="mb10">
+              </AlignCenter>
-              <Switch checked={switch_box_issue} onClick={switch_issue_types} />
+              <AlignCenter className="mb10">
-              <span className="ml30 color-grey-3">任务<span className="color-grey-8 ml15">(组织 bug 报告、任务和里程碑)</span></span>
+                <Switch checked={switch_box_issue} onClick={switch_issue_types} />
-            </AlignCenter>
+                <span className="ml30 color-grey-3">任务<span className="color-grey-8 ml15">(组织 bug 报告、任务和里程碑)</span></span>
-            <AlignCenter className="mb10">
+              </AlignCenter>
-              <Switch checked={switch_box_pull} onClick={switch_pull_types} />
+              <AlignCenter className="mb10">
-              <span className="ml30 color-grey-3">合并请求<span className="color-grey-8 ml15">(启用合并请求和代码评审)</span></span>
+                <Switch checked={switch_box_pull} onClick={switch_pull_types} />
-            </AlignCenter>
+                <span className="ml30 color-grey-3">合并请求<span className="color-grey-8 ml15">(启用合并请求和代码评审)</span></span>
-            <AlignCenter className="mb20">
+              </AlignCenter>
-              <Switch checked={switch_box_release} onClick={switch_releas_types} />
+              <AlignCenter className="mb20">
-              <span className="ml30 color-grey-3">版本发布<span className="color-grey-8 ml15">(跟踪项目版本和下载)</span></span>
+                <Switch checked={switch_box_release} onClick={switch_releas_types} />
-            </AlignCenter>
+                <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>

src/forge/Team/Index.scss

@@ -368,5 +368,5 @@
   }
 }
 .hide{
-  display: hidden;
+  display: none;
 }