vxe-table 3.15.28 → 3.15.29

package/lib/table/src/methods.js

@@ -37,8 +37,11 @@ function eqCellValue(row1, row2, field) {
   }
   return _xeUtils.default.isEqual(val1, val2);
 }
-function getNextSortOrder(_vm, column) {
-  const orders = _vm.sortOpts.orders;
+function getNextSortOrder($xeTable, column) {
+  const sortOpts = $xeTable.computeSortOpts;
+  const {
+    orders = []
+  } = sortOpts;
   const currOrder = column.order || null;
   const oIndex = orders.indexOf(currOrder) + 1;
   return orders[oIndex < orders.length ? oIndex : 0];
@@ -2395,8 +2398,66 @@ function removeFooterMerges($xeTable, merges) {
   }
   return rest;
 }
-function clearAllSort(_vm) {
-  _vm.tableFullColumn.forEach(column => {
+function handleSortEvent($xeTable, evnt, sortConfs, isUpdate) {
+  const sortOpts = $xeTable.computeSortOpts;
+  const {
+    multiple,
+    remote,
+    orders
+  } = sortOpts;
+  if (!_xeUtils.default.isArray(sortConfs)) {
+    sortConfs = [sortConfs];
+  }
+  if (sortConfs && sortConfs.length) {
+    if (!multiple) {
+      sortConfs = [sortConfs[0]];
+      clearAllSort($xeTable);
+    }
+    let firstColumn = null;
+    sortConfs.forEach((confs, index) => {
+      let {
+        field,
+        order
+      } = confs;
+      let column = field;
+      if (_xeUtils.default.isString(field)) {
+        column = $xeTable.getColumnByField(field);
+      }
+      if (!firstColumn) {
+        firstColumn = column;
+      }
+      if (column && column.sortable) {
+        if (orders && orders.indexOf(order) === -1) {
+          order = getNextSortOrder($xeTable, column);
+        }
+        if (column.order !== order) {
+          column.order = order;
+        }
+        column.sortTime = Date.now() + index;
+      }
+    });
+    if (isUpdate) {
+      if (!remote) {
+        $xeTable.handleTableData(true);
+      }
+    }
+    if (evnt) {
+      $xeTable.handleColumnSortEvent(evnt, firstColumn);
+    }
+    return $xeTable.$nextTick().then(() => {
+      updateRowOffsetTop($xeTable);
+      $xeTable.updateCellAreas();
+      return updateStyle($xeTable);
+    });
+  }
+  return $xeTable.$nextTick();
+}
+function clearAllSort($xeTable) {
+  const internalData = $xeTable;
+  const {
+    tableFullColumn
+  } = internalData;
+  tableFullColumn.forEach(column => {
     column.order = null;
   });
 }
@@ -3761,7 +3822,8 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const internalData = $xeTable;
   const {
     scrollXLoad,
-    scrollYLoad
+    scrollYLoad,
+    isAllOverflow
   } = reactData;
   const {
     lcsTimeout
@@ -3779,13 +3841,19 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
     internalData.inBodyScroll = false;
     internalData.inFooterScroll = false;
     internalData.scrollRenderType = '';
-    calcCellHeight($xeTable);
+    if (!isAllOverflow) {
+      calcCellHeight($xeTable);
+      updateRowOffsetTop($xeTable);
+    }
     if (isRollX && scrollXLoad) {
       $xeTable.updateScrollXData();
     }
     if (isRollY && scrollYLoad) {
       $xeTable.updateScrollYData().then(() => {
-        calcCellHeight($xeTable);
+        if (!isAllOverflow) {
+          calcCellHeight($xeTable);
+          updateRowOffsetTop($xeTable);
+        }
         $xeTable.updateScrollYSpace();
       });
     }
@@ -5436,6 +5504,7 @@ const Methods = {
         }
         _xeUtils.default.eachTree([targetColumn], column => {
           column.fixed = fixed;
+          column.renderFixed = fixed;
         });
         $xeTable.saveCustomStore('update:fixed');
         if (!status) {
@@ -5461,6 +5530,7 @@ const Methods = {
       if (targetColumn && targetColumn.fixed) {
         _xeUtils.default.eachTree([targetColumn], column => {
           column.fixed = null;
+          column.renderFixed = null;
         });
         $xeTable.saveCustomStore('update:fixed');
         if (!status) {
@@ -7238,10 +7308,14 @@ const Methods = {
     if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
       const ctEl = tdEl.querySelector('.vxe-cell--wrapper');
       let ovEl = null;
+      let tipEl = tdEl.querySelector(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label');
       if (column.treeNode) {
         ovEl = tdEl.querySelector('.vxe-tree-cell');
       }
-      handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+      if (!tipEl) {
+        tipEl = ctEl;
+      }
+      handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
     }
   },
   /**
@@ -7259,7 +7333,16 @@ const Methods = {
     const tdEl = evnt.currentTarget;
     handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+      const ctEl = tdEl.querySelector('.vxe-cell--wrapper');
+      let ovEl = null;
+      let tipEl = tdEl.querySelector(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label');
+      if (column.type === 'html') {
+        ovEl = tdEl.querySelector('.vxe-cell--html');
+      }
+      if (!tipEl) {
+        tipEl = ctEl;
+      }
+      handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
     }
   },
   openTooltip(target, content) {
@@ -9671,56 +9754,12 @@ const Methods = {
   },
   setSort(sortConfs, isUpdate) {
     const $xeTable = this;
-    const sortOpts = $xeTable.computeSortOpts;
-    const {
-      multiple,
-      remote,
-      orders
-    } = sortOpts;
-    if (!_xeUtils.default.isArray(sortConfs)) {
-      sortConfs = [sortConfs];
-    }
-    if (sortConfs && sortConfs.length) {
-      if (!multiple) {
-        sortConfs = [sortConfs[0]];
-        clearAllSort($xeTable);
-      }
-      let firstColumn = null;
-      sortConfs.forEach((confs, index) => {
-        let {
-          field,
-          order
-        } = confs;
-        let column = field;
-        if (_xeUtils.default.isString(field)) {
-          column = $xeTable.getColumnByField(field);
-        }
-        if (!firstColumn) {
-          firstColumn = column;
-        }
-        if (column && column.sortable) {
-          if (orders && orders.indexOf(order) === -1) {
-            order = getNextSortOrder($xeTable, column);
-          }
-          if (column.order !== order) {
-            column.order = order;
-          }
-          column.sortTime = Date.now() + index;
-        }
-      });
-      if (isUpdate) {
-        if (!remote) {
-          $xeTable.handleTableData(true);
-        }
-        $xeTable.handleColumnSortEvent(new Event('click'), firstColumn);
-      }
-      return $xeTable.$nextTick().then(() => {
-        updateRowOffsetTop($xeTable);
-        $xeTable.updateCellAreas();
-        return updateStyle($xeTable);
-      });
-    }
-    return $xeTable.$nextTick();
+    // 已废弃，即将去掉事件触发 new Event('click') -> null
+    return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+  },
+  setSortByEvent(evnt, sortConfs, isUpdate) {
+    const $xeTable = this;
+    return handleSortEvent($xeTable, evnt, sortConfs, isUpdate);
   },
   /**
    * 清空指定列的排序条件
@@ -9829,6 +9868,17 @@ const Methods = {
     }
     return sortList;
   },
+  setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
+    const $xeTable = this;
+    const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
+    if (column && column.filters) {
+      column.filters = (0, _util.toFilters)(options || []);
+      if (isUpdate) {
+        return $xeTable.handleColumnConfirmFilter(column, evnt);
+      }
+    }
+    return $xeTable.$nextTick();
+  },
   /**
    * 关闭筛选
    * @param {Event} evnt 事件