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

package/es/table/module/export/export-panel.js

@@ -299,7 +299,9 @@ export default {
                         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),

package/es/table/module/export/import-panel.js

@@ -155,7 +155,9 @@ export default {
                     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),

package/es/table/src/body.js

@@ -103,7 +103,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     const cellOffsetWidth = $xeTable.computeCellOffsetWidth;
     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;
@@ -285,6 +285,9 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         }
     }
     const tcStyle = {};
+    if (maxHeight) {
+        tcStyle.maxHeight = maxHeight + 'px';
+    }
     if (hasEllipsis && resizeWidthFlag) {
         let mergeColWidth = 0;
         if (mergeColspan > 1) {
@@ -295,13 +298,16 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
                 }
             }
         }
-        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) {
@@ -351,7 +357,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
                 class: ['vxe-cell--valid-error-tip', getClass(validOpts.className, errorValidItem)],
                 style: errRule && errRule.maxWidth
                     ? {
-                        width: `${errRule.maxWidth}px`
+                        width: errRule.maxWidth + 'px'
                     }
                     : undefined
             }, [
@@ -411,6 +417,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
                 '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,

package/es/table/src/util.js

@@ -670,7 +670,15 @@ export function handleRowidOrRow($xeTable, rowidOrRow) {
     return null;
 }
 export 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;
 }
 // 组装列配置
 export function assembleColumn(_vm) {

package/es/table/style.css

@@ -3597,13 +3597,13 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.vxe-table--render-default .vxe-body--column.col--cs-height, .vxe-table--render-default .vxe-body--column.col--rs-height, .vxe-table--render-default .vxe-body--column.col--auto-height {
+.vxe-table--render-default .vxe-body--column.col--cs-height, .vxe-table--render-default .vxe-body--column.col--rs-height, .vxe-table--render-default .vxe-body--column.col--auto-height, .vxe-table--render-default .vxe-body--column.col--max-height {
   overflow: hidden;
 }
-.vxe-table--render-default .vxe-body--column.col--cs-height.col--tree-node, .vxe-table--render-default .vxe-body--column.col--cs-height.col--valid-error, .vxe-table--render-default .vxe-body--column.col--rs-height.col--tree-node, .vxe-table--render-default .vxe-body--column.col--rs-height.col--valid-error, .vxe-table--render-default .vxe-body--column.col--auto-height.col--tree-node, .vxe-table--render-default .vxe-body--column.col--auto-height.col--valid-error {
+.vxe-table--render-default .vxe-body--column.col--cs-height.col--tree-node, .vxe-table--render-default .vxe-body--column.col--cs-height.col--valid-error, .vxe-table--render-default .vxe-body--column.col--rs-height.col--tree-node, .vxe-table--render-default .vxe-body--column.col--rs-height.col--valid-error, .vxe-table--render-default .vxe-body--column.col--auto-height.col--tree-node, .vxe-table--render-default .vxe-body--column.col--auto-height.col--valid-error, .vxe-table--render-default .vxe-body--column.col--max-height.col--tree-node, .vxe-table--render-default .vxe-body--column.col--max-height.col--valid-error {
   overflow: unset;
 }
-.vxe-table--render-default .vxe-body--column.col--cs-height > .vxe-cell, .vxe-table--render-default .vxe-body--column.col--rs-height > .vxe-cell, .vxe-table--render-default .vxe-body--column.col--auto-height > .vxe-cell {
+.vxe-table--render-default .vxe-body--column.col--cs-height > .vxe-cell, .vxe-table--render-default .vxe-body--column.col--rs-height > .vxe-cell, .vxe-table--render-default .vxe-body--column.col--auto-height > .vxe-cell, .vxe-table--render-default .vxe-body--column.col--max-height > .vxe-cell {
   overflow: hidden;
 }
 .vxe-table--render-default .vxe-body--column > .vxe-cell {