Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

This commit is contained in:
caishi 2022-05-06 10:21:07 +08:00
parent e4a95602cc f9773a7e42
commit 284d230821
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/Upload/attachment.js
View File

@ -52,7 +52,7 @@ class Attachment extends Component {
show_video: status === "preview",
video_url:
status === "preview"
? "https://forgeplus.trustie.net" + result.data.url
? "https://www.gitlink.org.cn" + result.data.url
: undefined,
move_spin: false,
});

2
src/forge/Wiki/EditWiki.jsx
View File

@ -192,7 +192,7 @@ export default Form.create()(({ form, history, showNotification, projectDetail,
/>
)}
<Form.Item className="mb0">
<Form.Item className="mb0 wiki-md">
<MDEditor
placeholder={"请输入wiki内容"}
height={500}

5
src/forge/Wiki/Index.scss
View File

@ -10,7 +10,7 @@ body {
.wiki-main {
width: 1200px;
min-height: 400px;
margin: 20px auto;
margin: 20px auto 60px;
.ant-btn-primary {
background-color: $wikiColor;
@ -106,6 +106,9 @@ body {
.has-error .ant-form-split {
position: absolute;
}
.wiki-md .ant-form-explain{
bottom: -6px;
}
.wiki-nav {
max-height: 60vh;
.wiki-search {

12
src/glcc/help/index.jsx
View File

@ -14,9 +14,9 @@ function Help(props) {
// 获取仓库wiki列表
useEffect(()=>{
wikiPages({
owner: locationStatus ? 'GLCC' : 'forgetest2',
repo: locationStatus ? 'glcc2022' : 'wiki1',
projectId: locationStatus ? '1403785' : '546103'
owner: locationStatus ? 'CCF-GLCC' : 'forgetest2',
repo: locationStatus ? 'glcc-help' : 'wiki1',
projectId: locationStatus ? '1403908' : '546103'
}).then(res => {
if (res && res.message === "200" && Array.isArray(res.data)) {
setFileArrInit(res.data);
@ -32,10 +32,10 @@ function Help(props) {
// 获取选择wiki详情
useEffect(() => {
checkItem.name && getWiki({
owner: locationStatus ? 'GLCC' : 'forgetest2',
repo: locationStatus ? 'glcc2022' : 'wiki1',
owner: locationStatus ? 'CCF-GLCC' : 'forgetest2',
repo: locationStatus ? 'glcc-help' : 'wiki1',
pagename: checkItem.name,
projectId: locationStatus ? '1403785' : '546103'
projectId: locationStatus ? '1403908' : '546103'
}).then(res => {
if (res && res.message === "200") {
setItemDetail(res.data);

2
src/home/Footnav.jsx
View File

@ -19,7 +19,7 @@ function Footnav() {
</ul>
<ul>
<li className="thehead">支持与服务</li>
<li><a href="https://forgeplus.trustie.net/docs/api">API文档</a></li>
<li><a href="https://www.gitlink.org.cn/docs/api">API文档</a></li>
<li><a href="https://git-scm.com">Git常用命令</a></li>
<li><a href="https://forum.trustie.net/forums/3080/detail">DevOps使用文档</a></li>
<li><a href='https://www.trustie.net/agreement'>服务协议</a></li>

2
src/home/Index.jsx
View File

@ -94,7 +94,7 @@ function Index(props) {
CCF开源发展委员会首批执行委员名单发布
</li>
</a>
<a href="https://forgeplus.trustie.net/Gitlink/forgeplus" target="_blank" className="font-18">
<a href="https://www.gitlink.org.cn/Gitlink/forgeplus" target="_blank" className="font-18">
<li>
平台精选仓库：GitLink/GitLink
</li>