Merge pull request '1.标签加载方式优化 2.预览md文件定位' (#132) from hc1913847458/forgeplus-react:testdev into pre_develop_dev
This commit is contained in:
commit
92fb98e303
|
@ -27,6 +27,7 @@ class CoderRootFileDetail extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount = () => {
|
componentDidMount = () => {
|
||||||
|
window.scrollTo(0, 0);
|
||||||
const { detail , mdFlag } = this.props;
|
const { detail , mdFlag } = this.props;
|
||||||
this.setState({
|
this.setState({
|
||||||
value: detail.content,
|
value: detail.content,
|
||||||
|
@ -214,7 +215,7 @@ class CoderRootFileDetail extends Component {
|
||||||
const Option = Select.Option;
|
const Option = Select.Option;
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<Anchor className="griditemAnchor" offsetTop={70} targetOffset={160}>
|
<Anchor className="griditemAnchor" offsetTop={70}>
|
||||||
<div className="griditemCate">
|
<div className="griditemCate">
|
||||||
{
|
{
|
||||||
md && readOnly &&
|
md && readOnly &&
|
||||||
|
|
|
@ -1,17 +1,17 @@
|
||||||
import React,{ useEffect , useState } from 'react';
|
import React,{ useEffect , useState } from 'react';
|
||||||
import SubMenu from '../sub/SubMenu';
|
import SubMenu from '../sub/SubMenu';
|
||||||
import { Table , Tooltip } from 'antd';
|
import { Table , Tooltip , Spin } from 'antd';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
import { truncateCommitId } from '../../common/util';
|
import { truncateCommitId } from '../../common/util';
|
||||||
import './Index.scss';
|
import './Index.scss';
|
||||||
import Tree from '../img/tree.png'
|
import Tree from '../img/tree.png'
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import Loading from '../../../Loading';
|
|
||||||
|
|
||||||
function Tags(props) {
|
function Tags(props) {
|
||||||
|
|
||||||
const [ source , setSource ] = useState([]);
|
const [ source , setSource ] = useState([]);
|
||||||
|
const [ isSpin , setIsSpin ] = useState(true);
|
||||||
|
|
||||||
const { projectsId , owner } = props.match.params;
|
const { projectsId , owner } = props.match.params;
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@ function Tags(props) {
|
||||||
axios.get(url).then((result) => {
|
axios.get(url).then((result) => {
|
||||||
if (result) {
|
if (result) {
|
||||||
setSource(result.data);
|
setSource(result.data);
|
||||||
|
setIsSpin(false);
|
||||||
}
|
}
|
||||||
}).catch(error => {})
|
}).catch(error => {})
|
||||||
}
|
}
|
||||||
|
@ -83,7 +84,6 @@ function Tags(props) {
|
||||||
render:(txt,item)=>{
|
render:(txt,item)=>{
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
|
||||||
<a href={`${item.tarball_url}`} download className="btn-83">
|
<a href={`${item.tarball_url}`} download className="btn-83">
|
||||||
<i className="iconfont icon-xiazai-icon font-16 mr5"></i>TAR
|
<i className="iconfont icon-xiazai-icon font-16 mr5"></i>TAR
|
||||||
</a>
|
</a>
|
||||||
|
@ -98,7 +98,17 @@ function Tags(props) {
|
||||||
return(
|
return(
|
||||||
<div>
|
<div>
|
||||||
<SubMenu tab={"tags"} projectsId={projectsId} owner={owner}/>
|
<SubMenu tab={"tags"} projectsId={projectsId} owner={owner}/>
|
||||||
<Table className="tagTable" dataSource={source} columns={columns} pagination={false}></Table>
|
{
|
||||||
|
source && source.length > 0 ?
|
||||||
|
|
||||||
|
<Table
|
||||||
|
className="tagTable"
|
||||||
|
dataSource={source} columns={columns} pagination={false}></Table>
|
||||||
|
:
|
||||||
|
<div className="tagSpin">
|
||||||
|
<Spin spinning={isSpin}/>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,4 +32,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
.tagSpin{
|
||||||
|
min-height: 300px;
|
||||||
|
text-align: center;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
}
|
}
|
Loading…
Reference in New Issue