Browse Source

Pull request #11177: REPORT-87843 复制特定文件夹名称,“的副本”后缀位置异常

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

* commit '8db25859bb486704d1669da8497ddd2377b8b4d1':
  REPORT-87843 复制特定文件夹名称,“的副本”后缀位置异常
new-design
Roger.Chen-陈旺 2 years ago
parent
commit
8bb9405db5
  1. 21
      designer-base/src/main/java/com/fr/design/file/FileOperationHelper.java

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

@ -127,7 +127,7 @@ public class FileOperationHelper {
WARNING_MESSAGE); WARNING_MESSAGE);
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
String name = getNoRepeatedName4Paste(targetDir, sourceFile.getName()); String name = getNoRepeatedName4Paste(targetDir, sourceFile);
String targetFile = StableUtils.pathJoin(targetDir, name); String targetFile = StableUtils.pathJoin(targetDir, name);
if (sourceFile.isDirectory()) { if (sourceFile.isDirectory()) {
copyDir(sourcePath, targetFile, withCopyVcs); copyDir(sourcePath, targetFile, withCopyVcs);
@ -177,19 +177,22 @@ public class FileOperationHelper {
* 重名处理 * 重名处理
* *
* @param targetDir * @param targetDir
* @param oldName * @param sourceFile
* @return * @return
*/ */
private String getNoRepeatedName4Paste(String targetDir, String oldName) { private String getNoRepeatedName4Paste(String targetDir, FileNode sourceFile) {
String oldName = sourceFile.getName();
while (isNameRepeaded(targetDir, oldName)) { while (isNameRepeaded(targetDir, oldName)) {
int index = oldName.lastIndexOf("."); if (sourceFile.isDirectory()) {
if (index > 0) {
String oName = oldName.substring(0, index);
oName = oName + Toolkit.i18nText("Fine-Design_Table_Data_Copy_Of_Table_Data");
oldName = oName.concat(oldName.substring(index));
} else {
//目录重名 //目录重名
oldName = oldName + Toolkit.i18nText("Fine-Design_Table_Data_Copy_Of_Table_Data"); oldName = oldName + Toolkit.i18nText("Fine-Design_Table_Data_Copy_Of_Table_Data");
} else {
int index = oldName.lastIndexOf(".");
if (index > 0) {
String oName = oldName.substring(0, index);
oName = oName + Toolkit.i18nText("Fine-Design_Table_Data_Copy_Of_Table_Data");
oldName = oName.concat(oldName.substring(index));
}
} }
} }
return oldName; return oldName;

Loading…
Cancel
Save