From 12dfc717930cab9bc6ce566ceff163d6b638d3e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Wed, 6 Sep 2023 16:17:35 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Information/Pages/source.jsx       | 22 ++++++++++++------
 src/forge/Information/Pages/sourceDetail.jsx | 24 +++++++++++---------
 src/forge/Information/index.scss             | 19 ++++++++++++++--
 src/forge/Information/indexZone1.scss        |  2 +-
 4 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/forge/Information/Pages/source.jsx b/src/forge/Information/Pages/source.jsx
index d4fe165a0..77fdd5137 100644
--- a/src/forge/Information/Pages/source.jsx
+++ b/src/forge/Information/Pages/source.jsx
@@ -1,5 +1,5 @@
 import React , { useEffect , useState } from 'react';
-import { Input , Pagination, Spin } from 'antd';
+import { Input , Pagination, Spin, Tag } from 'antd';
 import SourceIcon from '../img/sourceIcon.png';
 import { Link } from 'react-router-dom';
 import axios from 'axios';
@@ -7,6 +7,7 @@ import { getSourceTypeList , getSourceList , getSourceZoneList } from '../api';
 import Nodata from '../../Nodata';
 import ImgGreen from '../img/green_nodata.png';
 import '../indexZone1.scss';
+import { FlexAJ } from '../../Component/layout';
 
 const { Search } = Input;
 
