From a1c7143c463467dcf20d394bc4887bcfc221bd71 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 26 Jul 2023 15:17:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-101480=20=E3=80=90=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BA=8C=E6=9C=9F=E3=80=91=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E6=89=8B=E5=8A=A8=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=EF=BC=8C=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=9A=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JTemplate.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index 7977b8202..6fa6309cd 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -114,6 +114,8 @@ import java.awt.Dimension; import java.awt.FontMetrics; import java.io.ByteArrayOutputStream; import java.nio.file.Paths; +import java.util.Arrays; +import java.util.List; import java.util.Set; import java.util.concurrent.Callable; @@ -1146,6 +1148,10 @@ public abstract class JTemplate> * @param l 模板Listener */ public void addJTemplateActionListener(JTemplateActionListener l) { + List list = Arrays.asList(this.listenerList.getListeners(JTemplateActionListener.class)); + if (list.contains(l)) { + this.listenerList.remove(JTemplateActionListener.class, l); + } this.listenerList.add(JTemplateActionListener.class, l); } From 4b33c9c0c2b2d5369135b26e75410ee914cfee4f Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 26 Jul 2023 15:33:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-101480=20=E3=80=90=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BA=8C=E6=9C=9F=E3=80=91=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E6=89=8B=E5=8A=A8=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=EF=BC=8C=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=9A=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JTemplate.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index 6fa6309cd..76abb7445 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -1149,10 +1149,9 @@ public abstract class JTemplate> */ public void addJTemplateActionListener(JTemplateActionListener l) { List list = Arrays.asList(this.listenerList.getListeners(JTemplateActionListener.class)); - if (list.contains(l)) { - this.listenerList.remove(JTemplateActionListener.class, l); + if (!list.contains(l)) { + this.listenerList.add(JTemplateActionListener.class, l); } - this.listenerList.add(JTemplateActionListener.class, l); } /** From 157069c230ff36438b50885f1e93852d5ff89873 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 26 Jul 2023 17:47:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-101578=20=E3=80=90=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=89=E6=9C=9F=E3=80=91=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/file/TemplateTreePane.java | 11 +++++----- .../mainframe/vcs/common/VcsHelper.java | 21 ++----------------- .../design/mainframe/vcs/ui/VcsNewPane.java | 3 ++- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java index 2f8b1cd20..58d9b0e88 100644 --- a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java +++ b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java @@ -407,11 +407,12 @@ public class TemplateTreePane extends JPanel implements FileOperations { if (node instanceof FileNode) { FileNodeFILE nodeFILE = new FileNodeFILE((FileNode) node); if (nodeFILE.exists()) { - try { - WorkContext.getCurrent().get(VcsOperator.class).recycleVersion(VcsHelper.getInstance().getCurrentUsername(), VcsHelper.getInstance().dealWithFilePath(((FileNode) node).getEnvPath())); - } catch (Exception e) { - FineLoggerFactory.getLogger().error("[VcsV2] recycle {} failed", nodeFILE.getName()); - return false; + if (!VcsHelper.getInstance().isLegacyMode()) { + try { + WorkContext.getCurrent().get(VcsOperator.class).recycleVersion(VcsHelper.getInstance().getCurrentUsername(), nodeFILE.getPath()); + } catch (Exception e) { + FineLoggerFactory.getLogger().error("[VcsV2] recycle {} failed", nodeFILE.getName()); + } } if (TemplateResourceManager.getResource().delete(nodeFILE)) { HistoryTemplateListCache.getInstance().deleteFile(nodeFILE); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java index bd3551256..49054f651 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java @@ -27,6 +27,7 @@ import com.fr.stable.project.ProjectConstants; import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; import com.fr.workspace.WorkspaceEvent; +import com.fr.workspace.server.vcs.VcsFileUtils; import com.fr.workspace.server.vcs.VcsOperator; import com.fr.workspace.server.vcs.filesystem.VcsFileSystem; import com.fr.workspace.server.vcs.git.config.GcConfig; @@ -181,27 +182,9 @@ public class VcsHelper implements JTemplateActionListener { private String getEditingFilename() { JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); String editingFilePath = jt.getEditingFILE().getPath(); - return dealWithFilePath(editingFilePath); + return VcsFileUtils.dealWithFilePath(editingFilePath); } - /** - * 处理传入的文件名，使其符合Vcs规范 - * - * @param filePath 文件路径 - * @return 处理完的文件 - */ - public String dealWithFilePath(String filePath) { - String vcsCacheDir = VcsFileSystem.getInstance().getVcsCacheRelativePath(); - if (filePath.startsWith(ProjectConstants.REPORTLETS_NAME)) { - filePath = filePath.replaceFirst(ProjectConstants.REPORTLETS_NAME, StringUtils.EMPTY); - } else if (filePath.startsWith(vcsCacheDir)) { - filePath = filePath.replaceFirst(vcsCacheDir, StringUtils.EMPTY); - } - if (filePath.startsWith(VCS_FILE_SLASH)) { - filePath = filePath.substring(1); - } - return filePath; - } private boolean needDeleteVersion(VcsEntity entity) { VcsConfigManager configManager = DesignerEnvManager.getEnvManager().getVcsConfigManager(); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java index 3a949b85d..baafe5686 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java @@ -18,6 +18,7 @@ import com.fr.file.filetree.FileNode; import com.fr.report.entity.VcsEntity; import com.fr.stable.StringUtils; import com.fr.workspace.WorkContext; +import com.fr.workspace.server.vcs.VcsFileUtils; import com.fr.workspace.server.vcs.VcsOperator; import javax.swing.Icon; @@ -267,7 +268,7 @@ public class VcsNewPane extends RecyclePane { @Override protected List getTableList() { - List entityList = WorkContext.getCurrent().get(VcsOperator.class).getVersions(VcsHelper.getInstance().dealWithFilePath(filePath)); + List entityList = WorkContext.getCurrent().get(VcsOperator.class).getVersions(VcsFileUtils.dealWithFilePath(filePath)); List tableEntities = new ArrayList<>(); for (VcsEntity entity : entityList) { tableEntities.add(new VcsTableEntity(entity)); From 667856b068344980fdda9a42855288510ea01670 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 26 Jul 2023 19:02:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-101590=20=E3=80=90=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=89=E6=9C=9F=E3=80=91=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=A7=A6=E5=8F=91=E5=88=A0=E9=99=A4=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=89=80=E6=9C=89=E7=89=88=E6=9C=AC=E7=9A=84=E5=8A=A8?= =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E4=B8=BA=E4=BB=80=E4=B9=88=E4=BC=9A=E6=89=93?= =?UTF-8?q?=E5=BC=80=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java index efe622566..5a2f20cf1 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java @@ -120,7 +120,6 @@ public class VcsCenterPane extends VcsNewPane { model.getList().remove(o); model.fireTableDataChanged(); } - DesignerContext.getDesignerFrame().openTemplate(new FileNodeFILE(new FileNode(getTemplateTruePath(fileName), false))); } } });