[TOC]
", getTocContent()); - cleanToc(); - } +export default ({ value = '', className, style = {} }) => { + let str = String(value) - html = html.replace(/▁/g, "▁▁▁"); - // html = html.replace(/\n/g,""); - const el = useRef(); + const html = useMemo(() => { + let rs = marked(str) + const math_expressions = getMathExpressions() + if (str.match(/\[TOC\]/)) { + rs = rs.replace("
[TOC]
", getTocContent()) + cleanToc() + } + rs = rs.replace(/(__special_katext_id_\d+__)/g, (_match, capture) => { + const { type, expression } = math_expressions[capture] + return renderToString(_unescape(expression), { displayMode: type === 'block', throwOnError: false, output: 'html' }) + }) + rs = rs.replace(/▁/g, "▁▁▁") + resetMathExpressions() + return rs + }, [str]) + const el = useRef() function onAncherHandler(e) { - let target = e.target; - if (target.tagName.toUpperCase() === "A") { - let ancher = target.getAttribute("href"); - if (ancher.startsWith("#")) { - e.preventDefault(); - let viewEl = document.getElementById(ancher.replace("#", "")); + let target = e.target + if (target.tagName.toUpperCase() === 'A') { + let ancher = target.getAttribute('href') + if (ancher.startsWith('#')) { + e.preventDefault() + let viewEl = document.getElementById(ancher.replace('#', '')) if (viewEl) { - viewEl.parentNode.scrollTop = viewEl.offsetTop; + viewEl.parentNode.scrollTop = viewEl.offsetTop } } } @@ -34,23 +49,18 @@ export default ({ value = "", is_md = true, className, style = {} }) => { useEffect(() => { if (el.current && html) { if (html.match(preRegex)) { - window.PR.prettyPrint(); + window.PR.prettyPrint() } } if (el.current) { - el.current.addEventListener("click", onAncherHandler); + el.current.addEventListener('click', onAncherHandler) return () => { - el.current.removeEventListener("click", onAncherHandler); - }; + el.current.removeEventListener('click', onAncherHandler) + resetMathExpressions() + cleanToc() + } } - }, [html, el.current, onAncherHandler]); + }, [html, el.current, onAncherHandler]) - return ( - - ); -}; + return () +} diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js index 7e84e418..f5275827 100644 --- a/src/forge/Activity/Activity.js +++ b/src/forge/Activity/Activity.js @@ -52,8 +52,8 @@ class Activity extends Component{ } getInfo =(time,type,status,page)=>{ - const { projectsId } = this.props.match.params; - const url = `/projects/${projectsId}/project_trends.json`; + const { projectsId , owner } = this.props.match.params; + const url = `/${owner}/${projectsId}/activity.json`; axios.get(url,{ params:{ time,type,status,page diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js index ba0ff5d7..f1818d08 100644 --- a/src/forge/Activity/ActivityItem.js +++ b/src/forge/Activity/ActivityItem.js @@ -6,7 +6,7 @@ import { getImageUrl } from 'educoder'; class ActivityItem extends Component { render() { - const { projectsId } = this.props.match.params; + const { projectsId ,owner } = this.props.match.params; const { item } = this.props; return (- {item.name} + {item.name} {item.trend_type}
: // 如果是任务 item.trend_type === "Issue" ?- {item.name} + {item.name} {item.trend_type}
: // 如果是合并请求- {item.name} + {item.name} {item.trend_type}
} diff --git a/src/forge/Branch/Select.jsx b/src/forge/Branch/Select.jsx index 8236fd67..6d97d7b5 100644 --- a/src/forge/Branch/Select.jsx +++ b/src/forge/Branch/Select.jsx @@ -4,7 +4,7 @@ import './branch.css'; import { getBranch , getTag } from '../GetData/getData'; -export default (({ projectsId , repo_id , changeBranch , branch })=>{ +export default (({ projectsId , repo_id , changeBranch , branch , owner })=>{ const [ showValue , setShowValue ] = useState(branch); const [ inputValue , setInputValue] = useState(undefined); const [ nav , setNav ] = useState(0); @@ -30,18 +30,18 @@ export default (({ projectsId , repo_id , changeBranch , branch })=>{ }) useEffect(()=>{ - getBranchs(projectsId); + getBranchs(projectsId,owner); },[projectsId]) - async function getBranchs(id){ - let result = await getBranch(id); + async function getBranchs(id,owner){ + let result = await getBranch(id,owner); setData(result); setDatas(result); setIsSpin(false); } - async function getTags(id){ - let result = await getTag(id); + async function getTags(id,owner){ + let result = await getTag(id,owner); setData(result); setDatas(result); setIsSpin(false); @@ -57,9 +57,9 @@ export default (({ projectsId , repo_id , changeBranch , branch })=>{ setNav(nav); setIsSpin(true); if(nav === 0){ - getBranchs(projectsId); + getBranchs(projectsId,owner); }else{ - getTags(repo_id); + getTags(projectsId,owner); } } function chooseitem(value){ diff --git a/src/forge/GetData/getData.jsx b/src/forge/GetData/getData.jsx index e0474a33..3e2f2224 100644 --- a/src/forge/GetData/getData.jsx +++ b/src/forge/GetData/getData.jsx @@ -1,11 +1,11 @@ import axios from 'axios'; // 获取分支列表 -export const getBranch = async (id)=>{ - return (await axios.get(`/projects/${id}/branches.json`)).data; +export const getBranch = async (id,owner)=>{ + return (await axios.get(`/${owner}/${id}/branches.json`)).data; } // 获取标签列表 -export const getTag = async (id)=>{ - return (await axios.get(`/repositories/${id}/tags.json`)).data; +export const getTag = async (id,owner)=>{ + return (await axios.get(`/${owner}/${id}/tags.json`)).data; } // 获取hooks（仓库设置-管理web钩子）列表 export const getHooks = async (id,params)=>{ diff --git a/src/forge/Index.js b/src/forge/Index.js index 20eabd5c..6157aa64 100644 --- a/src/forge/Index.js +++ b/src/forge/Index.js @@ -46,7 +46,7 @@ class Index extends Component { )} >- -1 || urlFlag) ? "active" : ""}>
-
+
代码库
- -1 && !(url.indexOf("Milepost") > 0 || url.indexOf("meilpost") > 0 || url.indexOf("tags") > 0)) ? "active" : ""}>
-
+
任务 {projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} : ""} @@ -432,32 +434,32 @@ class Detail extends Component { { projectDetail && parseInt(projectDetail.type) !== 2 &&
- -1 ? "active" : ""}>
-
+
合并请求 {projectDetail && projectDetail.pull_requests_count ? {projectDetail.pull_requests_count} : ""}
}
{/* - -1 ? "active" : ""}> - + 工作流 {projectDetail && projectDetail.ops_count ? {projectDetail.ops_count} : ""} */}
- -1 || url.indexOf("meilpost") > -1) ? "active" : ""}>
-
+
里程碑 {projectDetail && projectDetail.versions_count ? {projectDetail.versions_count} :""}
- -1 ? "active" : ""}>
-
+
动态
{
isManager &&
- - 0 ? "active" : ""}>
仓库设置
+ - 0 ? "active" : ""}>
}
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 7a84d2e3..50189780 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -50,8 +50,8 @@ class MessageCount extends Component { }; getDetail = () => { - const { projectsId, mergeId } = this.props.match.params; - const url = `/projects/${projectsId}/pull_requests/${mergeId}.json`; + const { projectsId, mergeId, owner } = this.props.match.params; + const url = `/${owner}/${projectsId}/pulls/${mergeId}.json`; axios .get(url) .then((result) => { @@ -76,8 +76,8 @@ class MessageCount extends Component { //关闭任务 closedetail = () => { this.setState({ isSpin: true }); - const { projectsId, mergeId } = this.props.match.params; - const url = `/projects/${projectsId}/pull_requests/${mergeId}/refuse_merge.json`; + const { projectsId, mergeId , owner } = this.props.match.params; + const url = `/${owner}/${projectsId}/pulls/${mergeId}/refuse_merge.json`; axios .post(url) .then((result) => { @@ -105,9 +105,9 @@ class MessageCount extends Component { this.setState({ SpinMerge: true, }); - const { projectsId } = this.props.match.params; + const { projectsId , owner } = this.props.match.params; const { data, title, body, mergekey, pr_status } = this.state; - const url = `/projects/${projectsId}/pull_requests/${data.pull_request.id}/pr_merge.json`; + const url = `/${owner}/${projectsId}/pulls/${data.pull_request.id}/pr_merge.json`; axios .post(url, { project_id: projectsId, @@ -199,7 +199,7 @@ class MessageCount extends Component { }; render() { - const { projectsId, mergeId } = this.props.match.params; + const { projectsId, mergeId , owner } = this.props.match.params; const { data, @@ -258,7 +258,7 @@ class MessageCount extends Component {
-
- + 基本设置 @@ -60,7 +60,7 @@ class Index extends Component { } >
- + 协作者管理 @@ -82,7 +82,7 @@ class Index extends Component { className={pathname.indexOf("setting/tags") > -1 ? "active" : ""} >
- + 项目标签 @@ -108,45 +108,45 @@ class Index extends Component {
{/* 协作者 */} ( {/* 修改仓库信息 */})} > ( )} > ( )} > ( )} > ( )} > ( {/* 修改仓库信息 */})} > ( )} diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js index 3374329c..c102a968 100644 --- a/src/forge/Settings/Setting.js +++ b/src/forge/Settings/Setting.js @@ -52,8 +52,8 @@ class Setting extends Component { }; getInfo = () => { - const { projectsId } = this.props.match.params; - const url = `/repositories/${projectsId}/edit.json`; + const { projectsId , owner } = this.props.match.params; + const url = `/${owner}/${projectsId}/edit.json`; axios .get(url) .then((result) => { @@ -106,9 +106,10 @@ class Setting extends Component { resetSetting = () => { this.props.form.validateFields((err, values) => { if (!err) { - const { project_id } = this.props; + const { projectsId , owner } = this.props.match.params; + const { private_check } = this.state; - const url = `/projects/${project_id}.json`; + const url = `/${owner}/${projectsId}.json`; axios .put(url, { name: values.project_name, @@ -135,8 +136,8 @@ class Setting extends Component { this.props.confirm({ content: "删除后无法恢复，是否确认删除本仓库？", onOk: () => { - const { project_id } = this.props; - const url = `/projects/${project_id}.json`; + const { projectsId , owner } = this.props.match.params; + const url = `/${owner}/${projectsId}.json`; axios .delete(url) .then((result) => { diff --git a/src/forge/Version/New.jsx b/src/forge/Version/New.jsx index 18e481ea..de9cff48 100644 --- a/src/forge/Version/New.jsx +++ b/src/forge/Version/New.jsx @@ -28,13 +28,13 @@ export default Form.create()( const repo_id = projectDetail && projectDetail.repo_id; - const { projectsId, versionId } = match.params; + const { projectsId, versionId , owner } = match.params; useEffect(()=>{ - getBranchs(projectsId); + getBranchs(projectsId,owner); },[projectsId]) - async function getBranchs(id){ - let result = await getBranch(id); + async function getBranchs(id,owner){ + let result = await getBranch(id,owner); setBranchList(result); } diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js index dc5dc493..0e8a294b 100644 --- a/src/forge/Version/version.js +++ b/src/forge/Version/version.js @@ -30,8 +30,8 @@ class version extends Component { } // 获取列表数据 getIssueList = () => { - const { projectsId } = this.props.match.params; - const url = `/projects/${projectsId}/version_releases.json`; + const { projectsId, owner } = this.props.match.params; + const url = `/${owner}/${projectsId}/releases.json`; axios.get(url).then((result) => { if (result) { this.setState({ @@ -56,7 +56,7 @@ class version extends Component { } renderList = (releases) => { - const { projectsId } = this.props.match.params; + const { projectsId , owner } = this.props.match.params; if (releases && releases.length > 0) { return ( @@ -75,7 +75,7 @@ class version extends Component {{item.name} - （编辑） + （编辑） this.showBody(key,item.bodyshow)}> @@ -103,7 +103,7 @@ class version extends Component { } render() { - const { projectsId } = this.props.match.params; + const { projectsId ,owner } = this.props.match.params; const { data , releases } = this.state return ( @@ -112,7 +112,7 @@ class version extends Component { 版本发布 { data && data.user_permission ? - + 发布新版 + + 发布新版 : '' }diff --git a/src/index.css b/src/index.css index e5928c14..cd6f30b9 100644 --- a/src/index.css +++ b/src/index.css @@ -44,6 +44,9 @@ .markdown-body p { margin: 0 !important } +.markdown-body img{ + cursor: pointer; +} ol, ul, From 0e2cc884a74e5869ff7b74351fc8b885c8bcb12e Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com"+// +// ); +// } +// } +// export default Index; + import React, { Component } from "react"; import Meditor from "./m_editor"; +import Top from "../Main/DetailTop"; import "./index.css"; -import { Input } from "antd"; -import FileLanguage from '../Component/FileLanguage'; +import { Input, Select } from "antd"; class Index extends Component { constructor(props) { @@ -39,9 +125,62 @@ class Index extends Component { const urlroot = pathname.split("newfile")[1]; const file_path = `${urlroot}/${filename}`; const { projectDetail } = this.props; - + const Option = Select.Option; + const languages = [ + "apex", + "azcli", + "bat", + "clojure", + "coffee", + "cpp", + "csharp", + "csp", + "css", + "dockerfile", + "fsharp", + "go", + "handlebars", + "html", + "ini", + "java", + "javascript", + "json", + "less", + "lua", + "markdown", + "msdax", + "mysql", + "objective", + "perl", + "pgsql", + "php", + "postiats", + "powerquery", + "powershell", + "pug", + "python", + "r", + "razor", + "redis", + "redshift", + "ruby", + "rust", + "sb", + "scheme", + "scss", + "shell", + "solidity", + "sql", + "st", + "swift", + "typescript", + "vb", + "xml", + "yaml", + ]; return (+//+//+// 新建文件 +//
+//+//+//+//+//+//+//+// +//+// +// 取消 +// +//+//+//+// +// + 新建文件 @@ -64,7 +203,12 @@ class Index extends Component {
-+ Date: Thu, 13 Aug 2020 10:51:24 +0800 Subject: [PATCH 03/17] Fix: Add New File Language Api Wrong --- src/forge/Component/FileLanguage.jsx | 29 +++-- src/forge/Newfile/Index.js | 152 +-------------------------- 2 files changed, 18 insertions(+), 163 deletions(-) diff --git a/src/forge/Component/FileLanguage.jsx b/src/forge/Component/FileLanguage.jsx index 177449c4..7bfa617b 100644 --- a/src/forge/Component/FileLanguage.jsx +++ b/src/forge/Component/FileLanguage.jsx @@ -57,28 +57,27 @@ const LANGUAGE = [ export default (({ language , select_language })=>{ const [ languages , setLanguage ] = useState(undefined); - - useEffect(()=>{ - const url = '/dev_ops/languages.json'; - axios.get(url).then(result=>{ - if(result){ - setLanguage(result.data); - } - }).catch(error=>{ - console.log(error); - }) - },[]) + // useEffect(()=>{ + // const url = '/dev_ops/languages.json'; + // axios.get(url).then(result=>{ + // if(result){ + // setLanguage(result.data); + // } + // }).catch(error=>{ + // console.log(error); + // }) + // },[]) function changelanguage(value){ - let array = value ? languages.filter(item=>item.name === value) :undefined; - select_language(value,array && array[0]); + // let array = value ? languages.filter(item=>item.name === value) :undefined; + select_language(value); } return( ) diff --git a/src/forge/Newfile/Index.js b/src/forge/Newfile/Index.js index a9644a64..3df1614f 100644 --- a/src/forge/Newfile/Index.js +++ b/src/forge/Newfile/Index.js @@ -1,94 +1,8 @@ -// import React, { Component } from "react"; -// import Meditor from "./m_editor"; -// import "./index.css"; -// import { Input } from "antd"; -// import FileLanguage from '../Component/FileLanguage'; - -// class Index extends Component { -// constructor(props) { -// super(props); -// this.state = { -// editorValue: "", -// filename: "", -// language: undefined -// }; -// } - -// // 命名文件 -// changeFileName = (e) => { -// this.setState({ -// filename: e.target.value, -// }); -// }; -// // 取消，弹框询问 -// CancelAddFile = () => { -// this.props.history.goBack(); -// }; - -// select_language = (e) => { -// console.log(e) -// this.setState({ -// language: e -// }) - -// } - -// render() { -// const { pathname } = this.props.location; -// const { filename, language } = this.state; -// const urlroot = pathname.split("newfile")[1]; -// const file_path = `${urlroot}/${filename}`; -// const { projectDetail } = this.props; - -// return ( -// -// -// ); -// } -// } -// export default Index; - import React, { Component } from "react"; import Meditor from "./m_editor"; -import Top from "../Main/DetailTop"; import "./index.css"; -import { Input, Select } from "antd"; +import { Input } from "antd"; +import FileLanguage from '../Component/FileLanguage'; class Index extends Component { constructor(props) { @@ -125,62 +39,9 @@ class Index extends Component { const urlroot = pathname.split("newfile")[1]; const file_path = `${urlroot}/${filename}`; const { projectDetail } = this.props; - const Option = Select.Option; - const languages = [ - "apex", - "azcli", - "bat", - "clojure", - "coffee", - "cpp", - "csharp", - "csp", - "css", - "dockerfile", - "fsharp", - "go", - "handlebars", - "html", - "ini", - "java", - "javascript", - "json", - "less", - "lua", - "markdown", - "msdax", - "mysql", - "objective", - "perl", - "pgsql", - "php", - "postiats", - "powerquery", - "powershell", - "pug", - "python", - "r", - "razor", - "redis", - "redshift", - "ruby", - "rust", - "sb", - "scheme", - "scss", - "shell", - "solidity", - "sql", - "st", - "swift", - "typescript", - "vb", - "xml", - "yaml", - ]; + return (-//-//-// 新建文件 -//
-//-//-//-//-//-//-//-// -//-// -// 取消 -// -//-//-//-// -// - 新建文件 @@ -203,12 +64,7 @@ class Index extends Component {
- +
{item.last_commit && truncateCommitId(item.last_commit.sha)} {item.last_commit && item.last_commit.message} @@ -40,7 +40,7 @@ export default ((props)=>{
- 0 ? "active" : ""}> + 0 ? "active" : ""}> {(coderCount && coderCount.commits_count) || 0}个提交 - 0 ? "active" : ""}> + 0 ? "active" : ""}> {(coderCount && coderCount.branches_count) || 0}个分支 - 0 ? "active" : ""}> + 0 ? "active" : ""}> {(coderCount && coderCount.tags_count) || 0}个标签 - 0 ? "active" : ""}> + 0 ? "active" : ""}> {(coderCount && coderCount.version_releasesed_count) || 0}个发行版 diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index cf6485c0..5460d998 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -32,13 +32,13 @@ class UserSubmitComponent extends Component { // 提交变更 subMitFrom = () => { const { filepath, content, editor_type } = this.props; - const { branch, projectsId } = this.props.match.params; + const { branch, projectsId , owner } = this.props.match.params; const { submitType, filename } = this.state; this.setState({ isSpin: true }); let path = editor_type === "upload" ? filepath : filepath.substr(1); this.props.form.validateFieldsAndScroll((err, values) => { if (!err) { - const url = `/repositories/${projectsId}/create_file.json`; + const url = `/${owner}/${projectsId}/create_file.json`; axios.post(url, { filepath: filename ? filename : path, branch: branch, @@ -55,8 +55,8 @@ class UserSubmitComponent extends Component { getTopCount && getTopCount(values.branchname); } let url = values.branchname - ? `/projects/${projectsId}/coders?branch=${values.branchname}` - : `/projects/${projectsId}/coders`; + ? `/projects/${owner}/${projectsId}/coders?branch=${values.branchname}` + : `/projects/${owner}/${projectsId}/coders`; this.props.history.push(url); } }) @@ -74,9 +74,9 @@ class UserSubmitComponent extends Component { UpdateFile = () => { this.setState({ isSpin: true }); const { branch, detail, content, filepath } = this.props; - const { projectsId } = this.props.match.params; + const { projectsId , owner } = this.props.match.params; const { submitType } = this.state; - const url = `/repositories/${projectsId}/update_file.json`; + const url = `/${owner}/${projectsId}/update_file.json`; this.props.form.validateFieldsAndScroll((err, values) => { if (!err) { axios @@ -92,8 +92,8 @@ class UserSubmitComponent extends Component { this.setState({ isSpin: false }); if (result.data && result.data.status === 1) { let url = values.branchname - ? `/projects/${projectsId}/coders?branch=${values.branchname}` - : `/projects/${projectsId}/coders`; + ? `/projects/${owner}/${projectsId}/coders?branch=${values.branchname}` + : `/projects/${owner}/${projectsId}/coders`; this.props.history.push(url); this.props.showNotification("修改成功!"); @@ -113,7 +113,7 @@ class UserSubmitComponent extends Component { const { submitType, filename, isSpin } = this.state; const { getFieldDecorator } = this.props.form; - const { branch, projectsId } = this.props.match.params; + const { branch, projectsId , owner } = this.props.match.params; const { current_user, filepath, projectDetail } = this.props; const { editor_type } = this.props; @@ -228,7 +228,7 @@ class UserSubmitComponent extends Component {
- {item.name} + {item.name} {TagInfo(item.priority,"mr10")}
@@ -91,12 +91,12 @@ class OrderItem extends Component {