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

* commit 'a691ce2f76d823aba88a97fc1cfe290c30690e34':
  fix dock name
  fix 遗漏
  REPORT-28846 && REPORT-28830 && REPORT-27109

designer-base/src/main/java/com/fr/design/RestartHelper.java

@@ -202,7 +202,11 @@ public class RestartHelper {
             } catch (IOException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
-            DesignerContext.getDesignerFrame().exit();
+            if (DesignerContext.getDesignerFrame() != null) {
+                DesignerContext.getDesignerFrame().exit();
+            } else {
+                DesignerExiter.getInstance().execute();
+            }
         }
     }
 }

designer-base/src/main/java/com/fr/design/dialog/TipDialog.java

@@ -6,6 +6,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.IOUtils;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.BorderLayout;
@@ -42,9 +43,11 @@ public abstract class TipDialog extends JDialog implements ActionListener {
         JTextPane area = new JTextPane();
         UILabel typeLabel = new UILabel(type);
         area.insertComponent(typeLabel);
-        UILabel logoIconLabel = new UILabel();
+        if (StringUtils.isNotEmpty(type)) {
-        logoIconLabel.setIcon(IOUtils.readIcon("com/fr/base/images/oem/logo.png"));
+            UILabel logoIconLabel = new UILabel();
-        area.insertComponent(logoIconLabel);
+            logoIconLabel.setIcon(IOUtils.readIcon("com/fr/base/images/oem/logo.png"));
+            area.insertComponent(logoIconLabel);
+        }
         area.setPreferredSize(new Dimension(400, 100));
         area.setEnabled(true);
         area.setEditable(false);

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@@ -1104,8 +1104,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         if (tplFile != null) {
             int index = HistoryTemplateListCache.getInstance().contains(tplFile);
             if (index != -1) {
-                HistoryTemplateListCache.getInstance().getHistoryList().get(index).activeOldJTemplate();
+                JTemplate jt = HistoryTemplateListCache.getInstance().getHistoryList().get(index);
-                return;
+                if (!(jt instanceof JVirtualTemplate)) {
+                    jt.activeOldJTemplate();
+                    return;
+                }
             }
         }
 

designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java

@@ -30,7 +30,7 @@ public class StartErrorMessageCollector {
     }
 
     public void record(String id, String msg, String detail) {
-        FineLoggerFactory.getLogger().error(id +  ": " + msg + "detail: " + detail);
+        FineLoggerFactory.getLogger().error(id +  ": " + msg + ", detail: " + detail);
         ErrorInfo errorInfo = new ErrorInfo(StringUtils.EMPTY, uuid, activeKey);
         errorInfo.setLogid(id);
         errorInfo.setLog(msg);

designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java

@@ -88,7 +88,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
         Window parentWindow = SwingUtilities.getWindowAncestor(grid);
         this.biasTextPainterPane = new BiasTextPainterPane();
         Dimension dimension = this.biasTextPainterPane.getPreferredSize();
-        Dimension wrapDimension = new Dimension((int) (dimension.width * MULTIPLE), (int) (dimension.height * MULTIPLE));
+        Dimension wrapDimension = new Dimension((int) (dimension.width * MULTIPLE), (int) (dimension.height * Math.pow(MULTIPLE, 2)));
         this.biasTextPainterPane.populate(biasTextPainter);
         return this.biasTextPainterPane.showWindowWithCustomSize(parentWindow, new DialogActionAdapter() {
 

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

@@ -32,6 +32,7 @@ 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[] DEBUG_OPTIONS = new String[]{"-Dfile.encoding=UTF-8", "-Xmx2048m"};
 
     static {
@@ -99,7 +100,7 @@ public class DesignerJavaRuntime extends AbstractJavaRuntime {
         if (isInstallVersion()) {
             String[] options = super.getJvmOptions();
             if (SupportOSImpl.DOCK_ICON.support()) {
-                options = ArrayUtils.add(options, DOCK_OPTIONS);
+                options = ArrayUtils.addAll(options, DOCK_OPTIONS, DOCK_NAME_OPTIONS);
             }
             return options;
         } else {