vxe-table 4.17.1 → 4.17.2

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

@@ -2,13 +2,12 @@ import { nextTick } from 'vue';
 import { VxeUI } from '../../../ui';
 import XEUtils from 'xe-utils';
 import { getColumnList } from '../../src/util';
-const tableCustomMethodKeys = ['openCustom', 'closeCustom', 'toggleCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox'];
+const tableCustomMethodKeys = ['openCustom', 'closeCustom', 'getCustomVisible', 'toggleCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox'];
 VxeUI.hooks.add('tableCustomModule', {
     setupTable($xeTable) {
         const { reactData, internalData } = $xeTable;
         const { computeCustomOpts, computeRowGroupFields } = $xeTable.getComputeMaps();
         const { refElem } = $xeTable.getRefMaps();
-        const $xeGrid = $xeTable.xeGrid;
         const $xeGantt = $xeTable.xeGantt;
         const calcMaxHeight = () => {
             const { customStore } = reactData;
@@ -279,8 +278,7 @@ VxeUI.hooks.add('tableCustomModule', {
             customStore.isIndeterminate = !customStore.isAll && collectColumn.some((column) => (!checkMethod || checkMethod({ $table: $xeTable, column })) && (column.renderVisible || column.halfVisible));
         };
         const emitCustomEvent = (type, evnt) => {
-            const comp = $xeGrid || $xeGantt || $xeTable;
-            comp.dispatchEvent('custom', { type }, evnt);
+            $xeTable.dispatchEvent('custom', { type }, evnt);
         };
         const customPrivateMethods = {
             checkCustomStatus,

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

@@ -73,6 +73,7 @@ export default defineVxeComponent({
             $xeTable.saveCustom();
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('confirm', $event);
+            $xeTable.emitCustomEvent('close', $event);
         };
         const cancelCloseEvent = ({ $event }) => {
             $xeTable.closeCustom();
@@ -82,11 +83,13 @@ export default defineVxeComponent({
             $xeTable.cancelCustom();
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('cancel', $event);
+            $xeTable.emitCustomEvent('close', $event);
         };
         const handleResetCustomEvent = (evnt) => {
             $xeTable.resetCustom(true);
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('reset', evnt);
+            $xeTable.emitCustomEvent('close', evnt);
         };
         const resetCustomEvent = ({ $event }) => {
             if (VxeUI.modal) {

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

@@ -10,6 +10,9 @@ hooks.add('tableMenuModule', {
         const { xID, props, reactData, internalData } = $xeTable;
         const { refElem, refTableFilter, refTableMenu } = $xeTable.getRefMaps();
         const { computeMouseOpts, computeIsContentMenu, computeMenuOpts } = $xeTable.getComputeMaps();
+        const $xeGrid = $xeTable.xeGrid;
+        const $xeGantt = $xeTable.xeGantt;
+        const $xeGGWrapper = $xeGrid || $xeGantt;
         let menuMethods = {};
         let menuPrivateMethods = {};
         /**
@@ -32,7 +35,10 @@ hooks.add('tableMenuModule', {
                         if (!visibleMethod || visibleMethod(params)) {
                             evnt.preventDefault();
                             $xeTable.updateZindex();
-                            const el = refElem.value;
+                            const el = $xeGGWrapper ? $xeGGWrapper.getRefMaps().refElem.value : refElem.value;
+                            if (!el) {
+                                return;
+                            }
                             const tableRect = el.getBoundingClientRect();
                             const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
                             let top = evnt.clientY - tableRect.y;

package/es/table/src/cell.js

@@ -382,11 +382,9 @@ export const Cell = {
         const tableReactData = $table.reactData;
         const tableInternalData = $table.internalData;
         const { isRowGroupStatus } = tableReactData;
-        const { computeEditOpts } = $table.getComputeMaps();
         const { editConfig } = tableProps;
-        const editOpts = computeEditOpts.value;
-        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 = '';
@@ -448,7 +446,8 @@ export const Cell = {
             if (defaultSlot) {
                 return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params));
             }
-            if (renderOpts) {
+            // formatter > (renderTableCell | renderTableDefault)
+            if (renderOpts && !formatter) {
                 const compConf = renderer.get(renderOpts.name);
                 if (compConf) {
                     const rtCell = compConf.renderTableCell || compConf.renderCell;

package/es/table/src/table.js

@@ -7385,11 +7385,12 @@ export default defineVxeComponent({
                 }
                 else {
                     if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
-                        tablePrivateMethods.preventEvent(evnt, 'event.clearCustom', {}, () => {
-                            if ($xeTable.closeCustom) {
+                        if (customStore.visible && $xeTable.closeCustom) {
+                            tablePrivateMethods.preventEvent(evnt, 'event.clearCustom', {}, () => {
                                 $xeTable.closeCustom();
-                            }
-                        });
+                                $xeTable.dispatchEvent('custom', { type: 'close' }, evnt);
+                            });
+                        }
                     }
                 }
             }

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -3141,7 +3141,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.17.1";
+const version = "4.17.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3653,7 +3653,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.17.1"}`;
+const log_version = `table v${"4.17.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5482,22 +5482,19 @@ const Cell = {
     const {
       isRowGroupStatus
     } = tableReactData;
-    const {
-      computeEditOpts
-    } = $table.getComputeMaps();
     const {
       editConfig
     } = tableProps;
-    const editOpts = computeEditOpts.value;
     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 = '';
@@ -5572,7 +5569,8 @@ const Cell = {
       if (defaultSlot) {
         return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params));
       }
-      if (renderOpts) {
+      // formatter > (renderTableCell | renderTableDefault)
+      if (renderOpts && !formatter) {
         const compConf = cell_renderer.get(renderOpts.name);
         if (compConf) {
           const rtCell = compConf.renderTableCell || compConf.renderCell;
@@ -9399,6 +9397,7 @@ function panel_createInternalData() {
       $xeTable.saveCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('confirm', $event);
+      $xeTable.emitCustomEvent('close', $event);
     };
     const cancelCloseEvent = ({
       $event
@@ -9412,11 +9411,13 @@ function panel_createInternalData() {
       $xeTable.cancelCustom();
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('cancel', $event);
+      $xeTable.emitCustomEvent('close', $event);
     };
     const handleResetCustomEvent = evnt => {
       $xeTable.resetCustom(true);
       $xeTable.closeCustom();
       $xeTable.emitCustomEvent('reset', evnt);
+      $xeTable.emitCustomEvent('close', evnt);
     };
     const resetCustomEvent = ({
       $event
@@ -12186,6 +12187,9 @@ menu_hook_hooks.add('tableMenuModule', {
       computeIsContentMenu,
       computeMenuOpts
     } = $xeTable.getComputeMaps();
+    const $xeGrid = $xeTable.xeGrid;
+    const $xeGantt = $xeTable.xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     let menuMethods = {};
     let menuPrivateMethods = {};
     /**
@@ -12215,7 +12219,10 @@ menu_hook_hooks.add('tableMenuModule', {
             if (!visibleMethod || visibleMethod(params)) {
               evnt.preventDefault();
               $xeTable.updateZindex();
-              const el = refElem.value;
+              const el = $xeGGWrapper ? $xeGGWrapper.getRefMaps().refElem.value : refElem.value;
+              if (!el) {
+                return;
+              }
               const tableRect = el.getBoundingClientRect();
               const {
                 scrollTop,
@@ -17028,7 +17035,7 @@ validator_hook_hooks.add('tableValidatorModule', {
 
 
 
-const tableCustomMethodKeys = ['openCustom', 'closeCustom', 'toggleCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox'];
+const tableCustomMethodKeys = ['openCustom', 'closeCustom', 'getCustomVisible', 'toggleCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox'];
 core_.VxeUI.hooks.add('tableCustomModule', {
   setupTable($xeTable) {
     const {
@@ -17042,7 +17049,6 @@ core_.VxeUI.hooks.add('tableCustomModule', {
     const {
       refElem
     } = $xeTable.getRefMaps();
-    const $xeGrid = $xeTable.xeGrid;
     const $xeGantt = $xeTable.xeGantt;
     const calcMaxHeight = () => {
       const {
@@ -17395,8 +17401,7 @@ core_.VxeUI.hooks.add('tableCustomModule', {
       })) && (column.renderVisible || column.halfVisible));
     };
     const emitCustomEvent = (type, evnt) => {
-      const comp = $xeGrid || $xeGantt || $xeTable;
-      comp.dispatchEvent('custom', {
+      $xeTable.dispatchEvent('custom', {
         type
       }, evnt);
     };
@@ -19568,7 +19573,7 @@ if(tableFilter){if(getEventTargetNode(evnt,el,'vxe-cell--filter').flag){// 如
 }else{if(!getEventTargetNode(evnt,document.body,'vxe-table--ignore-clear').flag){tablePrivateMethods.preventEvent(evnt,'event.clearFilter',internalData._currFilterParams,tableMethods.closeFilter);}}}// 自定义列
 if(tableCustom){if(customStore.btnEl===evnt.target||getEventTargetNode(evnt,document.body,'vxe-toolbar-custom-target').flag){// 如果点击了自定义列按钮
 }else if(getEventTargetNode(evnt,tableCustom.getRefMaps().refElem.value).flag){// 如果点击自定义列容器
-}else{if(!getEventTargetNode(evnt,document.body,'vxe-table--ignore-clear').flag){tablePrivateMethods.preventEvent(evnt,'event.clearCustom',{},()=>{if($xeTable.closeCustom){$xeTable.closeCustom();}});}}}// 如果已激活了编辑状态
+}else{if(!getEventTargetNode(evnt,document.body,'vxe-table--ignore-clear').flag){if(customStore.visible&&$xeTable.closeCustom){tablePrivateMethods.preventEvent(evnt,'event.clearCustom',{},()=>{$xeTable.closeCustom();$xeTable.dispatchEvent('custom',{type:'close'},evnt);});}}}}// 如果已激活了编辑状态
 if(actived.row){if(!(editOpts.autoClear===false)){// 如果是激活状态，点击了单元格之外
 const cell=actived.args.cell;if(!cell||!getEventTargetNode(evnt,cell).flag){if($validTooltip&&getEventTargetNode(evnt,$validTooltip.$el).flag){// 如果是激活状态，且点击了校验提示框
 }else if(!internalData._lastCallTime||internalData._lastCallTime+50<Date.now()){// 如果是激活状态，点击了单元格之外