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

2025-04-28 10:06:29 +08:00
parent ecdca981b0 ca94ca906f
commit 50d028f6b8
93 changed files with 1353 additions and 1156 deletions
--- a/packages/effects/access/package.json
+++ b/packages/effects/access/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vben/access",
-  "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": {
--- a/packages/effects/common-ui/package.json
+++ b/packages/effects/common-ui/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vben/common-ui",
-  "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": {
--- a/packages/effects/common-ui/src/components/captcha/hooks/useCaptchaPoints.ts
+++ b/packages/effects/common-ui/src/components/captcha/hooks/useCaptchaPoints.ts
@@ -9,7 +9,7 @@ export function useCaptchaPoints() {
  }

  function clearPoints() {
-    points.splice(0, points.length);
+    points.splice(0);
  }
  return {
    addPoint,
--- a/packages/effects/common-ui/src/components/json-viewer/style.scss
+++ b/packages/effects/common-ui/src/components/json-viewer/style.scss
@@ -14,8 +14,8 @@
    padding: 0 4px 2px;
    font-size: 0.9em;
    line-height: 0.9;
-    color: hsl(var(--secondary-foreground));
    vertical-align: 2px;
+    color: hsl(var(--secondary-foreground));
    cursor: pointer;
    user-select: none;
    background-color: hsl(var(--secondary));
@@ -65,7 +65,7 @@

    &.jv-string {
      color: hsl(var(--primary));
-      word-break: break-word;
+      overflow-wrap: break-word;
      white-space: normal;
    }
  }
--- a/packages/effects/common-ui/src/components/resize/resize.vue
+++ b/packages/effects/common-ui/src/components/resize/resize.vue
@@ -1072,8 +1072,8 @@ watch(
  box-sizing: border-box;
  width: 100%;
  height: 100%;
-  content: '';
  outline: 1px dashed #d6d6d6;
+  content: '';
 }

 .resize-stick {
--- a/packages/effects/common-ui/src/ui/authentication/doc-link.vue
+++ b/packages/effects/common-ui/src/ui/authentication/doc-link.vue
@@ -37,7 +37,7 @@ defineOptions({
        ⚡ 面试手册
      </a>
      <a
-        href="http://static.yudao.iocoder.cn/mp/Aix9975.jpeg"
+        href="http://static.yudao.iocoder.cn/mp/xinyu370.jpeg"
        target="_blank"
        class="text-primary hover:text-primary/80 text-sm"
      >
--- a/packages/effects/common-ui/src/ui/authentication/login.vue
+++ b/packages/effects/common-ui/src/ui/authentication/login.vue
@@ -18,7 +18,7 @@ import DocLink from './doc-link.vue';
 import ThirdPartyLogin from './third-party-login.vue';

 interface Props extends AuthenticationProps {
-  formSchema: VbenFormSchema[];
+  formSchema?: VbenFormSchema[];
 }

 defineOptions({
--- a/packages/effects/common-ui/src/ui/authentication/register.vue
+++ b/packages/effects/common-ui/src/ui/authentication/register.vue
@@ -14,7 +14,7 @@ import { VbenButton } from '@vben-core/shadcn-ui';
 import Title from './auth-title.vue';

 interface Props {
-  formSchema: VbenFormSchema[];
+  formSchema?: VbenFormSchema[];
  /**
   * @zh_CN 是否处于加载处理状态
   */
--- a/packages/effects/common-ui/src/ui/dashboard/analysis/analysis-charts-tabs.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/analysis/analysis-charts-tabs.vue
@@ -6,7 +6,7 @@ import { computed } from 'vue';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@vben-core/shadcn-ui';

 interface Props {
-  tabs: TabOption[];
+  tabs?: TabOption[];
 }

 defineOptions({
--- a/packages/effects/common-ui/src/ui/dashboard/analysis/analysis-overview.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/analysis/analysis-overview.vue
@@ -12,7 +12,7 @@ import {
 } from '@vben-core/shadcn-ui';

 interface Props {
-  items: AnalysisOverviewItem[];
+  items?: AnalysisOverviewItem[];
 }

 defineOptions({
--- a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-project.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-project.vue
@@ -10,7 +10,7 @@ import {
 } from '@vben-core/shadcn-ui';

 interface Props {
-  items: WorkbenchProjectItem[];
+  items?: WorkbenchProjectItem[];
  title: string;
 }

@@ -37,6 +37,8 @@ defineEmits(['click']);
            'border-r-0': index % 3 === 2,
            'border-b-0': index < 3,
            'pb-4': index > 2,
+            'rounded-bl-xl': index === items.length - 3,
+            'rounded-br-xl': index === items.length - 1,
          }"
          class="border-border group w-full cursor-pointer border-r border-t p-4 transition-all hover:shadow-xl md:w-1/2 lg:w-1/3"
        >
--- a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-quick-nav.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-quick-nav.vue
@@ -10,7 +10,7 @@ import {
 } from '@vben-core/shadcn-ui';

 interface Props {
-  items: WorkbenchQuickNavItem[];
+  items?: WorkbenchQuickNavItem[];
  title: string;
 }

@@ -35,8 +35,10 @@ defineEmits(['click']);
        <div
          :class="{
            'border-r-0': index % 3 === 2,
-            'pb-4': index > 2,
            'border-b-0': index < 3,
+            'pb-4': index > 2,
+            'rounded-bl-xl': index === items.length - 3,
+            'rounded-br-xl': index === items.length - 1,
          }"
          class="flex-col-center border-border group w-1/3 cursor-pointer border-r border-t py-8 hover:shadow-xl"
          @click="$emit('click', item)"
--- a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-todo.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-todo.vue
@@ -10,7 +10,7 @@ import {
 } from '@vben-core/shadcn-ui';

 interface Props {
-  items: WorkbenchTodoItem[];
+  items?: WorkbenchTodoItem[];
  title: string;
 }

--- a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-trends.vue
+++ b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-trends.vue
@@ -10,7 +10,7 @@ import {
 } from '@vben-core/shadcn-ui';

 interface Props {
-  items: WorkbenchTrendItem[];
+  items?: WorkbenchTrendItem[];
  title: string;
 }

--- a/packages/effects/hooks/package.json
+++ b/packages/effects/hooks/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vben/hooks",
-  "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": {
--- a/packages/effects/layouts/package.json
+++ b/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": {
--- a/packages/effects/layouts/src/basic/copyright/copyright.vue
+++ b/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;
 }
--- a/packages/effects/layouts/src/basic/layout.vue
+++ b/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">
--- a/packages/effects/layouts/src/basic/menu/extra-menu.vue
+++ b/packages/effects/layouts/src/basic/menu/extra-menu.vue
@@ -11,7 +11,7 @@ import { useNavigation } from './use-navigation';

 interface Props extends MenuProps {
  collapse?: boolean;
-  menus: MenuRecordRaw[];
+  menus?: MenuRecordRaw[];
 }

 withDefaults(defineProps<Props>(), {
--- a/packages/effects/layouts/src/basic/menu/menu.vue
+++ b/packages/effects/layouts/src/basic/menu/menu.vue
@@ -6,7 +6,7 @@ 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>(), {
--- a/packages/effects/layouts/src/widgets/global-search/global-search.vue
+++ b/packages/effects/layouts/src/widgets/global-search/global-search.vue
@@ -24,7 +24,7 @@ defineOptions({
 });

 const props = withDefaults(
-  defineProps<{ enableShortcutKey?: boolean; menus: MenuRecordRaw[] }>(),
+  defineProps<{ enableShortcutKey?: boolean; menus?: MenuRecordRaw[] }>(),
  {
    enableShortcutKey: true,
    menus: () => [],
--- a/packages/effects/layouts/src/widgets/global-search/search-panel.vue
+++ b/packages/effects/layouts/src/widgets/global-search/search-panel.vue
@@ -18,7 +18,7 @@ defineOptions({
 });

 const props = withDefaults(
-  defineProps<{ keyword: string; menus: MenuRecordRaw[] }>(),
+  defineProps<{ keyword?: string; menus?: MenuRecordRaw[] }>(),
  {
    keyword: '',
    menus: () => [],
--- a/packages/effects/layouts/src/widgets/lock-screen/lock-screen.vue
+++ b/packages/effects/layouts/src/widgets/lock-screen/lock-screen.vue
@@ -3,7 +3,7 @@ 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';
@@ -26,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');
@@ -35,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({
@@ -66,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'));
    }
--- a/packages/effects/layouts/src/widgets/preferences/blocks/checkbox-item.vue
+++ b/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;
--- a/packages/effects/layouts/src/widgets/preferences/blocks/toggle-item.vue
+++ b/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: () => [],
 });
--- a/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue
+++ b/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue
@@ -132,8 +132,8 @@ function toggleTheme(event: MouseEvent) {
  &__sun {
    @apply fill-foreground/90 stroke-none;

-    transition: transform 1.6s cubic-bezier(0.25, 0, 0.2, 1);
    transform-origin: center center;
+    transition: transform 1.6s cubic-bezier(0.25, 0, 0.2, 1);

    &:hover > svg > & {
      @apply fill-foreground/90;
@@ -143,10 +143,10 @@ function toggleTheme(event: MouseEvent) {
  &__sun-beams {
    @apply stroke-foreground/90 stroke-[2px];

+    transform-origin: center center;
    transition:
      transform 1.6s cubic-bezier(0.5, 1.5, 0.75, 1.25),
      opacity 0.6s cubic-bezier(0.25, 0, 0.3, 1);
-    transform-origin: center center;

    &:hover > svg > & {
      @apply stroke-foreground;
--- a/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue
+++ b/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue
@@ -9,7 +9,7 @@ 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';
@@ -82,7 +82,7 @@ const emit = defineEmits<{ logout: [] }>();

 const { globalLockScreenShortcutKey, globalLogoutShortcutKey } =
  usePreferences();
-const lockStore = useLockStore();
+const accessStore = useAccessStore();
 const [LockModal, lockModalApi] = useVbenModal({
  connectedComponent: LockScreenModal,
 });
@@ -133,7 +133,7 @@ function handleOpenLock() {

 function handleSubmitLock(lockScreenPassword: string) {
  lockModalApi.close();
-  lockStore.lockScreen(lockScreenPassword);
+  accessStore.lockScreen(lockScreenPassword);
 }

 function handleLogout() {
--- a/packages/effects/plugins/package.json
+++ b/packages/effects/plugins/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vben/plugins",
-  "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": {
--- a/packages/effects/plugins/src/vxe-table/use-vxe-grid.ts
+++ b/packages/effects/plugins/src/vxe-table/use-vxe-grid.ts
@@ -24,8 +24,8 @@ export function useVbenVxeGrid(options: VxeGridProps) {
      return () => h(VxeGrid, { ...props, ...attrs, api: extendedApi }, slots);
    },
    {
-      inheritAttrs: false,
      name: 'VbenVxeGrid',
+      inheritAttrs: false,
    },
  );
  // Add reactivity support
--- a/packages/effects/request/package.json
+++ b/packages/effects/request/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vben/request",
-  "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": {