Browse Source

Pull request #2467: REPORT-40606 【回归测试】表单模板如果未选择组件进行多次拖动,再切换模板就不行了,报错

Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0

* commit '84dc75af2cb0fedd3c8d0395a4764e351a87c5ce':
  REPORT-40606 【回归测试】表单模板如果未选择组件进行多次拖动,再切换模板就不行了,报错
  REPORT-40606 【回归测试】表单模板如果未选择组件进行多次拖动,再切换模板就不行了,报错
  REPORT-40606 【回归测试】表单模板如果未选择组件进行多次拖动,再切换模板就不行了,报错
feature/big-screen
pengda 4 years ago
parent
commit
fe731b6a30
  1. 11
      designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

11
designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

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

Loading…
Cancel
Save