vxe-table 4.8.7 → 4.8.9

package/es/table/src/table.js

@@ -2851,11 +2851,9 @@ export default defineComponent({
             reactData.lastScrollTime = Date.now();
             handleSyncScrollX(scrollLeft);
             $xeTable.triggerScrollXEvent(evnt);
-            $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+            $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
                 type: 'table',
-                fixed: '',
-                scrollTop,
-                scrollLeft
+                fixed: ''
             });
         };
         const debounceScrollYCalculate = XEUtils.debounce(function () {
@@ -2881,11 +2879,9 @@ export default defineComponent({
             reactData.lastScrollTime = Date.now();
             handleSyncScrollY(scrollTop);
             $xeTable.triggerScrollYEvent(evnt);
-            $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+            $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
                 type: 'table',
-                fixed: '',
-                scrollTop,
-                scrollLeft
+                fixed: ''
             });
         };
         let keyCtxTimeout;
@@ -3545,25 +3541,35 @@ export default defineComponent({
              * 设置为固定列
              */
             setColumnFixed(fieldOrColumn, fixed) {
-                const column = handleFieldOrColumn($xeTable, fieldOrColumn);
-                const targetColumn = getRootColumn($xeTable, column);
-                const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+                let status = false;
+                const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
                 const columnOpts = computeColumnOpts.value;
-                if (targetColumn && targetColumn.fixed !== fixed) {
-                    // 是否超过最大固定列数量
-                    if (!targetColumn.fixed && isMaxFixedColumn) {
-                        if (VxeUI.modal) {
-                            VxeUI.modal.message({
-                                status: 'error',
-                                content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
-                            });
+                const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+                for (let i = 0; i < cols.length; i++) {
+                    const item = cols[i];
+                    const column = handleFieldOrColumn($xeTable, item);
+                    const targetColumn = getRootColumn($xeTable, column);
+                    if (targetColumn && targetColumn.fixed !== fixed) {
+                        // 是否超过最大固定列数量
+                        if (!targetColumn.fixed && isMaxFixedColumn) {
+                            if (VxeUI.modal) {
+                                VxeUI.modal.message({
+                                    status: 'error',
+                                    content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
+                                });
+                            }
+                            return nextTick();
+                        }
+                        XEUtils.eachTree([targetColumn], (column) => {
+                            column.fixed = fixed;
+                        });
+                        tablePrivateMethods.saveCustomStore('update:fixed');
+                        if (!status) {
+                            status = true;
                         }
-                        return nextTick();
                     }
-                    XEUtils.eachTree([targetColumn], (column) => {
-                        column.fixed = fixed;
-                    });
-                    tablePrivateMethods.saveCustomStore('update:fixed');
+                }
+                if (status) {
                     return tableMethods.refreshColumn();
                 }
                 return nextTick();
@@ -3572,13 +3578,22 @@ export default defineComponent({
              * 取消指定固定列
              */
             clearColumnFixed(fieldOrColumn) {
-                const column = handleFieldOrColumn($xeTable, fieldOrColumn);
-                const targetColumn = getRootColumn($xeTable, column);
-                if (targetColumn && targetColumn.fixed) {
-                    XEUtils.eachTree([targetColumn], (column) => {
-                        column.fixed = null;
-                    });
-                    tablePrivateMethods.saveCustomStore('update:fixed');
+                let status = false;
+                const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+                cols.forEach(item => {
+                    const column = handleFieldOrColumn($xeTable, item);
+                    const targetColumn = getRootColumn($xeTable, column);
+                    if (targetColumn && targetColumn.fixed) {
+                        XEUtils.eachTree([targetColumn], (column) => {
+                            column.fixed = null;
+                        });
+                        tablePrivateMethods.saveCustomStore('update:fixed');
+                        if (!status) {
+                            status = true;
+                        }
+                    }
+                });
+                if (status) {
                     return tableMethods.refreshColumn();
                 }
                 return nextTick();
@@ -3587,9 +3602,18 @@ export default defineComponent({
              * 隐藏指定列
              */
             hideColumn(fieldOrColumn) {
-                const column = handleFieldOrColumn($xeTable, fieldOrColumn);
-                if (column && column.visible) {
-                    column.visible = false;
+                let status = false;
+                const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+                cols.forEach(item => {
+                    const column = handleFieldOrColumn($xeTable, item);
+                    if (column && column.visible) {
+                        column.visible = false;
+                        if (!status) {
+                            status = true;
+                        }
+                    }
+                });
+                if (status) {
                     return tablePrivateMethods.handleCustom();
                 }
                 return nextTick();
@@ -3598,25 +3622,43 @@ export default defineComponent({
              * 显示指定列
              */
             showColumn(fieldOrColumn) {
-                const column = handleFieldOrColumn($xeTable, fieldOrColumn);
-                if (column && !column.visible) {
-                    column.visible = true;
+                let status = false;
+                const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+                cols.forEach(item => {
+                    const column = handleFieldOrColumn($xeTable, item);
+                    if (column && !column.visible) {
+                        column.visible = true;
+                        if (!status) {
+                            status = true;
+                        }
+                    }
+                });
+                if (status) {
                     return tablePrivateMethods.handleCustom();
                 }
                 return nextTick();
             },
             setColumnWidth(fieldOrColumn, width) {
-                const column = handleFieldOrColumn($xeTable, fieldOrColumn);
-                if (column) {
-                    const colWidth = XEUtils.toInteger(width);
-                    let rdWidth = colWidth;
-                    if (isScale(width)) {
-                        const tableBody = refTableBody.value;
-                        const bodyElem = tableBody ? tableBody.$el : null;
-                        const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0;
-                        rdWidth = Math.floor(colWidth * bodyWidth);
-                    }
-                    column.resizeWidth = rdWidth;
+                let status = false;
+                const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+                cols.forEach(item => {
+                    const column = handleFieldOrColumn($xeTable, item);
+                    if (column) {
+                        const colWidth = XEUtils.toInteger(width);
+                        let rdWidth = colWidth;
+                        if (isScale(width)) {
+                            const tableBody = refTableBody.value;
+                            const bodyElem = tableBody ? tableBody.$el : null;
+                            const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0;
+                            rdWidth = Math.floor(colWidth * bodyWidth);
+                        }
+                        column.resizeWidth = rdWidth;
+                        if (!status) {
+                            status = true;
+                        }
+                    }
+                });
+                if (status) {
                     return tableMethods.refreshColumn();
                 }
                 return nextTick();
@@ -4584,16 +4626,36 @@ export default defineComponent({
              */
             scrollTo(scrollLeft, scrollTop) {
                 const tableBody = refTableBody.value;
+                const tableHeader = refTableHeader.value;
                 const tableFooter = refTableFooter.value;
+                const leftBody = refTableLeftBody.value;
                 const rightBody = refTableRightBody.value;
                 const tableBodyElem = tableBody ? tableBody.$el : null;
+                const leftBodyElem = leftBody ? leftBody.$el : null;
                 const rightBodyElem = rightBody ? rightBody.$el : null;
+                const tableHeaderElem = tableHeader ? tableHeader.$el : null;
                 const tableFooterElem = tableFooter ? tableFooter.$el : null;
                 if (XEUtils.isNumber(scrollLeft)) {
-                    setScrollLeft(tableFooterElem || tableBodyElem, scrollLeft);
+                    const xHandleEl = refScrollXHandleElem.value;
+                    if (xHandleEl) {
+                        setScrollLeft(xHandleEl, scrollLeft);
+                    }
+                    else {
+                        setScrollLeft(tableBodyElem, scrollLeft);
+                        setScrollLeft(tableHeaderElem, scrollLeft);
+                        setScrollLeft(tableFooterElem, scrollLeft);
+                    }
                 }
                 if (XEUtils.isNumber(scrollTop)) {
-                    setScrollTop(rightBodyElem || tableBodyElem, scrollTop);
+                    const yHandleEl = refScrollYHandleElem.value;
+                    if (yHandleEl) {
+                        setScrollTop(yHandleEl, scrollTop);
+                    }
+                    else {
+                        setScrollTop(tableBodyElem, scrollTop);
+                        setScrollTop(leftBodyElem, scrollTop);
+                        setScrollTop(rightBodyElem, scrollTop);
+                    }
                 }
                 if (reactData.scrollXLoad || reactData.scrollYLoad) {
                     return new Promise(resolve => {
@@ -5470,6 +5532,16 @@ export default defineComponent({
                 });
             }
         };
+        const updateRowDropOrigin = (row) => {
+            const el = refElem.value;
+            if (el) {
+                const clss = 'row--drag-origin';
+                const rowid = getRowid($xeTable, row);
+                XEUtils.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), (elem) => {
+                    addClass(elem, clss);
+                });
+            }
+        };
         const clearRowDropTarget = () => {
             const el = refElem.value;
             if (el) {
@@ -5479,6 +5551,17 @@ export default defineComponent({
                 });
             }
         };
+        const updateRowDropTarget = (row, dragPos) => {
+            const el = refElem.value;
+            if (el) {
+                const clss = 'row--drag-active-target';
+                const rowid = getRowid($xeTable, row);
+                XEUtils.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), (elem) => {
+                    addClass(elem, clss);
+                    elem.setAttribute('drag-pos', dragPos);
+                });
+            }
+        };
         const showRowDropTip = (evnt) => {
             const rdTipEl = refRowDragTipElem.value;
             if (!rdTipEl) {
@@ -6614,7 +6697,7 @@ export default defineComponent({
                 const treeOpts = computeTreeOpts.value;
                 const { transform } = treeOpts;
                 const { dragRow } = reactData;
-                const { afterFullData, tableFullData, prevDragRow, prevDragPos } = internalData;
+                const { afterFullData, afterTreeFullData, tableFullData, tableFullTreeData, prevDragRow, prevDragPos } = internalData;
                 if (prevDragRow && dragRow) {
                     // 判断是否有拖动
                     if (prevDragRow !== dragRow) {
@@ -6628,18 +6711,36 @@ export default defineComponent({
                                 return;
                             }
                             const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
-                            // 移出源位置
-                            const oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
-                            const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
-                            afterFullData.splice(oafIndex, 1);
-                            tableFullData.splice(otfIndex, 1);
-                            // 插新位置
-                            const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
-                            const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
-                            const nafIndex = pafIndex + dragOffsetIndex;
-                            const ntfIndex = ptfIndex + dragOffsetIndex;
-                            afterFullData.splice(nafIndex, 0, dragRow);
-                            tableFullData.splice(ntfIndex, 0, dragRow);
+                            let oafIndex = -1;
+                            let nafIndex = -1;
+                            if (treeConfig) {
+                                // 移出源位置
+                                oafIndex = $xeTable.findRowIndexOf(afterTreeFullData, dragRow);
+                                const otfIndex = $xeTable.findRowIndexOf(tableFullTreeData, dragRow);
+                                afterTreeFullData.splice(oafIndex, 1);
+                                tableFullTreeData.splice(otfIndex, 1);
+                                // 插新位置
+                                const pafIndex = $xeTable.findRowIndexOf(afterTreeFullData, prevDragRow);
+                                const ptfIndex = $xeTable.findRowIndexOf(tableFullTreeData, prevDragRow);
+                                nafIndex = pafIndex + dragOffsetIndex;
+                                const ntfIndex = ptfIndex + dragOffsetIndex;
+                                afterTreeFullData.splice(nafIndex, 0, dragRow);
+                                tableFullTreeData.splice(ntfIndex, 0, dragRow);
+                            }
+                            else {
+                                // 移出源位置
+                                oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
+                                const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
+                                afterFullData.splice(oafIndex, 1);
+                                tableFullData.splice(otfIndex, 1);
+                                // 插新位置
+                                const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
+                                const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
+                                nafIndex = pafIndex + dragOffsetIndex;
+                                const ntfIndex = ptfIndex + dragOffsetIndex;
+                                afterFullData.splice(nafIndex, 0, dragRow);
+                                tableFullData.splice(ntfIndex, 0, dragRow);
+                            }
                             reactData.isDragRowMove = true;
                             $xeTable.cacheRowMap();
                             $xeTable.updateScrollYStatus();
@@ -6687,8 +6788,7 @@ export default defineComponent({
                     const { dragRow } = reactData;
                     const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
                     const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-                    addClass(trEl, 'row--drag-active-target');
-                    trEl.setAttribute('drag-pos', dragPos);
+                    updateRowDropTarget(row, dragPos);
                     internalData.prevDragRow = row;
                     internalData.prevDragPos = dragPos;
                     dispatchEvent('row-dragover', {
@@ -6718,7 +6818,7 @@ export default defineComponent({
                 }
                 reactData.dragRow = row;
                 trEl.draggable = true;
-                addClass(trEl, 'row--drag-origin');
+                updateRowDropOrigin(row);
                 showRowDropTip(evnt);
                 updateRowDropTipContent(tdEl);
                 dispatchEvent('row-dragstart', params, evnt);
@@ -6735,7 +6835,7 @@ export default defineComponent({
             triggerScrollXEvent() {
                 loadScrollXData();
             },
-            handleScrollEvent(evnt, isRollY, isRollX, params) {
+            handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
                 const { highlightHoverRow } = props;
                 const tableBody = refTableBody.value;
                 const bodyElem = tableBody ? tableBody.$el : null;
@@ -6751,17 +6851,36 @@ export default defineComponent({
                 if (tooltip && tooltip.reactData.visible) {
                     tooltip.close();
                 }
-                if (isRollX) {
-                    tablePrivateMethods.checkScrolling();
-                }
                 const bodyHeight = bodyElem ? bodyElem.clientHeight : 0;
                 const bodyWidth = bodyElem ? bodyElem.clientWidth : 0;
                 const scrollHeight = bodyElem ? bodyElem.scrollHeight : 0;
                 const scrollWidth = bodyElem ? bodyElem.scrollWidth : 0;
-                const evntParams = Object.assign({ bodyHeight,
+                let isTop = false;
+                let isBottom = false;
+                let isLeft = false;
+                let isRight = false;
+                if (isRollX) {
+                    isLeft = scrollLeft <= 0;
+                    if (!isTop) {
+                        isRight = scrollLeft + bodyWidth >= scrollWidth;
+                    }
+                    tablePrivateMethods.checkScrolling();
+                }
+                else {
+                    isTop = scrollTop <= 0;
+                    if (!isTop) {
+                        isBottom = scrollTop + bodyHeight >= scrollHeight;
+                    }
+                }
+                const evntParams = Object.assign({ scrollTop,
+                    scrollLeft,
+                    bodyHeight,
                     bodyWidth,
                     scrollHeight,
-                    scrollWidth, isX: isRollX, isY: isRollY }, params);
+                    scrollWidth, isX: isRollX, isY: isRollY, isTop,
+                    isBottom,
+                    isLeft,
+                    isRight }, params);
                 dispatchEvent('scroll', evntParams, evnt);
             },
             /**

package/es/ui/index.js

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