From e60e65e8075e76bebec7e6908f70a1a12fe0fec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Tue, 20 May 2025 23:33:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(tabs):=20=E4=BC=98=E5=8C=96=20close=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=9C=A8=E6=A0=87=E7=AD=BE=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E6=89=93=E4=B9=B1=E6=97=B6=E4=BC=A0=E5=85=A5=20lay-id=20?=
 =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/tabs.html  | 20 ++++++++++++++++++++
 src/modules/tabs.js | 16 ++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/examples/tabs.html b/examples/tabs.html
index 631ee9d7..61fdf975 100644
--- a/examples/tabs.html
+++ b/examples/tabs.html
@@ -90,6 +90,26 @@
       </div>
     </div>
 
+    <h2>打乱标签顺序：</h2>
+    <div class="layui-tabs" lay-options="{closable: true}">
+      <ul class="layui-tabs-header">
+        <li lay-id="fff">Tab6</li>
+        <li lay-id="eee">Tab5</li>
+        <li lay-id="ccc">Tab3</li>
+        <li lay-id="bbb">Tab2</li>
+        <li lay-id="aaa">Tab1</li>
+        <li lay-id="ddd">Tab4</li>
+      </ul>
+      <div class="layui-tabs-body">
+        <div class="layui-tabs-item" lay-id="aaa">Tab Content-1</div>
+        <div class="layui-tabs-item" lay-id="bbb">Tab Content-2</div>
+        <div class="layui-tabs-item" lay-id="ccc">Tab Content-3</div>
+        <div class="layui-tabs-item" lay-id="ddd">Tab Content-4</div>
+        <div class="layui-tabs-item" lay-id="eee">Tab Content-5</div>
+        <div class="layui-tabs-item" lay-id="fff">Tab Content-6</div>
+      </div>
+    </div>
+
     <h2>标签 HASH 定位</h2>
     <div class="layui-tabs layui-hide-v" id="demoTabs-hash">
       <ul class="layui-tabs-header">
diff --git a/src/modules/tabs.js b/src/modules/tabs.js
index fa905fd4..c6ebd516 100644
--- a/src/modules/tabs.js
+++ b/src/modules/tabs.js
@@ -228,14 +228,13 @@ layui.define('component', function(exports) {
    * @param {boolean} force - 是否强制删除
    */
   Class.prototype.close = function(thisHeaderItem, force) {
-    if(!thisHeaderItem || !thisHeaderItem[0]) return;
+    if (!thisHeaderItem || !thisHeaderItem[0]) return;
 
     var that = this;
     var options = that.config;
+    var layid = thisHeaderItem.attr('lay-id');
     var index = thisHeaderItem.index();
 
-    if (!thisHeaderItem[0]) return;
-
     // 标签是否不可关闭
     if (thisHeaderItem.attr('lay-closable') === 'false') {
       return;
@@ -251,7 +250,7 @@ layui.define('component', function(exports) {
         component.CONST.MOD_NAME,
         'beforeClose('+ options.id +')',
         $.extend(data, {
-          index: thisHeaderItem.index()
+          index: index
         })
       );
 
@@ -271,8 +270,8 @@ layui.define('component', function(exports) {
     }
 
     // 移除元素
+    that.findBodyItem(layid || index).remove();
     thisHeaderItem.remove();
-    that.findBodyItem(index).remove();
 
     that.roll('auto', index);
 
@@ -365,7 +364,8 @@ layui.define('component', function(exports) {
 
     var that = this;
     var options = that.config;
-    var index = thisHeaderItem.attr('lay-id') || thisHeaderItem.index();
+    var layid = thisHeaderItem.attr('lay-id');
+    var index = thisHeaderItem.index();
     var thatA = thisHeaderItem.find('a');
     // 是否存在跳转链接
     var isLink = typeof thatA.attr('href') === 'string' && thatA.attr('target') === '_blank';
@@ -392,7 +392,7 @@ layui.define('component', function(exports) {
             headerItem: data.thisHeaderItem
           },
           to: {
-            index: thisHeaderItem.index(),
+            index: index,
             headerItem: thisHeaderItem
           }
         })
@@ -409,7 +409,7 @@ layui.define('component', function(exports) {
     .removeClass(component.CONST.CLASS_THIS);
 
     // 执行标签内容切换
-    that.findBodyItem(index).addClass(component.CONST.CLASS_SHOW)
+    that.findBodyItem(layid || index).addClass(component.CONST.CLASS_SHOW)
     .siblings().removeClass(component.CONST.CLASS_SHOW);
 
     that.roll('auto', index);