Pull request #9883: REPORT-79182 选中的文件下有锁定的模板，异常提示

Merge in DESIGN/design from ~ROGER.CHEN/design:release/11.0 to release/11.0

* commit 'e46f2a79e51df119de7b054da547cba3beb02bce':
  REPORT-79182 选中的文件下有锁定的模板，异常提示

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);
         }
 
         /**