diff --git a/.github/workflows/changeset-version.yml b/.github/workflows/changeset-version.yml index 7bc9b261..a21b53ce 100644 --- a/.github/workflows/changeset-version.yml +++ b/.github/workflows/changeset-version.yml @@ -43,7 +43,7 @@ jobs: cache: "pnpm" - name: Install dependencies - run: pnpm install + run: pnpm install --frozen-lockfile - name: Create Release Pull Request uses: changesets/action@v1 diff --git a/apps/web-antd/src/store/modules/app.ts b/apps/web-antd/src/store/modules/app.ts index 4064ae49..8ffd545a 100644 --- a/apps/web-antd/src/store/modules/app.ts +++ b/apps/web-antd/src/store/modules/app.ts @@ -7,7 +7,7 @@ export const useAppStore = defineStore('app', () => { const coreTabbarStore = useCoreTabbarStore(); /** - * 重置所有 状态 + * 重置所有状态 */ async function resetAppState() { coreStoreAccess.$reset(); diff --git a/packages/@core/forward/preferences/src/config.ts b/packages/@core/forward/preferences/src/config.ts index b1a433f7..65d2b38d 100644 --- a/packages/@core/forward/preferences/src/config.ts +++ b/packages/@core/forward/preferences/src/config.ts @@ -9,16 +9,16 @@ const defaultPreferences: Preferences = { colorWeakMode: false, compact: false, contentCompact: 'wide', - copyright: 'Copyright © 2024 Vben Admin PRO', + copyright: 'Copyright © 2024 Vben Admin Pro', defaultAvatar: 'https://cdn.jsdelivr.net/npm/@vbenjs/static-source@0.1.0/source/avatar-v1.webp', dynamicTitle: true, + enablePreferences: true, isMobile: false, layout: 'sidebar-nav', locale: 'zh-CN', name: 'Vben Admin Pro', semiDarkMenu: true, - showPreference: true, }, breadcrumb: { enable: true, @@ -28,8 +28,8 @@ const defaultPreferences: Preferences = { styleType: 'normal', }, footer: { - enable: false, - fixed: true, + enable: true, + fixed: false, }, header: { enable: true, diff --git a/packages/@core/forward/preferences/src/types.ts b/packages/@core/forward/preferences/src/types.ts index e8fe7783..88e7982d 100644 --- a/packages/@core/forward/preferences/src/types.ts +++ b/packages/@core/forward/preferences/src/types.ts @@ -38,6 +38,8 @@ interface AppPreferences { defaultAvatar: string; // /** 开启动态标题 */ dynamicTitle: boolean; + /** 是否显示偏好设置 */ + enablePreferences: boolean; /** 是否移动端 */ isMobile: boolean; /** 布局方式 */ @@ -48,8 +50,6 @@ interface AppPreferences { name: string; /** 是否开启半深色菜单(只在theme='light'时生效) */ semiDarkMenu: boolean; - /** 是否显示偏好设置 */ - showPreference: boolean; } interface BreadcrumbPreferences { diff --git a/packages/@core/ui-kit/layout-ui/src/vben-layout.vue b/packages/@core/ui-kit/layout-ui/src/vben-layout.vue index 41a3789d..5038bcd4 100644 --- a/packages/@core/ui-kit/layout-ui/src/vben-layout.vue +++ b/packages/@core/ui-kit/layout-ui/src/vben-layout.vue @@ -307,6 +307,7 @@ const tabbarStyle = computed((): CSSProperties => { const contentStyle = computed((): CSSProperties => { const fixed = headerFixed.value; + const { footerEnable, footerFixed, footerHeight } = props; return { marginTop: fixed && @@ -315,7 +316,7 @@ const contentStyle = computed((): CSSProperties => { (!isHeaderAuto.value || scrollY.value < headerWrapperHeight.value) ? `${headerWrapperHeight.value}px` : 0, - paddingBottom: `${props.footerEnable ? props.footerHeight : 0}px`, + paddingBottom: `${footerEnable && footerFixed ? footerHeight : 0}px`, }; }); diff --git a/packages/@core/ui-kit/tabs-ui/src/widgets/tool-more.vue b/packages/@core/ui-kit/tabs-ui/src/widgets/tool-more.vue index 9e708a48..792666f6 100644 --- a/packages/@core/ui-kit/tabs-ui/src/widgets/tool-more.vue +++ b/packages/@core/ui-kit/tabs-ui/src/widgets/tool-more.vue @@ -8,7 +8,7 @@ defineProps();