diff --git a/docs/src/components/common-ui/vben-form.md b/docs/src/components/common-ui/vben-form.md index 0193e070..ecaae6f8 100644 --- a/docs/src/components/common-ui/vben-form.md +++ b/docs/src/components/common-ui/vben-form.md @@ -347,7 +347,7 @@ export interface ActionButtonOptions { /** 是否显示 */ show?: boolean; /** 按钮文本 */ - text?: string; + content?: string; /** 任意属性 */ [key: string]: any; } diff --git a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap index 486bf048..d537d22e 100644 --- a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap +++ b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap @@ -80,6 +80,7 @@ exports[`defaultPreferences immutability test > should not modify the config obj "enable": true, "height": 38, "keepAlive": true, + "maxCount": 0, "middleClickToClose": false, "persist": true, "showIcon": true, diff --git a/packages/@core/preferences/src/config.ts b/packages/@core/preferences/src/config.ts index df6d69ca..27932910 100644 --- a/packages/@core/preferences/src/config.ts +++ b/packages/@core/preferences/src/config.ts @@ -80,6 +80,7 @@ const defaultPreferences: Preferences = { enable: true, height: 38, keepAlive: true, + maxCount: 0, middleClickToClose: false, persist: true, showIcon: true, diff --git a/packages/@core/preferences/src/types.ts b/packages/@core/preferences/src/types.ts index b554b219..9c7e87bc 100644 --- a/packages/@core/preferences/src/types.ts +++ b/packages/@core/preferences/src/types.ts @@ -168,6 +168,8 @@ interface TabbarPreferences { height: number; /** 开启标签页缓存功能 */ keepAlive: boolean; + /** 限制最大数量 */ + maxCount: number; /** 是否点击中键时关闭标签 */ middleClickToClose: boolean; /** 是否持久化标签 */ diff --git a/packages/effects/layouts/src/widgets/preferences/blocks/layout/tabbar.vue b/packages/effects/layouts/src/widgets/preferences/blocks/layout/tabbar.vue index 4c116e5a..ea533dad 100644 --- a/packages/effects/layouts/src/widgets/preferences/blocks/layout/tabbar.vue +++ b/packages/effects/layouts/src/widgets/preferences/blocks/layout/tabbar.vue @@ -5,6 +5,7 @@ import { computed } from 'vue'; import { $t } from '@vben/locales'; +import NumberFieldItem from '../number-field-item.vue'; import SelectItem from '../select-item.vue'; import SwitchItem from '../switch-item.vue'; @@ -22,6 +23,7 @@ const tabbarWheelable = defineModel('tabbarWheelable'); const tabbarStyleType = defineModel('tabbarStyleType'); const tabbarShowMore = defineModel('tabbarShowMore'); const tabbarShowMaximize = defineModel('tabbarShowMaximize'); +const tabbarMaxCount = defineModel('tabbarMaxCount'); const tabbarMiddleClickToClose = defineModel( 'tabbarMiddleClickToClose', ); @@ -54,6 +56,16 @@ const styleItems = computed((): SelectOption[] => [ {{ $t('preferences.tabbar.persist') }} + + {{ $t('preferences.tabbar.maxCount') }} + {{ $t('preferences.tabbar.draggable') }} diff --git a/packages/effects/layouts/src/widgets/preferences/blocks/number-field-item.vue b/packages/effects/layouts/src/widgets/preferences/blocks/number-field-item.vue index 6f39f4f9..3878f812 100644 --- a/packages/effects/layouts/src/widgets/preferences/blocks/number-field-item.vue +++ b/packages/effects/layouts/src/widgets/preferences/blocks/number-field-item.vue @@ -1,7 +1,10 @@