Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev

src/forge/Main/tag/Index.jsx

@@ -4,6 +4,7 @@ import { Table , Tooltip , Spin } from 'antd';
 import axios from 'axios';
 import { Link } from 'react-router-dom';
 import { truncateCommitId } from '../../common/util';
+import Nonedata from '../../Nodata';
 import './Index.scss';
 import Tree from '../img/tree.png'
 import moment from 'moment';
@@ -100,14 +101,15 @@ function Tags(props) {
       <SubMenu tab={"tags"} projectsId={projectsId} owner={owner}/>
       {
         source && source.length > 0 ?
-        
-        <Table 
-          className="tagTable"
-          dataSource={source} columns={columns} pagination={false}></Table>
-        : 
         <div className="tagSpin">
-          <Spin spinning={isSpin}/>
+          <Spin spinning={isSpin}>
+            <Table 
+              className="tagTable"
+              dataSource={source} columns={columns} pagination={false}></Table>
+          </Spin>
         </div>
+        : 
+        <Nonedata _html={'暂无数据~'}/>
       }
     </div>
   )