From de6236770fa3be847f34f0c4350221b3ccc1159a Mon Sep 17 00:00:00 2001
From: shine <zheng@fanruan.com>
Date: Wed, 26 May 2021 14:45:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81=E9=94=99?=
 =?UTF-8?q?=E4=BA=86=20=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/JTemplate.java    | 37 ----------
 .../design/mainframe/JTemplateNameHelper.java | 68 +++++++++++++------
 2 files changed, 48 insertions(+), 57 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index dd7eb1aece..e92fffab93 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@@ -844,43 +844,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
     }
 
-    /**
-     * @Description 返回文件名中的index
-     * @param: prefix 前缀
-     * @param: fileName 文件名称全名
-     * @return java.lang.Integer WorkBook11.cpt则返回11，如果没有找到index返回null
-     * @Author Henry.Wang
-     * @Date 2021/4/9 11:13
-     **/
-    private static Integer getFileNameIndex(String prefix, String fileName) {
-        char[] chars = new char[fileName.length()];
-        int i = 0;
-        for (; i < fileName.length(); i++) {
-            char c = fileName.charAt(i);
-            //匹配前缀
-            if (i < prefix.length()) {
-                if (c != prefix.charAt(i)) {
-                    return null;
-                }
-            } else {
-                if (c == '.') {
-                    break;
-                } else {
-                    //匹配0~9
-                    if (c < 48 || c > 57) {
-                        return null;
-                    }
-                    chars[i - prefix.length()] = c;
-                }
-            }
-        }
-        String s = new String(chars).substring(0, i - prefix.length());
-        if (StringUtils.isBlank(s)) {
-            return null;
-        }
-        return Integer.valueOf(s);
-    }
-
     // /////////////////////////////toolbarMenuDock//////////////////////////////////
 
     /**
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplateNameHelper.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplateNameHelper.java
index bd1b869b08..4e201a5efa 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplateNameHelper.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplateNameHelper.java
@@ -2,12 +2,12 @@ package com.fr.design.mainframe;
 
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.gui.itree.filetree.TemplateFileTree;
-import com.fr.general.ComparatorUtils;
+import com.fr.stable.StringUtils;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.regex.Pattern;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * @author shine
@@ -26,30 +26,58 @@ public class JTemplateNameHelper {
         TemplateFileTree tt = TemplateTreePane.getInstance().getTemplateFileTree();
         DefaultMutableTreeNode gen = (DefaultMutableTreeNode) tt.getModel().getRoot();
         String[] str = new String[gen.getChildCount()];
-        ArrayList<String> al = new ArrayList<String>();
+
+        List<Integer> reportNum = new ArrayList<>();
         for (int j = 0; j < gen.getChildCount(); j++) {
             str[j] = gen.getChildAt(j).toString();
-            if (str[j].contains(prefix) && str[j].contains(".")) {
-                for (int i = 0; i < PREFIX_NUM; i++) {
-                    if (ComparatorUtils.equals(str[j].split("[.]")[0], (prefix + i))) {
-                        al.add(str[j]);
-                    }
-
-                }
+            //返回文件名中的index(算法中没有再匹配文件后缀了，因为DefaultMutableTreeNode中已经匹配过了)
+            Integer index = getFileNameIndex(prefix, str[j]);
+            if (index != null) {
+                reportNum.add(index);
             }
         }
+        Collections.sort(reportNum);
+        int idx = reportNum.size() > 0 ? reportNum.get(reportNum.size() - 1) + 1 : 1;
 
-        int[] reportNum = new int[al.size()];
-        for (int i = 0; i < al.size(); i++) {
-            Pattern pattern = Pattern.compile("[" + prefix + ".]+");
-            String[] strs = pattern.split(al.get(i).toString());
-            reportNum[i] = Integer.parseInt(strs[1]);
-        }
-
-        Arrays.sort(reportNum);
-        int idx = reportNum.length > 0 ? reportNum[reportNum.length - 1] + 1 : 1;
         idx = idx + currentIndex;
         currentIndex++;
         return prefix + idx;
     }
+
+    /**
+     * @return java.lang.Integer WorkBook11.cpt则返回11，如果没有找到index返回null
+     * @Description 返回文件名中的index
+     * @param: prefix 前缀
+     * @param: fileName 文件名称全名
+     * @Author Henry.Wang
+     * @Date 2021/4/9 11:13
+     **/
+    private static Integer getFileNameIndex(String prefix, String fileName) {
+        char[] chars = new char[fileName.length()];
+        int i = 0;
+        for (; i < fileName.length(); i++) {
+            char c = fileName.charAt(i);
+            //匹配前缀
+            if (i < prefix.length()) {
+                if (c != prefix.charAt(i)) {
+                    return null;
+                }
+            } else {
+                if (c == '.') {
+                    break;
+                } else {
+                    //匹配0~9
+                    if (c < 48 || c > 57) {
+                        return null;
+                    }
+                    chars[i - prefix.length()] = c;
+                }
+            }
+        }
+        String s = new String(chars).substring(0, i - prefix.length());
+        if (StringUtils.isBlank(s)) {
+            return null;
+        }
+        return Integer.valueOf(s);
+    }
 }