releases 4.2.43

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.8.1",
+  "version": "4.8.2",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^4.2.42"
+    "vxe-pc-ui": "^4.2.43"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

packages/table/src/cell.ts

@@ -48,11 +48,19 @@ function renderTitleSuffixIcon (params: VxeTableDefines.CellRenderHeaderParams)
 
 function renderCellDragIcon (params: VxeTableDefines.CellRenderBodyParams) {
   const { $table } = params
+  const { computeDragOpts } = $table.getComputeMaps()
+  const dragOpts = computeDragOpts.value
+  const { rowDisabledMethod } = dragOpts
+  const isDisabled = rowDisabledMethod && rowDisabledMethod(params)
   return h('span', {
     key: 'dg',
-    class: 'vxe-cell--drag-handle',
+    class: ['vxe-cell--drag-handle', {
+      'is--disabled': isDisabled
+    }],
     onMousedown (evnt) {
-      $table.handleCellDragMousedownEvent(evnt, params)
+      if (!isDisabled) {
+        $table.handleCellDragMousedownEvent(evnt, params)
+      }
     },
     onMouseup: $table.handleCellDragMouseupEvent
   }, [
@@ -69,7 +77,8 @@ function renderCellBaseVNs (params: VxeTableDefines.CellRenderBodyParams, conten
   const { computeRowOpts, computeDragOpts } = $table.getComputeMaps()
   const rowOpts = computeRowOpts.value
   const dragOpts = computeDragOpts.value
-  if (dragSort && rowOpts.drag && dragOpts.showIcon) {
+  const { showRowIcon, rowVisibleMethod } = dragOpts
+  if (dragSort && rowOpts.drag && (showRowIcon && (!rowVisibleMethod || rowVisibleMethod(params)))) {
     vns.unshift(
       renderCellDragIcon(params)
     )
@@ -939,14 +948,14 @@ export const Cell = {
       return []
     }
     if (defaultSlot) {
-      return $table.callSlot(defaultSlot, cellParams)
+      return renderCellBaseVNs(params, $table.callSlot(defaultSlot, cellParams))
     }
     if (formatter) {
-      return [
+      return renderCellBaseVNs(params, [
         h('span', {
           class: 'vxe-cell--label'
         }, getDefaultCellLabel(cellParams))
-      ]
+      ])
     }
     return Cell.renderDefaultCell(cellParams)
   }

packages/table/src/table.ts

@@ -6642,8 +6642,8 @@ export default defineComponent({
       },
       handleRowDragDragendEvent (evnt) {
         const { treeConfig } = props
-        const rowOpts = computeRowOpts.value
-        const { dragEndMethod } = rowOpts
+        const dragOpts = computeDragOpts.value
+        const { dragEndMethod } = dragOpts
         const treeOpts = computeTreeOpts.value
         const { transform } = treeOpts
         const { dragRow } = reactData
@@ -6739,8 +6739,8 @@ export default defineComponent({
       },
       handleCellDragMousedownEvent (evnt, params) {
         evnt.stopPropagation()
-        const rowOpts = computeRowOpts.value
-        const { dragStartMethod } = rowOpts
+        const dragOpts = computeDragOpts.value
+        const { dragStartMethod } = dragOpts
         const { row } = params
         const dragEl = evnt.currentTarget as HTMLElement
         const tdEl = dragEl.parentNode?.parentNode as HTMLElement

packages/ui/index.ts

@@ -44,7 +44,7 @@ VxeUI.setConfig({
       strict: true
     },
     dragConfig: {
-      showIcon: true
+      showRowIcon: true
     },
     checkboxConfig: {
       // trigger: 'default',

styles/components/table-module/custom.scss

@@ -299,6 +299,11 @@
 }
 
 .vxe-table-custom-popup--row {
+  &.active--drag-origin {
+    .vxe-table-custom-popup--column-item {
+      opacity: 0.5;
+    }
+  }
   &.active--drag-target {
     &[drag-pos="top"] {
       .vxe-table-custom-popup--column-item {