vxe-table 3.15.28 → 3.15.29

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.27";
+const version = "3.15.29";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2864,7 +2864,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.27"}`;
+const log_version = `table v${"3.15.29"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5327,8 +5327,11 @@ function eqCellValue(row1, row2, field) {
   }
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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];
@@ -7685,8 +7688,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 (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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;
   });
 }
@@ -9051,7 +9112,8 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const internalData = $xeTable;
   const {
     scrollXLoad,
-    scrollYLoad
+    scrollYLoad,
+    isAllOverflow
   } = reactData;
   const {
     lcsTimeout
@@ -9069,13 +9131,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();
       });
     }
@@ -10730,6 +10798,7 @@ const Methods = {
         }
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
           column.fixed = fixed;
+          column.renderFixed = fixed;
         });
         $xeTable.saveCustomStore('update:fixed');
         if (!status) {
@@ -10755,6 +10824,7 @@ const Methods = {
       if (targetColumn && targetColumn.fixed) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
           column.fixed = null;
+          column.renderFixed = null;
         });
         $xeTable.saveCustomStore('update:fixed');
         if (!status) {
@@ -12537,10 +12607,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);
     }
   },
   /**
@@ -12558,7 +12632,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) {
@@ -14972,56 +15055,12 @@ const Methods = {
   },
   setSort(sortConfs, isUpdate) {
     const $xeTable = this;
-    const sortOpts = $xeTable.computeSortOpts;
-    const {
-      multiple,
-      remote,
-      orders
-    } = sortOpts;
-    if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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);
   },
   /**
    * 清空指定列的排序条件
@@ -15130,6 +15169,17 @@ const Methods = {
     }
     return sortList;
   },
+  setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
+    const $xeTable = this;
+    const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+    if (column && column.filters) {
+      column.filters = toFilters(options || []);
+      if (isUpdate) {
+        return $xeTable.handleColumnConfirmFilter(column, evnt);
+      }
+    }
+    return $xeTable.$nextTick();
+  },
   /**
    * 关闭筛选
    * @param {Event} evnt 事件
@@ -21732,6 +21782,7 @@ const {
       if (column && column.filters) {
         column.filters = toFilters(options || []);
         if (isUpdate) {
+          // 已废弃，即将去掉事件触发 new Event('click') -> null
           return $xeTable.handleColumnConfirmFilter(column, new Event('click'));
         }
       }