Compare commits

..

3 Commits

4 changed files with 13 additions and 13 deletions

View File

@@ -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>

View File

@@ -135,7 +135,7 @@ const local: App.I18n.Schema = {
title: 'Tab Settings',
visible: 'Tab Visible',
cache: 'Tag Bar Info Cache',
cacheTip: 'One-click to open/close global keepalive',
cacheTip: 'Keep the tab bar information after leaving the page',
height: 'Tab Height',
mode: {
title: 'Tab Mode',

View File

@@ -132,7 +132,7 @@ const local: App.I18n.Schema = {
title: '标签栏设置',
visible: '显示标签栏',
cache: '标签栏信息缓存',
cacheTip: '一键开启/关闭全局 keepalive',
cacheTip: '离开页面后仍然保留标签栏信息',
height: '标签栏高度',
mode: {
title: '标签栏风格',

View File

@@ -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);
});
}