vxe-table 4.12.0-beta.3 → 4.12.0-beta.5

package/es/table/src/table.js

@@ -3740,7 +3740,7 @@ export default defineComponent({
              */
             revertData(rows, field) {
                 const { keepSource, treeConfig } = props;
-                const { fullAllDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
+                const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const { transform } = treeOpts;
                 if (!keepSource) {
@@ -3771,7 +3771,7 @@ export default defineComponent({
                                 else {
                                     XEUtils.destructuring(row, XEUtils.clone(oRow, true));
                                 }
-                                if ($xeTable.isRemoveByRow(row)) {
+                                if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
                                     const rowRest = fullAllDataRowIdData[rowid];
                                     if (rowRest) {
                                         const reRow = rowRest.row;
@@ -6649,7 +6649,16 @@ export default defineComponent({
                 if (el) {
                     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);
+                    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;
             },

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.12.0-beta.3";
+export const version = "4.12.0-beta.5";
 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${"4.12.0-beta.3"}`;
+const version = `table v${"4.12.0-beta.5"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.12.0-beta.3";
+const version = "4.12.0-beta.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3586,7 +3586,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.12.0-beta.3"}`;
+const log_version = `table v${"4.12.0-beta.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -14676,6 +14676,7 @@ const maxXWidth = 5e6;
         } = props;
         const {
           fullAllDataRowIdData,
+          fullDataRowIdData,
           tableSourceData,
           sourceDataRowIdData,
           tableFullData,
@@ -14711,7 +14712,7 @@ const maxXWidth = 5e6;
                 } 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)) {
+                if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
                   const rowRest = fullAllDataRowIdData[rowid];
                   if (rowRest) {
                     const reRow = rowRest.row;
@@ -17966,7 +17967,15 @@ const maxXWidth = 5e6;
         if (el) {
           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);
+          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;
       },
@@ -28393,7 +28402,16 @@ render_renderer.mixin({
     tableFilterDefaultMethod: handleInputFilterMethod
   },
   FormatNumberInput: {
-    renderTableDefault: handleNumberCell
+    renderTableDefault: handleNumberCell,
+    tableFilterDefaultMethod: handleInputFilterMethod,
+    tableExportMethod(params) {
+      const {
+        row,
+        column
+      } = params;
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      return cellValue;
+    }
   },
   VxeNumberInput: {
     tableAutoFocus: 'input',
@@ -28553,7 +28571,9 @@ render_renderer.mixin({
   FormatSelect: {
     renderTableDefault(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
-    }
+    },
+    tableFilterDefaultMethod: handleFilterMethod,
+    tableExportMethod: handleExportSelectMethod
   },
   VxeTreeSelect: {
     tableAutoFocus: 'input',
@@ -28575,7 +28595,8 @@ render_renderer.mixin({
   FormatTreeSelect: {
     renderTableDefault(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
-    }
+    },
+    tableExportMethod: handleExportTreeSelectMethod
   },
   VxeTableSelect: {
     tableAutoFocus: 'input',