vxe-table 3.10.7 → 3.10.8

package/packages/table/src/cell.ts

@@ -74,16 +74,20 @@ function renderCellDragIcon (h: CreateElement, params: any) {
 }
 
 function renderCellBaseVNs (h: CreateElement, params: any, content: any) {
-  const { $table, column, row } = params
+  const { $table, column, row, level } = params
   const { dragSort } = column
-  const vns: any[] = XEUtils.isArray(content) ? content : [content]
+  const tableProps = $table
+  const { treeConfig } = tableProps
   const rowOpts = $table.computeRowOpts
   const dragOpts = $table.computeDragOpts
   const { showRowIcon, rowVisibleMethod } = dragOpts
+  const vns: any[] = XEUtils.isArray(content) ? content : [content]
   if (dragSort && rowOpts.drag && (showRowIcon && (!rowVisibleMethod || rowVisibleMethod({ row, column })))) {
-    vns.unshift(
-      renderCellDragIcon(h, params)
-    )
+    if (!treeConfig || !level) {
+      vns.unshift(
+        renderCellDragIcon(h, params)
+      )
+    }
   }
   return vns
 }

package/packages/table/src/header.ts

@@ -56,7 +56,7 @@ export default {
   },
   render (h: CreateElement) {
     const { _e, $parent: $xetable, fixedType, headerColumn, tableColumn, fixedColumn } = this
-    const { $listeners: tableListeners, tId, isGroup, visibleColumn, resizable, border, columnKey, headerRowClassName, headerCellClassName, headerRowStyle, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, highlightCurrentColumn, currentColumn, scrollXLoad, overflowX, scrollbarWidth, sortOpts, mouseConfig, columnOpts } = $xetable
+    const { $listeners: tableListeners, tId, isGroup, visibleColumn, resizable: allResizable, border, columnKey, headerRowClassName, headerCellClassName, headerRowStyle, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, highlightCurrentColumn, currentColumn, scrollXLoad, overflowX, scrollbarWidth, sortOpts, mouseConfig, columnOpts } = $xetable
     let headerGroups = headerColumn
     let renderColumnList = tableColumn
     if (isGroup) {
@@ -188,7 +188,7 @@ export default {
               /**
                * 列宽拖动
                */
-              !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || resizable))
+              !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable))
                 ? h('div', {
                   class: ['vxe-resizable', {
                     'is--line': !border || border === 'none'

package/packages/table/src/methods.ts

@@ -339,6 +339,17 @@ function clearRowDropOrigin ($xeTable: any) {
   }
 }
 
+function updateRowDropOrigin ($xeTable: any, row: any) {
+  const el = $xeTable.$el
+  if (el) {
+    const clss = 'row--drag-origin'
+    const rowid = getRowid($xeTable, row)
+    XEUtils.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), (elem) => {
+      addClass(elem, clss)
+    })
+  }
+}
+
 function clearRowDropTarget ($xeTable: any) {
   const el = $xeTable.$el
   if (el) {
@@ -349,6 +360,18 @@ function clearRowDropTarget ($xeTable: any) {
   }
 }
 
+function updateRowDropTarget ($xeTable: any, row: any, dragPos: string) {
+  const el = $xeTable.$el
+  if (el) {
+    const clss = 'row--drag-active-target'
+    const rowid = getRowid($xeTable, row)
+    XEUtils.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), (elem: any) => {
+      addClass(elem, clss)
+      elem.setAttribute('drag-pos', dragPos)
+    })
+  }
+}
+
 function showRowDropTip (evnt: DragEvent | MouseEvent, $xeTable: any) {
   const rdTipEl = $xeTable.$refs.refRowDragTipElem as HTMLDivElement
   if (!rdTipEl) {
@@ -4588,7 +4611,7 @@ const Methods = {
     const treeOpts = $xeTable.computeTreeOpts
     const { transform } = treeOpts
     const { dragRow } = reactData
-    const { afterFullData, tableFullData, prevDragRow, prevDragPos } = internalData
+    const { afterFullData, afterTreeFullData, tableFullData, tableFullTreeData, prevDragRow, prevDragPos } = internalData
     if (prevDragRow && dragRow) {
       // 判断是否有拖动
       if (prevDragRow !== dragRow) {
@@ -4605,18 +4628,36 @@ const Methods = {
           }
           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()
@@ -4670,8 +4711,7 @@ const Methods = {
       const { dragRow } = reactData
       const offsetY = evnt.clientY - trEl.getBoundingClientRect().y
       const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom'
-      addClass(trEl, 'row--drag-active-target')
-      trEl.setAttribute('drag-pos', dragPos)
+      updateRowDropTarget($xeTable, row, dragPos)
       internalData.prevDragRow = row
       internalData.prevDragPos = dragPos
       $xeTable.dispatchEvent('row-dragover', {
@@ -4703,7 +4743,7 @@ const Methods = {
     }
     reactData.dragRow = row
     trEl.draggable = true
-    addClass(trEl, 'row--drag-origin')
+    updateRowDropOrigin($xeTable, row)
     showRowDropTip(evnt, $xeTable)
     updateRowDropTipContent($xeTable, tdEl)
     $xeTable.dispatchEvent('row-dragstart', params, evnt)