Merge pull request #1539 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '3b042ad1d84b525c5f90324f53bf392b96dc6621':
  fix mac下不用awt的库读写
  REPORT-28873
  REPORT-28792 表单添加tab块问题

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

@@ -93,7 +93,7 @@ public class FormCreatorDropTarget extends DropTarget {
             //SetSelection时要确保选中的是最顶层的布局
             //tab布局添加的时候是初始化了XWCardLayout，实际上最顶层的布局是XWCardMainBorderLayout
             XCreator addingXCreator = addingModel.getXCreator();
-            Widget widget = (addingXCreator.getTopLayout() != null) ? (addingXCreator.getTopLayout().toData()) : addingXCreator.toData();
+            Widget widget = (addingXCreator.getBackupParent() != null && addingXCreator.getTopLayout() != null) ? (addingXCreator.getTopLayout().toData()) : addingXCreator.toData();
             //图表埋点
             dealChartBuryingPoint(widget);
             if (addingXCreator.isShared()) {

designer-realize/src/main/java/com/fr/start/DesignerJavaRuntime.java

@@ -9,7 +9,6 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.os.OperatingSystem;
 
-import javax.imageio.ImageIO;
 import java.io.File;
 import java.io.IOException;
 
@@ -32,15 +31,13 @@ public class DesignerJavaRuntime extends AbstractJavaRuntime {
     private static final String BIN_HOME = StableUtils.pathJoin(StableUtils.getInstallHome(), "bin");
     private static final String LOGO_PATH = StableUtils.pathJoin(BIN_HOME, "logo.png");
     private static final String DOCK_OPTIONS = "-Xdock:icon=" + LOGO_PATH;
-    private static final String DOCK_NAME_OPTIONS = "-Xdock:name=" + FineDesigner.class.getName();
+    private static final String DOCK_NAME_OPTIONS = "-Xdock:name=" + FineDesigner.class.getSimpleName();
     private static final String[] DEBUG_OPTIONS = new String[]{"-Dfile.encoding=UTF-8", "-Xmx2048m"};
 
     static {
-        if (SupportOSImpl.DOCK_ICON.support()) {
-            try {
-                ImageIO.write(IOUtils.readImage("com/fr/design/icon/logo.png"), "png", new File(LOGO_PATH));
-            } catch (IOException ignore) {
-            }
+        try {
+            IOUtils.copy(DesignerJavaRuntime.class.getResourceAsStream("/com/fr/design/icon/logo.png"), "logo.png", new File(BIN_HOME));
+        } catch (IOException ignore) {
         }
     }