From 3d57a6bff5e66c7f4a5b2cfd153ef8c3ab58c941 Mon Sep 17 00:00:00 2001 From: roger Date: Fri, 10 Feb 2023 13:19:18 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-87542=20=E5=A4=8D=E5=88=B6=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E7=82=B9=E5=87=BB=E5=88=B7=E6=96=B0=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E8=A7=A6=E5=8F=91=E7=B2=98=E8=B4=B4=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E6=8F=90=E7=A4=BA=E6=B2=A1=E6=9C=89=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/file/DefaultTemplateTreeDefineProcessor.java | 5 +++++ .../src/main/java/com/fr/design/file/TemplateTreePane.java | 1 + 2 files changed, 6 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java b/designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java index feb1e696f..63b88132b 100644 --- a/designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java +++ b/designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java @@ -28,6 +28,7 @@ import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; import com.fr.stable.collections.CollectionUtils; import com.fr.stable.project.ProjectConstants; +import com.fr.workspace.WorkContext; import javax.swing.BorderFactory; import javax.swing.JDialog; @@ -229,6 +230,10 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi } //确定目标目录并检查权限 FileOperations selectedOperation = DesignerFrameFileDealerPane.getInstance().getSelectedOperation(); + //没有选中目标目录时粘贴,允许超管往根目录粘贴 + if (selectedOperation.getFileNode() == null && WorkContext.getCurrent().isRoot()) { + return true; + } if (!selectedOperation.access()) { FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied"), 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 18abbb7e2..2867c121b 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 @@ -307,6 +307,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { if (reportletsTree.getSelectionCount() == 0) { //没选中文件刷新根目录 reportletsTree.refresh(); + return; } reportletsTree.refreshParent(Objects.requireNonNull(reportletsTree.getSelectionPath())); DesignerFrameFileDealerPane.getInstance().refreshRightToolBarBy(null);