Browse Source

Pull request #3210: REPORT-45775 决策报表参数面板控件可以复制到另一个参数面板--来源【客户需求 510651】

Merge in DESIGN/design from ~HADES/design:REPORT-45775 to bugfix/10.0

* commit '0d600b351a06f6dbc4d8e3ca9a9f8b4799abafff':
  REPORT-45775 决策报表参数面板控件可以复制到另一个参数面板--来源【客户需求 510651】
bugfix/10.0
ju|剧浩宇 4 years ago
parent
commit
68130801df
  1. 4
      designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java

4
designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java

@ -397,8 +397,10 @@ public class SelectionModel {
boolean absoluteCanvas = selectionXCreator.getClass().equals(XWAbsoluteLayout.class); boolean absoluteCanvas = selectionXCreator.getClass().equals(XWAbsoluteLayout.class);
//选中的是否是相对布局编辑器本身 //选中的是否是相对布局编辑器本身
boolean relativeEditor = selectionXCreator.getClass().equals(XWFitLayout.class); boolean relativeEditor = selectionXCreator.getClass().equals(XWFitLayout.class);
//选中的参数面板编辑器本身
boolean parameterEditor = selectionXCreator.getClass().equals(XWParameterLayout.class);
return !(tabEditor || absoluteEditor || absoluteCanvas || relativeEditor); return !(tabEditor || absoluteEditor || absoluteCanvas || relativeEditor || parameterEditor);
} else { } else {
return false; return false;
} }

Loading…
Cancel
Save