From b6e48807e7f15c43d92a01d99d5e4c4654963c08 Mon Sep 17 00:00:00 2001
From: sight <26325820+Sight-wcg@users.noreply.github.com>
Date: Sun, 15 Jun 2025 17:18:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(treeTable):=20expandNode=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20done=20=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/treeTable-async.html | 34 +++++++++++++++++++++++++++++++++-
 src/modules/treeTable.js      | 21 +++++++++++++--------
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/examples/treeTable-async.html b/examples/treeTable-async.html
index a9ae507d..5c70f227 100644
--- a/examples/treeTable-async.html
+++ b/examples/treeTable-async.html
@@ -14,12 +14,17 @@
   <div class="layui-fluid" style="padding: 15px;">
     <button class="layui-btn" lay-on="asyncLoad">asyncLoad</button>
     <button class="layui-btn" lay-on="flatData">flatData</button>
+    <button class="layui-btn" lay-on="expandNode">expandNode</button>
+    <button class="layui-btn" lay-on="unexpandNode">unexpandNode</button>
     <table id="demo"></table>
   </div>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/Mock.js/1.0.0/mock-min.js"></script>
   <script src="../src/layui.js" src1="//cdnjs.cloudflare.com/ajax/libs/layui/2.9.7/layui.js"
     src1="https://cdn.jsdelivr.net/gh/layui/layui@879a9c629cc832f5b235d138adf164d74c34991b/src/layui.js"></script>
   <script>
+    Mock.setup({
+      timeout: '100-300'
+    });
     layui.use(["treeTable", "util"], function () {
       var treeTable = layui.treeTable;
       var util = layui.util;
@@ -39,6 +44,11 @@
               async: {
                 enable: true,
                 autoParam: ["parentId=id"]
+              },
+              callback: {
+                onExpand: function (tableId, trData, trExpand) {
+                  console.log('onExpand', tableId, trData.id, trExpand);
+                }
               }
             },
           }, true)
@@ -57,6 +67,28 @@
               }
             },
           }, true)
+        },
+        expandNode: function(){
+          treeTable.expandNode('demo', {
+            index: 0,
+            expandFlag: true,
+            inherit: true,
+            callbackFlag: true,
+            done: function (tableId, trData, trExpand) {
+              console.log('done', tableId, trData.id, trExpand);
+            }
+          })
+        },
+        unexpandNode: function(){
+          treeTable.expandNode('demo', {
+            index: 0,
+            expandFlag: false,
+            inherit: true,
+            callbackFlag: true,
+            done: function (tableId, trData, trExpand) {
+              console.log('done', tableId, trData.id, trExpand);
+            }
+          })
         }
       })
 
@@ -130,7 +162,7 @@
       //var testDatas = getTreeData(rootNodes);
 
       Mock.mock(/getDatas/, "get", (config) => {
-        console.log(config);
+        //console.log(config);
         var params = layui.url(config.url);
         var search = params.search;
         var parentId = search.parentId;
diff --git a/src/modules/treeTable.js b/src/modules/treeTable.js
index afe51963..df9d6d5d 100644
--- a/src/modules/treeTable.js
+++ b/src/modules/treeTable.js
@@ -590,7 +590,7 @@ layui.define(['table'], function (exports) {
   })()
 
   // 优化参数，添加一个 getNodeByIndex 方法 只传 表格id 和行 dataIndex 分几步优化 todo
-  var expandNode = function (treeNode, expandFlag, sonSign, focus, callbackFlag) {
+  var expandNode = function (treeNode, expandFlag, sonSign, focus, callbackFlag, done) {
     // treeNode // 需要展开的节点
     var trElem = treeNode.trElem;
     var tableViewElem = treeNode.tableViewElem || trElem.closest(ELEM_VIEW);
@@ -658,7 +658,7 @@ layui.define(['table'], function (exports) {
               tableViewElem: tableViewElem,
               tableId: tableId,
               options: options,
-            }, expandFlag, sonSign, focus, callbackFlag);
+            }, expandFlag, sonSign, focus, callbackFlag, done);
           } else if (item1[LAY_EXPAND]) { // 初始化级联展开
             expandNode({
               dataIndex: item1[LAY_DATA_INDEX],
@@ -666,7 +666,7 @@ layui.define(['table'], function (exports) {
               tableViewElem: tableViewElem,
               tableId: tableId,
               options: options,
-            }, true);
+            }, true, undefined, undefined, undefined, done);
           }
         });
       } else {
@@ -681,7 +681,7 @@ layui.define(['table'], function (exports) {
             trData[LAY_ASYNC_STATUS] = 'success';
             trData[customName.children] = data;
             treeTableThat.initData(trData[customName.children], trData[LAY_DATA_INDEX])
-            expandNode(treeNode, true, isToggle ? false : sonSign, focus, callbackFlag);
+            expandNode(treeNode, true, isToggle ? false : sonSign, focus, callbackFlag, done);
           }
 
           var format = asyncSetting.format; // 自定义数据返回方法
@@ -804,7 +804,7 @@ layui.define(['table'], function (exports) {
                 tableViewElem: tableViewElem,
                 tableId: tableId,
                 options: options,
-              }, expandFlag, sonSign, focus, callbackFlag);
+              }, expandFlag, sonSign, focus, callbackFlag, done);
             })
           }
         }
@@ -820,7 +820,7 @@ layui.define(['table'], function (exports) {
             tableViewElem: tableViewElem,
             tableId: tableId,
             options: options,
-          }, expandFlag, sonSign, focus, callbackFlag);
+          }, expandFlag, sonSign, focus, callbackFlag, done);
         });
         tableViewElem.find(childNodes.map(function (value, index, array) { // 只隐藏直接子节点，其他由递归的处理
           return 'tr[lay-data-index="' + value[LAY_DATA_INDEX] + '"]'
@@ -843,6 +843,10 @@ layui.define(['table'], function (exports) {
       layui.type(onExpand) === 'function' && onExpand(tableId, trData, trExpand);
     }
 
+    if(layui.type(done) === 'function' && trData[LAY_ASYNC_STATUS] !== 'loading'){
+      done(tableId, trData, trExpand);
+    }
+
     return retValue;
   }
 
@@ -853,7 +857,8 @@ layui.define(['table'], function (exports) {
    * @param {Number|String} opts.index 展开行的数据下标
    * @param {Boolean} [opts.expandFlag] 展开、关闭、切换
    * @param {Boolean} [opts.inherit] 是否级联子节点
-   * @param {Boolean} [opts.callbackFlag] 是否触发事件
+   * @param {Boolean} [opts.callbackFlag] 是否触发 tree.callback 事件
+   * @param {Boolean} [opts.done] 节点操作完成后的回调函数
    * @return [{Boolean}] 状态结果
    * */
   treeTable.expandNode = function (id, opts) {
@@ -871,7 +876,7 @@ layui.define(['table'], function (exports) {
     var tableViewElem = options.elem.next();
     return expandNode({
       trElem: tableViewElem.find('tr[lay-data-index="' + index + '"]').first()
-    }, expandFlag, sonSign, null, callbackFlag)
+    }, expandFlag, sonSign, null, callbackFlag, opts.done)
   };
 
   /**