vxe-table 3.12.0-beta.6 → 3.12.0-beta.8

package/es/table/src/methods.js

@@ -66,9 +66,10 @@ function handleReserveRow(_vm, reserveRowMap) {
     });
     return reserveList;
 }
-function handleVirtualXVisible(_vm) {
-    const { $refs, visibleColumn } = _vm;
-    const { tableBody } = $refs;
+function handleVirtualXVisible($xeTable) {
+    const internalData = $xeTable;
+    const { visibleColumn } = internalData;
+    const tableBody = $xeTable.$refs.tableBody;
     const tableBodyElem = tableBody ? tableBody.$el : null;
     if (tableBodyElem) {
         const { scrollLeft, clientWidth } = tableBodyElem;
@@ -99,8 +100,8 @@ const computeRowHeight = ($xeTable) => {
     const tableBody = $xeTable.$refs.tableBody;
     const tableBodyElem = tableBody ? tableBody.$el : null;
     const vSize = $xeTable.computeSize;
-    const rowHeightMaps = $xeTable.rowHeightMaps;
-    let rowHeight = 0;
+    const rowHeightMaps = $xeTable.computeRowHeightMaps;
+    let rowHeight = 24;
     if (showOverflow) {
         if (tableBodyElem) {
             const tableHeaderElem = tableHeader ? tableHeader.$el : null;
@@ -120,8 +121,9 @@ const computeRowHeight = ($xeTable) => {
     return rowHeight;
 };
 function handleVirtualYVisible($xeTable) {
-    const { $refs, scrollYStore, afterFullData, fullAllDataRowIdData } = $xeTable;
-    const tableBody = $refs.tableBody;
+    const internalData = $xeTable;
+    const { scrollYStore, afterFullData, fullAllDataRowIdData } = internalData;
+    const tableBody = $xeTable.$refs.tableBody;
     const tableBodyElem = tableBody ? tableBody.$el : null;
     const { rowHeight } = scrollYStore;
     if (tableBodyElem) {
@@ -133,11 +135,11 @@ function handleVirtualYVisible($xeTable) {
         for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
             const row = afterFullData[rIndex];
             const rowid = getRowid($xeTable, row);
-            const rest = fullAllDataRowIdData[rowid];
-            if (!rest) {
+            const rowRest = fullAllDataRowIdData[rowid];
+            if (!rowRest) {
                 break;
             }
-            offsetTop += rest.height || rowHeight;
+            offsetTop += rowRest.height || rowHeight;
             if (toVisibleIndex === -1 && scrollTop < offsetTop) {
                 toVisibleIndex = rIndex;
             }
@@ -735,7 +737,6 @@ const Methods = {
         editStore.removeList = [];
         editStore.removeMaps = {};
         const sYLoad = this.updateScrollYStatus(fullData);
-        this.scrollYLoad = sYLoad;
         this.isDragRowMove = false;
         // 全量数据
         this.tableFullData = fullData;
@@ -5473,6 +5474,14 @@ const Methods = {
             evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
         }
     },
+    handleColDragSwapColumn() {
+        const $xeTable = this;
+        $xeTable.handleUpdateColumn();
+        $xeTable.parseColumns(false).then(() => {
+            $xeTable.updateCellAreas();
+            $xeTable.saveCustomStore('update:sort');
+        });
+    },
     handleColDragSwapEvent(evnt, isSyncColumn, dragCol, prevDragCol, prevDragPos, prevDragToChild) {
         const $xeTable = this;
         const props = $xeTable;
@@ -5616,11 +5625,7 @@ const Methods = {
                         }
                     }, evnt);
                     if (isSyncColumn) {
-                        $xeTable.handleUpdateColumn();
-                        $xeTable.parseColumns(false).then(() => {
-                            $xeTable.updateCellAreas();
-                            return $xeTable.saveCustomStore('update:sort');
-                        });
+                        $xeTable.handleColDragSwapColumn();
                     }
                 }).catch(() => {
                 });
@@ -6811,12 +6816,14 @@ const Methods = {
     scrollXEvent(evnt) {
         const $xeTable = this;
         const internalData = $xeTable;
-        const { inFooterScroll, inBodyScroll, lastScrollTop } = internalData;
-        if (inFooterScroll) {
-            return;
-        }
-        if (inBodyScroll) {
-            return;
+        const { intoRunScroll, inFooterScroll, inBodyScroll, lastScrollTop } = internalData;
+        if (!intoRunScroll) {
+            if (inFooterScroll) {
+                return;
+            }
+            if (inBodyScroll) {
+                return;
+            }
         }
         const tableHeader = $xeTable.$refs.tableHeader;
         const tableBody = $xeTable.$refs.tableBody;
@@ -6847,12 +6854,14 @@ const Methods = {
     scrollYEvent(evnt) {
         const $xeTable = this;
         const internalData = $xeTable;
-        const { inFooterScroll, inBodyScroll, lastScrollLeft } = internalData;
-        if (inFooterScroll) {
-            return;
-        }
-        if (inBodyScroll) {
-            return;
+        const { intoRunScroll, inFooterScroll, inBodyScroll, lastScrollLeft } = internalData;
+        if (!intoRunScroll) {
+            if (inFooterScroll) {
+                return;
+            }
+            if (inBodyScroll) {
+                return;
+            }
         }
         const tableBody = $xeTable.$refs.tableBody;
         const leftBody = $xeTable.$refs.leftBody;
@@ -6969,7 +6978,6 @@ const Methods = {
         const $xeTable = this;
         const props = $xeTable;
         const { showOverflow } = props;
-        // this.tableColumn = []
         return $xeTable.$nextTick().then(() => {
             $xeTable.handleTableColumn();
             calcCellHeight($xeTable);
@@ -7022,7 +7030,6 @@ const Methods = {
     },
     updateScrollYData() {
         const $xeTable = this;
-        // this.tableData = []
         return $xeTable.$nextTick().then(() => {
             $xeTable.handleTableData();
             calcCellHeight($xeTable);
@@ -7091,6 +7098,7 @@ const Methods = {
      */
     scrollTo(scrollLeft, scrollTop) {
         const $xeTable = this;
+        const internalData = $xeTable;
         const { $refs } = this;
         const { tableBody, tableHeader, leftBody, rightBody, tableFooter } = $refs;
         const tableBodyElem = tableBody ? tableBody.$el : null;
@@ -7098,6 +7106,7 @@ const Methods = {
         const rightBodyElem = rightBody ? rightBody.$el : null;
         const tableHeaderElem = tableHeader ? tableHeader.$el : null;
         const tableFooterElem = tableFooter ? tableFooter.$el : null;
+        internalData.intoRunScroll = true;
         if (XEUtils.isNumber(scrollLeft)) {
             const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
             if (xHandleEl) {
@@ -7121,7 +7130,14 @@ const Methods = {
             }
         }
         if (this.scrollXLoad || this.scrollYLoad) {
-            return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 30));
+            return new Promise(resolve => {
+                setTimeout(() => {
+                    $xeTable.$nextTick(() => {
+                        internalData.intoRunScroll = false;
+                        resolve();
+                    });
+                });
+            });
         }
         return this.$nextTick();
     },
@@ -7181,10 +7197,15 @@ const Methods = {
      */
     clearScroll() {
         const $xeTable = this;
-        const { $refs, scrollXStore, scrollYStore } = $xeTable;
-        const { tableBody, tableHeader, leftBody, rightBody, tableFooter } = $refs;
-        const tableBodyElem = tableBody ? tableBody.$el : null;
+        const internalData = $xeTable;
+        const { scrollXStore, scrollYStore } = internalData;
+        const tableBody = $xeTable.$refs.tableBody;
+        const tableHeader = $xeTable.$refs.tableHeader;
+        const tableFooter = $xeTable.$refs.tableFooter;
+        const leftBody = $xeTable.$refs.leftBody;
+        const rightBody = $xeTable.$refs.rightBody;
         const leftBodyElem = leftBody ? leftBody.$el : null;
+        const tableBodyElem = tableBody ? tableBody.$el : null;
         const rightBodyElem = rightBody ? rightBody.$el : null;
         const tableHeaderElem = tableHeader ? tableHeader.$el : null;
         const tableFooterElem = tableFooter ? tableFooter.$el : null;

package/es/table/src/util.js

@@ -66,14 +66,19 @@ const lineOffsetSizes = {
     small: 2,
     medium: 1
 };
-export function restoreScrollLocation(_vm, scrollLeft, scrollTop) {
-    return _vm.clearScroll().then(() => {
+export function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
+    const internalData = $xeTable;
+    return $xeTable.clearScroll().then(() => {
         if (scrollLeft || scrollTop) {
             // 重置最后滚动状态
-            _vm.lastScrollLeft = 0;
-            _vm.lastScrollTop = 0;
+            internalData.lastScrollLeft = 0;
+            internalData.lastScrollTop = 0;
+            internalData.inVirtualScroll = false;
+            internalData.inBodyScroll = false;
+            internalData.inFooterScroll = false;
+            internalData.bodyScrollType = '';
             // 还原滚动状态
-            return _vm.scrollTo(scrollLeft, scrollTop);
+            return $xeTable.scrollTo(scrollLeft, scrollTop);
         }
     });
 }

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.0-beta.6";
+export const version = "3.12.0-beta.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${"3.12.0-beta.6"}`;
+const version = `table v${"3.12.0-beta.8"}`;
 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.0-beta.6";
+const version = "3.12.0-beta.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2808,7 +2808,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.0-beta.6"}`;
+const log_version = `table v${"3.12.0-beta.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3054,14 +3054,19 @@ const lineOffsetSizes = {
   small: 2,
   medium: 1
 };
-function restoreScrollLocation(_vm, scrollLeft, scrollTop) {
-  return _vm.clearScroll().then(() => {
+function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
+  const internalData = $xeTable;
+  return $xeTable.clearScroll().then(() => {
     if (scrollLeft || scrollTop) {
       // 重置最后滚动状态
-      _vm.lastScrollLeft = 0;
-      _vm.lastScrollTop = 0;
+      internalData.lastScrollLeft = 0;
+      internalData.lastScrollTop = 0;
+      internalData.inVirtualScroll = false;
+      internalData.inBodyScroll = false;
+      internalData.inFooterScroll = false;
+      internalData.bodyScrollType = '';
       // 还原滚动状态
-      return _vm.scrollTo(scrollLeft, scrollTop);
+      return $xeTable.scrollTo(scrollLeft, scrollTop);
     }
   });
 }
@@ -4996,14 +5001,12 @@ function handleReserveRow(_vm, reserveRowMap) {
   });
   return reserveList;
 }
-function handleVirtualXVisible(_vm) {
+function handleVirtualXVisible($xeTable) {
+  const internalData = $xeTable;
   const {
-    $refs,
     visibleColumn
-  } = _vm;
-  const {
-    tableBody
-  } = $refs;
+  } = internalData;
+  const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   if (tableBodyElem) {
     const {
@@ -5045,8 +5048,8 @@ const computeRowHeight = $xeTable => {
   const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   const vSize = $xeTable.computeSize;
-  const rowHeightMaps = $xeTable.rowHeightMaps;
-  let rowHeight = 0;
+  const rowHeightMaps = $xeTable.computeRowHeightMaps;
+  let rowHeight = 24;
   if (showOverflow) {
     if (tableBodyElem) {
       const tableHeaderElem = tableHeader ? tableHeader.$el : null;
@@ -5066,13 +5069,13 @@ const computeRowHeight = $xeTable => {
   return rowHeight;
 };
 function handleVirtualYVisible($xeTable) {
+  const internalData = $xeTable;
   const {
-    $refs,
     scrollYStore,
     afterFullData,
     fullAllDataRowIdData
-  } = $xeTable;
-  const tableBody = $refs.tableBody;
+  } = internalData;
+  const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   const {
     rowHeight
@@ -5089,11 +5092,11 @@ function handleVirtualYVisible($xeTable) {
     for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
       const row = afterFullData[rIndex];
       const rowid = getRowid($xeTable, row);
-      const rest = fullAllDataRowIdData[rowid];
-      if (!rest) {
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (!rowRest) {
         break;
       }
-      offsetTop += rest.height || rowHeight;
+      offsetTop += rowRest.height || rowHeight;
       if (toVisibleIndex === -1 && scrollTop < offsetTop) {
         toVisibleIndex = rIndex;
       }
@@ -5780,7 +5783,6 @@ const Methods = {
     editStore.removeList = [];
     editStore.removeMaps = {};
     const sYLoad = this.updateScrollYStatus(fullData);
-    this.scrollYLoad = sYLoad;
     this.isDragRowMove = false;
     // 全量数据
     this.tableFullData = fullData;
@@ -11376,6 +11378,14 @@ const Methods = {
       evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
     }
   },
+  handleColDragSwapColumn() {
+    const $xeTable = this;
+    $xeTable.handleUpdateColumn();
+    $xeTable.parseColumns(false).then(() => {
+      $xeTable.updateCellAreas();
+      $xeTable.saveCustomStore('update:sort');
+    });
+  },
   handleColDragSwapEvent(evnt, isSyncColumn, dragCol, prevDragCol, prevDragPos, prevDragToChild) {
     const $xeTable = this;
     const props = $xeTable;
@@ -11532,11 +11542,7 @@ const Methods = {
             }
           }, evnt);
           if (isSyncColumn) {
-            $xeTable.handleUpdateColumn();
-            $xeTable.parseColumns(false).then(() => {
-              $xeTable.updateCellAreas();
-              return $xeTable.saveCustomStore('update:sort');
-            });
+            $xeTable.handleColDragSwapColumn();
           }
         }).catch(() => {});
       }
@@ -13007,15 +13013,18 @@ const Methods = {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
+      intoRunScroll,
       inFooterScroll,
       inBodyScroll,
       lastScrollTop
     } = internalData;
-    if (inFooterScroll) {
-      return;
-    }
-    if (inBodyScroll) {
-      return;
+    if (!intoRunScroll) {
+      if (inFooterScroll) {
+        return;
+      }
+      if (inBodyScroll) {
+        return;
+      }
     }
     const tableHeader = $xeTable.$refs.tableHeader;
     const tableBody = $xeTable.$refs.tableBody;
@@ -13049,15 +13058,18 @@ const Methods = {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
+      intoRunScroll,
       inFooterScroll,
       inBodyScroll,
       lastScrollLeft
     } = internalData;
-    if (inFooterScroll) {
-      return;
-    }
-    if (inBodyScroll) {
-      return;
+    if (!intoRunScroll) {
+      if (inFooterScroll) {
+        return;
+      }
+      if (inBodyScroll) {
+        return;
+      }
     }
     const tableBody = $xeTable.$refs.tableBody;
     const leftBody = $xeTable.$refs.leftBody;
@@ -13209,7 +13221,6 @@ const Methods = {
     const {
       showOverflow
     } = props;
-    // this.tableColumn = []
     return $xeTable.$nextTick().then(() => {
       $xeTable.handleTableColumn();
       calcCellHeight($xeTable);
@@ -13275,7 +13286,6 @@ const Methods = {
   },
   updateScrollYData() {
     const $xeTable = this;
-    // this.tableData = []
     return $xeTable.$nextTick().then(() => {
       $xeTable.handleTableData();
       calcCellHeight($xeTable);
@@ -13353,6 +13363,7 @@ const Methods = {
    */
   scrollTo(scrollLeft, scrollTop) {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
       $refs
     } = this;
@@ -13368,6 +13379,7 @@ const Methods = {
     const rightBodyElem = rightBody ? rightBody.$el : null;
     const tableHeaderElem = tableHeader ? tableHeader.$el : null;
     const tableFooterElem = tableFooter ? tableFooter.$el : null;
+    internalData.intoRunScroll = true;
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
       const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
       if (xHandleEl) {
@@ -13389,7 +13401,14 @@ const Methods = {
       }
     }
     if (this.scrollXLoad || this.scrollYLoad) {
-      return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 30));
+      return new Promise(resolve => {
+        setTimeout(() => {
+          $xeTable.$nextTick(() => {
+            internalData.intoRunScroll = false;
+            resolve();
+          });
+        });
+      });
     }
     return this.$nextTick();
   },
@@ -13454,20 +13473,18 @@ const Methods = {
    */
   clearScroll() {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
-      $refs,
       scrollXStore,
       scrollYStore
-    } = $xeTable;
-    const {
-      tableBody,
-      tableHeader,
-      leftBody,
-      rightBody,
-      tableFooter
-    } = $refs;
-    const tableBodyElem = tableBody ? tableBody.$el : null;
+    } = internalData;
+    const tableBody = $xeTable.$refs.tableBody;
+    const tableHeader = $xeTable.$refs.tableHeader;
+    const tableFooter = $xeTable.$refs.tableFooter;
+    const leftBody = $xeTable.$refs.leftBody;
+    const rightBody = $xeTable.$refs.rightBody;
     const leftBodyElem = leftBody ? leftBody.$el : null;
+    const tableBodyElem = tableBody ? tableBody.$el : null;
     const rightBodyElem = rightBody ? rightBody.$el : null;
     const tableHeaderElem = tableHeader ? tableHeader.$el : null;
     const tableFooterElem = tableFooter ? tableFooter.$el : null;
@@ -16629,7 +16646,7 @@ const renderPopupPanel = (h, _vm) => {
         }
       }), immediate ? h(VxeUIButtonComponent, {
         props: {
-          content: customOpts.resetButtonText || panel_getI18n('vxe.custom.customClose')
+          content: customOpts.resetButtonText || panel_getI18n('vxe.table.customClose')
         },
         on: {
           click: _vm.cancelCloseEvent
@@ -17164,11 +17181,7 @@ const renderPopupPanel = (h, _vm) => {
             }, evnt);
             if (immediate) {
               reactData.customColumnList = collectColumn.slice(0);
-              $xeTable.refreshColumn(true).then(() => {
-                $xeTable.updateCellAreas();
-                $xeTable.handleCustom();
-                $xeTable.saveCustomStore('update:sort');
-              });
+              $xeTable.handleColDragSwapColumn();
             }
           }).catch(() => {});
         }