diff --git a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java index 3a2e56d22..ce8fdaa9d 100644 --- a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java +++ b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java @@ -153,7 +153,7 @@ public class FRGUIPaneFactory { } public static LayoutManager createCenterLayout(JComponent centerBody) { - return createCenterLayout(centerBody, 0.3d); + return createCenterLayout(centerBody, 0.5d, 0.3d); } /** @@ -162,7 +162,7 @@ public class FRGUIPaneFactory { * @param centerBody 中心组件 * @return 布局方式 */ - public static LayoutManager createCenterLayout(JComponent centerBody, double factor) { + public static LayoutManager createCenterLayout(JComponent centerBody, double factorX, double factorY) { return new LayoutManager() { @@ -188,8 +188,8 @@ public class FRGUIPaneFactory { // 这个时候大小是不确定的 int bodyWidth = centerBody.getPreferredSize().width; int bodyHeight = centerBody.getPreferredSize().height; - int labelX = (width - bodyWidth) / 2; - int labelY = (int) ((height - bodyHeight) * factor); + int labelX = (int) ((width - bodyWidth) * factorX); + int labelY = (int) ((height - bodyHeight) * factorY); centerBody.setBounds(labelX, labelY, bodyWidth, bodyHeight); } diff --git a/designer-base/src/main/java/com/fr/start/common/DesignerOpenEmptyPanel.java b/designer-base/src/main/java/com/fr/start/common/DesignerOpenEmptyPanel.java index 89aeedc60..7f4a0eeb9 100644 --- a/designer-base/src/main/java/com/fr/start/common/DesignerOpenEmptyPanel.java +++ b/designer-base/src/main/java/com/fr/start/common/DesignerOpenEmptyPanel.java @@ -70,7 +70,7 @@ public class DesignerOpenEmptyPanel extends JPanel { this.body.add(createIcon, BorderLayout.NORTH); this.body.add(createButtonPanel, BorderLayout.SOUTH); - setLayout(FRGUIPaneFactory.createCenterLayout(this.body, 0.4d)); + setLayout(FRGUIPaneFactory.createCenterLayout(this.body, 0.4d, 0.4d)); ColorUtils.syncBackground(this, Color.WHITE); diff --git a/designer-base/src/main/java/com/fr/startup/ui/StartupPageModel.java b/designer-base/src/main/java/com/fr/startup/ui/StartupPageModel.java index c345c8991..a461ee33b 100644 --- a/designer-base/src/main/java/com/fr/startup/ui/StartupPageModel.java +++ b/designer-base/src/main/java/com/fr/startup/ui/StartupPageModel.java @@ -45,7 +45,8 @@ public class StartupPageModel { DesignerWorkspaceInfo workspaceInfo = envManager.getWorkspaceInfo(e); if (workspaceInfo.getType() == DesignerWorkspaceType.Remote) { WorkspaceConnectionInfo connection = workspaceInfo.getConnection(); - return new StartupWorkspaceBean(e, connection.getUrl(), workspaceInfo.getType()); + String remoteAddress = StartupPageUtil.getRemoteAddress(connection.getUrl()); + return new StartupWorkspaceBean(e, remoteAddress, workspaceInfo.getType()); } else { return new StartupWorkspaceBean(e, workspaceInfo.getPath(), workspaceInfo.getType()); } diff --git a/designer-base/src/main/java/com/fr/startup/ui/StartupPageUtil.java b/designer-base/src/main/java/com/fr/startup/ui/StartupPageUtil.java index 896b42595..2a71d0d5e 100644 --- a/designer-base/src/main/java/com/fr/startup/ui/StartupPageUtil.java +++ b/designer-base/src/main/java/com/fr/startup/ui/StartupPageUtil.java @@ -2,8 +2,10 @@ package com.fr.startup.ui; import com.fr.base.svg.SVGIcon; import com.fr.design.env.DesignerWorkspaceType; +import com.fr.log.FineLoggerFactory; import javax.swing.Icon; +import java.net.URL; /** * created by Harrison on 2022/07/11 @@ -37,4 +39,23 @@ public class StartupPageUtil { } return SVGIcon.readSVGIcon("/com/fr/design/startup/remote_server_background_28.svg", 28, 28); } + + /** + * 返回 ip : port + * + * @param urlStr 完整的 url 值,例如 https://localhost:3090/xxx + * @return localhost:3090 + */ + public static String getRemoteAddress(String urlStr) { + + try { + URL url = new URL(urlStr); + String host = url.getHost(); + int port = url.getPort(); + return host + ":" + port; + } catch (Exception e) { + FineLoggerFactory.getLogger().debug(e.getMessage(), e); + return urlStr; + } + } }