diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 47c1bfa48..61518ea7d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,34 +2,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -371,18 +352,17 @@ - + - - - + @@ -394,8 +374,8 @@ - - + + @@ -659,23 +639,6 @@ - - - - - - - - - - - - - - - - - @@ -832,26 +795,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -904,8 +847,45 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js index 6616d929c..aa19a8913 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 = ( @@ -163,21 +170,22 @@ class Activity extends Component{ - { - project_trends && project_trends.length > 0 ? -
- { - project_trends && project_trends.map((item,key)=>{ - return( - - ) - }) - } -
- : - - } - + + { + project_trends && project_trends.length > 0 ? +
+ { + project_trends && project_trends.map((item,key)=>{ + return( + + ) + }) + } +
+ : + + } + { data && data.project_trends_size > 0 && data.project_trends_size > LIMIT &&
diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js index 0636ce35a..0f6c0e04d 100644 --- a/src/forge/Version/version.js +++ b/src/forge/Version/version.js @@ -58,7 +58,7 @@ class version extends Component{ }) } - + render(){ @@ -68,87 +68,88 @@ class version extends Component{ if(data && data.releases && data.releases.length>0 ){ return(
{ - data.releases.map((item,key)=>{ - return( -
- { - item && item.id ? -
-
-
-
{item.draft}  -
-
-

-
-
- {item.name} - { - data && data.user_permission ? - (编辑) - : '' - } - -
+ data.releases.map((item,key)=>{ + return( +
+ { + item && item.id ? +
+
+
+
{item.draft}  +
+
+

+
+
+ {item.name} + { + data && data.user_permission ? + (编辑) + : '' + } + +
+ + +
+
+
+ {item.tag_name}  +
+
+

-
-
- {item.tag_name}  -
-
-

- -
-
- {item.body}  -
- - {item.user_name} - 发布于{item.created_at} -
-
-
-
-
- -
-
-

-
-
- 下载附件 - - 源代码(ZIP) - 源文件(TAR.GZ) -
-
-
-
- -
-
-

-
-
+
+ {item.body}  +
+ + {item.user_name} + 发布于{item.created_at}
- : - "" - } +
+
+ +
+
+

+
+
+ 下载附件 + + 源代码(ZIP) + 源文件(TAR.GZ) +
+
+
+
+ +
+
+

+
+
+
+
+
+ : + "" + }
- ) - }) - } -
+ ) + }) + } +
) }else{ - return( - - ) - } - } + return( + + ) + } + } return(
@@ -160,12 +161,12 @@ class version extends Component{ : '' } -
-
- {renderList()}
- -
+
+ {renderList()} +
+ +
) } }