diff --git a/src/common/marked.js b/src/common/marked.js index abfd657a..d481dc56 100644 --- a/src/common/marked.js +++ b/src/common/marked.js @@ -76,6 +76,7 @@ const tokenizer = { if (cap) { const raw = cap[0] let text = indentCodeCompensation(raw, cap[3] || '') + console.log(text); const lang = cap[2] ? cap[2].trim() : cap[2] if (['latex', 'katex', 'math'].indexOf(lang) >= 0) { const id = next_id() diff --git a/src/components/render-html.jsx b/src/components/render-html.jsx index b24fc092..bcebb663 100644 --- a/src/components/render-html.jsx +++ b/src/components/render-html.jsx @@ -30,7 +30,7 @@ export default ({ cleanToc() } rs = rs.replace(/(__special_katext_id_\d+__)/g, (_match, capture) => { - const { type, expression } = math_expressions[capture] + const { type, expression } = math_expressions[capture]; return renderToString(_unescape(expression) || '', { displayMode: type === 'block', throwOnError: false, output: 'html' }) }) rs = rs.replace(/▁/g, "▁▁▁") diff --git a/src/forge/AboutUs/AboutUs.jsx b/src/forge/AboutUs/AboutUs.jsx index c50e556a..bb5deccd 100644 --- a/src/forge/AboutUs/AboutUs.jsx +++ b/src/forge/AboutUs/AboutUs.jsx @@ -128,7 +128,7 @@ function AboutUs(){

一站式过程管理

-
支持易修、里程碑、   
通知提醒、标签归档、Wiki文档、组织管理   
+
支持疑修、里程碑、   
通知提醒、标签归档、Wiki文档、组织管理   
diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js index 7b90b830..2f3a84e8 100644 --- a/src/forge/Activity/Activity.js +++ b/src/forge/Activity/Activity.js @@ -152,7 +152,7 @@ class Activity extends Component{

- {data && data.issues_count}易修 + {data && data.issues_count}疑修 diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 6090c69e..56a02e7b 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -455,10 +455,10 @@ function CoderDepot(props){ baseOperate && urlLink(`/${owner}/${projectsId}/compare/master...${branchName || defaultBranch}`)} >+ 合并请求 } - + 易修 + + 疑修 {/* { baseOper && - urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 易修 + urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 疑修 } */} } diff --git a/src/forge/Main/projecthome/SubList.jsx b/src/forge/Main/projecthome/SubList.jsx index 94727e8a..7dfed496 100644 --- a/src/forge/Main/projecthome/SubList.jsx +++ b/src/forge/Main/projecthome/SubList.jsx @@ -59,9 +59,16 @@ function SubList() {
{i.name} -

- {i.project && i.project.name} -

+ { + i.project && i.project.name ? +

+ + + {i.project && i.project.name} + +

+ :"" + }
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index 5f16b9e2..f03f14ba 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -50,7 +50,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa - 易修(Issue) + 疑修(Issue) {projectDetail && projectDetail.issues_count ? {numFormat(projectDetail.issues_count)} : ""} diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js index eff19fb7..e67dac9b 100644 --- a/src/forge/Order/MilepostDetail.js +++ b/src/forge/Order/MilepostDetail.js @@ -246,9 +246,9 @@ class MilepostDetail extends Component { } { current_user && current_user.login ? - {this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建易修 + {this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建疑修 : - 创建易修 + 创建疑修 } diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js index 6e661d69..4455d7ba 100644 --- a/src/forge/Order/OrderItem.js +++ b/src/forge/Order/OrderItem.js @@ -102,7 +102,7 @@ class OrderItem extends Component { this.deletedetail(item.id)} diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index aa1ba594..4b358175 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -357,9 +357,9 @@ class order extends Component { renderNew =()=>{ return( // {createIssue()}}> - // + 创建易修 + // + 创建疑修 // - + 创建易修 + + 创建疑修 ) } @@ -557,7 +557,7 @@ class order extends Component {

- {form_type === "edit" ? "编辑" :( form_type === "copy" ? "复制" : "新建")}易修 + {form_type === "edit" ? "编辑" :( form_type === "copy" ? "复制" : "新建")}疑修

{getFieldDecorator("subject", { rules: [ { required: true, - message: "请填写易修标题", + message: "请填写疑修标题", }, ] })()} diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js index 68dc4d0f..9fb44ace 100644 --- a/src/forge/Settings/Setting.js +++ b/src/forge/Settings/Setting.js @@ -12,7 +12,7 @@ const { Option } = Select; const menu = [ {name:"主页",index:"home"}, {name:"代码库",index:"code"}, - {name:"易修 (Issue)",index:"issues"}, + {name:"疑修 (Issue)",index:"issues"}, {name:"合并请求 (PR)",index:"pulls"}, {name:"引擎 (Engine)",index:"devops"}, // {name:"资源库",index:"resources"}, @@ -180,7 +180,7 @@ class Setting extends Component { const { projectsId , owner } = this.props.match.params; const { projectName } = this.state; this.props.confirm({ - content: 该操作无法撤销!且将会一并删除相关的易修、合并请求、工作流、里程碑、动态等数据。
是否确认删除 {owner}/{projectName}({projectsId})
, + content: 该操作无法撤销!且将会一并删除相关的疑修、合并请求、工作流、里程碑、动态等数据。
是否确认删除 {owner}/{projectName}({projectsId})
, onOk: () => { const url = `/${owner}/${projectsId}.json`; axios.delete(url).then((result) => { diff --git a/src/forge/claims/claims.js b/src/forge/claims/claims.js index 22ab0cf0..f45115b8 100644 --- a/src/forge/claims/claims.js +++ b/src/forge/claims/claims.js @@ -253,7 +253,7 @@ class claims extends React.Component { { claimerdata&&claimerdata.length>0?(
- 声明要关注/解决此易修的用户{claimerdata.length} + 声明要关注/解决此疑修的用户{claimerdata.length}
this.setVisibleFunc(false)}> {claimerdata.map((item,key)=>{ return( @@ -266,7 +266,7 @@ class claims extends React.Component { })}
):( -
声明要关注/解决此易修的用户 0
+
声明要关注/解决此疑修的用户 0
)}
diff --git a/src/forge/users/Echart/Line.jsx b/src/forge/users/Echart/Line.jsx index e8c9ac64..ae34f288 100644 --- a/src/forge/users/Echart/Line.jsx +++ b/src/forge/users/Echart/Line.jsx @@ -21,7 +21,7 @@ function Line({data}) { trigger: 'axis' }, legend: { - data: ['提交数', '易修数', '合并请求数'], + data: ['提交数', '疑修数', '合并请求数'], right: 'center', bottom: '4%', }, @@ -62,7 +62,7 @@ function Line({data}) { data: d.commits_count }, { - name: '易修数', + name: '疑修数', type: 'line', data: d.issues_count }, diff --git a/src/forge/users/Team.jsx b/src/forge/users/Team.jsx index 2751280b..bb0bf6ee 100644 --- a/src/forge/users/Team.jsx +++ b/src/forge/users/Team.jsx @@ -44,7 +44,7 @@ function Team(props){ setSort_by(e.key)}> 创建时间排序 项目数排序 - 用户数排序 + 组织成员数排序 ) diff --git a/src/home/SecondEdition.jsx b/src/home/SecondEdition.jsx index 0baa91ab..c6457f44 100644 --- a/src/home/SecondEdition.jsx +++ b/src/home/SecondEdition.jsx @@ -145,7 +145,7 @@ function SecondEdition({setValue}) {

一站式过程管理

-

提供易修(Issue)、里程碑、通知提醒、标签归档等多样化任务管理工具,支持各类开发任务的发布、指派与跟踪;

+

提供疑修(Issue)、里程碑、通知提醒、标签归档等多样化任务管理工具,支持各类开发任务的发布、指派与跟踪;

同时提供在线Wiki文档、组织多粒度管理等功能,为您搭建一站式的项目过程管理环境;

让您的团队协作更高效、过程更透明!

diff --git a/src/modules/search/index.jsx b/src/modules/search/index.jsx index 09bdb458..89d72f4b 100644 --- a/src/modules/search/index.jsx +++ b/src/modules/search/index.jsx @@ -217,7 +217,7 @@ const GlobalSearch = ({ location, showNotification, history }) => { } */} - +

{`找到${totalType5}条结果`}

:

- 尚未创建易修的实训,不能申请发布 + 尚未创建疑修的实训,不能申请发布

}