From cd84cd2ff4a1846167eba02a67512c733f60fe93 Mon Sep 17 00:00:00 2001 From: roger Date: Tue, 30 Aug 2022 20:29:54 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-79182=20=E9=80=89=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E6=9C=89=E9=94=81=E5=AE=9A=E7=9A=84?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/DefaultTemplateTreeDefineProcessor.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) 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 821d36551e..103bf5ee39 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 @@ -207,7 +207,7 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi for (ExpandMutableTreeNode treeNode : treeNodeList) { FileOperationHelper.getInstance().checkFreeOrLock(treeNode, pasteNodes, lockedNodes); } - if (pasteNodes.isEmpty()) { + if (pasteNodes.isEmpty() || !lockedNodes.isEmpty()) { //提示:复制的文件都不能黏贴 FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Confirm_Paste_Unlock_File"), @@ -215,18 +215,7 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi WARNING_MESSAGE); return; } - if (lockedNodes.isEmpty()) { - doPaste(targetDir, pasteNodes); - } else { - if (FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), - Toolkit.i18nText("Fine-Design_Basic_Confirm_Paste_Other_File"), - Toolkit.i18nText("Fine-Design_Basic_Confirm"), - YES_NO_OPTION) - == JOptionPane.YES_OPTION) { - // 黏贴其他可黏贴的文件 - doPaste(targetDir, pasteNodes); - } - } + doPaste(targetDir, pasteNodes); } /**