Browse Source

Merge branch 'release/10.0' into release/11.0

* release/10.0:
  REPORT-62275 tab高度弹窗撤销问题

# Conflicts:
#	designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java
bugfix/11.0
方磊 3 years ago
parent
commit
a02ea7988e
  1. 1
      designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java

1
designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java

@ -147,6 +147,7 @@ public class FormCreatorDropTarget extends DropTarget {
if (!addingModel.isAddedIllegal()) { if (!addingModel.isAddedIllegal()) {
designer.getEditListenerTable().fireCreatorModified(addingModel.getXCreator(), DesignerEvent.CREATOR_ADDED); designer.getEditListenerTable().fireCreatorModified(addingModel.getXCreator(), DesignerEvent.CREATOR_ADDED);
} }
tabDragInner.tryDragIn();
} else { } else {
Toolkit.getDefaultToolkit().beep(); Toolkit.getDefaultToolkit().beep();
// 拖入失败 取消选中 // 拖入失败 取消选中

Loading…
Cancel
Save