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

packages/effects/layouts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vben/layouts",
-  "version": "5.5.4",
+  "version": "5.5.5",
   "homepage": "https://github.com/vbenjs/vue-vben-admin",
   "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
   "repository": {

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

@@ -1,8 +1,8 @@
 <script lang="ts" setup>
 interface Props {
-  companyName: string;
+  companyName?: string;
   companySiteLink?: string;
-  date: string;
+  date?: string;
   icp?: string;
   icpLink?: string;
 }

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

@@ -12,7 +12,7 @@ import {
   updatePreferences,
   usePreferences,
 } from '@vben/preferences';
-import { useLockStore } from '@vben/stores';
+import { useAccessStore } from '@vben/stores';
 import { cloneDeep, mapTree } from '@vben/utils';
 
 import { VbenAdminLayout } from '@vben-core/layout-ui';
@@ -49,7 +49,7 @@ const {
   sidebarCollapsed,
   theme,
 } = usePreferences();
-const lockStore = useLockStore();
+const accessStore = useAccessStore();
 const { refresh } = useRefresh();
 
 const sidebarTheme = computed(() => {
@@ -356,7 +356,7 @@ const headerSlots = computed(() => {
       />
 
       <Transition v-if="preferences.widget.lockScreen" name="slide-up">
-        <slot v-if="lockStore.isLockScreen" name="lock-screen"></slot>
+        <slot v-if="accessStore.isLockScreen" name="lock-screen"></slot>
       </Transition>
 
       <template v-if="preferencesButtonPosition.fixed">

packages/effects/layouts/src/basic/menu/extra-menu.vue

@@ -1,15 +1,17 @@
 <script lang="ts" setup>
 import type { MenuRecordRaw } from '@vben/types';
+
 import type { MenuProps } from '@vben-core/menu-ui';
 
-import { Menu } from '@vben-core/menu-ui';
 import { useRoute } from 'vue-router';
 
+import { Menu } from '@vben-core/menu-ui';
+
 import { useNavigation } from './use-navigation';
 
 interface Props extends MenuProps {
   collapse?: boolean;
-  menus: MenuRecordRaw[];
+  menus?: MenuRecordRaw[];
 }
 
 withDefaults(defineProps<Props>(), {

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

@@ -1,11 +1,12 @@
 <script lang="ts" setup>
 import type { MenuRecordRaw } from '@vben/types';
+
 import type { MenuProps } from '@vben-core/menu-ui';
 
 import { Menu } from '@vben-core/menu-ui';
 
 interface Props extends MenuProps {
-  menus: MenuRecordRaw[];
+  menus?: MenuRecordRaw[];
 }
 
 const props = withDefaults(defineProps<Props>(), {

packages/effects/layouts/src/widgets/global-search/global-search.vue

@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import type { MenuRecordRaw } from '@vben/types';
 
+import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
+
 import {
   ArrowDown,
   ArrowUp,
@@ -10,9 +12,10 @@ import {
 } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { isWindowsOs } from '@vben/utils';
+
 import { useVbenModal } from '@vben-core/popup-ui';
+
 import { useMagicKeys, whenever } from '@vueuse/core';
-import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
 
 import SearchPanel from './search-panel.vue';
 
@@ -21,7 +24,7 @@ defineOptions({
 });
 
 const props = withDefaults(
-  defineProps<{ enableShortcutKey?: boolean; menus: MenuRecordRaw[] }>(),
+  defineProps<{ enableShortcutKey?: boolean; menus?: MenuRecordRaw[] }>(),
   {
     enableShortcutKey: true,
     menus: () => [],

packages/effects/layouts/src/widgets/global-search/search-panel.vue

@@ -1,21 +1,24 @@
 <script setup lang="ts">
 import type { MenuRecordRaw } from '@vben/types';
 
+import { nextTick, onMounted, ref, shallowRef, watch } from 'vue';
+import { useRouter } from 'vue-router';
+
 import { SearchX, X } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { mapTree, traverseTreeValues, uniqueByField } from '@vben/utils';
+
 import { VbenIcon, VbenScrollbar } from '@vben-core/shadcn-ui';
 import { isHttpUrl } from '@vben-core/shared/utils';
+
 import { onKeyStroke, useLocalStorage, useThrottleFn } from '@vueuse/core';
-import { nextTick, onMounted, ref, shallowRef, watch } from 'vue';
-import { useRouter } from 'vue-router';
 
 defineOptions({
   name: 'SearchPanel',
 });
 
 const props = withDefaults(
-  defineProps<{ keyword: string; menus: MenuRecordRaw[] }>(),
+  defineProps<{ keyword?: string; menus?: MenuRecordRaw[] }>(),
   {
     keyword: '',
     menus: () => [],

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

@@ -1,12 +1,15 @@
 <script setup lang="ts">
+import { computed, reactive, ref } from 'vue';
+
 import { LockKeyhole } from '@vben/icons';
 import { $t, useI18n } from '@vben/locales';
-import { storeToRefs, useLockStore } from '@vben/stores';
+import { storeToRefs, useAccessStore } from '@vben/stores';
+
 import { useScrollLock } from '@vben-core/composables';
 import { useVbenForm, z } from '@vben-core/form-ui';
 import { VbenAvatar, VbenButton } from '@vben-core/shadcn-ui';
+
 import { useDateFormat, useNow } from '@vueuse/core';
-import { computed, reactive, ref } from 'vue';
 
 interface Props {
   avatar?: string;
@@ -23,7 +26,7 @@ withDefaults(defineProps<Props>(), {
 defineEmits<{ toLogin: [] }>();
 
 const { locale } = useI18n();
-const lockStore = useLockStore();
+const accessStore = useAccessStore();
 
 const now = useNow();
 const meridiem = useDateFormat(now, 'A');
@@ -32,7 +35,7 @@ const minute = useDateFormat(now, 'mm');
 const date = useDateFormat(now, 'YYYY-MM-DD dddd', { locales: locale.value });
 
 const showUnlockForm = ref(false);
-const { lockScreenPassword } = storeToRefs(lockStore);
+const { lockScreenPassword } = storeToRefs(accessStore);
 
 const [Form, { form, validate }] = useVbenForm(
   reactive({
@@ -63,7 +66,7 @@ async function handleSubmit() {
   const { valid } = await validate();
   if (valid) {
     if (validPass.value) {
-      lockStore.unlockScreen();
+      accessStore.unlockScreen();
     } else {
       form.setFieldError('password', $t('authentication.passwordErrorTip'));
     }

packages/effects/layouts/src/widgets/preferences/blocks/checkbox-item.vue

@@ -14,7 +14,7 @@ defineOptions({
 withDefaults(
   defineProps<{
     disabled?: boolean;
-    items: SelectOption[];
+    items?: SelectOption[];
     multiple?: boolean;
     onBtnClick?: (value: string) => void;
     placeholder?: string;

packages/effects/layouts/src/widgets/preferences/blocks/toggle-item.vue

@@ -7,7 +7,7 @@ defineOptions({
   name: 'PreferenceToggleItem',
 });
 
-withDefaults(defineProps<{ disabled?: boolean; items: SelectOption[] }>(), {
+withDefaults(defineProps<{ disabled?: boolean; items?: SelectOption[] }>(), {
   disabled: false,
   items: () => [],
 });

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

@@ -1,13 +1,17 @@
 <script setup lang="ts">
-import type { AnyFunction } from '@vben/types';
 import type { Component } from 'vue';
 
+import type { AnyFunction } from '@vben/types';
+
+import { computed, useTemplateRef, watch } from 'vue';
+
 import { useHoverToggle } from '@vben/hooks';
 import { LockKeyhole, LogOut } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { preferences, usePreferences } from '@vben/preferences';
-import { useLockStore } from '@vben/stores';
+import { useAccessStore } from '@vben/stores';
 import { isWindowsOs } from '@vben/utils';
+
 import { useVbenModal } from '@vben-core/popup-ui';
 import {
   Badge,
@@ -21,8 +25,8 @@ import {
   VbenAvatar,
   VbenIcon,
 } from '@vben-core/shadcn-ui';
+
 import { useMagicKeys, whenever } from '@vueuse/core';
-import { computed, useTemplateRef, watch } from 'vue';
 
 import { LockScreenModal } from '../lock-screen';
 
@@ -78,7 +82,7 @@ const emit = defineEmits<{ logout: [] }>();
 
 const { globalLockScreenShortcutKey, globalLogoutShortcutKey } =
   usePreferences();
-const lockStore = useLockStore();
+const accessStore = useAccessStore();
 const [LockModal, lockModalApi] = useVbenModal({
   connectedComponent: LockScreenModal,
 });
@@ -129,7 +133,7 @@ function handleOpenLock() {
 
 function handleSubmitLock(lockScreenPassword: string) {
   lockModalApi.close();
-  lockStore.lockScreen(lockScreenPassword);
+  accessStore.lockScreen(lockScreenPassword);
 }
 
 function handleLogout() {