vxe-table 3.23.0-beta.7 → 3.23.1

package/es/table/module/export/mixin.js

@@ -1040,7 +1040,7 @@ function handleImport($xeTable, content, opts) {
         }
         VxeUI.modal.message({ content: getI18n('vxe.error.impFields'), status: 'error' });
         if (_importReject) {
-            _importReject({ status: false });
+            _importReject({ status: false, msg: 'field mismatching' });
         }
     }
 }
@@ -1058,7 +1058,7 @@ function handleFileImport($xeTable, file, opts) {
             }
             VxeUI.modal.message({ content: getI18n('vxe.error.notType', [type]), status: 'error' });
         }
-        const params = { status: false };
+        const params = { status: false, msg: 'type error' };
         return Promise.reject(params);
     }
     const rest = new Promise((resolve, reject) => {
@@ -1094,7 +1094,7 @@ function handleFileImport($xeTable, file, opts) {
                     const reader = new FileReader();
                     reader.onerror = () => {
                         errLog('vxe.error.notType', [type]);
-                        _importReject({ status: false });
+                        _importReject({ status: false, msg: 'reading file error' });
                     };
                     reader.onload = (e) => {
                         handleImport($xeTable, e.target.result, options);
@@ -1106,7 +1106,7 @@ function handleFileImport($xeTable, file, opts) {
         else {
             // 不支持的浏览器
             errLog('vxe.error.notExp');
-            _importResolve({ status: true });
+            _importResolve({ status: false, msg: 'unsupported browser' });
         }
     });
     return rest.then(() => {
@@ -1581,7 +1581,7 @@ export default {
                 if (['xlsx', 'pdf'].includes(type)) {
                     warnLog('vxe.error.reqPlugin', [3, 'plugin-export-xlsx']);
                 }
-                const params = { status: false };
+                const params = { status: false, msg: 'type error' };
                 return Promise.reject(params);
             }
             if (!handleOptions.print) {
@@ -1589,7 +1589,7 @@ export default {
                     const beRest = beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
                     if (XEUtils.isBoolean(beRest)) {
                         if (!beRest) {
-                            const params = { status: false };
+                            const params = { status: false, msg: 'before prevent' };
                             return Promise.reject(params);
                         }
                     }
@@ -1706,7 +1706,7 @@ export default {
                 const biRest = beforeImportMethod({ options: opts, $table: $xeTable });
                 if (XEUtils.isBoolean(biRest)) {
                     if (!biRest) {
-                        const params = { status: false };
+                        const params = { status: false, mas: 'before prevent' };
                         return Promise.reject(params);
                     }
                 }
@@ -1729,7 +1729,7 @@ export default {
                 const biRest = beforeImportMethod({ options: opts, $table: $xeTable });
                 if (XEUtils.isBoolean(biRest)) {
                     if (!biRest) {
-                        const params = { status: false };
+                        const params = { status: false, mas: 'before prevent' };
                         return Promise.reject(params);
                     }
                 }
@@ -1880,7 +1880,8 @@ export default {
                     }
                 }
                 else {
-                    const e = { status: false };
+                    errLog('vxe.error.reqComp', ['vxe-print']);
+                    const e = { status: false, msg: 'print not exist' };
                     reject(e);
                 }
             });

package/es/table/src/methods.js

@@ -2536,9 +2536,10 @@ const calcCellHeight = ($xeTable) => {
     if (!el || !el.clientWidth) {
         return;
     }
+    const cellOpts = $xeTable.computeCellOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
-    if (!isAllOverflow && (scrollYLoad || scrollXLoad || (treeConfig && treeOpts.showLine))) {
+    if (!isAllOverflow && (scrollYLoad || scrollXLoad || cellOpts.maxHeight || (treeConfig && treeOpts.showLine))) {
         const { handleGetRowId } = createHandleGetRowId($xeTable);
         el.setAttribute('data-calc-row', 'Y');
         tableData.forEach(row => {
@@ -4283,7 +4284,7 @@ function updateRowOffsetTop($xeTable) {
         const rowid = handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid] || {};
         rowRest.oTop = offsetTop;
-        offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+        offsetTop += getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
         // 是否展开行
         if (expandColumn && rowExpandedMaps[rowid]) {
             offsetTop += rowRest.expandHeight || expandOpts.height || 0;
@@ -4325,7 +4326,7 @@ function updateRowExpandStyle($xeTable) {
                             offsetTop = trEl.offsetTop + trEl.offsetHeight;
                         }
                         else {
-                            offsetTop = rowRest.oTop + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
+                            offsetTop = rowRest.oTop + getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
                         }
                     }
                     else {
@@ -7097,7 +7098,7 @@ const tableMethods = {
             return;
         }
         const defaultRowHeight = $xeTable.computeDefaultRowHeight;
-        let currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+        let currCellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
         if (!showOverflow) {
             currCellHeight = tdEl.clientHeight;
         }
@@ -7262,7 +7263,7 @@ const tableMethods = {
             if (rowRest) {
                 const resizeHeight = rowRest.resizeHeight;
                 if (resizeHeight || isFull) {
-                    const currCellHeight = resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+                    const currCellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
                     rest[rowid] = currCellHeight;
                 }
             }
@@ -7334,7 +7335,7 @@ const tableMethods = {
         const rowid = XEUtils.isString(rowOrId) || XEUtils.isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
-            return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+            return getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
         }
         return 0;
     },

package/es/table/src/util.js

@@ -672,10 +672,10 @@ export function handleRowidOrRow($xeTable, rowidOrRow) {
 export function getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) {
     const { height, minHeight, maxHeight } = cellOpts;
     let cellHeight = rowRest.resizeHeight || height || rowOpts.height || rowRest.height || defaultRowHeight;
-    if (maxHeight && maxHeight < cellHeight) {
+    if (maxHeight && maxHeight <= cellHeight) {
         cellHeight = maxHeight;
     }
-    if (minHeight && minHeight > cellHeight) {
+    if (minHeight && minHeight >= cellHeight) {
         cellHeight = minHeight;
     }
     return cellHeight;

package/es/table/style.css

@@ -3618,7 +3618,6 @@
 .vxe-table--render-default .vxe-body--column > .vxe-cell {
   display: flex;
   flex-direction: row;
-  align-items: center;
 }
 .vxe-table--render-default {
   /*溢出列*/
@@ -4020,6 +4019,9 @@
 .vxe-table--render-default.vxe-editable .vxe-body--column {
   padding: 0;
 }
+.vxe-table--render-default .vxe-cell--wrapper {
+  margin: auto 0;
+}
 .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > .vxe-reusekeep-control {
   position: absolute;
   width: 0;