|
|
@@ -75,13 +75,16 @@ const DesktopNavToggle=()=>{
|
|
|
const currRoute=useSelector(getRoute(pathname));
|
|
|
const getRootRoute=(pathname)=>{
|
|
|
let route="";
|
|
|
- let clv=currRoute.lv;
|
|
|
- for (let i = 0; i < LINKS.length; i++) {
|
|
|
- let link=LINKS[i];
|
|
|
- let lv=link.lv;
|
|
|
- if (clv.startsWith(lv)){
|
|
|
- route=link.path;
|
|
|
- break;
|
|
|
+ if (currRoute){
|
|
|
+ let clv=currRoute.lv;
|
|
|
+ if (clv==null)return route;
|
|
|
+ for (let i = 0; i < LINKS.length; i++) {
|
|
|
+ let link=LINKS[i];
|
|
|
+ let lv=link.lv;
|
|
|
+ if (clv.startsWith(lv)){
|
|
|
+ route=link.path;
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return route;
|
|
|
@@ -105,7 +108,7 @@ const DesktopNavToggle=()=>{
|
|
|
<svg className={"icon"}>
|
|
|
<use xlinkHref={`${symbol}#${link.icon}`} />
|
|
|
</svg>
|
|
|
- {i18n.t(link.title)}
|
|
|
+ {i18n.t("links."+link.title)}
|
|
|
</NavLink>
|
|
|
</StyledToggle>
|
|
|
))
|
|
|
@@ -189,7 +192,12 @@ const PageHeader = () => {
|
|
|
const {pathname} = useLocation();
|
|
|
const navigate=useNavigate();
|
|
|
const barRef = useRef(null);
|
|
|
+ const currRoute=useSelector(getRoute(pathname));
|
|
|
let lastscroll=0;
|
|
|
+ const checkNavActive=(lv)=>{
|
|
|
+ if (currRoute&&currRoute.lv)return currRoute.lv.startsWith(lv);
|
|
|
+ else return false;
|
|
|
+ }
|
|
|
const getHeaderHeight = () => {
|
|
|
const header = document.querySelector('#appbar');
|
|
|
if (header!=null)return `${header.offsetHeight || 0}px`
|
|
|
@@ -266,13 +274,13 @@ const PageHeader = () => {
|
|
|
</button>
|
|
|
{
|
|
|
LINKS.map((link, index) => (
|
|
|
- <button key={index} className={`${styles['mb-top-navigate-item']} ${pathname===link.path?active:''}`} onClick={()=>{
|
|
|
+ <button key={index} className={`${styles['mb-top-navigate-item']} ${checkNavActive(link.lv)?active:''}`} onClick={()=>{
|
|
|
changePath(link.path);
|
|
|
}}>
|
|
|
<svg className={"icon"}>
|
|
|
<use xlinkHref={`${symbol_m}#${link.icon}`} />
|
|
|
</svg>
|
|
|
- <span>{i18n.t(link.title)}</span>
|
|
|
+ <span>{i18n.t("links."+link.title)}</span>
|
|
|
</button>
|
|
|
))
|
|
|
}
|