diff --git a/dist.tar.gz b/dist.tar.gz index 80bc39d6..4cf65208 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/settings.ts b/src/settings.ts index eac49ef0..133f5abb 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -29,5 +29,11 @@ export default { * @type {boolean} true | false * @description Whether expand the shortcut key area */ - shortcutExpanded: false + shortcutExpanded: false, + + /** + * @type {'tile' | 'collapse'} + * @description Toolbar button display mode: tile (平铺) or collapse (折叠) + */ + toolbarMode: 'collapse' } diff --git a/src/stores/modules/settings.ts b/src/stores/modules/settings.ts index 06f24a66..31919bf6 100644 --- a/src/stores/modules/settings.ts +++ b/src/stores/modules/settings.ts @@ -3,7 +3,7 @@ import defaultSettings from '@/settings' import { ref, computed, watch } from 'vue' import { useUserStore } from './user' -const { showSettings, tagsView, fixedHeader, sidebarLogo, shortcutExpanded } = defaultSettings +const { showSettings, tagsView, fixedHeader, sidebarLogo, shortcutExpanded, toolbarMode: defaultToolbarMode } = defaultSettings export const useSettingsStore = defineStore('settings', () => { const userStore = useUserStore() @@ -15,6 +15,7 @@ export const useSettingsStore = defineStore('settings', () => { const sidebarLogoRef = ref(sidebarLogo) const layoutMode = ref<'sidebar' | 'top-bottom'>('top-bottom') const shortcutExpandedRef = ref(shortcutExpanded) + const toolbarModeRef = ref<'tile' | 'collapse'>(defaultToolbarMode || 'collapse') const storageKey = computed(() => { if (!userStore.user?.username && !userStore.user?.id) return null @@ -34,6 +35,7 @@ export const useSettingsStore = defineStore('settings', () => { if (typeof parsed.sidebarLogo === 'boolean') sidebarLogoRef.value = parsed.sidebarLogo if (typeof parsed.layoutMode === 'string') layoutMode.value = parsed.layoutMode if (typeof parsed.shortcutExpanded === 'boolean') shortcutExpandedRef.value = parsed.shortcutExpanded + if (parsed.toolbarMode === 'tile' || parsed.toolbarMode === 'collapse') toolbarModeRef.value = parsed.toolbarMode } catch (e) { console.error('Failed to parse settings from storage', e) } @@ -48,7 +50,8 @@ export const useSettingsStore = defineStore('settings', () => { fixedHeader: fixedHeaderRef.value, sidebarLogo: sidebarLogoRef.value, layoutMode: layoutMode.value, - shortcutExpanded: shortcutExpandedRef.value + shortcutExpanded: shortcutExpandedRef.value, + toolbarMode: toolbarModeRef.value } try { localStorage.setItem(storageKey.value, JSON.stringify(payload)) @@ -69,6 +72,7 @@ export const useSettingsStore = defineStore('settings', () => { sidebarLogoRef.value = sidebarLogo layoutMode.value = 'top-bottom' shortcutExpandedRef.value = shortcutExpanded + toolbarModeRef.value = defaultToolbarMode || 'collapse' } }, { immediate: true }) @@ -80,7 +84,8 @@ export const useSettingsStore = defineStore('settings', () => { fixedHeader: 1, sidebarLogo: 1, layoutMode: 1, - shortcutExpanded: 1 + shortcutExpanded: 1, + toolbarMode: 1 }, key)) return switch (key) { @@ -105,6 +110,9 @@ export const useSettingsStore = defineStore('settings', () => { case 'shortcutExpanded': shortcutExpandedRef.value = value break + case 'toolbarMode': + toolbarModeRef.value = value + break default: break } @@ -121,6 +129,7 @@ export const useSettingsStore = defineStore('settings', () => { sidebarLogo: sidebarLogoRef, layoutMode, shortcutExpanded: shortcutExpandedRef, + toolbarMode: toolbarModeRef, changeSetting } }) diff --git a/src/views/order/orderManagement/component/OrderToolbarButtonGroup.vue b/src/views/order/orderManagement/component/OrderToolbarButtonGroup.vue index b9ec21e2..0257d113 100644 --- a/src/views/order/orderManagement/component/OrderToolbarButtonGroup.vue +++ b/src/views/order/orderManagement/component/OrderToolbarButtonGroup.vue @@ -1,7 +1,7 @@