vxe-table 3.16.13 → 3.16.14

package/lib/table/src/methods.js

@@ -3486,6 +3486,7 @@ function loadTableData($xeTable, datas, isReset) {
   }).then(() => {
     computeScrollLoad($xeTable);
   }).then(() => {
+    const virtualYOpts = $xeTable.computeVirtualYOpts;
     // 是否启用了虚拟滚动
     if (sYLoad) {
       scrollYStore.endIndex = scrollYStore.visibleSize;
@@ -3494,6 +3495,9 @@ function loadTableData($xeTable, datas, isReset) {
       if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
         (0, _log.errLog)('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
       }
+      if (virtualYOpts.mode === 'scroll' && expandOpts.mode === 'fixed') {
+        (0, _log.warnLog)('vxe.error.notConflictProp', ['virtual-y-config.mode=scroll', 'expand-config.mode=inside']);
+      }
       // if (showOverflow) {
       //   if (!rowOpts.height) {
       //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
@@ -5543,6 +5547,35 @@ const Methods = {
     }
     return [];
   },
+  /**
+   * 只对 tree-config 有效，用于树形结构，获取指定行的层级
+   */
+  getTreeRowLevel(rowOrRowid) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    if (rowOrRowid && treeConfig) {
+      let rowid;
+      if (_xeUtils.default.isString(rowOrRowid)) {
+        rowid = rowOrRowid;
+      } else {
+        rowid = (0, _util.getRowid)($xeTable, rowOrRowid);
+      }
+      if (rowid) {
+        const rest = fullAllDataRowIdData[rowid];
+        if (rest) {
+          return rest.level;
+        }
+      }
+    }
+    return -1;
+  },
   /**
    * 只对 tree-config 有效，获取行的父级
    */