Null369
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/gitlink_server' into gitlink_server_wechat

This commit is contained in:
黄心宇 2024-04-25 09:15:51 +08:00
parent 8ecef8e8fd 6098ffa36a
commit 0c1641309c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/Information/Pages/help.jsx
View File

@ -66,7 +66,7 @@ function ProjectSource(props) {
// 获取wiki内容
setLoading(true);
getWiki({
pageName: wiki.titleStr,
pageName: wiki.title_sub,
...wikiParams
}).then(res=>{
setLoading(false);
@ -78,7 +78,7 @@ function ProjectSource(props) {
message.error("加载失败")
}
})
}, [wiki && wiki.titleStr])
}, [wiki && wiki.title_sub])
useEffect(() => {
if (scroller) {
@ -236,7 +236,7 @@ function ProjectSource(props) {
<div className='wikiTitleHC font-20 mb5'>{wikiDetail.name}</div>
{wikiDetail.commit && <div className='wikiUpdateTimeHC font-15'>更新时间：{wikiDetail.commit.author.date || '刚刚'}</div>}
</div>
{adminUrl && <Button onClick={()=>{wiki && window.open(`${data && data.gitlinkProject.wiki_url}/${wiki.titleStr}/${wiki.key}`)}} className='zone_apply_button' style={{width: '90px', height: '34px'}}>配置内容</Button>}
{adminUrl && <Button onClick={()=>{wiki && window.open(`${data && data.gitlinkProject.wiki_url}/${wiki.title_sub}/${wiki.key}`)}} className='zone_apply_button' style={{width: '90px', height: '34px'}}>配置内容</Button>}
</FlexAJ>
{wikiDetail.md_content && <RenderHtml className="wikiContentHC editor-content-panel mt20 imageLayerParent" value={ Base64.decode(wikiDetail.md_content) } url={history.location}/>}
</LongWidth>

2
src/forge/Settings/Setting.js
View File

@ -423,7 +423,7 @@ class Setting extends Component {
{/* <Mirror /> */}
</WhiteBack>
{
projectDetail && projectDetail.permission && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner")?
projectDetail && projectDetail.permission && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner" || projectDetail.permission ==="Manager")?
<WhiteBack className="dangerousBox mb20">
<div>
<div className="dangerousTitle">危险操作区</div>