From 6b5449a6d59e44f2aa724805688a9fc959e5daf7 Mon Sep 17 00:00:00 2001
From: gewuyou <1063891901@qq.com>
Date: Sat, 14 Oct 2023 19:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=20BUG=20?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=B6=85=E8=BF=8710=E4=B8=AA=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=A0=87=E7=AD=BE=E9=A1=B5=E5=90=8E=EF=BC=8C=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=B7=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jcnc/jnotepad/app/utils/TabUtil.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jcnc/jnotepad/app/utils/TabUtil.java b/src/main/java/org/jcnc/jnotepad/app/utils/TabUtil.java
index 01befa8..6b4cf11 100644
--- a/src/main/java/org/jcnc/jnotepad/app/utils/TabUtil.java
+++ b/src/main/java/org/jcnc/jnotepad/app/utils/TabUtil.java
@@ -250,6 +250,7 @@ public class TabUtil {
         // 设定初始索引
         int index = 1;
         StringBuilder tabTitle = new StringBuilder();
+        String content = UiResourceBundle.getContent(NEW_FILE);
         // 获取当前默认创建标签页集合
         List<Tab> tabs = CenterTabPane.getInstance()
                 .getTabs()
@@ -257,15 +258,21 @@ public class TabUtil {
                 // 排除不属于默认创建的标签页
                 .filter(tab -> AppConstants.TABNAME_PATTERN.matcher(tab.getText()).matches())
                 // 对默认创建的标签页进行排序
-                .sorted(Comparator.comparing(Tab::getText))
+                .sorted(Comparator.comparing(tab -> {
+                    String tabText = tab.getText();
+                    // 提取数字部分
+                    String numberPart = tabText.substring(content.length());
+                    // 解析为数字
+                    return Integer.parseInt(numberPart);
+                }))
                 // 转为List集合
                 .toList();
         // 构建初始标签页名称
-        tabTitle.append(UiResourceBundle.getContent(TextConstants.NEW_FILE)).append(index);
+        tabTitle.append(content).append(index);
         for (Tab tab : tabs) {
             if (tab.getText().contentEquals(tabTitle)) {
                 tabTitle.setLength(0);
-                tabTitle.append(UiResourceBundle.getContent(TextConstants.NEW_FILE)).append(++index);
+                tabTitle.append(content).append(++index);
             } else {
                 break;
             }
-- 
Gitee