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

package/lib/table/src/table.js

@@ -4366,6 +4366,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = props;
         const {
           fullAllDataRowIdData,
+          fullDataRowIdData,
           tableSourceData,
           sourceDataRowIdData,
           tableFullData,
@@ -4377,7 +4378,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = 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 (0, _vue.nextTick)();
         }
@@ -4391,22 +4392,22 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         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;
                   }
                 }
@@ -7648,7 +7649,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (el) {
           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);
+          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;
       },