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

package/es/table/src/table.js

@@ -1322,12 +1322,25 @@ export default defineComponent({
                 tablePrivateMethods.checkScrolling();
             }
         };
+        // const updateCellOffset = () => {
+        //   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 = () => {
             const { showOverflow } = props;
-            const { tableData, scrollXLoad, scrollYLoad } = reactData;
+            const { tableData, scrollXLoad } = reactData;
             const { fullAllDataRowIdData } = internalData;
             const el = refElem.value;
-            if (!showOverflow && (scrollXLoad || scrollYLoad) && el) {
+            if (!showOverflow && el) {
                 let paddingTop = 0;
                 let paddingBottom = 0;
                 let calcPadding = false;
@@ -1358,6 +1371,7 @@ export default defineComponent({
                     }
                 });
             }
+            // updateCellOffset()
         };
         const getOrderField = (column) => {
             const { sortBy, sortType } = column;
@@ -2371,7 +2385,9 @@ export default defineComponent({
                     scrollXStore.offsetSize = offsetXSize;
                     scrollXStore.visibleSize = visibleXSize;
                     scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
-                    tablePrivateMethods.updateScrollXData();
+                    tablePrivateMethods.updateScrollXData().then(() => {
+                        loadScrollXData();
+                    });
                 }
                 else {
                     tablePrivateMethods.updateScrollXSpace();
@@ -2387,7 +2403,9 @@ export default defineComponent({
                     scrollYStore.offsetSize = offsetYSize;
                     scrollYStore.visibleSize = visibleYSize;
                     scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
-                    tablePrivateMethods.updateScrollYData();
+                    tablePrivateMethods.updateScrollYData().then(() => {
+                        loadScrollYData();
+                    });
                 }
                 else {
                     tablePrivateMethods.updateScrollYSpace();
@@ -2397,7 +2415,7 @@ export default defineComponent({
         };
         const handleRecalculateLayout = (reFull) => {
             const el = refElem.value;
-            internalData.reRunTime = Date.now();
+            internalData.rceRunTime = Date.now();
             if (!el || !el.clientWidth) {
                 return nextTick();
             }
@@ -3070,10 +3088,14 @@ export default defineComponent({
                 internalData.inFooterScroll = false;
                 internalData.bodyScrollType = '';
                 if (isRollX && scrollXLoad) {
-                    tablePrivateMethods.updateScrollXData();
+                    tablePrivateMethods.updateScrollXData().then(() => {
+                        loadScrollXData();
+                    });
                 }
                 if (isRollY && scrollYLoad) {
-                    tablePrivateMethods.updateScrollYData();
+                    tablePrivateMethods.updateScrollYData().then(() => {
+                        loadScrollYData();
+                    });
                 }
                 tableMethods.updateCellAreas();
             }, 200);
@@ -3999,7 +4021,7 @@ export default defineComponent({
              */
             recalculate(reFull) {
                 return new Promise(resolve => {
-                    const { rceTimeout, reRunTime } = internalData;
+                    const { rceTimeout, rceRunTime } = internalData;
                     const resizeOpts = computeResizeOpts.value;
                     const refreshDelay = resizeOpts.refreshDelay || 20;
                     const el = refElem.value;
@@ -4008,7 +4030,7 @@ export default defineComponent({
                     }
                     if (rceTimeout) {
                         clearTimeout(rceTimeout);
-                        if (reRunTime && reRunTime + (refreshDelay - 5) < Date.now()) {
+                        if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
                             resolve(handleRecalculateLayout(!!reFull));
                         }
                         else {
@@ -6412,6 +6434,10 @@ export default defineComponent({
                 const isCustomVisible = isAllCustom || storageOpts.visible;
                 const isCustomFixed = isAllCustom || storageOpts.fixed;
                 const isCustomSort = isAllCustom || storageOpts.sort;
+                if (type !== 'reset') {
+                    // fix：修复拖动列宽，重置按钮无法点击的问题
+                    reactData.isCustomStatus = true;
+                }
                 if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
                     if (!tableId) {
                         errLog('vxe.error.reqProp', ['id']);

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.1-beta.0";
+const version = "4.10.1-beta.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3558,7 +3558,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.1-beta.0"}`;
+const log_version = `table v${"4.10.1-beta.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6421,12 +6421,14 @@ const lineOffsetSizes = {
         }
       }
       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) {
@@ -11858,20 +11860,32 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tablePrivateMethods.checkScrolling();
       }
     };
+    // const updateCellOffset = () => {
+    //   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 = () => {
       const {
         showOverflow
       } = props;
       const {
         tableData,
-        scrollXLoad,
-        scrollYLoad
+        scrollXLoad
       } = reactData;
       const {
         fullAllDataRowIdData
       } = internalData;
       const el = refElem.value;
-      if (!showOverflow && (scrollXLoad || scrollYLoad) && el) {
+      if (!showOverflow && el) {
         let paddingTop = 0;
         let paddingBottom = 0;
         let calcPadding = false;
@@ -11902,6 +11916,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
         });
       }
+      // updateCellOffset()
     };
     const getOrderField = column => {
       const {
@@ -13183,7 +13198,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           scrollXStore.offsetSize = offsetXSize;
           scrollXStore.visibleSize = visibleXSize;
           scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
-          tablePrivateMethods.updateScrollXData();
+          tablePrivateMethods.updateScrollXData().then(() => {
+            loadScrollXData();
+          });
         } else {
           tablePrivateMethods.updateScrollXSpace();
         }
@@ -13200,7 +13217,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           scrollYStore.offsetSize = offsetYSize;
           scrollYStore.visibleSize = visibleYSize;
           scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
-          tablePrivateMethods.updateScrollYData();
+          tablePrivateMethods.updateScrollYData().then(() => {
+            loadScrollYData();
+          });
         } else {
           tablePrivateMethods.updateScrollYSpace();
         }
@@ -13209,7 +13228,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     };
     const handleRecalculateLayout = reFull => {
       const el = refElem.value;
-      internalData.reRunTime = Date.now();
+      internalData.rceRunTime = Date.now();
       if (!el || !el.clientWidth) {
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       }
@@ -14000,10 +14019,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         internalData.inFooterScroll = false;
         internalData.bodyScrollType = '';
         if (isRollX && scrollXLoad) {
-          tablePrivateMethods.updateScrollXData();
+          tablePrivateMethods.updateScrollXData().then(() => {
+            loadScrollXData();
+          });
         }
         if (isRollY && scrollYLoad) {
-          tablePrivateMethods.updateScrollYData();
+          tablePrivateMethods.updateScrollYData().then(() => {
+            loadScrollYData();
+          });
         }
         tableMethods.updateCellAreas();
       }, 200);
@@ -15042,7 +15065,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return new Promise(resolve => {
           const {
             rceTimeout,
-            reRunTime
+            rceRunTime
           } = internalData;
           const resizeOpts = computeResizeOpts.value;
           const refreshDelay = resizeOpts.refreshDelay || 20;
@@ -15052,7 +15075,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
           if (rceTimeout) {
             clearTimeout(rceTimeout);
-            if (reRunTime && reRunTime + (refreshDelay - 5) < Date.now()) {
+            if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
               resolve(handleRecalculateLayout(!!reFull));
             } else {
               (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
@@ -17786,6 +17809,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const isCustomVisible = isAllCustom || storageOpts.visible;
         const isCustomFixed = isAllCustom || storageOpts.fixed;
         const isCustomSort = isAllCustom || storageOpts.sort;
+        if (type !== 'reset') {
+          // fix：修复拖动列宽，重置按钮无法点击的问题
+          reactData.isCustomStatus = true;
+        }
         if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
           if (!tableId) {
             errLog('vxe.error.reqProp', ['id']);