diff --git a/package.json b/package.json index 205a8a122e..f316bb3cf4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table", - "version": "4.10.8", + "version": "4.10.9", "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.3.80" + "vxe-pc-ui": "^4.3.81" }, "devDependencies": { "@types/resize-observer-browser": "^0.1.11", diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts index ce5a88ccf5..76efd80d0d 100644 --- a/packages/table/src/table.ts +++ b/packages/table/src/table.ts @@ -9200,7 +9200,7 @@ export default defineComponent({ } const renderDragTip = () => { - const { dragRow } = reactData + const { dragRow, dragCol } = reactData const rowOpts = computeRowOpts.value const columnOpts = computeColumnOpts.value const rowDragOpts = computeRowDragOpts.value @@ -9222,31 +9222,33 @@ export default defineComponent({ 'is--guides': columnDragOpts.showGuidesStatus }] }), - h('div', { - ref: refDragTipElem, - class: 'vxe-table--drag-sort-tip' - }, [ - h('div', { - class: 'vxe-table--drag-sort-tip-wrapper' + (dragRow && rowDragOpts.showDragTip) || (dragCol && columnDragOpts.showDragTip) + ? h('div', { + ref: refDragTipElem, + class: 'vxe-table--drag-sort-tip' }, [ h('div', { - class: 'vxe-table--drag-sort-tip-status' + class: 'vxe-table--drag-sort-tip-wrapper' }, [ - h('span', { - class: ['vxe-table--drag-sort-tip-normal-status', dragRow ? getIcon().TABLE_DRAG_STATUS_ROW : getIcon().TABLE_DRAG_STATUS_COLUMN] - }), - h('span', { - class: ['vxe-table--drag-sort-tip-sub-status', getIcon().TABLE_DRAG_STATUS_SUB_ROW] - }), - h('span', { - class: ['vxe-table--drag-sort-tip-disabled-status', getIcon().TABLE_DRAG_DISABLED] - }) - ]), - h('div', { - class: 'vxe-table--drag-sort-tip-content' - }, renderDragTipContents()) + h('div', { + class: 'vxe-table--drag-sort-tip-status' + }, [ + h('span', { + class: ['vxe-table--drag-sort-tip-normal-status', dragRow ? getIcon().TABLE_DRAG_STATUS_ROW : getIcon().TABLE_DRAG_STATUS_COLUMN] + }), + h('span', { + class: ['vxe-table--drag-sort-tip-sub-status', getIcon().TABLE_DRAG_STATUS_SUB_ROW] + }), + h('span', { + class: ['vxe-table--drag-sort-tip-disabled-status', getIcon().TABLE_DRAG_DISABLED] + }) + ]), + h('div', { + class: 'vxe-table--drag-sort-tip-content' + }, renderDragTipContents()) + ]) ]) - ]) + : renderEmptyElement($xeTable) ]) } return renderEmptyElement($xeTable) diff --git a/packages/ui/index.ts b/packages/ui/index.ts index 8fcbfff89f..5626d8840f 100644 --- a/packages/ui/index.ts +++ b/packages/ui/index.ts @@ -52,12 +52,14 @@ VxeUI.setConfig({ rowDragConfig: { showIcon: true, animation: true, - showGuidesStatus: true + showGuidesStatus: true, + showDragTip: true }, columnDragConfig: { showIcon: true, animation: true, - showGuidesStatus: true + showGuidesStatus: true, + showDragTip: true }, checkboxConfig: { // trigger: 'default',