releases 3.21.24

Author: xuliangzhan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.21.23",
+  "version": "3.21.24",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -68,7 +68,7 @@
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
     "vue-template-compiler": "2.6.14",
-    "vxe-pc-ui": "3.15.21"
+    "vxe-pc-ui": "3.15.27"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

packages/table/src/cell.ts

@@ -553,7 +553,7 @@ export const Cell = {
     const treeOpts = $table.computeTreeOpts
     const { row, column, level } = params
     const { slots } = column
-    const { padding, indent, lazy, trigger, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts
+    const { padding, indent, lazy, trigger, visibleMethod, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
     const rowChilds = row[childrenField]
@@ -593,7 +593,7 @@ export const Cell = {
             }
           : undefined
       }, [
-        showIcon && (lazy ? (isLazyLoaded ? hasChild : (hasChild || hasLazyChilds)) : hasChild)
+        showIcon && (lazy ? (isLazyLoaded ? hasChild : (hasChild || hasLazyChilds)) : hasChild) && (!visibleMethod || visibleMethod(params))
           ? [
               h('div', {
                 class: 'vxe-cell--tree-btn',

packages/table/src/methods.ts

@@ -487,8 +487,9 @@ function handleBaseTreeExpand ($xeTable: VxeTableConstructor & VxeTablePrivateMe
   const result: any[] = []
   const columnIndex = $xeTable.getColumnIndex(treeNodeColumn)
   const $columnIndex = $xeTable.getVMColumnIndex(treeNodeColumn)
+  const _columnIndex = $xeTable.getVTColumnIndex(treeNodeColumn)
   const { handleGetRowId } = createHandleGetRowId($xeTable)
-  let validRows = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows
+  let validRows = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, _columnIndex, row })) : rows
   if (accordion) {
     validRows = validRows.length ? [validRows[validRows.length - 1]] : []
     // 同一级只能展开一个