vxe-table 4.19.5 → 4.19.7

package/es/table/src/body.js

@@ -345,21 +345,11 @@ export default defineVxeComponent({
                         class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
                     }, column.renderCell(cellParams)));
                 }
-                tdVNs.push(h('div', {
-                    key: 'tc',
-                    class: ['vxe-cell', {
-                            'c--title': showTitle,
-                            'c--tooltip': showTooltip,
-                            'c--ellipsis': showEllipsis
-                        }],
-                    style: tcStyle,
-                    title: showTitle ? $xeTable.getCellLabel(row, column) : null
-                }, clVNs));
                 if (showValidTip && errorValidItem) {
                     const errRule = errorValidItem.rule;
                     const validSlot = slots ? slots.valid : null;
                     const validParams = Object.assign(Object.assign(Object.assign({}, cellParams), errorValidItem), { rule: errorValidItem });
-                    tdVNs.push(h('div', {
+                    clVNs.push(h('div', {
                         key: 'tcv',
                         class: ['vxe-cell--valid-error-tip', getPropClass(validOpts.className, validParams)],
                         style: errRule && errRule.maxWidth
@@ -381,6 +371,16 @@ export default defineVxeComponent({
                         ])
                     ]));
                 }
+                tdVNs.push(h('div', {
+                    key: 'tc',
+                    class: ['vxe-cell', {
+                            'c--title': showTitle,
+                            'c--tooltip': showTooltip,
+                            'c--ellipsis': showEllipsis
+                        }],
+                    style: tcStyle,
+                    title: showTitle ? $xeTable.getCellLabel(row, column) : null
+                }, clVNs));
             }
             let showAreaRowStatus = false;
             if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {

package/es/table/src/emits.js

@@ -106,6 +106,7 @@ export const tableEmits = [
     'cell-area-selection-all-end',
     'cell-area-arrows-start',
     'cell-area-arrows-end',
+    'cell-area-fill-copy',
     'active-cell-change-start',
     'active-cell-change-end'
 ];

package/es/table/src/group.js

@@ -18,6 +18,9 @@ export default defineVxeComponent({
         if (slots.header) {
             columnSlots.header = slots.header;
         }
+        if (slots.title) {
+            columnSlots.title = slots.title;
+        }
         columnConfig.slots = columnSlots;
         columnConfig.children = [];
         watchColumn($xeTable, props, columnConfig);

package/es/table/src/table.js

@@ -4,7 +4,7 @@ import XEUtils from 'xe-utils';
 import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, wheelScrollTopTo, wheelScrollLeftTo, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement, hasEventInputTarget } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
-import { createReactData, createInternalData, getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight, getLastChildColumn } from './util';
+import { createReactData, createInternalData, getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight, getLastChildColumn } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from '../../ui/src/anime';
 import { warnLog, errLog } from '../../ui/src/log';
@@ -1830,6 +1830,7 @@ export default defineVxeComponent({
             if (!xHandleEl) {
                 return;
             }
+            const columnOpts = computeColumnOpts.value;
             let tWidth = 0;
             const minCellWidth = 40; // 列宽最少限制 40px
             const bodyWidth = bodyWrapperElem.clientWidth;
@@ -1838,39 +1839,73 @@ export default defineVxeComponent({
             const { fit } = props;
             const { columnStore } = reactData;
             const { resizeList, pxMinList, autoMinList, pxList, scaleList, scaleMinList, autoList, remainList } = columnStore;
+            const parseColumnMaxWidth = (column) => {
+                const maxWidth = column.maxWidth || columnOpts.maxWidth;
+                if (maxWidth && maxWidth !== 'auto') {
+                    if (isScale(maxWidth)) {
+                        return Math.floor(XEUtils.toInteger(maxWidth) * meanWidth);
+                    }
+                    return XEUtils.toInteger(maxWidth);
+                }
+                return 0;
+            };
             // 最小宽
             pxMinList.forEach((column) => {
-                const minWidth = XEUtils.toInteger(column.minWidth);
-                tWidth += minWidth;
-                column.renderWidth = minWidth;
+                let miWidth = XEUtils.toInteger(column.minWidth);
+                const mxWidth = parseColumnMaxWidth(column);
+                if (mxWidth) {
+                    miWidth = Math.min(miWidth, mxWidth);
+                }
+                tWidth += miWidth;
+                column.renderWidth = miWidth;
             });
             // 最小自适应
             autoMinList.forEach((column) => {
-                const caWidth = Math.max(60, XEUtils.toInteger(column.renderAutoWidth));
+                let caWidth = Math.max(60, XEUtils.toInteger(column.renderAutoWidth));
+                const mxWidth = parseColumnMaxWidth(column);
+                if (mxWidth) {
+                    caWidth = Math.min(caWidth, mxWidth);
+                }
                 tWidth += caWidth;
                 column.renderWidth = caWidth;
             });
             // 最小百分比
             scaleMinList.forEach((column) => {
-                const smWidth = Math.floor(XEUtils.toInteger(column.minWidth) * meanWidth);
+                let smWidth = Math.floor(XEUtils.toInteger(column.minWidth) * meanWidth);
+                const mxWidth = parseColumnMaxWidth(column);
+                if (mxWidth) {
+                    smWidth = Math.min(smWidth, mxWidth);
+                }
                 tWidth += smWidth;
                 column.renderWidth = smWidth;
             });
             // 固定百分比
             scaleList.forEach((column) => {
-                const sfWidth = Math.floor(XEUtils.toInteger(column.width) * meanWidth);
+                let sfWidth = Math.floor(XEUtils.toInteger(column.width) * meanWidth);
+                const mxWidth = parseColumnMaxWidth(column);
+                if (mxWidth) {
+                    sfWidth = Math.min(sfWidth, mxWidth);
+                }
                 tWidth += sfWidth;
                 column.renderWidth = sfWidth;
             });
             // 固定宽
             pxList.forEach((column) => {
-                const pWidth = XEUtils.toInteger(column.width);
+                let pWidth = XEUtils.toInteger(column.width);
+                const mxWidth = parseColumnMaxWidth(column);
+                if (mxWidth) {
+                    pWidth = Math.min(pWidth, mxWidth);
+                }
                 tWidth += pWidth;
                 column.renderWidth = pWidth;
             });
             // 自适应宽
             autoList.forEach((column) => {
-                const aWidth = Math.max(60, XEUtils.toInteger(column.renderAutoWidth));
+                let aWidth = Math.max(60, XEUtils.toInteger(column.renderAutoWidth));
+                const mxWidth = parseColumnMaxWidth(column);
+                if (mxWidth) {
+                    aWidth = Math.min(aWidth, mxWidth);
+                }
                 tWidth += aWidth;
                 column.renderWidth = aWidth;
             });
@@ -1880,11 +1915,12 @@ export default defineVxeComponent({
                 tWidth += reWidth;
                 column.renderWidth = reWidth;
             });
+            const zoomColumnList = scaleMinList.concat(pxMinList).concat(autoMinList).filter(column => !parseColumnMaxWidth(column));
             remainWidth -= tWidth;
-            meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + autoMinList.length + remainList.length)) : 0;
+            meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (zoomColumnList.length + remainList.length)) : 0;
             if (fit) {
                 if (remainWidth > 0) {
-                    scaleMinList.concat(pxMinList).concat(autoMinList).forEach((column) => {
+                    zoomColumnList.forEach((column) => {
                         tWidth += meanWidth;
                         column.renderWidth += meanWidth;
                     });
@@ -1903,8 +1939,9 @@ export default defineVxeComponent({
                 /**
                  * 偏移量算法
                  * 如果所有列足够放的情况下，从最后动态列开始分配
+                 * 排除已设置 max-width
                  */
-                const dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(autoMinList).concat(remainList);
+                const dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(autoMinList).concat(remainList).filter(column => !parseColumnMaxWidth(column));
                 let dynamicSize = dynamicList.length - 1;
                 if (dynamicSize > 0) {
                     let i = bodyWidth - tWidth;
@@ -2400,7 +2437,7 @@ export default defineVxeComponent({
                 xScrollbarVisible = 'hidden';
             }
             let yScrollbarVisible = overflowY ? 'visible' : 'hidden';
-            if ((scrollbarYConf.visible === 'hidden' || scrollbarYConf.visible === false) || ($xeGanttView && !scrollbarYToLeft)) {
+            if ((scrollbarYConf.visible === 'hidden' || scrollbarYConf.visible === false) || (($xeGantt && $xeGanttView && $xeGantt.reactData.showRightView) && !scrollbarYToLeft)) {
                 osbWidth = 0;
                 yScrollbarVisible = 'hidden';
             }
@@ -3707,6 +3744,7 @@ export default defineVxeComponent({
                 updateStyle();
             }).then(() => {
                 computeScrollLoad();
+                syncGanttScrollYStatus();
             }).then(() => {
                 const virtualYOpts = computeVirtualYOpts.value;
                 // 是否启用了虚拟滚动
@@ -3766,6 +3804,7 @@ export default defineVxeComponent({
                         reactData.isRowLoading = false;
                         handleRecalculateStyle(false, false, false);
                         updateTreeLineStyle();
+                        syncGanttScrollYStatus();
                         // 如果是自动行高，特殊情况需调用 recalculate 手动刷新
                         if (!props.showOverflow) {
                             setTimeout(() => {
@@ -4085,9 +4124,14 @@ export default defineVxeComponent({
             reactData.scrollXLoad = scrollXLoad;
             return scrollXLoad;
         };
+        const syncGanttScrollYStatus = () => {
+            const $xeGanttView = internalData.xeGanttView;
+            if ($xeGanttView && $xeGanttView.handleUpdateSYStatus) {
+                $xeGanttView.handleUpdateSYStatus(reactData.scrollYLoad);
+            }
+        };
         const updateScrollYStatus = (fullData) => {
             const { treeConfig } = props;
-            const $xeGanttView = internalData.xeGanttView;
             const virtualYOpts = computeVirtualYOpts.value;
             const treeOpts = computeTreeOpts.value;
             const { transform } = treeOpts;
@@ -4095,9 +4139,7 @@ export default defineVxeComponent({
             // 如果gt为0，则总是启用
             const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
             reactData.scrollYLoad = scrollYLoad;
-            if ($xeGanttView && $xeGanttView.handleUpdateSYStatus) {
-                $xeGanttView.handleUpdateSYStatus(scrollYLoad);
-            }
+            syncGanttScrollYStatus();
             return scrollYLoad;
         };
         /**
@@ -9398,6 +9440,7 @@ export default defineVxeComponent({
                 const dragBtnOffsetWidth = XEUtils.floor(dragBtnWidth / 2);
                 const dragPosLeft = dragBtnRect.x - tableRect.x + dragBtnOffsetWidth;
                 const minInterval = getColReMinWidth(cellParams) - dragBtnOffsetWidth; // 列之间的最小间距
+                const maxInterval = getColReMaxWidth(cellParams); // 列之间的最大间距
                 const dragMinLeft = isRightFixed ? 0 : (cellRect.x - tableRect.x + dragBtnWidth + minInterval);
                 const dragMaxLeft = cellRect.x - tableRect.x + cell.clientWidth - minInterval;
                 let fixedLeftRemainWidth = 0;
@@ -9437,6 +9480,10 @@ export default defineVxeComponent({
                         left = Math.min(left, dragMaxLeft);
                     }
                     dragLeft = Math.max(left, dragMinLeft);
+                    // 最大宽
+                    if (maxInterval > 1) {
+                        dragLeft = Math.min(dragLeft, maxInterval + dragMinLeft - minInterval);
+                    }
                     const resizeBarLeft = Math.max(1, dragLeft);
                     resizeBarElem.style.left = `${resizeBarLeft}px`;
                     resizeBarElem.style.top = `${scrollbarXToTop ? osbHeight : 0}px`;
@@ -9517,6 +9564,7 @@ export default defineVxeComponent({
                     const cell = dragBtnElem.parentNode;
                     const cellParams = Object.assign(params, { cell, $table: $xeTable });
                     const colMinWidth = getColReMinWidth(cellParams);
+                    const colMaxWidth = getColReMaxWidth(cellParams);
                     el.setAttribute('data-calc-col', 'Y');
                     let resizeWidth = calcColumnAutoWidth(resizeColumn, el);
                     el.removeAttribute('data-calc-col');
@@ -9524,6 +9572,9 @@ export default defineVxeComponent({
                         resizeWidth = Math.max(resizeWidth, colRest.width);
                     }
                     resizeWidth = Math.max(colMinWidth, resizeWidth);
+                    if (colMaxWidth > 1) {
+                        resizeWidth = Math.min(colMaxWidth, resizeWidth);
+                    }
                     const resizeParams = Object.assign(Object.assign({}, params), { resizeWidth, resizeColumn });
                     reactData.isDragResize = false;
                     internalData._lastResizeTime = Date.now();

package/es/table/src/util.js

@@ -683,14 +683,16 @@ export function getCalcHeight(height) {
 }
 /**
  * 列宽拖动最大宽度
- * @param params
- * @returns
  */
 export function getColReMaxWidth(params) {
-    const { $table } = params;
-    const { computeResizableOpts } = $table.getComputeMaps();
+    const { $table, column, cell } = params;
+    const internalData = $table.internalData;
+    const { elemStore } = internalData;
+    const { computeColumnOpts, computeResizableOpts } = $table.getComputeMaps();
     const resizableOpts = computeResizableOpts.value;
+    const columnOpts = computeColumnOpts.value;
     const { maxWidth: reMaxWidth } = resizableOpts;
+    const colMaxWidth = column.maxWidth || columnOpts.maxWidth;
     // 如果自定义调整宽度逻辑
     if (reMaxWidth) {
         const customMaxWidth = XEUtils.isFunction(reMaxWidth) ? reMaxWidth(params) : reMaxWidth;
@@ -698,19 +700,35 @@ export function getColReMaxWidth(params) {
             return Math.max(1, XEUtils.toNumber(customMaxWidth));
         }
     }
+    const minTitleWidth = XEUtils.floor((XEUtils.toNumber(getComputedStyle(cell).fontSize) || 14) * 1.8);
+    const paddingLeftRight = getPaddingLeftRightSize(cell) + getPaddingLeftRightSize(queryElement(cell, '.vxe-cell'));
+    const mWidth = minTitleWidth + paddingLeftRight;
+    // 如果设置最小宽
+    if (colMaxWidth) {
+        const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+        if (bodyScrollElem) {
+            if (isScale(colMaxWidth)) {
+                const bodyWidth = bodyScrollElem.clientWidth - 1;
+                const meanWidth = bodyWidth / 100;
+                return Math.max(mWidth, Math.floor(XEUtils.toInteger(colMaxWidth) * meanWidth));
+            }
+            else if (isPx(colMaxWidth)) {
+                return Math.max(mWidth, XEUtils.toInteger(colMaxWidth));
+            }
+        }
+    }
     return -1;
 }
 /**
  * 列宽拖动最小宽度
- * @param params
- * @returns
  */
 export function getColReMinWidth(params) {
     const { $table, column, cell } = params;
     const tableProps = $table.props;
     const internalData = $table.internalData;
-    const { computeResizableOpts } = $table.getComputeMaps();
+    const { computeColumnOpts, computeResizableOpts } = $table.getComputeMaps();
     const resizableOpts = computeResizableOpts.value;
+    const columnOpts = computeColumnOpts.value;
     const { minWidth: reMinWidth } = resizableOpts;
     // 如果自定义调整宽度逻辑
     if (reMinWidth) {
@@ -721,7 +739,8 @@ export function getColReMinWidth(params) {
     }
     const { elemStore } = internalData;
     const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps;
-    const { showHeaderOverflow, minWidth: colMinWidth } = column;
+    const { showHeaderOverflow } = column;
+    const colMinWidth = column.minWidth || columnOpts.minWidth;
     const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
     const showEllipsis = headOverflow === 'ellipsis';
     const showTitle = headOverflow === 'title';

package/es/ui/index.js

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