vxe-table 3.20.4 → 3.20.6

package/es/table/src/methods.js

@@ -8331,19 +8331,24 @@ const tableMethods = {
         if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
             let newValue = row;
             let isChange = oldValue !== newValue;
-            const selected = !isChange;
-            if (isChange) {
+            if (strict) {
                 handleCheckedRadioRow($xeTable, newValue);
             }
-            else if (!strict) {
-                isChange = oldValue === newValue;
-                if (isChange) {
+            else {
+                if (oldValue === newValue) {
+                    newValue = null;
+                }
+                isChange = oldValue !== newValue;
+                if (isChange && newValue) {
+                    handleCheckedRadioRow($xeTable, newValue);
+                }
+                else {
                     newValue = null;
                     $xeTable.clearRadioRow();
                 }
             }
             if (isChange) {
-                $xeTable.dispatchEvent('radio-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
+                $xeTable.dispatchEvent('radio-change', Object.assign({ oldValue, newValue, selected: !!newValue }, params), evnt);
             }
         }
     },
@@ -8354,29 +8359,31 @@ const tableMethods = {
         const columnOpts = $xeTable.computeColumnOpts;
         const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const beforeRowMethod = currentColumnOpts.beforeSelectMethod || columnOpts.currentMethod;
-        let { column: newValue } = params;
+        let newValue = params.column;
         const { trigger, strict } = currentColumnOpts;
         if (trigger === 'manual') {
             return;
         }
         let isChange = oldValue !== newValue;
-        const selected = !isChange;
-        if (!beforeRowMethod || beforeRowMethod({ column: newValue, selected, $table: $xeTable })) {
+        if (!beforeRowMethod || beforeRowMethod({ column: newValue, $table: $xeTable })) {
             if (strict) {
                 $xeTable.setCurrentColumn(newValue);
             }
             else {
-                isChange = oldValue === newValue;
-                if (isChange) {
+                if (oldValue === newValue) {
                     newValue = null;
-                    $xeTable.clearCurrentColumn();
                 }
-                else {
+                isChange = oldValue !== newValue;
+                if (isChange && newValue) {
                     $xeTable.setCurrentColumn(newValue);
                 }
+                else {
+                    newValue = null;
+                    $xeTable.clearCurrentColumn();
+                }
             }
             if (isChange) {
-                $xeTable.dispatchEvent('current-column-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
+                $xeTable.dispatchEvent('current-column-change', Object.assign({ oldValue, newValue, selected: !!newValue }, params), evnt);
             }
         }
         else {
@@ -8396,25 +8403,27 @@ const tableMethods = {
             return;
         }
         let isChange = oldValue !== newValue;
-        const selected = !isChange;
-        if (!beforeRowMethod || beforeRowMethod({ row: newValue, selected, $table: $xeTable })) {
+        if (!beforeRowMethod || beforeRowMethod({ row: newValue, $table: $xeTable })) {
             if (strict) {
                 $xeTable.setCurrentRow(newValue);
             }
             else {
-                isChange = oldValue === newValue;
-                if (isChange) {
+                if (oldValue === newValue) {
                     newValue = null;
-                    $xeTable.clearCurrentRow();
                 }
-                else {
+                isChange = oldValue !== newValue;
+                if (isChange && newValue) {
                     $xeTable.setCurrentRow(newValue);
                 }
+                else {
+                    newValue = null;
+                    $xeTable.clearCurrentRow();
+                }
             }
             if (isChange) {
-                $xeTable.dispatchEvent('current-row-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
+                $xeTable.dispatchEvent('current-row-change', Object.assign({ oldValue, newValue, selected: !!newValue }, params), evnt);
                 // 已废弃
-                $xeTable.dispatchEvent('current-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
+                $xeTable.dispatchEvent('current-change', Object.assign({ oldValue, newValue }, params), evnt);
             }
         }
         else {
@@ -11996,7 +12005,9 @@ const tableMethods = {
         const $xeTable = this;
         const props = $xeTable;
         const reactData = $xeTable;
+        const internalData = $xeTable;
         const { isAllOverflow, scrollYLoad, scrollXLoad } = reactData;
+        const { _sToTime } = internalData;
         const rest = [];
         if (row) {
             if (props.treeConfig) {
@@ -12009,11 +12020,29 @@ const tableMethods = {
         if (fieldOrColumn) {
             rest.push(handleScrollToRowColumn($xeTable, fieldOrColumn, row, options));
         }
+        if (_sToTime) {
+            clearTimeout(_sToTime);
+        }
         return Promise.all(rest).then(() => {
             if (row) {
                 if (!isAllOverflow && (scrollYLoad || scrollXLoad)) {
                     calcCellHeight($xeTable);
                     calcCellWidth($xeTable);
+                    // 可视区被渲染后位置被偏移
+                    internalData._sToTime = setTimeout(() => {
+                        internalData._sToTime = undefined;
+                        if (scrollYLoad) {
+                            if (props.treeConfig) {
+                                $xeTable.scrollToTreeRow(row);
+                            }
+                            else {
+                                rowToVisible($xeTable, row);
+                            }
+                        }
+                        if (scrollXLoad && fieldOrColumn) {
+                            handleScrollToRowColumn($xeTable, fieldOrColumn, row, options);
+                        }
+                    }, 350);
                 }
                 return $xeTable.$nextTick();
             }

package/es/table/src/table.js

@@ -51,6 +51,27 @@ function handleKeyField($xeTable) {
     internalData.currKeyField = keyField;
     internalData.isCurrDeepKey = hasDeepKey(keyField);
 }
+function updateColumnAllOverflow($xeTable) {
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const { showOverflow } = props;
+    const { isGroup } = reactData;
+    const { tableFullColumn, collectColumn } = internalData;
+    let isAllOverflow = !!showOverflow;
+    const handleFunc = (column) => {
+        if (isAllOverflow && column.showOverflow === false) {
+            isAllOverflow = false;
+        }
+    };
+    if (isGroup) {
+        XEUtils.eachTree(collectColumn, handleFunc);
+    }
+    else {
+        tableFullColumn.forEach(handleFunc);
+    }
+    reactData.isAllOverflow = isAllOverflow;
+}
 /**
  * 渲染浮固定列
  * 分别渲染左边固定列和右边固定列
@@ -1376,6 +1397,17 @@ export default {
         showFooter() {
             this.reLayoutFlag++;
         },
+        showHeaderOverflow() {
+            this.reLayoutFlag++;
+        },
+        showOverflow() {
+            const $xeTable = this;
+            updateColumnAllOverflow($xeTable);
+            this.reLayoutFlag++;
+        },
+        showFooterOverflow() {
+            this.reLayoutFlag++;
+        },
         overflowX() {
             this.reLayoutFlag++;
         },
@@ -1876,6 +1908,10 @@ export default {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
+        const { _sToTime } = internalData;
+        if (_sToTime) {
+            clearTimeout(_sToTime);
+        }
         const teleportWrapperEl = $xeTable.$refs.refTeleportWrapper;
         if (teleportWrapperEl && teleportWrapperEl.parentElement) {
             teleportWrapperEl.parentElement.removeChild(teleportWrapperEl);

package/es/table/src/util.js

@@ -129,6 +129,7 @@ export function createInternalData() {
         tooltipTimeout: null,
         initStatus: false,
         isActivated: false
+        // _sToTime: null
     };
 }
 export function createReactData() {
@@ -821,11 +822,9 @@ export function createColumn($xeTable, options, renderOptions) {
     return isColumnInfo(options) ? options : new ColumnInfo($xeTable, options, renderOptions);
 }
 export function rowToVisible($xeTable, row) {
-    const tableProps = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const { showOverflow } = tableProps;
-    const { scrollYLoad, scrollYTop } = reactData;
+    const { scrollYLoad, scrollYTop, isAllOverflow } = reactData;
     const { elemStore, afterFullData, fullAllDataRowIdData, isResizeCellHeight } = internalData;
     const rowOpts = $xeTable.computeRowOpts;
     const cellOpts = $xeTable.computeCellOpts;
@@ -853,7 +852,7 @@ export function rowToVisible($xeTable, row) {
             // 如果是虚拟渲染滚动
             if (scrollYLoad) {
                 const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
-                if (!isCustomCellHeight && showOverflow) {
+                if (!isCustomCellHeight && isAllOverflow) {
                     return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * defaultRowHeight);
                 }
                 const rowRest = fullAllDataRowIdData[rowid] || {};

package/es/table/style.css

@@ -2507,12 +2507,12 @@
 }
 
 /*header*/
-.vxe-table {
-  /*排序*/
-}
 .vxe-table .vxe-table--header-wrapper {
   color: var(--vxe-ui-table-header-font-color);
 }
+.vxe-table {
+  /*排序*/
+}
 .vxe-table .vxe-cell--sort {
   text-align: center;
   position: relative;
@@ -2866,21 +2866,6 @@
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
   direction: ltr;
-  /*边框*/
-  /*边框线*/
-  /*树形节点*/
-  /*行分组*/
-  /*单元格高度*/
-  /*溢出列*/
-  /*展开行*/
-  /*拖拽列*/
-  /*拖拽行把柄*/
-  /*暂无数据*/
-  /*校验不通过*/
-  /*已废弃，旧的校验样式**/
-  /*单元格标记删除状态*/
-  /*单元格编辑状态*/
-  /*可编辑*/
 }
 .vxe-table--render-default .vxe-table--body-wrapper {
   background-color: var(--vxe-ui-layout-background-color);
@@ -3049,6 +3034,9 @@
 .vxe-table--render-default .vxe-body--row.row--hover.row--current > .vxe-body--column {
   background-color: var(--vxe-ui-table-row-hover-current-background-color);
 }
+.vxe-table--render-default {
+  /*边框*/
+}
 .vxe-table--render-default.border--default.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.border--full.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.border--outer.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.border--inner.sy-pos--right .vxe-table--scroll-y-top-corner {
   background-image: linear-gradient(var(--vxe-ui-table-border-color), var(--vxe-ui-table-border-color)), linear-gradient(var(--vxe-ui-table-border-color), var(--vxe-ui-table-border-color));
   background-repeat: no-repeat;
@@ -3413,6 +3401,9 @@
   width: 0;
   float: left;
 }
+.vxe-table--render-default {
+  /*边框线*/
+}
 .vxe-table--render-default .vxe-table--border-line {
   position: absolute;
   top: 0;
@@ -3423,6 +3414,9 @@
   pointer-events: none;
   border: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
+.vxe-table--render-default {
+  /*树形节点*/
+}
 .vxe-table--render-default .vxe-tree--line-wrapper {
   position: relative;
   display: block;
@@ -3469,6 +3463,9 @@
           user-select: none;
   cursor: pointer;
 }
+.vxe-table--render-default {
+  /*行分组*/
+}
 .vxe-table--render-default .vxe-row-group--node-btn:hover {
   color: var(--vxe-ui-font-color);
 }
@@ -3477,6 +3474,9 @@
   color: var(--vxe-ui-font-lighten-color);
   transition: transform 0.1s ease-in-out;
 }
+.vxe-table--render-default {
+  /*单元格高度*/
+}
 .vxe-table--render-default .vxe-body--column.col--ellipsis > .vxe-cell .vxe-row-group-cell,
 .vxe-table--render-default .vxe-body--column.col--ellipsis > .vxe-cell .vxe-tree-cell {
   overflow: hidden;
@@ -3497,6 +3497,9 @@
   flex-direction: row;
   align-items: center;
 }
+.vxe-table--render-default {
+  /*溢出列*/
+}
 .vxe-table--render-default .vxe-header--column:not(.col--active).col--ellipsis > .vxe-cell,
 .vxe-table--render-default .vxe-body--column:not(.col--active).col--ellipsis > .vxe-cell,
 .vxe-table--render-default .vxe-footer--column:not(.col--active).col--ellipsis > .vxe-cell {
@@ -3530,6 +3533,9 @@
   flex-direction: row;
   align-items: center;
 }
+.vxe-table--render-default {
+  /*展开行*/
+}
 .vxe-table--render-default .vxe-table--row-expanded-wrapper {
   position: absolute;
   top: 0;
@@ -3600,12 +3606,18 @@
   overflow: auto;
   outline: 0;
 }
+.vxe-table--render-default {
+  /*拖拽列*/
+}
 .vxe-table--render-default .vxe-table--column.col--drag-move {
   transition: transform 0.5s ease;
 }
 .vxe-table--render-default .vxe-table--column.col--drag-origin > .vxe-cell {
   opacity: 0.3;
 }
+.vxe-table--render-default {
+  /*拖拽行把柄*/
+}
 .vxe-table--render-default .vxe-cell--drag-handle {
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -3669,6 +3681,9 @@
 .vxe-table--render-default.size--mini .vxe-cell--radio {
   font-size: var(--vxe-radio-font-size-mini);
 }
+.vxe-table--render-default {
+  /*暂无数据*/
+}
 .vxe-table--render-default .vxe-table--empty-placeholder,
 .vxe-table--render-default .vxe-table--empty-block {
   color: var(--vxe-ui-input-placeholder-color);
@@ -3709,6 +3724,9 @@
 .vxe-table--render-default .vxe-body--column.col--selected {
   box-shadow: inset 0px 0px 0px 2px var(--vxe-ui-font-primary-color);
 }
+.vxe-table--render-default {
+  /*校验不通过*/
+}
 .vxe-table--render-default .vxe-body--column .vxe-cell--valid-error-tip {
   width: 100%;
   position: absolute;
@@ -3765,6 +3783,9 @@
 .vxe-table--render-default.valid-msg--full .vxe-body--row:last-child .vxe-cell--valid-error-tip {
   top: calc(100% - 1.3em);
 }
+.vxe-table--render-default {
+  /*已废弃，旧的校验样式**/
+}
 .vxe-table--render-default.old-cell-valid .vxe-body--column.col--valid-error .vxe-cell--valid-error-tip {
   width: 320px;
   position: absolute;
@@ -3792,6 +3813,9 @@
   transform: translateX(0);
   text-align: left;
 }
+.vxe-table--render-default {
+  /*单元格标记删除状态*/
+}
 .vxe-table--render-default .vxe-body--row.row--pending {
   color: var(--vxe-ui-font-disabled-color);
   opacity: 0.5;
@@ -3811,6 +3835,9 @@
   border-bottom: 1px solid var(--vxe-ui-table-validate-error-color);
   z-index: 1;
 }
+.vxe-table--render-default {
+  /*单元格编辑状态*/
+}
 .vxe-table--render-default .vxe-body--row.row--new > .vxe-body--column {
   position: relative;
 }
@@ -3837,6 +3864,9 @@
   border-color: transparent var(--vxe-ui-table-cell-dirty-update-color) transparent transparent;
   transform: rotate(45deg);
 }
+.vxe-table--render-default {
+  /*可编辑*/
+}
 .vxe-table--render-default.vxe-editable.cell--highlight .vxe-body--column.col--active {
   box-shadow: inset 0px 0px 0px 2px var(--vxe-ui-font-primary-color);
 }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.20.4";
+export const version = "3.20.6";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

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

package/es/vxe-grid/style.css

@@ -36,6 +36,8 @@
 .vxe-grid .vxe-grid--table-container {
   display: flex;
   flex-direction: row;
+  flex-grow: 1;
+  overflow: hidden;
 }
 .vxe-grid .vxe-grid--left-wrapper,
 .vxe-grid .vxe-grid--right-wrapper {
@@ -56,6 +58,8 @@
 }
 
 .vxe-grid--layout-body-content-wrapper {
+  display: flex;
+  flex-direction: column;
   flex-grow: 1;
   overflow: auto;
 }

package/es/vxe-grid/style.min.css

@@ -1 +1 @@
-.vxe-grid{position:relative;display:flex;flex-direction:column}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:var(--vxe-ui-layout-background-color)}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid .vxe-grid--table-container{display:flex;flex-direction:row}.vxe-grid .vxe-grid--left-wrapper,.vxe-grid .vxe-grid--right-wrapper{flex-shrink:0;overflow:auto;outline:0}.vxe-grid .vxe-grid--table-wrapper{flex-grow:1;overflow:hidden}.vxe-grid--layout-body-wrapper{display:flex;flex-direction:row;overflow:auto;flex-grow:1}.vxe-grid--layout-body-content-wrapper{flex-grow:1;overflow:auto}.vxe-grid--layout-aside-left-wrapper,.vxe-grid--layout-footer-wrapper,.vxe-grid--layout-header-wrapper{flex-shrink:0}.vxe-grid--layout-aside-left-wrapper{overflow:auto}.vxe-grid{font-size:var(--vxe-ui-font-size-default)}.vxe-grid.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-grid.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-grid.size--mini{font-size:var(--vxe-ui-font-size-mini)}
+.vxe-grid{position:relative;display:flex;flex-direction:column}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:var(--vxe-ui-layout-background-color)}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid .vxe-grid--table-container{display:flex;flex-direction:row;flex-grow:1;overflow:hidden}.vxe-grid .vxe-grid--left-wrapper,.vxe-grid .vxe-grid--right-wrapper{flex-shrink:0;overflow:auto;outline:0}.vxe-grid .vxe-grid--table-wrapper{flex-grow:1;overflow:hidden}.vxe-grid--layout-body-wrapper{display:flex;flex-direction:row;overflow:auto;flex-grow:1}.vxe-grid--layout-body-content-wrapper{display:flex;flex-direction:column;flex-grow:1;overflow:auto}.vxe-grid--layout-aside-left-wrapper,.vxe-grid--layout-footer-wrapper,.vxe-grid--layout-header-wrapper{flex-shrink:0}.vxe-grid--layout-aside-left-wrapper{overflow:auto}.vxe-grid{font-size:var(--vxe-ui-font-size-default)}.vxe-grid.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-grid.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-grid.size--mini{font-size:var(--vxe-ui-font-size-mini)}

package/es/vxe-table/style.css

@@ -2507,12 +2507,12 @@
 }
 
 /*header*/
-.vxe-table {
-  /*排序*/
-}
 .vxe-table .vxe-table--header-wrapper {
   color: var(--vxe-ui-table-header-font-color);
 }
+.vxe-table {
+  /*排序*/
+}
 .vxe-table .vxe-cell--sort {
   text-align: center;
   position: relative;
@@ -2866,21 +2866,6 @@
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
   direction: ltr;
-  /*边框*/
-  /*边框线*/
-  /*树形节点*/
-  /*行分组*/
-  /*单元格高度*/
-  /*溢出列*/
-  /*展开行*/
-  /*拖拽列*/
-  /*拖拽行把柄*/
-  /*暂无数据*/
-  /*校验不通过*/
-  /*已废弃，旧的校验样式**/
-  /*单元格标记删除状态*/
-  /*单元格编辑状态*/
-  /*可编辑*/
 }
 .vxe-table--render-default .vxe-table--body-wrapper {
   background-color: var(--vxe-ui-layout-background-color);
@@ -3049,6 +3034,9 @@
 .vxe-table--render-default .vxe-body--row.row--hover.row--current > .vxe-body--column {
   background-color: var(--vxe-ui-table-row-hover-current-background-color);
 }
+.vxe-table--render-default {
+  /*边框*/
+}
 .vxe-table--render-default.border--default.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.border--full.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.border--outer.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.border--inner.sy-pos--right .vxe-table--scroll-y-top-corner {
   background-image: linear-gradient(var(--vxe-ui-table-border-color), var(--vxe-ui-table-border-color)), linear-gradient(var(--vxe-ui-table-border-color), var(--vxe-ui-table-border-color));
   background-repeat: no-repeat;
@@ -3413,6 +3401,9 @@
   width: 0;
   float: left;
 }
+.vxe-table--render-default {
+  /*边框线*/
+}
 .vxe-table--render-default .vxe-table--border-line {
   position: absolute;
   top: 0;
@@ -3423,6 +3414,9 @@
   pointer-events: none;
   border: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
+.vxe-table--render-default {
+  /*树形节点*/
+}
 .vxe-table--render-default .vxe-tree--line-wrapper {
   position: relative;
   display: block;
@@ -3469,6 +3463,9 @@
           user-select: none;
   cursor: pointer;
 }
+.vxe-table--render-default {
+  /*行分组*/
+}
 .vxe-table--render-default .vxe-row-group--node-btn:hover {
   color: var(--vxe-ui-font-color);
 }
@@ -3477,6 +3474,9 @@
   color: var(--vxe-ui-font-lighten-color);
   transition: transform 0.1s ease-in-out;
 }
+.vxe-table--render-default {
+  /*单元格高度*/
+}
 .vxe-table--render-default .vxe-body--column.col--ellipsis > .vxe-cell .vxe-row-group-cell,
 .vxe-table--render-default .vxe-body--column.col--ellipsis > .vxe-cell .vxe-tree-cell {
   overflow: hidden;
@@ -3497,6 +3497,9 @@
   flex-direction: row;
   align-items: center;
 }
+.vxe-table--render-default {
+  /*溢出列*/
+}
 .vxe-table--render-default .vxe-header--column:not(.col--active).col--ellipsis > .vxe-cell,
 .vxe-table--render-default .vxe-body--column:not(.col--active).col--ellipsis > .vxe-cell,
 .vxe-table--render-default .vxe-footer--column:not(.col--active).col--ellipsis > .vxe-cell {
@@ -3530,6 +3533,9 @@
   flex-direction: row;
   align-items: center;
 }
+.vxe-table--render-default {
+  /*展开行*/
+}
 .vxe-table--render-default .vxe-table--row-expanded-wrapper {
   position: absolute;
   top: 0;
@@ -3600,12 +3606,18 @@
   overflow: auto;
   outline: 0;
 }
+.vxe-table--render-default {
+  /*拖拽列*/
+}
 .vxe-table--render-default .vxe-table--column.col--drag-move {
   transition: transform 0.5s ease;
 }
 .vxe-table--render-default .vxe-table--column.col--drag-origin > .vxe-cell {
   opacity: 0.3;
 }
+.vxe-table--render-default {
+  /*拖拽行把柄*/
+}
 .vxe-table--render-default .vxe-cell--drag-handle {
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -3669,6 +3681,9 @@
 .vxe-table--render-default.size--mini .vxe-cell--radio {
   font-size: var(--vxe-radio-font-size-mini);
 }
+.vxe-table--render-default {
+  /*暂无数据*/
+}
 .vxe-table--render-default .vxe-table--empty-placeholder,
 .vxe-table--render-default .vxe-table--empty-block {
   color: var(--vxe-ui-input-placeholder-color);
@@ -3709,6 +3724,9 @@
 .vxe-table--render-default .vxe-body--column.col--selected {
   box-shadow: inset 0px 0px 0px 2px var(--vxe-ui-font-primary-color);
 }
+.vxe-table--render-default {
+  /*校验不通过*/
+}
 .vxe-table--render-default .vxe-body--column .vxe-cell--valid-error-tip {
   width: 100%;
   position: absolute;
@@ -3765,6 +3783,9 @@
 .vxe-table--render-default.valid-msg--full .vxe-body--row:last-child .vxe-cell--valid-error-tip {
   top: calc(100% - 1.3em);
 }
+.vxe-table--render-default {
+  /*已废弃，旧的校验样式**/
+}
 .vxe-table--render-default.old-cell-valid .vxe-body--column.col--valid-error .vxe-cell--valid-error-tip {
   width: 320px;
   position: absolute;
@@ -3792,6 +3813,9 @@
   transform: translateX(0);
   text-align: left;
 }
+.vxe-table--render-default {
+  /*单元格标记删除状态*/
+}
 .vxe-table--render-default .vxe-body--row.row--pending {
   color: var(--vxe-ui-font-disabled-color);
   opacity: 0.5;
@@ -3811,6 +3835,9 @@
   border-bottom: 1px solid var(--vxe-ui-table-validate-error-color);
   z-index: 1;
 }
+.vxe-table--render-default {
+  /*单元格编辑状态*/
+}
 .vxe-table--render-default .vxe-body--row.row--new > .vxe-body--column {
   position: relative;
 }
@@ -3837,6 +3864,9 @@
   border-color: transparent var(--vxe-ui-table-cell-dirty-update-color) transparent transparent;
   transform: rotate(45deg);
 }
+.vxe-table--render-default {
+  /*可编辑*/
+}
 .vxe-table--render-default.vxe-editable.cell--highlight .vxe-body--column.col--active {
   box-shadow: inset 0px 0px 0px 2px var(--vxe-ui-font-primary-color);
 }

package/lib/grid/style/style.css

@@ -36,6 +36,8 @@
 .vxe-grid .vxe-grid--table-container {
   display: flex;
   flex-direction: row;
+  flex-grow: 1;
+  overflow: hidden;
 }
 .vxe-grid .vxe-grid--left-wrapper,
 .vxe-grid .vxe-grid--right-wrapper {
@@ -56,6 +58,8 @@
 }
 
 .vxe-grid--layout-body-content-wrapper {
+  display: flex;
+  flex-direction: column;
   flex-grow: 1;
   overflow: auto;
 }

package/lib/grid/style/style.min.css

@@ -1 +1 @@
-.vxe-grid{position:relative;display:flex;flex-direction:column}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:var(--vxe-ui-layout-background-color)}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid .vxe-grid--table-container{display:flex;flex-direction:row}.vxe-grid .vxe-grid--left-wrapper,.vxe-grid .vxe-grid--right-wrapper{flex-shrink:0;overflow:auto;outline:0}.vxe-grid .vxe-grid--table-wrapper{flex-grow:1;overflow:hidden}.vxe-grid--layout-body-wrapper{display:flex;flex-direction:row;overflow:auto;flex-grow:1}.vxe-grid--layout-body-content-wrapper{flex-grow:1;overflow:auto}.vxe-grid--layout-aside-left-wrapper,.vxe-grid--layout-footer-wrapper,.vxe-grid--layout-header-wrapper{flex-shrink:0}.vxe-grid--layout-aside-left-wrapper{overflow:auto}.vxe-grid{font-size:var(--vxe-ui-font-size-default)}.vxe-grid.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-grid.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-grid.size--mini{font-size:var(--vxe-ui-font-size-mini)}
+.vxe-grid{position:relative;display:flex;flex-direction:column}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:var(--vxe-ui-layout-background-color)}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid .vxe-grid--table-container{display:flex;flex-direction:row;flex-grow:1;overflow:hidden}.vxe-grid .vxe-grid--left-wrapper,.vxe-grid .vxe-grid--right-wrapper{flex-shrink:0;overflow:auto;outline:0}.vxe-grid .vxe-grid--table-wrapper{flex-grow:1;overflow:hidden}.vxe-grid--layout-body-wrapper{display:flex;flex-direction:row;overflow:auto;flex-grow:1}.vxe-grid--layout-body-content-wrapper{display:flex;flex-direction:column;flex-grow:1;overflow:auto}.vxe-grid--layout-aside-left-wrapper,.vxe-grid--layout-footer-wrapper,.vxe-grid--layout-header-wrapper{flex-shrink:0}.vxe-grid--layout-aside-left-wrapper{overflow:auto}.vxe-grid{font-size:var(--vxe-ui-font-size-default)}.vxe-grid.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-grid.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-grid.size--mini{font-size:var(--vxe-ui-font-size-mini)}

package/lib/index.common.js

@@ -17,6 +17,5 @@ Object.keys(VxeTableExport).forEach(function (key) {
     }
   });
 });
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 var _default = exports.default = VxeTableExport;