分支设置

src/forge/Settings/BranchRule.jsx

@@ -14,7 +14,7 @@ export default Form.create()(
     const [ list, setList ] = useState(undefined);
 
     const { projectsId, owner , branch } = match.params;
-    const { getFieldDecorator, validateFields , setFieldsValue } = form;
+    const { getFieldDecorator, validateFields , setFieldsValue , getFieldsValue } = form;
 
     useEffect(() => {
       const url = `/${owner}/${projectsId}/collaborators.json`;
@@ -29,7 +29,7 @@ export default Form.create()(
         // 需要设置分支保护的分支名，获取分支保护详情
         getGuardDetail(owner,projectsId,branch);
       }
-    },[branch]);
+    },[]);
 
     function getGuardDetail(owner,projectsId,branch){
       const url = `/${owner}/${projectsId}/protected_branches/${branch}/edit.json`;
@@ -42,15 +42,14 @@ export default Form.create()(
           if(protected_branch){
             let enable_push = protected_branch.enable_push_whitelist ? 2 : protected_branch.enable_push ? 1 : 0;
             
+            setFieldsValue({
+              ...protected_branch,
+              enable_push
+            })
             setOptions(enable_push);
             setMergeOptions(protected_branch.enable_merge_whitelist);
             setApproveOptions(protected_branch.enable_approvals_whitelist);
-            
-            setFieldsValue({
-              
-              enable_push,
-              ...protected_branch
-            })
+            console.log("111",getFieldsValue("enable_status_check"));
           }
         }
       }).catch(error=>{});
@@ -74,7 +73,7 @@ export default Form.create()(
             params:
             {
               branch_name:branch,
-              enable_push:values.enable_push !== 0 ,
+              enable_push:values.enable_push !== 0 ?false : true,
               enable_push_whitelist:values.enable_push === 2 ? true : false,
               ...values
             }
@@ -88,11 +87,11 @@ export default Form.create()(
     }
 
     const helper = useCallback(
-      (label, name, rules, widget, className, isRequired) => (
+      (label, name, rules, widget, className, isRequired,flag) => (
         <div className={className}>
           <span className={isRequired ? "required" : ""}>{label}</span>
-          <Form.Item >
-            {getFieldDecorator(name,  { rules, validateFirst: true })(widget)}
+          <Form.Item>
+            {getFieldDecorator(name,  { rules, validateFirst: true , valuePropName:flag ? "checked":"value" })(widget)}
           </Form.Item>
         </div>
       ),
@@ -134,7 +133,6 @@ export default Form.create()(
               "",
               "enable_push",
               [],
-              
               <Radio.Group disabled={!protect} onChange={changeProtectOption}>
                 <Radio className="columsRadio" value={0}>
                   禁用推送<span className="color-grey-9 ml5 font-12">此分支不允许推送</span>
@@ -204,7 +202,7 @@ export default Form.create()(
               <Checkbox disabled={!protect}>
                 启用状态检查
               </Checkbox>,
-              "setStyleRule"
+              "setStyleRule",false,true
             )}
             <div style={{display:"flex",alignItems:"center"}}>
               {helper(
@@ -221,7 +219,7 @@ export default Form.create()(
               "",
               "enable_approvals_whitelist",
               [],
-              <Checkbox disabled={!protect} checked={approveOptions} onChange={changeWhitelistUsernameOption}>
+              <Checkbox name="enable_approvals_whitelist" disabled={!protect} checked={approveOptions} onChange={changeWhitelistUsernameOption}>
                 批准仅限列入白名单的用户或团队<span className="color-grey-9 ml5 font-12">只有白名单用户或团队的审核才能计数 没有批准的白名单,任何有写访问权限的人的审核都将计数</span>
               </Checkbox>,
               "setStyleRule"
@@ -251,38 +249,38 @@ export default Form.create()(
               "",
               "block_on_rejected_reviews",
               [],
-              <Checkbox disabled={!protect}>
+              <Checkbox disabled={!protect} name="block_on_rejected_reviews">
                 拒绝审核阻止了合并<span className="color-grey-9 ml5 font-12">如果官方审查人员要求作出改动，即使有足够的批准，合并也不允许</span>
               </Checkbox>,
-              "setStyleRule"
+              "setStyleRule",false,true
             )}
 
             {helper(
               "",
               "dismiss_stale_approvals",
               [],
-              <Checkbox disabled={!protect}>
+              <Checkbox disabled={!protect} name="dismiss_stale_approvals">
                 取消过时的批准<span className="color-grey-9 ml5 font-12">当新的提交更改合并请求内容被推送到分支时，旧的批准将被撤销</span>
               </Checkbox>,
-              "setStyleRule"
+              "setStyleRule",false,true
             )}
             {helper(
               "",
               "require_signed_commits",
               [],
-              <Checkbox disabled={!protect}>
+              <Checkbox disabled={!protect} name="require_signed_commits">
                 需要签名提交
               </Checkbox>,
-              "setStyleRule"
+              "setStyleRule",false,true
             )}
             {helper(
               "",
               "block_on_outdated_branch",
               [],
-              <Checkbox disabled={!protect}>
+              <Checkbox disabled={!protect} name="block_on_outdated_branch">
                 如果拉取请求已经过时，阻止合并<span className="color-grey-9 ml5 font-12">当头部分支落后基础分支时，不能合并</span>
               </Checkbox>,
-              "setStyleRule"
+              "setStyleRule",false,true
             )}
           </div>
           

src/forge/Settings/Index.js

@@ -43,8 +43,8 @@ class Index extends Component {
 
     const flag = pathname === `/projects/${owner}/${projectsId}/setting`;
     return (
-      <Box className="ProjectListIndex">
-        <Short>
+      <div className="ProjectListIndex">
+        <div style={{width:"28%",borderRadius:"5px",marginBottom:"30%"}}>
           <ul className="list-l-Menu">
             <li className={flag ? "active" : ""}>
               <p>
@@ -101,9 +101,9 @@ class Index extends Component {
               </p>
             </li> */}
           </ul>
-        </Short>
-        <Long>
-          <Gap>
+        </div>
+        <div style={{width:"72%",borderRadius:"5px",marginBottom:"30px"}}>
+          <div style={{paddingLeft:"20px",boxSizing:"border-box"}}>
             <Switch {...this.props}>
               {/* 协作者 */}
               <Route
@@ -151,9 +151,9 @@ class Index extends Component {
                 )}
               ></Route>
             </Switch>
-          </Gap>
-        </Long>
-      </Box>
+          </div>
+        </div>
+      </div>
     );
   }
 }