From 2d021cacb3ea350414aca1cd8f2c46a0efc57793 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 16 Oct 2024 16:31:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-137581=20=E3=80=90fr-fbp=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90=E3=80=91?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5-SSH=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/data/datapane/preview/ConnectionInfoBeanHelper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/ConnectionInfoBeanHelper.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/ConnectionInfoBeanHelper.java index 2fb5832c57..0aa05737ed 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/ConnectionInfoBeanHelper.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/ConnectionInfoBeanHelper.java @@ -27,7 +27,6 @@ import com.fr.module.tool.ActivatorToolBox; import com.fr.security.encryption.transmission.TransmissionEncryptionManager; import com.fr.stable.Constants; import com.fr.stable.StringUtils; -import com.fr.third.fasterxml.jackson.core.JsonProcessingException; import com.fr.third.fasterxml.jackson.databind.ObjectMapper; import com.fr.third.springframework.beans.BeanUtils; import com.fr.workspace.server.repository.WorkplaceConstants; @@ -180,7 +179,7 @@ public class ConnectionInfoBeanHelper { .redirectPort(jdbcConnection.getSsh().getRedirectPort()) .redirectIp((jdbcConnection.getSsh()).getRedirectIp()) .sshTimeOut(((BaseSsh) jdbcConnection.getSsh()).getTimeOut()) - .sshSecret(withPassword ? ((BaseSsh) jdbcConnection.getSsh()).getSecret() : DecisionServiceConstants.DEFAULT_PASSWORD) + .sshSecret(withPassword ? DataEncryptionHelper.encrypt(((BaseSsh) jdbcConnection.getSsh()).getSecret()) : DecisionServiceConstants.DEFAULT_PASSWORD) .sshPrivateKeyPath(jdbcConnection.getSsh().getSshType() == SshType.KEY ? ((KeyVerifySsh) jdbcConnection.getSsh()).getPrivateKeyPath() : StringUtils.EMPTY) .usingSsl((jdbcConnection.getSsl()).isUsingSsl()) .sslType(jdbcConnection.getSsl().getSslType().toString()) From 4c50173ee92d591f20f50d22bfc42b5c7e051577 Mon Sep 17 00:00:00 2001 From: renekton Date: Thu, 17 Oct 2024 10:52:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E9=AB=98=E5=BA=A6=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/mainframe/FormWidgetPopWindow.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetPopWindow.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetPopWindow.java index e29548e57b..e7cfaff259 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetPopWindow.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetPopWindow.java @@ -17,6 +17,8 @@ import java.awt.Toolkit; import java.awt.event.AWTEventListener; import java.awt.event.MouseEvent; +import static com.fine.theme.utils.FineUIScale.scale; + //august: public class FormWidgetPopWindow extends JWindow { private WidgetOption[] options; @@ -127,8 +129,8 @@ public class FormWidgetPopWindow extends JWindow { public Dimension preferredLayoutSize(Container parent) { Insets insets = parent.getInsets(); int nmembers = parent.getComponentCount(); - return new Dimension(maxLine * 28 + insets.left + insets.right + right + left, (nmembers / maxLine + 1) - * 24 + insets.top + insets.bottom + top + bottom); + return new Dimension(maxLine * scale(28) + insets.left + insets.right + scale(right) + scale(left), + (int) Math.ceil((float) nmembers / maxLine) * scale(26) + insets.top + insets.bottom + scale(top) + scale(bottom)); } @Override