From 303e5d513f795986617c4166e8b4197fdf0b2a9f Mon Sep 17 00:00:00 2001 From: xudan Date: Fri, 24 Oct 2025 13:39:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(storage-menu):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E8=8F=9C=E5=8D=95=E9=A1=B9=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A1=AE=E4=BF=9D=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81=E5=8A=A8=E6=80=81=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/context-menu/storage-menu.vue | 32 +++++++++---------- .../context-menu/menu-config.service.ts | 30 +++-------------- src/services/storage-location.service.ts | 12 ++++--- 3 files changed, 28 insertions(+), 46 deletions(-) diff --git a/src/components/context-menu/storage-menu.vue b/src/components/context-menu/storage-menu.vue index e6a77ea..f53a95b 100644 --- a/src/components/context-menu/storage-menu.vue +++ b/src/components/context-menu/storage-menu.vue @@ -51,36 +51,36 @@
{{ selectedLocation.name }} - 操作
-
- 📦 +
占用
-
- 📤 +
释放
-
- 🔒 +
锁定
-
- 🔓 +
解锁
-
- ✅ +
启用
-
- ❌ +
禁用
-
- 📋 +
设为空托盘
-
- 🗑️ +
清除空托盘
diff --git a/src/services/context-menu/menu-config.service.ts b/src/services/context-menu/menu-config.service.ts index 2610dae..e722359 100644 --- a/src/services/context-menu/menu-config.service.ts +++ b/src/services/context-menu/menu-config.service.ts @@ -66,8 +66,10 @@ export function getMenuConfig( } case 'area': - // 区域类型 - return getAreaMenuConfig(data); + // 区域类型 - 根据要求，不显示菜单 + return { + menuType: 'default' as const, + }; default: // 对于默认情况，我们不希望显示任何菜单， @@ -78,30 +80,6 @@ export function getMenuConfig( } } -/** - * 获取区域菜单配置 - * @param data 事件数据 - * @returns 区域菜单配置 - */ -function getAreaMenuConfig(data: ParsedEventData): AreaMenuConfig { - console.log(`处理区域类型，区域ID: ${data.id}`); - - if (data.id && data.name) { - return { - menuType: 'area' as const, - areaInfo: { - id: data.id, - name: data.name, - type: '区域', - }, - }; - } - - return { - menuType: 'default' as const, - }; -} - /** * 处理右键菜单的核心逻辑 - 统一处理函数 * @param parsedData 解析后的事件数据 diff --git a/src/services/storage-location.service.ts b/src/services/storage-location.service.ts index 68349b6..d6d21f8 100644 --- a/src/services/storage-location.service.ts +++ b/src/services/storage-location.service.ts @@ -99,8 +99,8 @@ const DEFAULT_STORAGE_CONFIG: StorageLocationConfig = { }, }; -// 提供给绘制层快速查询的全局状态映射：pointId -> (layerName -> { occupied, locked, disabled }) -export type StorageState = { occupied?: boolean; locked?: boolean; disabled?: boolean }; +// 提供给绘制层快速查询的全局状态映射：pointId -> (layerName -> { occupied, locked, disabled, isEmptyTray }) +export type StorageState = { occupied?: boolean; locked?: boolean; disabled?: boolean; isEmptyTray?: boolean }; export const storageStateMap = reactive(new Map>()); /** @@ -310,7 +310,8 @@ export class StorageLocationService { !currentLocation || currentLocation.is_occupied !== newLocation.is_occupied || currentLocation.is_locked !== newLocation.is_locked || - currentLocation.is_disabled !== newLocation.is_disabled + currentLocation.is_disabled !== newLocation.is_disabled || + currentLocation.is_empty_tray !== newLocation.is_empty_tray ) { return true; } @@ -344,7 +345,8 @@ export class StorageLocationService { !currentLocation || currentLocation.is_occupied !== newLocation.is_occupied || currentLocation.is_locked !== newLocation.is_locked || - currentLocation.is_disabled !== newLocation.is_disabled + currentLocation.is_disabled !== newLocation.is_disabled || + currentLocation.is_empty_tray !== newLocation.is_empty_tray ) { changedPointIds.add(pointId); break; @@ -397,6 +399,7 @@ export class StorageLocationService { occupied: loc.is_occupied, locked: loc.is_locked, disabled: loc.is_disabled, + isEmptyTray: loc.is_empty_tray, }); }); storageStateMap.set(pointId, inner); @@ -448,6 +451,7 @@ export class StorageLocationService { occupied: new_status.is_occupied, locked: new_status.is_locked, disabled: new_status.is_disabled, + isEmptyTray: new_status.is_empty_tray, }); storageStateMap.set(pointId, inner);