vxe-table 4.11.18 → 4.11.20

package/es/table/src/body.js

@@ -205,6 +205,7 @@ export default defineComponent({
             tdOns.onDblclick = (evnt) => {
                 $xeTable.triggerCellDblclickEvent(evnt, cellParams);
             };
+            let isMergeCell = false;
             // 合并行或列
             if (mergeList.length) {
                 const spanRest = mergeBodyMethod(mergeList, _rowIndex, _columnIndex);
@@ -214,9 +215,11 @@ export default defineComponent({
                         return null;
                     }
                     if (rowspan > 1) {
+                        isMergeCell = true;
                         tdAttrs.rowspan = rowspan;
                     }
                     if (colspan > 1) {
+                        isMergeCell = true;
                         tdAttrs.colspan = colspan;
                     }
                 }
@@ -249,12 +252,14 @@ export default defineComponent({
             const isLastColumn = $columnIndex === columns.length - 1;
             const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
             let isVNPreEmptyStatus = false;
-            if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-                if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
-                    isVNPreEmptyStatus = true;
-                }
-                else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-                    isVNPreEmptyStatus = true;
+            if (!isMergeCell) {
+                if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
+                    if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+                        isVNPreEmptyStatus = true;
+                    }
+                    else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+                        isVNPreEmptyStatus = true;
+                    }
                 }
             }
             const tcStyle = {};

package/es/table/src/footer.js

@@ -126,6 +126,7 @@ export default defineComponent({
                 tfOns.onDblclick = (evnt) => {
                     $xeTable.dispatchEvent('footer-cell-dblclick', Object.assign({ cell: evnt.currentTarget }, cellParams), evnt);
                 };
+                let isMergeCell = false;
                 // 合并行或列
                 if (mergeFooterList.length) {
                     const spanRest = mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex);
@@ -135,9 +136,11 @@ export default defineComponent({
                             return null;
                         }
                         if (rowspan > 1) {
+                            isMergeCell = true;
                             attrs.rowspan = rowspan;
                         }
                         if (colspan > 1) {
+                            isMergeCell = true;
                             attrs.colspan = colspan;
                         }
                     }
@@ -158,8 +161,10 @@ export default defineComponent({
                 const isLastColumn = $columnIndex === tableColumn.length - 1;
                 const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
                 let isVNPreEmptyStatus = false;
-                if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-                    isVNPreEmptyStatus = true;
+                if (!isMergeCell) {
+                    if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+                        isVNPreEmptyStatus = true;
+                    }
                 }
                 const tcStyle = {};
                 if (hasEllipsis) {

package/es/table/src/table.js

@@ -9,7 +9,7 @@ import TableHeaderComponent from './header';
 import TableFooterComponent from './footer';
 import tableProps from './props';
 import tableEmits from './emits';
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth } from './util';
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 import TableCustomPanelComponent from '../module/custom/panel';
@@ -3374,6 +3374,9 @@ export default defineComponent({
         };
         tableMethods = {
             dispatchEvent,
+            getEl() {
+                return refElem.value;
+            },
             /**
              * 重置表格的一切数据状态
              */
@@ -3693,7 +3696,9 @@ export default defineComponent({
              */
             revertData(rows, field) {
                 const { keepSource, treeConfig } = props;
+                const { editStore } = reactData;
                 const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
+                const removeTempMaps = Object.assign({}, editStore.removeMaps);
                 const treeOpts = computeTreeOpts.value;
                 const { transform } = treeOpts;
                 if (!keepSource) {
@@ -3728,6 +3733,7 @@ export default defineComponent({
                                         XEUtils.destructuring(row, XEUtils.clone(oRow, true));
                                     }
                                     if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                                        delete removeTempMaps[rowid];
                                         tableFullData.unshift(row);
                                         afterFullData.unshift(row);
                                         reDelFlag = true;
@@ -3739,6 +3745,7 @@ export default defineComponent({
                 }
                 if (rows) {
                     if (reDelFlag) {
+                        editStore.removeMaps = removeTempMaps;
                         $xeTable.updateFooter();
                         $xeTable.cacheRowMap(false);
                         $xeTable.handleTableData(treeConfig && transform);
@@ -3891,18 +3898,20 @@ export default defineComponent({
             },
             /**
              * 检查行或列数据是否发生改变
-             * @param {Row} row 行对象
+             * @param {Row} rowOrId 行对象
              * @param {String} field 字段名
              */
-            isUpdateByRow(row, field) {
+            isUpdateByRow(rowOrId, field) {
                 const { keepSource } = props;
                 const { tableFullColumn, fullDataRowIdData, sourceDataRowIdData } = internalData;
                 if (keepSource) {
-                    const rowid = getRowid($xeTable, row);
+                    const rowid = XEUtils.isString(rowOrId) || XEUtils.isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
+                    const rowRest = fullDataRowIdData[rowid];
                     // 新增的数据不需要检测
-                    if (!fullDataRowIdData[rowid]) {
+                    if (!rowRest) {
                         return false;
                     }
+                    const row = rowRest.row;
                     const oRow = sourceDataRowIdData[rowid];
                     if (oRow) {
                         if (arguments.length > 1) {
@@ -3966,6 +3975,94 @@ export default defineComponent({
                     tableColumn: reactData.tableColumn.slice(0)
                 };
             },
+            /**
+             * 移动列到指定列的位置
+             * @param fieldOrColumn
+             * @param targetFieldOrColumn
+             * @param options
+             */
+            moveColumnTo(fieldOrColumn, targetFieldOrColumn, options) {
+                const { fullColumnIdData, visibleColumn } = internalData;
+                const { dragToChild, dragPos, isCrossDrag } = Object.assign({}, options);
+                const dragCol = handleFieldOrColumn($xeTable, fieldOrColumn);
+                let prevDragCol = null;
+                const colRest = dragCol ? fullColumnIdData[dragCol.id] : null;
+                let defPos = 'left';
+                if (XEUtils.isNumber(targetFieldOrColumn)) {
+                    if (colRest && targetFieldOrColumn) {
+                        let currList = colRest.items;
+                        let offsetIndex = colRest._index + targetFieldOrColumn;
+                        if (isCrossDrag) {
+                            currList = visibleColumn;
+                            offsetIndex = colRest._index + targetFieldOrColumn;
+                        }
+                        if (offsetIndex > 0 && offsetIndex < currList.length - 1) {
+                            prevDragCol = currList[offsetIndex];
+                        }
+                        if (targetFieldOrColumn > 0) {
+                            defPos = 'right';
+                        }
+                    }
+                }
+                else {
+                    prevDragCol = handleFieldOrColumn($xeTable, targetFieldOrColumn);
+                    const targetColRest = prevDragCol ? fullColumnIdData[prevDragCol.id] : null;
+                    if (colRest && targetColRest) {
+                        if (targetColRest._index > colRest._index) {
+                            defPos = 'right';
+                        }
+                    }
+                }
+                return $xeTable.handleColDragSwapEvent(null, true, dragCol, prevDragCol, dragPos || defPos, dragToChild === true);
+            },
+            /**
+             * 移动行到指定行的位置
+             * @param rowidOrRow
+             * @param targetRowidOrRow
+             * @param options
+             */
+            moveRowTo(rowidOrRow, targetRowidOrRow, options) {
+                const { treeConfig } = props;
+                const { fullAllDataRowIdData, afterFullData } = internalData;
+                const { dragToChild, dragPos, isCrossDrag } = Object.assign({}, options);
+                const treeOpts = computeTreeOpts.value;
+                const dragRow = handleRowidOrRow($xeTable, rowidOrRow);
+                let prevDragRow = null;
+                let defPos = 'top';
+                const rowRest = dragRow ? fullAllDataRowIdData[getRowid($xeTable, dragRow)] : null;
+                if (XEUtils.isNumber(targetRowidOrRow)) {
+                    if (rowRest && targetRowidOrRow) {
+                        let currList = afterFullData;
+                        let offsetIndex = rowRest._index + targetRowidOrRow;
+                        if (treeConfig) {
+                            currList = rowRest.items;
+                            if (treeOpts.transform) {
+                                offsetIndex = rowRest.treeIndex + targetRowidOrRow;
+                                if (isCrossDrag) {
+                                    currList = afterFullData;
+                                    offsetIndex = rowRest._index + targetRowidOrRow;
+                                }
+                            }
+                        }
+                        if (offsetIndex >= 0 && offsetIndex <= currList.length - 1) {
+                            prevDragRow = currList[offsetIndex];
+                        }
+                        if (targetRowidOrRow > 0) {
+                            defPos = 'bottom';
+                        }
+                    }
+                }
+                else {
+                    prevDragRow = handleRowidOrRow($xeTable, targetRowidOrRow);
+                    const targetRowRest = prevDragRow ? fullAllDataRowIdData[getRowid($xeTable, prevDragRow)] : null;
+                    if (rowRest && targetRowRest) {
+                        if (targetRowRest._index > rowRest._index) {
+                            defPos = 'bottom';
+                        }
+                    }
+                }
+                return $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true);
+            },
             /**
              * 获取表格的全量列
              */
@@ -6146,8 +6243,8 @@ export default defineComponent({
                             if (selected.row && selected.column) {
                                 $xeTable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
                             }
-                            else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-                                // 当前行按键上下移动
+                            // 当前行按键上下移动
+                            if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
                                 $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
                             }
                         }
@@ -8039,6 +8136,9 @@ export default defineComponent({
                 const { afterFullData, tableFullData } = internalData;
                 const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
                 const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
+                const errRest = {
+                    status: false
+                };
                 if (prevDragRow && dragRow) {
                     // 判断是否有拖动
                     if (prevDragRow !== dragRow) {
@@ -8053,7 +8153,7 @@ export default defineComponent({
                         const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
                         return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
                             if (!status) {
-                                return;
+                                return errRest;
                             }
                             let oafIndex = -1;
                             let nafIndex = -1;
@@ -8078,12 +8178,12 @@ export default defineComponent({
                                             if (isPeerDrag && !isCrossDrag) {
                                                 if (oldRest.row[parentField] !== newRest.row[parentField]) {
                                                     // 非同级
-                                                    return;
+                                                    return errRest;
                                                 }
                                             }
                                             else {
                                                 if (!isCrossDrag) {
-                                                    return;
+                                                    return errRest;
                                                 }
                                                 if (oldAllMaps[newRowid]) {
                                                     isSelfToChildStatus = true;
@@ -8094,7 +8194,7 @@ export default defineComponent({
                                                                 content: getI18n('vxe.error.treeDragChild')
                                                             });
                                                         }
-                                                        return;
+                                                        return errRest;
                                                     }
                                                 }
                                             }
@@ -8102,13 +8202,13 @@ export default defineComponent({
                                         else if (oldLevel) {
                                             // 子到根
                                             if (!isCrossDrag) {
-                                                return;
+                                                return errRest;
                                             }
                                         }
                                         else if (newLevel) {
                                             // 根到子
                                             if (!isCrossDrag) {
-                                                return;
+                                                return errRest;
                                             }
                                             if (oldAllMaps[newRowid]) {
                                                 isSelfToChildStatus = true;
@@ -8119,7 +8219,7 @@ export default defineComponent({
                                                             content: getI18n('vxe.error.treeDragChild')
                                                         });
                                                     }
-                                                    return;
+                                                    return errRest;
                                                 }
                                             }
                                         }
@@ -8179,27 +8279,34 @@ export default defineComponent({
                             if (reactData.scrollYLoad) {
                                 $xeTable.updateScrollYSpace();
                             }
-                            nextTick().then(() => {
+                            if (evnt) {
+                                dispatchEvent('row-dragend', {
+                                    oldRow: dragRow,
+                                    newRow: prevDragRow,
+                                    dragRow,
+                                    dragPos: prevDragPos,
+                                    dragToChild: isDragToChildFlag,
+                                    offsetIndex: dragOffsetIndex,
+                                    _index: {
+                                        newIndex: nafIndex,
+                                        oldIndex: oafIndex
+                                    }
+                                }, evnt);
+                            }
+                            return nextTick().then(() => {
                                 $xeTable.updateCellAreas();
                                 $xeTable.recalculate();
+                            }).then(() => {
+                                return {
+                                    status: true
+                                };
                             });
-                            dispatchEvent('row-dragend', {
-                                oldRow: dragRow,
-                                newRow: prevDragRow,
-                                dragRow,
-                                dragPos: prevDragPos,
-                                dragToChild: isDragToChildFlag,
-                                offsetIndex: dragOffsetIndex,
-                                _index: {
-                                    newIndex: nafIndex,
-                                    oldIndex: oafIndex
-                                }
-                            }, evnt);
                         }).catch(() => {
+                            return errRest;
                         });
                     }
                 }
-                return Promise.resolve();
+                return Promise.resolve(errRest);
             },
             handleRowDragDragendEvent(evnt) {
                 const { treeConfig } = props;
@@ -8326,6 +8433,9 @@ export default defineComponent({
                 const { isPeerDrag, isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod, dragToChildMethod } = columnDragOpts;
                 const { collectColumn } = internalData;
                 const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0;
+                const errRest = {
+                    status: false
+                };
                 if (prevDragCol && dragCol) {
                     // 判断是否有拖动
                     if (prevDragCol !== dragCol) {
@@ -8342,7 +8452,7 @@ export default defineComponent({
                         const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
                         return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
                             if (!status) {
-                                return;
+                                return errRest;
                             }
                             let oafIndex = -1;
                             let nafIndex = -1;
@@ -8356,12 +8466,12 @@ export default defineComponent({
                                 if (isPeerDrag && !isCrossDrag) {
                                     if (dragColumn.parentId !== newColumn.parentId) {
                                         // 非同级
-                                        return;
+                                        return errRest;
                                     }
                                 }
                                 else {
                                     if (!isCrossDrag) {
-                                        return;
+                                        return errRest;
                                     }
                                     if (oldAllMaps[newColumn.id]) {
                                         isSelfToChildStatus = true;
@@ -8372,7 +8482,7 @@ export default defineComponent({
                                                     content: getI18n('vxe.error.treeDragChild')
                                                 });
                                             }
-                                            return;
+                                            return errRest;
                                         }
                                     }
                                 }
@@ -8380,13 +8490,13 @@ export default defineComponent({
                             else if (dragColumn.parentId) {
                                 // 子到根
                                 if (!isCrossDrag) {
-                                    return;
+                                    return errRest;
                                 }
                             }
                             else if (newColumn.parentId) {
                                 // 根到子
                                 if (!isCrossDrag) {
-                                    return;
+                                    return errRest;
                                 }
                                 if (oldAllMaps[newColumn.id]) {
                                     isSelfToChildStatus = true;
@@ -8397,7 +8507,7 @@ export default defineComponent({
                                                 content: getI18n('vxe.error.treeDragChild')
                                             });
                                         }
-                                        return;
+                                        return errRest;
                                     }
                                 }
                             }
@@ -8458,26 +8568,32 @@ export default defineComponent({
                                     $xeTable.clearCopyCellArea();
                                 }
                             }
-                            dispatchEvent('column-dragend', {
-                                oldColumn: dragColumn,
-                                newColumn,
-                                dragColumn,
-                                dragPos: prevDragPos,
-                                dragToChild: isDragToChildFlag,
-                                offsetIndex: dragOffsetIndex,
-                                _index: {
-                                    newIndex: nafIndex,
-                                    oldIndex: oafIndex
-                                }
-                            }, evnt);
+                            if (evnt) {
+                                dispatchEvent('column-dragend', {
+                                    oldColumn: dragColumn,
+                                    newColumn,
+                                    dragColumn,
+                                    dragPos: prevDragPos,
+                                    dragToChild: isDragToChildFlag,
+                                    offsetIndex: dragOffsetIndex,
+                                    _index: {
+                                        newIndex: nafIndex,
+                                        oldIndex: oafIndex
+                                    }
+                                }, evnt);
+                            }
                             if (isSyncColumn) {
                                 $xeTable.handleColDragSwapColumn();
                             }
+                            return {
+                                status: true
+                            };
                         }).catch(() => {
+                            return errRest;
                         });
                     }
                 }
-                return Promise.resolve();
+                return Promise.resolve(errRest);
             },
             handleHeaderCellDragDragendEvent(evnt) {
                 const { dragCol } = reactData;

package/es/table/src/util.js

@@ -90,14 +90,17 @@ export function getRowUniqueId() {
 export function getRowkey($xeTable) {
     const { props } = $xeTable;
     const { computeRowOpts } = $xeTable.getComputeMaps();
-    const { rowId } = props;
     const rowOpts = computeRowOpts.value;
-    return rowId || rowOpts.keyField || '_X_ROW_KEY';
+    return `${props.rowId || rowOpts.keyField || '_X_ROW_KEY'}`;
 }
 // 行主键 value
 export function getRowid($xeTable, row) {
     const rowid = XEUtils.get(row, getRowkey($xeTable));
-    return XEUtils.eqNull(rowid) ? '' : encodeURIComponent(rowid);
+    return encodeRowid(rowid);
+}
+// 编码行主键
+export function encodeRowid(rowVal) {
+    return XEUtils.eqNull(rowVal) ? '' : encodeURIComponent(rowVal);
 }
 export const handleFieldOrColumn = ($xeTable, fieldOrColumn) => {
     if (fieldOrColumn) {
@@ -105,6 +108,13 @@ export const handleFieldOrColumn = ($xeTable, fieldOrColumn) => {
     }
     return null;
 };
+export const handleRowidOrRow = ($xeTable, rowidOrRow) => {
+    if (rowidOrRow) {
+        const rowid = XEUtils.isString(rowidOrRow) || XEUtils.isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow);
+        return $xeTable.getRowById(rowid);
+    }
+    return null;
+};
 function getPaddingLeftRightSize(elem) {
     if (elem) {
         const computedStyle = getComputedStyle(elem);

package/es/ui/index.js

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