diff --git a/src/App.css b/src/App.css index 55bdd7f4..bea43bd9 100644 --- a/src/App.css +++ b/src/App.css @@ -60,8 +60,10 @@ body { .ant-progress-textno { color: #f5222d; } -.CodeMirror pre.CodeMirror-line{ - font-size: 16px!important; +.CodeMirror .CodeMirror-lines pre.CodeMirror-line{ + font-size: 12px; + line-height: 20px; + font-family:"PingFang SC", "Segoe UI", Helvetica, Arial, "Apple Color Emoji", SimHei, SimSun, sans-serif, "Microsoft YaHei"; } /* md多空格 */ .markdown-body p { diff --git a/src/forge/Component/LanguagePower.jsx b/src/forge/Component/LanguagePower.jsx index b2fb174b..ca7019b3 100644 --- a/src/forge/Component/LanguagePower.jsx +++ b/src/forge/Component/LanguagePower.jsx @@ -55,7 +55,7 @@ function LanguagePower({owner,projectsId}){ { array && array.map((item,key)=>{ return( - + ) }) } @@ -66,7 +66,7 @@ function LanguagePower({owner,projectsId}){ { array.map((item,key)=>{ return( - {item.name}{item.percent} + {item.name}{item.percent} ) }) } diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 71146363..d79d0f1f 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -493,6 +493,7 @@ function CoderDepot(props){ dirInfo.map((item,key)=>{ return( {item.name} : - goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}> + goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" ? "submoduleStyle":''}> {item.name} } diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss index 6f07aadb..fcaba3ac 100644 --- a/src/forge/Main/list.scss +++ b/src/forge/Main/list.scss @@ -306,6 +306,14 @@ } .files-md{ 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{ diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index 15633f3b..de3008f2 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -32,7 +32,7 @@ function DetailBanner({ history,list , owner , projectsId ,showNotification , ur } }).catch(error=>{}) } -console.log("detail:",open_devops); + return(
setVisible(false)} name={projectDetail && projectDetail.name} onSuccess={onSuccess}/> diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index 3e636332..de437840 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -37,7 +37,7 @@ class Milepost extends Component { const url = `/${owner}/${projectsId}/milestones.json`; axios.get(url, { params: { - projectsId, page, limit, status, order_type, order_name + page, limit, status, order_type, order_name } }).then((result) => { if (result) { diff --git a/src/forge/Order/Tags.js b/src/forge/Order/Tags.js index eeff8db2..4082c022 100644 --- a/src/forge/Order/Tags.js +++ b/src/forge/Order/Tags.js @@ -105,7 +105,6 @@ class Tags extends Component { const url = `/projects/${owner}/${projectsId}/labels.json`; axios.post(url, { ...values, - project_id: projectsId, color: this.state.textcolor }).then(result => { if (result) { diff --git a/src/forge/Order/newMilepost.js b/src/forge/Order/newMilepost.js index f11b9abd..7b7c184e 100644 --- a/src/forge/Order/newMilepost.js +++ b/src/forge/Order/newMilepost.js @@ -57,7 +57,6 @@ class NewMilepost extends Component { } axios.post(url, { ...values, - project_id: projectsId, effective_date: time, status: 'open' }).then(result => { diff --git a/src/forge/Settings/new_tags.js b/src/forge/Settings/new_tags.js index ca3eb265..b39d0ca7 100644 --- a/src/forge/Settings/new_tags.js +++ b/src/forge/Settings/new_tags.js @@ -96,7 +96,6 @@ class NewTags extends Component { axios .post(url, { ...values, - project_id: projectsId, color: this.state.textcolor, }) .then((result) => { diff --git a/src/forge/Wiki/Index.jsx b/src/forge/Wiki/Index.jsx index 1a8b0883..2e91df16 100644 --- a/src/forge/Wiki/Index.jsx +++ b/src/forge/Wiki/Index.jsx @@ -5,6 +5,8 @@ import cookie from 'react-cookies'; import CopyTool from '../Component/CopyTool'; import DelModal from './components/ModalFun'; import Welcome from './Welcome'; +import RenderHtml from "../../components/render-html"; + import { wikiPages, getWiki, deleteWiki } from './api'; import { httpUrl, TokenKey } from './fetch'; import './Index.scss'; @@ -281,7 +283,7 @@ export default (props) => { {permission && }
-
+ {itemDetail&&itemDetail.simple_content&&}