refactor: Separate store

packages/effects/access/src/directive.ts

@@ -33,6 +33,6 @@ const authDirective: Directive = {
   mounted,
 };
 
-export function useAccessDirective(app: App) {
+export function registerAccessDirective(app: App) {
   app.directive('access', authDirective);
 }

packages/effects/access/src/use-access.ts

@@ -1,10 +1,11 @@
 import { computed } from 'vue';
 
 import { preferences, updatePreferences } from '@vben/preferences';
-import { useCoreAccessStore } from '@vben/stores';
+import { useAccessStore, useUserStore } from '@vben/stores';
 
 function useAccess() {
-  const coreAccessStore = useCoreAccessStore();
+  const accessStore = useAccessStore();
+  const userStore = useUserStore();
   const accessMode = computed(() => {
     return preferences.app.accessMode;
   });
@@ -15,7 +16,7 @@ function useAccess() {
    * @param roles
    */
   function hasAccessByRoles(roles: string[]) {
-    const userRoleSet = new Set(coreAccessStore.userRoles);
+    const userRoleSet = new Set(userStore.userRoles);
     const intersection = roles.filter((item) => userRoleSet.has(item));
     return intersection.length > 0;
   }
@@ -26,7 +27,7 @@ function useAccess() {
    * @param codes
    */
   function hasAccessByCodes(codes: string[]) {
-    const userCodesSet = new Set(coreAccessStore.accessCodes);
+    const userCodesSet = new Set(accessStore.accessCodes);
 
     const intersection = codes.filter((item) => userCodesSet.has(item));
     return intersection.length > 0;

packages/effects/hooks/src/use-refresh.ts

@@ -1,13 +1,13 @@
 import { useRouter } from 'vue-router';
 
-import { useCoreTabbarStore } from '@vben/stores';
+import { useTabbarStore } from '@vben/stores';
 
 export function useRefresh() {
   const router = useRouter();
-  const coreTabbarStore = useCoreTabbarStore();
+  const tabbarStore = useTabbarStore();
 
   function refresh() {
-    coreTabbarStore.refresh(router);
+    tabbarStore.refresh(router);
   }
 
   return {

packages/effects/hooks/src/use-tabs.ts

@@ -1,64 +1,64 @@
 import { type RouteLocationNormalized, useRoute, useRouter } from 'vue-router';
 
-import { useCoreTabbarStore } from '@vben/stores';
+import { useTabbarStore } from '@vben/stores';
 
 export function useTabs() {
   const router = useRouter();
   const route = useRoute();
-  const coreTabbarStore = useCoreTabbarStore();
+  const tabbarStore = useTabbarStore();
 
   async function closeLeftTabs(tab?: RouteLocationNormalized) {
-    await coreTabbarStore.closeLeftTabs(tab || route);
+    await tabbarStore.closeLeftTabs(tab || route);
   }
 
   async function closeAllTabs() {
-    await coreTabbarStore.closeAllTabs(router);
+    await tabbarStore.closeAllTabs(router);
   }
 
   async function closeRightTabs(tab?: RouteLocationNormalized) {
-    await coreTabbarStore.closeRightTabs(tab || route);
+    await tabbarStore.closeRightTabs(tab || route);
   }
 
   async function closeOtherTabs(tab?: RouteLocationNormalized) {
-    await coreTabbarStore.closeOtherTabs(tab || route);
+    await tabbarStore.closeOtherTabs(tab || route);
   }
 
   async function closeCurrentTab(tab?: RouteLocationNormalized) {
-    await coreTabbarStore.closeTab(tab || route, router);
+    await tabbarStore.closeTab(tab || route, router);
   }
 
   async function pinTab(tab?: RouteLocationNormalized) {
-    await coreTabbarStore.pinTab(tab || route);
+    await tabbarStore.pinTab(tab || route);
   }
 
   async function unpinTab(tab?: RouteLocationNormalized) {
-    await coreTabbarStore.unpinTab(tab || route);
+    await tabbarStore.unpinTab(tab || route);
   }
 
   async function toggleTabPin(tab?: RouteLocationNormalized) {
-    await coreTabbarStore.toggleTabPin(tab || route);
+    await tabbarStore.toggleTabPin(tab || route);
   }
 
   async function refreshTab() {
-    await coreTabbarStore.refresh(router);
+    await tabbarStore.refresh(router);
   }
 
   async function openTabInNewWindow(tab?: RouteLocationNormalized) {
-    coreTabbarStore.openTabInNewWindow(tab || route);
+    tabbarStore.openTabInNewWindow(tab || route);
   }
 
   async function closeTabByKey(key: string) {
-    await coreTabbarStore.closeTabByKey(key, router);
+    await tabbarStore.closeTabByKey(key, router);
   }
 
   async function setTabTitle(title: string) {
-    coreTabbarStore.setUpdateTime();
-    await coreTabbarStore.setTabTitle(route, title);
+    tabbarStore.setUpdateTime();
+    await tabbarStore.setTabTitle(route, title);
   }
 
   async function resetTabTitle() {
-    coreTabbarStore.setUpdateTime();
-    await coreTabbarStore.resetTabTitle(route);
+    tabbarStore.setUpdateTime();
+    await tabbarStore.resetTabTitle(route);
   }
 
   /**
@@ -66,8 +66,8 @@ export function useTabs() {
    * @param tab
    */
   function getTabDisableState(tab: RouteLocationNormalized = route) {
-    const tabs = coreTabbarStore.getTabs;
-    const affixTabs = coreTabbarStore.affixTabs;
+    const tabs = tabbarStore.getTabs;
+    const affixTabs = tabbarStore.affixTabs;
     const index = tabs.findIndex((item) => item.path === tab.path);
 
     const disabled = tabs.length <= 1;

packages/effects/layouts/src/basic/content/content.vue

@@ -9,7 +9,7 @@ import { RouterView } from 'vue-router';
 
 import { useContentHeight } from '@vben/hooks';
 import { preferences, usePreferences } from '@vben/preferences';
-import { storeToRefs, useCoreTabbarStore } from '@vben/stores';
+import { storeToRefs, useTabbarStore } from '@vben/stores';
 import { Spinner } from '@vben-core/shadcn-ui';
 
 import { IFrameRouterView } from '../../iframe';
@@ -17,7 +17,7 @@ import { useContentSpinner } from './use-content-spinner';
 
 defineOptions({ name: 'LayoutContent' });
 
-const tabbarStore = useCoreTabbarStore();
+const tabbarStore = useTabbarStore();
 const { keepAlive } = usePreferences();
 const { spinning } = useContentSpinner();
 const { contentStyles } = useContentHeight();

packages/effects/layouts/src/basic/header/header.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { preferences, usePreferences } from '@vben/preferences';
-import { useCoreAccessStore } from '@vben/stores';
+import { useAccessStore } from '@vben/stores';
 import { VbenFullScreen } from '@vben-core/shadcn-ui';
 
 import { GlobalSearch, LanguageToggle, ThemeToggle } from '../../widgets';
@@ -20,7 +20,7 @@ withDefaults(defineProps<Props>(), {
   theme: 'light',
 });
 
-const accessStore = useCoreAccessStore();
+const accessStore = useAccessStore();
 const { globalSearchShortcutKey } = usePreferences();
 </script>
 

packages/effects/layouts/src/basic/layout.vue

@@ -8,7 +8,7 @@ import {
   updatePreferences,
   usePreferences,
 } from '@vben/preferences';
-import { useCoreAccessStore, useCoreLockStore } from '@vben/stores';
+import { useLockStore, useUserStore } from '@vben/stores';
 import { MenuRecordRaw } from '@vben/types';
 import { mapTree } from '@vben/utils';
 import { VbenAdminLayout } from '@vben-core/layout-ui';
@@ -41,9 +41,9 @@ const {
   layout,
   sidebarCollapsed,
 } = usePreferences();
-const coreAccessStore = useCoreAccessStore();
+const userStore = useUserStore();
 const { updateWatermark } = useWatermark();
-const coreLockStore = useCoreLockStore();
+const lockStore = useLockStore();
 
 const headerMenuTheme = computed(() => {
   return isDark.value ? 'dark' : 'light';
@@ -138,7 +138,7 @@ watch(
       // await nextTick();
 
       updateWatermark({
-        content: `${preferences.app.name} 用户名: ${coreAccessStore.userInfo?.username}`,
+        content: `${preferences.app.name} 用户名: ${userStore.userInfo?.username}`,
         // parent: contentRef.value,
       });
     }
@@ -317,7 +317,7 @@ watch(
       />
 
       <Transition v-if="preferences.widget.lockScreen" name="slide-up">
-        <slot v-if="coreLockStore.isLockScreen" name="lock-screen"></slot>
+        <slot v-if="lockStore.isLockScreen" name="lock-screen"></slot>
       </Transition>
     </template>
   </VbenAdminLayout>

packages/effects/layouts/src/basic/menu/use-extra-menu.ts

@@ -4,13 +4,13 @@ import { computed, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 
 import { preferences } from '@vben/preferences';
-import { useCoreAccessStore } from '@vben/stores';
+import { useAccessStore } from '@vben/stores';
 import { findRootMenuByPath } from '@vben/utils';
 
 import { useNavigation } from './use-navigation';
 
 function useExtraMenu() {
-  const accessStore = useCoreAccessStore();
+  const accessStore = useAccessStore();
   const { navigation } = useNavigation();
 
   const menus = computed(() => accessStore.accessMenus);

packages/effects/layouts/src/basic/menu/use-mixed-menu.ts

@@ -4,14 +4,14 @@ import { computed, onBeforeMount, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 
 import { preferences, usePreferences } from '@vben/preferences';
-import { useCoreAccessStore } from '@vben/stores';
+import { useAccessStore } from '@vben/stores';
 import { findRootMenuByPath } from '@vben/utils';
 
 import { useNavigation } from './use-navigation';
 
 function useMixedMenu() {
   const { navigation } = useNavigation();
-  const accessStore = useCoreAccessStore();
+  const accessStore = useAccessStore();
   const route = useRoute();
   const splitSideMenus = ref<MenuRecordRaw[]>([]);
   const rootMenuPath = ref<string>('');

packages/effects/layouts/src/basic/tabbar/tabbar.vue

@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 
 import { useContentMaximize, useTabs } from '@vben/hooks';
 import { preferences } from '@vben/preferences';
-import { useCoreTabbarStore } from '@vben/stores';
+import { useTabbarStore } from '@vben/stores';
 import {
   TabsToolMore,
   TabsToolRefresh,
@@ -21,7 +21,7 @@ defineOptions({
 defineProps<{ showIcon?: boolean; theme?: string }>();
 
 const route = useRoute();
-const coreTabbarStore = useCoreTabbarStore();
+const tabbarStore = useTabbarStore();
 const { toggleMaximize } = useContentMaximize();
 const { refreshTab, unpinTab } = useTabs();
 
@@ -34,7 +34,7 @@ const {
 } = useTabbar();
 
 const menus = computed(() => {
-  const tab = coreTabbarStore.getTabByPath(currentActive.value);
+  const tab = tabbarStore.getTabByPath(currentActive.value);
   const menus = createContextMenus(tab);
   return menus.map((item) => {
     return {
@@ -47,7 +47,7 @@ const menus = computed(() => {
 
 // 刷新后如果不保持tab状态，关闭其他tab
 if (!preferences.tabbar.persist) {
-  coreTabbarStore.closeOtherTabs(route);
+  tabbarStore.closeOtherTabs(route);
 }
 </script>
 
@@ -61,7 +61,7 @@ if (!preferences.tabbar.persist) {
     :style-type="preferences.tabbar.styleType"
     :tabs="currentTabs"
     @close="handleClose"
-    @sort-tabs="coreTabbarStore.sortTabs"
+    @sort-tabs="tabbarStore.sortTabs"
     @unpin="unpinTab"
     @update:active="handleClick"
   />

packages/effects/layouts/src/basic/tabbar/use-tabbar.ts

@@ -23,19 +23,14 @@ import {
   X,
 } from '@vben/icons';
 import { $t, useI18n } from '@vben/locales';
-import {
-  storeToRefs,
-  useCoreAccessStore,
-  useCoreTabbarStore,
-} from '@vben/stores';
+import { useAccessStore, useTabbarStore } from '@vben/stores';
 import { filterTree } from '@vben/utils';
 
 export function useTabbar() {
   const router = useRouter();
   const route = useRoute();
-  const accessStore = useCoreAccessStore();
-  const coreTabbarStore = useCoreTabbarStore();
-  const { accessMenus } = storeToRefs(accessStore);
+  const accessStore = useAccessStore();
+  const tabbarStore = useTabbarStore();
   const { contentIsMaximize, toggleMaximize } = useContentMaximize();
   const {
     closeAllTabs,
@@ -58,8 +53,8 @@ export function useTabbar() {
   const currentTabs = ref<RouteLocationNormalizedGeneric[]>();
   watch(
     [
-      () => coreTabbarStore.getTabs,
-      () => coreTabbarStore.updateTime,
+      () => tabbarStore.getTabs,
+      () => tabbarStore.updateTime,
       () => locale.value,
     ],
     ([tabs]) => {
@@ -74,7 +69,7 @@ export function useTabbar() {
     const affixTabs = filterTree(router.getRoutes(), (route) => {
       return !!route.meta?.affixTab;
     });
-    coreTabbarStore.setAffixTabs(affixTabs);
+    tabbarStore.setAffixTabs(affixTabs);
   };
 
   // 点击tab,跳转路由
@@ -98,7 +93,7 @@ export function useTabbar() {
   }
 
   watch(
-    () => accessMenus.value,
+    () => accessStore.accessMenus,
     () => {
       initAffixTabs();
     },
@@ -108,7 +103,7 @@ export function useTabbar() {
   watch(
     () => route.path,
     () => {
-      coreTabbarStore.addTab(route as RouteLocationNormalized);
+      tabbarStore.addTab(route as RouteLocationNormalized);
     },
     { immediate: true },
   );

packages/effects/layouts/src/iframe/iframe-router-view.vue

@@ -5,13 +5,13 @@ import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
 import { preferences } from '@vben/preferences';
-import { useCoreTabbarStore } from '@vben/stores';
+import { useTabbarStore } from '@vben/stores';
 import { Spinner } from '@vben-core/shadcn-ui';
 
 defineOptions({ name: 'IFrameRouterView' });
 
 const spinningList = ref<boolean[]>([]);
-const coreTabbarStore = useCoreTabbarStore();
+const tabbarStore = useTabbarStore();
 const route = useRoute();
 
 const enableTabbar = computed(() => preferences.tabbar.enable);
@@ -20,7 +20,7 @@ const iframeRoutes = computed(() => {
   if (!enableTabbar.value) {
     return route.meta.iframeSrc ? [route] : [];
   }
-  return coreTabbarStore.getTabs.filter((tab) => !!tab.meta?.iframeSrc);
+  return tabbarStore.getTabs.filter((tab) => !!tab.meta?.iframeSrc);
 });
 
 const tabNames = computed(
@@ -36,7 +36,7 @@ function routeShow(tabItem: RouteLocationNormalized) {
 function canRender(tabItem: RouteLocationNormalized) {
   const { meta, name } = tabItem;
 
-  if (!name || !coreTabbarStore.renderRouteView) {
+  if (!name || !tabbarStore.renderRouteView) {
     return false;
   }
 
@@ -52,7 +52,7 @@ function canRender(tabItem: RouteLocationNormalized) {
   ) {
     return false;
   }
-  return coreTabbarStore.getTabs.some((tab) => tab.name === name);
+  return tabbarStore.getTabs.some((tab) => tab.name === name);
 }
 
 function hideLoading(index: number) {

packages/effects/layouts/src/widgets/lock-screen/lock-screen.vue

@@ -3,7 +3,7 @@ import { computed, reactive, ref, watchEffect } from 'vue';
 
 import { LockKeyhole } from '@vben/icons';
 import { $t, useI18n } from '@vben/locales';
-import { storeToRefs, useCoreLockStore } from '@vben/stores';
+import { storeToRefs, useLockStore } from '@vben/stores';
 import {
   VbenAvatar,
   VbenButton,
@@ -27,7 +27,7 @@ withDefaults(defineProps<Props>(), {
 defineEmits<{ toLogin: [] }>();
 
 const { locale } = useI18n();
-const coreLockStore = useCoreLockStore();
+const lockStore = useLockStore();
 
 const now = useNow();
 const meridiem = useDateFormat(now, 'A');
@@ -37,7 +37,7 @@ const date = useDateFormat(now, 'YYYY-MM-DD dddd', { locales: locale.value });
 
 const showUnlockForm = ref(false);
 const validPass = ref(true);
-const { lockScreenPassword } = storeToRefs(coreLockStore);
+const { lockScreenPassword } = storeToRefs(lockStore);
 
 const formState = reactive({
   password: '',
@@ -77,7 +77,7 @@ function handleSubmit() {
     validPass.value = false;
     return;
   }
-  coreLockStore.unlockScreen();
+  lockStore.unlockScreen();
 }
 
 function toggleUnlockForm() {

packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue

@@ -7,7 +7,7 @@ import { computed, ref } from 'vue';
 import { LockKeyhole, LogOut, SwatchBook } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { preferences, usePreferences } from '@vben/preferences';
-import { useCoreLockStore } from '@vben/stores';
+import { useLockStore } from '@vben/stores';
 import { isWindowsOs } from '@vben/utils';
 import {
   Badge,
@@ -80,7 +80,7 @@ const {
   globalLogoutShortcutKey,
   globalPreferencesShortcutKey,
 } = usePreferences();
-const coreLockStore = useCoreLockStore();
+const lockStore = useLockStore();
 const { handleOpenPreference } = useOpenPreferences();
 
 const altView = computed(() => (isWindowsOs() ? 'Alt' : '⌥'));
@@ -111,7 +111,7 @@ function handleSubmitLock({
   lockScreenPassword: string;
 }) {
   openLock.value = false;
-  coreLockStore.lockScreen(lockScreenPassword);
+  lockStore.lockScreen(lockScreenPassword);
 }
 function handleLogout() {
   // emit