Merge pull request #8009 in DESIGN/design from final/11.0 to release/11.0

* commit 'c090c03dbcb692d6e4678498db36a899490451cc':
  REPORT-66939
  REPORT-66947
  REPORT-66947 拖拽拖出可拖拽区域的时候，没有及时清理内存里残留的上次dropTarget对象，需要清理一下
  REPORT-58833 js编辑器埋点

designer-base/src/main/java/com/fr/design/javascript/JSContentWithDescriptionPane.java

@@ -441,19 +441,21 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
                     Object value = helpDOCList.getSelectedValue();
                     if (value instanceof HelpDocument) {
                         String url = ((HelpDocument) value).getDocumentUrl();
-                        try {
-                            Desktop.getDesktop().browse(new URI(url));
-                        } catch (IOException ex) {
-                            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
-                        } catch (URISyntaxException ex) {
-                            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
-                        }
+                        browse(url);
                     }
                 }
             }
         });
     }
 
+    private void browse(String url){
+        try {
+            Desktop.getDesktop().browse(new URI(url));
+        } catch (IOException | URISyntaxException ex) {
+            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
+        }
+    }
+
     private void initHelpDOCListRender() {
         helpDOCList.setCellRenderer(new DefaultListCellRenderer() {
             @Override

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

@@ -1248,7 +1248,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
      * @param currentDragEvent
      */
     public void startDraggingNewWidget(XCreator xCreator, MouseEvent startDragEvent, MouseEvent currentDragEvent) {
-        if (currentDragEvent == null || this.getDropTarget() != null) {
+        if (currentDragEvent == null) {
             return;
         }
 
@@ -1270,7 +1270,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
      * @param currentDragEvent
      */
     public void startDraggingFormWidget(XCreator xCreator, MouseEvent startDragEvent, MouseEvent currentDragEvent) {
-        if (currentDragEvent == null || this.getDropTarget() != null) {
+        if (currentDragEvent == null) {
             return;
         }
         backUpCreator(xCreator);
@@ -1318,7 +1318,14 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         DraggingModel model = this.draggingModel;
         MouseEvent dragEvent = model.getCurrentDragEvent();
         XCreator hotspot = this.getComponentAt(dragEvent.getX(), dragEvent.getY());
-        return XCreatorUtils.getHotspotContainer(hotspot);
+        XLayoutContainer container = XCreatorUtils.getHotspotContainer(hotspot);
+        XLayoutContainer topLayout = container.getTopLayout();
+        // REPORT-66939 Tab比较特殊，它是又多个LayoutContainer组成，直接返回container会导致误判，需要先找到最上层topLayout，取其父layout才是正确结果
+        if (topLayout != null && container != topLayout) {
+            return (XLayoutContainer) topLayout.getParent();
+        } else {
+            return container;
+        }
     }
 
     /**