forked from Gitlink/forgeplus-react
20220708里程碑issue回归
This commit is contained in:
parent
22b9990893
commit
3534856786
|
@ -60,8 +60,10 @@ body {
|
||||||
.ant-progress-textno {
|
.ant-progress-textno {
|
||||||
color: #f5222d;
|
color: #f5222d;
|
||||||
}
|
}
|
||||||
.CodeMirror pre.CodeMirror-line{
|
.CodeMirror .CodeMirror-lines pre.CodeMirror-line{
|
||||||
font-size: 16px!important;
|
font-size: 12px;
|
||||||
|
line-height: 20px;
|
||||||
|
font-family:"PingFang SC", "Segoe UI", Helvetica, Arial, "Apple Color Emoji", SimHei, SimSun, sans-serif, "Microsoft YaHei";
|
||||||
}
|
}
|
||||||
/* md多空格 */
|
/* md多空格 */
|
||||||
.markdown-body p {
|
.markdown-body p {
|
||||||
|
|
|
@ -55,7 +55,7 @@ function LanguagePower({owner,projectsId}){
|
||||||
{
|
{
|
||||||
array && array.map((item,key)=>{
|
array && array.map((item,key)=>{
|
||||||
return(
|
return(
|
||||||
<span style={{width:item.percent,backgroundColor:item.color}}></span>
|
<span key={item.id||key} style={{width:item.percent,backgroundColor:item.color}}></span>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ function LanguagePower({owner,projectsId}){
|
||||||
{
|
{
|
||||||
array.map((item,key)=>{
|
array.map((item,key)=>{
|
||||||
return(
|
return(
|
||||||
<span><i className="zero" style={{backgroundColor:`${item.color}`}}></i><span>{item.name}</span><span>{item.percent}</span></span>
|
<span key={item.id||key}><i className="zero" style={{backgroundColor:`${item.color}`}}></i><span>{item.name}</span><span>{item.percent}</span></span>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -493,6 +493,7 @@ function CoderDepot(props){
|
||||||
dirInfo.map((item,key)=>{
|
dirInfo.map((item,key)=>{
|
||||||
return(
|
return(
|
||||||
<Catalogue
|
<Catalogue
|
||||||
|
key={item.id||key}
|
||||||
owner={owner}
|
owner={owner}
|
||||||
item={item}
|
item={item}
|
||||||
projectsId={projectsId}
|
projectsId={projectsId}
|
||||||
|
|
|
@ -21,7 +21,7 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId , platform
|
||||||
(!platform && item.image_type) ?
|
(!platform && item.image_type) ?
|
||||||
<span><i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name}</span>
|
<span><i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name}</span>
|
||||||
:
|
:
|
||||||
<a onClick={()=>goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}>
|
<a onClick={()=>goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" ? "submoduleStyle":''}>
|
||||||
<i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name}
|
<i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name}
|
||||||
</a>
|
</a>
|
||||||
}
|
}
|
||||||
|
|
|
@ -306,6 +306,14 @@
|
||||||
}
|
}
|
||||||
.files-md{
|
.files-md{
|
||||||
padding:20px;
|
padding:20px;
|
||||||
|
h1,h2, h3, h4, h5, h6{
|
||||||
|
margin-bottom: .5em !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.readBox{
|
||||||
|
h1,h2, h3, h4, h5, h6{
|
||||||
|
margin-bottom: .5em !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/* 详情-代码 */
|
/* 详情-代码 */
|
||||||
.branch-wrapper{
|
.branch-wrapper{
|
||||||
|
|
|
@ -32,7 +32,7 @@ function DetailBanner({ history,list , owner , projectsId ,showNotification , ur
|
||||||
}
|
}
|
||||||
}).catch(error=>{})
|
}).catch(error=>{})
|
||||||
}
|
}
|
||||||
console.log("detail:",open_devops);
|
|
||||||
return(
|
return(
|
||||||
<div className="f-wrap-between mt25">
|
<div className="f-wrap-between mt25">
|
||||||
<QuitBox visible={visible} onCancel={()=>setVisible(false)} name={projectDetail && projectDetail.name} onSuccess={onSuccess}/>
|
<QuitBox visible={visible} onCancel={()=>setVisible(false)} name={projectDetail && projectDetail.name} onSuccess={onSuccess}/>
|
||||||
|
|
|
@ -37,7 +37,7 @@ class Milepost extends Component {
|
||||||
const url = `/${owner}/${projectsId}/milestones.json`;
|
const url = `/${owner}/${projectsId}/milestones.json`;
|
||||||
axios.get(url, {
|
axios.get(url, {
|
||||||
params: {
|
params: {
|
||||||
projectsId, page, limit, status, order_type, order_name
|
page, limit, status, order_type, order_name
|
||||||
}
|
}
|
||||||
}).then((result) => {
|
}).then((result) => {
|
||||||
if (result) {
|
if (result) {
|
||||||
|
|
|
@ -105,7 +105,6 @@ class Tags extends Component {
|
||||||
const url = `/projects/${owner}/${projectsId}/labels.json`;
|
const url = `/projects/${owner}/${projectsId}/labels.json`;
|
||||||
axios.post(url, {
|
axios.post(url, {
|
||||||
...values,
|
...values,
|
||||||
project_id: projectsId,
|
|
||||||
color: this.state.textcolor
|
color: this.state.textcolor
|
||||||
}).then(result => {
|
}).then(result => {
|
||||||
if (result) {
|
if (result) {
|
||||||
|
|
|
@ -57,7 +57,6 @@ class NewMilepost extends Component {
|
||||||
}
|
}
|
||||||
axios.post(url, {
|
axios.post(url, {
|
||||||
...values,
|
...values,
|
||||||
project_id: projectsId,
|
|
||||||
effective_date: time,
|
effective_date: time,
|
||||||
status: 'open'
|
status: 'open'
|
||||||
}).then(result => {
|
}).then(result => {
|
||||||
|
|
|
@ -96,7 +96,6 @@ class NewTags extends Component {
|
||||||
axios
|
axios
|
||||||
.post(url, {
|
.post(url, {
|
||||||
...values,
|
...values,
|
||||||
project_id: projectsId,
|
|
||||||
color: this.state.textcolor,
|
color: this.state.textcolor,
|
||||||
})
|
})
|
||||||
.then((result) => {
|
.then((result) => {
|
||||||
|
|
|
@ -5,6 +5,8 @@ import cookie from 'react-cookies';
|
||||||
import CopyTool from '../Component/CopyTool';
|
import CopyTool from '../Component/CopyTool';
|
||||||
import DelModal from './components/ModalFun';
|
import DelModal from './components/ModalFun';
|
||||||
import Welcome from './Welcome';
|
import Welcome from './Welcome';
|
||||||
|
import RenderHtml from "../../components/render-html";
|
||||||
|
|
||||||
import { wikiPages, getWiki, deleteWiki } from './api';
|
import { wikiPages, getWiki, deleteWiki } from './api';
|
||||||
import { httpUrl, TokenKey } from './fetch';
|
import { httpUrl, TokenKey } from './fetch';
|
||||||
import './Index.scss';
|
import './Index.scss';
|
||||||
|
@ -281,7 +283,7 @@ export default (props) => {
|
||||||
{permission && <Button type="primary" onClick={goEdit}>编辑</Button>}
|
{permission && <Button type="primary" onClick={goEdit}>编辑</Button>}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="wiki-content-detail editor-content-panel markdown-body" dangerouslySetInnerHTML={{ __html: itemDetail && itemDetail.simple_content }} ></div>
|
{itemDetail&&itemDetail.simple_content&&<RenderHtml className="wiki-content-detail editor-content-panel" value={ itemDetail&&itemDetail.md_content } url={history.location}/>}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div >
|
</div >
|
||||||
|
|
Loading…
Reference in New Issue