vxe-table 4.15.7 → 4.15.9

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

@@ -2436,9 +2436,6 @@ export default defineVxeComponent({
             if (mouseConfig && mouseOpts.selected && editStore.selected.row && editStore.selected.column) {
                 $xeTable.addCellSelectedClass();
             }
-            if ($xeGanttView) {
-                $xeGanttView.handleUpdateStyle();
-            }
             return nextTick();
         };
         const checkValidate = (type) => {
@@ -3073,7 +3070,6 @@ export default defineVxeComponent({
         };
         const handleLazyRecalculate = (reFull, reWidth, reHeight) => {
             return new Promise(resolve => {
-                const $xeGanttView = internalData.xeGanttView;
                 const { rceTimeout, rceRunTime } = internalData;
                 const resizeOpts = computeResizeOpts.value;
                 const refreshDelay = resizeOpts.refreshDelay || 20;
@@ -3096,9 +3092,6 @@ export default defineVxeComponent({
                 else {
                     resolve(handleRecalculateStyle(reFull, reWidth, reHeight));
                 }
-                if ($xeGanttView) {
-                    $xeGanttView.handleLazyRecalculate();
-                }
                 internalData.rceTimeout = setTimeout(() => {
                     internalData.rceTimeout = undefined;
                     handleRecalculateStyle(reFull, reWidth, reHeight);
@@ -4058,17 +4051,6 @@ export default defineVxeComponent({
             };
             requestAnimationFrame(step);
         };
-        const syncGanttScrollTop = (scrollTop) => {
-            const $xeGanttView = internalData.xeGanttView;
-            if ($xeGanttView) {
-                const ganttInternalData = $xeGanttView.internalData;
-                const { elemStore: ganttElemStore } = ganttInternalData;
-                const ganttBodyScrollElem = getRefElem(ganttElemStore['main-body-scroll']);
-                if (ganttBodyScrollElem) {
-                    ganttBodyScrollElem.scrollTop = scrollTop;
-                }
-            }
-        };
         const dispatchEvent = (type, params, evnt) => {
             emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid }, params));
         };
@@ -4959,6 +4941,29 @@ export default defineVxeComponent({
                 }
                 return [];
             },
+            /**
+             * 只对 tree-config 有效，用于树形结构，获取指定行的层级
+             */
+            getTreeRowLevel(rowOrRowid) {
+                const { treeConfig } = props;
+                const { fullAllDataRowIdData } = internalData;
+                if (rowOrRowid && treeConfig) {
+                    let rowid;
+                    if (XEUtils.isString(rowOrRowid)) {
+                        rowid = rowOrRowid;
+                    }
+                    else {
+                        rowid = getRowid($xeTable, rowOrRowid);
+                    }
+                    if (rowid) {
+                        const rest = fullAllDataRowIdData[rowid];
+                        if (rest) {
+                            return rest.level;
+                        }
+                    }
+                }
+                return -1;
+            },
             /**
              * 只对 tree-config 有效，获取行的父级
              */
@@ -7904,7 +7909,6 @@ export default defineVxeComponent({
             handleTableData(force) {
                 const { scrollYLoad } = reactData;
                 const { scrollYStore, fullDataRowIdData } = internalData;
-                const $xeGanttView = internalData.xeGanttView;
                 let fullList = internalData.afterFullData;
                 // 是否进行数据处理
                 if (force) {
@@ -7925,9 +7929,6 @@ export default defineVxeComponent({
                 });
                 reactData.tableData = tableData;
                 internalData.visibleDataRowIdData = visibleDataRowIdMaps;
-                if ($xeGanttView) {
-                    $xeGanttView.updateViewData();
-                }
                 return nextTick();
             },
             /**
@@ -10444,7 +10445,6 @@ export default defineVxeComponent({
                     }
                     setScrollTop(yHandleEl, scrollTop);
                     setScrollTop(rowExpandEl, scrollTop);
-                    syncGanttScrollTop(scrollTop);
                     if (scrollYLoad) {
                         $xeTable.triggerScrollYEvent(evnt);
                     }
@@ -10633,7 +10633,6 @@ export default defineVxeComponent({
                         setScrollTop(leftScrollElem, currTopNum);
                         setScrollTop(rightScrollElem, currTopNum);
                         setScrollTop(rowExpandEl, currTopNum);
-                        syncGanttScrollTop(currTopNum);
                         if (scrollYLoad) {
                             $xeTable.triggerScrollYEvent(evnt);
                         }
@@ -10651,7 +10650,6 @@ export default defineVxeComponent({
                             setScrollTop(leftScrollElem, currTopNum);
                             setScrollTop(rightScrollElem, currTopNum);
                             setScrollTop(rowExpandEl, currTopNum);
-                            syncGanttScrollTop(currTopNum);
                             if (scrollYLoad) {
                                 $xeTable.triggerScrollYEvent(evnt);
                             }
@@ -10725,7 +10723,6 @@ export default defineVxeComponent({
                 setScrollTop(leftScrollElem, scrollTop);
                 setScrollTop(rightScrollElem, scrollTop);
                 setScrollTop(rowExpandEl, scrollTop);
-                syncGanttScrollTop(scrollTop);
                 if (scrollYLoad) {
                     $xeTable.triggerScrollYEvent(evnt);
                 }
@@ -10765,7 +10762,6 @@ export default defineVxeComponent({
             updateScrollXSpace() {
                 const { scrollXLoad, overflowX, scrollXWidth } = reactData;
                 const { visibleColumn, scrollXStore, elemStore, fullColumnIdData } = internalData;
-                const $xeGanttView = internalData.xeGanttView;
                 const mouseOpts = computeMouseOpts.value;
                 const tableBody = refTableBody.value;
                 const tableBodyElem = tableBody ? tableBody.$el : null;
@@ -10831,9 +10827,6 @@ export default defineVxeComponent({
                     if (isScrollXBig && mouseOpts.area) {
                         errLog('vxe.error.notProp', ['mouse-config.area']);
                     }
-                    if ($xeGanttView) {
-                        $xeGanttView.updateScrollXSpace();
-                    }
                     return nextTick().then(() => {
                         updateStyle();
                     });
@@ -10843,7 +10836,6 @@ export default defineVxeComponent({
             updateScrollYSpace() {
                 const { isAllOverflow, overflowY, scrollYLoad, expandColumn } = reactData;
                 const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData;
-                const $xeGanttView = internalData.xeGanttView;
                 const { startIndex } = scrollYStore;
                 const mouseOpts = computeMouseOpts.value;
                 const expandOpts = computeExpandOpts.value;
@@ -10943,9 +10935,6 @@ export default defineVxeComponent({
                 if (isScrollYBig && mouseOpts.area) {
                     errLog('vxe.error.notProp', ['mouse-config.area']);
                 }
-                if ($xeGanttView) {
-                    $xeGanttView.updateScrollYSpace();
-                }
                 return nextTick().then(() => {
                     updateStyle();
                 });

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.7";
+export const version = "4.15.9";
 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.7"}`;
+const version = `table v${"4.15.9"}`;
 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");

package/lib/index.common.js

@@ -17,6 +17,5 @@ Object.keys(VxeUITableExport).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 = VxeUITableExport;