From 0eca94d803e63c4f0fcfe0a2b1024c665ebbe4ab Mon Sep 17 00:00:00 2001
From: morning-star <26325820+Sight-wcg@users.noreply.github.com>
Date: Mon, 22 Apr 2024 17:50:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(treeTable):=20=E8=8A=82=E7=82=B9=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=90=8E=EF=BC=8C=E8=A1=8C=E7=B4=A2=E5=BC=95=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=94=99=E8=AF=AF=20(#1812)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(treeTable): 节点移动后，行索引获取错误

* update code
---
 src/modules/table.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/modules/table.js b/src/modules/table.js
index 0e958def..5f6ebd10 100644
--- a/src/modules/table.js
+++ b/src/modules/table.js
@@ -1586,7 +1586,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
     // 匹配行元素
     var tr = function(tr) {
       return isCheckAll ? tr : tr.filter(isCheckMult ? function() {
-        var dataIndex = $(this).data('index');
+        var dataIndex = $(this).attr('data-index');
         return opts.index.indexOf(dataIndex) !== -1;
       } : '[data-index="'+ opts.index +'"]');
     }(that.layBody.find('tr'));
@@ -2288,7 +2288,6 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
     //数据行中的事件返回的公共对象成员
     var commonMember = that.commonMember = function(sets){
       var othis = $(this);
-      // treeTable 中使用 attr('data-index'), tr 更新时 jQuery 的缓存会导致获取到错误的 index
       var index = othis.parents('tr').eq(0).attr('data-index');
       var tr = that.layBody.find('tr[data-index="'+ index +'"]');
       var data = table.cache[that.key] || [];
@@ -2335,7 +2334,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
       var td = othis.closest('td');
       var checkbox = othis.prev();
       var children = that.layBody.find('input[name="layTableCheckbox"]');
-      var index = checkbox.parents('tr').eq(0).data('index');
+      var index = checkbox.parents('tr').eq(0).attr('data-index');
       var checked = checkbox[0].checked;
       var isAll = checkbox.attr('lay-filter') === 'layTableAllChoose';
 
@@ -2375,7 +2374,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
       var td = othis.closest('td');
       var radio = othis.prev();
       var checked = radio[0].checked;
-      var index = radio.parents('tr').eq(0).data('index');
+      var index = radio.parents('tr').eq(0).attr('data-index');
 
       layui.stope(e);
       if(radio[0].disabled) return false;
@@ -2448,7 +2447,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
       var field = othis.data('field');
       var key = othis.data('key');
       var col = that.col(key);
-      var index = othis.closest('tr').data('index');
+      var index = othis.closest('tr').attr('data-index');
       var data = table.cache[that.key][index];
       var elemCell = othis.children(ELEM_CELL);
 
@@ -2482,7 +2481,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
       var td = othis.parent();
       var value = this.value;
       var field = othis.parent().data('field');
-      var index = othis.closest('tr').data('index');
+      var index = othis.closest('tr').attr('data-index');
       var data = table.cache[that.key][index];
 
       //事件回调的参数对象
@@ -2561,7 +2560,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
       var td = othis.parent();
       var key = td.data('key');
       var col = that.col(key);
-      var index = td.parent().data('index');
+      var index = td.parent().attr('data-index');
       var elemCell = td.children(ELEM_CELL);
       var ELEM_CELL_C = 'layui-table-cell-c';
       var elemCellClose = $('<i class="layui-icon layui-icon-up '+ ELEM_CELL_C +'">');
@@ -2658,7 +2657,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
     var toolFn = function(type){
       var othis = $(this);
       var td = othis.closest('td');
-      var index = othis.parents('tr').eq(0).data('index');
+      var index = othis.parents('tr').eq(0).attr('data-index');
       // 标记当前活动行
       that.setRowActive(index);