vxe-table 3.15.9 → 3.15.11

package/lib/table/src/methods.js

@@ -1321,7 +1321,7 @@ function updateStyle($xeTable) {
             isOptimizeMode = true;
           }
         }
-        if (!isOptimizeMode) {
+        if (!isOptimizeMode || !isColLoading && (fixedType || !overflowX)) {
           renderColumnList = visibleColumn;
         }
         if (fixedType) {
@@ -8505,10 +8505,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);
         }
       }
     }
@@ -9505,9 +9505,7 @@ const Methods = {
   },
   sort(sortConfs, sortOrder) {
     const $xeTable = this;
-    const {
-      sortOpts
-    } = this;
+    const sortOpts = $xeTable.computeSortOpts;
     const {
       multiple,
       remote,
@@ -9527,7 +9525,7 @@ const Methods = {
     if (sortConfs.length) {
       let firstSortColumn;
       if (!multiple) {
-        clearAllSort(this);
+        clearAllSort($xeTable);
       }
       (multiple ? sortConfs : [sortConfs[0]]).forEach((confs, index) => {
         let {
@@ -9536,14 +9534,14 @@ const Methods = {
         } = confs;
         let column = field;
         if (_xeUtils.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;
@@ -9553,14 +9551,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;
@@ -9592,7 +9591,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) {
@@ -9608,6 +9607,7 @@ const Methods = {
         $xeTable.handleColumnSortEvent(new Event('click'), firstColumn);
       }
       return $xeTable.$nextTick().then(() => {
+        updateRowOffsetTop($xeTable);
         $xeTable.updateCellAreas();
         return updateStyle($xeTable);
       });
@@ -9621,21 +9621,22 @@ const Methods = {
    */
   clearSort(fieldOrColumn) {
     const $xeTable = this;
-    const {
-      sortOpts
-    } = this;
+    const sortOpts = $xeTable.computeSortOpts;
     if (fieldOrColumn) {
-      const column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
+      const column = (0, _util.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() {
@@ -11003,7 +11004,6 @@ const Methods = {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const {
-      isGroup,
       scrollXLoad,
       overflowX,
       scrollXWidth
@@ -11050,13 +11050,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'];