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

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.4";
+const version = "4.21.0-beta.6";
 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.4"}`;
+const tableVersion = `table v${"4.21.0-beta.6"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -1621,7 +1621,15 @@ function handleRowidOrRow($xeTable, rowidOrRow) {
     return null;
 }
 function getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) {
-    return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+    const { height, minHeight, maxHeight } = cellOpts;
+    let cellHeight = rowRest.resizeHeight || height || rowOpts.height || rowRest.height || defaultRowHeight;
+    if (maxHeight && maxHeight < cellHeight) {
+        cellHeight = maxHeight;
+    }
+    if (minHeight && minHeight > cellHeight) {
+        cellHeight = minHeight;
+    }
+    return cellHeight;
 }
 function getPaddingLeftRightSize(elem) {
     if (elem) {
@@ -4163,7 +4171,7 @@ var TableBodyComponent = defineVxeComponent({
             const cellOffsetWidth = computeCellOffsetWidth.value;
             const { selectCellToRow } = areaOpts;
             const { field, type, cellRender, editRender, align, showOverflow, className, treeNode, rowResize, padding, verticalAlign, slots } = column;
-            const { verticalAlign: allVerticalAlign } = cellOpts;
+            const { verticalAlign: allVerticalAlign, minHeight, maxHeight } = cellOpts;
             const { actived } = editStore;
             const rowRest = fullAllDataRowIdData[rowid] || {};
             const colid = column.id;
@@ -4345,6 +4353,9 @@ var TableBodyComponent = defineVxeComponent({
                 }
             }
             const tcStyle = {};
+            if (maxHeight) {
+                tcStyle.maxHeight = maxHeight + 'px';
+            }
             if (hasEllipsis && resizeWidthFlag) {
                 let mergeColWidth = 0;
                 if (mergeColspan > 1) {
@@ -4355,13 +4366,16 @@ var TableBodyComponent = defineVxeComponent({
                         }
                     }
                 }
-                tcStyle.width = `${column.renderWidth + mergeColWidth - cellOffsetWidth}px`;
+                tcStyle.width = (column.renderWidth + mergeColWidth - cellOffsetWidth) + 'px';
             }
             if (scrollYLoad || scrollXLoad || hasEllipsis || isCsHeight || isRsHeight) {
-                tcStyle.height = `${cellHeight}px`;
+                tcStyle.height = cellHeight + 'px';
             }
             else {
-                tcStyle.minHeight = `${cellHeight}px`;
+                tcStyle.minHeight = cellHeight + 'px';
+            }
+            if (minHeight) {
+                tcStyle.minHeight = minHeight + 'px';
             }
             const tdVNs = [];
             if (fixedHiddenColumn && isAllOverflow) {
@@ -4407,7 +4421,7 @@ var TableBodyComponent = defineVxeComponent({
                         class: ['vxe-cell--valid-error-tip', getPropClass(validOpts.className, validParams)],
                         style: errRule && errRule.maxWidth
                             ? {
-                                width: `${errRule.maxWidth}px`
+                                width: errRule.maxWidth + 'px'
                             }
                             : null
                     }, [
@@ -4462,6 +4476,7 @@ var TableBodyComponent = defineVxeComponent({
                         'col--rs-height': isRsHeight,
                         'col--to-row': showAreaRowStatus,
                         'col--auto-height': isVNAutoHeight,
+                        'col--max-height': maxHeight,
                         'fixed--width': !isAutoCellWidth,
                         'fixed--hidden': fixedHiddenColumn,
                         'is--padding': isCellPadding,
@@ -7731,7 +7746,9 @@ var TableImportPanelComponent = defineVxeComponent({
                     showFooter: true,
                     escClosable: true,
                     maskClosable: true,
+                    position: modelOptions.position,
                     fullscreen: modelOptions.fullscreen,
+                    remember: modelOptions.remember,
                     showMinimize: modelOptions.showMinimize,
                     showMaximize: getDefaultConfig(modelOptions.showMaximize, true),
                     resize: getDefaultConfig(modelOptions.resize, true),
@@ -8095,7 +8112,9 @@ var TableExportPanelComponent = defineVxeComponent({
                     showFooter: true,
                     escClosable: true,
                     maskClosable: true,
+                    position: modelOptions.position,
                     fullscreen: modelOptions.fullscreen,
+                    remember: modelOptions.remember,
                     showMinimize: modelOptions.showMinimize,
                     showMaximize: getDefaultConfig(modelOptions.showMaximize, true),
                     resize: getDefaultConfig(modelOptions.resize, true),