vxe-table 4.19.20 → 4.19.22

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

@@ -151,39 +151,41 @@ VxeUI.hooks.add('tableCustomModule', {
             }
             return openCustom();
         };
-        const saveCustom = () => {
+        const saveCustom = (isDirectly) => {
             const { customColumnList, aggHandleFields, rowGroupList } = reactData;
             const customOpts = computeCustomOpts.value;
             const { allowVisible, allowSort, allowFixed, allowResizable, allowGroup, allowValues } = customOpts;
-            XEUtils.eachTree(customColumnList, (column, index, items, path, parentColumn) => {
-                if (parentColumn) {
-                    // 更新子列信息
-                    column.fixed = parentColumn.fixed;
-                }
-                else {
-                    if (allowSort) {
-                        const sortIndex = index + 1;
-                        column.renderSortNumber = sortIndex;
+            if (!isDirectly) {
+                XEUtils.eachTree(customColumnList, (column, index, items, path, parentColumn) => {
+                    if (parentColumn) {
+                        // 更新子列信息
+                        column.fixed = parentColumn.fixed;
                     }
-                    if (allowFixed) {
-                        column.fixed = column.renderFixed;
+                    else {
+                        if (allowSort) {
+                            const sortIndex = index + 1;
+                            column.renderSortNumber = sortIndex;
+                        }
+                        if (allowFixed) {
+                            column.fixed = column.renderFixed;
+                        }
                     }
-                }
-                if (allowResizable) {
-                    if (column.renderVisible && (!column.children || !column.children.length)) {
-                        if (column.renderResizeWidth !== column.renderWidth) {
-                            column.resizeWidth = column.renderResizeWidth;
-                            column.renderWidth = column.renderResizeWidth;
+                    if (allowResizable) {
+                        if (column.renderVisible && (!column.children || !column.children.length)) {
+                            if (column.renderResizeWidth !== column.renderWidth) {
+                                column.resizeWidth = column.renderResizeWidth;
+                                column.renderWidth = column.renderResizeWidth;
+                            }
                         }
                     }
-                }
-                if (allowVisible) {
-                    column.visible = column.renderVisible;
-                }
-                if (allowGroup && allowValues) {
-                    column.aggFunc = column.renderAggFn;
-                }
-            });
+                    if (allowVisible) {
+                        column.visible = column.renderVisible;
+                    }
+                    if (allowGroup && allowValues) {
+                        column.aggFunc = column.renderAggFn;
+                    }
+                });
+            }
             reactData.isCustomStatus = true;
             if (allowGroup && !!$xeTable.handlePivotTableAggData) {
                 if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
@@ -365,11 +367,13 @@ VxeUI.hooks.add('tableCustomModule', {
                 if (customStore.visible) {
                     closeCustom();
                     emitCustomEvent('close', evnt);
+                    $xeTable.dispatchEvent('custom-close', {}, evnt);
                 }
                 else {
                     customStore.btnEl = evnt.target;
                     openCustom();
                     emitCustomEvent('open', evnt);
+                    $xeTable.dispatchEvent('custom-open', {}, evnt);
                 }
             },
             customOpenEvent(evnt) {
@@ -380,6 +384,7 @@ VxeUI.hooks.add('tableCustomModule', {
                     customStore.btnEl = evnt.target;
                     $xeTable.openCustom();
                     $xeTable.emitCustomEvent('open', evnt);
+                    $xeTable.dispatchEvent('custom-open', {}, evnt);
                 }
             },
             customCloseEvent(evnt) {
@@ -389,6 +394,7 @@ VxeUI.hooks.add('tableCustomModule', {
                     customStore.activeBtn = false;
                     $xeTable.closeCustom();
                     $xeTable.emitCustomEvent('close', evnt);
+                    $xeTable.dispatchEvent('custom-close', {}, evnt);
                 }
             },
             handleUpdateCustomColumn,

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

@@ -75,23 +75,30 @@ export default defineVxeComponent({
             $xeTable.saveCustom();
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('confirm', $event);
+            $xeTable.dispatchEvent('custom-confirm', {}, $event);
             $xeTable.emitCustomEvent('close', $event);
+            $xeTable.dispatchEvent('custom-close', {}, $event);
         };
         const cancelCloseEvent = ({ $event }) => {
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('close', $event);
+            $xeTable.dispatchEvent('custom-close', {}, $event);
         };
         const cancelCustomEvent = ({ $event }) => {
             $xeTable.cancelCustom();
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('cancel', $event);
+            $xeTable.dispatchEvent('custom-cancel', {}, $event);
             $xeTable.emitCustomEvent('close', $event);
+            $xeTable.dispatchEvent('custom-close', {}, $event);
         };
         const handleResetCustomEvent = (evnt) => {
             $xeTable.resetCustom(true);
             $xeTable.closeCustom();
             $xeTable.emitCustomEvent('reset', evnt);
+            $xeTable.dispatchEvent('custom-reset', {}, evnt);
             $xeTable.emitCustomEvent('close', evnt);
+            $xeTable.dispatchEvent('custom-close', {}, evnt);
         };
         const resetCustomEvent = ({ $event }) => {
             if (VxeUI.modal) {

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

@@ -544,7 +544,6 @@ hooks.add('tableEditModule', {
                 return handleInsertRowAt(records, targetRowOrRowid, true);
             },
             insertChild(records, parentRowOrParentId) {
-                window.aa = internalData;
                 return handleInsertChildRowAt(records, parentRowOrParentId, null);
             },
             insertChildAt(records, parentRowOrParentId, targetRow) {

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

@@ -1,7 +1,7 @@
 import { nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
-import { getDomNode, getAbsolutePos, getEventTargetNode } from '../../../ui/src/dom';
+import { getDomNode, getAbsolutePos, getEventTargetNode, toCssUnit } from '../../../ui/src/dom';
 import { isEnableConf, hasChildrenList } from '../../../ui/src/utils';
 const { menus, hooks, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI;
 const tableMenuMethodKeys = ['closeMenu'];
@@ -23,7 +23,7 @@ hooks.add('tableMenuModule', {
             const isContentMenu = computeIsContentMenu.value;
             const menuOpts = computeMenuOpts.value;
             const config = menuOpts[type];
-            const { zIndex, transfer, visibleMethod } = menuOpts;
+            const { zIndex, transfer, width, visibleMethod } = menuOpts;
             if (config) {
                 const { options, disabled } = config;
                 if (disabled) {
@@ -49,17 +49,21 @@ hooks.add('tableMenuModule', {
                             }
                             const handleVisible = () => {
                                 internalData._currMenuParams = params;
+                                const ctxStyle = {
+                                    zIndex: zIndex || internalData.tZindex,
+                                    top: `${top}px`,
+                                    left: `${left}px`
+                                };
+                                if (width) {
+                                    ctxStyle['--vxe-ui-table-menu-item-width'] = toCssUnit(width);
+                                }
                                 Object.assign(ctxMenuStore, {
                                     visible: true,
                                     list: options,
                                     selected: null,
                                     selectChild: null,
                                     showChild: false,
-                                    style: {
-                                        zIndex: zIndex || internalData.tZindex,
-                                        top: `${top}px`,
-                                        left: `${left}px`
-                                    }
+                                    style: ctxStyle
                                 });
                                 nextTick(() => {
                                     const tableMenu = refTableMenu.value;

package/es/table/src/emits.js

@@ -74,6 +74,11 @@ export const tableEmits = [
     'scroll',
     'scroll-boundary',
     'custom',
+    'custom-open',
+    'custom-close',
+    'custom-cancel',
+    'custom-reset',
+    'custom-confirm',
     'custom-visible-change',
     'custom-visible-all',
     'custom-fixed-change',

package/es/table/src/table.js

@@ -9166,12 +9166,16 @@ export default defineVxeComponent({
                 // 如果为 null 使用默认逻辑
                 if (XEUtils.eqNull(customContent)) {
                     isShow = isOver;
+                    content = cellText;
                 }
                 else if (customContent !== '' && customContent !== false) {
                     // 如果为 '' | false 则不显示
                     isShow = true;
+                    content = customContent;
+                }
+                else {
+                    content = cellText;
                 }
-                content = cellText;
             }
             if (isShow && content) {
                 const tipContent = formatText(content);
@@ -11338,6 +11342,7 @@ export default defineVxeComponent({
                 if (evnt.dataTransfer) {
                     evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
                 }
+                $xeTable.closeTooltip();
             },
             handleRowDragSwapEvent(evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild) {
                 const { treeConfig, dragConfig } = props;
@@ -12002,6 +12007,7 @@ export default defineVxeComponent({
                 if (evnt.dataTransfer) {
                     evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
                 }
+                $xeTable.closeTooltip();
             },
             handleColDragSwapColumn() {
                 handleUpdateColumn();

package/es/ui/index.js

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

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"4.19.20"}`;
+const tableVersion = `table v${"4.19.22"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';