vxe-table 4.15.6 → 4.15.8

package/es/table/src/body.js

@@ -79,7 +79,7 @@ export default defineVxeComponent({
         const renderTdColumn = (seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) => {
             const $xeGrid = $xeTable.xeGrid;
             const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, treeConfig, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
-            const { tableData, dragRow, overflowX, overflowY, currentColumn, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps } = tableReactData;
+            const { tableData, tableColumn, dragRow, overflowX, overflowY, currentColumn, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps } = tableReactData;
             const { fullAllDataRowIdData, fullColumnIdData, mergeBodyCellMaps, visibleColumn, afterFullData, mergeBodyList, scrollXStore, scrollYStore } = tableInternalData;
             const cellOpts = computeCellOpts.value;
             const validOpts = computeValidOpts.value;
@@ -265,10 +265,10 @@ export default defineVxeComponent({
             let isVNPreEmptyStatus = false;
             if (!isMergeCell) {
                 if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-                    if (overflowY && scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+                    if (overflowY && scrollYLoad && tableData.length > 16 && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
                         isVNPreEmptyStatus = true;
                     }
-                    else if (overflowX && scrollXLoad && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+                    else if (overflowX && scrollXLoad && tableColumn.length > 10 && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                         isVNPreEmptyStatus = true;
                     }
                 }

package/es/table/src/footer.js

@@ -148,7 +148,7 @@ export default defineVxeComponent({
                 const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
                 let isVNPreEmptyStatus = false;
                 if (isOptimizeMode && overflowX && !isMergeCell) {
-                    if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+                    if (scrollXLoad && tableColumn.length > 10 && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                         isVNPreEmptyStatus = true;
                     }
                 }

package/es/table/src/header.js

@@ -37,7 +37,7 @@ export default defineVxeComponent({
             const $xeGrid = $xeTable.xeGrid;
             const { fixedType } = props;
             const { resizable: allResizable, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps;
-            const { currentColumn, dragCol, scrollXLoad, scrollYLoad, overflowX } = tableReactData;
+            const { currentColumn, dragCol, scrollXLoad, scrollYLoad, overflowX, tableColumn } = tableReactData;
             const { fullColumnIdData, scrollXStore } = tableInternalData;
             const virtualXOpts = computeVirtualXOpts.value;
             const columnOpts = computeColumnOpts.value;
@@ -117,7 +117,7 @@ export default defineVxeComponent({
                 let isVNPreEmptyStatus = false;
                 if (isOptimizeMode && overflowX && !isGroup) {
                     if (!dragCol || dragCol.id !== colid) {
-                        if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+                        if (scrollXLoad && tableColumn.length > 10 && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                             isVNPreEmptyStatus = true;
                         }
                     }

package/es/table/src/table.js

@@ -70,12 +70,6 @@ export default defineVxeComponent({
             lastScrollTime: 0,
             // 行高
             rowHeight: 0,
-            // 表头高度
-            tHeaderHeight: 0,
-            // 表体高度
-            tBodyHeight: 0,
-            // 表尾高度
-            tFooterHeight: 0,
             // 表格父容器的高度
             parentHeight: 0,
             // 是否使用分组表头
@@ -97,6 +91,8 @@ export default defineVxeComponent({
             rowGroupColumn: null,
             // 展开列信息
             expandColumn: null,
+            checkboxColumn: null,
+            radioColumn: null,
             // 树节点列信息
             treeNodeColumn: null,
             hasFixedColumn: false,
@@ -1593,6 +1589,8 @@ export default defineVxeComponent({
             reactData.rowGroupColumn = rowGroupColumn;
             reactData.treeNodeColumn = treeNodeColumn;
             reactData.expandColumn = expandColumn;
+            reactData.checkboxColumn = checkboxColumn;
+            reactData.radioColumn = radioColumn;
             reactData.isAllOverflow = isAllOverflow;
         };
         const updateHeight = () => {
@@ -2157,8 +2155,8 @@ export default defineVxeComponent({
         };
         const updateStyle = () => {
             const { showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
-            const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn, isColLoading, tHeaderHeight, tFooterHeight } = reactData;
-            const { visibleColumn, tableHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
+            const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn, isColLoading } = reactData;
+            const { visibleColumn, tableHeight, elemStore, customHeight, customMinHeight, customMaxHeight, tHeaderHeight, tFooterHeight } = internalData;
             const $xeGanttView = internalData.xeGanttView;
             const el = refElem.value;
             if (!el || !el.clientHeight) {
@@ -2166,8 +2164,9 @@ export default defineVxeComponent({
             }
             const containerList = ['main', 'left', 'right'];
             let osbWidth = overflowY ? scrollbarWidth : 0;
-            const osbHeight = overflowX ? scrollbarHeight : 0;
+            let osbHeight = overflowX ? scrollbarHeight : 0;
             const emptyPlaceholderElem = refEmptyPlaceholder.value;
+            const scrollbarOpts = computeScrollbarOpts.value;
             const mouseOpts = computeMouseOpts.value;
             const expandOpts = computeExpandOpts.value;
             const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
@@ -2178,13 +2177,19 @@ export default defineVxeComponent({
             }
             const scrollbarXToTop = computeScrollbarXToTop.value;
             const scrollbarYToLeft = computeScrollbarYToLeft.value;
-            const xScrollbarVisible = overflowX ? 'visible' : 'hidden';
-            let yScrollbarVisible = overflowY ? 'visible' : 'hidden';
+            let xScrollbarVisible = overflowX ? 'visible' : 'hidden';
             if ($xeGanttView) {
-                if (!scrollbarYToLeft) {
-                    osbWidth = 0;
-                    yScrollbarVisible = 'hidden';
-                }
+                osbHeight = scrollbarHeight;
+                xScrollbarVisible = 'visible';
+            }
+            else if (scrollbarOpts.x && scrollbarOpts.x.visible === false) {
+                osbHeight = 0;
+                xScrollbarVisible = 'hidden';
+            }
+            let yScrollbarVisible = overflowY ? 'visible' : 'hidden';
+            if ((scrollbarOpts.y && scrollbarOpts.y.visible === false) || ($xeGanttView && !scrollbarYToLeft)) {
+                osbWidth = 0;
+                yScrollbarVisible = 'hidden';
             }
             let tbHeight = 0;
             let bodyMaxHeight = 0;
@@ -2253,7 +2258,7 @@ export default defineVxeComponent({
                 rowExpandEl.style.height = `${tbHeight}px`;
                 rowExpandEl.style.top = `${tHeaderHeight}px`;
             }
-            reactData.tBodyHeight = tbHeight;
+            internalData.tBodyHeight = tbHeight;
             containerList.forEach((name, index) => {
                 const fixedType = index > 0 ? name : '';
                 const layoutList = ['header', 'body', 'footer'];
@@ -3012,8 +3017,8 @@ export default defineVxeComponent({
                 const hHeight = headerTableElem ? headerTableElem.clientHeight : 0;
                 const fHeight = footerTableElem ? footerTableElem.clientHeight : 0;
                 internalData.tableHeight = bodyWrapperElem.offsetHeight;
-                reactData.tHeaderHeight = hHeight;
-                reactData.tFooterHeight = fHeight;
+                internalData.tHeaderHeight = hHeight;
+                internalData.tFooterHeight = fHeight;
                 reactData.overflowX = overflowX;
                 reactData.parentHeight = Math.max(hHeight + fHeight + 20, $xeTable.getParentHeight());
             }
@@ -3100,6 +3105,9 @@ export default defineVxeComponent({
                 }, refreshDelay);
             });
         };
+        const handleResizeEvent = () => {
+            handleLazyRecalculate(true, true, true);
+        };
         const handleUpdateAggValues = () => {
             const { visibleColumn } = internalData;
             const aggCols = [];
@@ -3966,13 +3974,13 @@ export default defineVxeComponent({
             }, fpsTime);
         };
         const checkLastSyncScroll = (isRollX, isRollY) => {
-            const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
             const { lcsTimeout } = internalData;
             reactData.lazScrollLoading = true;
             if (lcsTimeout) {
                 clearTimeout(lcsTimeout);
             }
             internalData.lcsTimeout = setTimeout(() => {
+                const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
                 internalData.lcsRunTime = Date.now();
                 internalData.lcsTimeout = undefined;
                 internalData.intoRunScroll = false;
@@ -7544,7 +7552,7 @@ export default defineVxeComponent({
             if (!el || !el.clientWidth) {
                 return;
             }
-            handleLazyRecalculate(true, true, true);
+            handleResizeEvent();
             $xeTable.updateCellAreas();
         };
         const handleTargetEnterEvent = (isClear) => {
@@ -8997,8 +9005,8 @@ export default defineVxeComponent({
              * 如果是双击模式，则单击后选中状态
              */
             triggerCellClickEvent(evnt, params) {
-                const { highlightCurrentRow, highlightCurrentColumn, editConfig } = props;
-                const { editStore, isDragResize } = reactData;
+                const { treeConfig, highlightCurrentRow, highlightCurrentColumn, editConfig, aggregateConfig, rowGroupConfig } = props;
+                const { editStore, isDragResize, expandColumn, checkboxColumn, radioColumn } = reactData;
                 if (isDragResize) {
                     return;
                 }
@@ -9027,15 +9035,15 @@ export default defineVxeComponent({
                 params = Object.assign({ cell, triggerRadio, triggerCheckbox, triggerTreeNode, triggerExpandNode }, params);
                 if (!triggerCheckbox && !triggerRadio) {
                     // 如果是展开行
-                    if (!triggerExpandNode && (expandOpts.trigger === 'row' || (isExpandType && expandOpts.trigger === 'cell'))) {
+                    if (!triggerExpandNode && ((expandColumn && expandOpts.trigger === 'row') || (isExpandType && expandOpts.trigger === 'cell'))) {
                         $xeTable.triggerRowExpandEvent(evnt, params);
                     }
                     // 如果是树形表格
-                    if ((treeOpts.trigger === 'row' || (treeNode && treeOpts.trigger === 'cell'))) {
+                    if (treeConfig && (treeOpts.trigger === 'row' || (treeNode && treeOpts.trigger === 'cell'))) {
                         $xeTable.triggerTreeExpandEvent(evnt, params);
                     }
                     // 如果是行分组
-                    if ((aggregateOpts.trigger === 'row' || (rowGroupNode && aggregateOpts.trigger === 'cell'))) {
+                    if ((aggregateConfig || rowGroupConfig) && (aggregateOpts.trigger === 'row' || (rowGroupNode && aggregateOpts.trigger === 'cell'))) {
                         $xeTable.triggerRowGroupExpandEvent(evnt, params);
                     }
                 }
@@ -9055,11 +9063,11 @@ export default defineVxeComponent({
                             }
                         }
                         // 如果是单选框
-                        if (!triggerRadio && (radioOpts.trigger === 'row' || (isRadioType && radioOpts.trigger === 'cell'))) {
+                        if (!triggerRadio && ((radioColumn && radioOpts.trigger === 'row') || (isRadioType && radioOpts.trigger === 'cell'))) {
                             $xeTable.triggerRadioRowEvent(evnt, params);
                         }
                         // 如果是复选框
-                        if (!triggerCheckbox && (checkboxOpts.trigger === 'row' || (isCheckboxType && checkboxOpts.trigger === 'cell'))) {
+                        if (!triggerCheckbox && ((checkboxColumn && checkboxOpts.trigger === 'row') || (isCheckboxType && checkboxOpts.trigger === 'cell'))) {
                             $xeTable.handleToggleCheckRowEvent(evnt, params);
                         }
                     }
@@ -12074,7 +12082,7 @@ export default defineVxeComponent({
                     const parentEl = tablePrivateMethods.getParentElem();
                     resizeObserver = globalResize.create(() => {
                         if (props.autoResize) {
-                            tableMethods.recalculate(true);
+                            handleResizeEvent();
                         }
                     });
                     if (el) {

package/es/table/src/util.js

@@ -109,6 +109,12 @@ export function createInternalData() {
         // 已删除行
         removeRowMaps: {},
         cvCacheMaps: {},
+        // 表头高度
+        tHeaderHeight: 0,
+        // 表体高度
+        tBodyHeight: 0,
+        // 表尾高度
+        tFooterHeight: 0,
         inited: false,
         tooltipTimeout: null,
         initStatus: false,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.15.6";
+export const version = "4.15.8";
 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${"4.15.6"}`;
+const version = `table v${"4.15.8"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/components.js

@@ -7,7 +7,18 @@ var _exportNames = {
   install: true
 };
 exports.install = install;
-var _core = require("@vxe-ui/core");
+var _ui = require("./ui");
+Object.keys(_ui).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _ui[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _ui[key];
+    }
+  });
+});
 var _column = require("./column");
 Object.keys(_column).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -69,31 +80,19 @@ Object.keys(_toolbar).forEach(function (key) {
   });
 });
 var _zhCN = _interopRequireDefault(require("./locale/lang/zh-CN"));
-var _ui = require("./ui");
-Object.keys(_ui).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _ui[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _ui[key];
-    }
-  });
-});
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const components = [_column.VxeColumn, _colgroup.VxeColgroup, _grid.VxeGrid, _table.VxeTable, _toolbar.VxeToolbar];
 // 默认安装
 function install(app, options) {
-  _core.VxeUI.setConfig(options);
+  _ui.VxeUI.setConfig(options);
   components.forEach(component => component.install(app));
 }
 // 保留兼容老版本
-if (!_core.VxeUI.hasLanguage('zh-CN')) {
+if (!_ui.VxeUI.hasLanguage('zh-CN')) {
   const defaultLanguage = 'zh-CN';
-  _core.VxeUI.setI18n(defaultLanguage, _zhCN.default);
-  _core.VxeUI.setLanguage(defaultLanguage);
+  _ui.VxeUI.setI18n(defaultLanguage, _zhCN.default);
+  _ui.VxeUI.setLanguage(defaultLanguage);
 }
-_core.VxeUI.setTheme('light');
+_ui.VxeUI.setTheme('light');
 
 // Components

package/lib/components.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={install:!0},_core=(exports.install=install,require("@vxe-ui/core")),_column=require("./column"),_colgroup=(Object.keys(_column).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_column[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _column[e]}})}),require("./colgroup")),_grid=(Object.keys(_colgroup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_colgroup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _colgroup[e]}})}),require("./grid")),_table=(Object.keys(_grid).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_grid[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _grid[e]}})}),require("./table")),_toolbar=(Object.keys(_table).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_table[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _table[e]}})}),require("./toolbar")),_zhCN=(Object.keys(_toolbar).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_toolbar[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _toolbar[e]}})}),_interopRequireDefault(require("./locale/lang/zh-CN"))),_ui=require("./ui");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}Object.keys(_ui).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_ui[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _ui[e]}})});let components=[_column.VxeColumn,_colgroup.VxeColgroup,_grid.VxeGrid,_table.VxeTable,_toolbar.VxeToolbar];function install(t,e){_core.VxeUI.setConfig(e),components.forEach(e=>e.install(t))}if(!_core.VxeUI.hasLanguage("zh-CN")){let e="zh-CN";_core.VxeUI.setI18n(e,_zhCN.default),_core.VxeUI.setLanguage(e)}_core.VxeUI.setTheme("light");
+Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={install:!0},_ui=(exports.install=install,require("./ui")),_column=(Object.keys(_ui).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_ui[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _ui[e]}})}),require("./column")),_colgroup=(Object.keys(_column).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_column[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _column[e]}})}),require("./colgroup")),_grid=(Object.keys(_colgroup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_colgroup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _colgroup[e]}})}),require("./grid")),_table=(Object.keys(_grid).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_grid[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _grid[e]}})}),require("./table")),_toolbar=(Object.keys(_table).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_table[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _table[e]}})}),require("./toolbar")),_zhCN=(Object.keys(_toolbar).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_toolbar[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _toolbar[e]}})}),_interopRequireDefault(require("./locale/lang/zh-CN")));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let components=[_column.VxeColumn,_colgroup.VxeColgroup,_grid.VxeGrid,_table.VxeTable,_toolbar.VxeToolbar];function install(t,e){_ui.VxeUI.setConfig(e),components.forEach(e=>e.install(t))}if(!_ui.VxeUI.hasLanguage("zh-CN")){let e="zh-CN";_ui.VxeUI.setI18n(e,_zhCN.default),_ui.VxeUI.setLanguage(e)}_ui.VxeUI.setTheme("light");