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

This commit is contained in:
caishi 2021-10-14 10:28:46 +08:00
commit 76d8c4b67a
2 changed files with 10 additions and 10 deletions

View File

@ -552,7 +552,7 @@ class Detail extends Component {
<span className="detail_tag_btn" loading={forkSpin}> <span className="detail_tag_btn" loading={forkSpin}>
<Tooltip title="复刻是fork的中文名即复制代码仓库" placement="bottom"> <Tooltip title="复刻是fork的中文名即复制代码仓库" placement="bottom">
<a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={this.forkFunc}> <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={this.forkFunc}>
<i className="iconfont icon-fork color-grey-9 mr3 font-16"></i><span></span> <i className="iconfont icon-fork color-grey-9 mr3 font-16"></i><span>(Fork)</span>
</a> </a>
</Tooltip> </Tooltip>
{ {

View File

@ -121,15 +121,15 @@ function Tags(props) {
<SubMenu tab={"tags"} projectsId={projectsId} owner={owner}/> <SubMenu tab={"tags"} projectsId={projectsId} owner={owner}/>
<Spin spinning={isSpin}> <Spin spinning={isSpin}>
<div className="tagSpin"> <div className="tagSpin">
{ {
source && source.length > 0 && source && source.length > 0 &&
<Table <Table
className="tagTable" className="tagTable"
dataSource={source} columns={columns} pagination={false}></Table> dataSource={source} columns={columns} pagination={false}></Table>
} }
{ {
source && source.length === 0 && <Nonedata _html={'暂无数据~'}/> source && source.length === 0 && <Nonedata _html={'暂无数据~'}/>
} }
</div> </div>
</Spin> </Spin>
</div> </div>