vxe-table 4.10.1 → 4.10.2

package/es/table/src/table.js

@@ -1028,6 +1028,8 @@ export default defineComponent({
             const columnOpts = computeColumnOpts.value;
             const columnDragOpts = computeColumnDragOpts.value;
             const { isCrossDrag, isSelfToChildDrag } = columnDragOpts;
+            const customOpts = computeCustomOpts.value;
+            const { storage } = customOpts;
             const rowOpts = computeRowOpts.value;
             const isGroup = collectColumn.some(hasChildrenList);
             let isAllOverflow = !!props.showOverflow;
@@ -1047,8 +1049,8 @@ export default defineComponent({
                     fullColumnFieldData[field] = rest;
                 }
                 else {
-                    if (isCrossDrag || isSelfToChildDrag) {
-                        errLog('vxe.error.emptyProp', ['column.field']);
+                    if (storage || isCrossDrag || isSelfToChildDrag) {
+                        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
                     }
                 }
                 if (!hasFixed && fixed) {
@@ -2332,25 +2334,28 @@ export default defineComponent({
                 const { loadMethod } = expandOpts;
                 if (loadMethod) {
                     const { fullAllDataRowIdData } = internalData;
-                    const { rowExpandLazyLoadedMaps } = reactData;
+                    const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
                     const rowid = getRowid($xeTable, row);
                     const rowRest = fullAllDataRowIdData[rowid];
-                    rowExpandLazyLoadedMaps[rowid] = row;
+                    rExpandLazyLoadedMaps[rowid] = row;
+                    reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
                     loadMethod({ $table: $xeTable, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }).then(() => {
-                        const { rowExpandedMaps } = reactData;
+                        const rExpandedMaps = Object.assign({}, reactData.rowExpandedMaps);
                         if (rowRest) {
                             rowRest.expandLoaded = true;
                         }
-                        rowExpandedMaps[rowid] = row;
+                        rExpandedMaps[rowid] = row;
+                        reactData.rowExpandedMaps = rExpandedMaps;
                     }).catch(() => {
                         if (rowRest) {
                             rowRest.expandLoaded = false;
                         }
                     }).finally(() => {
-                        const { rowExpandLazyLoadedMaps } = reactData;
-                        if (rowExpandLazyLoadedMaps[rowid]) {
-                            delete rowExpandLazyLoadedMaps[rowid];
+                        const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
+                        if (rExpandLazyLoadedMaps[rowid]) {
+                            delete rExpandLazyLoadedMaps[rowid];
                         }
+                        reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
                         nextTick().then(() => tableMethods.recalculate()).then(() => resolve());
                     });
                 }
@@ -4687,7 +4692,7 @@ export default defineComponent({
                 return rowRest && !!rowRest.expandLoaded;
             },
             clearRowExpandLoaded(row) {
-                const { rowExpandLazyLoadedMaps } = reactData;
+                const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
                 const { fullAllDataRowIdData } = internalData;
                 const expandOpts = computeExpandOpts.value;
                 const { lazy } = expandOpts;
@@ -4695,8 +4700,9 @@ export default defineComponent({
                 const rowRest = fullAllDataRowIdData[rowid];
                 if (lazy && rowRest) {
                     rowRest.expandLoaded = false;
-                    delete rowExpandLazyLoadedMaps[rowid];
+                    delete rExpandLazyLoadedMaps[rowid];
                 }
+                reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
                 return nextTick();
             },
             /**
@@ -4868,7 +4874,7 @@ export default defineComponent({
                 return rowRest && !!rowRest.treeLoaded;
             },
             clearTreeExpandLoaded(rows) {
-                const { treeExpandedMaps } = reactData;
+                const tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
                 const { fullAllDataRowIdData } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const { transform } = treeOpts;
@@ -4881,12 +4887,13 @@ export default defineComponent({
                         const rowRest = fullAllDataRowIdData[rowid];
                         if (rowRest) {
                             rowRest.treeLoaded = false;
-                            if (treeExpandedMaps[rowid]) {
-                                delete treeExpandedMaps[rowid];
+                            if (tExpandedMaps[rowid]) {
+                                delete tExpandedMaps[rowid];
                             }
                         }
                     });
                 }
+                reactData.treeExpandedMaps = tExpandedMaps;
                 if (transform) {
                     handleVirtualTreeToList();
                     return tablePrivateMethods.handleTableData();
@@ -5319,7 +5326,7 @@ export default defineComponent({
                 }
                 let hasResizable = 0;
                 let hasSort = 0;
-                let hasFixedt = 0;
+                let hasFixed = 0;
                 let hasVisible = 0;
                 XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
                     // 只支持一级
@@ -5334,7 +5341,7 @@ export default defineComponent({
                         if (column.fixed !== column.defaultFixed) {
                             const colKey = column.getKey();
                             if (colKey) {
-                                hasFixedt = 1;
+                                hasFixed = 1;
                                 fixedData[colKey] = column.fixed;
                             }
                         }
@@ -5369,7 +5376,7 @@ export default defineComponent({
                 if (hasSort) {
                     storeData.sortData = sortData;
                 }
-                if (hasFixedt) {
+                if (hasFixed) {
                     storeData.fixedData = fixedData;
                 }
                 if (hasVisible) {
@@ -7315,22 +7322,21 @@ export default defineComponent({
                     evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
                 }
             },
-            handleRowDragDragendEvent(evnt) {
+            handleRowDragSwapEvent(evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild) {
                 const { treeConfig, dragConfig } = props;
                 const rowDragOpts = computeRowDragOpts.value;
-                const { fullAllDataRowIdData, prevDragToChild } = internalData;
+                const { fullAllDataRowIdData } = internalData;
                 const { isPeerDrag, isCrossDrag, isSelfToChildDrag, dragEndMethod } = rowDragOpts;
                 const treeOpts = computeTreeOpts.value;
                 const { transform, rowField, mapChildrenField, parentField } = treeOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
-                const { dragRow } = reactData;
-                const { afterFullData, tableFullData, prevDragRow, prevDragPos } = internalData;
+                const { afterFullData, tableFullData } = internalData;
                 const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
                 const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
                 if (prevDragRow && dragRow) {
                     // 判断是否有拖动
                     if (prevDragRow !== dragRow) {
-                        Promise.resolve(dEndMethod
+                        return Promise.resolve(dEndMethod
                             ? dEndMethod({
                                 oldRow: dragRow,
                                 newRow: prevDragRow,
@@ -7481,6 +7487,34 @@ export default defineComponent({
                         });
                     }
                 }
+                return Promise.resolve();
+            },
+            handleRowDragDragendEvent(evnt) {
+                const { treeConfig } = props;
+                const { fullAllDataRowIdData, prevDragToChild } = internalData;
+                const { dragRow } = reactData;
+                const treeOpts = computeTreeOpts.value;
+                const { lazy } = treeOpts;
+                const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+                const { prevDragRow, prevDragPos } = internalData;
+                if (treeConfig && prevDragToChild) {
+                    // 懒加载
+                    if (lazy) {
+                        const newRowid = getRowid($xeTable, prevDragRow);
+                        const rowRest = fullAllDataRowIdData[newRowid];
+                        if (prevDragRow[hasChildField]) {
+                            if (rowRest && rowRest.treeLoaded) {
+                                $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                            }
+                        }
+                        else {
+                            $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                        }
+                    }
+                }
+                else {
+                    $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                }
                 hideDropTip();
                 clearRowDropOrigin();
                 internalData.prevDragToChild = false;
@@ -7495,7 +7529,8 @@ export default defineComponent({
                 const { fullAllDataRowIdData } = internalData;
                 const { dragRow } = reactData;
                 const treeOpts = computeTreeOpts.value;
-                const { transform, parentField } = treeOpts;
+                const { lazy, transform, parentField } = treeOpts;
+                const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
                 const rowDragOpts = computeRowDragOpts.value;
                 const { isPeerDrag, isCrossDrag, isToChildDrag } = rowDragOpts;
                 if (!dragRow) {
@@ -7508,18 +7543,21 @@ export default defineComponent({
                 const rest = fullAllDataRowIdData[rowid];
                 if (rest) {
                     const row = rest.row;
+                    const rowid = getRowid($xeTable, row);
+                    const rowRest = fullAllDataRowIdData[rowid];
                     evnt.preventDefault();
                     const { dragRow } = reactData;
                     const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
                     const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
+                    internalData.prevDragToChild = !!(treeConfig && transform && (isCrossDrag && isToChildDrag) && hasCtrlKey);
+                    internalData.prevDragRow = row;
+                    internalData.prevDragPos = dragPos;
                     if ($xeTable.eqRow(dragRow, row) ||
+                        (hasCtrlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded) ||
                         (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level))) {
                         showDropTip(evnt, trEl, null, false, dragPos);
                         return;
                     }
-                    internalData.prevDragToChild = !!(treeConfig && transform && (isCrossDrag && isToChildDrag) && hasCtrlKey);
-                    internalData.prevDragRow = row;
-                    internalData.prevDragPos = dragPos;
                     showDropTip(evnt, trEl, null, true, dragPos);
                     dispatchEvent('row-dragover', {
                         oldRow: dragRow,
@@ -7762,15 +7800,15 @@ export default defineComponent({
                     const { clientX } = evnt;
                     const offsetX = clientX - thEl.getBoundingClientRect().x;
                     const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
+                    internalData.prevDragToChild = !!((isCrossDrag && isToChildDrag) && hasCtrlKey);
+                    internalData.prevDragCol = column;
+                    internalData.prevDragPos = dragPos;
                     if (column.fixed ||
                         (dragCol && dragCol.id === column.id) ||
                         (!isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.parentId))) {
                         showDropTip(evnt, null, thEl, false, dragPos);
                         return;
                     }
-                    internalData.prevDragToChild = !!((isCrossDrag && isToChildDrag) && hasCtrlKey);
-                    internalData.prevDragCol = column;
-                    internalData.prevDragPos = dragPos;
                     showDropTip(evnt, null, thEl, true, dragPos);
                     dispatchEvent('column-dragover', {
                         oldColumn: dragCol,

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.1";
+const version = "4.10.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3558,7 +3558,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.1"}`;
+const log_version = `table v${"4.10.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5062,6 +5062,7 @@ const Cell = {
         $table.triggerTreeExpandEvent(evnt, params);
       };
     }
+    console.log(row.name, hasChild);
     return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
       class: ['vxe-cell--tree-node', {
         'is--active': isActive
@@ -5069,7 +5070,7 @@ const Cell = {
       style: {
         paddingLeft: `${level * indent}px`
       }
-    }, [showIcon && (lazy ? isLazyLoaded ? hasChild : hasLazyChilds : hasChild) ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+    }, [showIcon && (lazy ? isLazyLoaded ? hasChild : hasChild || hasLazyChilds : hasChild) ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
       class: 'vxe-tree--btn-wrapper',
       ...ons
     }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
@@ -11599,6 +11600,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         isCrossDrag,
         isSelfToChildDrag
       } = columnDragOpts;
+      const customOpts = computeCustomOpts.value;
+      const {
+        storage
+      } = customOpts;
       const rowOpts = computeRowOpts.value;
       const isGroup = collectColumn.some(hasChildrenList);
       let isAllOverflow = !!props.showOverflow;
@@ -11632,8 +11637,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
           fullColumnFieldData[field] = rest;
         } else {
-          if (isCrossDrag || isSelfToChildDrag) {
-            errLog('vxe.error.emptyProp', ['column.field']);
+          if (storage || isCrossDrag || isSelfToChildDrag) {
+            errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
           }
         }
         if (!hasFixed && fixed) {
@@ -13181,36 +13186,39 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const {
             fullAllDataRowIdData
           } = internalData;
-          const {
-            rowExpandLazyLoadedMaps
-          } = reactData;
+          const rExpandLazyLoadedMaps = {
+            ...reactData.rowExpandLazyLoadedMaps
+          };
           const rowid = getRowid($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid];
-          rowExpandLazyLoadedMaps[rowid] = row;
+          rExpandLazyLoadedMaps[rowid] = row;
+          reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
           loadMethod({
             $table: $xeTable,
             row,
             rowIndex: tableMethods.getRowIndex(row),
             $rowIndex: tableMethods.getVMRowIndex(row)
           }).then(() => {
-            const {
-              rowExpandedMaps
-            } = reactData;
+            const rExpandedMaps = {
+              ...reactData.rowExpandedMaps
+            };
             if (rowRest) {
               rowRest.expandLoaded = true;
             }
-            rowExpandedMaps[rowid] = row;
+            rExpandedMaps[rowid] = row;
+            reactData.rowExpandedMaps = rExpandedMaps;
           }).catch(() => {
             if (rowRest) {
               rowRest.expandLoaded = false;
             }
           }).finally(() => {
-            const {
-              rowExpandLazyLoadedMaps
-            } = reactData;
-            if (rowExpandLazyLoadedMaps[rowid]) {
-              delete rowExpandLazyLoadedMaps[rowid];
+            const rExpandLazyLoadedMaps = {
+              ...reactData.rowExpandLazyLoadedMaps
+            };
+            if (rExpandLazyLoadedMaps[rowid]) {
+              delete rExpandLazyLoadedMaps[rowid];
             }
+            reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
             (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => tableMethods.recalculate()).then(() => resolve());
           });
         } else {
@@ -15893,9 +15901,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return rowRest && !!rowRest.expandLoaded;
       },
       clearRowExpandLoaded(row) {
-        const {
-          rowExpandLazyLoadedMaps
-        } = reactData;
+        const rExpandLazyLoadedMaps = {
+          ...reactData.rowExpandLazyLoadedMaps
+        };
         const {
           fullAllDataRowIdData
         } = internalData;
@@ -15907,8 +15915,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const rowRest = fullAllDataRowIdData[rowid];
         if (lazy && rowRest) {
           rowRest.expandLoaded = false;
-          delete rowExpandLazyLoadedMaps[rowid];
+          delete rExpandLazyLoadedMaps[rowid];
         }
+        reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       /**
@@ -16115,9 +16124,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return rowRest && !!rowRest.treeLoaded;
       },
       clearTreeExpandLoaded(rows) {
-        const {
-          treeExpandedMaps
-        } = reactData;
+        const tExpandedMaps = {
+          ...reactData.treeExpandedMaps
+        };
         const {
           fullAllDataRowIdData
         } = internalData;
@@ -16134,12 +16143,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
               rowRest.treeLoaded = false;
-              if (treeExpandedMaps[rowid]) {
-                delete treeExpandedMaps[rowid];
+              if (tExpandedMaps[rowid]) {
+                delete tExpandedMaps[rowid];
               }
             }
           });
         }
+        reactData.treeExpandedMaps = tExpandedMaps;
         if (transform) {
           handleVirtualTreeToList();
           return tablePrivateMethods.handleTableData();
@@ -16628,7 +16638,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
         let hasResizable = 0;
         let hasSort = 0;
-        let hasFixedt = 0;
+        let hasFixed = 0;
         let hasVisible = 0;
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn) => {
           // 只支持一级
@@ -16643,7 +16653,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             if (column.fixed !== column.defaultFixed) {
               const colKey = column.getKey();
               if (colKey) {
-                hasFixedt = 1;
+                hasFixed = 1;
                 fixedData[colKey] = column.fixed;
               }
             }
@@ -16679,7 +16689,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         if (hasSort) {
           storeData.sortData = sortData;
         }
-        if (hasFixedt) {
+        if (hasFixed) {
           storeData.fixedData = fixedData;
         }
         if (hasVisible) {
@@ -18963,15 +18973,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
         }
       },
-      handleRowDragDragendEvent(evnt) {
+      handleRowDragSwapEvent(evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild) {
         const {
           treeConfig,
           dragConfig
         } = props;
         const rowDragOpts = computeRowDragOpts.value;
         const {
-          fullAllDataRowIdData,
-          prevDragToChild
+          fullAllDataRowIdData
         } = internalData;
         const {
           isPeerDrag,
@@ -18987,21 +18996,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           parentField
         } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
-        const {
-          dragRow
-        } = reactData;
         const {
           afterFullData,
-          tableFullData,
-          prevDragRow,
-          prevDragPos
+          tableFullData
         } = internalData;
         const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
         const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
         if (prevDragRow && dragRow) {
           // 判断是否有拖动
           if (prevDragRow !== dragRow) {
-            Promise.resolve(dEndMethod ? dEndMethod({
+            return Promise.resolve(dEndMethod ? dEndMethod({
               oldRow: dragRow,
               newRow: prevDragRow,
               dragPos: prevDragPos,
@@ -19152,6 +19156,44 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             }).catch(() => {});
           }
         }
+        return Promise.resolve();
+      },
+      handleRowDragDragendEvent(evnt) {
+        const {
+          treeConfig
+        } = props;
+        const {
+          fullAllDataRowIdData,
+          prevDragToChild
+        } = internalData;
+        const {
+          dragRow
+        } = reactData;
+        const treeOpts = computeTreeOpts.value;
+        const {
+          lazy
+        } = treeOpts;
+        const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+        const {
+          prevDragRow,
+          prevDragPos
+        } = internalData;
+        if (treeConfig && prevDragToChild) {
+          // 懒加载
+          if (lazy) {
+            const newRowid = getRowid($xeTable, prevDragRow);
+            const rowRest = fullAllDataRowIdData[newRowid];
+            if (prevDragRow[hasChildField]) {
+              if (rowRest && rowRest.treeLoaded) {
+                $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+              }
+            } else {
+              $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+            }
+          }
+        } else {
+          $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+        }
         hideDropTip();
         clearRowDropOrigin();
         internalData.prevDragToChild = false;
@@ -19173,9 +19215,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } = reactData;
         const treeOpts = computeTreeOpts.value;
         const {
+          lazy,
           transform,
           parentField
         } = treeOpts;
+        const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
         const rowDragOpts = computeRowDragOpts.value;
         const {
           isPeerDrag,
@@ -19192,19 +19236,21 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const rest = fullAllDataRowIdData[rowid];
         if (rest) {
           const row = rest.row;
+          const rowid = getRowid($xeTable, row);
+          const rowRest = fullAllDataRowIdData[rowid];
           evnt.preventDefault();
           const {
             dragRow
           } = reactData;
           const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
           const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-          if ($xeTable.eqRow(dragRow, row) || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level)) {
-            showDropTip(evnt, trEl, null, false, dragPos);
-            return;
-          }
           internalData.prevDragToChild = !!(treeConfig && transform && isCrossDrag && isToChildDrag && hasCtrlKey);
           internalData.prevDragRow = row;
           internalData.prevDragPos = dragPos;
+          if ($xeTable.eqRow(dragRow, row) || hasCtrlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level)) {
+            showDropTip(evnt, trEl, null, false, dragPos);
+            return;
+          }
           showDropTip(evnt, trEl, null, true, dragPos);
           dispatchEvent('row-dragover', {
             oldRow: dragRow,
@@ -19479,13 +19525,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           } = evnt;
           const offsetX = clientX - thEl.getBoundingClientRect().x;
           const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
+          internalData.prevDragToChild = !!(isCrossDrag && isToChildDrag && hasCtrlKey);
+          internalData.prevDragCol = column;
+          internalData.prevDragPos = dragPos;
           if (column.fixed || dragCol && dragCol.id === column.id || !isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.parentId)) {
             showDropTip(evnt, null, thEl, false, dragPos);
             return;
           }
-          internalData.prevDragToChild = !!(isCrossDrag && isToChildDrag && hasCtrlKey);
-          internalData.prevDragCol = column;
-          internalData.prevDragPos = dragPos;
           showDropTip(evnt, null, thEl, true, dragPos);
           dispatchEvent('column-dragover', {
             oldColumn: dragCol,
@@ -25785,10 +25831,10 @@ core_.VxeUI.hooks.add('tableCustomModule', {
         allowFixed,
         allowResizable
       } = customOpts;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parent) => {
-        if (parent) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, (column, index, items, path, parentColumn) => {
+        if (parentColumn) {
           // 更新子列信息
-          column.fixed = parent.fixed;
+          column.fixed = parentColumn.fixed;
         } else {
           if (allowSort) {
             const sortIndex = index + 1;