"+(escaped?code:escape(code,true))+"\n'+(escaped?code:escape(code,true))+"\n\n"+quote+"\n"};Renderer.prototype.html=function(html){return html};Renderer.prototype.heading=function(text,level,raw){return"
\n":"
\n"};Renderer.prototype.list=function(body,ordered){var type=ordered?"ol":"ul";return"<"+type+">\n"+body+"\n"};Renderer.prototype.listitem=function(text){return"
"+text+"
\n"};Renderer.prototype.table=function(header,body){return""+text+""};Renderer.prototype.br=function(){return this.options.xhtml?"":"
"};Renderer.prototype.del=function(text){return"
"+escape(e.message+"",true)+""}throw e}}marked.options=marked.setOptions=function(opt){merge(marked.defaults,opt);return marked};marked.defaults={gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,smartLists:false,silent:false,highlight:null,langPrefix:"lang-",smartypants:false,headerPrefix:"",renderer:new Renderer,xhtml:false};marked.Parser=Parser;marked.parser=Parser.parse;marked.Renderer=Renderer;marked.Lexer=Lexer;marked.lexer=Lexer.lex;marked.InlineLexer=InlineLexer;marked.inlineLexer=InlineLexer.output;marked.parse=marked;if(typeof module!=="undefined"&&typeof exports==="object"){module.exports=marked}else{if(typeof define==="function"&&define.amd){define(function(){return marked})}else{this.marked=marked}}}).call(function(){return this||(typeof window!=="undefined"?window:global)}()); \ No newline at end of file +!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).marked=t()}(this,function(){"use strict";function r(e,t){for(var u=0;u
'+(u?e:H(e,!0))+"\n":""+(u?e:H(e,!0))+"\n"+e+"\n"},t.html=function(e){return e},t.heading=function(e,t,u,n){return this.options.headerIds?"
\n":"
\n"},t.list=function(e,t,u){var n=t?"ol":"ul";return"<"+n+(t&&1!==u?' start="'+u+'"':"")+">\n"+e+"\n"},t.listitem=function(e){return"
"+e+"
\n"},t.table=function(e,t){return""+e+""},t.br=function(){return this.options.xhtml?"":"
"},t.del=function(e){return"
"+se(e.message+"",!0)+"";throw e}}return ae.options=ae.setOptions=function(e){return re(ae.defaults,e),le(ae.defaults),ae},ae.getDefaults=$,ae.defaults=x,ae.use=function(){for(var u=this,e=arguments.length,t=new Array(e),n=0;n
"+se(e.message+"",!0)+"";throw e}},ae.Parser=te,ae.parser=te.parse,ae.Renderer=ne,ae.TextRenderer=S,ae.Lexer=ee,ae.lexer=ee.lex,ae.Tokenizer=ue,ae.Slugger=B,ae.parse=ae}); \ No newline at end of file diff --git a/public/js/editormd/marked.min.js b/public/js/editormd/marked.min.js index 5597fa444..92eccfd37 100755 --- a/public/js/editormd/marked.min.js +++ b/public/js/editormd/marked.min.js @@ -1,9 +1,6 @@ /** - * marked v0.3.3 - a markdown parser - * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed) - * https://github.com/chjj/marked + * marked - a markdown parser + * Copyright (c) 2011-2021, Christopher Jeffrey. (MIT Licensed) + * https://github.com/markedjs/marked */ -(function(){var block={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:noop,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:noop,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,def:/^ *\[([^\]]+)\]: *]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:noop,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};block.bullet=/(?:[*+-]|\d+\.)/;block.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;block.item=replace(block.item,"gm")(/bull/g,block.bullet)();block.list=replace(block.list)(/bull/g,block.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+block.def.source+")")();block.blockquote=replace(block.blockquote)("def",block.def)();block._tag="(?!(?:"+"a|em|strong|small|s|cite|q|dfn|abbr|data|time|code"+"|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo"+"|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b";block.html=replace(block.html)("comment",//)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/
"+(escaped?code:escape(code,true))+"\n'+(escaped?code:escape(code,true))+"\n\n"+quote+"\n"};Renderer.prototype.html=function(html){return html};Renderer.prototype.heading=function(text,level,raw){return"
\n":"
\n"};Renderer.prototype.list=function(body,ordered){var type=ordered?"ol":"ul";return"<"+type+">\n"+body+"\n"};Renderer.prototype.listitem=function(text){return"
"+text+"
\n"};Renderer.prototype.table=function(header,body){return""+text+""};Renderer.prototype.br=function(){return this.options.xhtml?"":"
"};Renderer.prototype.del=function(text){return"
"+escape(e.message+"",true)+""}throw e}}marked.options=marked.setOptions=function(opt){merge(marked.defaults,opt);return marked};marked.defaults={gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,smartLists:false,silent:false,highlight:null,langPrefix:"lang-",smartypants:false,headerPrefix:"",renderer:new Renderer,xhtml:false};marked.Parser=Parser;marked.parser=Parser.parse;marked.Renderer=Renderer;marked.Lexer=Lexer;marked.lexer=Lexer.lex;marked.InlineLexer=InlineLexer;marked.inlineLexer=InlineLexer.output;marked.parse=marked;if(typeof module!=="undefined"&&typeof exports==="object"){module.exports=marked}else{if(typeof define==="function"&&define.amd){define(function(){return marked})}else{this.marked=marked}}}).call(function(){return this||(typeof window!=="undefined"?window:global)}()); \ No newline at end of file +!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e="undefined"!=typeof globalThis?globalThis:e||self).marked=t()}(this,function(){"use strict";function r(e,t){for(var u=0;u
'+(u?e:H(e,!0))+"\n":""+(u?e:H(e,!0))+"\n"+e+"\n"},t.html=function(e){return e},t.heading=function(e,t,u,n){return this.options.headerIds?"
\n":"
\n"},t.list=function(e,t,u){var n=t?"ol":"ul";return"<"+n+(t&&1!==u?' start="'+u+'"':"")+">\n"+e+"\n"},t.listitem=function(e){return"
"+e+"
\n"},t.table=function(e,t){return""+e+""},t.br=function(){return this.options.xhtml?"":"
"},t.del=function(e){return"
"+se(e.message+"",!0)+"";throw e}}return ae.options=ae.setOptions=function(e){return re(ae.defaults,e),le(ae.defaults),ae},ae.getDefaults=$,ae.defaults=x,ae.use=function(){for(var u=this,e=arguments.length,t=new Array(e),n=0;n
"+se(e.message+"",!0)+"";throw e}},ae.Parser=te,ae.parser=te.parse,ae.Renderer=ne,ae.TextRenderer=S,ae.Lexer=ee,ae.lexer=ee.lex,ae.Tokenizer=ue,ae.Slugger=B,ae.parse=ae}); \ No newline at end of file diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js index 65c354f3f..965387554 100644 --- a/src/common/UrlTool.js +++ b/src/common/UrlTool.js @@ -345,8 +345,8 @@ export function addMeta(name, content){ */ export function setSeoMeta(keyWords, title, description, url, owner, projectId) { // 服务端没有location - const host = window.location.host === 'null' || !window.location.host ? ssrHost : window.location.host - const origin = window.location.origin === 'null' || !window.location.origin ? ssrOrigin : window.location.origin + const host = window.location.host + const origin = window.location.origin document.querySelector(`meta[property='og:title']`).content = title + ' | GitLink'; document.querySelector(`title`).textContent = title + ' | GitLink'; document.querySelector(`meta[property='og:url']`).content = origin + url; From cd1f17152234a6a3da87f1ae849f33445ae0cddb Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 20 Mar 2024 09:49:11 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E5=9F=BA=E4=BA=8E=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=9B=E5=BB=BA=E5=8F=91=E8=A1=8C=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/AppConfig.js | 1 + src/forge/Branch/Select.jsx | 3 +- src/forge/Branch/SelectOverlay.jsx | 83 ++++++++++++++++++------- src/forge/Branch/branch.scss | 22 ++++++- src/forge/GetData/getData.jsx | 4 ++ src/forge/Main/tree/Index.jsx | 98 +++++++++++++++--------------- src/forge/Main/version/New.jsx | 1 + 7 files changed, 141 insertions(+), 71 deletions(-) diff --git a/src/AppConfig.js b/src/AppConfig.js index c246ad013..8e58ebafb 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -34,6 +34,7 @@ export function initAxiosInterceptors(props) { var proxy = "http://172.20.32.202:4000"; + //响应前的设置 axios.interceptors.request.use( config => { diff --git a/src/forge/Branch/Select.jsx b/src/forge/Branch/Select.jsx index 5dd2e99bd..330e0260e 100644 --- a/src/forge/Branch/Select.jsx +++ b/src/forge/Branch/Select.jsx @@ -5,7 +5,7 @@ import SelectOverlay from './SelectOverlay'; import { findDOMNode } from 'react-dom'; import { turnbar } from 'educoder'; -export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true })=>{ +export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true , commitflag=false })=>{ const [ showValue , setShowValue ] = useState(branch); const [ visible , setVisible ] = useState(false); @@ -46,6 +46,7 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag visible={visible} changeBranch={ChangeB} tagflag={tagflag} + commitflag={commitflag} projectsId={projectsId} owner={owner} branchList={branchList} diff --git a/src/forge/Branch/SelectOverlay.jsx b/src/forge/Branch/SelectOverlay.jsx index 0be567324..12ced5d2d 100644 --- a/src/forge/Branch/SelectOverlay.jsx +++ b/src/forge/Branch/SelectOverlay.jsx @@ -1,13 +1,15 @@ import React , { useState , useEffect } from 'react'; import { Input , Spin , Menu } from 'antd'; -import { getBranch , getTag } from '../GetData/getData'; +import { getBranch , getTag , getCommit } from '../GetData/getData'; +import { truncateCommitId } from "../common/util"; -function SelectOverlay({ changeBranch , tagflag , projectsId , owner , visible }) { +function SelectOverlay({ changeBranch , tagflag , commitflag , projectsId , owner , visible }) { const [ inputValue , setInputValue] = useState(undefined); const [ nav , setNav ] = useState(0); const [ isSpin , setIsSpin ] = useState(true); const [ data , setData ] = useState(undefined); + const [ commitData , setCommitData ] = useState(undefined); const [ datas , setDatas ] = useState(undefined); const [ keys ,setKeys] = useState("branch"); @@ -31,33 +33,68 @@ function SelectOverlay({ changeBranch , tagflag , projectsId , owner , visible } setDatas(result); setIsSpin(false); } + async function getCommits(id,owner,search){ + let result = await getCommit(id,owner,search); + setCommitData(result.data && result.data.commits); + setIsSpin(false); + } function chooseitem(value){ changeBranch(value); } function changeInputValue(e){ setInputValue(e.target.value); - let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data; - setDatas(filter); + if(keys ==="commit"){ + // 调用接口搜索 + getCommits(projectsId,owner,e.target.value); + }else{ + let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data; + setDatas(filter); + } } function changeNav(e){ setKeys(e.key); setIsSpin(true); + setInputValue(undefined); if(e.key === "branch"){ getBranchs(projectsId,owner); setNav(0); - }else{ + }else if(e.key === "commit"){ + getCommits(projectsId,owner); + setNav(2); + } + else{ getTags(projectsId,owner); setNav(1); } } + const commitEle =(ele)=> ( + ele && ele.length>0 ? +
-
+ {
+ ele.map((i,k)=>{
+ return(
+
- chooseitem(i.sha)}>
+ {truncateCommitId(i.sha)}
+ ++{i.commit_message}@ {i.time_from_now} +
+ )
+ })
+ }
+
暂无提交数据～
+ )
+
return(
}
- placeholder={`请输入分支${tagflag ? "或标签" :""}名称搜索`}
+ placeholder={keys === "commit" ?"搜索提交":`请输入分支${tagflag ? "或标签" :""}名称搜索`}
autocomplete="off" className="OptionsInput"
value={inputValue}
onChange={changeInputValue}
@@ -66,23 +103,27 @@ function SelectOverlay({ changeBranch , tagflag , projectsId , owner , visible }
-
)
diff --git a/src/forge/Branch/branch.scss b/src/forge/Branch/branch.scss
index 030b05cd1..e1970722f 100644
--- a/src/forge/Branch/branch.scss
+++ b/src/forge/Branch/branch.scss
@@ -22,7 +22,7 @@
background: #fff;
max-height: 300px;
}
-.OptionsUl{
+.OptionsUl,.commitUl{
min-height: 50px;
max-height: 220px;
overflow-y: auto;
@@ -46,6 +46,26 @@
line-height: 32px;
width: 100%;
}
+.commitUl{
+ padding:0px 20px;
+}
+.commitUl li{
+ padding:15px 0px;
+ border-bottom: 1px dashed rgba(168,168,168,0.31);
+ &:last-child{
+ border:none;
+ }
+ cursor: pointer;
+}
+.commitUl .commitMsg{
+ margin-top: 8px;
+ display: flex;
+ div{
+ word-break: break-all;
+ flex: 1;
+ width: 0;
+ }
+}
.branch-tagBox{
border:1px solid #D0D0D0;
border-radius: 3px;
diff --git a/src/forge/GetData/getData.jsx b/src/forge/GetData/getData.jsx
index 216b1e1d3..3289cc86d 100644
--- a/src/forge/GetData/getData.jsx
+++ b/src/forge/GetData/getData.jsx
@@ -8,6 +8,10 @@ export const getBranch = async (id,owner)=>{
export const getTag = async (id,owner)=>{
return (await axios.get(`/${owner}/${id}/tags.json`,{params:{only_name:true}})).data.tags;
}
+// 获取提交记录
+export const getCommit = async(id,owner,search)=>{
+ return await axios.get(`/v1/${owner}/${id}/commits/recent`,{params:{keyword:search}})
+}
// 获取hooks（仓库设置-管理web钩子）列表
export const getHooks = async (id,params)=>{
return (await axios.get(`/projects/${id}/hooks.json`,{params})).data;
diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx
index 8b6a1b473..a0ea0abb8 100644
--- a/src/forge/Main/tree/Index.jsx
+++ b/src/forge/Main/tree/Index.jsx
@@ -71,7 +71,7 @@ function Index(props) {
dataIndex: "commit",
key: 3,
ellipsis: true,
- width: "240px",
+ width: "260px",
render: (txt, item) => {
return (
-
- {
- datas && datas.length>0 &&
- datas.map((item,key)=>{
- return(
-
- chooseitem(item.name)}>{item.name} - ) - }) - - } - { - datas && datas.length === 0 && -
暂无{inputValue}{nav === 0 ?"分支":"标签"}~
- } --
+ {
+ datas && datas.length>0 &&
+ datas.map((item,key)=>{
+ return(
+
- chooseitem(item.name)}>{item.name} + ) + }) + } + { + datas && datas.length === 0 && +
暂无{inputValue}{nav === 0 ?"分支":"标签"}~
+ } +
@@ -97,7 +97,7 @@ function Index(props) {
dataIndex: "commit_id",
key: 4,
ellipsis: true,
- width: "250px",
+ width: "225px",
render: (txt, item) => {
return
}
- },
- {
- title: "分支类型",
- dataIndex: "default_branch",
- key: 5,
- width: "150px",
- render: (txt, item) => {
- return isManager ? txt === item.name ? 默认分支 : : txt === item.name ? '默认分支' : '普通分支'
- }
- },
- {
- title: "操作",
- dataIndex: "name",
- key: 6,
- align: "center",
- width: "300px",
- className: "branchActionColumn",
- render: (txt, item,key) => {
- return (
- item.is_deleted ?
-
@@ -327,7 +325,7 @@ export default (props) => {
{permission && }
@@ -110,54 +110,56 @@ function Index(props) {
- 将基于 Commits{truncateCommitId(item.commit_id)}创建分支}>
-
-
-
:
-
- {
- (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
- + 合并请求
- }
-
- 下载
-
- {isManager && (txt === item.default_branch ?
- )
- }
}
];
+ const mergeCol = {
+ title: "分支类型",
+ dataIndex: "default_branch",
+ key: 5,
+ width:"150px",
+ render: (txt, item) => {
+ return isManager ? txt === item.name ? 默认分支 : : txt === item.name ? '默认分支' : '普通分支'
+ }
+ }
+
+ const operCol ={
+ title: "操作",
+ dataIndex: "name",
+ key: 6,
+ align: "center",
+ width: "300px",
+ className: "branchActionColumn",
+ render: (txt, item,key) => {
+ return (
+ item.is_deleted ?
+
+ 将基于 Commits{truncateCommitId(item.commit_id)}创建分支}>
+
+
+
:
+
+ {
+ (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
+ + 合并请求
+ }
+
+ 下载
+
+ {isManager && (txt === item.default_branch ?
+ )
+ }
+ }
+
function restoreBranch(id,name){
const url = `/v1/${owner}/${projectsId}/branches/restore.json`;
Axios.post(url,{
@@ -306,7 +308,7 @@ function Index(props) {
rowKey={'name'}
className='branchListTable'
dataSource={list}
- columns={columns}
+ columns={chooseStatus==="deleted"?[...columns,operCol]:[...columns,mergeCol,operCol]}
pagination={{current: current,
pageSize: pageSize,
total: total,
diff --git a/src/forge/Main/version/New.jsx b/src/forge/Main/version/New.jsx
index e3b46772a..6de00d36b 100644
--- a/src/forge/Main/version/New.jsx
+++ b/src/forge/Main/version/New.jsx
@@ -177,6 +177,7 @@ export default Form.create()(
owner={owner}
history={history}
tagflag={false}
+ commitflag={true}
branchList={projectDetail && projectDetail.branches && projectDetail.branches.list}
>
选择一个已经存在的标签，或者在发布时新建一个标签
From 5e435f8521c1aaeaff5bae485f7bc581b0f333e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Wed, 20 Mar 2024 10:18:36 +0800 Subject: [PATCH 11/24] =?UTF-8?q?wiki=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=20issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Wiki/Index.jsx | 40 ++++++++++----------- src/forge/Wiki/Preview.jsx | 13 +++---- src/forge/Wiki/api.js | 25 ++++++++++--- src/forge/Wiki/components/sidebar/index.jsx | 12 ++----- 4 files changed, 50 insertions(+), 40 deletions(-) diff --git a/src/forge/Wiki/Index.jsx b/src/forge/Wiki/Index.jsx index 1c8eb99cd..08288c366 100644 --- a/src/forge/Wiki/Index.jsx +++ b/src/forge/Wiki/Index.jsx @@ -5,7 +5,7 @@ import CopyTool from '../Component/CopyTool'; import Welcome from './Welcome'; import RenderHtml from "../../components/render-html"; -import { wikiPages, getWiki, parseSidebar, updateWiki, treeToMd } from './api'; +import { wikiPages, getWiki, parseSidebar, updateWiki, treeToMd, deleteSameKey } from './api'; import { httpUrl } from './fetch'; import './Index.scss'; import './components/ModalFun/index.scss'; @@ -38,18 +38,9 @@ export default (props) => { const [addMenuError, setAddMenuError] = useState(undefined); const [sidebar, setSidebar] = useState(undefined); const [defaultSelectedKeys, setDefaultSelectedKeys] = useState(undefined); - const [masterProtected, setMasterProtected] = useState(false); useEffect(()=>{ window.scrollTo(0,0); - // 获取仓库分支信息，判断master是否设置了分支保护 - if(projectsId && owner){ - axios.get(`/v1/${owner}/${projectsId}/branches.json`, {keyword: 'master'}).then(res=>{ - if(res && res.data && res.data.total_count === 1){ - setMasterProtected(res.data.branches[0].protected); - } - }) - } }, []) useEffect(()=>{ @@ -84,9 +75,9 @@ export default (props) => { setSidebar(sidebar) setFileList(menuList); let firstWikiNode = undefined; - const arr = pathname.split('/'); if(!pathname.endsWith('/wiki')){ - firstWikiNode = findNodeByName(menuList, arr[arr.length-2]); + const {wikiName} = match.params; + firstWikiNode = findNodeByName(menuList, wikiName); } else{ // 找到目录树中第一个[[页面]] firstWikiNode = findFirstWiki(menuList); @@ -95,14 +86,14 @@ export default (props) => { !firstWikiNode && (firstWikiNode = findFirstWiki(menuList)); // 设置目录 选中节点初始化 setDefaultSelectedKeys([firstWikiNode.key+""]); - const title = firstWikiNode.title.trim().substring(2,firstWikiNode.title.trim().length-2); + const title = firstWikiNode.titleStr; const firstWiki = res.data.filter(item => { return title === item.name })[0]; setCheckItem({ ...firstWiki, key: firstWikiNode.key }) if(window.location.pathname.indexOf('/wiki') === -1) return - history.push(`/${owner}/${projectsId}/wiki/${title}/${firstWikiNode.key}`); + history.push(encodeURI(`/${owner}/${projectsId}/wiki/${firstWiki.sub_url}/${firstWikiNode.key}`)); } else { setFileArr([]); setFileArrInit([]); @@ -110,9 +101,9 @@ export default (props) => { }); }, [project, reload]) - // 加载单个wiki详情，参数尽量用驼峰，此处由于后端太麻烦所以不标准 + // 加载单个wiki详情,sub_url: 后端转义的字符串 useEffect(() => { - project && checkItem.name && getWiki({ + project && checkItem.sub_url && getWiki({ owner: owner, repo: projectsId, pageName: checkItem.sub_url, @@ -228,11 +219,11 @@ export default (props) => { } function goEdit(params) { - history.push(`/${owner}/${projectsId}/wiki/${encodeURI(checkItem.sub_url)}/${checkItem.key}/edit${params}`); + history.push(encodeURI(`/${owner}/${projectsId}/wiki/${checkItem.sub_url}/${checkItem.key}/edit${params}`)); } function preview() { - window.open(`/${owner}/${projectsId}/wiki/preview/${encodeURI(project.name)}/${project.id}`); + window.open(encodeURI(`/${owner}/${projectsId}/wiki/preview/${project.name}/${project.id}`)); } // 支持 Markdown，Html，Pdf格式文件 @@ -257,11 +248,18 @@ export default (props) => { function changeitem(item){ const {name, key} = item; const wiki = fileArrInit.filter(item => { return item.name == name })[0]; + if(!wiki){ + // 不存在的wiki，修正sidebarfindSameKeyByDel + const menuListByDel = deleteSameKey(fileList, key); + updateWikiFun(menuListByDel); + message.success("不存在的wiki") + return + } setCheckItem({ ...wiki, key }) - history.push(`/${owner}/${projectsId}/wiki/${name}/${key}`); + history.push(encodeURI(`/${owner}/${projectsId}/wiki/${name}/${key}`)); } return ( @@ -297,7 +295,7 @@ export default (props) => {
{/* 读sidebar转换成目录树 */}
-
+
-
关联账号
+关联第三方账号
+
您已完成头歌/github/gitee/qq/中国研究生赛事平台授权，请补充Gitlink登录信息以完成第三方账号绑定
{ key === "0" ? diff --git a/src/forge/Account/bind.jsx b/src/forge/Account/bind.jsx index 983c781b2..4337d83ff 100644 --- a/src/forge/Account/bind.jsx +++ b/src/forge/Account/bind.jsx @@ -93,7 +93,7 @@ function Bind(props){