vxe-table 3.12.0-beta.9 → 3.12.0

package/es/table/src/methods.js

@@ -94,31 +94,28 @@ function handleVirtualXVisible($xeTable) {
     return { toVisibleIndex: 0, visibleSize: 6 };
 }
 const computeRowHeight = ($xeTable) => {
-    const props = $xeTable;
-    const { showOverflow } = props;
     const tableHeader = $xeTable.$refs.tableHeader;
     const tableBody = $xeTable.$refs.tableBody;
     const tableBodyElem = tableBody ? tableBody.$el : null;
     const vSize = $xeTable.computeSize;
     const rowHeightMaps = $xeTable.computeRowHeightMaps;
-    let rowHeight = 24;
-    if (showOverflow) {
-        if (tableBodyElem) {
-            const tableHeaderElem = tableHeader ? tableHeader.$el : null;
-            let firstTrElem;
-            firstTrElem = tableBodyElem.querySelector('tr');
-            if (!firstTrElem && tableHeaderElem) {
-                firstTrElem = tableHeaderElem.querySelector('tr');
-            }
-            if (firstTrElem) {
-                rowHeight = firstTrElem.clientHeight;
-            }
-            if (!rowHeight) {
-                rowHeight = rowHeightMaps[vSize || 'default'];
-            }
+    let rowHeight = 0;
+    if (tableBodyElem) {
+        const tableHeaderElem = tableHeader ? tableHeader.$el : null;
+        let firstTrElem;
+        firstTrElem = tableBodyElem.querySelector('tr');
+        if (!firstTrElem && tableHeaderElem) {
+            firstTrElem = tableHeaderElem.querySelector('tr');
+        }
+        if (firstTrElem) {
+            rowHeight = firstTrElem.clientHeight;
         }
     }
-    return rowHeight;
+    if (!rowHeight) {
+        rowHeight = rowHeightMaps[vSize || 'default'];
+    }
+    // 最低支持 18px 行高
+    return Math.max(18, rowHeight);
 };
 function handleVirtualYVisible($xeTable) {
     const internalData = $xeTable;
@@ -531,7 +528,9 @@ const handleScrollToRowColumn = ($xeTable, fieldOrColumn, row) => {
     return $xeTable.$nextTick();
 };
 function handleRecalculateLayout($xeTable, reFull) {
+    const internalData = $xeTable;
     const el = $xeTable.$refs.refElem;
+    internalData.reRunTime = Date.now();
     if (!el || !el.clientWidth) {
         return $xeTable.$nextTick();
     }
@@ -967,7 +966,7 @@ const Methods = {
         const isLazy = treeConfig && treeOpts.lazy;
         const fullAllDataRowIdMaps = {};
         const fullDataRowIdMaps = {};
-        const handleCache = (row, index, items, path, parent, nodes) => {
+        const handleCache = (row, index, items, path, parentRow, nodes) => {
             let rowid = getRowid(this, row);
             const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
             const level = nodes ? nodes.length - 1 : 0;
@@ -980,13 +979,13 @@ const Methods = {
             }
             let cacheItem = fullAllDataRowIdData[rowid];
             if (!cacheItem) {
-                cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, items, parent, level, height: 0 };
+                cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, items, parent: parentRow, level, height: 0 };
             }
             cacheItem.row = row;
             cacheItem.items = items;
-            cacheItem.parent = parent;
+            cacheItem.parent = parentRow;
             cacheItem.level = level;
-            cacheItem.index = treeConfig && parent ? -1 : index;
+            cacheItem.index = treeConfig && parentRow ? -1 : index;
             if (isSource) {
                 fullDataRowIdMaps[rowid] = cacheItem;
             }
@@ -1051,9 +1050,9 @@ const Methods = {
                     sourceDataRowIdData[rowid] = XEUtils.clone(childRow, true);
                 });
             }
-            XEUtils.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
+            XEUtils.eachTree(rows, (childRow, index, items, path, parentItem, nodes) => {
                 const rowid = getRowid($xeTable, childRow);
-                const parentRow = parent || parentRest.row;
+                const parentRow = parentItem || parentRest.row;
                 const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0 };
                 fullDataRowIdData[rowid] = rest;
                 fullAllDataRowIdData[rowid] = rest;
@@ -1091,9 +1090,9 @@ const Methods = {
         let radioColumn;
         let htmlColumn;
         let hasFixed;
-        const handleFunc = (column, index, items, path, parent) => {
+        const handleFunc = (column, index, items, path, parentColumn) => {
             const { id: colid, field, fixed, type, treeNode } = column;
-            const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parent || null, width: 0 };
+            const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0 };
             if (field) {
                 if (fullColumnFieldData[field]) {
                     errLog('vxe.error.colRepet', ['field', field]);
@@ -1158,9 +1157,9 @@ const Methods = {
             fullColumnIdData[colid] = rest;
         };
         if (isGroup) {
-            XEUtils.eachTree(collectColumn, (column, index, items, path, parent, nodes) => {
+            XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn, nodes) => {
                 column.level = nodes.length;
-                handleFunc(column, index, items, path, parent);
+                handleFunc(column, index, items, path, parentColumn);
             });
         }
         else {
@@ -1752,10 +1751,10 @@ const Methods = {
         if (treeConfig && treeOpts.transform) {
             const fullData = [];
             const expandMaps = {};
-            XEUtils.eachTree(afterTreeFullData, (row, index, items, path, parent) => {
+            XEUtils.eachTree(afterTreeFullData, (row, index, items, path, parentRow) => {
                 const rowid = getRowid(this, row);
-                const parentRowid = getRowid(this, parent);
-                if (!parent || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
+                const parentRowid = getRowid(this, parentRow);
+                if (!parentRow || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
                     const rowRest = fullAllDataRowIdData[rowid];
                     if (rowRest) {
                         rowRest._index = fullData.length;
@@ -2290,11 +2289,11 @@ const Methods = {
         let hasCustomSort = false;
         // 处理还原
         if (resizableData || sortData || visibleData || fixedData) {
-            XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
+            XEUtils.eachTree(collectColumn, (column, index, items, path, parentRow) => {
                 const colKey = column.getKey();
                 // 支持一级
-                if (!parent) {
-                    if (fixedData && fixedData[colKey]) {
+                if (!parentRow) {
+                    if (fixedData && fixedData[colKey] !== undefined) {
                         column.fixed = fixedData[colKey];
                     }
                     if (sortData && XEUtils.isNumber(sortData[colKey])) {
@@ -2373,9 +2372,9 @@ const Methods = {
         let hasSort = 0;
         let hasFixedt = 0;
         let hasVisible = 0;
-        XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
+        XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
             // 只支持一级
-            if (!parent) {
+            if (!parentColumn) {
                 collectColumn.forEach((column) => {
                     const colKey = column.getKey();
                     if (colKey) {
@@ -2383,7 +2382,7 @@ const Methods = {
                         sortData[colKey] = column.renderSortNumber;
                     }
                 });
-                if (column.fixed && column.fixed !== column.defaultFixed) {
+                if (column.fixed !== column.defaultFixed) {
                     const colKey = column.getKey();
                     if (colKey) {
                         hasFixedt = 1;
@@ -2506,13 +2505,13 @@ const Methods = {
             const leftGroupList = [];
             const centerGroupList = [];
             const rightGroupList = [];
-            XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
+            XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
                 const isColGroup = hasChildrenList(column);
                 // 如果是分组，必须按组设置固定列，不允许给子列设置固定
-                if (parent && parent.fixed) {
-                    column.fixed = parent.fixed;
+                if (parentColumn && parentColumn.fixed) {
+                    column.fixed = parentColumn.fixed;
                 }
-                if (parent && column.fixed !== parent.fixed) {
+                if (parentColumn && column.fixed !== parentColumn.fixed) {
                     errLog('vxe.error.groupFixed');
                 }
                 if (isColGroup) {
@@ -2705,27 +2704,34 @@ const Methods = {
      * 刷新布局
      */
     recalculate(reFull) {
+        const $xeTable = this;
+        const internalData = $xeTable;
         return new Promise(resolve => {
-            const $xeTable = this;
-            const internalData = $xeTable;
-            const { rceTimeout } = internalData;
+            const { rceTimeout, reRunTime } = internalData;
+            const resizeOpts = $xeTable.computeResizeOpts;
+            const refreshDelay = resizeOpts.refreshDelay || 20;
             const el = $xeTable.$refs.refElem;
             if (el && el.clientWidth) {
                 $xeTable.autoCellWidth();
             }
             if (rceTimeout) {
                 clearTimeout(rceTimeout);
-                $xeTable.$nextTick(() => {
-                    resolve();
-                });
+                if (reRunTime && reRunTime + (refreshDelay - 5) < Date.now()) {
+                    resolve(handleRecalculateLayout($xeTable, !!reFull));
+                }
+                else {
+                    $xeTable.$nextTick(() => {
+                        resolve();
+                    });
+                }
             }
             else {
                 resolve(handleRecalculateLayout($xeTable, !!reFull));
             }
             internalData.rceTimeout = setTimeout(() => {
                 internalData.rceTimeout = undefined;
-                resolve(handleRecalculateLayout($xeTable, !!reFull));
-            }, 15);
+                handleRecalculateLayout($xeTable, !!reFull);
+            }, refreshDelay);
         });
     },
     calcCellWidth() {
@@ -5062,7 +5068,7 @@ const Methods = {
         const { editStore, editConfig, editOpts } = this;
         const { actived } = editStore;
         const cell = evnt.currentTarget;
-        params.cell = cell;
+        params = Object.assign({ cell }, params);
         if (isEnableConf(editConfig) && editOpts.trigger === 'dblclick') {
             if (!actived.args || evnt.currentTarget !== actived.args.cell) {
                 if (editOpts.mode === 'row') {
@@ -5230,7 +5236,7 @@ const Methods = {
         const { treeConfig, dragConfig } = props;
         const rowDragOpts = $xeTable.computeRowDragOpts;
         const { fullAllDataRowIdData, prevDragToChild } = internalData;
-        const { isCrossDrag, isSelfToChildDrag, dragEndMethod } = rowDragOpts;
+        const { isPeerDrag, isCrossDrag, isSelfToChildDrag, dragEndMethod } = rowDragOpts;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform, rowField, mapChildrenField, parentField } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -5272,20 +5278,28 @@ const Methods = {
                                 let isSelfToChildStatus = false;
                                 if (oldLevel && newLevel) {
                                     // 子到子
-                                    if (!isCrossDrag) {
-                                        return;
+                                    if (isPeerDrag) {
+                                        if (oldRest.row[parentField] !== newRest.row[parentField]) {
+                                            // 非同级
+                                            return;
+                                        }
                                     }
-                                    if (oldAllMaps[newRowid]) {
-                                        isSelfToChildStatus = true;
-                                        if (!isSelfToChildDrag) {
-                                            if (VxeUI.modal) {
-                                                VxeUI.modal.message({
-                                                    status: 'error',
-                                                    content: getI18n('vxe.error.treeDragChild')
-                                                });
-                                            }
+                                    else {
+                                        if (!isCrossDrag) {
                                             return;
                                         }
+                                        if (oldAllMaps[newRowid]) {
+                                            isSelfToChildStatus = true;
+                                            if (!(isCrossDrag && isSelfToChildDrag)) {
+                                                if (VxeUI.modal) {
+                                                    VxeUI.modal.message({
+                                                        status: 'error',
+                                                        content: getI18n('vxe.error.treeDragChild')
+                                                    });
+                                                }
+                                                return;
+                                            }
+                                        }
                                     }
                                 }
                                 else if (oldLevel) {
@@ -5301,7 +5315,7 @@ const Methods = {
                                     }
                                     if (oldAllMaps[newRowid]) {
                                         isSelfToChildStatus = true;
-                                        if (!isSelfToChildDrag) {
+                                        if (!(isCrossDrag && isSelfToChildDrag)) {
                                             if (VxeUI.modal) {
                                                 VxeUI.modal.message({
                                                     status: 'error',
@@ -5324,7 +5338,7 @@ const Methods = {
                                 const ntfIndex = ptfIndex + dragOffsetIndex;
                                 fullList.splice(ntfIndex, 0, dragRow);
                                 // 改变层级
-                                if (isSelfToChildStatus && isSelfToChildDrag) {
+                                if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
                                     XEUtils.each(dragRow[childrenField], childRow => {
                                         childRow[parentField] = dragRow[parentField];
                                     });
@@ -5400,9 +5414,9 @@ const Methods = {
         const { fullAllDataRowIdData } = internalData;
         const { dragRow } = reactData;
         const treeOpts = $xeTable.computeTreeOpts;
-        const { transform } = treeOpts;
+        const { transform, parentField } = treeOpts;
         const rowDragOpts = $xeTable.computeRowDragOpts;
-        const { isCrossDrag, isToChildDrag } = rowDragOpts;
+        const { isPeerDrag, isCrossDrag, isToChildDrag } = rowDragOpts;
         if (!dragRow) {
             evnt.preventDefault();
             return;
@@ -5417,7 +5431,8 @@ const Methods = {
             const { dragRow } = reactData;
             const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
             const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-            if ($xeTable.eqRow(dragRow, row) || (!isCrossDrag && treeConfig && rest.level)) {
+            if ($xeTable.eqRow(dragRow, row) ||
+                (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level))) {
                 showDropTip($xeTable, evnt, trEl, null, false, dragPos);
                 return;
             }
@@ -5489,7 +5504,7 @@ const Methods = {
         const internalData = $xeTable;
         const { mouseConfig } = props;
         const columnDragOpts = $xeTable.computeColumnDragOpts;
-        const { isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod } = columnDragOpts;
+        const { isPeerDrag, isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod } = columnDragOpts;
         const { collectColumn } = internalData;
         const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0;
         if (prevDragCol && dragCol) {
@@ -5517,20 +5532,28 @@ const Methods = {
                     let isSelfToChildStatus = false;
                     if (oldColumn.parentId && newColumn.parentId) {
                         // 子到子
-                        if (!isCrossDrag) {
-                            return;
+                        if (isPeerDrag) {
+                            if (oldColumn.parentId !== newColumn.parentId) {
+                                // 非同级
+                                return;
+                            }
                         }
-                        if (oldAllMaps[newColumn.id]) {
-                            isSelfToChildStatus = true;
-                            if (!isSelfToChildDrag) {
-                                if (VxeUI.modal) {
-                                    VxeUI.modal.message({
-                                        status: 'error',
-                                        content: getI18n('vxe.error.treeDragChild')
-                                    });
-                                }
+                        else {
+                            if (!isCrossDrag) {
                                 return;
                             }
+                            if (oldAllMaps[newColumn.id]) {
+                                isSelfToChildStatus = true;
+                                if (!(isCrossDrag && isSelfToChildDrag)) {
+                                    if (VxeUI.modal) {
+                                        VxeUI.modal.message({
+                                            status: 'error',
+                                            content: getI18n('vxe.error.treeDragChild')
+                                        });
+                                    }
+                                    return;
+                                }
+                            }
                         }
                     }
                     else if (oldColumn.parentId) {
@@ -5546,7 +5569,7 @@ const Methods = {
                         }
                         if (oldAllMaps[newColumn.id]) {
                             isSelfToChildStatus = true;
-                            if (!isSelfToChildDrag) {
+                            if (!(isCrossDrag && isSelfToChildDrag)) {
                                 if (VxeUI.modal) {
                                     VxeUI.modal.message({
                                         status: 'error',
@@ -5562,7 +5585,7 @@ const Methods = {
                     }
                     const oldewMatchRest = XEUtils.findTree(collectColumn, item => item.id === oldColumn.id);
                     // 改变层级
-                    if (isSelfToChildStatus && isSelfToChildDrag) {
+                    if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
                         if (oldewMatchRest) {
                             const { items: oCols, index: oIndex } = oldewMatchRest;
                             const childList = oldColumn.children || [];
@@ -5586,7 +5609,7 @@ const Methods = {
                     if (newMatchRest) {
                         const { items: nCols, index: nIndex, parent: nParent } = newMatchRest;
                         // 转子级
-                        if (isToChildDrag && prevDragToChild) {
+                        if ((isCrossDrag && isToChildDrag) && prevDragToChild) {
                             oldColumn.parentId = newColumn.id;
                             newColumn.children = (newColumn.children || []).concat([oldColumn]);
                         }
@@ -5598,8 +5621,8 @@ const Methods = {
                             nafIndex = nIndex;
                         }
                     }
-                    XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
-                        if (!parent) {
+                    XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+                        if (!parentColumn) {
                             const sortIndex = index + 1;
                             column.renderSortNumber = sortIndex;
                         }
@@ -5658,7 +5681,7 @@ const Methods = {
         const internalData = $xeTable;
         const { dragCol } = reactData;
         const columnDragOpts = $xeTable.computeColumnDragOpts;
-        const { isToChildDrag, isCrossDrag } = columnDragOpts;
+        const { isToChildDrag, isPeerDrag, isCrossDrag } = columnDragOpts;
         if (!dragCol) {
             evnt.preventDefault();
             return;
@@ -5672,11 +5695,13 @@ const Methods = {
             const { clientX } = evnt;
             const offsetX = clientX - thEl.getBoundingClientRect().x;
             const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
-            if (column.fixed || (dragCol && dragCol.id === column.id) || (!isCrossDrag && column.parentId)) {
+            if (column.fixed ||
+                (dragCol && dragCol.id === column.id) ||
+                (!isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.parentId))) {
                 showDropTip($xeTable, evnt, null, thEl, false, dragPos);
                 return;
             }
-            internalData.prevDragToChild = !!(isToChildDrag && hasCtrlKey);
+            internalData.prevDragToChild = !!((isCrossDrag && isToChildDrag) && hasCtrlKey);
             internalData.prevDragCol = column;
             internalData.prevDragPos = dragPos;
             showDropTip($xeTable, evnt, null, thEl, true, dragPos);

package/es/table/src/table.js

@@ -475,6 +475,9 @@ export default {
             return 0;
         },
         rowHeightMaps() {
+            return this.computeRowHeightMaps;
+        },
+        computeRowHeightMaps() {
             return {
                 default: 48,
                 medium: 44,
@@ -1112,18 +1115,11 @@ export default {
             });
         }
         if (this.autoResize) {
-            const handleWrapperResize = this.resizeOpts.refreshDelay ? XEUtils.throttle(() => this.recalculate(true), this.resizeOpts.refreshDelay, { leading: true, trailing: true }) : null;
-            const resizeObserver = globalResize.create(handleWrapperResize
-                ? () => {
-                    if (this.autoResize) {
-                        handleWrapperResize();
-                    }
+            const resizeObserver = globalResize.create(() => {
+                if (this.autoResize) {
+                    this.recalculate(true);
                 }
-                : () => {
-                    if (this.autoResize) {
-                        this.recalculate(true);
-                    }
-                });
+            });
             resizeObserver.observe(this.$el);
             resizeObserver.observe(this.getParentElem());
             this.$resize = resizeObserver;

package/es/toolbar/src/toolbar.js

@@ -4,7 +4,7 @@ import { VxeUI } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getIcon, getI18n, renderer, commands, createEvent, globalMixins, renderEmptyElement } = VxeUI;
-export default defineVxeComponent({
+export default {
     name: 'VxeToolbar',
     mixins: [
         globalMixins.sizeMixin
@@ -346,17 +346,23 @@ export default defineVxeComponent({
         /**
          * 渲染按钮
          */
-        renderBtns(h) {
+        renderLeftBtns(h) {
             // 使用已安装的组件，如果未安装则不渲染
             const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
             const $xeToolbar = this;
             const props = $xeToolbar;
+            const slots = $xeToolbar.$scopedSlots;
             const internalData = $xeToolbar.internalData;
             const $xeGrid = $xeToolbar.$xeGrid;
             const { buttons } = props;
             const { connectTable } = internalData;
             const $table = connectTable;
+            const buttonPrefixSlot = slots.buttonPrefix || slots['button-prefix'];
+            const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix'];
             const btnVNs = [];
+            if (buttonPrefixSlot) {
+                btnVNs.push(...getSlotVNs(buttonPrefixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $table: $table })));
+            }
             if (buttons) {
                 buttons.forEach((item) => {
                     const { dropdowns, buttonRender } = item;
@@ -405,6 +411,9 @@ export default defineVxeComponent({
                     }
                 });
             }
+            if (buttonSuffixSlot) {
+                btnVNs.push(...getSlotVNs(buttonSuffixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $table: $table })));
+            }
             return btnVNs;
         },
         /**
@@ -415,12 +424,18 @@ export default defineVxeComponent({
             const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
             const $xeToolbar = this;
             const props = $xeToolbar;
+            const slots = $xeToolbar.$scopedSlots;
             const internalData = $xeToolbar.internalData;
             const $xeGrid = $xeToolbar.$xeGrid;
             const { tools } = props;
             const { connectTable } = internalData;
             const $table = connectTable;
+            const toolPrefixSlot = slots.toolPrefix || slots['tool-prefix'];
+            const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix'];
             const btnVNs = [];
+            if (toolPrefixSlot) {
+                btnVNs.push(...getSlotVNs(toolPrefixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $table: $table })));
+            }
             if (tools) {
                 tools.forEach((item, tIndex) => {
                     const { dropdowns, toolRender } = item;
@@ -472,6 +487,9 @@ export default defineVxeComponent({
                     }
                 });
             }
+            if (toolSuffixSlot) {
+                btnVNs.push(...getSlotVNs(toolSuffixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $table: $table })));
+            }
             return btnVNs;
         },
         renderToolImport(h) {
@@ -625,7 +643,7 @@ export default defineVxeComponent({
             }, [
                 h('div', {
                     class: 'vxe-buttons--wrapper'
-                }, buttonsSlot ? buttonsSlot({ $grid: $xeGrid, $table: $table }) : $xeToolbar.renderBtns(h)),
+                }, buttonsSlot ? buttonsSlot({ $grid: $xeGrid, $table: $table }) : $xeToolbar.renderLeftBtns(h)),
                 h('div', {
                     class: 'vxe-tools--wrapper'
                 }, toolsSlot ? toolsSlot({ $grid: $xeGrid, $table: $table }) : $xeToolbar.renderRightTools(h)),
@@ -686,4 +704,4 @@ export default defineVxeComponent({
     render(h) {
         return this.renderVN(h);
     }
-});
+};

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.12.0-beta.9";
+export const version = "3.12.0";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -31,7 +31,7 @@ VxeUI.setConfig({
         //   keyField: '_X_ROW_KEY' // 行数据的唯一主键字段名
         // },
         resizeConfig: {
-        // refreshDelay: 250
+        // refreshDelay: 20
         },
         resizableConfig: {
             dragMode: 'auto',

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.12.0-beta.9"}`;
+const version = `table v${"3.12.0"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/es/ui/src/vn.js

@@ -26,6 +26,9 @@ export function getChangeEvent(renderOpts) {
     return 'change';
 }
 export function getSlotVNs(vns) {
+    if (vns === null || vns === undefined) {
+        return [];
+    }
     if (XEUtils.isArray(vns)) {
         return vns;
     }