vxe-table 3.15.36 → 3.15.38

package/es/table/src/methods.js

@@ -305,7 +305,17 @@ function cacheColumnMap($xeTable) {
     reactData.expandColumn = expandColumn;
     reactData.isAllOverflow = isAllOverflow;
 }
-const updateScrollYStatus = ($xeTable, fullData) => {
+function updateScrollXStatus($xeTable, fullColumn) {
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const virtualXOpts = $xeTable.computeVirtualXOpts;
+    const allCols = fullColumn || internalData.tableFullColumn;
+    // 如果gt为0，则总是启用
+    const scrollXLoad = !!virtualXOpts.enabled && virtualXOpts.gt > -1 && (virtualXOpts.gt === 0 || virtualXOpts.gt < allCols.length);
+    reactData.scrollXLoad = scrollXLoad;
+    return scrollXLoad;
+}
+function updateScrollYStatus($xeTable, fullData) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -318,7 +328,7 @@ const updateScrollYStatus = ($xeTable, fullData) => {
     const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
     reactData.scrollYLoad = scrollYLoad;
     return scrollYLoad;
-};
+}
 /**
  * 展开与收起树节点
  * @param rows
@@ -2992,7 +3002,6 @@ function parseColumns($xeTable, isReset) {
     const centerList = [];
     const rightList = [];
     const { isGroup, columnStore } = reactData;
-    const virtualXOpts = $xeTable.computeVirtualXOpts;
     const { collectColumn, tableFullColumn, scrollXStore, fullColumnIdData } = internalData;
     // 如果是分组表头，如果子列全部被隐藏，则根列也隐藏
     if (isGroup) {
@@ -3055,11 +3064,12 @@ function parseColumns($xeTable, isReset) {
         });
     }
     const visibleColumn = leftList.concat(centerList).concat(rightList);
-    // 如果gt为0，则总是启用
-    const scrollXLoad = !!virtualXOpts.enabled && virtualXOpts.gt > -1 && (virtualXOpts.gt === 0 || virtualXOpts.gt < tableFullColumn.length);
+    internalData.visibleColumn = visibleColumn;
+    updateColumnOffsetLeft($xeTable);
+    const sXLoad = updateScrollXStatus($xeTable);
     reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0;
     Object.assign(columnStore, { leftList, centerList, rightList });
-    if (scrollXLoad) {
+    if (sXLoad) {
         // if (showOverflow) {
         //   if (!rowOpts.height) {
         //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
@@ -3095,7 +3105,6 @@ function parseColumns($xeTable, isReset) {
         $xeTable.clearMergeCells();
         $xeTable.clearMergeFooterItems();
     }
-    reactData.scrollXLoad = scrollXLoad;
     visibleColumn.forEach((column, index) => {
         const colid = column.id;
         const colRest = fullColumnIdData[colid];
@@ -3103,7 +3112,6 @@ function parseColumns($xeTable, isReset) {
             colRest._index = index;
         }
     });
-    internalData.visibleColumn = visibleColumn;
     handleTableColumn($xeTable);
     if (isReset) {
         return $xeTable.updateFooter().then(() => {
@@ -3758,8 +3766,23 @@ const Methods = {
      */
     loadColumn(columns) {
         const $xeTable = this;
+        const internalData = $xeTable;
+        const { lastScrollLeft, lastScrollTop } = internalData;
         const collectColumn = XEUtils.mapTree(columns, column => Cell.createColumn($xeTable, column), { children: 'children' });
-        return handleColumn($xeTable, collectColumn);
+        return handleColumn($xeTable, collectColumn).then(() => {
+            let targetScrollLeft = lastScrollLeft;
+            let targetScrollTop = lastScrollTop;
+            const virtualXOpts = $xeTable.computeVirtualXOpts;
+            const virtualYOpts = $xeTable.computeVirtualYOpts;
+            // 是否在更新数据之后自动滚动重置滚动条
+            if (virtualXOpts.scrollToLeftOnChange) {
+                targetScrollLeft = 0;
+            }
+            if (virtualYOpts.scrollToTopOnChange) {
+                targetScrollTop = 0;
+            }
+            restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop);
+        });
     },
     /**
      * 加载列配置并恢复到初始状态
@@ -5551,7 +5574,7 @@ const Methods = {
         return new Promise(resolve => {
             // 还原滚动条位置
             if (lastScrollLeft || lastScrollTop) {
-                return restoreScrollLocation($xeTable, lastScrollLeft, lastScrollTop).then().then(() => {
+                return restoreScrollLocation($xeTable, lastScrollLeft, lastScrollTop).then(() => {
                     // 存在滚动行为未结束情况
                     setTimeout(resolve, 10);
                 });
@@ -9930,7 +9953,9 @@ const Methods = {
                 }, 30);
             });
         }
-        return $xeTable.$nextTick();
+        return $xeTable.$nextTick().then(() => {
+            internalData.intoRunScroll = false;
+        });
     },
     /**
      * 如果有滚动条，则滚动到对应的行
@@ -10265,19 +10290,19 @@ funcs.forEach(name => {
     Methods[name] = function (...args) {
         if (!this[`_${name}`]) {
             if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
-                errLog('vxe.error.reqModule', ['VxeTableExportModule']);
+                errLog('vxe.error.reqModule', ['Export']);
             }
             else if ('fullValidate,validate'.split(',').includes(name)) {
-                errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
+                errLog('vxe.error.reqModule', ['Validator']);
             }
             else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
-                errLog('vxe.error.reqModule', ['VxeTableFilterModule']);
+                errLog('vxe.error.reqModule', ['Filter']);
             }
             else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
-                errLog('vxe.error.reqModule', ['VxeTableEditModule']);
+                errLog('vxe.error.reqModule', ['Edit']);
             }
             else if ('openCustom'.split(',').includes(name)) {
-                errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
+                errLog('vxe.error.reqModule', ['Custom']);
             }
         }
         return this[`_${name}`] ? this[`_${name}`](...args) : null;

package/es/toolbar/src/toolbar.js

@@ -144,9 +144,6 @@ export default {
                 if ($table.triggerCustomEvent) {
                     $table.triggerCustomEvent($event);
                 }
-                else {
-                    errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
-                }
             }
         },
         handleMouseenterSettingEvent({ $event }) {
@@ -157,9 +154,6 @@ export default {
             if ($table) {
                 $table.customOpenEvent($event);
             }
-            else {
-                errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
-            }
         },
         handleMouseleaveSettingEvent({ $event }) {
             const $xeToolbar = this;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.15.36";
+export const version = "3.15.38";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -178,6 +178,7 @@ VxeUI.setConfig({
             extension: true
         },
         keyboardConfig: {
+            isAll: true,
             isEsc: true
         },
         areaConfig: {

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.36";
+const version = "3.15.38";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2180,6 +2180,7 @@ core_.VxeUI.setConfig({
       extension: true
     },
     keyboardConfig: {
+      isAll: true,
       isEsc: true
     },
     areaConfig: {
@@ -2646,7 +2647,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.36"}`;
+const log_version = `table v${"3.15.38"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5497,7 +5498,17 @@ function cacheColumnMap($xeTable) {
   reactData.expandColumn = expandColumn;
   reactData.isAllOverflow = isAllOverflow;
 }
-const updateScrollYStatus = ($xeTable, fullData) => {
+function updateScrollXStatus($xeTable, fullColumn) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const virtualXOpts = $xeTable.computeVirtualXOpts;
+  const allCols = fullColumn || internalData.tableFullColumn;
+  // 如果gt为0，则总是启用
+  const scrollXLoad = !!virtualXOpts.enabled && virtualXOpts.gt > -1 && (virtualXOpts.gt === 0 || virtualXOpts.gt < allCols.length);
+  reactData.scrollXLoad = scrollXLoad;
+  return scrollXLoad;
+}
+function updateScrollYStatus($xeTable, fullData) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -5514,7 +5525,7 @@ const updateScrollYStatus = ($xeTable, fullData) => {
   const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
   reactData.scrollYLoad = scrollYLoad;
   return scrollYLoad;
-};
+}
 /**
  * 展开与收起树节点
  * @param rows
@@ -8692,7 +8703,6 @@ function parseColumns($xeTable, isReset) {
     isGroup,
     columnStore
   } = reactData;
-  const virtualXOpts = $xeTable.computeVirtualXOpts;
   const {
     collectColumn,
     tableFullColumn,
@@ -8752,15 +8762,16 @@ function parseColumns($xeTable, isReset) {
     });
   }
   const visibleColumn = leftList.concat(centerList).concat(rightList);
-  // 如果gt为0，则总是启用
-  const scrollXLoad = !!virtualXOpts.enabled && virtualXOpts.gt > -1 && (virtualXOpts.gt === 0 || virtualXOpts.gt < tableFullColumn.length);
+  internalData.visibleColumn = visibleColumn;
+  updateColumnOffsetLeft($xeTable);
+  const sXLoad = updateScrollXStatus($xeTable);
   reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0;
   Object.assign(columnStore, {
     leftList,
     centerList,
     rightList
   });
-  if (scrollXLoad) {
+  if (sXLoad) {
     // if (showOverflow) {
     //   if (!rowOpts.height) {
     //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
@@ -8798,7 +8809,6 @@ function parseColumns($xeTable, isReset) {
     $xeTable.clearMergeCells();
     $xeTable.clearMergeFooterItems();
   }
-  reactData.scrollXLoad = scrollXLoad;
   visibleColumn.forEach((column, index) => {
     const colid = column.id;
     const colRest = fullColumnIdData[colid];
@@ -8806,7 +8816,6 @@ function parseColumns($xeTable, isReset) {
       colRest._index = index;
     }
   });
-  internalData.visibleColumn = visibleColumn;
   handleTableColumn($xeTable);
   if (isReset) {
     return $xeTable.updateFooter().then(() => {
@@ -9539,10 +9548,28 @@ const Methods = {
    */
   loadColumn(columns) {
     const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      lastScrollLeft,
+      lastScrollTop
+    } = internalData;
     const collectColumn = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(columns, column => cell.createColumn($xeTable, column), {
       children: 'children'
     });
