vxe-table 3.19.1 → 3.19.3

package/es/table/module/custom/panel.js

@@ -953,6 +953,7 @@ export default {
             $xeTable.saveCustom();
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('confirm', $event);
+            $xeTable.emitCustomEvent('close', $event);
         },
         cancelCloseEvent({ $event }) {
             const $xeTableCustomPanel = this;
@@ -966,6 +967,7 @@ export default {
             $xeTable.cancelCustom();
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('cancel', $event);
+            $xeTable.emitCustomEvent('close', $event);
         },
         handleResetCustomEvent(evnt) {
             const $xeTableCustomPanel = this;
@@ -973,6 +975,7 @@ export default {
             $xeTable.resetCustom(true);
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('reset', evnt);
+            $xeTable.emitCustomEvent('close', evnt);
         },
         resetCustomEvent(evnt) {
             if (VxeUI.modal) {

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

@@ -163,6 +163,9 @@ export default {
          */
         handleOpenMenuEvent(evnt, type, params) {
             const $xeTable = this;
+            const $xeGrid = $xeTable.$xeGrid;
+            const $xeGantt = $xeTable.$xeGantt;
+            const $xeGGWrapper = $xeGrid || $xeGantt;
             const reactData = $xeTable;
             const internalData = $xeTable;
             const { ctxMenuStore } = reactData;
@@ -181,7 +184,7 @@ export default {
                         if (!visibleMethod || visibleMethod(params)) {
                             evnt.preventDefault();
                             $xeTable.updateZindex();
-                            const el = $xeTable.$refs.refElem;
+                            const el = $xeGGWrapper ? $xeGGWrapper.$refs.refElem : $xeTable.$refs.refElem;
                             const tableRect = el.getBoundingClientRect();
                             const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
                             let top = evnt.clientY - tableRect.y;

package/es/table/src/cell.js

@@ -370,9 +370,8 @@ export const Cell = {
         const tableInternalData = $table;
         const { isRowGroupStatus } = tableReactData;
         const { editConfig } = tableProps;
-        const editOpts = $table.computeEditOpts;
-        const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column;
-        const renderOpts = editConfig && isEnableConf(editOpts) && editRender ? editRender : cellRender;
+        const { field, slots, editRender, cellRender, rowGroupNode, aggFunc, formatter } = column;
+        const renderOpts = editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null);
         const defaultSlot = slots ? slots.default : null;
         const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null;
         let cellValue = '';
@@ -433,7 +432,8 @@ export const Cell = {
             if (defaultSlot) {
                 return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h));
             }
-            if (renderOpts) {
+            // formatter > (renderTableCell | renderTableDefault)
+            if (renderOpts && !formatter) {
                 const compConf = renderer.get(renderOpts.name);
                 const rtDefault = compConf ? (compConf.renderTableDefault || compConf.renderDefault) : null;
                 const rtCell = compConf ? (compConf.renderTableCell || compConf.renderCell) : null;

package/es/table/src/methods.js

@@ -125,7 +125,7 @@ function handleCustomRestore($xeTable, storeData) {
     const customOpts = $xeTable.computeCustomOpts;
     const { storage, storeOptions } = customOpts;
     const isAllCustom = storage === true;
-    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+    const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
     const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
     const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
     const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -219,7 +219,7 @@ function restoreCustomStorage($xeTable) {
     const customOpts = $xeTable.computeCustomOpts;
     const { storage, restoreStore, storeOptions } = customOpts;
     const isAllCustom = storage === true;
-    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+    const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
     const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
     const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
     const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -474,6 +474,7 @@ function handleBaseTreeExpand($xeTable, rows, expanded) {
     }
     reactData.treeExpandedFlag++;
     return Promise.all(result).then(() => {
+        updateTreeLineStyle($xeTable);
         return $xeTable.recalculate();
     });
 }
@@ -2912,6 +2913,9 @@ function handleRecalculateStyle($xeTable, reFull, reWidth, reHeight) {
     calcScrollbar($xeTable);
     updateStyle($xeTable);
     updateRowExpandStyle($xeTable);
+    if (reFull) {
+        updateTreeLineStyle($xeTable);
+    }
     return computeScrollLoad($xeTable).then(() => {
         // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
         if (reWidth) {
@@ -2929,6 +2933,9 @@ function handleRecalculateStyle($xeTable, reFull, reWidth, reHeight) {
             updateRowOffsetTop($xeTable);
         }
         updateRowExpandStyle($xeTable);
+        if (reFull) {
+            updateTreeLineStyle($xeTable);
+        }
         if (reFull) {
             return computeScrollLoad($xeTable);
         }
@@ -5403,7 +5410,7 @@ const Methods = {
         const customOpts = $xeTable.computeCustomOpts;
         const { storage, restoreStore, storeOptions } = customOpts;
         const isAllCustom = storage === true;
-        const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+        const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
         const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
         const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
         const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -5439,7 +5446,7 @@ const Methods = {
         const { fullColumnFieldData, collectColumn } = internalData;
         const { storage, checkMethod, storeOptions } = customOpts;
         const isAllCustom = storage === true;
-        const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+        const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
         const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
         const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
         const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -5560,7 +5567,7 @@ const Methods = {
         const customOpts = $xeTable.computeCustomOpts;
         const { updateStore, storage, storeOptions } = customOpts;
         const isAllCustom = storage === true;
-        const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+        const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
         const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
         const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
         const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -6319,7 +6326,7 @@ const Methods = {
             }
             else {
                 if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
-                    this.preventEvent(evnt, 'event.clearFilter', internalData._currFilterParams, this.closeFilter);
+                    $xeTable.preventEvent(evnt, 'event.clearFilter', internalData._currFilterParams, $xeTable.closeFilter);
                 }
             }
         }
@@ -6333,7 +6340,12 @@ const Methods = {
             }
             else {
                 if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
-                    this.preventEvent(evnt, 'event.clearCustom', {}, () => this.closeCustom());
+                    if (customStore.visible && $xeTable.closeCustom) {
+                        $xeTable.preventEvent(evnt, 'event.clearCustom', {}, () => {
+                            $xeTable.closeCustom();
+                            $xeTable.dispatchEvent('custom', { type: 'close' }, evnt);
+                        });
+                    }
                 }
             }
         }
@@ -6346,10 +6358,10 @@ const Methods = {
                     if (validTooltip && getEventTargetNode(evnt, validTooltip.$el).flag) {
                         // 如果是激活状态，且点击了校验提示框
                     }
-                    else if (!this.lastCallTime || this.lastCallTime + 50 < Date.now()) {
+                    else if (!internalData._lastCallTime || internalData._lastCallTime + 50 < Date.now()) {
                         if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
                             // 如果手动调用了激活单元格，避免触发源被移除后导致重复关闭
-                            this.preventEvent(evnt, 'event.clearEdit', actived.args, () => {
+                            $xeTable.preventEvent(evnt, 'event.clearEdit', actived.args, () => {
                                 let isClear;
                                 if (editOpts.mode === 'row') {
                                     const rowTargetNode = getEventTargetNode(evnt, el, 'vxe-body--row');
@@ -6370,7 +6382,7 @@ const Methods = {
                                     isClear = getEventTargetNode(evnt, el, 'vxe-footer--row').flag;
                                 }
                                 // 如果固定了高度且点击了行之外的空白处，则清除激活状态
-                                if (!isClear && this.height && !this.overflowY) {
+                                if (!isClear && props.height && !reactData.overflowY) {
                                     const bodyWrapperElem = evnt.target;
                                     if (hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
                                         isClear = evnt.offsetY < bodyWrapperElem.clientHeight;
@@ -6382,8 +6394,8 @@ const Methods = {
                                     setTimeout(() => {
                                         $xeTable.handleClearEdit(evnt).then(() => {
                                             // 如果存在校验，点击了表格之外则清除
-                                            if (!this.isActivated && editRules && validOpts.autoClear) {
-                                                this.validErrorMaps = {};
+                                            if (!internalData.isActivated && editRules && validOpts.autoClear) {
+                                                reactData.validErrorMaps = {};
                                             }
                                         });
                                     });
@@ -6415,29 +6427,31 @@ const Methods = {
         }
         // 如果配置了快捷菜单且，点击了其他地方则关闭
         if (ctxMenuStore.visible && tableMenu && !getEventTargetNode(evnt, tableMenu.$el).flag) {
-            this.closeMenu();
+            $xeTable.closeMenu();
         }
         const isActivated = getEventTargetNode(evnt, ($xeGGWrapper || $xeTable).$el).flag;
         // 如果存在校验，点击了表格之外则清除
         if (!isActivated && editRules && validOpts.autoClear) {
-            this.validErrorMaps = {};
+            reactData.validErrorMaps = {};
         }
         // 最后激活的表格
-        this.isActivated = isActivated;
+        internalData.isActivated = isActivated;
     },
     /**
      * 窗口失焦事件处理
      */
     handleGlobalBlurEvent() {
-        this.closeFilter();
-        this.closeMenu();
+        const $xeTable = this;
+        $xeTable.closeFilter();
+        $xeTable.closeMenu();
     },
     /**
      * 全局滚动事件
      */
     handleGlobalMousewheelEvent() {
-        this.closeTooltip();
-        this.closeMenu();
+        const $xeTable = this;
+        $xeTable.closeTooltip();
+        $xeTable.closeMenu();
     },
     /**
      * 表格键盘事件
@@ -10469,6 +10483,7 @@ const Methods = {
             }
             reactData.treeExpandedFlag++;
         }).then(() => {
+            updateTreeLineStyle($xeTable);
             if (expList.length) {
                 $xeTable.recalculate();
             }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.19.1";
+export const version = "3.19.3";
 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.19.1"}`;
+const version = `table v${"3.19.3"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.1";
+const version = "3.19.3";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2695,7 +2695,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.1"}`;
+const log_version = `table v${"3.19.3"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4242,16 +4242,16 @@ const Cell = {
     const {
       editConfig
     } = tableProps;
-    const editOpts = $table.computeEditOpts;
     const {
       field,
       slots,
       editRender,
       cellRender,
       rowGroupNode,
-      aggFunc
+      aggFunc,
+      formatter
     } = column;
-    const renderOpts = editConfig && isEnableConf(editOpts) && editRender ? editRender : cellRender;
+    const renderOpts = editConfig && isEnableConf(editRender) ? editRender : isEnableConf(cellRender) ? cellRender : null;
     const defaultSlot = slots ? slots.default : null;
     const gcSlot = slots ? slots.groupContent || slots['group-content'] : null;
     let cellValue = '';
@@ -4323,7 +4323,8 @@ const Cell = {
       if (defaultSlot) {
         return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h));
       }
-      if (renderOpts) {
+      // formatter > (renderTableCell | renderTableDefault)
+      if (renderOpts && !formatter) {
         const compConf = cell_renderer.get(renderOpts.name);
         const rtDefault = compConf ? compConf.renderTableDefault || compConf.renderDefault : null;
         const rtCell = compConf ? compConf.renderTableCell || compConf.renderCell : null;
@@ -6099,7 +6100,7 @@ function handleCustomRestore($xeTable, storeData) {
     storeOptions
   } = customOpts;
   const isAllCustom = storage === true;
-  const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+  const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
   const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
   const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
   const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -6221,7 +6222,7 @@ function restoreCustomStorage($xeTable) {
     storeOptions
   } = customOpts;
   const isAllCustom = storage === true;
-  const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+  const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
   const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
   const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
   const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -6530,6 +6531,7 @@ function handleBaseTreeExpand($xeTable, rows, expanded) {
   }
   reactData.treeExpandedFlag++;
   return Promise.all(result).then(() => {
+    updateTreeLineStyle($xeTable);
     return $xeTable.recalculate();
   });
 }
@@ -9423,6 +9425,9 @@ function handleRecalculateStyle($xeTable, reFull, reWidth, reHeight) {
   calcScrollbar($xeTable);
   updateStyle($xeTable);
   updateRowExpandStyle($xeTable);
+  if (reFull) {
+    updateTreeLineStyle($xeTable);
+  }
   return computeScrollLoad($xeTable).then(() => {
     // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
     if (reWidth) {
@@ -9440,6 +9445,9 @@ function handleRecalculateStyle($xeTable, reFull, reWidth, reHeight) {
       updateRowOffsetTop($xeTable);
     }
     updateRowExpandStyle($xeTable);
+    if (reFull) {
+      updateTreeLineStyle($xeTable);
+    }
     if (reFull) {
       return computeScrollLoad($xeTable);
     }
@@ -12276,7 +12284,7 @@ const Methods = {
       storeOptions
     } = customOpts;
     const isAllCustom = storage === true;
-    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+    const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
     const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
     const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
     const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -12328,7 +12336,7 @@ const Methods = {
       storeOptions
     } = customOpts;
     const isAllCustom = storage === true;
-    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+    const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
     const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
     const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
     const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -12460,7 +12468,7 @@ const Methods = {
       storeOptions
     } = customOpts;
     const isAllCustom = storage === true;
-    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+    const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
     const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
     const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
     const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
@@ -13325,7 +13333,7 @@ const Methods = {
         // 如果点击筛选容器
       } else {
         if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
-          this.preventEvent(evnt, 'event.clearFilter', internalData._currFilterParams, this.closeFilter);
+          $xeTable.preventEvent(evnt, 'event.clearFilter', internalData._currFilterParams, $xeTable.closeFilter);
         }
       }
     }
@@ -13337,7 +13345,14 @@ const Methods = {
         // 如果点击自定义列容器
       } else {
         if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
-          this.preventEvent(evnt, 'event.clearCustom', {}, () => this.closeCustom());
+          if (customStore.visible && $xeTable.closeCustom) {
+            $xeTable.preventEvent(evnt, 'event.clearCustom', {}, () => {
+              $xeTable.closeCustom();
+              $xeTable.dispatchEvent('custom', {
+                type: 'close'
+              }, evnt);
+            });
+          }
         }
       }
     }
@@ -13349,10 +13364,10 @@ const Methods = {
         if (!cell || !getEventTargetNode(evnt, cell).flag) {
           if (validTooltip && getEventTargetNode(evnt, validTooltip.$el).flag) {
             // 如果是激活状态，且点击了校验提示框
-          } else if (!this.lastCallTime || this.lastCallTime + 50 < Date.now()) {
+          } else if (!internalData._lastCallTime || internalData._lastCallTime + 50 < Date.now()) {
             if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
               // 如果手动调用了激活单元格，避免触发源被移除后导致重复关闭
-              this.preventEvent(evnt, 'event.clearEdit', actived.args, () => {
+              $xeTable.preventEvent(evnt, 'event.clearEdit', actived.args, () => {
                 let isClear;
                 if (editOpts.mode === 'row') {
                   const rowTargetNode = getEventTargetNode(evnt, el, 'vxe-body--row');
@@ -13372,7 +13387,7 @@ const Methods = {
                   isClear = getEventTargetNode(evnt, el, 'vxe-footer--row').flag;
                 }
                 // 如果固定了高度且点击了行之外的空白处，则清除激活状态
-                if (!isClear && this.height && !this.overflowY) {
+                if (!isClear && props.height && !reactData.overflowY) {
                   const bodyWrapperElem = evnt.target;
                   if (hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
                     isClear = evnt.offsetY < bodyWrapperElem.clientHeight;
@@ -13384,8 +13399,8 @@ const Methods = {
                   setTimeout(() => {
                     $xeTable.handleClearEdit(evnt).then(() => {
                       // 如果存在校验，点击了表格之外则清除
-                      if (!this.isActivated && editRules && validOpts.autoClear) {
-                        this.validErrorMaps = {};
+                      if (!internalData.isActivated && editRules && validOpts.autoClear) {
+                        reactData.validErrorMaps = {};
                       }
                     });
                   });
@@ -13418,29 +13433,31 @@ const Methods = {
     }
     // 如果配置了快捷菜单且，点击了其他地方则关闭
     if (ctxMenuStore.visible && tableMenu && !getEventTargetNode(evnt, tableMenu.$el).flag) {
-      this.closeMenu();
+      $xeTable.closeMenu();
     }
     const isActivated = getEventTargetNode(evnt, ($xeGGWrapper || $xeTable).$el).flag;
     // 如果存在校验，点击了表格之外则清除
     if (!isActivated && editRules && validOpts.autoClear) {
-      this.validErrorMaps = {};
+      reactData.validErrorMaps = {};
     }
     // 最后激活的表格
-    this.isActivated = isActivated;
+    internalData.isActivated = isActivated;
   },
   /**
    * 窗口失焦事件处理
    */
   handleGlobalBlurEvent() {
-    this.closeFilter();
-    this.closeMenu();
+    const $xeTable = this;
+    $xeTable.closeFilter();
+    $xeTable.closeMenu();
   },
   /**
    * 全局滚动事件
    */
   handleGlobalMousewheelEvent() {
-    this.closeTooltip();
-    this.closeMenu();
+    const $xeTable = this;
+    $xeTable.closeTooltip();
+    $xeTable.closeMenu();
   },
   /**
    * 表格键盘事件
@@ -18186,6 +18203,7 @@ const Methods = {
       }
       reactData.treeExpandedFlag++;
     }).then(() => {
+      updateTreeLineStyle($xeTable);
       if (expList.length) {
         $xeTable.recalculate();
       }
@@ -22574,6 +22592,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
       $xeTable.saveCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('confirm', $event);
+      $xeTable.emitCustomEvent('close', $event);
     },
     cancelCloseEvent({
       $event
@@ -22591,6 +22610,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
       $xeTable.cancelCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('cancel', $event);
+      $xeTable.emitCustomEvent('close', $event);
     },
     handleResetCustomEvent(evnt) {
       const $xeTableCustomPanel = this;
@@ -22598,6 +22618,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
       $xeTable.resetCustom(true);
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('reset', evnt);
+      $xeTable.emitCustomEvent('close', evnt);
     },
     resetCustomEvent(evnt) {
       if (core_.VxeUI.modal) {
@@ -24992,6 +25013,9 @@ const {
      */
     handleOpenMenuEvent(evnt, type, params) {
       const $xeTable = this;
+      const $xeGrid = $xeTable.$xeGrid;
+      const $xeGantt = $xeTable.$xeGantt;
+      const $xeGGWrapper = $xeGrid || $xeGantt;
       const reactData = $xeTable;
       const internalData = $xeTable;
       const {
@@ -25017,7 +25041,7 @@ const {
             if (!visibleMethod || visibleMethod(params)) {
               evnt.preventDefault();
               $xeTable.updateZindex();
-              const el = $xeTable.$refs.refElem;
+              const el = $xeGGWrapper ? $xeGGWrapper.$refs.refElem : $xeTable.$refs.refElem;
               const tableRect = el.getBoundingClientRect();
               const {
                 scrollTop,
@@ -30025,10 +30049,7 @@ function emitCustomEvent($xeTable, type, evnt) {
     },
     emitCustomEvent(type, evnt) {
       const $xeTable = this;
-      const $xeGrid = $xeTable.$xeGrid;
-      const $xeGantt = $xeTable.$xeGantt;
-      const comp = $xeGrid || $xeGantt || $xeTable;
-      comp.dispatchEvent('custom', {
+      $xeTable.dispatchEvent('custom', {
         type
       }, evnt);
     },