From caa44c15d3e1979b64fde04816606de608b5fef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AD=90=E6=B6=B5?= <2067519648@qq.com> Date: Fri, 28 Jun 2024 02:46:51 +0000 Subject: [PATCH] =?UTF-8?q?!2848=20=E4=BC=98=E5=8C=96:=20=E5=8F=AA?= =?UTF-8?q?=E8=A6=81=E5=B7=A6=E4=BE=A7=E7=89=B9=E6=80=A7=E6=89=93=E5=BC=80?= =?UTF-8?q?=EF=BC=8C=E6=89=8D=E4=B8=8D=E8=83=BD=E5=8F=8C=E5=87=BB=E7=89=B9?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Editor/DbClick/DbClick.ts | 2 +- src/UI/Store/EntityStore.ts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Editor/DbClick/DbClick.ts b/src/Editor/DbClick/DbClick.ts index d28724c42..3678533be 100644 --- a/src/Editor/DbClick/DbClick.ts +++ b/src/Editor/DbClick/DbClick.ts @@ -321,7 +321,7 @@ export class DbClickManager extends Singleton { let enStore = EntityStore.GetInstance(); //如果打开曲线特性框,后续的双击的图元加入属性框进行设置 - if (enStore.IsWorking) + if (enStore.IsCanShowProperties) return; enStore.AddEntitysToMap([pickEnt]); diff --git a/src/UI/Store/EntityStore.ts b/src/UI/Store/EntityStore.ts index a5fd72c8b..a450eb1f1 100644 --- a/src/UI/Store/EntityStore.ts +++ b/src/UI/Store/EntityStore.ts @@ -68,6 +68,14 @@ export class EntityStore extends Singleton return (DownPanelStore.GetInstance().showType & ToolBarType.properties) > 0 || LayerPropertieStore.isShow; } + /** 是否可以双击实体,显示特性弹窗 */ + get IsCanShowProperties() + { + const store = DownPanelStore.GetInstance(); + // 仅当打开左侧特性面板(图层不算) + return (store.showType & ToolBarType.properties) > 0 && !store.isLayer; + } + GetEntitys() { let ens: Entity[] = [];