Browse Source

Pull request #5252: REPORT-56080 图表双击无法进入图表编辑页

Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0

* commit '4dfa89b1371429d79f7a7d26e06bc185fcb0c811':
  REPORT-56080 图表双击无法进入图表编辑页
feature/10.0
Tommy 3 years ago
parent
commit
6f6d1959ac
  1. 5
      designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java

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

@ -85,13 +85,14 @@ public class SelectionModel {
if (e.getButton() == MouseEvent.BUTTON3 || (!InputEventBaseOnOS.isControlDown(e) && !e.isShiftDown())) {
// 如果Ctrl或者Shift键盘没有按下,则清除已经选择的组件
XCreator selectXCreator = selection.getSelectedCreator();
if (selectXCreator != null && comp != null) {
boolean clickOnce = e.getClickCount() == 1;
boolean hasCom = selectXCreator != null && comp != null;
if (clickOnce && hasCom) {
if (StringUtils.equals(selectXCreator.toData().getWidgetName(), comp.toData().getWidgetName())) {
return;
}
}
selection.reset();
} else {
//按下Ctrl或者shift键时鼠标可以进行多选,两次点击同一控件就取消选中
XLayoutContainer topLayout = XCreatorUtils.getHotspotContainer(comp).getTopLayout();

Loading…
Cancel
Save