vxe-table 3.15.2 → 3.15.4

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.2";
+const version = "3.15.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.2"}`;
+const log_version = `table v${"3.15.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5507,6 +5507,116 @@ const updateScrollYStatus = ($xeTable, fullData) => {
   reactData.scrollYLoad = scrollYLoad;
   return scrollYLoad;
 };
+/**
+ * 展开与收起树节点
+ * @param rows
+ * @param expanded
+ * @returns
+ */
+function handleBaseTreeExpand($xeTable, rows, expanded) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    treeNodeColumn
+  } = reactData;
+  const {
+    fullAllDataRowIdData,
+    tableFullData,
+    treeExpandedMaps,
+    treeExpandLazyLoadedMaps
+  } = internalData;
+  const treeOpts = $xeTable.computeTreeOpts;
+  const {
+    reserve,
+    lazy,
+    accordion,
+    toggleMethod
+  } = treeOpts;
+  const childrenField = treeOpts.children || treeOpts.childrenField;
+  const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+  const result = [];
+  const columnIndex = $xeTable.getColumnIndex(treeNodeColumn);
+  const $columnIndex = $xeTable.getVMColumnIndex(treeNodeColumn);
+  const {
+    handleGetRowId
+  } = createHandleGetRowId($xeTable);
+  let validRows = toggleMethod ? rows.filter(row => toggleMethod({
+    $table: $xeTable,
+    expanded,
+    column: treeNodeColumn,
+    columnIndex,
+    $columnIndex,
+    row
+  })) : rows;
+  if (accordion) {
+    validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
+    // 同一级只能展开一个
+    const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullData, item => item === validRows[0], {
+      children: childrenField
+    });
+    if (matchObj) {
+      matchObj.items.forEach(item => {
+        const rowid = handleGetRowId(item);
+        if (treeExpandedMaps[rowid]) {
+          delete treeExpandedMaps[rowid];
+        }
+      });
+    }
+  }
+  if (expanded) {
+    validRows.forEach(row => {
+      const rowid = handleGetRowId(row);
+      if (!treeExpandedMaps[rowid]) {
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
+          // 是否使用懒加载
+          if (isLoad) {
+            result.push(handleAsyncTreeExpandChilds($xeTable, row));
+          } else {
+            if (row[childrenField] && row[childrenField].length) {
+              treeExpandedMaps[rowid] = row;
+            }
+          }
+        }
+      }
+    });
+  } else {
+    validRows.forEach(item => {
+      const rowid = handleGetRowId(item);
+      if (treeExpandedMaps[rowid]) {
+        delete treeExpandedMaps[rowid];
+      }
+    });
+  }
+  if (reserve) {
+    validRows.forEach(row => handleTreeExpandReserve($xeTable, row, expanded));
+  }
+  reactData.treeExpandedFlag++;
+  return Promise.all(result).then(() => {
+    return $xeTable.recalculate();
+  });
+}
+/**
+ * 虚拟树的展开与收起
+ * @param rows
+ * @param expanded
+ * @returns
+ */
+function handleVirtualTreeExpand($xeTable, rows, expanded) {
+  return handleBaseTreeExpand($xeTable, rows, expanded).then(() => {
+    handleVirtualTreeToList($xeTable);
+    $xeTable.handleTableData();
+    updateAfterDataIndex($xeTable);
+    return $xeTable.$nextTick();
+  }).then(() => {
+    return $xeTable.recalculate(true);
+  }).then(() => {
+    setTimeout(() => {
+      $xeTable.updateCellAreas();
+    }, 30);
+  });
+}
 function updateAfterListIndex($xeTable) {
   const props = $xeTable;
   const internalData = $xeTable;
@@ -14480,8 +14590,8 @@ const Methods = {
         columnIndex,
         $columnIndex,
         row,
-        rowIndex: this.getRowIndex(row),
-        $rowIndex: this.getVMRowIndex(row)
+        rowIndex: $xeTable.getRowIndex(row),
+        $rowIndex: $xeTable.getVMRowIndex(row)
       })) : rows;
       if (expanded) {
         validRows.forEach(row => {
@@ -14736,7 +14846,7 @@ const Methods = {
           internalData.treeEATime = setTimeout(() => {
             internalData.treeEATime = undefined;
             $xeTable.scrollToRow(row);
-          }, 20);
+          }, 30);
         }
       });
       $xeTable.dispatchEvent('toggle-tree-expand', {
@@ -14778,117 +14888,6 @@ const Methods = {
     });
     return this.setTreeExpand(expandeds, expanded);
   },
