From eab0e8e48cc7e5c7dcfde7160daea6d714910301 Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <Destiny.Lin@fanruan.com>
Date: Tue, 8 Nov 2022 10:07:17 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-82745=20=E4=BA=8C=E6=AC=A1=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E6=A8=A1=E6=9D=BF=E8=AE=A1=E6=95=B0=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/JTemplateNameHelper.java | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

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 96ca5b4843..0f245d8bb4 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
@@ -1,5 +1,6 @@
 package com.fr.design.mainframe;
 
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.gui.itree.filetree.TemplateFileTree;
 import com.fr.stable.StringUtils;
@@ -19,8 +20,6 @@ public class JTemplateNameHelper {
 
     private static final int PREFIX_NUM = 3000;
 
-    private static short currentIndex = 0;// 此变量用于多次新建模板时，让名字不重复
-
     public static String newTemplateNameByIndex(String prefix) {
         // 用于获取左侧模板的文件名，如左侧已包含"WorkBook1.cpt, WorkBook12.cpt, WorkBook177.cpt"
         // 那么新建的文件名将被命名为"WorkBook178.cpt",即取最大数+1
@@ -37,13 +36,33 @@ public class JTemplateNameHelper {
                 reportNum.add(index);
             }
         }
+        //把当前编辑面板的模板名也加进来判断
+        addHistoryTemplateName2List(reportNum, prefix);
         Collections.sort(reportNum);
         BigInteger idx = reportNum.size() > 0 ? reportNum.get(reportNum.size() - 1).add(BigInteger.valueOf(1)) : BigInteger.valueOf(1);
-        idx = idx.add(BigInteger.valueOf(currentIndex));
-        currentIndex++;
         return prefix + idx;
     }
 
+    /**
+     * 将当前打开的模板列表的模板名处理一下加进来，以便于获取左侧模板文件名与当前模板列表的最大值
+     *
+     * @param reportNum 存储后缀的列表
+     * @param prefix    前缀
+     */
+    private static void addHistoryTemplateName2List(List<BigInteger> reportNum, String prefix) {
+        int len = HistoryTemplateListCache.getInstance().getHistoryCount();
+        for (int i = 0; i < len; i++) {
+            JTemplate<?, ?> jTemplate = HistoryTemplateListCache.getInstance().get(i);
+            if (jTemplate != null) {
+                String templateName = jTemplate.getTemplateName();
+                BigInteger index = getFileNameIndex(prefix, templateName);
+                if (index != null) {
+                    reportNum.add(index);
+                }
+            }
+        }
+    }
+
     /**
      * @return java.lang.Integer WorkBook11.cpt则返回11，如果没有找到index返回null
      * @Description 返回文件名中的index