vxe-table 4.16.2 → 4.16.4

package/es/table/module/menu/hook.js

@@ -146,6 +146,8 @@ hooks.add('tableMenuModule', {
              * 快捷菜单事件处理
              */
             handleGlobalContextmenuEvent(evnt) {
+                const $xeGrid = $xeTable.xeGrid;
+                const $xeGantt = $xeTable.xeGantt;
                 const { mouseConfig, menuConfig } = props;
                 const { editStore, ctxMenuStore } = reactData;
                 const { visibleColumn } = internalData;
@@ -163,7 +165,7 @@ hooks.add('tableMenuModule', {
                     }
                     if (internalData._keyCtx) {
                         const type = 'body';
-                        const params = { type, $table: $xeTable, keyboard: true, columns: visibleColumn.slice(0), $event: evnt };
+                        const params = { type, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, keyboard: true, columns: visibleColumn.slice(0), $event: evnt };
                         // 如果开启单元格区域
                         if (mouseConfig && mouseOpts.area) {
                             const activeArea = $xeTable.getActiveCellArea();
@@ -191,7 +193,7 @@ hooks.add('tableMenuModule', {
                             // target=td|th，直接向上找 table 去匹配即可
                             return target.parentNode.parentNode.parentNode.getAttribute('xid') === xID;
                         });
-                        const params = { type: layout, $table: $xeTable, columns: visibleColumn.slice(0), $event: evnt };
+                        const params = { type: layout, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, columns: visibleColumn.slice(0), $event: evnt };
                         if (columnTargetNode.flag) {
                             const cell = columnTargetNode.targetElem;
                             const columnNodeRest = $xeTable.getColumnNode(cell);

package/es/table/render/index.js

@@ -295,7 +295,7 @@ function nativeEditRender(renderOpts, params) {
     const { name } = renderOpts;
     const cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value;
     return [
-        h(name, Object.assign(Object.assign(Object.assign({ class: `vxe-default-${name}` }, getNativeAttrs(renderOpts)), { value: cellValue }), getNativeEditOns(renderOpts, params)))
+        h(`${name}`, Object.assign(Object.assign(Object.assign({ class: `vxe-default-${name}` }, getNativeAttrs(renderOpts)), { value: cellValue }), getNativeEditOns(renderOpts, params)))
     ];
 }
 function buttonCellRender(renderOpts, params) {
@@ -350,7 +350,8 @@ function oldButtonEditRender(renderOpts, params) {
  * @deprecated
  */
 function oldButtonsEditRender(renderOpts, params) {
-    return renderOpts.children.map((childRenderOpts) => oldButtonEditRender(childRenderOpts, params)[0]);
+    const { children } = renderOpts;
+    return children ? children.map((childRenderOpts) => oldButtonEditRender(childRenderOpts, params)[0]) : [];
 }
 function renderNativeOptgroups(renderOpts, params, renderOptionsMethods) {
     const { optionGroups, optionGroupProps = {} } = renderOpts;
@@ -394,7 +395,7 @@ function nativeFilterRender(renderOpts, params) {
     const { name } = renderOpts;
     const attrs = getNativeAttrs(renderOpts);
     return column.filters.map((option, oIndex) => {
-        return h(name, Object.assign(Object.assign(Object.assign({ key: oIndex, class: `vxe-default-${name}` }, attrs), { value: option.data }), getNativeFilterOns(renderOpts, params, option)));
+        return h(`${name}`, Object.assign(Object.assign(Object.assign({ key: oIndex, class: `vxe-default-${name}` }, attrs), { value: option.data }), getNativeFilterOns(renderOpts, params, option)));
     });
 }
 function defaultFilterRender(renderOpts, params) {

package/es/table/src/body.js

@@ -167,15 +167,14 @@ export default defineVxeComponent({
             // hover 进入事件
             if (showTitle || showTooltip || showAllTip || tooltipConfig) {
                 tdOns.onMouseenter = (evnt) => {
-                    if (isVMScrollProcess()) {
-                        return;
-                    }
-                    if (showTitle) {
-                        updateCellTitle(evnt.currentTarget, column);
-                    }
-                    else if (showTooltip || showAllTip) {
-                        // 如果配置了显示 tooltip
-                        $xeTable.triggerBodyTooltipEvent(evnt, cellParams);
+                    if (!isVMScrollProcess()) {
+                        if (showTitle) {
+                            updateCellTitle(evnt.currentTarget, column);
+                        }
+                        else if (showTooltip || showAllTip) {
+                            // 如果配置了显示 tooltip
+                            $xeTable.triggerBodyTooltipEvent(evnt, cellParams);
+                        }
                     }
                     $xeTable.dispatchEvent('cell-mouseenter', Object.assign({ cell: evnt.currentTarget }, cellParams), evnt);
                 };
@@ -183,11 +182,10 @@ export default defineVxeComponent({
             // hover 退出事件
             if (showTooltip || showAllTip || tooltipConfig) {
                 tdOns.onMouseleave = (evnt) => {
-                    if (isVMScrollProcess()) {
-                        return;
-                    }
-                    if (showTooltip || showAllTip) {
-                        $xeTable.handleTargetLeaveEvent(evnt);
+                    if (!isVMScrollProcess()) {
+                        if (showTooltip || showAllTip) {
+                            $xeTable.handleTargetLeaveEvent(evnt);
+                        }
                     }
                     $xeTable.dispatchEvent('cell-mouseleave', Object.assign({ cell: evnt.currentTarget }, cellParams), evnt);
                 };

package/es/table/src/table.js

@@ -10148,11 +10148,20 @@ export default defineVxeComponent({
                 const rowDragOpts = computeRowDragOpts.value;
                 const { isCrossTableDrag } = rowDragOpts;
                 if (isCrossTableDrag && crossTableDragRowObj && !tableData.length) {
-                    const { $oldTable } = crossTableDragRowObj;
-                    if ($oldTable && $oldTable.xID !== $xeTable.xID) {
-                        evnt.preventDefault();
-                        crossTableDragRowObj.$newTable = $xeTable;
-                        internalData.prevDragRow = null;
+                    const { $oldTable, $newTable } = crossTableDragRowObj;
+                    if ($oldTable) {
+                        const oldTableReactData = $oldTable.reactData;
+                        if ($oldTable.xID !== $xeTable.xID) {
+                            if ($newTable && $newTable.xID !== $xeTable.xID) {
+                                $newTable.hideCrossTableRowDropClearStatus();
+                            }
+                            evnt.preventDefault();
+                            $oldTable.hideCrossTableRowDropClearStatus();
+                            crossTableDragRowObj.$newTable = $xeTable;
+                            internalData.prevDragRow = null;
+                            reactData.dragTipText = oldTableReactData.dragTipText;
+                            showDropTip(evnt, evnt.currentTarget, null, true, '');
+                        }
                     }
                 }
             },
@@ -10370,6 +10379,9 @@ export default defineVxeComponent({
                                 crossTableDragRowObj.$newTable = null;
                             }
                             else {
+                                if ($newTable && $newTable.xID !== $xeTable.xID) {
+                                    $newTable.hideCrossTableRowDropClearStatus();
+                                }
                                 $oldTable.hideCrossTableRowDropClearStatus();
                                 oldTableReactData.isCrossDragRow = true;
                                 reactData.dragTipText = oldTableReactData.dragTipText;
@@ -12032,13 +12044,13 @@ export default defineVxeComponent({
             const scrollbarXToTop = computeScrollbarXToTop.value;
             const scrollbarYToLeft = computeScrollbarYToLeft.value;
             const { isCrossTableDrag } = rowDragOpts;
-            const rwOns = {};
+            const tbOns = {
+                onKeydown: keydownEvent
+            };
             if (isCrossTableDrag && !tableData.length) {
-                rwOns.onDragover = $xeTable.handleCrossTableRowDragoverEmptyEvent;
+                tbOns.onDragover = $xeTable.handleCrossTableRowDragoverEmptyEvent;
             }
-            return h('div', {
-                ref: refElem,
-                class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`, `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`, {
+            return h('div', Object.assign({ ref: refElem, class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`, `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`, {
                         [`size--${vSize}`]: vSize,
                         [`valid-msg--${validOpts.msgMode}`]: !!editRules,
                         'vxe-editable': !!editConfig,
@@ -12068,10 +12080,7 @@ export default defineVxeComponent({
                         'is--scroll-x': overflowX,
                         'is--virtual-x': scrollXLoad,
                         'is--virtual-y': scrollYLoad
-                    }],
-                spellcheck: false,
-                onKeydown: keydownEvent
-            }, [
+                    }], spellcheck: false }, tbOns), [
                 /**
                  * 隐藏列
                  */
@@ -12095,7 +12104,10 @@ export default defineVxeComponent({
                         class: 'vxe-table-var-mini'
                     })
                 ]),
-                h('div', Object.assign({ key: 'tw', class: 'vxe-table--render-wrapper' }, rwOns), scrollbarXToTop
+                h('div', {
+                    key: 'tw',
+                    class: 'vxe-table--render-wrapper'
+                }, scrollbarXToTop
                     ? [
                         renderScrollX(),
                         renderBody()

package/es/table/style.css

@@ -2394,10 +2394,6 @@
 .vxe-header--column .vxe-cell-title-suffix-icon {
   padding: 0.2em;
 }
-.vxe-header--column .vxe-cell-title-prefix-icon,
-.vxe-header--column .vxe-cell-title-suffix-icon {
-  cursor: help;
-}
 .vxe-header--column .vxe-cell-title-prefix-icon.theme--primary,
 .vxe-header--column .vxe-cell-title-suffix-icon.theme--primary {
   color: var(--vxe-ui-font-primary-color);