vxe-table 3.12.11 → 3.12.13

package/es/table/src/table.js

@@ -115,7 +115,7 @@ const renderDragTipContents = (h, $xeTable) => {
 };
 const renderDragTip = (h, $xeTable) => {
     const reactData = $xeTable;
-    const { dragRow } = reactData;
+    const { dragRow, dragCol } = reactData;
     const rowOpts = $xeTable.computeRowOpts;
     const columnOpts = $xeTable.computeColumnOpts;
     const rowDragOpts = $xeTable.computeRowDragOpts;
@@ -136,31 +136,33 @@ const renderDragTip = (h, $xeTable) => {
                         '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, $xeTable))
+                        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(h, $xeTable))
+                    ])
                 ])
-            ])
+                : renderEmptyElement($xeTable)
         ]);
     }
     return renderEmptyElement($xeTable);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.12.11";
+export const version = "3.12.13";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -47,12 +47,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',

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.12.11"}`;
+const version = `table v${"3.12.13"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.11";
+const version = "3.12.13";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2267,12 +2267,14 @@ core_.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',
@@ -2840,7 +2842,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.11"}`;
+const log_version = `table v${"3.12.13"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -15249,7 +15251,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const rowOpts = $xeTable.computeRowOpts;
   const rowDragOpts = $xeTable.computeRowDragOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
-  const customCellHeight = cellOpts.height || rowOpts.height;
+  const customCellHeight = calcCellHeightFlag ? cellOpts.height || rowOpts.height : 0;
   const {
     disabledMethod: dragDisabledMethod,
     isCrossDrag,
@@ -15434,7 +15436,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     isDirty = $xeTable.isUpdateByRow(row, column.field);
   }
   const isVNAutoHeight = scrollYLoad && !hasEllipsis;
-  const cellHeight = calcCellHeightFlag ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight : defaultRowHeight;
+  const cellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isVNPreEmptyStatus = false;
@@ -24789,7 +24791,8 @@ const renderDragTipContents = (h, $xeTable) => {
 const table_renderDragTip = (h, $xeTable) => {
   const reactData = $xeTable;
   const {
-    dragRow
+    dragRow,
+    dragCol
   } = reactData;
   const rowOpts = $xeTable.computeRowOpts;
   const columnOpts = $xeTable.computeColumnOpts;
@@ -24808,7 +24811,7 @@ const table_renderDragTip = (h, $xeTable) => {
       class: ['vxe-table--drag-col-line', {
         'is--guides': columnDragOpts.showGuidesStatus
       }]
-    }), h('div', {
+    }), dragRow && rowDragOpts.showDragTip || dragCol && columnDragOpts.showDragTip ? h('div', {
       ref: 'refDragTipElem',
       class: 'vxe-table--drag-sort-tip'
     }, [h('div', {
@@ -24823,7 +24826,7 @@ const table_renderDragTip = (h, $xeTable) => {
       class: ['vxe-table--drag-sort-tip-disabled-status', table_getIcon().TABLE_DRAG_DISABLED]
     })]), h('div', {
       class: 'vxe-table--drag-sort-tip-content'
-    }, renderDragTipContents(h, $xeTable))])])]);
+    }, renderDragTipContents(h, $xeTable))])]) : table_renderEmptyElement($xeTable)]);
   }
   return table_renderEmptyElement($xeTable);
 };