vxe-table 3.15.1 → 3.15.3

package/es/table/src/methods.js

@@ -308,6 +308,95 @@ const updateScrollYStatus = ($xeTable, fullData) => {
     reactData.scrollYLoad = scrollYLoad;
     return scrollYLoad;
 };
+/**
+ * 展开与收起树节点
+ * @param rows
+ * @param expanded
+ * @returns
+ */
+function handleBaseTreeExpand($xeTable, rows, expanded) {
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const { treeNodeColumn } = reactData;
+    const { fullAllDataRowIdData, tableFullData, treeExpandedMaps, treeExpandLazyLoadedMaps } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const { reserve, lazy, accordion, toggleMethod } = treeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+    const result = [];
+    const columnIndex = $xeTable.getColumnIndex(treeNodeColumn);
+    const $columnIndex = $xeTable.getVMColumnIndex(treeNodeColumn);
+    const { handleGetRowId } = createHandleGetRowId($xeTable);
+    let validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows;
+    if (accordion) {
+        validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
+        // 同一级只能展开一个
+        const matchObj = XEUtils.findTree(tableFullData, item => item === validRows[0], { children: childrenField });
+        if (matchObj) {
+            matchObj.items.forEach(item => {
+                const rowid = handleGetRowId(item);
+                if (treeExpandedMaps[rowid]) {
+                    delete treeExpandedMaps[rowid];
+                }
+            });
+        }
+    }
+    if (expanded) {
+        validRows.forEach((row) => {
+            const rowid = handleGetRowId(row);
+            if (!treeExpandedMaps[rowid]) {
+                const rowRest = fullAllDataRowIdData[rowid];
+                if (rowRest) {
+                    const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
+                    // 是否使用懒加载
+                    if (isLoad) {
+                        result.push(handleAsyncTreeExpandChilds($xeTable, row));
+                    }
+                    else {
+                        if (row[childrenField] && row[childrenField].length) {
+                            treeExpandedMaps[rowid] = row;
+                        }
+                    }
+                }
+            }
+        });
+    }
+    else {
+        validRows.forEach(item => {
+            const rowid = handleGetRowId(item);
+            if (treeExpandedMaps[rowid]) {
+                delete treeExpandedMaps[rowid];
+            }
+        });
+    }
+    if (reserve) {
+        validRows.forEach((row) => handleTreeExpandReserve($xeTable, row, expanded));
+    }
+    reactData.treeExpandedFlag++;
+    return Promise.all(result).then(() => {
+        return $xeTable.recalculate();
+    });
+}
+/**
+ * 虚拟树的展开与收起
+ * @param rows
+ * @param expanded
+ * @returns
+ */
+function handleVirtualTreeExpand($xeTable, rows, expanded) {
+    return handleBaseTreeExpand($xeTable, rows, expanded).then(() => {
+        handleVirtualTreeToList($xeTable);
+        $xeTable.handleTableData();
+        updateAfterDataIndex($xeTable);
+        return $xeTable.$nextTick();
+    }).then(() => {
+        return $xeTable.recalculate(true);
+    }).then(() => {
+        setTimeout(() => {
+            $xeTable.updateCellAreas();
+        }, 30);
+    });
+}
 function updateAfterListIndex($xeTable) {
     const props = $xeTable;
     const internalData = $xeTable;
@@ -2872,7 +2961,12 @@ const Methods = {
             $xeTable.checkSelectionStatus();
             return new Promise(resolve => {
                 this.$nextTick()
-                    .then(() => $xeTable.recalculate())
+                    .then(() => handleRecalculateLayout($xeTable, false))
+                    .then(() => {
+                    calcCellHeight($xeTable);
+                    updateRowOffsetTop($xeTable);
+                    return handleRecalculateLayout($xeTable, false);
+                })
                     .then(() => {
                     let targetScrollLeft = lastScrollLeft;
                     let targetScrollTop = lastScrollTop;
@@ -2886,8 +2980,7 @@ const Methods = {
                         targetScrollTop = 0;
                     }
                     reactData.isRowLoading = false;
-                    calcCellHeight($xeTable);
-                    updateRowOffsetTop($xeTable);
+                    handleRecalculateLayout($xeTable, false);
                     // 是否变更虚拟滚动
                     if (oldScrollYLoad === sYLoad) {
                         restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop)
@@ -6459,6 +6552,10 @@ const Methods = {
         const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const beforeRowMethod = currentColumnOpts.beforeSelectMethod || columnOpts.currentMethod;
         const { column: newValue } = params;
+        const { trigger } = currentColumnOpts;
+        if (trigger === 'manual') {
+            return;
+        }
         const isChange = oldValue !== newValue;
         if (!beforeRowMethod || beforeRowMethod({ column: newValue, $table: $xeTable })) {
             $xeTable.setCurrentColumn(newValue);
@@ -6478,6 +6575,10 @@ const Methods = {
         const currentRowOpts = $xeTable.computeCurrentRowOpts;
         const beforeRowMethod = currentRowOpts.beforeSelectMethod || rowOpts.currentMethod;
         const { row: newValue } = params;
+        const { trigger } = currentRowOpts;
+        if (trigger === 'manual') {
+            return;
+        }
         const isChange = oldValue !== newValue;
         if (!beforeRowMethod || beforeRowMethod({ row: newValue, $table: $xeTable })) {
             $xeTable.setCurrentRow(newValue);
@@ -7979,7 +8080,7 @@ const Methods = {
                 internalData.rowExpandedMaps = rowExpandedMaps;
                 rows = rows.slice(rows.length - 1, rows.length);
             }
-            const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows;
+            const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: $xeTable.getRowIndex(row), $rowIndex: $xeTable.getVMRowIndex(row) })) : rows;
             if (expanded) {
                 validRows.forEach((row) => {
                     const rowid = handleGetRowId(row);
@@ -7996,7 +8097,7 @@ const Methods = {
                 });
             }
             else {
-                validRows.forEach((item) => {
+                validRows.forEach(item => {
                     const rowid = handleGetRowId(item);
                     if (rowExpandedMaps[rowid]) {
                         delete rowExpandedMaps[rowid];
@@ -8188,10 +8289,10 @@ const Methods = {
     triggerTreeExpandEvent(evnt, params) {
         const $xeTable = this;
         const internalData = $xeTable;
-        const { treeExpandLazyLoadedMaps } = internalData;
+        const { treeExpandLazyLoadedMaps, treeEATime } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { row, column } = params;
-        const { lazy, trigger } = treeOpts;
+        const { lazy, trigger, accordion } = treeOpts;
         if (trigger === 'manual') {
             return;
         }
@@ -8201,7 +8302,17 @@ const Methods = {
             const expanded = !$xeTable.isTreeExpandByRow(row);
             const columnIndex = $xeTable.getColumnIndex(column);
             const $columnIndex = $xeTable.getVMColumnIndex(column);
-            $xeTable.setTreeExpand(row, expanded);
+            if (treeEATime) {
+                clearTimeout(treeEATime);
+            }
+            $xeTable.setTreeExpand(row, expanded).then(() => {
+                if (accordion) {
+                    internalData.treeEATime = setTimeout(() => {
+                        internalData.treeEATime = undefined;
+                        $xeTable.scrollToRow(row);
+                    }, 30);
+                }
+            });
             $xeTable.dispatchEvent('toggle-tree-expand', { expanded, column, columnIndex, $columnIndex, row }, evnt);
         }
     },
@@ -8228,96 +8339,6 @@ const Methods = {
         }, { children: childrenField });
         return this.setTreeExpand(expandeds, expanded);
     },
-    /**
-     * 默认，展开与收起树节点
-     * @param rows
-     * @param expanded
-     * @returns
-     */
-    handleBaseTreeExpand(rows, expanded) {
-        const $xeTable = this;
-        const reactData = $xeTable;
-        const internalData = $xeTable;
-        const { treeNodeColumn } = reactData;
-        const { fullAllDataRowIdData, tableFullData, treeExpandedMaps, treeExpandLazyLoadedMaps } = internalData;
-        const treeOpts = $xeTable.computeTreeOpts;
-        const { reserve, lazy, accordion, toggleMethod } = treeOpts;
-        const childrenField = treeOpts.children || treeOpts.childrenField;
-        const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-        const result = [];
-        const columnIndex = $xeTable.getColumnIndex(treeNodeColumn);
-        const $columnIndex = $xeTable.getVMColumnIndex(treeNodeColumn);
-        const { handleGetRowId } = createHandleGetRowId($xeTable);
-        let validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows;
-        if (accordion) {
-            validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
-            // 同一级只能展开一个
-            const matchObj = XEUtils.findTree(tableFullData, item => item === validRows[0], { children: childrenField });
-            if (matchObj) {
-                matchObj.items.forEach(item => {
-                    const rowid = handleGetRowId(item);
-                    if (treeExpandedMaps[rowid]) {
-                        delete treeExpandedMaps[rowid];
-                    }
-                });
-            }
-        }
-        if (expanded) {
-            validRows.forEach((row) => {
-                const rowid = handleGetRowId(row);
-                if (!treeExpandedMaps[rowid]) {
-                    const rowRest = fullAllDataRowIdData[rowid];
-                    if (rowRest) {
-                        const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
-                        // 是否使用懒加载
-                        if (isLoad) {
-                            result.push(handleAsyncTreeExpandChilds($xeTable, row));
-                        }
-                        else {
-                            if (row[childrenField] && row[childrenField].length) {
-                                treeExpandedMaps[rowid] = row;
-                            }
-                        }
-                    }
-                }
-            });
-        }
-        else {
-            validRows.forEach((item) => {
-                const rowid = handleGetRowId(item);
-                if (treeExpandedMaps[rowid]) {
-                    delete treeExpandedMaps[rowid];
-                }
-            });
-        }
-        if (reserve) {
-            validRows.forEach((row) => handleTreeExpandReserve($xeTable, row, expanded));
-        }
-        reactData.treeExpandedFlag++;
-        return Promise.all(result).then(() => {
-            return $xeTable.recalculate();
-        });
-    },
-    /**
-     * 虚拟树的展开与收起
-     * @param rows
-     * @param expanded
-     * @returns
-     */
-    handleVirtualTreeExpand(rows, expanded) {
-        const $xeTable = this;
-        return this.handleBaseTreeExpand(rows, expanded).then(() => {
-            handleVirtualTreeToList($xeTable);
-            this.handleTableData();
-            updateAfterDataIndex($xeTable);
-        }).then(() => {
-            return this.recalculate();
-        }).then(() => {
-            setTimeout(() => {
-                this.updateCellAreas();
-            }, 30);
-        });
-    },
     /**
      * 设置展开树形节点，二个参数设置这一行展开与否
      * 支持单行
@@ -8326,6 +8347,7 @@ const Methods = {
      * @param {Boolean} expanded 是否展开
      */
     setTreeExpand(rows, expanded) {
+        const $xeTable = this;
         const { treeOpts } = this;
         const { transform } = treeOpts;
         if (rows) {
@@ -8335,10 +8357,10 @@ const Methods = {
             if (rows.length) {
                 // 如果为虚拟树
                 if (transform) {
-                    return this.handleVirtualTreeExpand(rows, expanded);
+                    return handleVirtualTreeExpand($xeTable, rows, expanded);
                 }
                 else {
-                    return this.handleBaseTreeExpand(rows, expanded);
+                    return handleBaseTreeExpand($xeTable, rows, expanded);
                 }
             }
         }
@@ -8948,7 +8970,8 @@ const Methods = {
             if (isScrollXBig && mouseOpts.area) {
                 errLog('vxe.error.notProp', ['mouse-config.area']);
             }
-            $xeTable.$nextTick(() => {
+            calcScrollbar($xeTable);
+            return $xeTable.$nextTick(() => {
                 updateStyle($xeTable);
             });
         }
@@ -9057,6 +9080,7 @@ const Methods = {
         if (isScrollYBig && mouseOpts.area) {
             errLog('vxe.error.notProp', ['mouse-config.area']);
         }
+        calcScrollbar($xeTable);
         return $xeTable.$nextTick().then(() => {
             updateStyle($xeTable);
         });

package/es/table/src/table.js

@@ -1407,6 +1407,9 @@ export default {
         if (this.highlightHoverColumn) {
             warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
         }
+        if (props.resizable) {
+            warnLog('vxe.error.delProp', ['resizable', 'column-config.resizable']);
+        }
         // if (props.scrollY) {
         //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
         // }

package/es/table/style.css

@@ -1467,9 +1467,11 @@
   position: absolute;
   top: 0;
   min-width: 100px;
+  font-size: var(--vxe-ui-font-size-default);
   border-radius: var(--vxe-ui-border-radius);
   background-color: var(--vxe-ui-layout-background-color);
   border: 1px solid var(--vxe-ui-base-popup-border-color);
+  color: var(--vxe-ui-font-color);
   box-shadow: var(--vxe-ui-base-popup-box-shadow);
   z-index: 10;
 }
@@ -1579,6 +1581,16 @@
   vertical-align: middle;
 }
 
+.vxe-table--filter-wrapper.size--medium {
+  font-size: var(--vxe-ui-font-size-medium);
+}
+.vxe-table--filter-wrapper.size--small {
+  font-size: var(--vxe-ui-font-size-small);
+}
+.vxe-table--filter-wrapper.size--mini {
+  font-size: var(--vxe-ui-font-size-mini);
+}
+
 .vxe-table--context-menu-wrapper {
   display: none;
 }
@@ -2997,6 +3009,9 @@
           user-select: none;
   cursor: pointer;
 }
+.vxe-table--render-default .vxe-tree--btn-wrapper > i {
+  background-color: var(--vxe-ui-layout-background-color);
+}
 .vxe-table--render-default .vxe-tree--node-btn {
   display: block;
   color: var(--vxe-ui-font-lighten-color);
@@ -3017,6 +3032,9 @@
 .vxe-table--render-default .vxe-body--column.col--cs-height, .vxe-table--render-default .vxe-body--column.col--rs-height, .vxe-table--render-default .vxe-body--column.col--auto-height {
   overflow: hidden;
 }
+.vxe-table--render-default .vxe-body--column.col--cs-height.col--tree-node, .vxe-table--render-default .vxe-body--column.col--rs-height.col--tree-node, .vxe-table--render-default .vxe-body--column.col--auto-height.col--tree-node {
+  overflow: unset;
+}
 .vxe-table--render-default .vxe-body--column.col--cs-height > .vxe-cell, .vxe-table--render-default .vxe-body--column.col--rs-height > .vxe-cell, .vxe-table--render-default .vxe-body--column.col--auto-height > .vxe-cell {
   overflow: hidden;
 }