vxe-table 3.13.18 → 3.13.20

package/es/table/src/methods.js

@@ -3,7 +3,7 @@ import { browse, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEv
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getRefElem } from './util';
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getRefElem } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI;
@@ -2190,6 +2190,10 @@ const Methods = {
         }
         return [];
     },
+    getEl() {
+        const $xeTable = this;
+        return $xeTable.$refs.refElem;
+    },
     /**
      * 获取父容器元素
      */
@@ -2201,10 +2205,26 @@ const Methods = {
      * 获取父容器的高度
      */
     getParentHeight() {
-        const { $el, $xegrid, height } = this;
-        const parentElem = $el.parentNode;
-        const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
-        return Math.floor($xegrid ? $xegrid.getParentHeight() : XEUtils.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
+        const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
+        const props = $xeTable;
+        const { height } = props;
+        const el = $xeTable.$refs.refElem;
+        if (el) {
+            const parentElem = el.parentNode;
+            const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
+            let parentWrapperHeight = 0;
+            if (parentElem) {
+                if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+                    parentWrapperHeight = $xeGrid.getParentHeight();
+                }
+                else {
+                    parentWrapperHeight = parentElem.clientHeight;
+                }
+            }
+            return Math.floor(parentWrapperHeight - parentPaddingSize);
+        }
+        return 0;
     },
     /**
      * 获取需要排除的高度
@@ -2386,7 +2406,7 @@ const Methods = {
                 //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
                 // }
                 if (this.spanMethod) {
-                    warnLog('vxe.error.scrollErrProp', ['table.span-method']);
+                    errLog('vxe.error.scrollErrProp', ['table.span-method']);
                 }
             }
             handleReserveStatus($xeTable);
@@ -2926,12 +2946,12 @@ const Methods = {
         const reactData = $xeTable;
         const internalData = $xeTable;
         const { keepSource, treeConfig } = props;
-        const { fullAllDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
+        const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform } = treeOpts;
         if (!keepSource) {
             if (process.env.NODE_ENV === 'development') {
-                warnLog('vxe.error.reqProp', ['keep-source']);
+                errLog('vxe.error.reqProp', ['keep-source']);
             }
             return $xeTable.$nextTick();
         }
@@ -2946,23 +2966,23 @@ const Methods = {
         }
         let reDelFlag = false;
         if (targetRows.length) {
-            targetRows.forEach((row) => {
-                if (!$xeTable.isInsertByRow(row)) {
-                    const rowid = getRowid($xeTable, row);
-                    const oRow = sourceDataRowIdData[rowid];
-                    if (oRow && row) {
-                        if (field) {
-                            XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
-                        }
-                        else {
-                            XEUtils.destructuring(row, XEUtils.clone(oRow, true));
-                        }
-                        if ($xeTable.isRemoveByRow(row)) {
-                            const rowRest = fullAllDataRowIdData[rowid];
-                            if (rowRest) {
-                                const reRow = rowRest.row;
-                                tableFullData.unshift(reRow);
-                                afterFullData.unshift(reRow);
+            targetRows.forEach((item) => {
+                const rowid = getRowid($xeTable, item);
+                const rowRest = fullAllDataRowIdData[rowid];
+                if (rowRest) {
+                    const row = rowRest.row;
+                    if (!$xeTable.isInsertByRow(row)) {
+                        const oRow = sourceDataRowIdData[rowid];
+                        if (oRow && row) {
+                            if (field) {
+                                XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
+                            }
+                            else {
+                                XEUtils.destructuring(row, XEUtils.clone(oRow, true));
+                            }
+                            if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                                tableFullData.unshift(row);
+                                afterFullData.unshift(row);
                                 reDelFlag = true;
                             }
                         }
@@ -3133,20 +3153,25 @@ const Methods = {
     },
     /**
      * 检查行或列数据是否发生改变
-     * @param {Row} row 行对象
+     * @param {Row} rowOrId 行对象
      * @param {String} field 字段名
      */
-    isUpdateByRow(row, field) {
-        const { tableFullColumn, keepSource, sourceDataRowIdData, fullDataRowIdData } = this;
+    isUpdateByRow(rowOrId, field) {
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { keepSource } = props;
+        const { tableFullColumn, fullDataRowIdData, sourceDataRowIdData } = internalData;
         if (keepSource) {
-            const rowid = getRowid(this, 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 oldRest = sourceDataRowIdData[rowid];
-            if (oldRest) {
-                const oRow = oldRest.row;
+            const row = rowRest.row;
+            const oRow = sourceDataRowIdData[rowid];
+            if (oRow) {
                 if (arguments.length > 1) {
                     return !eqCellValue(oRow, row, field);
                 }
@@ -3208,6 +3233,99 @@ const Methods = {
             tableColumn: this.tableColumn.slice(0)
         };
     },
+    /**
+     * 移动列到指定列的位置
+     * @param fieldOrColumn
+     * @param targetFieldOrColumn
+     * @param options
+     */
+    moveColumnTo(fieldOrColumn, targetFieldOrColumn, options) {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        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 $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { fullAllDataRowIdData, afterFullData } = internalData;
+        const { dragToChild, dragPos, isCrossDrag } = Object.assign({}, options);
+        const treeOpts = $xeTable.computeTreeOpts;
+        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);
+    },
     /**
      * 获取表格的全量列
      */
@@ -3228,22 +3346,30 @@ const Methods = {
      * 用于多选行，获取已选中的数据
      */
     getCheckboxRecords(isFull) {
-        const { tableFullData, afterFullData, treeConfig, treeOpts, checkboxOpts, tableFullTreeData, afterTreeFullData, afterFullRowMaps } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { selectCheckboxMaps } = reactData;
+        const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { transform, mapChildrenField } = treeOpts;
         const { checkField } = checkboxOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
-        const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
         let rowList = [];
         if (checkField) {
             if (treeConfig) {
+                const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
                 rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, checkField), { children: transform ? mapChildrenField : childrenField });
             }
             else {
+                const currTableData = isFull ? tableFullData : afterFullData;
                 rowList = currTableData.filter((row) => XEUtils.get(row, checkField));
             }
         }
         else {
-            const { selectCheckboxMaps, fullDataRowIdData } = this;
             XEUtils.each(selectCheckboxMaps, (row, rowid) => {
                 if (isFull) {
                     if (fullDataRowIdData[rowid]) {
@@ -6419,6 +6545,9 @@ const Methods = {
         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) {
@@ -6433,7 +6562,7 @@ const Methods = {
                 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;
@@ -6458,12 +6587,12 @@ const Methods = {
                                     if (isPeerDrag && !isCrossDrag) {
                                         if (oldRest.row[parentField] !== newRest.row[parentField]) {
                                             // 非同级
-                                            return;
+                                            return errRest;
                                         }
                                     }
                                     else {
                                         if (!isCrossDrag) {
-                                            return;
+                                            return errRest;
                                         }
                                         if (oldAllMaps[newRowid]) {
                                             isSelfToChildStatus = true;
@@ -6474,7 +6603,7 @@ const Methods = {
                                                         content: getI18n('vxe.error.treeDragChild')
                                                     });
                                                 }
-                                                return;
+                                                return errRest;
                                             }
                                         }
                                     }
@@ -6482,13 +6611,13 @@ const Methods = {
                                 else if (oldLevel) {
                                     // 子到根
                                     if (!isCrossDrag) {
-                                        return;
+                                        return errRest;
                                     }
                                 }
                                 else if (newLevel) {
                                     // 根到子
                                     if (!isCrossDrag) {
-                                        return;
+                                        return errRest;
                                     }
                                     if (oldAllMaps[newRowid]) {
                                         isSelfToChildStatus = true;
@@ -6499,7 +6628,7 @@ const Methods = {
                                                     content: getI18n('vxe.error.treeDragChild')
                                                 });
                                             }
-                                            return;
+                                            return errRest;
                                         }
                                     }
                                 }
@@ -6559,27 +6688,34 @@ const Methods = {
                     if (reactData.scrollYLoad) {
                         $xeTable.updateScrollYSpace();
                     }
-                    $xeTable.$nextTick().then(() => {
+                    if (evnt) {
+                        $xeTable.dispatchEvent('row-dragend', {
+                            oldRow: dragRow,
+                            newRow: prevDragRow,
+                            dragRow,
+                            dragPos: prevDragPos,
+                            dragToChild: isDragToChildFlag,
+                            offsetIndex: dragOffsetIndex,
+                            _index: {
+                                newIndex: nafIndex,
+                                oldIndex: oafIndex
+                            }
+                        }, evnt);
+                    }
+                    return $xeTable.$nextTick().then(() => {
                         $xeTable.updateCellAreas();
                         $xeTable.recalculate();
+                    }).then(() => {
+                        return {
+                            status: true
+                        };
                     });
-                    $xeTable.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 $xeTable = this;
@@ -6724,6 +6860,9 @@ const Methods = {
         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) {
@@ -6740,7 +6879,7 @@ const Methods = {
                 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;
@@ -6754,12 +6893,12 @@ const Methods = {
                         if (isPeerDrag && !isCrossDrag) {
                             if (dragColumn.parentId !== newColumn.parentId) {
                                 // 非同级
-                                return;
+                                return errRest;
                             }
                         }
                         else {
                             if (!isCrossDrag) {
-                                return;
+                                return errRest;
                             }
                             if (oldAllMaps[newColumn.id]) {
                                 isSelfToChildStatus = true;
@@ -6770,7 +6909,7 @@ const Methods = {
                                             content: getI18n('vxe.error.treeDragChild')
                                         });
                                     }
-                                    return;
+                                    return errRest;
                                 }
                             }
                         }
@@ -6778,13 +6917,13 @@ const Methods = {
                     else if (dragColumn.parentId) {
                         // 子到根
                         if (!isCrossDrag) {
-                            return;
+                            return errRest;
                         }
                     }
                     else if (newColumn.parentId) {
                         // 根到子
                         if (!isCrossDrag) {
-                            return;
+                            return errRest;
                         }
                         if (oldAllMaps[newColumn.id]) {
                             isSelfToChildStatus = true;
@@ -6795,7 +6934,7 @@ const Methods = {
                                         content: getI18n('vxe.error.treeDragChild')
                                     });
                                 }
-                                return;
+                                return errRest;
                             }
                         }
                     }
@@ -6856,26 +6995,32 @@ const Methods = {
                             $xeTable.clearCopyCellArea();
                         }
                     }
-                    $xeTable.dispatchEvent('column-dragend', {
-                        oldColumn: dragColumn,
-                        newColumn,
-                        dragColumn,
-                        dragPos: prevDragPos,
-                        dragToChild: isDragToChildFlag,
-                        offsetIndex: dragOffsetIndex,
-                        _index: {
-                            newIndex: nafIndex,
-                            oldIndex: oafIndex
-                        }
-                    }, evnt);
+                    if (evnt) {
+                        $xeTable.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 $xeTable = this;

package/es/table/src/util.js

@@ -90,13 +90,19 @@ export function getRowUniqueId() {
     return XEUtils.uniqueId('row_');
 }
 // 行主键 key
-export function getRowkey($xetable) {
-    return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ROW_KEY';
+export function getRowkey($xeTable) {
+    const props = $xeTable;
+    const rowOpts = $xeTable.computeRowOpts;
+    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);
 }
 function getPaddingLeftRightSize(elem) {
     if (elem) {
@@ -122,12 +128,19 @@ export function getCellHeight(height) {
     }
     return height || 0;
 }
-export function handleFieldOrColumn(_vm, fieldOrColumn) {
+export function handleFieldOrColumn($xeTable, fieldOrColumn) {
     if (fieldOrColumn) {
-        return XEUtils.isString(fieldOrColumn) || XEUtils.isNumber(fieldOrColumn) ? _vm.getColumnByField(`${fieldOrColumn}`) : fieldOrColumn;
+        return XEUtils.isString(fieldOrColumn) || XEUtils.isNumber(fieldOrColumn) ? $xeTable.getColumnByField(`${fieldOrColumn}`) : 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;
+};
 // 组装列配置
 export function assembleColumn(_vm) {
     const { $el, $xetable, $xecolumn, columnConfig } = _vm;

package/es/ui/index.js

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

package/lib/grid/src/grid.js

@@ -671,6 +671,10 @@ var _default = exports.default = {
       }
       return [];
     },
+    getEl() {
+      const $xeGrid = this;
+      return $xeGrid.$refs.refElem;
+    },
     /**
      * 获取需要排除的高度
      */