-    return handleColumn($xeTable, collectColumn);
+    return handleColumn($xeTable, collectColumn).then(() => {
+      let targetScrollLeft = lastScrollLeft;
+      let targetScrollTop = lastScrollTop;
+      const virtualXOpts = $xeTable.computeVirtualXOpts;
+      const virtualYOpts = $xeTable.computeVirtualYOpts;
+      // 是否在更新数据之后自动滚动重置滚动条
+      if (virtualXOpts.scrollToLeftOnChange) {
+        targetScrollLeft = 0;
+      }
+      if (virtualYOpts.scrollToTopOnChange) {
+        targetScrollTop = 0;
+      }
+      restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop);
+    });
   },
   /**
    * 加载列配置并恢复到初始状态
@@ -11620,7 +11647,7 @@ const Methods = {
     return new Promise(resolve => {
       // 还原滚动条位置
       if (lastScrollLeft || lastScrollTop) {
-        return restoreScrollLocation($xeTable, lastScrollLeft, lastScrollTop).then().then(() => {
+        return restoreScrollLocation($xeTable, lastScrollLeft, lastScrollTop).then(() => {
           // 存在滚动行为未结束情况
           setTimeout(resolve, 10);
         });
@@ -16747,7 +16774,9 @@ const Methods = {
         }, 30);
       });
     }
-    return $xeTable.$nextTick();
+    return $xeTable.$nextTick().then(() => {
+      internalData.intoRunScroll = false;
+    });
   },
   /**
    * 如果有滚动条，则滚动到对应的行
@@ -17120,15 +17149,15 @@ funcs.forEach(name => {
   Methods[name] = function (...args) {
     if (!this[`_${name}`]) {
       if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
-        errLog('vxe.error.reqModule', ['VxeTableExportModule']);
+        errLog('vxe.error.reqModule', ['Export']);
       } else if ('fullValidate,validate'.split(',').includes(name)) {
-        errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
+        errLog('vxe.error.reqModule', ['Validator']);
       } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
-        errLog('vxe.error.reqModule', ['VxeTableFilterModule']);
+        errLog('vxe.error.reqModule', ['Filter']);
       } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
-        errLog('vxe.error.reqModule', ['VxeTableEditModule']);
+        errLog('vxe.error.reqModule', ['Edit']);
       } else if ('openCustom'.split(',').includes(name)) {
-        errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
+        errLog('vxe.error.reqModule', ['Custom']);
       }
     }
     return this[`_${name}`] ? this[`_${name}`](...args) : null;
@@ -22804,7 +22833,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
   }
   return $xeTable.$nextTick().then(() => {
     $xeTable.updateCellAreas();
-    return $xeTable.recalculate();
+    return $xeTable.recalculate(true);
   }).then(() => {
     return {
       row: newRecords.length ? newRecords[newRecords.length - 1] : null,
@@ -23222,7 +23251,7 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
       }
       return this.$nextTick().then(() => {
         this.updateCellAreas();
-        return this.recalculate();
+        return this.recalculate(true);
       }).then(() => {
         return {
           row: delList.length ? delList[delList.length - 1] : null,
@@ -25951,8 +25980,8 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
         let mouseScrollSpaceSize = 1;
         const triggerEvent = (type, evnt) => {
           this.emitEvent(`checkbox-range-${type}`, {
-            records: this.getCheckboxRecords(),
-            reserves: this.getCheckboxReserveRecords()
+            records: () => this.getCheckboxRecords(),
+            reserves: () => this.getCheckboxReserveRecords()
           }, evnt);
         };
         const handleChecked = evnt => {
@@ -29461,8 +29490,6 @@ const {
       if ($table) {
         if ($table.triggerCustomEvent) {
           $table.triggerCustomEvent($event);
-        } else {
-          errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
         }
       }
     },
@@ -29477,8 +29504,6 @@ const {
       const $table = connectTable;
       if ($table) {
         $table.customOpenEvent($event);
-      } else {
-        errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
       }
     },
     handleMouseleaveSettingEvent({