|
|
@ -619,8 +619,9 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection |
|
|
|
if (paraComponent != null && paraComponent.acceptType(XWParameterLayout.class)) { |
|
|
|
if (paraComponent != null && paraComponent.acceptType(XWParameterLayout.class)) { |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
if (this.getSelectionModel().getSelection().getSelectedCreator().getParent() != null |
|
|
|
XCreator creator = this.getSelectionModel().getSelection().getSelectedCreator(); |
|
|
|
&& ((XLayoutContainer) this.getSelectionModel().getSelection().getSelectedCreator().getParent()).acceptType(XWAbsoluteLayout.class)) { |
|
|
|
if (creator != null && creator.getParent() != null |
|
|
|
|
|
|
|
&& ((XLayoutContainer) creator.getParent()).acceptType(XWAbsoluteLayout.class)) { |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -1337,6 +1338,9 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection |
|
|
|
// 当前选中控件可以上移一层吗?
|
|
|
|
// 当前选中控件可以上移一层吗?
|
|
|
|
public boolean isCurrentComponentMovableUp() { |
|
|
|
public boolean isCurrentComponentMovableUp() { |
|
|
|
XCreator creator = getSelectionModel().getSelection().getSelectedCreator(); |
|
|
|
XCreator creator = getSelectionModel().getSelection().getSelectedCreator(); |
|
|
|
|
|
|
|
if (null == creator) { |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
XLayoutContainer container = (XLayoutContainer) creator.getParent(); |
|
|
|
XLayoutContainer container = (XLayoutContainer) creator.getParent(); |
|
|
|
if (container == null || !container.supportInnerOrderChangeActions()) { |
|
|
|
if (container == null || !container.supportInnerOrderChangeActions()) { |
|
|
|
return false; |
|
|
|
return false; |
|
|
@ -1347,6 +1351,9 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection |
|
|
|
// 当前选中控件可以下移一层吗?
|
|
|
|
// 当前选中控件可以下移一层吗?
|
|
|
|
public boolean isCurrentComponentMovableDown() { |
|
|
|
public boolean isCurrentComponentMovableDown() { |
|
|
|
XCreator creator = getSelectionModel().getSelection().getSelectedCreator(); |
|
|
|
XCreator creator = getSelectionModel().getSelection().getSelectedCreator(); |
|
|
|
|
|
|
|
if (null == creator) { |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
XLayoutContainer container = (XLayoutContainer) creator.getParent(); |
|
|
|
XLayoutContainer container = (XLayoutContainer) creator.getParent(); |
|
|
|
if (container == null || !container.supportInnerOrderChangeActions()) { |
|
|
|
if (container == null || !container.supportInnerOrderChangeActions()) { |
|
|
|
return false; |
|
|
|
return false; |
|
|
|