From affdeb43a6274d064a3154eb74b79de670e5c0dc Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 4 Jun 2018 13:38:24 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-6277=20&=20REPORT-6276=20=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E5=B8=83=E5=B1=80=E4=B8=8B=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4=E4=BA=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E4=BD=8D=E7=BD=AE=E5=90=8E=EF=BC=8Cweb?= =?UTF-8?q?=E7=AB=AF=E9=A2=84=E8=A7=88=E6=B2=A1=E6=9C=89=E7=9B=B8=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E5=8F=98=E5=8C=96=EF=BC=9Bcpt=E9=87=8C=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E5=85=83=E7=B4=A0=E7=9A=84=E4=BD=8D=E7=BD=AE=E7=94=A8?= =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E9=94=AE=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=EF=BC=88=E6=9A=82=E6=97=B6=E9=9A=90=E5=8E=BB=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E9=94=AE=EF=BC=89?= 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 | 5 +++-- .../com/fr/design/designer/creator/XLayoutContainer.java | 8 ++++++++ .../src/com/fr/design/actions/edit/DeleteAction.java | 2 +- .../edit/order/BringFloatElementForwardAction.java | 2 +- .../edit/order/BringFloatElementToFrontAction.java | 2 +- .../edit/order/SendFloatElementBackwardAction.java | 2 +- .../actions/edit/order/SendFloatElementToBackAction.java | 2 +- 10 files changed, 25 insertions(+), 13 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 95cde265d..ce57343c2 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 9fc69953b..5a6980525 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 47be1b9f2..0995df3ca 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 512b075d9..94852b5d8 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,13 @@ 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 28427b9af..62ae1e215 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位置替换新的控件 * diff --git a/designer-realize/src/com/fr/design/actions/edit/DeleteAction.java b/designer-realize/src/com/fr/design/actions/edit/DeleteAction.java index 60e113e9a..cbd4f11b6 100644 --- a/designer-realize/src/com/fr/design/actions/edit/DeleteAction.java +++ b/designer-realize/src/com/fr/design/actions/edit/DeleteAction.java @@ -25,7 +25,7 @@ public class DeleteAction extends ElementCaseAction { this.setMnemonic('D'); //Richie:删除菜单图标 this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/delete.png")); - this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0)); +// this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0)); } @Override diff --git a/designer-realize/src/com/fr/design/actions/edit/order/BringFloatElementForwardAction.java b/designer-realize/src/com/fr/design/actions/edit/order/BringFloatElementForwardAction.java index 42e79433d..3a1557ffe 100644 --- a/designer-realize/src/com/fr/design/actions/edit/order/BringFloatElementForwardAction.java +++ b/designer-realize/src/com/fr/design/actions/edit/order/BringFloatElementForwardAction.java @@ -27,7 +27,7 @@ public class BringFloatElementForwardAction extends AbstractFloatElementOrderAct this.setName(Inter.getLocText("M_Edit-Bring_Forward")); this.setMnemonic('F'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/up.png")); - this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER)); +// this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER)); } @Override diff --git a/designer-realize/src/com/fr/design/actions/edit/order/BringFloatElementToFrontAction.java b/designer-realize/src/com/fr/design/actions/edit/order/BringFloatElementToFrontAction.java index f689fb4bf..30446485d 100644 --- a/designer-realize/src/com/fr/design/actions/edit/order/BringFloatElementToFrontAction.java +++ b/designer-realize/src/com/fr/design/actions/edit/order/BringFloatElementToFrontAction.java @@ -28,7 +28,7 @@ public class BringFloatElementToFrontAction extends AbstractFloatElementOrderAct this.setName(Inter.getLocText("M_Edit-Bring_to_Front")); this.setMnemonic('T'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_top.png")); - this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER + InputEvent.ALT_MASK)); +// this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER + InputEvent.ALT_MASK)); } @Override diff --git a/designer-realize/src/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java b/designer-realize/src/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java index 79953c8a0..a5e6ceb6a 100644 --- a/designer-realize/src/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java +++ b/designer-realize/src/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java @@ -27,7 +27,7 @@ public class SendFloatElementBackwardAction extends AbstractFloatElementOrderAct this.setName(Inter.getLocText("M_Edit-Send_Backward")); this.setMnemonic('B'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/down.png")); - this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER)); +// this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER)); } @Override diff --git a/designer-realize/src/com/fr/design/actions/edit/order/SendFloatElementToBackAction.java b/designer-realize/src/com/fr/design/actions/edit/order/SendFloatElementToBackAction.java index c4158642c..1ccd3788c 100644 --- a/designer-realize/src/com/fr/design/actions/edit/order/SendFloatElementToBackAction.java +++ b/designer-realize/src/com/fr/design/actions/edit/order/SendFloatElementToBackAction.java @@ -28,7 +28,7 @@ public class SendFloatElementToBackAction extends AbstractFloatElementOrderActio this.setName(Inter.getLocText("M_Edit-Send_to_Back")); this.setMnemonic('K'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_bottom.png")); - this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER + InputEvent.ALT_MASK)); +// this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER + InputEvent.ALT_MASK)); } @Override