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

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

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