mirror of
https://github.com/soybeanjs/soybean-admin.git
synced 2026-03-26 00:27:22 +08:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
af1b5f1d33 | ||
|
|
75ccd00843 |
@@ -68,14 +68,15 @@ const swatches: string[] = [
|
||||
{{ $t('theme.appearance.themeColor.followPrimary') }}
|
||||
</NCheckbox>
|
||||
</template>
|
||||
<NColorPicker
|
||||
class="w-90px"
|
||||
:value="themeStore.themeColors[key]"
|
||||
:disabled="key === 'info' && themeStore.isInfoFollowPrimary"
|
||||
:show-alpha="false"
|
||||
:swatches="swatches"
|
||||
@update:value="handleUpdateColor($event, key)"
|
||||
/>
|
||||
<div class="w-90px">
|
||||
<NColorPicker
|
||||
:value="themeStore.themeColors[key]"
|
||||
:disabled="key === 'info' && themeStore.isInfoFollowPrimary"
|
||||
:show-alpha="false"
|
||||
:swatches="swatches"
|
||||
@update:value="handleUpdateColor($event, key)"
|
||||
/>
|
||||
</div>
|
||||
</SettingItem>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -38,8 +38,7 @@ export function createRouteGuard(router: Router) {
|
||||
|
||||
// if the route does not need login, then it is allowed to access directly
|
||||
if (!needLogin) {
|
||||
handleRouteSwitch(to, from);
|
||||
return;
|
||||
return handleRouteSwitch(to, from);
|
||||
}
|
||||
|
||||
// the route need login but the user is not logged in, then switch to the login page
|
||||
@@ -53,7 +52,7 @@ export function createRouteGuard(router: Router) {
|
||||
}
|
||||
|
||||
// switch route normally
|
||||
handleRouteSwitch(to, from);
|
||||
return handleRouteSwitch(to, from);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user