@@ -53,7 +54,7 @@ function Source(props){
   function getLists(){
     setIsSpin(true);
     getSourceList({
-      id,pageSize:limit,pageNum:page,typeId:chooseTypeId,domainId:chooseZoneId,name:search
+      id,pageSize:limit,pageNum:page,searchTypeId:chooseTypeId,domainId:chooseZoneId,name:search
     }).then(response=>{
       if(response){
         setSourceList(response.data.rows);
@@ -98,7 +99,7 @@ function Source(props){
                   {
                     zoneList.map((i,k)=>{
                       return(
-                        <li key={k} onClick={()=>{setChooseZoneId(i.id);window.scrollTo(0,450)}} className={chooseZoneId && chooseZoneId === i.id ? "active":"" }>{i.name}</li>
+                        <li key={k} onClick={()=>{setChooseZoneId(i.id);window.scrollTo(0,450)}} className={`${chooseZoneId && chooseZoneId === i.id ? "active":""} task-hide`}>{i.name}</li>
                       )
                     })
                   }
@@ -138,12 +139,19 @@ function Source(props){
                       {i.summary}
                       </p>
                       <div className="s_infos">
-                        <p className="load_count">
-                          <img src={SourceIcon} alt="" width="18px" className="mr5"/><span style={{color:"#5e6685"}}>{i.downloadCount}</span>
-                        </p>
+                        <FlexAJ>
+                          {temp === "zone" && <span className='domainNameBox task-hide'>{i.domainName}</span>}
+                          <p className="load_count">
+                            <img src={SourceIcon} alt="" width="18px" className="mr5" style={{marginTop: '-4px'}}/><span style={{color:"#5e6685"}}>{i.downloadCount}</span>
+                          </p>
+                        </FlexAJ>
                         {temp === "zone1" && <p className="load_source">
                           <span>{i.domainName}</span>
-                          <span>{i.typeName}</span>
+                          {i.zoneResourceTypeList && <span>
+                            {i.zoneResourceTypeList.reduce((pre, cur)=>{
+                              return pre ? `${pre}, ${cur.name}` : cur.name
+                            }, '')}
+                          </span>}
                         </p>
                         }
                       </div>
diff --git a/src/forge/Information/Pages/sourceDetail.jsx b/src/forge/Information/Pages/sourceDetail.jsx
index 9d1570776..93167732a 100644
--- a/src/forge/Information/Pages/sourceDetail.jsx
+++ b/src/forge/Information/Pages/sourceDetail.jsx
@@ -7,6 +7,8 @@ import { Link } from 'react-router-dom';
 import axios from 'axios';
 import { Base64 } from 'js-base64';
 import { httpUrl } from '../fetch';
+import { AlignCenter, FlexAJ } from '../../Component/layout';
+import SourceIcon from '../img/sourceIcon.png';
 
 
 function SourceDetail(props){
@@ -36,7 +38,16 @@ function SourceDetail(props){
       {
         detail &&
         <div className="source_detail_box">
-          <div className="s_d_title">{detail.name}</div>
+          <FlexAJ className="s_d_title">
+            <AlignCenter>
+              <span className='domainNameBoxD font-13 mr15'>{detail.domainName}</span>
+              <span className='font-22'>{detail.name}</span>
+            </AlignCenter>
+            <p className="load_count">
+              <img src={SourceIcon} alt="" width="18px" className="mr5" style={{marginTop: '-4px'}}/><span style={{color:"#5e6685"}}>{detail.downloadCount}</span>
+            </p>
+          </FlexAJ>
+          <div className='pb20'>{detail.summary}</div>
           {
             detail.fileList && detail.fileList.length > 0 &&
             <ul className="files_box">
@@ -46,6 +57,7 @@ function SourceDetail(props){
                     <li>
                       <img src={SourceFile} alt="" width="20px" className="mr12"/>
                       <span className="task-hide">{i.fileOriginName}</span>
+                      <span>{i.zoneResourceType.name}</span>
                       <span>{i.fileSizeInfo}</span>
                       <a href={`${httpUrl}/file/open/download/${i.fileId}`} download className="f_b_load primaryColor">下载</a>
                     </li>
@@ -54,16 +66,6 @@ function SourceDetail(props){
               }
             </ul>
           }
-          
-          { detail.introduction && 
-            <div style={{padding:"20px 0px"}}>
-              <RenderHtml 
-                className="source_detail imageLayerParent" 
-                value={detail.introduction ? Base64.decode(detail.introduction):""} 
-                url={props.history.location} 
-              />
-            </div>
-          }
         </div>
       }
     </div>
diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss
index 0d488e358..f9dc7881c 100644
--- a/src/forge/Information/index.scss
+++ b/src/forge/Information/index.scss
@@ -1380,17 +1380,24 @@
           margin-bottom: 14px!important;
         }
       }
+      .domainNameBox{
+        border:1px solid var(--primary-color);
+        border-radius:2px;
+        height: 28px;
+        padding: 0px 12px;
+        color: var(--primary-color);
+        max-width: 70%;
+      }
     }
   }
 }
 .source_detail_box{
   background-color: #fff;
-  padding:10px 35px 30px;
+  padding:10px 35px 70px 30px;
   .s_d_title{
     padding:25px 0px;
     border-bottom: 1px dashed rgba(141, 149, 172, 0.27);
     color:#1f2329;
-    font-size:22px;
     margin-bottom: 20px!important;
   }
   .files_box{
@@ -1411,6 +1418,14 @@
       }
     }
   }
+  .domainNameBoxD{
+    display: inline-block;
+    border:1px solid var(--primary-color);
+    border-radius:2px;
+    height: 28px;
+    padding: 0px 12px;
+    color: var(--primary-color);
+  }
 }
 // 帮助中心
 .zoneHelpBox{
diff --git a/src/forge/Information/indexZone1.scss b/src/forge/Information/indexZone1.scss
index 6ee7816ae..f434bba06 100644
--- a/src/forge/Information/indexZone1.scss
+++ b/src/forge/Information/indexZone1.scss
@@ -721,7 +721,7 @@
             align-items: center;
             margin-top: 10px;
             .load_count{
-              margin-right: 10px;
+              margin-right: 100px;
               min-width: 68px;
             }
           }

From 68a004be4cb538d821e2e194986dafe59206d455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 7 Sep 2023 10:35:48 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dissue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Information/Pages/source.jsx       |  2 +-
 src/forge/Information/Pages/sourceDetail.jsx | 23 ++++++++++++--------
 src/forge/Information/index.scss             | 10 ++++++++-
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/forge/Information/Pages/source.jsx b/src/forge/Information/Pages/source.jsx
index 77fdd5137..06c22e4f3 100644
--- a/src/forge/Information/Pages/source.jsx
+++ b/src/forge/Information/Pages/source.jsx
@@ -115,7 +115,7 @@ function Source(props){
                   {
                     typeList.map((i,k)=>{
                       return(
-                        <li key={k} onClick={()=>{setChooseTypeId(i.id);window.scrollTo(0,450)}} className={chooseTypeId && chooseTypeId === i.id ? "active":"" }>{i.name}</li>
+                        <li key={k} onClick={()=>{setChooseTypeId(i.id);window.scrollTo(0,450)}} className={`${chooseTypeId && chooseTypeId === i.id ? "active":""} task-hide`}>{i.name}</li>
                       )
                     })
                   }
diff --git a/src/forge/Information/Pages/sourceDetail.jsx b/src/forge/Information/Pages/sourceDetail.jsx
index 93167732a..0e98a96f2 100644
--- a/src/forge/Information/Pages/sourceDetail.jsx
+++ b/src/forge/Information/Pages/sourceDetail.jsx
@@ -38,15 +38,20 @@ function SourceDetail(props){
       {
         detail &&
         <div className="source_detail_box">
-          <FlexAJ className="s_d_title">
-            <AlignCenter>
-              <span className='domainNameBoxD font-13 mr15'>{detail.domainName}</span>
-              <span className='font-22'>{detail.name}</span>
-            </AlignCenter>
-            <p className="load_count">
-              <img src={SourceIcon} alt="" width="18px" className="mr5" style={{marginTop: '-4px'}}/><span style={{color:"#5e6685"}}>{detail.downloadCount}</span>
-            </p>
-          </FlexAJ>
+          <div className="s_d_title">
+            <FlexAJ>
+              <AlignCenter style={{flex: 1}}>
+                <span className='domainNameBoxD font-13 mr15'>{detail.domainName}</span>
+                <span className='font-22' style={{flex: 1}}>{detail.name}</span>
+              </AlignCenter>
+              <div className="load_count">
+                <img src={SourceIcon} alt="" width="18px" className="mr5" style={{marginTop: '-4px'}}/><span style={{color:"#5e6685"}}>{detail.downloadCount}</span>
+              </div>
+            </FlexAJ>
+            {detail.createUser && detail.createUser.avatar && <img alt='' src={detail.createUser.avatar} className='publicUserAvatar mr10'/>}
+            <span className='mr20'>{detail.createUser && detail.createUser.nickName}</span>
+            <span>发布于{detail.updateTime || detail.createTime}</span>
+          </div>
           <div className='pb20'>{detail.summary}</div>
           {
             detail.fileList && detail.fileList.length > 0 &&
diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss
index f9dc7881c..97183225b 100644
--- a/src/forge/Information/index.scss
+++ b/src/forge/Information/index.scss
@@ -1395,10 +1395,18 @@
   background-color: #fff;
   padding:10px 35px 70px 30px;
   .s_d_title{
-    padding:25px 0px;
+    padding:20px 0px 10px;
     border-bottom: 1px dashed rgba(141, 149, 172, 0.27);
     color:#1f2329;
     margin-bottom: 20px!important;
+    &>span{
+      color: #4c5876;
+    }
+    .publicUserAvatar{
+      width: 24px;
+      border-radius: 50%;
+      margin-top: -3px;
+    }
   }
   .files_box{
     padding:11px 30px;

From a18f4c6ca675d7ffeacd58df79d3b347284524b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 7 Sep 2023 15:23:23 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Information/Pages/sourceDetail.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/forge/Information/Pages/sourceDetail.jsx b/src/forge/Information/Pages/sourceDetail.jsx
index 0e98a96f2..4f3f7b865 100644
--- a/src/forge/Information/Pages/sourceDetail.jsx
+++ b/src/forge/Information/Pages/sourceDetail.jsx
@@ -48,8 +48,8 @@ function SourceDetail(props){
                 <img src={SourceIcon} alt="" width="18px" className="mr5" style={{marginTop: '-4px'}}/><span style={{color:"#5e6685"}}>{detail.downloadCount}</span>
               </div>
             </FlexAJ>
-            {detail.createUser && detail.createUser.avatar && <img alt='' src={detail.createUser.avatar} className='publicUserAvatar mr10'/>}
-            <span className='mr20'>{detail.createUser && detail.createUser.nickName}</span>
+            {detail.createUser && detail.createUser.avatar && <Link to={`/${detail.createUser.userName}`}><img alt='' src={detail.createUser.avatar} className='publicUserAvatar mr10'/></Link>}
+            {detail.createUser && <Link className='mr20' to={`/${detail.createUser.userName}`}>{detail.createUser.nickName}</Link>}
             <span>发布于{detail.updateTime || detail.createTime}</span>
           </div>
           <div className='pb20'>{detail.summary}</div>

From 7fa31a3ec748750a6382acd362918e40f81fec6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 7 Sep 2023 15:23:43 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Information/Pages/help.jsx | 24 +++++++++++++-----------
 src/forge/Information/index.scss     | 15 ++++++++++-----
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/forge/Information/Pages/help.jsx b/src/forge/Information/Pages/help.jsx
index 10352e197..a46971fad 100644
--- a/src/forge/Information/Pages/help.jsx
+++ b/src/forge/Information/Pages/help.jsx
@@ -198,7 +198,7 @@ function ProjectSource(props) {
         <span>{item.titleStr}</span>
       );
       return (
-        <TreeNode title={title} key={item.key + ""} dataRef={item} className='menuHcNode font-15'>
+        <TreeNode title={title} key={item.key + ""} isLeaf={item.isFile} dataRef={item} className='menuHcNode font-15'>
           {renderTreeNodes(item.children)}
         </TreeNode>
       );
@@ -214,16 +214,18 @@ function ProjectSource(props) {
           {
             wikiList && (wikiList.length > 0 ? <Box className='zoneHelpBox'>
               {/* wiki目录导航 */}
-              <div className='leftMenuHC mr20'>
-                <Search
-                  allowClear
-                  placeholder="输入关键字搜索文件"
-                  className="searchHC mb10"
-                  onSearch={changeSearchValue}
-                />
-                <DirectoryTree onSelect={selectTree} expandedKeys={expandedKeys} onExpand={onExpand} autoExpandParent={autoExpandParent} showIcon={false}>
-                  {renderTreeNodes(initMenuList)}
-                </DirectoryTree>
+              <div className='leftMenuBox mr20'>
+                <div className='leftMenuHC'>
+                  <Search
+                    allowClear
+                    placeholder="输入关键字搜索文件"
+                    className="searchHC mb10"
+                    onSearch={changeSearchValue}
+                  />
+                  <DirectoryTree onSelect={selectTree} expandedKeys={expandedKeys} onExpand={onExpand} autoExpandParent={autoExpandParent} showIcon={false}>
+                    {renderTreeNodes(initMenuList)}
+                  </DirectoryTree>
+                </div>
               </div>
               {/* 内容区 */}
               {wikiDetail && <LongWidth className='wikiContentBox'>
diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss
index 97183225b..0f16a211a 100644
--- a/src/forge/Information/index.scss
+++ b/src/forge/Information/index.scss
@@ -1437,15 +1437,17 @@
 }
 // 帮助中心
 .zoneHelpBox{
+  .leftMenuBox{
+    background: #ffffff;
+    padding: 25px 18px 25px 15px;
+  }
   .leftMenuHC{
     width: 290px;
     min-height: 500px;
     overflow-x: auto;
-    &::-webkit-scrollbar{
-      display: none;
-    }
-    background: #ffffff;
-    padding: 25px 15px;
+    // &::-webkit-scrollbar{
+    //   display: none;
+    // }
     .ant-tree.ant-tree-directory > .menuHcNode span.ant-tree-node-content-wrapper.ant-tree-node-selected, .ant-tree.ant-tree-directory .ant-tree-child-tree > .menuHcNode span.ant-tree-node-content-wrapper.ant-tree-node-selected{
       color: var(--primary-color);
     }
@@ -1468,6 +1470,9 @@
     .searchHC .ant-input-search-icon:hover{
       color: var(--primary-color);
     }
+    .ant-tree li span.ant-tree-switcher{
+      width: 10px;
+    }
   }
   .wikiTitleHC{
     font-weight: 700;

From e73a9b7d20907b1abcc77f0187a0c255816a39e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 7 Sep 2023 15:30:46 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Information/Pages/sourceDetail.jsx | 2 +-
 src/forge/Information/index.scss             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/forge/Information/Pages/sourceDetail.jsx b/src/forge/Information/Pages/sourceDetail.jsx
index 4f3f7b865..d94f85362 100644
--- a/src/forge/Information/Pages/sourceDetail.jsx
+++ b/src/forge/Information/Pages/sourceDetail.jsx
@@ -62,7 +62,7 @@ function SourceDetail(props){
                     <li>
                       <img src={SourceFile} alt="" width="20px" className="mr12"/>
                       <span className="task-hide">{i.fileOriginName}</span>
-                      <span>{i.zoneResourceType.name}</span>
+                      <span style={{width: '340px'}}>{i.zoneResourceType.name}</span>
                       <span>{i.fileSizeInfo}</span>
                       <a href={`${httpUrl}/file/open/download/${i.fileId}`} download className="f_b_load primaryColor">下载</a>
                     </li>
diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss
index 0f16a211a..c305887f7 100644
--- a/src/forge/Information/index.scss
+++ b/src/forge/Information/index.scss
@@ -1420,7 +1420,7 @@
         font-size:15px;
         min-width: 190px;
         &.task-hide{
-          width: 500px;
+          width: 450px;
           margin-right: 20px;
         }
       }

From 0a53c76e9c87afbc97c93c790a2ea99415491d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 8 Sep 2023 14:29:44 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=AE=80=E4=BB=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE=E7=AE=80=E4=BB=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glcc/apply/editInfo.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/glcc/apply/editInfo.jsx b/src/glcc/apply/editInfo.jsx
index b9b836e43..cd037a6b6 100644
--- a/src/glcc/apply/editInfo.jsx
+++ b/src/glcc/apply/editInfo.jsx
@@ -242,12 +242,12 @@ function EditRepoApplyInfo(props) {
           { pattern: emailreg, message: "请输入正确的邮箱地址"},],
           <Input placeholder="输入项目联系人邮箱" onBlur={()=>{verify("name")}}/>
         )}
-        <div className='introArea'>{helper('社区简介',
+        <div className='introArea'>{helper('项目简介',
           '',
           'projectIntro',
-          [{ required: true, message: "请输入社区简介" },
+          [{ required: true, message: "请输入项目简介" },
           { max: 200, message: '超出限制长度200位字符，请重新编辑' }],
-          <TextArea placeholder="请输入社区简介" onBlur={()=>{verify("intro")}} rows={4}/>
+          <TextArea placeholder="请输入项目简介" onBlur={()=>{verify("intro")}} rows={4}/>
         )}</div>
         <div className='introArea'>{helper('项目logo',
           '限制上传格式为：png、jpg、jpeg，限制20M。建议上传大小为382*228',

From 6ca7a3040cc6d67c1e8c9720938295802111ff4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 8 Sep 2023 14:30:26 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=E6=88=AA=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Component/MemberCards.jsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx
index 48d90e136..a02efffb7 100644
--- a/src/forge/Component/MemberCards.jsx
+++ b/src/forge/Component/MemberCards.jsx
@@ -18,6 +18,10 @@ const Name = styled.div`{
   height:22px;
   line-height:22px;
   margin-bottom:7px;
+  width: 170px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }`
 const Time = styled.div`{
   color:#888;

From 51ba88809fa9a40f3b05fb50177b0120533b82c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 8 Sep 2023 14:31:46 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=88=86=E6=94=AF=E6=98=BE=E7=A4=BAtag?=
 =?UTF-8?q?=E5=8A=A0=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/MergeItem.js    | 4 ++--
 src/forge/Merge/MessageCount.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 4c82bb392..373532f95 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -112,7 +112,7 @@ class MergeItem extends Component {
                         <Tag className="pr-branch-tag">
                           <Link
                             to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
-                            className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
+                            className="maxW200px task-hide ver-middle" style={{maxWidth:"300px"}}
                           >
                             {item.is_original
                               ? item.fork_project_user_name
@@ -136,7 +136,7 @@ class MergeItem extends Component {
                         <Tag className="pr-branch-tag">
                           <Link
                             to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
-                            className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
+                            className="maxW200px task-hide ver-middle" style={{maxWidth:"300px"}}
                           >
                             {project_author_name}: {item.pull_request_base}
                           </Link>
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index d4a0b6fac..b12e73aae 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -406,7 +406,7 @@ class MessageCount extends Component {
                         <Tag className="pr-branch-tag">
                           <Link
                             to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
-                            className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.pull_request.fork_project_user}: ${data.pull_request && data.pull_request.head}`}
+                            className="ver-middle task-hide" style={{maxWidth:"300px"}} title={`${data.pull_request.fork_project_user}: ${data.pull_request && data.pull_request.head}`}
                           >
                             {data.pull_request && data.pull_request.fork_project_user}: {data.pull_request && data.pull_request.head}
                           </Link>
@@ -421,7 +421,7 @@ class MessageCount extends Component {
                         <Tag className="pr-branch-tag">
                           <Link
                             to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
-                            className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`}
+                            className="ver-middle task-hide" style={{maxWidth:"300px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`}
                           >
                             {data.issue.project_author}: {data.pull_request.base}
                           </Link>

From 76c6e5d451c37ed137193e29b9d5f738c5bba01c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 8 Sep 2023 14:32:31 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99=E8=BF=94=E5=9B=9E=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/loginRegister/Register.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/loginRegister/Register.jsx b/src/modules/loginRegister/Register.jsx
index 6c8251ae1..673ec33b9 100644
--- a/src/modules/loginRegister/Register.jsx
+++ b/src/modules/loginRegister/Register.jsx
@@ -103,7 +103,8 @@ function Register(props){
             callback();
           }else{
             setGetCaptchaBut(false);
-            callback(response.data.status === -2 ? `该${registerType ? '邮箱' : '手机号'}已被注册` : response.data.message);
+            // callback(response.data.status === -2 ? `该${registerType ? '邮箱' : '手机号'}已被注册` : response.data.message);
+            callback(response.data.message);
           }
         }):callback();setEmailStr(undefined);
       }else{