From ec2002fb07073922ef930732e615a54b652353b3 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 30 Dec 2024 10:10:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-145453=20=E3=80=90fr-fbp=E3=80=91ssh?= =?UTF-8?q?=E5=92=8Cssl=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E8=8E=B7=E5=8F=96=E5=AF=86=E9=92=A5=E7=AD=89?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=B6=EF=BC=8C=E8=B7=AF=E5=BE=84=E6=B7=B1?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E9=80=89=E6=8B=A9=E5=90=8E=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/data/datapane/connect/SshPane.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java index 12b173779e..a54a9c0abf 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java @@ -25,6 +25,7 @@ import com.fr.file.FILE; import com.fr.file.FILEChooserPane; import com.fr.file.filter.ChooseFileFilter; import com.fr.stable.StringUtils; +import com.fr.stable.project.ProjectConstants; import com.fr.third.guava.collect.HashBiMap; import javax.swing.JPanel; @@ -66,7 +67,7 @@ public class SshPane extends BasicPane { private JPanel sshSettingPane; private SimpleCardPane verifyCardPane; private final UIButton fileChooserButton = new UIButton(); - + private static final String TRIM = SslUtils.CERTIFICATES + ProjectConstants.FORWARD_SLASH; private static final String USE_PASSWORD = "usePassword"; private static final String USE_KEY = "useKey"; @@ -104,7 +105,11 @@ public class SshPane extends BasicPane { if (file == null) { keyPath.setText(StringUtils.EMPTY); } else { - keyPath.setText(file.getPath()); + String path = file.getPath(); + if (path.startsWith(TRIM)) { + path = path.substring(TRIM.length()); + } + keyPath.setText(path); } } fileChooser.removeAllFilter(); From 9f7bb99784f781832b0fe607b0d4b917a8e681db Mon Sep 17 00:00:00 2001 From: "Richard.Fang" Date: Mon, 30 Dec 2024 10:55:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-145518=20fix:=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=A0=91=E6=96=B0=E5=BB=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E5=90=8E=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/DesignerFrameFileDealerPane.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index cbda592149..3f6b7ba578 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -29,6 +29,7 @@ import com.fr.design.file.FileToolbarStateChangeListener; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.file.MultiTemplateTabPane; +import com.fr.design.file.NodeAuthProcessor; import com.fr.design.file.TemplateTreePane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; @@ -755,8 +756,10 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt } String targetPath = FilenameUtils.standard(parentPath + CoreConstants.SEPARATOR + userInput); boolean success = selectedOperation.mkdir(targetPath); - selectedOperation.refresh(); + NodeAuthProcessor.getInstance().refresh(); + DesignerFrameFileDealerPane.getInstance().refreshRightToolBarBy(null); this.dispose(); + // 定位模板流程中刷新模板树 LocateAction.gotoEditingTemplateLeaf(targetPath); if (!success) { FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), From 7dd4fb0f5cf45d18567f4aaac7c00735385a6673 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 30 Dec 2024 15:41:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-145453=20=E3=80=90fr-fbp=E3=80=91ssh?= =?UTF-8?q?=E5=92=8Cssl=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E8=8E=B7=E5=8F=96=E5=AF=86=E9=92=A5=E7=AD=89?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=B6=EF=BC=8C=E8=B7=AF=E5=BE=84=E6=B7=B1?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E9=80=89=E6=8B=A9=E5=90=8E=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/data/datapane/connect/SshPane.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java index 12b173779e..46b8028784 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java @@ -25,6 +25,7 @@ import com.fr.file.FILE; import com.fr.file.FILEChooserPane; import com.fr.file.filter.ChooseFileFilter; import com.fr.stable.StringUtils; +import com.fr.stable.project.ProjectConstants; import com.fr.third.guava.collect.HashBiMap; import javax.swing.JPanel; @@ -67,6 +68,7 @@ public class SshPane extends BasicPane { private SimpleCardPane verifyCardPane; private final UIButton fileChooserButton = new UIButton(); + private static final String TRIM = SslUtils.CERTIFICATES + ProjectConstants.FORWARD_SLASH; private static final String USE_PASSWORD = "usePassword"; private static final String USE_KEY = "useKey"; @@ -104,6 +106,11 @@ public class SshPane extends BasicPane { if (file == null) { keyPath.setText(StringUtils.EMPTY); } else { + String path = file.getPath(); + if (path.startsWith(TRIM)) { + path = path.substring(TRIM.length()); + } + keyPath.setText(path); keyPath.setText(file.getPath()); } } From 5ebce6029ef7bc7526d5afde7b277907a47346cb Mon Sep 17 00:00:00 2001 From: "Richard.Fang" Date: Mon, 30 Dec 2024 15:42:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-145518=20fix:=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=A0=91=E6=96=B0=E5=BB=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E5=90=8E=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/DesignerFrameFileDealerPane.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index cbda592149..3f6b7ba578 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -29,6 +29,7 @@ import com.fr.design.file.FileToolbarStateChangeListener; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.file.MultiTemplateTabPane; +import com.fr.design.file.NodeAuthProcessor; import com.fr.design.file.TemplateTreePane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; @@ -755,8 +756,10 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt } String targetPath = FilenameUtils.standard(parentPath + CoreConstants.SEPARATOR + userInput); boolean success = selectedOperation.mkdir(targetPath); - selectedOperation.refresh(); + NodeAuthProcessor.getInstance().refresh(); + DesignerFrameFileDealerPane.getInstance().refreshRightToolBarBy(null); this.dispose(); + // 定位模板流程中刷新模板树 LocateAction.gotoEditingTemplateLeaf(targetPath); if (!success) { FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), From 27621b1d62eed7487872b4e3cfe6f9b639c4c0d8 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 30 Dec 2024 16:33:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-145453=20=E3=80=90fr-fbp=E3=80=91ssh?= =?UTF-8?q?=E5=92=8Cssl=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E8=8E=B7=E5=8F=96=E5=AF=86=E9=92=A5=E7=AD=89?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=B6=EF=BC=8C=E8=B7=AF=E5=BE=84=E6=B7=B1?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E9=80=89=E6=8B=A9=E5=90=8E=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/data/datapane/connect/SshPane.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java index 46b8028784..57709a6377 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java @@ -111,7 +111,6 @@ public class SshPane extends BasicPane { path = path.substring(TRIM.length()); } keyPath.setText(path); - keyPath.setText(file.getPath()); } } fileChooser.removeAllFilter();