diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index d8032b7fb..58d3fcaef 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -204,7 +204,6 @@ class NewHeader extends Component { }else{ str = match.path; } - if (url && (str === url || (str === url+'/'))) { return true }else { diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 4183131b0..52c76b482 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -192,7 +192,7 @@ function CoderDepot(props){ const url = `/${owner}/${projectsId}/sub_entries.json`; axios.get(url, { params:{ - filepath:path, + filepath:returnbar(path), ref:ref || branchName, type } @@ -272,8 +272,9 @@ function CoderDepot(props){ if(type!=="submodule"){ let enBranch = branchName || defaultBranch; let checkvalue = turnbar(enBranch); + let enPath = turnbar(path); setType(type); - props.history.push(`/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`); + props.history.push(`/${owner}/${projectsId}${`/tree/${checkvalue}`}${enPath?`/${enPath}`:""}`); } } diff --git a/src/forge/Main/CoderDepotPath.jsx b/src/forge/Main/CoderDepotPath.jsx index 89d6a5ca3..44e0c458e 100644 --- a/src/forge/Main/CoderDepotPath.jsx +++ b/src/forge/Main/CoderDepotPath.jsx @@ -1,5 +1,5 @@ -import { result } from 'lodash'; import React from 'react'; +import { returnbar } from 'educoder'; function CoderDepotPath({treeValuePath , returnUlr , returnMain , getPathUrl , identifier}){ @@ -17,9 +17,9 @@ function CoderDepotPath({treeValuePath , returnUlr , returnMain , getPathUrl , i { key === treeValuePath.length-1 ? - {item} + {returnbar(item)} : - returnUlr(`${getPathUrl(treeValuePath,key+1)}`)} className="color-blue subFileName">{item} + returnUlr(`${getPathUrl(treeValuePath,key+1)}`)} className="color-blue subFileName">{returnbar(item)} } ); diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss index 8e1701195..6f07aadb4 100644 --- a/src/forge/Main/list.scss +++ b/src/forge/Main/list.scss @@ -512,7 +512,7 @@ top: 0px; color: #999; height: 22px; - line-height: 22px; + line-height: 17px; } .addFile{ display: flex;