Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin-pro

packages/@core/forward/stores/src/modules/tabbar.test.ts

@@ -71,20 +71,6 @@ describe('useCoreAccessStore', () => {
     // expect(router.replace).toHaveBeenCalled();
   });
 
-  it('returns all tabs including affix tabs', () => {
-    const store = useCoreTabbarStore();
-    store.tabs = [
-      { fullPath: '/home', meta: {}, name: 'Home', path: '/home' },
-    ] as any;
-    store.affixTabs = [
-      { meta: { hideInTab: false }, path: '/dashboard' },
-    ] as any;
-
-    const result = store.getTabs;
-    expect(result.length).toBe(2);
-    expect(result.find((tab) => tab.path === '/dashboard')).toBeDefined();
-  });
-
   it('closes a non-affix tab', () => {
     const store = useCoreTabbarStore();
     const tab: any = {
@@ -135,7 +121,7 @@ describe('useCoreAccessStore', () => {
     store.tabs.push(normalTab);
     store.affixTabs.push(affixTab);
     expect(store.getTabs).toContainEqual(normalTab);
-    // expect(store.getTabs).toContainEqual(affixTab);
+    expect(store.affixTabs).toContainEqual(affixTab);
   });
 
   it('navigates to a specific tab', async () => {

packages/locales/src/langs/en-US.yaml

@@ -244,8 +244,8 @@ preferences:
     mode-auto-scroll: Scroll hide/display
   footer:
     title: Footer
-    visible: Fixed at the bottom
+    visible: Display Footer
-    fixed: Display Footer
+    fixed: Fixed at the bottom
   copyright:
     title: Copyright
     enable: Enable copyright