Merge remote-tracking branch 'origin/release/11.0' into release/11.0

designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java

@@ -215,7 +215,7 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi
                         WARNING_MESSAGE);
                 return;
             }
-            doPaste(targetDir, pasteNodes);
+            doPaste(targetDir, treeNodeList);
         }
 
         /**
@@ -256,7 +256,10 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi
                 for (ExpandMutableTreeNode node : pasteNodes) {
                     if (node.getUserObject() instanceof FileNode) {
                         FileNode fileNode = (FileNode) node.getUserObject();
-                        targetFile = FileOperationHelper.getInstance().copyFile(fileNode, targetDir);
+                        String newTargetFile = FileOperationHelper.getInstance().copyFile(fileNode, targetDir);
+                        if (StringUtils.isNotEmpty(newTargetFile)) {
+                            targetFile = newTargetFile;
+                        }
                         FineLoggerFactory.getLogger().debug("Template: {} paste to {} success.", fileNode.getEnvPath(), targetDir);
                     }
                 }

designer-base/src/main/java/com/fr/design/file/FileOperationHelper.java

@@ -119,12 +119,20 @@ public class FileOperationHelper {
     }
 
     private String copyFile(FileNode sourceFile, String targetDir, boolean withCopyVcs) {
+        String sourcePath = sourceFile.getEnvPath();
+        if (!TemplateResourceManager.getResource().exist(sourcePath)) {
+            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                    Toolkit.i18nText("Fine-Design_Basic_Source_File_Not_Exist", sourcePath),
+                    Toolkit.i18nText("Fine-Design_Basic_Alert"),
+                    WARNING_MESSAGE);
+            return StringUtils.EMPTY;
+        }
         String name = getNoRepeatedName4Paste(targetDir, sourceFile.getName());
         String targetFile = StableUtils.pathJoin(targetDir, name);
         if (sourceFile.isDirectory()) {
-            copyDir(sourceFile.getEnvPath(), targetFile, withCopyVcs);
+            copyDir(sourcePath, targetFile, withCopyVcs);
         } else {
-            copyFile(sourceFile.getEnvPath(), targetFile, withCopyVcs);
+            copyFile(sourcePath, targetFile, withCopyVcs);
         }
         return targetFile;
     }