From 518d341ed5d82a853bbdbd937a70f2657d1e2948 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 22 Feb 2021 10:17:52 +0800
Subject: [PATCH] issues

---
 src/forge/Component/ListCount.jsx  |  2 +-
 src/forge/Order/order.js           |  2 +-
 src/forge/Team/Group/GroupForm.jsx | 27 +++++++++++++++------------
 src/forge/Team/Index.scss          |  7 +++++++
 src/forge/users/Index.scss         |  4 ++++
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/forge/Component/ListCount.jsx b/src/forge/Component/ListCount.jsx
index 5a88dd430..d8bedbc6c 100644
--- a/src/forge/Component/ListCount.jsx
+++ b/src/forge/Component/ListCount.jsx
@@ -19,7 +19,7 @@ export default (({fork,parise})=>{
   }`;
   const SpanStyleparise = styled.span`{
     display:flex;
-    align-item:center;
+    align-items:center;
     margin-left:30px;
     padding:0px 12px;
     border-radius:13px;
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index c7a4e6223..0203a26a5 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -325,7 +325,7 @@ class order extends Component {
 
   deletedetail = (id) => {
     const { projectsId , owner } = this.props.match.params;
-    const url = `/projects/${owner}/${projectsId}/issues/${id}.json`;
+    const url = `/${owner}/${projectsId}/issues/${id}.json`;
     axios.delete(url, {
       data: {
         project_id: projectsId,
diff --git a/src/forge/Team/Group/GroupForm.jsx b/src/forge/Team/Group/GroupForm.jsx
index 4b169edf2..cae0efd27 100644
--- a/src/forge/Team/Group/GroupForm.jsx
+++ b/src/forge/Team/Group/GroupForm.jsx
@@ -21,8 +21,9 @@ export default Form.create()(
   forwardRef(({ form , match, showNotification, history, GroupDetail }) => {
     
     const [isSpin, setIsSpin] = useState(false);
-    const [check_box, setGroupDetail] = useState(false);
+    const [check_box, setCheckBox] = useState(false);
     const [switch_box, setSwtichBox] = useState([]);
+    const [onwers, setOnwers] = useState(false);
     const [switch_box_code, setSwtichBoxCode] = useState(false);
     const [switch_box_pull, setSwtichBoxPull] = useState(false);
     const [switch_box_issue, setSwtichBoxIssue] = useState(false);
@@ -32,7 +33,8 @@ export default Form.create()(
 
     useEffect(() => {
       if (GroupDetail) {
-        setGroupDetail(GroupDetail.can_create_org_project)
+        setOnwers(GroupDetail.authorize === "owner");
+        setCheckBox(GroupDetail.can_create_org_project)
         setSwtichBox(GroupDetail.units)
         setFieldsValue({
           ...GroupDetail
@@ -50,13 +52,13 @@ export default Form.create()(
     }, [switch_box])
 
     const helper = useCallback(
-      (label, name, rules, widget, isRequired, mbValue) => (
-        <React.Fragment>
-          <span className={isRequired ? "required" : ""}>{label}</span>
+      (label, name, rules, widget, isRequired, mbValue,className) => (
+        <div className={className}>
+          <span className={isRequired ? `required` : ``}>{label}</span>
           <Form.Item style={{ marginBottom: `${mbValue}px` || "20px" }}>
             {getFieldDecorator(name, { rules, validateFirst: true })(widget)}
           </Form.Item>
-        </React.Fragment>
+        </div>
       ),
       []
     );
@@ -92,7 +94,7 @@ export default Form.create()(
     }
 
     function change_check_box_status() {
-      setGroupDetail(!check_box)
+      setCheckBox(!check_box)
     }
 
     function switch_checked(code) {
@@ -145,7 +147,7 @@ export default Form.create()(
                 '团队名称：',
                 "name",
                 [{ required: true, message: "请输入团队名称" }],
-                <Input placeholder="请输入团队名称" />, true
+                <Input placeholder="请输入团队名称" disabled={onwers}/>, true
               )}
               {helper(
                 <span className="mb5">团队描述：<span className="color-grey-8">(描述团队的目的或作用)</span></span>,
@@ -155,6 +157,7 @@ export default Form.create()(
                   placeholder="请输入团队描述"
                 />
               )}
+              
               {helper(
                 '项目权限：',
                 "includes_all_project",
@@ -162,23 +165,23 @@ export default Form.create()(
                 <Radio.Group>
                   <Radio value={false} style={addStyle}>指定项目<span className="color-grey-8 ml10">(团队成员将只能访问添加到团队的项目。 选择此项 <span className="color-grey-3">将不会</span> 自动删除已经添加的项目)</span></Radio>
                   <Radio value={true} style={OptionStyle}>所有项目<span className="color-grey-8 ml10">(团队可以访问所有项目。选择此选项将 <span className="color-grey-3">添加所有现有的</span> 项目到指定团队)</span></Radio>
-                </Radio.Group>, false, 0
+                </Radio.Group>, false, 0,onwers ? "hide":""
               )}
               {helper(
                 '',
                 "can_create_org_project",
                 [],
-                <Checkbox checked={check_box} onChange={change_check_box_status} style={OptionStyle}>新建项目<span className="color-grey-8 ml10">(成员可以在组织中新建项目。创建者将自动获得新建的项目的管理员权限)</span></Checkbox>, false
+                <Checkbox checked={check_box} onChange={change_check_box_status} style={OptionStyle}>新建项目<span className="color-grey-8 ml10">(成员可以在组织中新建项目。创建者将自动获得新建的项目的管理员权限)</span></Checkbox>, false, 20,onwers ? "hide":""
               )}
               {helper(
-                '权限：',
+                '版本库权限：',
                 "authorize",
                 [],
                 <Radio.Group>
                   <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
+                </Radio.Group>, false, 20,onwers ? "hide":""
               )}
             </Form>
             {/* <p className="required">允许访问项目单元：</p>
diff --git a/src/forge/Team/Index.scss b/src/forge/Team/Index.scss
index c1df5f128..56569e286 100644
--- a/src/forge/Team/Index.scss
+++ b/src/forge/Team/Index.scss
@@ -63,6 +63,10 @@
         line-height: 30px;
         padding:0px 10px;
       }
+      .ant-btn.ant-input-search-button{
+        margin-top: -1px;
+        margin-right: -1px;
+      }
     }
     .team{
       padding:0px 32px;
@@ -355,3 +359,6 @@
     border-bottom: 1px solid #eee;
   }
 }
+.hide{
+  display: none;
+}
\ No newline at end of file
diff --git a/src/forge/users/Index.scss b/src/forge/users/Index.scss
index d65b2c505..1bdd0ec09 100644
--- a/src/forge/users/Index.scss
+++ b/src/forge/users/Index.scss
@@ -19,6 +19,10 @@ $flex:flex;
     display: $flex;
     align-items: center;
   }
+  .ant-btn.ant-input-search-button{
+    margin-top: -1px;
+    margin-right: -1px;
+  }
 }
 .contentBox{
   padding:20px 40px 0px 40px;