fix layout menu
This commit is contained in:
parent
3e09e4b0dd
commit
3034a12ded
|
|
@ -139,11 +139,12 @@ export const Layout: FC<LYTChild> = (props) => {
|
||||||
if (!w.user) {
|
if (!w.user) {
|
||||||
local.loading = true;
|
local.loading = true;
|
||||||
loadSession(props.login_url || "/auth/login");
|
loadSession(props.login_url || "/auth/login");
|
||||||
|
console.log(w.user);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (path === props.login_url) return props.blank_layout;
|
if (path === props.login_url) return props.blank_layout;
|
||||||
if (!w.user && !isEditor)
|
if (!w.user && !isEditor) {
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={cx(
|
className={cx(
|
||||||
|
|
@ -153,6 +154,9 @@ export const Layout: FC<LYTChild> = (props) => {
|
||||||
<FieldLoading />
|
<FieldLoading />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
} else {
|
||||||
|
local.loading = false;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<props.PassProp
|
<props.PassProp
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,6 @@ type MLocal = typeof local_default & { render: () => void };
|
||||||
|
|
||||||
export const Menu: FC<MenuProp> = (props) => {
|
export const Menu: FC<MenuProp> = (props) => {
|
||||||
const imenu = props.menu;
|
const imenu = props.menu;
|
||||||
console.log({imenu})
|
|
||||||
let role = props.role;
|
let role = props.role;
|
||||||
role = props.on_init();
|
role = props.on_init();
|
||||||
let menu = get(imenu, role) || [];
|
let menu = get(imenu, role) || [];
|
||||||
|
|
@ -82,7 +81,6 @@ export const SideBar: FC<{
|
||||||
pm
|
pm
|
||||||
}
|
}
|
||||||
const data: IMenu[] = (typeof _data[0] === "string" ? [_data] : _data) as any;
|
const data: IMenu[] = (typeof _data[0] === "string" ? [_data] : _data) as any;
|
||||||
console.log({data})
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
data.map((item) => {
|
data.map((item) => {
|
||||||
const menu = {
|
const menu = {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue