vxe-table 3.12.1-beta.0 → 3.12.1-beta.2

package/es/table/src/methods.js

@@ -270,15 +270,29 @@ function calcTableHeight(_vm, key) {
     }
     return num;
 }
+// const updateCellOffset = ($xeTable: VxeTableConstructor) => {
+//   const internalData = $xeTable as unknown as TableInternalData
+//   const { chTimeout, chRunTime } = internalData
+//   if (chTimeout) {
+//     clearTimeout(chTimeout)
+//   }
+//   if (!chRunTime || chRunTime + 10 < Date.now()) {
+//     internalData.chRunTime = Date.now()
+//   }
+//   internalData.chTimeout = setTimeout(() => {
+//     internalData.chRunTime = undefined
+//     internalData.chTimeout = undefined
+//   }, 80)
+// }
 const calcCellHeight = ($xeTable) => {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { showOverflow } = props;
-    const { tableData, scrollXLoad, scrollYLoad } = reactData;
+    const { tableData, scrollXLoad } = reactData;
     const { fullAllDataRowIdData } = internalData;
     const el = $xeTable.$refs.refElem;
-    if (!showOverflow && (scrollXLoad || scrollYLoad) && el) {
+    if (!showOverflow && el) {
         let paddingTop = 0;
         let paddingBottom = 0;
         let calcPadding = false;
@@ -309,6 +323,7 @@ const calcCellHeight = ($xeTable) => {
             }
         });
     }
+    // updateCellOffset($xeTable)
 };
 function getOrderField(_vm, column) {
     const { sortBy, sortType } = column;
@@ -530,7 +545,7 @@ const handleScrollToRowColumn = ($xeTable, fieldOrColumn, row) => {
 function handleRecalculateLayout($xeTable, reFull) {
     const internalData = $xeTable;
     const el = $xeTable.$refs.refElem;
-    internalData.reRunTime = Date.now();
+    internalData.rceRunTime = Date.now();
     if (!el || !el.clientWidth) {
         return $xeTable.$nextTick();
     }
@@ -561,10 +576,14 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
         internalData.bodyScrollType = '';
         internalData.inFooterScroll = false;
         if (isRollX && scrollXLoad) {
-            $xeTable.updateScrollXData();
+            $xeTable.updateScrollXData().then(() => {
+                $xeTable.loadScrollXData();
+            });
         }
         if (isRollY && scrollYLoad) {
-            $xeTable.updateScrollYData();
+            $xeTable.updateScrollYData().then(() => {
+                $xeTable.loadScrollYData();
+            });
         }
         $xeTable.updateCellAreas();
     }, 200);
@@ -2431,6 +2450,7 @@ const Methods = {
     saveCustomStore(type) {
         const $xeTable = this;
         const props = $xeTable;
+        const reactData = $xeTable;
         const { customConfig } = props;
         const tableId = $xeTable.computeTableId;
         const customOpts = $xeTable.computeCustomOpts;
@@ -2441,6 +2461,9 @@ const Methods = {
         const isCustomVisible = isAllCustom || storageOpts.visible;
         const isCustomFixed = isAllCustom || storageOpts.fixed;
         const isCustomSort = isAllCustom || storageOpts.sort;
+        if (type !== 'reset') {
+            reactData.isCustomStatus = true;
+        }
         if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
             if (!tableId) {
                 errLog('vxe.error.reqProp', ['id']);
@@ -2707,7 +2730,7 @@ const Methods = {
         const $xeTable = this;
         const internalData = $xeTable;
         return new Promise(resolve => {
-            const { rceTimeout, reRunTime } = internalData;
+            const { rceTimeout, rceRunTime } = internalData;
             const resizeOpts = $xeTable.computeResizeOpts;
             const refreshDelay = resizeOpts.refreshDelay || 20;
             const el = $xeTable.$refs.refElem;
@@ -2716,7 +2739,7 @@ const Methods = {
             }
             if (rceTimeout) {
                 clearTimeout(rceTimeout);
-                if (reRunTime && reRunTime + (refreshDelay - 5) < Date.now()) {
+                if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
                     resolve(handleRecalculateLayout($xeTable, !!reFull));
                 }
                 else {
@@ -6954,7 +6977,9 @@ const Methods = {
                 scrollXStore.offsetSize = offsetXSize;
                 scrollXStore.visibleSize = visibleXSize;
                 scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
-                $xeTable.updateScrollXData();
+                $xeTable.updateScrollXData().then(() => {
+                    $xeTable.loadScrollXData();
+                });
             }
             else {
                 $xeTable.updateScrollXSpace();
@@ -6970,7 +6995,9 @@ const Methods = {
                 scrollYStore.offsetSize = offsetYSize;
                 scrollYStore.visibleSize = visibleYSize;
                 scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
-                $xeTable.updateScrollYData();
+                $xeTable.updateScrollYData().then(() => {
+                    $xeTable.loadScrollYData();
+                });
             }
             else {
                 $xeTable.updateScrollYSpace();

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.1-beta.0";
+export const version = "3.12.1-beta.2";
 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.12.1-beta.0"}`;
+const version = `table v${"3.12.1-beta.2"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.1-beta.0";
+const version = "3.12.1-beta.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2814,7 +2814,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.1-beta.0"}`;
+const log_version = `table v${"3.12.1-beta.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5282,6 +5282,20 @@ function calcTableHeight(_vm, key) {
   }
   return num;
 }
+// const updateCellOffset = ($xeTable: VxeTableConstructor) => {
+//   const internalData = $xeTable as unknown as TableInternalData
+//   const { chTimeout, chRunTime } = internalData
+//   if (chTimeout) {
+//     clearTimeout(chTimeout)
+//   }
+//   if (!chRunTime || chRunTime + 10 < Date.now()) {
+//     internalData.chRunTime = Date.now()
+//   }
+//   internalData.chTimeout = setTimeout(() => {
+//     internalData.chRunTime = undefined
+//     internalData.chTimeout = undefined
+//   }, 80)
+// }
 const calcCellHeight = $xeTable => {
   const props = $xeTable;
   const reactData = $xeTable;
@@ -5291,14 +5305,13 @@ const calcCellHeight = $xeTable => {
   } = props;
   const {
     tableData,
-    scrollXLoad,
-    scrollYLoad
+    scrollXLoad
   } = reactData;
   const {
     fullAllDataRowIdData
   } = internalData;
   const el = $xeTable.$refs.refElem;
-  if (!showOverflow && (scrollXLoad || scrollYLoad) && el) {
+  if (!showOverflow && el) {
     let paddingTop = 0;
     let paddingBottom = 0;
     let calcPadding = false;
@@ -5329,6 +5342,7 @@ const calcCellHeight = $xeTable => {
       }
     });
   }
+  // updateCellOffset($xeTable)
 };
 function getOrderField(_vm, column) {
   const {
@@ -5567,7 +5581,7 @@ const handleScrollToRowColumn = ($xeTable, fieldOrColumn, row) => {
 function handleRecalculateLayout($xeTable, reFull) {
   const internalData = $xeTable;
   const el = $xeTable.$refs.refElem;
-  internalData.reRunTime = Date.now();
+  internalData.rceRunTime = Date.now();
   if (!el || !el.clientWidth) {
     return $xeTable.$nextTick();
   }
@@ -5603,10 +5617,14 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
     internalData.bodyScrollType = '';
     internalData.inFooterScroll = false;
     if (isRollX && scrollXLoad) {
-      $xeTable.updateScrollXData();
+      $xeTable.updateScrollXData().then(() => {
+        $xeTable.loadScrollXData();
+      });
     }
     if (isRollY && scrollYLoad) {
-      $xeTable.updateScrollYData();
+      $xeTable.updateScrollYData().then(() => {
+        $xeTable.loadScrollYData();
+      });
     }
     $xeTable.updateCellAreas();
   }, 200);
@@ -7836,6 +7854,7 @@ const Methods = {
   saveCustomStore(type) {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
     const {
       customConfig
     } = props;
@@ -7851,6 +7870,9 @@ const Methods = {
     const isCustomVisible = isAllCustom || storageOpts.visible;
     const isCustomFixed = isAllCustom || storageOpts.fixed;
     const isCustomSort = isAllCustom || storageOpts.sort;
+    if (type !== 'reset') {
+      reactData.isCustomStatus = true;
+    }
     if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       if (!tableId) {
         errLog('vxe.error.reqProp', ['id']);
@@ -8141,7 +8163,7 @@ const Methods = {
     return new Promise(resolve => {
       const {
         rceTimeout,
-        reRunTime
+        rceRunTime
       } = internalData;
       const resizeOpts = $xeTable.computeResizeOpts;
       const refreshDelay = resizeOpts.refreshDelay || 20;
@@ -8151,7 +8173,7 @@ const Methods = {
       }
       if (rceTimeout) {
         clearTimeout(rceTimeout);
-        if (reRunTime && reRunTime + (refreshDelay - 5) < Date.now()) {
+        if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
           resolve(handleRecalculateLayout($xeTable, !!reFull));
         } else {
           $xeTable.$nextTick(() => {
@@ -13225,7 +13247,9 @@ const Methods = {
         scrollXStore.offsetSize = offsetXSize;
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
-        $xeTable.updateScrollXData();
+        $xeTable.updateScrollXData().then(() => {
+          $xeTable.loadScrollXData();
+        });
       } else {
         $xeTable.updateScrollXSpace();
       }
@@ -13242,7 +13266,9 @@ const Methods = {
         scrollYStore.offsetSize = offsetYSize;
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
-        $xeTable.updateScrollYData();
+        $xeTable.updateScrollYData().then(() => {
+          $xeTable.loadScrollYData();
+        });
       } else {
         $xeTable.updateScrollYSpace();
       }
@@ -14174,12 +14200,14 @@ function renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, ro
     }
   }
   let cellHeight = '';
-  if (hasEllipsis && (scrollYRHeight || rowHeight)) {
-    cellHeight = `${scrollYRHeight || rowHeight}px`;
-  } else if (scrollXLoad || scrollYLoad) {
-    if (!hasEllipsis) {
-      cellHeight = `${rest.height || 24}px`;
+  if (hasEllipsis) {
+    if (scrollYRHeight || rowHeight) {
+      cellHeight = `${scrollYRHeight || rowHeight}px`;
+    } else if (!isAllOverflow) {
+      cellHeight = `${rest.height || 18}px`;
     }
+  } else {
+    cellHeight = `${rest.height || 18}px`;
   }
   if (mouseConfig && mouseOpts.area && selectCellToRow) {
     if (!$columnIndex && selectCellToRow === true || selectCellToRow === column.field) {
@@ -21848,7 +21876,7 @@ const convertToRows = originColumns => {
           handleOptions.data = afterFullData;
         }
       }
-      return handleExport($xeTable, opts);
+      return handleExport($xeTable, handleOptions);
     },
     _importByFile(file, options) {
       const opts = Object.assign({}, options);