vxe-table 4.8.7 → 4.8.8

package/lib/table/src/table.js

@@ -6306,6 +6306,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
         });
       }
     };
+    const updateRowDropOrigin = row => {
+      const el = refElem.value;
+      if (el) {
+        const clss = 'row--drag-origin';
+        const rowid = (0, _util.getRowid)($xeTable, row);
+        _xeUtils.default.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), elem => {
+          (0, _dom.addClass)(elem, clss);
+        });
+      }
+    };
     const clearRowDropTarget = () => {
       const el = refElem.value;
       if (el) {
@@ -6315,6 +6325,17 @@ var _default = exports.default = (0, _vue.defineComponent)({
         });
       }
     };
+    const updateRowDropTarget = (row, dragPos) => {
+      const el = refElem.value;
+      if (el) {
+        const clss = 'row--drag-active-target';
+        const rowid = (0, _util.getRowid)($xeTable, row);
+        _xeUtils.default.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), elem => {
+          (0, _dom.addClass)(elem, clss);
+          elem.setAttribute('drag-pos', dragPos);
+        });
+      }
+    };
     const showRowDropTip = evnt => {
       const rdTipEl = refRowDragTipElem.value;
       if (!rdTipEl) {
@@ -7698,7 +7719,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = reactData;
         const {
           afterFullData,
+          afterTreeFullData,
           tableFullData,
+          tableFullTreeData,
           prevDragRow,
           prevDragPos
         } = internalData;
@@ -7713,18 +7736,35 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 return;
               }
               const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
-              // 移出源位置
-              const oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
-              const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
-              afterFullData.splice(oafIndex, 1);
-              tableFullData.splice(otfIndex, 1);
-              // 插新位置
-              const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
-              const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
-              const nafIndex = pafIndex + dragOffsetIndex;
-              const ntfIndex = ptfIndex + dragOffsetIndex;
-              afterFullData.splice(nafIndex, 0, dragRow);
-              tableFullData.splice(ntfIndex, 0, dragRow);
+              let oafIndex = -1;
+              let nafIndex = -1;
+              if (treeConfig) {
+                // 移出源位置
+                oafIndex = $xeTable.findRowIndexOf(afterTreeFullData, dragRow);
+                const otfIndex = $xeTable.findRowIndexOf(tableFullTreeData, dragRow);
+                afterTreeFullData.splice(oafIndex, 1);
+                tableFullTreeData.splice(otfIndex, 1);
+                // 插新位置
+                const pafIndex = $xeTable.findRowIndexOf(afterTreeFullData, prevDragRow);
+                const ptfIndex = $xeTable.findRowIndexOf(tableFullTreeData, prevDragRow);
+                nafIndex = pafIndex + dragOffsetIndex;
+                const ntfIndex = ptfIndex + dragOffsetIndex;
+                afterTreeFullData.splice(nafIndex, 0, dragRow);
+                tableFullTreeData.splice(ntfIndex, 0, dragRow);
+              } else {
+                // 移出源位置
+                oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
+                const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
+                afterFullData.splice(oafIndex, 1);
+                tableFullData.splice(otfIndex, 1);
+                // 插新位置
+                const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
+                const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
+                nafIndex = pafIndex + dragOffsetIndex;
+                const ntfIndex = ptfIndex + dragOffsetIndex;
+                afterFullData.splice(nafIndex, 0, dragRow);
+                tableFullData.splice(ntfIndex, 0, dragRow);
+              }
               reactData.isDragRowMove = true;
               $xeTable.cacheRowMap();
               $xeTable.updateScrollYStatus();
@@ -7773,8 +7813,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           } = reactData;
           const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
           const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-          (0, _dom.addClass)(trEl, 'row--drag-active-target');
-          trEl.setAttribute('drag-pos', dragPos);
+          updateRowDropTarget(row, dragPos);
           internalData.prevDragRow = row;
           internalData.prevDragPos = dragPos;
           dispatchEvent('row-dragover', {
@@ -7808,7 +7847,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         reactData.dragRow = row;
         trEl.draggable = true;
-        (0, _dom.addClass)(trEl, 'row--drag-origin');
+        updateRowDropOrigin(row);
         showRowDropTip(evnt);
         updateRowDropTipContent(tdEl);
         dispatchEvent('row-dragstart', params, evnt);