vxe-table 3.18.9 → 3.18.10

package/es/table/src/body.js

@@ -828,7 +828,10 @@ export default {
                 }),
                 mouseConfig && mouseOpts.area
                     ? h('div', {
-                        class: 'vxe-table--cell-area'
+                        class: 'vxe-table--cell-area',
+                        attrs: {
+                            xid: xID
+                        }
                     }, [
                         h('span', {
                             class: 'vxe-table--cell-main-area'

package/es/table/src/header.js

@@ -412,7 +412,10 @@ export default {
                 ]),
                 mouseConfig && mouseOpts.area
                     ? h('div', {
-                        class: 'vxe-table--cell-area'
+                        class: 'vxe-table--cell-area',
+                        attrs: {
+                            xid: xID
+                        }
                     }, [
                         h('span', {
                             class: 'vxe-table--cell-main-area'

package/es/table/src/methods.js

@@ -3967,7 +3967,6 @@ const Methods = {
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
         const $xeGantt = $xeTable.$xeGantt;
-        const $xeGGWrapper = $xeGrid || $xeGantt;
         const props = $xeTable;
         const { height } = props;
         const el = $xeTable.$refs.refElem;
@@ -3976,8 +3975,11 @@ const Methods = {
             const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
             let parentWrapperHeight = 0;
             if (parentElem) {
-                if ($xeGGWrapper && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
-                    parentWrapperHeight = $xeGGWrapper.getParentHeight();
+                if ($xeGantt && hasClass(parentElem, 'vxe-gantt--table-wrapper')) {
+                    parentWrapperHeight = $xeGantt.getParentHeight();
+                }
+                else if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+                    parentWrapperHeight = $xeGrid.getParentHeight();
                 }
                 else {
                     parentWrapperHeight = parentElem.clientHeight;
@@ -6443,7 +6445,7 @@ const Methods = {
                 const { mouseConfig, keyboardConfig, treeConfig, editConfig, highlightCurrentRow, highlightCurrentColumn } = props;
                 const { ctxMenuStore, editStore, currentRow } = reactData;
                 const { afterFullData } = internalData;
-                const isMenu = $xeTable.computeIsMenu;
+                const isContentMenu = $xeTable.computeIsContentMenu;
                 const bodyMenu = $xeTable.computeBodyMenu;
                 const keyboardOpts = $xeTable.computeKeyboardOpts;
                 const mouseOpts = $xeTable.computeMouseOpts;
@@ -6470,7 +6472,7 @@ const Methods = {
                 const hasShiftKey = evnt.shiftKey;
                 const hasAltKey = evnt.altKey;
                 const operArrow = isLeftArrow || isUpArrow || isRightArrow || isDwArrow;
-                const operCtxMenu = isMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
+                const operCtxMenu = isContentMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
                 const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;

package/es/table/src/table.js

@@ -1084,9 +1084,12 @@ export default {
             return footerOpts && footerOpts.options ? footerOpts.options : [];
         },
         isCtxMenu() {
-            return this.computeIsMenu;
+            return this.computeIsContentMenu;
         },
         computeIsMenu() {
+            return this.computeIsContentMenu;
+        },
+        computeIsContentMenu() {
             const $xeTable = this;
             const props = $xeTable;
             const menuOpts = $xeTable.computeMenuOpts;
@@ -1888,7 +1891,7 @@ export default {
         const mouseOpts = $xeTable.computeMouseOpts;
         const areaOpts = $xeTable.computeAreaOpts;
         const loadingOpts = $xeTable.computeLoadingOpts;
-        const isMenu = $xeTable.computeIsMenu;
+        const isContentMenu = $xeTable.computeIsContentMenu;
         const currLoading = reactData.isColLoading || reactData.isRowLoading || loading;
         const resizableOpts = $xeTable.computeResizableOpts;
         const isArea = mouseConfig && mouseOpts.area;
@@ -2112,7 +2115,7 @@ export default {
             /**
              * 快捷菜单
              */
-            isMenu
+            isContentMenu
                 ? h(TableMenuPanelComponent, {
                     key: 'tm',
                     ref: 'refTableMenu',

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.18.9";
+export const version = "3.18.10";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.9";
+const version = "3.18.10";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2675,7 +2675,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.9"}`;
+const log_version = `table v${"3.18.10"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -10519,7 +10519,6 @@ const Methods = {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
     const $xeGantt = $xeTable.$xeGantt;
-    const $xeGGWrapper = $xeGrid || $xeGantt;
     const props = $xeTable;
     const {
       height
@@ -10530,8 +10529,10 @@ const Methods = {
       const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
       let parentWrapperHeight = 0;
       if (parentElem) {
-        if ($xeGGWrapper && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
-          parentWrapperHeight = $xeGGWrapper.getParentHeight();
+        if ($xeGantt && hasClass(parentElem, 'vxe-gantt--table-wrapper')) {
+          parentWrapperHeight = $xeGantt.getParentHeight();
+        } else if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+          parentWrapperHeight = $xeGrid.getParentHeight();
         } else {
           parentWrapperHeight = parentElem.clientHeight;
         }
@@ -13374,7 +13375,7 @@ const Methods = {
         const {
           afterFullData
         } = internalData;
-        const isMenu = $xeTable.computeIsMenu;
+        const isContentMenu = $xeTable.computeIsContentMenu;
         const bodyMenu = $xeTable.computeBodyMenu;
         const keyboardOpts = $xeTable.computeKeyboardOpts;
         const mouseOpts = $xeTable.computeMouseOpts;
@@ -13406,7 +13407,7 @@ const Methods = {
         const hasShiftKey = evnt.shiftKey;
         const hasAltKey = evnt.altKey;
         const operArrow = isLeftArrow || isUpArrow || isRightArrow || isDwArrow;
-        const operCtxMenu = isMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
+        const operCtxMenu = isContentMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
         const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
@@ -20351,7 +20352,10 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     }, renderRows(h, this, fixedType, isOptimizeMode, renderDataList, renderColumnList))]), h('div', {
       class: 'vxe-table--checkbox-range'
     }), mouseConfig && mouseOpts.area ? h('div', {
-      class: 'vxe-table--cell-area'
+      class: 'vxe-table--cell-area',
+      attrs: {
+        xid: xID
+      }
     }, [h('span', {
       class: 'vxe-table--cell-main-area'
     }, mouseOpts.extension ? [h('span', {
@@ -20865,7 +20869,10 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     h('thead', {
       ref: 'refHeaderTHead'
     }, renderHeads(h, _vm, isGroup, isOptimizeMode, renderHeaderList))]), mouseConfig && mouseOpts.area ? h('div', {
-      class: 'vxe-table--cell-area'
+      class: 'vxe-table--cell-area',
+      attrs: {
+        xid: xID
+      }
     }, [h('span', {
       class: 'vxe-table--cell-main-area'
     }), h('span', {
@@ -24432,7 +24439,7 @@ const {
       const {
         ctxMenuStore
       } = reactData;
-      const isMenu = $xeTable.computeIsMenu;
+      const isContentMenu = $xeTable.computeIsContentMenu;
       const menuOpts = $xeTable.computeMenuOpts;
       const config = menuOpts[type];
       const visibleMethod = menuOpts.visibleMethod;
@@ -24443,7 +24450,7 @@ const {
         } = config;
         if (disabled) {
           evnt.preventDefault();
-        } else if (isMenu && options && options.length) {
+        } else if (isContentMenu && options && options.length) {
           params.options = options;
           $xeTable.preventEvent(evnt, 'event.showMenu', params, () => {
             if (!visibleMethod || visibleMethod(params)) {
@@ -30670,9 +30677,12 @@ function renderBody(h, $xeTable) {
       return footerOpts && footerOpts.options ? footerOpts.options : [];
     },
     isCtxMenu() {
-      return this.computeIsMenu;
+      return this.computeIsContentMenu;
     },
     computeIsMenu() {
+      return this.computeIsContentMenu;
+    },
+    computeIsContentMenu() {
       const $xeTable = this;
       const props = $xeTable;
       const menuOpts = $xeTable.computeMenuOpts;
@@ -31580,7 +31590,7 @@ function renderBody(h, $xeTable) {
     const mouseOpts = $xeTable.computeMouseOpts;
     const areaOpts = $xeTable.computeAreaOpts;
     const loadingOpts = $xeTable.computeLoadingOpts;
-    const isMenu = $xeTable.computeIsMenu;
+    const isContentMenu = $xeTable.computeIsContentMenu;
     const currLoading = reactData.isColLoading || reactData.isRowLoading || loading;
     const resizableOpts = $xeTable.computeResizableOpts;
     const isArea = mouseConfig && mouseOpts.area;
@@ -31773,7 +31783,7 @@ function renderBody(h, $xeTable) {
     /**
      * 快捷菜单
      */
-    isMenu ? h(menu_panel, {
+    isContentMenu ? h(menu_panel, {
       key: 'tm',
       ref: 'refTableMenu',
       props: {