vxe-table 3.15.10 → 3.15.12

package/es/table/src/methods.js

@@ -7275,13 +7275,13 @@ const Methods = {
                     checkValidate($xeTable, 'blur')
                         .catch((e) => e)
                         .then(() => {
-                        this.handleEdit(params, evnt)
+                        $xeTable.handleEdit(params, evnt)
                             .then(() => checkValidate($xeTable, 'change'))
                             .catch((e) => e);
                     });
                 }
                 else if (editOpts.mode === 'cell') {
-                    this.handleEdit(params, evnt)
+                    $xeTable.handleEdit(params, evnt)
                         .then(() => checkValidate($xeTable, 'change'))
                         .catch((e) => e);
                 }
@@ -8132,7 +8132,7 @@ const Methods = {
     },
     sort(sortConfs, sortOrder) {
         const $xeTable = this;
-        const { sortOpts } = this;
+        const sortOpts = $xeTable.computeSortOpts;
         const { multiple, remote, orders } = sortOpts;
         if (sortConfs) {
             if (XEUtils.isString(sortConfs)) {
@@ -8147,20 +8147,20 @@ const Methods = {
         if (sortConfs.length) {
             let firstSortColumn;
             if (!multiple) {
-                clearAllSort(this);
+                clearAllSort($xeTable);
             }
             (multiple ? sortConfs : [sortConfs[0]]).forEach((confs, index) => {
                 let { field, order } = confs;
                 let column = field;
                 if (XEUtils.isString(field)) {
-                    column = this.getColumnByField(field);
+                    column = $xeTable.getColumnByField(field);
                 }
                 if (column && (column.sortable || column.remoteSort)) {
                     if (!firstSortColumn) {
                         firstSortColumn = column;
                     }
-                    if (orders.indexOf(order) === -1) {
-                        order = getNextSortOrder(this, column);
+                    if (orders && orders.indexOf(order) === -1) {
+                        order = getNextSortOrder($xeTable, column);
                     }
                     if (column.order !== order) {
                         column.order = order;
@@ -8170,14 +8170,15 @@ const Methods = {
             });
             // 如果是服务端排序，则跳过本地排序处理
             if (!remote || (firstSortColumn && firstSortColumn.remoteSort)) {
-                this.handleTableData(true);
+                $xeTable.handleTableData(true);
             }
-            return this.$nextTick().then(() => {
-                this.updateCellAreas();
+            return $xeTable.$nextTick().then(() => {
+                updateRowOffsetTop($xeTable);
+                $xeTable.updateCellAreas();
                 return updateStyle($xeTable);
             });
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     setSort(sortConfs, isUpdate) {
         const $xeTable = this;
@@ -8202,7 +8203,7 @@ const Methods = {
                     firstColumn = column;
                 }
                 if (column && column.sortable) {
-                    if (orders.indexOf(order) === -1) {
+                    if (orders && orders.indexOf(order) === -1) {
                         order = getNextSortOrder($xeTable, column);
                     }
                     if (column.order !== order) {
@@ -8218,6 +8219,7 @@ const Methods = {
                 $xeTable.handleColumnSortEvent(new Event('click'), firstColumn);
             }
             return $xeTable.$nextTick().then(() => {
+                updateRowOffsetTop($xeTable);
                 $xeTable.updateCellAreas();
                 return updateStyle($xeTable);
             });
@@ -8231,20 +8233,23 @@ const Methods = {
      */
     clearSort(fieldOrColumn) {
         const $xeTable = this;
-        const { sortOpts } = this;
+        const sortOpts = $xeTable.computeSortOpts;
         if (fieldOrColumn) {
-            const column = handleFieldOrColumn(this, fieldOrColumn);
+            const column = handleFieldOrColumn($xeTable, fieldOrColumn);
             if (column) {
                 column.order = null;
             }
         }
         else {
-            clearAllSort(this);
+            clearAllSort($xeTable);
         }
         if (!sortOpts.remote) {
-            this.handleTableData(true);
+            $xeTable.handleTableData(true);
         }
-        return this.$nextTick().then(() => updateStyle($xeTable));
+        return $xeTable.$nextTick().then(() => {
+            updateRowOffsetTop($xeTable);
+            return updateStyle($xeTable);
+        });
     },
     // 在 v3 中废弃
     getSortColumn() {
@@ -9580,48 +9585,42 @@ const Methods = {
      */
     scrollTo(scrollLeft, scrollTop) {
         const $xeTable = this;
+        const reactData = $xeTable;
         const internalData = $xeTable;
-        const { $refs } = this;
-        const { refTableBody, refTableHeader, leftBody, rightBody, refTableFooter } = $refs;
-        const tableBodyElem = refTableBody ? refTableBody.$el : null;
-        const leftBodyElem = leftBody ? leftBody.$el : null;
-        const rightBodyElem = rightBody ? rightBody.$el : null;
-        const tableHeaderElem = refTableHeader ? refTableHeader.$el : null;
-        const tableFooterElem = refTableFooter ? refTableFooter.$el : null;
+        const { elemStore } = internalData;
+        const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
+        const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+        const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
+        const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
+        const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
+        const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
+        const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
         internalData.intoRunScroll = true;
         if (XEUtils.isNumber(scrollLeft)) {
-            const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
-            if (xHandleEl) {
-                setScrollLeft(xHandleEl, scrollLeft);
-            }
-            else {
-                setScrollLeft(tableBodyElem, scrollLeft);
-                setScrollLeft(tableHeaderElem, scrollLeft);
-                setScrollLeft(tableFooterElem, scrollLeft);
-            }
+            setScrollLeft(xHandleEl, scrollLeft);
+            setScrollLeft(bodyScrollElem, scrollLeft);
+            setScrollLeft(headerScrollElem, scrollLeft);
+            setScrollLeft(footerScrollElem, scrollLeft);
+            loadScrollXData($xeTable);
         }
         if (XEUtils.isNumber(scrollTop)) {
-            const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
-            if (yHandleEl) {
-                setScrollTop(yHandleEl, scrollTop);
-            }
-            else {
-                setScrollTop(tableBodyElem, scrollTop);
-                setScrollTop(leftBodyElem, scrollTop);
-                setScrollTop(rightBodyElem, scrollTop);
-            }
+            setScrollTop(yHandleEl, scrollTop);
+            setScrollTop(bodyScrollElem, scrollTop);
+            setScrollTop(leftScrollElem, scrollTop);
+            setScrollTop(rightScrollElem, scrollTop);
+            loadScrollYData($xeTable);
         }
-        if (this.scrollXLoad || this.scrollYLoad) {
+        if (reactData.scrollXLoad || reactData.scrollYLoad) {
             return new Promise(resolve => {
                 setTimeout(() => {
                     $xeTable.$nextTick(() => {
                         internalData.intoRunScroll = false;
                         resolve();
                     });
-                });
+                }, 30);
             });
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     /**
      * 如果有滚动条，则滚动到对应的行
@@ -9630,15 +9629,16 @@ const Methods = {
      */
     scrollToRow(row, fieldOrColumn) {
         const $xeTable = this;
+        const props = $xeTable;
         const reactData = $xeTable;
         const { isAllOverflow, scrollYLoad, scrollXLoad } = reactData;
         const rest = [];
         if (row) {
-            if (this.treeConfig) {
-                rest.push(this.scrollToTreeRow(row));
+            if (props.treeConfig) {
+                rest.push($xeTable.scrollToTreeRow(row));
             }
             else {
-                rest.push(rowToVisible(this, row));
+                rest.push(rowToVisible($xeTable, row));
             }
         }
         if (fieldOrColumn) {

package/es/table/src/util.js

@@ -64,22 +64,18 @@ export const convertHeaderColumnToRows = (originColumns) => {
 };
 export function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
     const internalData = $xeTable;
-    return $xeTable.clearScroll().then(() => {
-        if (scrollLeft || scrollTop) {
-            // 重置最后滚动状态
-            internalData.lastScrollLeft = 0;
-            internalData.lastScrollTop = 0;
-            internalData.intoRunScroll = false;
-            internalData.inVirtualScroll = false;
-            internalData.inWheelScroll = false;
-            internalData.inHeaderScroll = false;
-            internalData.inBodyScroll = false;
-            internalData.inFooterScroll = false;
-            internalData.scrollRenderType = '';
-            // 还原滚动状态
-            return $xeTable.scrollTo(scrollLeft, scrollTop);
-        }
-    });
+    if (scrollLeft || scrollTop) {
+        internalData.intoRunScroll = false;
+        internalData.inVirtualScroll = false;
+        internalData.inWheelScroll = false;
+        internalData.inHeaderScroll = false;
+        internalData.inBodyScroll = false;
+        internalData.inFooterScroll = false;
+        internalData.scrollRenderType = '';
+        // 还原滚动状态
+        return $xeTable.scrollTo(scrollLeft, scrollTop);
+    }
+    return $xeTable.$nextTick();
 }
 export function toTreePathSeq(path) {
     return path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');

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.10";
+export const version = "3.15.12";
 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.15.10"}`;
+const version = `table v${"3.15.12"}`;
 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.15.10";
+const version = "3.15.12";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2858,7 +2858,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.10"}`;
+const log_version = `table v${"3.15.12"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3101,22 +3101,18 @@ const convertHeaderColumnToRows = originColumns => {
 };
 function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
   const internalData = $xeTable;
-  return $xeTable.clearScroll().then(() => {
-    if (scrollLeft || scrollTop) {
-      // 重置最后滚动状态
-      internalData.lastScrollLeft = 0;
-      internalData.lastScrollTop = 0;
-      internalData.intoRunScroll = false;
-      internalData.inVirtualScroll = false;
-      internalData.inWheelScroll = false;
-      internalData.inHeaderScroll = false;
-      internalData.inBodyScroll = false;
-      internalData.inFooterScroll = false;
-      internalData.scrollRenderType = '';
-      // 还原滚动状态
-      return $xeTable.scrollTo(scrollLeft, scrollTop);
-    }
-  });
+  if (scrollLeft || scrollTop) {
+    internalData.intoRunScroll = false;
+    internalData.inVirtualScroll = false;
+    internalData.inWheelScroll = false;
+    internalData.inHeaderScroll = false;
+    internalData.inBodyScroll = false;
+    internalData.inFooterScroll = false;
+    internalData.scrollRenderType = '';
+    // 还原滚动状态
+    return $xeTable.scrollTo(scrollLeft, scrollTop);
+  }
+  return $xeTable.$nextTick();
 }
 function toTreePathSeq(path) {
   return path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
@@ -13786,10 +13782,10 @@ const Methods = {
       if (!actived.args || evnt.currentTarget !== actived.args.cell) {
         if (editOpts.mode === 'row') {
           checkValidate($xeTable, 'blur').catch(e => e).then(() => {
-            this.handleEdit(params, evnt).then(() => checkValidate($xeTable, 'change')).catch(e => e);
+            $xeTable.handleEdit(params, evnt).then(() => checkValidate($xeTable, 'change')).catch(e => e);
           });
         } else if (editOpts.mode === 'cell') {
-          this.handleEdit(params, evnt).then(() => checkValidate($xeTable, 'change')).catch(e => e);
+          $xeTable.handleEdit(params, evnt).then(() => checkValidate($xeTable, 'change')).catch(e => e);
         }
       }
     }
@@ -14784,9 +14780,7 @@ const Methods = {
   },
   sort(sortConfs, sortOrder) {
     const $xeTable = this;
-    const {
-      sortOpts
-    } = this;
+    const sortOpts = $xeTable.computeSortOpts;
     const {
       multiple,
       remote,
@@ -14806,7 +14800,7 @@ const Methods = {
     if (sortConfs.length) {
       let firstSortColumn;
       if (!multiple) {
-        clearAllSort(this);
+        clearAllSort($xeTable);
       }
       (multiple ? sortConfs : [sortConfs[0]]).forEach((confs, index) => {
         let {
@@ -14815,14 +14809,14 @@ const Methods = {
         } = confs;
         let column = field;
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(field)) {
-          column = this.getColumnByField(field);
+          column = $xeTable.getColumnByField(field);
         }
         if (column && (column.sortable || column.remoteSort)) {
           if (!firstSortColumn) {
             firstSortColumn = column;
           }
-          if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(this, column);
+          if (orders && orders.indexOf(order) === -1) {
+            order = getNextSortOrder($xeTable, column);
           }
           if (column.order !== order) {
             column.order = order;
@@ -14832,14 +14826,15 @@ const Methods = {
       });
       // 如果是服务端排序，则跳过本地排序处理
       if (!remote || firstSortColumn && firstSortColumn.remoteSort) {
-        this.handleTableData(true);
+        $xeTable.handleTableData(true);
       }
-      return this.$nextTick().then(() => {
-        this.updateCellAreas();
+      return $xeTable.$nextTick().then(() => {
+        updateRowOffsetTop($xeTable);
+        $xeTable.updateCellAreas();
         return updateStyle($xeTable);
       });
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   setSort(sortConfs, isUpdate) {
     const $xeTable = this;
@@ -14871,7 +14866,7 @@ const Methods = {
           firstColumn = column;
         }
         if (column && column.sortable) {
-          if (orders.indexOf(order) === -1) {
+          if (orders && orders.indexOf(order) === -1) {
             order = getNextSortOrder($xeTable, column);
           }
           if (column.order !== order) {
@@ -14887,6 +14882,7 @@ const Methods = {
         $xeTable.handleColumnSortEvent(new Event('click'), firstColumn);
       }
       return $xeTable.$nextTick().then(() => {
+        updateRowOffsetTop($xeTable);
         $xeTable.updateCellAreas();
         return updateStyle($xeTable);
       });
@@ -14900,21 +14896,22 @@ const Methods = {
    */
   clearSort(fieldOrColumn) {
     const $xeTable = this;
-    const {
-      sortOpts
-    } = this;
+    const sortOpts = $xeTable.computeSortOpts;
     if (fieldOrColumn) {
-      const column = handleFieldOrColumn(this, fieldOrColumn);
+      const column = handleFieldOrColumn($xeTable, fieldOrColumn);
       if (column) {
         column.order = null;
       }
     } else {
-      clearAllSort(this);
+      clearAllSort($xeTable);
     }
     if (!sortOpts.remote) {
-      this.handleTableData(true);
+      $xeTable.handleTableData(true);
     }
-    return this.$nextTick().then(() => updateStyle($xeTable));
+    return $xeTable.$nextTick().then(() => {
+      updateRowOffsetTop($xeTable);
+      return updateStyle($xeTable);
+    });
   },
   // 在 v3 中废弃
   getSortColumn() {
@@ -16491,54 +16488,44 @@ const Methods = {
    */
   scrollTo(scrollLeft, scrollTop) {
     const $xeTable = this;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
-      $refs
-    } = this;
-    const {
-      refTableBody,
-      refTableHeader,
-      leftBody,
-      rightBody,
-      refTableFooter
-    } = $refs;
-    const tableBodyElem = refTableBody ? refTableBody.$el : null;
-    const leftBodyElem = leftBody ? leftBody.$el : null;
-    const rightBodyElem = rightBody ? rightBody.$el : null;
-    const tableHeaderElem = refTableHeader ? refTableHeader.$el : null;
-    const tableFooterElem = refTableFooter ? refTableFooter.$el : null;
+      elemStore
+    } = internalData;
+    const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
+    const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
+    const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
+    const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
+    const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
     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) {
-        setScrollLeft(xHandleEl, scrollLeft);
-      } else {
-        setScrollLeft(tableBodyElem, scrollLeft);
-        setScrollLeft(tableHeaderElem, scrollLeft);
-        setScrollLeft(tableFooterElem, scrollLeft);
-      }
+      setScrollLeft(xHandleEl, scrollLeft);
+      setScrollLeft(bodyScrollElem, scrollLeft);
+      setScrollLeft(headerScrollElem, scrollLeft);
+      setScrollLeft(footerScrollElem, scrollLeft);
+      loadScrollXData($xeTable);
     }
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollTop)) {
-      const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
-      if (yHandleEl) {
-        setScrollTop(yHandleEl, scrollTop);
-      } else {
-        setScrollTop(tableBodyElem, scrollTop);
-        setScrollTop(leftBodyElem, scrollTop);
-        setScrollTop(rightBodyElem, scrollTop);
-      }
+      setScrollTop(yHandleEl, scrollTop);
+      setScrollTop(bodyScrollElem, scrollTop);
+      setScrollTop(leftScrollElem, scrollTop);
+      setScrollTop(rightScrollElem, scrollTop);
+      loadScrollYData($xeTable);
     }
-    if (this.scrollXLoad || this.scrollYLoad) {
+    if (reactData.scrollXLoad || reactData.scrollYLoad) {
       return new Promise(resolve => {
         setTimeout(() => {
           $xeTable.$nextTick(() => {
             internalData.intoRunScroll = false;
             resolve();
           });
-        });
+        }, 30);
       });
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   /**
    * 如果有滚动条，则滚动到对应的行
@@ -16547,6 +16534,7 @@ const Methods = {
    */
   scrollToRow(row, fieldOrColumn) {
     const $xeTable = this;
+    const props = $xeTable;
     const reactData = $xeTable;
     const {
       isAllOverflow,
@@ -16555,10 +16543,10 @@ const Methods = {
     } = reactData;
     const rest = [];
     if (row) {
-      if (this.treeConfig) {
-        rest.push(this.scrollToTreeRow(row));
+      if (props.treeConfig) {
+        rest.push($xeTable.scrollToTreeRow(row));
       } else {
-        rest.push(rowToVisible(this, row));
+        rest.push(rowToVisible($xeTable, row));
       }
     }
     if (fieldOrColumn) {