vxe-table 4.19.23 → 4.19.25

package/dist/all.esm.js

@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version = "4.19.23";
+const version = "4.19.25";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -755,7 +755,7 @@ function wheelScrollTopTo(diffNum, cb) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.19.23"}`;
+const tableVersion = `table v${"4.19.25"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -2593,7 +2593,7 @@ const Cell = {
         const { treeExpandedFlag } = tableReactData;
         const { fullAllDataRowIdData, treeExpandedMaps, treeExpandLazyLoadedMaps } = tableInternalData;
         const treeOpts = computeTreeOpts.value;
-        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];
@@ -2628,7 +2628,7 @@ const Cell = {
                 }
                 : undefined
         }, [
-            showIcon && (lazy ? (isLazyLoaded ? hasChild : (hasChild || hasLazyChilds)) : hasChild)
+            showIcon && (lazy ? (isLazyLoaded ? hasChild : (hasChild || hasLazyChilds)) : hasChild) && (!visibleMethod || visibleMethod(params))
                 ? [
                     h('div', Object.assign({ class: 'vxe-cell--tree-btn' }, ons), [
                         h('i', {
@@ -19410,8 +19410,9 @@ var VxeTableComponent = defineVxeComponent({
             const result = [];
             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) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows;
+            let validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, _columnIndex, row })) : rows;
             if (accordion) {
                 validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
                 // 同一级只能展开一个
@@ -20848,10 +20849,10 @@ var VxeTableComponent = defineVxeComponent({
                         return false;
                     }
                     if (arguments.length > 1) {
-                        return !eqCellValue(oRow, row, field).result;
+                        return !eqCellValue(row, oRow, field).result;
                     }
                     for (let i = 0; i < keepFields.length; i++) {
-                        if (!eqCellValue(oRow, row, keepFields[i]).result) {
+                        if (!eqCellValue(row, oRow, keepFields[i]).result) {
                             return true;
                         }
                     }
@@ -20880,7 +20881,7 @@ var VxeTableComponent = defineVxeComponent({
                         }
                         for (let i = 0; i < keepFields.length; i++) {
                             const field = keepFields[i];
-                            const { result, newValue, oldValue } = eqCellValue(oRow, row, field);
+                            const { result, newValue, oldValue } = eqCellValue(row, oRow, field);
                             if (!result) {
                                 const column = fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
                                 cellList.push({ row, rowid, column, field, newValue, oldValue });