From 8d36dd3794758d4c9871f0fe296eeac9595c0e6c Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Wed, 3 Jan 2018 10:33:35 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-6258=20tab=E6=A0=87=E7=AD=BE=E5=8F=B3?=
 =?UTF-8?q?=E5=87=BB=E6=97=B6=E5=8E=9F=E6=9C=AC=E7=9A=84=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=A2=AB=E8=A6=86=E7=9B=96=E4=BA=86=3D>?=
 =?UTF-8?q?=E9=9D=9E=E7=BB=9D=E5=AF=B9=E5=B8=83=E5=B1=80=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=8C=89=E9=92=AE=E7=81=B0=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/designer/creator/XLayoutContainer.java  | 8 ++++++++
 .../com/fr/design/designer/creator/XWAbsoluteLayout.java  | 5 +++++
 .../src/com/fr/design/mainframe/FormDesigner.java         | 8 ++++----
 3 files changed, 17 insertions(+), 4 deletions(-)

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 e4281174b6..4f0476388d 100644
--- a/designer_form/src/com/fr/design/designer/creator/XLayoutContainer.java
+++ b/designer_form/src/com/fr/design/designer/creator/XLayoutContainer.java
@@ -564,4 +564,12 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
         return false;
     }
 
+    /**
+     * 内部组件是否支持叠加顺序的调整
+     * return boolean
+     */
+    public boolean supportInnerOrderChangeActions() {
+        return false;
+    }
+
 }
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java b/designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java
index 58c5f74dda..afaaf2fef0 100644
--- a/designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java
@@ -515,4 +515,9 @@ public class XWAbsoluteLayout extends XLayoutContainer {
             widget.setBounds(xCreator.getBounds());
         }
     }
+
+    @Override
+    public boolean supportInnerOrderChangeActions() {
+        return true;
+    }
 }
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/mainframe/FormDesigner.java b/designer_form/src/com/fr/design/mainframe/FormDesigner.java
index 851a2cdee6..19425b18b2 100644
--- a/designer_form/src/com/fr/design/mainframe/FormDesigner.java
+++ b/designer_form/src/com/fr/design/mainframe/FormDesigner.java
@@ -1139,8 +1139,8 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     // 当前选中控件可以上移一层吗？
     public boolean isCurrentComponentMovableUp() {
         XCreator creator = getSelectionModel().getSelection().getSelectedCreator();
-        Container container = creator.getParent();
-        if (container == null) {
+        XLayoutContainer container = (XLayoutContainer) creator.getParent();
+        if (container == null || !container.supportInnerOrderChangeActions()) {
             return false;
         }
         return creator.isMovable() && container.getComponentZOrder(creator) > 0;
@@ -1149,8 +1149,8 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     // 当前选中控件可以下移一层吗？
     public boolean isCurrentComponentMovableDown() {
         XCreator creator = getSelectionModel().getSelection().getSelectedCreator();
-        Container container = creator.getParent();
-        if (container == null) {
+        XLayoutContainer container = (XLayoutContainer) creator.getParent();
+        if (container == null || !container.supportInnerOrderChangeActions()) {
             return false;
         }
         return creator.isMovable() && container.getComponentZOrder(creator) < container.getComponentCount() - 1;