From 8f6048f8400b2b8c1fd122d0fb8fa87b8c66423c Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Thu, 9 Apr 2020 17:23:40 +0800
Subject: [PATCH] issue

---
 src/forge/Activity/Activity.js |  48 ++++++-----
 src/forge/Version/version.js   | 148 +++++++++++++++++----------------
 2 files changed, 103 insertions(+), 93 deletions(-)

diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js
index 137677a53..4ff058e01 100644
--- a/src/forge/Activity/Activity.js
+++ b/src/forge/Activity/Activity.js
@@ -1,5 +1,5 @@
 import React , { Component } from 'react';
-import { Dropdown , Menu , Icon , Pagination} from 'antd';
+import { Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
 import '../css/index.css';
 import '../Branch/branch.css';
 import './activity.css';
@@ -39,11 +39,16 @@ class Activity extends Component{
       page:1,
 
       data:undefined,
-      project_trends:undefined
+      project_trends:undefined,
+
+      isSpin:false
     }
   }
   componentDidMount=()=>{
     const { time,type,status,page } = this.state;
+    this.setState({
+      isSpin:true
+    })
     this.getInfo(time,type,status,page);
   }
 
@@ -58,7 +63,8 @@ class Activity extends Component{
       if(result){
         this.setState({
           data:result.data,
-          project_trends:result.data.project_trends
+          project_trends:result.data.project_trends,
+          isSpin:false
         })
       }
     }).catch(error=>{
@@ -69,7 +75,8 @@ class Activity extends Component{
   // 切换周期
   changeTime=(e)=>{
     this.setState({
-      time:e.key
+      time:e.key,
+      isSpin:true
     })
     const { type,status,page } = this.state;
     this.getInfo(e.key,type,status,page);
@@ -91,7 +98,7 @@ class Activity extends Component{
     this.getInfo(time,type,status,page);
   }
   render(){
-    const { time , data , page , project_trends } = this.state;
+    const { time , data , page , project_trends , isSpin } = this.state;
 
     const menu = (
       <Menu>
@@ -163,21 +170,22 @@ class Activity extends Component{
             </Dropdown>
           </div>
         </div>
-        {
-          project_trends && project_trends.length > 0 ?
-          <div className="activity_list">
-            {
-              project_trends && project_trends.map((item,key)=>{
-                return(
-                  <ActivityItem item={item} {...this.props} ></ActivityItem>
-                )
-              })
-            }
-          </div>
-          :
-          <NoneData _html="暂时还没有相关数据哦!" />
-        }
-        
+        <Spin spinning={isSpin}>
+          {
+            project_trends && project_trends.length > 0 ?
+            <div className="activity_list">
+              {
+                project_trends && project_trends.map((item,key)=>{
+                  return(
+                    <ActivityItem item={item} {...this.props} ></ActivityItem>
+                  )
+                })
+              }
+            </div>
+            :
+            <NoneData _html="暂时还没有相关数据哦!" />
+          }
+        </Spin>
         {
           data && data.project_trends_size > 0 && data.project_trends_size > LIMIT &&
           <div className="pageDIV">
diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js
index f88ef6f6c..aed98f4a4 100644
--- a/src/forge/Version/version.js
+++ b/src/forge/Version/version.js
@@ -65,86 +65,88 @@ class version extends Component{
     const { projectsId } = this.props.match.params;
     const{data}=this.state
     const renderList =()=>{
-      if(data && data.releases && data.releases.length>0 ){
-        return(
-          <div>{
-              data.releases.map((item,key)=>{
-                return(
-                  <div key={key}>
-                    {
-                      item && item.id ?
-                        <div>
-                          <div style={{display:'flex'}}>
-                            <div className="versionleft">
-                              <div className="versionrighe"></div><span  className={item&&item.draft==="稳定"?"opendversionetail":"closedversionetail"} style={{marginTop:5,margin:'auto',marginRight:15}}>{item.draft} </span>
-                            </div>
-                            <div className="version_line_one">
-                              <p className="versionrectangle"> </p>
-                            </div>
-                            <div className="versionrighe">
-                              <h1 style={{marginLeft:15,marginTop:5}}>{item.name}
-                                {
-                                  data && data.user_permission ?
-                                    <Link to={`/projects/${projectsId}/version/${item.version_id}/upversion`} style={{color:'blue',fontSize:10,marginLeft:5}}>(编辑)</Link>
-                                    : ''
-                                }
-                              </h1>
-                            </div>
+      if(data && data.releases){
+        if( data.releases.length>0 ){
+          return(
+            <div>{
+                data.releases.map((item,key)=>{
+                  return(
+                    <div key={key}>
+                      {
+                        item && item.id ?
+                          <div>
+                            <div style={{display:'flex'}}>
+                              <div className="versionleft">
+                                <div className="versionrighe"></div><span  className={item&&item.draft==="稳定"?"opendversionetail":"closedversionetail"} style={{marginTop:5,margin:'auto',marginRight:15}}>{item.draft} </span>
+                              </div>
+                              <div className="version_line_one">
+                                <p className="versionrectangle"> </p>
+                              </div>
+                              <div className="versionrighe">
+                                <h1 style={{marginLeft:15,marginTop:5}}>{item.name}
+                                  {
+                                    data && data.user_permission ?
+                                      <Link to={`/projects/${projectsId}/version/${item.version_id}/upversion`} style={{color:'blue',fontSize:10,marginLeft:5}}>(编辑)</Link>
+                                      : ''
+                                  }
+                                </h1>
+                              </div>
 
 
-                          </div>
-                          <div style={{display:'flex'}}>
-                            <div className="versionleft">
-                              <span style={{marginTop:5,margin:'auto',marginRight:15}}>{item.tag_name} </span>
                             </div>
-                            <div className="version_line_one">
-                              <p  style={{width:4}}> </p>
+                            <div style={{display:'flex'}}>
+                              <div className="versionleft">
+                                <span style={{marginTop:5,margin:'auto',marginRight:15}}>{item.tag_name} </span>
+                              </div>
+                              <div className="version_line_one">
+                                <p  style={{width:4}}> </p>
 
+                              </div>
+                              <div className="versionrighe">
+                                <h5 style={{marginLeft:15,marginTop:10}}>{item.body} </h5>
+                              </div>
                             </div>
-                            <div className="versionrighe">
-                              <h5 style={{marginLeft:15,marginTop:10}}>{item.body} </h5>
+                            <div style={{display:'flex'}}>
+                              <div className="versionleft">
+                                <span style={{marginTop:5,marginRight:15}}></span>
+                              </div>
+                              <div className="version_line_tpw">
+                                <p  style={{width:4}}> </p>
+                              </div>
+                              <div className="versionrighe">
+                                <h1 style={{marginLeft:15,marginTop:10}}>下载附件
+                                </h1>
+                                <a href={item.zipball_url} download="源代码(ZIP)" style={{color:'blue',marginLeft:15}}>源代码(ZIP)</a>
+                                <a href={item.tarball_url} download="源文件(TAR.GZ)" style={{color:'blue',marginLeft:15}}>源文件(TAR.GZ)</a>
+                              </div>
+                            </div>
+                            <div style={{display:'flex'}}>
+                              <div className="versionleft">
+                                <span style={{marginTop:5,marginRight:15}}></span>
+                              </div>
+                              <div className="version_line_tpw">
+                                <p  style={{width:4}}> </p>
+                              </div>
+                              <div className="versionrighe">
+                              </div>
                             </div>
                           </div>
-                          <div style={{display:'flex'}}>
-                            <div className="versionleft">
-                              <span style={{marginTop:5,marginRight:15}}></span>
-                            </div>
-                            <div className="version_line_tpw">
-                              <p  style={{width:4}}> </p>
-                            </div>
-                            <div className="versionrighe">
-                              <h1 style={{marginLeft:15,marginTop:10}}>下载附件
-                              </h1>
-                              <a href={item.zipball_url} download="源代码(ZIP)" style={{color:'blue',marginLeft:15}}>源代码(ZIP)</a>
-                              <a href={item.tarball_url} download="源文件(TAR.GZ)" style={{color:'blue',marginLeft:15}}>源文件(TAR.GZ)</a>
-                            </div>
-                          </div>
-                          <div style={{display:'flex'}}>
-                            <div className="versionleft">
-                              <span style={{marginTop:5,marginRight:15}}></span>
-                            </div>
-                            <div className="version_line_tpw">
-                              <p  style={{width:4}}> </p>
-                            </div>
-                            <div className="versionrighe">
-                            </div>
-                          </div>
-                        </div>
-                        :
-                        ""
-                    }
-                </div>
-                )
-              })
-            }
-          </div> 
-        )
-      }else{
-       return(
-         <NoneData _html="暂时还没有相关数据哦!" />
-       )
-     }
-   }
+                          :
+                          ""
+                      }
+                  </div>
+                  )
+                })
+              }
+            </div> 
+          )
+        }else{
+          return(
+            <NoneData _html="暂时还没有相关数据哦!" />
+          )
+        }
+      }
+    }
 
     return(
       <div className="main">