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

package/es/table/src/methods.js

@@ -2274,10 +2274,26 @@ const Methods = {
      * 获取父容器的高度
      */
     getParentHeight() {
-        const { $el, $xegrid, height } = this;
-        const parentElem = $el.parentNode;
-        const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
-        return Math.floor($xegrid ? $xegrid.getParentHeight() : XEUtils.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
+        const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
+        const props = $xeTable;
+        const { height } = props;
+        const el = $xeTable.$refs.refElem;
+        if (el) {
+            const parentElem = el.parentNode;
+            const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
+            let parentWrapperHeight = 0;
+            if (parentElem) {
+                if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+                    parentWrapperHeight = $xeGrid.getParentHeight();
+                }
+                else {
+                    parentWrapperHeight = parentElem.clientHeight;
+                }
+            }
+            return Math.floor(parentWrapperHeight - parentPaddingSize);
+        }
+        return 0;
     },
     /**
      * 获取需要排除的高度
@@ -2982,12 +2998,12 @@ const Methods = {
         const reactData = $xeTable;
         const internalData = $xeTable;
         const { keepSource, treeConfig } = props;
-        const { fullAllDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
+        const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform } = treeOpts;
         if (!keepSource) {
             if (process.env.NODE_ENV === 'development') {
-                warnLog('vxe.error.reqProp', ['keep-source']);
+                errLog('vxe.error.reqProp', ['keep-source']);
             }
             return $xeTable.$nextTick();
         }
@@ -3002,23 +3018,23 @@ const Methods = {
         }
         let reDelFlag = false;
         if (targetRows.length) {
-            targetRows.forEach((row) => {
-                if (!$xeTable.isInsertByRow(row)) {
-                    const rowid = getRowid($xeTable, row);
-                    const oRow = sourceDataRowIdData[rowid];
-                    if (oRow && row) {
-                        if (field) {
-                            XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
-                        }
-                        else {
-                            XEUtils.destructuring(row, XEUtils.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 = 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.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
+                            }
+                            else {
+                                XEUtils.destructuring(row, XEUtils.clone(oRow, true));
+                            }
+                            if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                                tableFullData.unshift(row);
+                                afterFullData.unshift(row);
                                 reDelFlag = true;
                             }
                         }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.14.0-beta.4";
+export const version = "3.14.0-beta.6";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.14.0-beta.4"}`;
+const version = `table v${"3.14.0-beta.6"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.14.0-beta.4";
+const version = "3.14.0-beta.6";
 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.14.0-beta.4"}`;
+const log_version = `table v${"3.14.0-beta.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7709,14 +7709,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' ? getPaddingTopBottomSize(parentElem) : 0;
-    return Math.floor($xegrid ? $xegrid.getParentHeight() : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
+    } = props;
+    const el = $xeTable.$refs.refElem;
+    if (el) {
+      const parentElem = el.parentNode;
+      const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
+      let parentWrapperHeight = 0;
+      if (parentElem) {
+        if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+          parentWrapperHeight = $xeGrid.getParentHeight();
+        } else {
+          parentWrapperHeight = parentElem.clientHeight;
+        }
+      }
+      return Math.floor(parentWrapperHeight - parentPaddingSize);
+    }
+    return 0;
   },
   /**
    * 获取需要排除的高度
@@ -8540,6 +8553,7 @@ const Methods = {
     } = props;
     const {
       fullAllDataRowIdData,
+      fullDataRowIdData,
       tableSourceData,
       sourceDataRowIdData,
       tableFullData,
@@ -8551,7 +8565,7 @@ const Methods = {
     } = treeOpts;
     if (!keepSource) {
       if (true) {
-        warnLog('vxe.error.reqProp', ['keep-source']);
+        errLog('vxe.error.reqProp', ['keep-source']);
       }
       return $xeTable.$nextTick();
     }
@@ -8565,22 +8579,22 @@ const Methods = {
     }
     let reDelFlag = false;
     if (targetRows.length) {
-      targetRows.forEach(row => {
-        if (!$xeTable.isInsertByRow(row)) {
-          const rowid = getRowid($xeTable, row);
-          const oRow = sourceDataRowIdData[rowid];
-          if (oRow && row) {
-            if (field) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oRow, field), true));
-            } else {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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 = 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) {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(oRow, field), true));
+              } else {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(row, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(oRow, true));
+              }
+              if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                tableFullData.unshift(row);
+                afterFullData.unshift(row);
                 reDelFlag = true;
               }
             }