fix(grid): [grid] 修复表格展开状态下拖拽无法正确渲染bug

Author: chenxi-20

packages/vue/src/grid/src/body/src/body.tsx

@@ -564,7 +564,7 @@ function renderRow(args) {
         attrs: {
           'data-rowid': rowid
         },
-        key: rowKey || treeConfig ? rowid : $rowIndex,
+        key: rowid,
         on: trOn
       },
       tableColumn.map((column, $columnIndex) => {
@@ -608,7 +608,7 @@ function renderRowExpanded(args) {
           'tr',
           {
             class: 'tiny-grid-body__expanded-row',
-            key: `expand_${rowid}`,
+            key: `expand_${rowid}${rowIndex}`,
             on: trOn
           },
           [
@@ -897,7 +897,8 @@ export default defineComponent({
   render() {
     let { $parent: $table } = this as any
     let { $grid, isCenterEmpty, keyboardConfig = {}, mouseConfig = {}, renderEmpty } = $table
-    let { scrollLoad, tableColumn, tableData, tableLayout } = $table
+    let { scrollLoad, tableColumn, tableLayout } = $table
+    const tableData = $table.$grid.data || $table.tableData
     let $slots = $grid.slots
     let isCenterCls = isCenterEmpty ? 'is__center' : ''
 

packages/vue/src/grid/src/dragger/src/rowDrop.ts

@@ -59,14 +59,18 @@ export const createHandlerOnEnd = ({ _vm, refresh }) => {
     }
     const options = { children: (_vm.treeConfig || {}).children || 'children' }
     const targetTrElem = event.item
-    const { parentNode: wrapperElem, previousElementSibling: prevTrElem } = targetTrElem
+    const { parentNode: wrapperElem, previousElementSibling } = targetTrElem
+    let prevTrElem = previousElementSibling
     // 这里优先使用用户通过props传递过来的表格数据，所以拖拽后会改变原始数据
     const tableTreeData = _vm.data || _vm.tableData
     const selfRow = _vm.getRowNode(targetTrElem).item
     const selfNode = findTree(tableTreeData, (row) => row === selfRow, options)
     const isScrollYLoad = _vm.scrollYLoad
     if (!isScrollYLoad) {
       if (prevTrElem) {
+        if (prevTrElem.classList.contains('tiny-grid-body__expanded-row')) {
+          prevTrElem = prevTrElem.previousElementSibling
+        }
         // 移动到节点
         const prevRow = _vm.getRowNode(prevTrElem).item
         const prevNode = findTree(tableTreeData, (row) => row === prevRow, options)