-  /**
-   * 默认，展开与收起树节点
-   * @param rows
-   * @param expanded
-   * @returns
-   */
-  handleBaseTreeExpand(rows, expanded) {
-    const $xeTable = this;
-    const reactData = $xeTable;
-    const internalData = $xeTable;
-    const {
-      treeNodeColumn
-    } = reactData;
-    const {
-      fullAllDataRowIdData,
-      tableFullData,
-      treeExpandedMaps,
-      treeExpandLazyLoadedMaps
-    } = internalData;
-    const treeOpts = $xeTable.computeTreeOpts;
-    const {
-      reserve,
-      lazy,
-      accordion,
-      toggleMethod
-    } = treeOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
-    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-    const result = [];
-    const columnIndex = $xeTable.getColumnIndex(treeNodeColumn);
-    const $columnIndex = $xeTable.getVMColumnIndex(treeNodeColumn);
-    const {
-      handleGetRowId
-    } = createHandleGetRowId($xeTable);
-    let validRows = toggleMethod ? rows.filter(row => toggleMethod({
-      $table: $xeTable,
-      expanded,
-      column: treeNodeColumn,
-      columnIndex,
-      $columnIndex,
-      row
-    })) : rows;
-    if (accordion) {
-      validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
-      // 同一级只能展开一个
-      const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullData, item => item === validRows[0], {
-        children: childrenField
-      });
-      if (matchObj) {
-        matchObj.items.forEach(item => {
-          const rowid = handleGetRowId(item);
-          if (treeExpandedMaps[rowid]) {
-            delete treeExpandedMaps[rowid];
-          }
-        });
-      }
-    }
-    if (expanded) {
-      validRows.forEach(row => {
-        const rowid = handleGetRowId(row);
-        if (!treeExpandedMaps[rowid]) {
-          const rowRest = fullAllDataRowIdData[rowid];
-          if (rowRest) {
-            const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
-            // 是否使用懒加载
-            if (isLoad) {
-              result.push(handleAsyncTreeExpandChilds($xeTable, row));
-            } else {
-              if (row[childrenField] && row[childrenField].length) {
-                treeExpandedMaps[rowid] = row;
-              }
-            }
-          }
-        }
-      });
-    } else {
-      validRows.forEach(item => {
-        const rowid = handleGetRowId(item);
-        if (treeExpandedMaps[rowid]) {
-          delete treeExpandedMaps[rowid];
-        }
-      });
-    }
-    if (reserve) {
-      validRows.forEach(row => handleTreeExpandReserve($xeTable, row, expanded));
-    }
-    reactData.treeExpandedFlag++;
-    return Promise.all(result).then(() => {
-      return $xeTable.recalculate();
-    });
-  },
-  /**
-   * 虚拟树的展开与收起
-   * @param rows
-   * @param expanded
-   * @returns
-   */
-  handleVirtualTreeExpand(rows, expanded) {
-    const $xeTable = this;
-    return this.handleBaseTreeExpand(rows, expanded).then(() => {
-      handleVirtualTreeToList($xeTable);
-      this.handleTableData();
-      updateAfterDataIndex($xeTable);
-    }).then(() => {
-      return this.recalculate();
-    }).then(() => {
-      setTimeout(() => {
-        this.updateCellAreas();
-      }, 30);
-    });
-  },
   /**
    * 设置展开树形节点，二个参数设置这一行展开与否
    * 支持单行
@@ -14897,6 +14896,7 @@ const Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setTreeExpand(rows, expanded) {
+    const $xeTable = this;
     const {
       treeOpts
     } = this;
@@ -14910,9 +14910,9 @@ const Methods = {
       if (rows.length) {
         // 如果为虚拟树
         if (transform) {
-          return this.handleVirtualTreeExpand(rows, expanded);
+          return handleVirtualTreeExpand($xeTable, rows, expanded);
         } else {
-          return this.handleBaseTreeExpand(rows, expanded);
+          return handleBaseTreeExpand($xeTable, rows, expanded);
         }
       }
     }
@@ -16266,6 +16266,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     showOverflow: allShowOverflow,
     border,
     height,
+    treeConfig,
     cellClassName: allCellClassName,
     cellStyle,
     align: allAlign,
@@ -16306,6 +16307,8 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const checkboxOpts = $xeTable.computeCheckboxOpts;
   const editOpts = $xeTable.computeEditOpts;
   const tooltipOpts = $xeTable.computeTooltipOpts;
+  const virtualXOpts = $xeTable.computeVirtualXOpts;
+  const virtualYOpts = $xeTable.computeVirtualYOpts;
   const {
     isAllColumnDrag,
     isAllRowDrag
@@ -16509,9 +16512,9 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   let isVNPreEmptyStatus = false;
   if (!isMergeCell) {
     if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-      if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+      if (scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
         isVNPreEmptyStatus = true;
-      } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      } else if (scrollXLoad && !virtualXOpts.immediate && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
         isVNPreEmptyStatus = true;
       }
     }
@@ -17184,6 +17187,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     fullColumnIdData,
     scrollXStore
   } = tableInternalData;
+  const virtualXOpts = $xeTable.computeVirtualXOpts;
   const columnOpts = $xeTable.computeColumnOpts;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
   const cellOpts = $xeTable.computeCellOpts;
@@ -17279,7 +17283,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     let isVNPreEmptyStatus = false;
     if (!isGroup) {
       if (!dragCol || dragCol.id !== colid) {
-        if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+        if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
           isVNPreEmptyStatus = true;
         }
       }
@@ -17650,10 +17654,12 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     mergeFooterCellMaps,
     scrollXStore
   } = tableInternalData;
+  const virtualXOpts = $xeTable.computeVirtualXOpts;
   const tooltipOpts = $xeTable.computeTooltipOpts;
+  const resizableOpts = $xeTable.resizableOpts;
   const {
     isAllColumnDrag
-  } = $xeTable.resizableOpts;
+  } = resizableOpts;
   const columnOpts = $xeTable.computeColumnOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const cellOpts = $xeTable.computeCellOpts;
@@ -17779,7 +17785,7 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
     if (!isMergeCell) {
-      if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
         isVNPreEmptyStatus = true;
       }
     }
@@ -27594,6 +27600,9 @@ function renderBody(h, $xeTable) {
     if (this.highlightHoverColumn) {
       warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
     }
+    if (props.resizable) {
+      warnLog('vxe.error.delProp', ['resizable', 'column-config.resizable']);
+    }
     // if (props.scrollY) {
     //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
     // }