vxe-table 3.15.9 → 3.15.11

package/es/table/src/methods.js

@@ -1050,7 +1050,7 @@ function updateStyle($xeTable) {
                         isOptimizeMode = true;
                     }
                 }
-                if (!isOptimizeMode) {
+                if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
                     renderColumnList = visibleColumn;
                 }
                 if (fixedType) {
@@ -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() {
@@ -9389,7 +9394,7 @@ const Methods = {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        const { isGroup, scrollXLoad, overflowX, scrollXWidth } = reactData;
+        const { scrollXLoad, overflowX, scrollXWidth } = reactData;
         const { visibleColumn, scrollXStore, elemStore, fullColumnIdData } = internalData;
         const mouseOpts = $xeTable.computeMouseOpts;
         const tableBody = $xeTable.$refs.refTableBody;
@@ -9428,13 +9433,13 @@ const Methods = {
                 marginLeft = `${xSpaceLeft}px`;
             }
             if (headerTableElem) {
-                headerTableElem.style.marginLeft = isGroup ? '' : marginLeft;
+                headerTableElem.style.marginLeft = headerTableElem.getAttribute('xvm') ? marginLeft : '';
             }
             if (bodyTableElem) {
                 bodyTableElem.style.marginLeft = marginLeft;
             }
             if (footerTableElem) {
-                footerTableElem.style.marginLeft = marginLeft;
+                footerTableElem.style.marginLeft = footerTableElem.getAttribute('xvm') ? marginLeft : '';
             }
             reactData.isScrollXBig = isScrollXBig;
             const containerList = ['main'];

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.9";
+export const version = "3.15.11";
 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.9"}`;
+const version = `table v${"3.15.11"}`;
 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.9";
+const version = "3.15.11";
 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.9"}`;
+const log_version = `table v${"3.15.11"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6589,7 +6589,7 @@ function updateStyle($xeTable) {
             isOptimizeMode = true;
           }
         }
-        if (!isOptimizeMode) {
+        if (!isOptimizeMode || !isColLoading && (fixedType || !overflowX)) {
           renderColumnList = visibleColumn;
         }
         if (fixedType) {
@@ -13786,10 +13786,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 +14784,7 @@ const Methods = {
   },
   sort(sortConfs, sortOrder) {
     const $xeTable = this;
-    const {
-      sortOpts
-    } = this;
+    const sortOpts = $xeTable.computeSortOpts;
     const {
       multiple,
       remote,
@@ -14806,7 +14804,7 @@ const Methods = {
     if (sortConfs.length) {
       let firstSortColumn;
       if (!multiple) {
-        clearAllSort(this);
+        clearAllSort($xeTable);
       }
       (multiple ? sortConfs : [sortConfs[0]]).forEach((confs, index) => {
         let {
@@ -14815,14 +14813,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 +14830,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 +14870,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 +14886,7 @@ const Methods = {
         $xeTable.handleColumnSortEvent(new Event('click'), firstColumn);
       }
       return $xeTable.$nextTick().then(() => {
+        updateRowOffsetTop($xeTable);
         $xeTable.updateCellAreas();
         return updateStyle($xeTable);
       });
@@ -14900,21 +14900,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() {
@@ -16283,7 +16284,6 @@ const Methods = {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const {
-      isGroup,
       scrollXLoad,
       overflowX,
       scrollXWidth
@@ -16330,13 +16330,13 @@ const Methods = {
         marginLeft = `${xSpaceLeft}px`;
       }
       if (headerTableElem) {
-        headerTableElem.style.marginLeft = isGroup ? '' : marginLeft;
+        headerTableElem.style.marginLeft = headerTableElem.getAttribute('xvm') ? marginLeft : '';
       }
       if (bodyTableElem) {
         bodyTableElem.style.marginLeft = marginLeft;
       }
       if (footerTableElem) {
-        footerTableElem.style.marginLeft = marginLeft;
+        footerTableElem.style.marginLeft = footerTableElem.getAttribute('xvm') ? marginLeft : '';
       }
       reactData.isScrollXBig = isScrollXBig;
       const containerList = ['main'];