vxe-table 3.14.0-beta.4 → 3.14.0-beta.6

package/lib/table/src/methods.js

@@ -2645,14 +2645,27 @@ const Methods = {
    * 获取父容器的高度
    */
   getParentHeight() {
+    const $xeTable = this;
+    const $xeGrid = $xeTable.$xeGrid;
+    const props = $xeTable;
     const {
-      $el,
-      $xegrid,
       height
-    } = this;
-    const parentElem = $el.parentNode;
-    const parentPaddingSize = height === '100%' || height === 'auto' ? (0, _dom.getPaddingTopBottomSize)(parentElem) : 0;
-    return Math.floor($xegrid ? $xegrid.getParentHeight() : _xeUtils.default.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
+    } = props;
+    const el = $xeTable.$refs.refElem;
+    if (el) {
+      const parentElem = el.parentNode;
+      const parentPaddingSize = height === '100%' || height === 'auto' ? (0, _dom.getPaddingTopBottomSize)(parentElem) : 0;
+      let parentWrapperHeight = 0;
+      if (parentElem) {
+        if ($xeGrid && (0, _dom.hasClass)(parentElem, 'vxe-grid--table-wrapper')) {
+          parentWrapperHeight = $xeGrid.getParentHeight();
+        } else {
+          parentWrapperHeight = parentElem.clientHeight;
+        }
+      }
+      return Math.floor(parentWrapperHeight - parentPaddingSize);
+    }
+    return 0;
   },
   /**
    * 获取需要排除的高度
@@ -3470,6 +3483,7 @@ const Methods = {
     } = props;
     const {
       fullAllDataRowIdData,
+      fullDataRowIdData,
       tableSourceData,
       sourceDataRowIdData,
       tableFullData,
@@ -3481,7 +3495,7 @@ const Methods = {
     } = treeOpts;
     if (!keepSource) {
       if (process.env.NODE_ENV === 'development') {
-        (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
+        (0, _log.errLog)('vxe.error.reqProp', ['keep-source']);
       }
       return $xeTable.$nextTick();
     }
@@ -3495,22 +3509,22 @@ const Methods = {
     }
     let reDelFlag = false;
     if (targetRows.length) {
-      targetRows.forEach(row => {
-        if (!$xeTable.isInsertByRow(row)) {
-          const rowid = (0, _util.getRowid)($xeTable, row);
-          const oRow = sourceDataRowIdData[rowid];
-          if (oRow && row) {
-            if (field) {
-              _xeUtils.default.set(row, field, _xeUtils.default.clone(_xeUtils.default.get(oRow, field), true));
-            } else {
-              _xeUtils.default.destructuring(row, _xeUtils.default.clone(oRow, true));
-            }
-            if ($xeTable.isRemoveByRow(row)) {
-              const rowRest = fullAllDataRowIdData[rowid];
-              if (rowRest) {
-                const reRow = rowRest.row;
-                tableFullData.unshift(reRow);
-                afterFullData.unshift(reRow);
+      targetRows.forEach(item => {
+        const rowid = (0, _util.getRowid)($xeTable, item);
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          const row = rowRest.row;
+          if (!$xeTable.isInsertByRow(row)) {
+            const oRow = sourceDataRowIdData[rowid];
+            if (oRow && row) {
+              if (field) {
+                _xeUtils.default.set(row, field, _xeUtils.default.clone(_xeUtils.default.get(oRow, field), true));
+              } else {
+                _xeUtils.default.destructuring(row, _xeUtils.default.clone(oRow, true));
+              }
+              if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                tableFullData.unshift(row);
+                afterFullData.unshift(row);
                 reDelFlag = true;
               }
             }