vxe-table 4.21.0-beta.7 → 4.21.1

package/dist/all.esm.js

@@ -47,7 +47,7 @@ function getDefaultConfig(val1, def1) {
     return XEUtils.eqNull(val1) ? def1 : val1;
 }
 
-const version = "4.21.0-beta.7";
+const version = "4.21.1";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -769,7 +769,7 @@ function wheelScrollTopTo(diffNum, cb) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.21.0-beta.7"}`;
+const tableVersion = `table v${"4.21.1"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -1623,10 +1623,10 @@ function handleRowidOrRow($xeTable, rowidOrRow) {
 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;
@@ -11628,7 +11628,7 @@ hooks$4.add('tableExportModule', {
                     VxeUI.modal.message({ content: getI18n$4('vxe.error.impFields'), status: 'error' });
                 }
                 if (_importReject) {
-                    _importReject({ status: false });
+                    _importReject({ status: false, msg: 'field mismatching' });
                 }
             }
         };
@@ -11643,7 +11643,7 @@ hooks$4.add('tableExportModule', {
                         VxeUI.modal.message({ content: getI18n$4('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) => {
@@ -11679,7 +11679,7 @@ hooks$4.add('tableExportModule', {
                             const reader = new FileReader();
                             reader.onerror = () => {
                                 errLog$5('vxe.error.notType', [type]);
-                                _importReject({ status: false });
+                                _importReject({ status: false, msg: 'reading file error' });
                             };
                             reader.onload = (e) => {
                                 handleImport(e.target.result, options);
@@ -11691,7 +11691,7 @@ hooks$4.add('tableExportModule', {
                 else {
                     // 不支持的浏览器
                     errLog$5('vxe.error.notExp');
-                    _importResolve({ status: true });
+                    _importResolve({ status: false, msg: 'unsupported browser' });
                 }
             });
             return rest.then(() => {
@@ -12104,7 +12104,7 @@ hooks$4.add('tableExportModule', {
                     if (['xlsx', 'pdf'].includes(type)) {
                         warnLog$4('vxe.error.reqPlugin', [4, 'plugin-export-xlsx']);
                     }
-                    const params = { status: false };
+                    const params = { status: false, msg: 'type error' };
                     return Promise.reject(params);
                 }
                 if (!handleOptions.print) {
@@ -12112,7 +12112,7 @@ hooks$4.add('tableExportModule', {
                         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);
                             }
                         }
@@ -12229,7 +12229,7 @@ hooks$4.add('tableExportModule', {
                     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);
                         }
                     }
@@ -12251,7 +12251,7 @@ hooks$4.add('tableExportModule', {
                     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);
                         }
                     }
@@ -12401,7 +12401,8 @@ hooks$4.add('tableExportModule', {
                         }
                     }
                     else {
-                        const e = { status: false };
+                        errLog$5('vxe.error.reqComp', ['vxe-print']);
+                        const e = { status: false, msg: 'print not exist' };
                         reject(e);
                     }
                 });
@@ -17627,9 +17628,10 @@ var VxeTableComponent = defineVxeComponent({
             if (!el || !el.clientWidth) {
                 return;
             }
+            const cellOpts = computeCellOpts.value;
             const treeOpts = computeTreeOpts.value;
             const defaultRowHeight = computeDefaultRowHeight.value;
-            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 => {
@@ -20273,7 +20275,7 @@ var VxeTableComponent = defineVxeComponent({
                 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;
@@ -20313,7 +20315,7 @@ var VxeTableComponent = defineVxeComponent({
                                     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 {
@@ -21822,7 +21824,7 @@ var VxeTableComponent = defineVxeComponent({
                     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;
                         }
                     }
@@ -21888,7 +21890,7 @@ var VxeTableComponent = defineVxeComponent({
                 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;
             },
@@ -25549,7 +25551,7 @@ var VxeTableComponent = defineVxeComponent({
                     return;
                 }
                 const defaultRowHeight = computeDefaultRowHeight.value;
-                let currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+                let currCellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
                 if (!showOverflow) {
                     currCellHeight = tdEl.clientHeight;
                 }