From 597eed5d8a89967bf7b3fb2201c76b704d34e942 Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 30 Dec 2021 17:58:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-65107=20=E5=86=B3=E7=AD=96=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8-11frm=EF=BC=8C=E6=97=A0=E6=B3=95=E5=90=91tab=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E6=96=B9=E6=8B=96=E5=85=A5=E6=94=BE=E7=BD=AE?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C10=E4=B8=8A=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=BF=98=E6=AF=94=E8=BE=83=E9=A1=BA=E7=95=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/mainframe/FormCreatorDropTarget.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java b/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java index 5eb354c6cb..102c5c863a 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java @@ -90,9 +90,6 @@ public class FormCreatorDropTarget extends DropTarget { XLayoutContainer container = XCreatorUtils.getHotspotContainer(hoveredComponent); boolean success = false; if (container != null) { - //XWCardTagLayout 切换添加状态到普通状态 - container.stopAddingState(designer); - // 如果是容器，则调用其acceptComponent接受组件 AddingModel model = designer.getAddingModel(); From 0a3552adae241de1054855699a0a027d865b2b59 Mon Sep 17 00:00:00 2001 From: kerry Date: Tue, 4 Jan 2022 09:17:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/designer/creator/XLayoutContainer.java | 8 -------- .../creator/cardlayout/XWCardMainBorderLayout.java | 12 ------------ .../creator/cardlayout/XWCardTagLayout.java | 9 --------- .../creator/cardlayout/XWCardTitleLayout.java | 13 +------------ 4 files changed, 1 insertion(+), 41 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java b/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java index 01d09fe4cc..3d0b24847b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java @@ -474,14 +474,6 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme return 0; } - /** - * 切换到非添加状态 - * - * @param designer 表单设计器 - */ - public void stopAddingState(FormDesigner designer) { - } - /** * 寻找最近的为自适应布局的父容器 * diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java index fdc01be1e9..e09b31fb09 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java @@ -179,18 +179,6 @@ public class XWCardMainBorderLayout extends XWBorderLayout { } } - /** - * 切换到非添加状态 - * - * @return designer 表单设计器 - */ - @Override - public void stopAddingState(FormDesigner designer){ - designer.stopAddingState(); - return; - } - - /** * 添加card区域 * diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java index ceb334028a..850378af21 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java @@ -187,15 +187,6 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout { return DEFAULT_NAME; } - /** - * 切换到非添加状态 - * - * @return designer 表单设计器 - */ - @Override - public void stopAddingState(FormDesigner designer) { - designer.stopAddingState(); - } //新增时去tabFitLayout名字中最大的Index+1，防止重名 private int getTabNameIndex() { diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTitleLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTitleLayout.java index 7cdca0a0bc..9695eee18a 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTitleLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTitleLayout.java @@ -166,18 +166,7 @@ public class XWCardTitleLayout extends XWBorderLayout { XWCardTagLayout xwCardTagLayout = (XWCardTagLayout) this.getComponent(0); this.addTagPart(xwCardTagLayout); } - - /** - * 切换到非添加状态 - * - * @return designer 表单设计器 - */ - @Override - public void stopAddingState(FormDesigner designer){ - designer.stopAddingState(); - return; - } - + /** * 该布局隐藏，无需对边框进行操作 * @param border 边框