From 3f828e7094a0e7fbdc088e39959c658dc61595cd Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 2 Jan 2018 13:53:18 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-6277=20=E7=BB=9D=E5=AF=B9=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E4=B8=8B=E8=AE=BE=E8=AE=A1=E5=99=A8=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E7=BB=84=E4=BB=B6=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=90=8E=EF=BC=8Cweb=E7=AB=AF=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=B2=A1=E6=9C=89=E7=9B=B8=E5=BA=94=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/designer/beans/actions/MoveDownAction.java | 5 +++-- .../design/designer/beans/actions/MoveToBottomAction.java | 5 +++-- .../fr/design/designer/beans/actions/MoveToTopAction.java | 5 +++-- .../fr/design/designer/beans/actions/MoveUpAction.java | 6 ++++-- .../com/fr/design/designer/creator/XLayoutContainer.java | 8 ++++++++ 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/beans/actions/MoveDownAction.java b/designer_form/src/com/fr/design/designer/beans/actions/MoveDownAction.java index 95cde265df..ce57343c29 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/MoveDownAction.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/MoveDownAction.java @@ -3,6 +3,7 @@ package com.fr.design.designer.beans.actions; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; import com.fr.general.Inter; @@ -37,13 +38,13 @@ public class MoveDownAction extends FormEditAction { } FormSelection selection = designer.getSelectionModel().getSelection(); XCreator creator = selection.getSelectedCreator(); - Container container = creator.getParent(); + XLayoutContainer container = (XLayoutContainer) creator.getParent(); int targetIndex = container.getComponentZOrder(creator) + 1; if (targetIndex >= container.getComponentCount()) { return false; } container.setComponentZOrder(creator, targetIndex); - designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_DELETED); + designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } diff --git a/designer_form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java b/designer_form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java index 9fc69953b8..5a69805253 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java @@ -3,6 +3,7 @@ package com.fr.design.designer.beans.actions; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; import com.fr.general.Inter; @@ -37,13 +38,13 @@ public class MoveToBottomAction extends FormEditAction { } FormSelection selection = designer.getSelectionModel().getSelection(); XCreator creator = selection.getSelectedCreator(); - Container container = creator.getParent(); + XLayoutContainer container = (XLayoutContainer) creator.getParent(); int targetIndex = container.getComponentCount() - 1; if (container.getComponentZOrder(creator) >= targetIndex) { return false; } container.setComponentZOrder(creator, targetIndex); - designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_DELETED); + designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } diff --git a/designer_form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java b/designer_form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java index 47be1b9f2a..0995df3ca1 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java @@ -3,6 +3,7 @@ package com.fr.design.designer.beans.actions; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; import com.fr.general.Inter; @@ -37,12 +38,12 @@ public class MoveToTopAction extends FormEditAction { } FormSelection selection = designer.getSelectionModel().getSelection(); XCreator creator = selection.getSelectedCreator(); - Container container = creator.getParent(); + XLayoutContainer container = (XLayoutContainer) creator.getParent(); if (container.getComponentZOrder(creator) == 0) { return false; } container.setComponentZOrder(creator, 0); - designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_DELETED); + designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } diff --git a/designer_form/src/com/fr/design/designer/beans/actions/MoveUpAction.java b/designer_form/src/com/fr/design/designer/beans/actions/MoveUpAction.java index 512b075d9b..654b39d695 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/MoveUpAction.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/MoveUpAction.java @@ -3,6 +3,7 @@ package com.fr.design.designer.beans.actions; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; import com.fr.general.Inter; @@ -36,13 +37,14 @@ public class MoveUpAction extends FormEditAction { } FormSelection selection = designer.getSelectionModel().getSelection(); XCreator creator = selection.getSelectedCreator(); - Container container = creator.getParent(); + XLayoutContainer container = (XLayoutContainer) creator.getParent(); int targetIndex = container.getComponentZOrder(creator) - 1; if (targetIndex < 0) { return false; } container.setComponentZOrder(creator, targetIndex); - designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_DELETED); + + designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } diff --git a/designer_form/src/com/fr/design/designer/creator/XLayoutContainer.java b/designer_form/src/com/fr/design/designer/creator/XLayoutContainer.java index 28427b9afb..62ae1e2155 100644 --- a/designer_form/src/com/fr/design/designer/creator/XLayoutContainer.java +++ b/designer_form/src/com/fr/design/designer/creator/XLayoutContainer.java @@ -126,6 +126,14 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme return this; } + public void setComponentZOrder(XCreator creator, int targetIndex) { + super.setComponentZOrder(creator, targetIndex); // 设计器界面上更改 + // 以下是数据层更改，会反映到 web 端 + WLayout layout = this.toData(); + String widgetName = creator.toData().getWidgetName(); + layout.setWidgetIndex(layout.getWidget(widgetName), targetIndex); + } + /** * 当前组件zorder位置替换新的控件 *