From 08047fb002f5470b7800b036da3f3e098100824e Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Thu, 30 Sep 2021 13:43:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2issue=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderDepot.jsx |  1 +
 src/forge/Main/tag/Index.jsx  | 14 ++++++++------
 src/forge/Main/tree/Index.jsx |  2 +-
 src/forge/css/index.scss      |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 02a829a7b..e473f9b93 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -191,6 +191,7 @@ function CoderDepot(props){
         setLastCommit(c && c.commit);
         setLastCommitAuthor(c && c.committer);
         setMainFlag(false);
+        setReadme(result.data.readme)
         setReadOnly(true);
         setReadOnly(!editReadme);
         setHide(true);
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index 54586b144..d5c2593e9 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -6,6 +6,7 @@ import { Link } from 'react-router-dom';
 import { truncateCommitId } from '../../common/util';
 import './Index.scss';
 import Tree from '../img/tree.png'
+import moment from 'moment';
 
 
 function Tags(props) {
@@ -44,7 +45,7 @@ function Tags(props) {
         return (
           <span className="color-grey-3">
             <Link className="mr3" style={{fontWeight:"500"}} to={`/${item.commit && item.commit.login}`} >{item.commit && item.commit.name}</Link>
-            <span>创建于{item.commit && item.commit.time}</span>
+            <span>创建于{item.commit && item.commit.time_ago}</span>
           </span>
         )
       }
@@ -56,7 +57,7 @@ function Tags(props) {
       ellipsis:true,
       render:(txt,item)=>{
         return (
-          <Tooltip placement="top" title={`最后提交日期:${`dddddd`}`}>
+          <Tooltip placement="top" title={`最后提交日期:${item.created_at_unix ? moment(item.created_at_unix*1000).format('YYYY-MM-DD'):''}`}>
             <img src={Tree} alt="提交ID" width="22px" className="mr4"/>
             <Link className="hover color-blue" to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`}>{truncateCommitId(item.id)}</Link>
           </Tooltip>
@@ -82,12 +83,13 @@ function Tags(props) {
       render:(txt,item)=>{
         return (
           <div>
-            <Link to={`/${owner}/${projectsId}/pulls/new/${item.name}`} className="btn-83">
+
+            <a href={`${item.tarball_url}`} download className="btn-83">
               <i className="iconfont icon-xiazai-icon font-16 mr5"></i>TAR
-            </Link>
-            <Link to={`/${owner}/${projectsId}/pulls/new/${item.name}`} className="btn-83 ml15">
+            </a>
+            <a href={`${item.zipball_url}`} download className="btn-83">
               <i className="iconfont icon-xiazai-icon font-16 mr5"></i>ZIP
-            </Link>
+            </a>
           </div>
         )
       }
diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx
index 3d532de5f..9324cd596 100644
--- a/src/forge/Main/tree/Index.jsx
+++ b/src/forge/Main/tree/Index.jsx
@@ -63,7 +63,7 @@ function Index(props) {
                             <div className="treeinfo">
                               <Link to={`/${owner}/${projectsId}/tree/${turnbar(i.name)}`} className="task-hide">{i.name}</Link>
                               <div>
-                                <img src={getImageUrl(`${last_commit && last_commit.committer && last_commit.image_url}`)} alt="" />
+                                <img style={{borderRadius:"50%"}} src={getImageUrl(`${last_commit && last_commit.committer && last_commit.committer.image_url}`)} alt=""/>
                                 <span className="mr3 color-grey-3" style={{fontWeight:"500"}}>{last_commit && last_commit.committer && last_commit.committer.name}</span>
                                 <span className="color-grey-3">更新于{last_commit && last_commit.time_from_now}</span>
                               </div>
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index dfca6e632..319d4670a 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -306,6 +306,7 @@ form{
   border-radius: 5px;
   font-weight: 500;
   color: #333333!important;
+  margin-right: 15px;
   &:hover{
     background: #F3F4F6;
     color: #333333!important;

From c42d249fd9e63857353094aaf1c5c195ef155b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 30 Sep 2021 15:45:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=94=B9=E7=89=88issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                 | 13 +++++++++----
 src/forge/Branch/Select.jsx       |  3 +--
 src/forge/Component/Releases.jsx  |  4 ++--
 src/forge/Main/version/New.jsx    | 21 +++++++++++++++++----
 src/forge/Main/version/version.js | 13 +++++++------
 5 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 96077ad36..9ea84263c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7286,7 +7286,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -7703,7 +7704,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -7759,6 +7761,7 @@
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7802,12 +7805,14 @@
         "wrappy": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "optional": true
         }
       }
     },
diff --git a/src/forge/Branch/Select.jsx b/src/forge/Branch/Select.jsx
index 601b94e8b..4937686d1 100644
--- a/src/forge/Branch/Select.jsx
+++ b/src/forge/Branch/Select.jsx
@@ -4,7 +4,6 @@ import './branch.scss';
 import { getBranch , getTag } from '../GetData/getData';
 import SelectOverlay from './SelectOverlay';
 
-
 export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true })=>{
   const [ showValue , setShowValue ] = useState(branch);
 
@@ -26,7 +25,7 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag
       <div className="branch-tagBox">
         {/* {nav === 0 ?"分支":"标签"} */}
         <span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span>
-        <span className="ant-dropdown-link task-hide" style={{fontWeight:"500",minWidth:"45px"}}>
+        <span className="ant-dropdown-link task-hide" style={{fontWeight:"500",minWidth:"45px",maxWidth:"270px"}}>
           {showValue}
         </span>
         <i className="showtag iconfont icon-sanjiaoxing-down font-15 color-grey-9 mr5 ml5 mt1" />
diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx
index 7a287d964..3ed27867b 100644
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@@ -15,9 +15,9 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
             return(
             key === 0 &&<AlignTop className="mt10">
               <div>
-                <p className="font-16 color-grey-6">
+                <p className="font-16 color-grey-6" style={{display:'flex',alignItems:'center'}}>
                   {/* 如果是点击最新则发行版列表页只展示最新的一个 */}
-                  <Link to={{pathname:`/${owner}/${projectsId}/releases`,query:{turnFromNew:true}}}>{item.name}</Link>
+                  <Link to={{pathname:`/${owner}/${projectsId}/releases`,query:{turnFromNew:true}}} style={{maxWidth:'200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis'}}>{item.name}</Link>
                   <span className="font-12 laterest ml5">最新</span>
                 </p>
                 <p className="color-grey-3 font-12">{item.created_at}</p>
diff --git a/src/forge/Main/version/New.jsx b/src/forge/Main/version/New.jsx
index 3f432e94d..ca9057caa 100644
--- a/src/forge/Main/version/New.jsx
+++ b/src/forge/Main/version/New.jsx
@@ -8,6 +8,7 @@ import Upload from "../../Upload/Index";
 import Attachments from "../../Upload/attachment";
 import axios from "axios";
 import "./version.scss";
+import { trim } from "lodash";
 
 const { Option } = AutoComplete;
 
@@ -137,8 +138,14 @@ export default Form.create()(
               <Form.Item>
                 {getFieldDecorator("tag_name", 
                   { rules:[
-                    { required: true, message: "请输入获取或选择一个标签" }
-                    ], 
+                    { required: true, message: "请输入获取或选择一个标签" },
+                    { validator: (rule,val,callback) =>{
+                        if(val.length>30 || val.indexOf(' ')>0 || val.match(/^\s+$/) || trim(val).length!=val.length){
+                          callback('无效的标签名称，请参考右侧建议命名标签并确认长度在1~30个字符之间');
+                        }else{
+                          callback();
+                        }
+                    }}], 
                     validateFirst: true 
                   })(
                   <AutoComplete
@@ -166,8 +173,14 @@ export default Form.create()(
             <Form.Item className="pt20">
               {getFieldDecorator("name", 
                 { rules:[
-                  { required: true, message: "请输入发行版的标题" }
-                  ], 
+                  { required: true, message: "请输入发行版的标题" },
+                  { validator: (rule,val,callback) =>{
+                      if(val.length>50){
+                        callback('标题长度在1~50个字符之间');
+                      }else{
+                        callback();
+                      }
+                  }}], 
                   validateFirst: true 
                 })(
                   <Input placeholder="发行版的标题" />
diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js
index fced2f7fd..bbc145b9c 100644
--- a/src/forge/Main/version/version.js
+++ b/src/forge/Main/version/version.js
@@ -34,6 +34,7 @@ function version(props) {
         setReleases(result.data.releases);
         setIsSpin(false);
       }
+      
     }).catch((error) => {
       console.log(error);
     })
@@ -71,10 +72,10 @@ function version(props) {
         </span>
         <div className="versionInfo_right">
           <div className="versionName">
-            <Link to={`/${owner}/${projectsId}/tree/${item.tag_name}`} className="task-hide color-blue hover font-18">发布{item.name}</Link>
+            <Link to={`/${owner}/${projectsId}/tree/${item.tag_name}`} className="task-hide color-blue hover font-18">{item.name}</Link>
             <span>
-            {data && data.user_admin_permission && <Link to={{pathname:`/${owner}/${projectsId}/releases/${item.version_id}/update`,state:{"stable":item.draft==="稳定"}}} className="ml15"><i className="iconfont icon-a-bianji1 font-16 color-grey-6"></i></Link>}
-            {data && data.user_admin_permission && <i className ="iconfont icon-shanchuicon1 font-16 ml15" onClick={()=>{deleteRelease(item.version_id)}}></i>}
+            {data && data.user_permission && type !== 2 && <Link to={{pathname:`/${owner}/${projectsId}/releases/${item.version_id}/update`,state:{"stable":item.draft==="稳定"}}} className="ml15"><i className="iconfont icon-a-bianji1 font-16 color-grey-6"></i></Link>}
+            {data && data.user_permission && type !== 2 && <i className ="iconfont icon-shanchuicon1 font-16 ml15" onClick={()=>{deleteRelease(item.version_id)}}></i>}
             </span>
           </div>
           <span className="color-grey-3 mb15 version-user">
@@ -97,7 +98,7 @@ function version(props) {
           <p className="versionFile">
             {/* 发行版附件下载 */}
             {item.attachments && item.attachments.map((item)=>{
-              return(<Link to={`${item.url}`}><i className="iconfont icon-wenjian7 font-14 mr10 color-grey-3"></i>下载  {item.title}</Link>)
+              return(<a href={item.url}><i className="iconfont icon-wenjian7 font-14 mr10 color-grey-3"></i>下载  {item.title}</a>)
             })}
             {/* 发行版下载包 */}
             <a href={item.tarball_url}><i className="iconfont icon-wenjian7 font-14 mr10 color-grey-3"></i>下载  {item.tag_name}.TAR.gz</a>
@@ -112,7 +113,7 @@ function version(props) {
       return (
         <React.Fragment>
           {
-            data && data.user_admin_permission &&
+            data && data.user_permission && type !== 2 &&
             <div className="addReleaseBtn">
               <Button type={"primary"} onClick={addFunc} className="btnblue" style={{height:"36px"}}>发布新版本</Button>
             </div>
@@ -125,7 +126,7 @@ function version(props) {
     } else if (releases && releases.length === 0) {
       return (
         <Empty 
-          operation={data && data.user_admin_permission} 
+          operation={data && data.user_permission && type !== 2} 
           addFunc={addFunc}
         />
       )