adminforth 2.13.0-next.22 → 2.13.0-next.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/spa/src/App.vue
CHANGED
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
</nav>
|
|
74
74
|
|
|
75
75
|
<Sidebar
|
|
76
|
-
v-if="loggedIn && routerIsReady && loginRedirectCheckIsReady && defaultLayout && !headerOnlyLayout"
|
|
76
|
+
v-if="loggedIn && routerIsReady && loginRedirectCheckIsReady && defaultLayout && !headerOnlyLayout && coreStore.menu.length > 0"
|
|
77
77
|
:sideBarOpen="sideBarOpen"
|
|
78
78
|
:forceIconOnly="route.meta?.sidebarAndHeader === 'preferIconOnly'"
|
|
79
79
|
@hideSidebar="hideSidebar"
|
|
@@ -311,17 +311,13 @@ async function loadMenu() {
|
|
|
311
311
|
function handleCustomLayout() {
|
|
312
312
|
if (route.meta?.sidebarAndHeader === 'none') {
|
|
313
313
|
defaultLayout.value = false;
|
|
314
|
-
headerOnlyLayout.value = false;
|
|
315
314
|
} else if (route.meta?.sidebarAndHeader === 'preferIconOnly') {
|
|
316
315
|
defaultLayout.value = true;
|
|
317
|
-
headerOnlyLayout.value = false;
|
|
318
316
|
isSidebarIconOnly.value = true;
|
|
319
317
|
} else if (route.meta?.sidebarAndHeader === 'headerOnly') {
|
|
320
|
-
defaultLayout.value = true;
|
|
321
318
|
headerOnlyLayout.value = true;
|
|
322
319
|
} else {
|
|
323
320
|
defaultLayout.value = true;
|
|
324
|
-
headerOnlyLayout.value = false;
|
|
325
321
|
}
|
|
326
322
|
}
|
|
327
323
|
|
|
@@ -199,6 +199,9 @@ async function login() {
|
|
|
199
199
|
if (resp.error) {
|
|
200
200
|
error.value = resp.error;
|
|
201
201
|
} else if (resp.redirectTo) {
|
|
202
|
+
error.value = null;
|
|
203
|
+
user.authorize();
|
|
204
|
+
await coreStore.fetchMenuAndResource();
|
|
202
205
|
router.push(resp.redirectTo);
|
|
203
206
|
} else {
|
|
204
207
|
error.value = null;
|