From 707b3914498d16975e2bc140e8caf265e976f35f Mon Sep 17 00:00:00 2001
From: zouawen <846027729@qq.com>
Date: Thu, 26 Feb 2026 10:09:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=AE=BD?=
=?UTF-8?q?=E5=BA=A6=E6=8B=96=E6=8B=BD=E6=94=B9=E4=B8=BAcomposable?=
=?UTF-8?q?=E5=AE=9E=E7=8E=B0=EF=BC=8C=E5=90=8C=E6=97=B6=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?tabbar.ts=E6=96=87=E4=BB=B6lint=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/@core/composables/src/index.ts | 1 +
.../@core/composables/src/use-resizable.ts | 72 +++++++++++++++++++
.../src/components/layout-sidebar.vue | 36 ++++------
.../ui-kit/layout-ui/src/vben-layout.vue | 6 +-
packages/stores/src/modules/tabbar.ts | 58 +++++++++++----
5 files changed, 129 insertions(+), 44 deletions(-)
create mode 100644 packages/@core/composables/src/use-resizable.ts
diff --git a/packages/@core/composables/src/index.ts b/packages/@core/composables/src/index.ts
index 2dbd4b80..2f6826f2 100644
--- a/packages/@core/composables/src/index.ts
+++ b/packages/@core/composables/src/index.ts
@@ -2,6 +2,7 @@ export * from './use-is-mobile';
export * from './use-layout-style';
export * from './use-namespace';
export * from './use-priority-value';
+export * from './use-resizable';
export * from './use-scroll-lock';
export * from './use-simple-locale';
export * from './use-sortable';
diff --git a/packages/@core/composables/src/use-resizable.ts b/packages/@core/composables/src/use-resizable.ts
new file mode 100644
index 00000000..eeda2df9
--- /dev/null
+++ b/packages/@core/composables/src/use-resizable.ts
@@ -0,0 +1,72 @@
+import { onUnmounted, ref } from 'vue';
+
+interface ResizableOptions {
+ max?: number;
+ min?: number;
+ onChange?: (newWidth: number) => void;
+}
+
+export function useResizable(options: ResizableOptions = {}) {
+ const { min = 0, max = 999, onChange } = options;
+
+ const isDragging = ref(false);
+
+ let cleanup: (() => void) | null = null;
+
+ let userSelect = '';
+ let cursor = '';
+
+ const startDrag = (e: MouseEvent, width: number) => {
+ e.preventDefault();
+ e.stopPropagation();
+
+ isDragging.value = true;
+ const startX = e.clientX;
+ const startWidth = width;
+
+ userSelect = document.body.style.userSelect;
+ cursor = document.body.style.cursor;
+
+ document.body.style.userSelect = 'none';
+ document.body.style.cursor = 'col-resize';
+
+ const onMouseMove = (moveEvent: MouseEvent) => {
+ if (!isDragging.value) return;
+
+ const deltaX = moveEvent.clientX - startX;
+ let newWidth = startWidth + deltaX;
+
+ newWidth = Math.min(max, Math.max(min, newWidth));
+
+ onChange?.(newWidth);
+ };
+
+ const onMouseUp = () => {
+ if (!isDragging.value) return;
+ cleanup?.();
+ };
+
+ document.addEventListener('mousemove', onMouseMove, { passive: true });
+ document.addEventListener('mouseup', onMouseUp);
+
+ cleanup = () => {
+ document.removeEventListener('mousemove', onMouseMove);
+ document.removeEventListener('mouseup', onMouseUp);
+
+ document.body.style.userSelect = userSelect;
+ document.body.style.cursor = cursor;
+
+ isDragging.value = false;
+ cleanup = null;
+ };
+ };
+
+ onUnmounted(() => {
+ cleanup?.();
+ });
+
+ return {
+ isDragging,
+ startDrag,
+ };
+}
diff --git a/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue b/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
index dddb282b..c3930ac9 100644
--- a/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
+++ b/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
@@ -1,8 +1,9 @@
diff --git a/packages/@core/ui-kit/layout-ui/src/vben-layout.vue b/packages/@core/ui-kit/layout-ui/src/vben-layout.vue
index b5cb1b32..92363e61 100644
--- a/packages/@core/ui-kit/layout-ui/src/vben-layout.vue
+++ b/packages/@core/ui-kit/layout-ui/src/vben-layout.vue
@@ -484,10 +484,6 @@ function handleHeaderToggle() {
}
const idMainContent = ELEMENT_ID_MAIN_CONTENT;
-
-function handleUpdateSidebarWidth(val: number) {
- emit('update:sidebar-width', val);
-}
@@ -515,7 +511,7 @@ function handleUpdateSidebarWidth(val: number) {
:width="getSidebarWidth"
:z-index="sidebarZIndex"
@leave="() => emit('sideMouseLeave')"
- @update:width="handleUpdateSidebarWidth"
+ @update:width="(val) => emit('update:sidebar-width', val)"
>
diff --git a/packages/stores/src/modules/tabbar.ts b/packages/stores/src/modules/tabbar.ts
index 8d18d442..66a3758b 100644
--- a/packages/stores/src/modules/tabbar.ts
+++ b/packages/stores/src/modules/tabbar.ts
@@ -1,5 +1,9 @@
import type { ComputedRef } from 'vue';
-import type { RouteLocationNormalized, Router, RouteRecordNormalized } from 'vue-router';
+import type {
+ RouteLocationNormalized,
+ Router,
+ RouteRecordNormalized,
+} from 'vue-router';
import type { TabDefinition } from '@vben-core/typings';
@@ -66,7 +70,9 @@ export const useTabbarStore = defineStore('core-tabbar', {
*/
async _bulkCloseByKeys(keys: string[]) {
const keySet = new Set(keys);
- this.tabs = this.tabs.filter((item) => !keySet.has(getTabKeyFromTab(item)));
+ this.tabs = this.tabs.filter(
+ (item) => !keySet.has(getTabKeyFromTab(item)),
+ );
if (isVisitHistory()) {
this.visitHistory.remove(...keys);
}
@@ -130,20 +136,25 @@ export const useTabbarStore = defineStore('core-tabbar', {
if (tabIndex === -1) {
const maxCount = preferences.tabbar.maxCount;
// 获取动态路由打开数,超过 0 即代表需要控制打开数
- const maxNumOfOpenTab = (routeTab?.meta?.maxNumOfOpenTab ?? -1) as number;
+ const maxNumOfOpenTab = (routeTab?.meta?.maxNumOfOpenTab ??
+ -1) as number;
// 如果动态路由层级大于 0 了,那么就要限制该路由的打开数限制了
// 获取到已经打开的动态路由数, 判断是否大于某一个值
if (
maxNumOfOpenTab > 0 &&
- this.tabs.filter((tab) => tab.name === routeTab.name).length >= maxNumOfOpenTab
+ this.tabs.filter((tab) => tab.name === routeTab.name).length >=
+ maxNumOfOpenTab
) {
// 关闭第一个
- const index = this.tabs.findIndex((item) => item.name === routeTab.name);
+ const index = this.tabs.findIndex(
+ (item) => item.name === routeTab.name,
+ );
index !== -1 && this.tabs.splice(index, 1);
} else if (maxCount > 0 && this.tabs.length >= maxCount) {
// 关闭第一个
const index = this.tabs.findIndex(
- (item) => !Reflect.has(item.meta, 'affixTab') || !item.meta.affixTab
+ (item) =>
+ !Reflect.has(item.meta, 'affixTab') || !item.meta.affixTab,
);
index !== -1 && this.tabs.splice(index, 1);
}
@@ -183,7 +194,9 @@ export const useTabbarStore = defineStore('core-tabbar', {
this.tabs = newTabs.length > 0 ? newTabs : [...this.tabs].splice(0, 1);
// 设置访问历史记录
if (isVisitHistory()) {
- this.visitHistory.retain(this.tabs.map((item) => getTabKeyFromTab(item)));
+ this.visitHistory.retain(
+ this.tabs.map((item) => getTabKeyFromTab(item)),
+ );
}
await this._goToDefaultTab(router);
this.updateCacheTabs();
@@ -220,7 +233,9 @@ export const useTabbarStore = defineStore('core-tabbar', {
for (const key of closeKeys) {
if (key !== getTabKeyFromTab(tab)) {
- const closeTab = this.tabs.find((item) => getTabKeyFromTab(item) === key);
+ const closeTab = this.tabs.find(
+ (item) => getTabKeyFromTab(item) === key,
+ );
if (!closeTab) {
continue;
}
@@ -290,12 +305,14 @@ export const useTabbarStore = defineStore('core-tabbar', {
break;
}
}
- await (previousTab ? this._goToTab(previousTab, router) : this._goToDefaultTab(router));
+ await (previousTab
+ ? this._goToTab(previousTab, router)
+ : this._goToDefaultTab(router));
return;
}
// 未开启访问历史记录,直接跳转下一个或上一个tab
const index = this.getTabs.findIndex(
- (item) => getTabKeyFromTab(item) === getTabKey(currentRoute.value)
+ (item) => getTabKeyFromTab(item) === getTabKey(currentRoute.value),
);
const before = this.getTabs[index - 1];
@@ -319,7 +336,9 @@ export const useTabbarStore = defineStore('core-tabbar', {
*/
async closeTabByKey(key: string, router: Router) {
const originKey = decodeURIComponent(key);
- const index = this.tabs.findIndex((item) => getTabKeyFromTab(item) === originKey);
+ const index = this.tabs.findIndex(
+ (item) => getTabKeyFromTab(item) === originKey,
+ );
if (index === -1) {
return;
}
@@ -335,7 +354,9 @@ export const useTabbarStore = defineStore('core-tabbar', {
* @param key
*/
getTabByKey(key: string) {
- return this.getTabs.find((item) => getTabKeyFromTab(item) === key) as TabDefinition;
+ return this.getTabs.find(
+ (item) => getTabKeyFromTab(item) === key,
+ ) as TabDefinition;
},
/**
* @zh_CN 新窗口打开标签页
@@ -656,14 +677,21 @@ function isTabShown(tab: TabDefinition) {
* @param tab
*/
function getTabKey(tab: RouteLocationNormalized | RouteRecordNormalized) {
- const { fullPath, path, meta: { fullPathKey } = {}, query = {} } = tab as RouteLocationNormalized;
+ const {
+ fullPath,
+ path,
+ meta: { fullPathKey } = {},
+ query = {},
+ } = tab as RouteLocationNormalized;
// pageKey可能是数组(查询参数重复时可能出现)
- const pageKey = Array.isArray(query.pageKey) ? query.pageKey[0] : query.pageKey;
+ const pageKey = Array.isArray(query.pageKey)
+ ? query.pageKey[0]
+ : query.pageKey;
let rawKey;
if (pageKey) {
rawKey = pageKey;
} else {
- rawKey = fullPathKey === false ? path : fullPath ?? path;
+ rawKey = fullPathKey === false ? path : (fullPath ?? path);
}
try {
return decodeURIComponent(rawKey);