vxe-table 4.17.28 → 4.17.29

package/es/table/src/table.js

@@ -3614,7 +3614,8 @@ export default defineVxeComponent({
         };
         const initData = () => {
             const { data } = props;
-            loadTableData(data || [], true).then(() => {
+            dispatchEvent('ready', {}, null);
+            loadTableData(data || [], true, true).then(() => {
                 if (data && data.length) {
                     internalData.inited = true;
                     internalData.initStatus = true;
@@ -3632,10 +3633,10 @@ export default defineVxeComponent({
          * 加载表格数据
          * @param {Array} datas 数据
          */
-        const loadTableData = (datas, isReset) => {
+        const loadTableData = (datas, isReload, isReset) => {
             const { keepSource, treeConfig, rowGroupConfig, aggregateConfig } = props;
             const { rowGroupList, scrollYLoad: oldScrollYLoad } = reactData;
-            const { scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData;
+            const { initStatus, scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData;
             const rowOpts = computeRowOpts.value;
             const treeOpts = computeTreeOpts.value;
             const expandOpts = computeExpandOpts.value;
@@ -3773,6 +3774,19 @@ export default defineVxeComponent({
                 }
                 handleReserveStatus();
                 $xeTable.checkSelectionStatus();
+                if (initStatus) {
+                    dispatchEvent('data-rendered', {
+                        isReload,
+                        visibleColumn: internalData.visibleColumn,
+                        visibleData: internalData.afterFullData
+                    }, null);
+                }
+                else {
+                    dispatchEvent('init-rendered', {
+                        visibleColumn: internalData.visibleColumn,
+                        visibleData: internalData.afterFullData
+                    }, null);
+                }
                 $xeTable.dispatchEvent('data-change', {
                     visibleColumn: internalData.visibleColumn,
                     visibleData: internalData.afterFullData
@@ -3844,7 +3858,9 @@ export default defineVxeComponent({
             handleDefaultMergeCells();
             handleDefaultMergeHeaderItems();
             handleDefaultMergeFooterItems();
-            nextTick(() => setTimeout(() => $xeTable.recalculate()));
+            nextTick(() => {
+                setTimeout(() => $xeTable.recalculate());
+            });
         };
         /**
          * 处理初始化的默认行为
@@ -4821,7 +4837,7 @@ export default defineVxeComponent({
              */
             loadData(datas) {
                 const { initStatus } = internalData;
-                return loadTableData(datas, false).then(() => {
+                return loadTableData(datas, false, false).then(() => {
                     internalData.inited = true;
                     internalData.initStatus = true;
                     if (!initStatus) {
@@ -4839,7 +4855,7 @@ export default defineVxeComponent({
                     .then(() => {
                     internalData.inited = true;
                     internalData.initStatus = true;
-                    return loadTableData(datas, true);
+                    return loadTableData(datas, true, true);
                 }).then(() => {
                     handleLoadDefaults();
                     return handleLazyRecalculate(false, true, true);
@@ -6945,7 +6961,7 @@ export default defineVxeComponent({
                     handleUpdateRowGroup(confList.map(fieldOrColumn => {
                         return XEUtils.isString(fieldOrColumn) ? fieldOrColumn : fieldOrColumn.field;
                     }));
-                    return loadTableData(internalData.tableSynchData, true);
+                    return loadTableData(internalData.tableSynchData, false, true);
                 }
                 return nextTick();
             },
@@ -6974,7 +6990,7 @@ export default defineVxeComponent({
                     return nextTick();
                 }
                 handleUpdateRowGroup([]);
-                return loadTableData(internalData.tableSynchData, true);
+                return loadTableData(internalData.tableSynchData, false, true);
             },
             isRowGroupRecord(row) {
                 warnLog('vxe.error.delFunc', ['isRowGroupRecord', 'isAggregateRecord']);
@@ -8344,6 +8360,16 @@ export default defineVxeComponent({
                 reactData.dragCol = null;
             }
         };
+        const handleRowDragEndClearStatus = () => {
+            clearRowDragData();
+            clearCrossTableDragStatus();
+            handleRecalculateStyle(false, true, true);
+        };
+        const handleColDragEndClearStatus = () => {
+            clearColDragData();
+            clearCrossTableDragStatus();
+            handleRecalculateStyle(true, true, true);
+        };
         const clearRowDropOrigin = () => {
             const el = refElem.value;
             if (el) {
@@ -10392,76 +10418,47 @@ export default defineVxeComponent({
                         dragToChild: !!prevDragToChild,
                         offsetIndex: dragOffsetIndex
                     };
-                    const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
-                    return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
-                        if (!status) {
-                            return errRest;
-                        }
-                        const dragRowid = getRowid($xeTable, dragRow);
-                        const dragRowRest = fullAllDataRowIdData[dragRowid] || {};
-                        const _dragRowIndex = dragRowRest._index;
-                        let dragRowHeight = 0;
-                        let dragOffsetTop = -1;
-                        if (animation) {
-                            dragRowHeight = getCellRestHeight(dragRowRest, cellOpts, rowOpts, defaultRowHeight);
-                            const oldTrEl = el.querySelector(`.vxe-body--row[rowid="${dragRowid}"]`);
-                            if (oldTrEl) {
-                                dragOffsetTop = oldTrEl.offsetTop;
-                            }
-                        }
-                        let oafIndex = -1;
-                        let nafIndex = -1;
-                        // 如果为树结构
-                        if (treeConfig) {
-                            if (transform) {
-                                // 移出源位置
-                                const oldRest = dragRowRest;
-                                const newRowid = getRowid($xeTable, prevDragRow);
-                                const newRest = fullAllDataRowIdData[newRowid];
-                                if (oldRest && newRest) {
-                                    const { level: oldLevel } = oldRest;
-                                    const { level: newLevel } = newRest;
-                                    const oldAllMaps = {};
-                                    XEUtils.eachTree([dragRow], item => {
-                                        oldAllMaps[getRowid($xeTable, item)] = item;
-                                    }, { children: mapChildrenField });
-                                    let isSelfToChildStatus = false;
-                                    if (oldLevel && newLevel) {
-                                        // 子到子
-                                        if (isPeerDrag && !isCrossDrag) {
-                                            if (oldRest.row[parentField] !== newRest.row[parentField]) {
-                                                // 非同级
-                                                return errRest;
-                                            }
-                                        }
-                                        else {
-                                            if (!isCrossDrag) {
-                                                return errRest;
-                                            }
-                                            if (oldAllMaps[newRowid]) {
-                                                isSelfToChildStatus = true;
-                                                if (!(isCrossDrag && isSelfToChildDrag)) {
-                                                    if (VxeUI.modal) {
-                                                        VxeUI.modal.message({
-                                                            status: 'error',
-                                                            content: getI18n('vxe.error.treeDragChild')
-                                                        });
-                                                    }
-                                                    return errRest;
-                                                }
-                                            }
-                                        }
-                                    }
-                                    else if (oldLevel) {
-                                        // 子到根
-                                        if (!isCrossDrag) {
-                                            return errRest;
+                    const dragRowid = getRowid($xeTable, dragRow);
+                    const dragRowRest = fullAllDataRowIdData[dragRowid] || {};
+                    const _dragRowIndex = dragRowRest._index;
+                    let dragRowHeight = 0;
+                    let dragOffsetTop = -1;
+                    if (animation) {
+                        dragRowHeight = getCellRestHeight(dragRowRest, cellOpts, rowOpts, defaultRowHeight);
+                        const oldTrEl = el.querySelector(`.vxe-body--row[rowid="${dragRowid}"]`);
+                        if (oldTrEl) {
+                            dragOffsetTop = oldTrEl.offsetTop;
+                        }
+                    }
+                    let oafIndex = -1;
+                    let nafIndex = -1;
+                    const oldRest = dragRowRest;
+                    const newRowid = getRowid($xeTable, prevDragRow);
+                    const newRest = fullAllDataRowIdData[newRowid];
+                    const oldAllMaps = {};
+                    let isSelfToChildStatus = false;
+                    // 如果为树结构
+                    if (treeConfig) {
+                        if (transform) {
+                            if (oldRest && newRest) {
+                                const { level: oldLevel } = oldRest;
+                                const { level: newLevel } = newRest;
+                                XEUtils.eachTree([dragRow], item => {
+                                    oldAllMaps[getRowid($xeTable, item)] = item;
+                                }, { children: mapChildrenField });
+                                if (oldLevel && newLevel) {
+                                    // 子到子
+                                    if (isPeerDrag && !isCrossDrag) {
+                                        if (oldRest.row[parentField] !== newRest.row[parentField]) {
+                                            // 非同级
+                                            handleRowDragEndClearStatus();
+                                            return Promise.resolve(errRest);
                                         }
                                     }
-                                    else if (newLevel) {
-                                        // 根到子
+                                    else {
                                         if (!isCrossDrag) {
-                                            return errRest;
+                                            handleRowDragEndClearStatus();
+                                            return Promise.resolve(errRest);
                                         }
                                         if (oldAllMaps[newRowid]) {
                                             isSelfToChildStatus = true;
@@ -10472,13 +10469,55 @@ export default defineVxeComponent({
                                                         content: getI18n('vxe.error.treeDragChild')
                                                     });
                                                 }
-                                                return errRest;
+                                                handleRowDragEndClearStatus();
+                                                return Promise.resolve(errRest);
                                             }
                                         }
                                     }
-                                    else {
-                                        // 根到根
+                                }
+                                else if (oldLevel) {
+                                    // 子到根
+                                    if (!isCrossDrag) {
+                                        handleRowDragEndClearStatus();
+                                        return Promise.resolve(errRest);
                                     }
+                                }
+                                else if (newLevel) {
+                                    // 根到子
+                                    if (!isCrossDrag) {
+                                        handleRowDragEndClearStatus();
+                                        return Promise.resolve(errRest);
+                                    }
+                                    if (oldAllMaps[newRowid]) {
+                                        isSelfToChildStatus = true;
+                                        if (!(isCrossDrag && isSelfToChildDrag)) {
+                                            if (VxeUI.modal) {
+                                                VxeUI.modal.message({
+                                                    status: 'error',
+                                                    content: getI18n('vxe.error.treeDragChild')
+                                                });
+                                            }
+                                            handleRowDragEndClearStatus();
+                                            return Promise.resolve(errRest);
+                                        }
+                                    }
+                                }
+                                else {
+                                    // 根到根
+                                }
+                            }
+                        }
+                    }
+                    const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+                    return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
+                        if (!status) {
+                            return errRest;
+                        }
+                        // 如果为树结构
+                        if (treeConfig) {
+                            if (transform) {
+                                // 移出源位置
+                                if (oldRest && newRest) {
                                     const fullList = XEUtils.toTreeArray(internalData.afterTreeFullData, {
                                         key: rowField,
                                         parentKey: parentField,
@@ -10521,8 +10560,6 @@ export default defineVxeComponent({
                             afterFullData.splice(nafIndex, 0, dragRow);
                             tableFullData.splice(ntfIndex, 0, dragRow);
                         }
-                        clearRowDragData();
-                        clearCrossTableDragStatus();
                         $xeTable.handleTableData(treeConfig && transform);
                         $xeTable.cacheRowMap(false);
                         updateScrollYStatus();
@@ -10630,18 +10667,15 @@ export default defineVxeComponent({
                     }).catch(() => {
                         return errRest;
                     }).then((rest) => {
-                        clearRowDragData();
-                        clearCrossTableDragStatus();
+                        handleRowDragEndClearStatus();
                         return rest;
                     });
                 }
-                clearRowDragData();
-                clearCrossTableDragStatus();
+                handleRowDragEndClearStatus();
                 return Promise.resolve(errRest);
             },
             handleCrossTableRowDragCancelEvent() {
-                clearRowDragData();
-                clearCrossTableDragStatus();
+                handleRowDragEndClearStatus();
             },
             /**
              * 处理跨表拖拽完成
@@ -10701,8 +10735,7 @@ export default defineVxeComponent({
                         dispatchEvent('row-remove-dragend', {
                             row: dragRow
                         }, evnt);
-                        clearRowDragData();
-                        clearCrossTableDragStatus();
+                        handleRowDragEndClearStatus();
                     }
                 }
             },
@@ -10775,8 +10808,7 @@ export default defineVxeComponent({
                                         $oldTable.handleCrossTableRowDragCancelEvent(evnt);
                                     }
                                 }
-                                clearRowDragData();
-                                clearCrossTableDragStatus();
+                                handleRowDragEndClearStatus();
                                 return errRest;
                             }
                             let insertRest = Promise.resolve();
@@ -11049,78 +11081,50 @@ export default defineVxeComponent({
                         dragToChild: !!prevDragToChild,
                         offsetIndex: dragOffsetIndex
                     };
-                    const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
-                    return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
-                        if (!status) {
-                            return errRest;
-                        }
-                        let dragTargetColumn = null;
-                        const dragAllTargetCols = [];
-                        let dragColWidth = 0;
-                        if (animation) {
-                            XEUtils.eachTree([dragColumn], column => {
-                                if (!dragTargetColumn && (!column.children || !column.children.length)) {
-                                    dragTargetColumn = column;
-                                    dragColWidth += column.renderWidth;
-                                }
-                                dragAllTargetCols.push(column);
-                            });
-                        }
-                        if (!dragTargetColumn) {
-                            dragTargetColumn = dragColumn;
-                        }
-                        const dragColRest = fullColumnIdData[dragTargetColumn.id] || {};
-                        const _dragColIndex = dragColRest._index;
-                        let dragOffsetLeft = -1;
-                        if (animation) {
-                            const oldTrEl = el.querySelector(`.vxe-table--column[colid="${dragTargetColumn.id}"]`);
-                            if (oldTrEl) {
-                                dragOffsetLeft = oldTrEl.offsetLeft;
-                            }
-                        }
-                        let oafIndex = -1;
-                        let nafIndex = -1;
-                        const oldAllMaps = {};
+                    let dragTargetColumn = null;
+                    const dragAllTargetCols = [];
+                    let dragColWidth = 0;
+                    if (animation) {
                         XEUtils.eachTree([dragColumn], column => {
-                            oldAllMaps[column.id] = column;
-                        });
-                        let isSelfToChildStatus = false;
-                        if (dragColumn.parentId && newColumn.parentId) {
-                            // 子到子
-                            if (isPeerDrag && !isCrossDrag) {
-                                if (dragColumn.parentId !== newColumn.parentId) {
-                                    // 非同级
-                                    return errRest;
-                                }
-                            }
-                            else {
-                                if (!isCrossDrag) {
-                                    return errRest;
-                                }
-                                if (oldAllMaps[newColumn.id]) {
-                                    isSelfToChildStatus = true;
-                                    if (!(isCrossDrag && isSelfToChildDrag)) {
-                                        if (VxeUI.modal) {
-                                            VxeUI.modal.message({
-                                                status: 'error',
-                                                content: getI18n('vxe.error.treeDragChild')
-                                            });
-                                        }
-                                        return errRest;
-                                    }
-                                }
+                            if (!dragTargetColumn && (!column.children || !column.children.length)) {
+                                dragTargetColumn = column;
+                                dragColWidth += column.renderWidth;
                             }
+                            dragAllTargetCols.push(column);
+                        });
+                    }
+                    if (!dragTargetColumn) {
+                        dragTargetColumn = dragColumn;
+                    }
+                    const dragColRest = fullColumnIdData[dragTargetColumn.id] || {};
+                    const _dragColIndex = dragColRest._index;
+                    let dragOffsetLeft = -1;
+                    if (animation) {
+                        const oldTrEl = el.querySelector(`.vxe-table--column[colid="${dragTargetColumn.id}"]`);
+                        if (oldTrEl) {
+                            dragOffsetLeft = oldTrEl.offsetLeft;
                         }
-                        else if (dragColumn.parentId) {
-                            // 子到根
-                            if (!isCrossDrag) {
-                                return errRest;
+                    }
+                    let oafIndex = -1;
+                    let nafIndex = -1;
+                    const oldAllMaps = {};
+                    XEUtils.eachTree([dragColumn], column => {
+                        oldAllMaps[column.id] = column;
+                    });
+                    let isSelfToChildStatus = false;
+                    if (dragColumn.parentId && newColumn.parentId) {
+                        // 子到子
+                        if (isPeerDrag && !isCrossDrag) {
+                            if (dragColumn.parentId !== newColumn.parentId) {
+                                // 非同级
+                                handleColDragEndClearStatus();
+                                return Promise.resolve(errRest);
                             }
                         }
-                        else if (newColumn.parentId) {
-                            // 根到子
+                        else {
                             if (!isCrossDrag) {
-                                return errRest;
+                                handleColDragEndClearStatus();
+                                return Promise.resolve(errRest);
                             }
                             if (oldAllMaps[newColumn.id]) {
                                 isSelfToChildStatus = true;
@@ -11131,12 +11135,46 @@ export default defineVxeComponent({
                                             content: getI18n('vxe.error.treeDragChild')
                                         });
                                     }
-                                    return errRest;
+                                    handleColDragEndClearStatus();
+                                    return Promise.resolve(errRest);
                                 }
                             }
                         }
-                        else {
-                            // 根到根
+                    }
+                    else if (dragColumn.parentId) {
+                        // 子到根
+                        if (!isCrossDrag) {
+                            handleColDragEndClearStatus();
+                            return Promise.resolve(errRest);
+                        }
+                    }
+                    else if (newColumn.parentId) {
+                        // 根到子
+                        if (!isCrossDrag) {
+                            handleColDragEndClearStatus();
+                            return Promise.resolve(errRest);
+                        }
+                        if (oldAllMaps[newColumn.id]) {
+                            isSelfToChildStatus = true;
+                            if (!(isCrossDrag && isSelfToChildDrag)) {
+                                if (VxeUI.modal) {
+                                    VxeUI.modal.message({
+                                        status: 'error',
+                                        content: getI18n('vxe.error.treeDragChild')
+                                    });
+                                }
+                                handleColDragEndClearStatus();
+                                return Promise.resolve(errRest);
+                            }
+                        }
+                    }
+                    else {
+                        // 根到根
+                    }
+                    const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+                    return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
+                        if (!status) {
+                            return errRest;
                         }
                         const oldewMatchRest = XEUtils.findTree(collectColumn, item => item.id === dragColumn.id);
                         // 改变层级
@@ -11296,13 +11334,11 @@ export default defineVxeComponent({
                     }).catch(() => {
                         return errRest;
                     }).then((rest) => {
-                        clearColDragData();
-                        clearCrossTableDragStatus();
+                        handleColDragEndClearStatus();
                         return rest;
                     });
                 }
-                clearColDragData();
-                clearCrossTableDragStatus();
+                handleColDragEndClearStatus();
                 return Promise.resolve(errRest);
             },
             handleHeaderCellDragDragendEvent(evnt) {
@@ -12211,7 +12247,7 @@ export default defineVxeComponent({
                 }
             },
             handleUpdateAggData() {
-                return loadTableData(internalData.tableSynchData, true);
+                return loadTableData(internalData.tableSynchData, false, true);
             },
             updateZindex() {
                 if (props.zIndex) {
@@ -13020,7 +13056,7 @@ export default defineVxeComponent({
             if (value && value.length >= 20000) {
                 warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
-            loadTableData(value, true).then(() => {
+            loadTableData(value, false, true).then(() => {
                 const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 const expandOpts = computeExpandOpts.value;
                 internalData.inited = true;

package/es/ui/index.js

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