From 3ae928449457ee168084622695bb2c5abca6fdc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <hetongchong@csxjy.com>
Date: Wed, 2 Mar 2022 14:10:23 +0800
Subject: [PATCH 1/2] 0304-issue

---
 src/forge/Main/Index.js                      | 2 +-
 src/forge/Settings/Webhooks/New.jsx          | 4 ++--
 src/forge/Team/Setting/TeamSettingCommon.jsx | 2 +-
 src/forge/users/InfosUser.js                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js
index c3268739..48d113d6 100644
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@@ -244,7 +244,7 @@ class Index extends Component {
       <Menu onClick={this.ChangeSoryBy}>
         <Menu.Item key="updated_on">更新时间排序</Menu.Item>
         <Menu.Item key="created_on">创建时间排序</Menu.Item>
-        <Menu.Item key="forked_count">fork数据排序</Menu.Item>
+        <Menu.Item key="forked_count">fork数量排序</Menu.Item>
         <Menu.Item key="praises_count">点赞数量排序</Menu.Item>
       </Menu>
     )
diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx
index fbc6e8c4..2fee3bf0 100644
--- a/src/forge/Settings/Webhooks/New.jsx
+++ b/src/forge/Settings/Webhooks/New.jsx
@@ -260,11 +260,11 @@ function New({ form , match , showNotification , history }) {
                 </span> */}
                 <span>
                   <Checkbox value="create">创建</Checkbox>
-                  <span>创建分支或标记</span>
+                  <span>创建分支或标签</span>
                 </span>
                 <span>
                   <Checkbox value="delete">删除</Checkbox>
-                  <span>删除分支或标记</span>
+                  <span>删除分支或标签</span>
                 </span>
               </div>
               <p className="color-grey-3 mt10 mb10">合并请求事件</p>
diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx
index 6e98183f..72f01504 100644
--- a/src/forge/Team/Setting/TeamSettingCommon.jsx
+++ b/src/forge/Team/Setting/TeamSettingCommon.jsx
@@ -176,7 +176,7 @@ export default Form.create()(
                 '最大仓库数：',
                 "max_repo_creation",
                 [],
-                <InputNumber value="-1" style={{width:"350px"}}/>,false,false,
+                <InputNumber value="-1" max={1000} style={{width:"350px"}}/>,false,false,
                 "当输入栏为空时，默认数量无限制"
               )}
               <p>选择头像:</p>
diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js
index fff3685e..4a5c7d9b 100644
--- a/src/forge/users/InfosUser.js
+++ b/src/forge/users/InfosUser.js
@@ -108,7 +108,7 @@ class InfosUser extends Component {
     <Menu onClick={this.ChangeSoryBy}>
       <Menu.Item key="updated_on">更新时间排序</Menu.Item>
       <Menu.Item key="created_on">创建时间排序</Menu.Item>
-      <Menu.Item key="forked_count">fork数据排序</Menu.Item>
+      <Menu.Item key="forked_count">fork数量排序</Menu.Item>
       <Menu.Item key="praises_count">点赞数量排序</Menu.Item>
     </Menu>
   );

From 15b2ce6ea96740d2edced74bd6d7c30ff246c8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <1261960504@qq.com>
Date: Wed, 2 Mar 2022 15:10:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Team/Setting/TeamSettingCommon.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx
index 72f01504..3e0389e3 100644
--- a/src/forge/Team/Setting/TeamSettingCommon.jsx
+++ b/src/forge/Team/Setting/TeamSettingCommon.jsx
@@ -74,6 +74,7 @@ export default Form.create()(
     function getImage(image){
       setImageFlag(true);
       setImage(image);
+      console.log(image);
     }
 
     // 删除组织
@@ -107,6 +108,7 @@ export default Form.create()(
       }
       callback();
     }
+    
     return(
       <div>
         <WhiteBack>
@@ -180,7 +182,7 @@ export default Form.create()(
                 "当输入栏为空时，默认数量无限制"
               )}
               <p>选择头像:</p>
-              <UploadImage url={getImageUrl(`/${image}`)} getImage={getImage}/>
+              <UploadImage url={image&&image.startsWith('images/avatars/Organization')?getImageUrl(`/${image}`):image} getImage={getImage}/>
               <Button type={"primary"} onClick={updateDetail}>更新组织设置</Button>
             </Form>
           </Div>