vxe-table 4.23.4 → 4.23.5

package/dist/all.esm.js

@@ -56,7 +56,7 @@ function getDefaultConfig(val1, def1) {
     return XEUtils.eqNull(val1) ? def1 : val1;
 }
 
-const version = "4.23.4";
+const version = "4.23.5";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -952,7 +952,7 @@ function getPopupAppendElement(appendTo) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.23.4"}`;
+const tableVersion = `table v${"4.23.5"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -10075,7 +10075,7 @@ hooks$5.add('tableEditModule', {
             }
             reactData.removeRowFlag++;
             reactData.insertRowFlag++;
-            $xeTable.cacheRowMap(false);
+            $xeTable.cacheRowMap(false, false);
             $xeTable.updateScrollYStatus();
             $xeTable.handleTableData(treeConfig && transform);
             if (!(treeConfig && transform)) {
@@ -10442,7 +10442,7 @@ hooks$5.add('tableEditModule', {
                 reactData.removeRowFlag++;
                 reactData.insertRowFlag++;
                 reactData.pendingRowFlag++;
-                $xeTable.cacheRowMap(false);
+                $xeTable.cacheRowMap(false, false);
                 $xeTable.handleTableData(treeConfig && transform);
                 $xeTable.updateFooter();
                 $xeTable.handleUpdateBodyMerge();
@@ -17608,7 +17608,7 @@ var VxeTableComponent = defineVxeComponent({
                     internalData.tableFullGroupData = groupRest.treeData;
                     reactData.isRowGroupStatus = true;
                     reactData.rowGroupList = aggGroupConfs;
-                    $xeTable.cacheRowMap(false);
+                    $xeTable.cacheRowMap(false, false);
                 }
                 // 如果自定义了顺序
                 if (isCustomSort && sortData) {
@@ -19137,7 +19137,7 @@ var VxeTableComponent = defineVxeComponent({
                 }
             }
         };
-        const handleAsyncTreeExpandChilds = (row) => {
+        const handleAsyncTreeExpandChilds = (row, autoExpand) => {
             const treeOpts = computeTreeOpts.value;
             const checkboxOpts = computeCheckboxOpts.value;
             const { transform, loadMethod } = treeOpts;
@@ -19161,7 +19161,7 @@ var VxeTableComponent = defineVxeComponent({
                         if (childRecords) {
                             return $xeTable.loadTreeChildren(row, childRecords).then(childRows => {
                                 const { treeExpandedMaps } = internalData;
-                                if (childRows.length && !treeExpandedMaps[rowid]) {
+                                if (autoExpand && childRows.length && !treeExpandedMaps[rowid]) {
                                     treeExpandedMaps[rowid] = row;
                                 }
                                 reactData.treeExpandedFlag++;
@@ -19869,7 +19869,7 @@ var VxeTableComponent = defineVxeComponent({
             internalData.tableFullTreeData = isRGroup ? [] : treeData;
             internalData.tableFullGroupData = isRGroup ? treeData : [];
             // 缓存数据
-            $xeTable.cacheRowMap(isReset);
+            $xeTable.cacheRowMap(isReset, true);
             // 原始数据
             internalData.tableSynchData = datas;
             if (isReset) {
@@ -20340,7 +20340,7 @@ var VxeTableComponent = defineVxeComponent({
                             const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
                             // 是否使用懒加载
                             if (isLoad) {
-                                result.push(handleAsyncTreeExpandChilds(row));
+                                result.push(handleAsyncTreeExpandChilds(row, true));
                             }
                             else {
                                 if (row[childrenField] && row[childrenField].length) {
@@ -21331,7 +21331,7 @@ var VxeTableComponent = defineVxeComponent({
                     if (reDelFlag) {
                         reactData.removeRowFlag++;
                         $xeTable.updateFooter();
-                        $xeTable.cacheRowMap(false);
+                        $xeTable.cacheRowMap(false, true);
                         $xeTable.handleTableData(treeConfig && transform);
                         if (!(treeConfig && transform)) {
                             $xeTable.updateAfterDataIndex();
@@ -23569,7 +23569,7 @@ var VxeTableComponent = defineVxeComponent({
              * 重新懒加载树节点，并展开该节点
              * @param {Row} row 行对象
              */
-            reloadTreeExpand(row) {
+            reloadTreeExpand(row, autoExpand = true) {
                 const { treeExpandLazyLoadedMaps } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
@@ -23577,7 +23577,7 @@ var VxeTableComponent = defineVxeComponent({
                 const rowid = getRowid($xeTable, row);
                 if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
                     return $xeTable.clearTreeExpandLoaded(row).then(() => {
-                        return handleAsyncTreeExpandChilds(row);
+                        return handleAsyncTreeExpandChilds(row, autoExpand);
                     }).then(() => {
                         if (transform) {
                             handleVirtualTreeToList();
@@ -25467,7 +25467,7 @@ var VxeTableComponent = defineVxeComponent({
             internalData.insertRowMaps = iRowMaps;
             internalData.removeRowMaps = rRowMaps;
             internalData.afterFullData = afterFullList;
-            $xeTable.cacheRowMap(false);
+            $xeTable.cacheRowMap(false, false);
             $xeTable.handleTableData(treeConfig && transform);
             $xeTable.updateFooter();
             $xeTable.handleUpdateBodyMerge();
@@ -25695,7 +25695,7 @@ var VxeTableComponent = defineVxeComponent({
             /**
              * 更新数据行的 Map
              */
-            cacheRowMap(isReset) {
+            cacheRowMap(isReset, isReLoaded) {
                 const { treeConfig } = props;
                 const { isRowGroupStatus } = reactData;
                 const { currKeyField, fullAllDataRowIdData, tableFullData, tableFullTreeData, tableFullGroupData, treeExpandedMaps, rowExpandedMaps, selectCheckboxMaps } = internalData;
@@ -25714,8 +25714,10 @@ var VxeTableComponent = defineVxeComponent({
                         fullDataRowIdMaps[rowid] = rowRest;
                         fullAllDataRowIdMaps[rowid] = rowRest;
                     }
-                    rowRest.treeLoaded = false;
-                    rowRest.expandLoaded = false;
+                    if (isReset || isReLoaded) {
+                        rowRest.treeLoaded = false;
+                        rowRest.expandLoaded = false;
+                    }
                     rowRest._seq = rowNum++;
                     rowRest.row = row;
                     rowRest.items = items;
@@ -27749,7 +27751,7 @@ var VxeTableComponent = defineVxeComponent({
                         }
                         $xeTable.handleClearStack();
                         $xeTable.handleTableData(treeConfig && transform);
-                        $xeTable.cacheRowMap(false);
+                        $xeTable.cacheRowMap(false, false);
                         updateScrollYStatus();
                         if (!(treeConfig && transform)) {
                             $xeTable.updateAfterDataIndex();
@@ -28106,31 +28108,62 @@ var VxeTableComponent = defineVxeComponent({
                 const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
                 const { prevDragRow, prevDragPos } = internalData;
                 const rowDragOpts = computeRowDragOpts.value;
-                const { isCrossTableDrag } = rowDragOpts;
+                const { isCrossDrag, isCrossTableDrag, isAutoExpandToChild, isAutoLazyLoadToChild } = rowDragOpts;
+                const childrenField = treeOpts.children || treeOpts.childrenField;
                 // 跨表拖拽
-                if (isCrossTableDrag && crossTableDragRowObj) {
+                if (isCrossTableDrag && (!treeConfig || isCrossDrag) && crossTableDragRowObj) {
                     const { $newTable } = crossTableDragRowObj;
                     if ($newTable && $newTable.xID !== $xeTable.xID) {
                         $newTable.handleCrossTableRowDragInsertEvent(evnt);
                         return;
                     }
                 }
-                if (treeConfig && lazy && prevDragToChild) {
+                if (treeConfig && prevDragToChild) {
                     // 懒加载
-                    const newRowid = getRowid($xeTable, prevDragRow);
-                    const rowRest = fullAllDataRowIdData[newRowid];
-                    if (prevDragRow[hasChildField]) {
-                        if (rowRest && rowRest.treeLoaded) {
+                    const prevRowid = getRowid($xeTable, prevDragRow);
+                    const rowRest = fullAllDataRowIdData[prevRowid];
+                    if (!rowRest) {
+                        handleRowDragEndClearStatus();
+                        return;
+                    }
+                    const hasLazyChilds = prevDragRow[hasChildField];
+                    const rowChilds = prevDragRow[childrenField];
+                    // 如果懒加载节点未被加载
+                    if (isAutoExpandToChild) {
+                        // 判断目标节点是否有树子级
+                        if ((lazy && hasLazyChilds) || (rowChilds && rowChilds.length)) {
+                            hideDropTip();
+                            $xeTable.setTreeExpand(prevDragRow, true).then(() => {
+                                $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                            });
+                            return;
+                        }
+                        $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild).then(() => {
+                            if (!$xeTable.isTreeExpandByRow(prevDragRow)) {
+                                $xeTable.setTreeExpand(prevDragRow, true);
+                            }
+                        });
+                        return;
+                    }
+                    // 如果是懒加载节点。只加载不自动展开
+                    if ((lazy && hasLazyChilds) && isAutoLazyLoadToChild) {
+                        if (rowChilds && rowChilds.length) {
                             $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                            return;
                         }
+                        hideDropTip();
+                        $xeTable.reloadTreeExpand(prevDragRow, false).then(() => {
+                            $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                        });
+                        return;
                     }
-                    else {
-                        $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+                    // 懒加载的行默认需要先展开过后才允许拖拽，除非启用 isAutoExpandToChild | isAutoLazyLoadToChild
+                    if (lazy && hasLazyChilds && !rowRest.treeLoaded) {
+                        handleRowDragEndClearStatus();
+                        return;
                     }
                 }
-                else {
-                    $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
-                }
+                $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
             },
             handleRowDragDragoverEvent(evnt) {
                 const { treeConfig } = props;
@@ -28140,7 +28173,7 @@ var VxeTableComponent = defineVxeComponent({
                 const { lazy, transform, parentField } = treeOpts;
                 const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
                 const rowDragOpts = computeRowDragOpts.value;
-                const { isPeerDrag, isCrossDrag, isToChildDrag, isCrossTableDrag } = rowDragOpts;
+                const { isPeerDrag, isCrossDrag, isToChildDrag, isCrossTableDrag, isAutoLazyLoadToChild, isAutoExpandToChild } = rowDragOpts;
                 if (!dragRow && !(isCrossTableDrag && (!treeConfig || isCrossDrag) && crossTableDragRowObj)) {
                     evnt.preventDefault();
                     return;
@@ -28184,7 +28217,7 @@ var VxeTableComponent = defineVxeComponent({
                         }
                     }
                     if ($xeTable.eqRow(dragRow, row) ||
-                        (isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded) ||
+                        (isControlKey && treeConfig && lazy && row[hasChildField] && (rowRest && !rowRest.treeLoaded) && !isAutoLazyLoadToChild && !isAutoExpandToChild) ||
                         (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rowRest.level))) {
                         showDropTip(evnt, trEl, null, false, dragPos);
                         return;