diff --git a/package.json b/package.json index 7e7dce77a1..f65486a644 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table", - "version": "4.7.65", + "version": "4.7.66", "description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、列拖拽,懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...", "scripts": { "update": "npm install --legacy-peer-deps", @@ -28,7 +28,7 @@ "style": "lib/style.css", "typings": "types/index.d.ts", "dependencies": { - "vxe-pc-ui": "^4.0.96" + "vxe-pc-ui": "^4.1.0" }, "devDependencies": { "@types/resize-observer-browser": "^0.1.11", diff --git a/packages/table/module/custom/panel.ts b/packages/table/module/custom/panel.ts index 28e0fb4537..f3a84df543 100644 --- a/packages/table/module/custom/panel.ts +++ b/packages/table/module/custom/panel.ts @@ -5,7 +5,7 @@ import { addClass, removeClass } from '../../../ui/src/dom' import { errLog } from '../../../ui/src/log' import XEUtils from 'xe-utils' -import type { VxeModalComponent, VxeDrawerComponent, VxeButtonComponent, VxeRadioGroupComponent, VxeTooltipComponent, VxeInputComponent } from 'vxe-pc-ui' +import type { VxeModalComponent, VxeDrawerComponent, VxeButtonComponent, VxeRadioGroupComponent, VxeTooltipComponent, VxeInputComponent, VxeButtonEvents } from 'vxe-pc-ui' import type { VxeTableDefines, VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeColumnPropTypes } from '../../../../types' const { getI18n, getIcon } = VxeUI @@ -55,7 +55,7 @@ export default defineComponent({ }, 300) } - const confirmCustomEvent = (evnt: Event) => { + const confirmCustomEvent: VxeButtonEvents.Click = ({ $event }) => { const { customColumnList } = reactData const customOpts = computeCustomOpts.value const { allowVisible, allowSort, allowFixed, allowResizable } = customOpts @@ -82,11 +82,11 @@ export default defineComponent({ } }) $xeTable.closeCustom() - $xeTable.emitCustomEvent('confirm', evnt) + $xeTable.emitCustomEvent('confirm', $event) $xeTable.saveCustomStore('confirm') } - const cancelCustomEvent = (evnt: Event) => { + const cancelCustomEvent: VxeButtonEvents.Click = ({ $event }) => { const { customStore } = props const { customColumnList } = reactData const { oldSortMaps, oldFixedMaps, oldVisibleMaps } = customStore @@ -112,7 +112,7 @@ export default defineComponent({ } }, { children: 'children' }) $xeTable.closeCustom() - $xeTable.emitCustomEvent('cancel', evnt) + $xeTable.emitCustomEvent('cancel', $event) } const handleResetCustomEvent = (evnt: Event) => { @@ -121,7 +121,7 @@ export default defineComponent({ $xeTable.emitCustomEvent('reset', evnt) } - const resetCustomEvent = (evnt: Event) => { + const resetCustomEvent: VxeButtonEvents.Click = ({ $event }) => { if (VxeUI.modal) { VxeUI.modal.confirm({ content: getI18n('vxe.custom.cstmConfirmRestore'), @@ -129,11 +129,11 @@ export default defineComponent({ escClosable: true }).then(type => { if (type === 'confirm') { - handleResetCustomEvent(evnt) + handleResetCustomEvent($event) } }) } else { - handleResetCustomEvent(evnt) + handleResetCustomEvent($event) } } diff --git a/packages/toolbar/src/toolbar.ts b/packages/toolbar/src/toolbar.ts index c562de6dc9..556b6eb281 100644 --- a/packages/toolbar/src/toolbar.ts +++ b/packages/toolbar/src/toolbar.ts @@ -4,7 +4,7 @@ import { VxeUI } from '../../ui' import { getSlotVNs } from '../../ui/src/vn' import { warnLog, errLog } from '../../ui/src/log' -import type { VxeButtonComponent } from 'vxe-pc-ui' +import type { VxeButtonComponent, VxeButtonEvents } from 'vxe-pc-ui' import type { VxeGridConstructor, GridPrivateMethods, ToolbarMethods, VxeToolbarConstructor, VxeToolbarEmits, VxeToolbarPropTypes, VxeTableConstructor, ToolbarPrivateRef, VxeTableMethods, VxeTablePrivateMethods, ToolbarReactData } from '../../../types' const { getConfig, getIcon, getI18n, renderer, commands, createEvent, useFns } = VxeUI @@ -146,7 +146,7 @@ export default defineComponent({ } } - const refreshEvent = (evnt: KeyboardEvent) => { + const refreshEvent: VxeButtonEvents.Click = ({ $event }) => { const { isRefresh } = reactData const refreshOpts = computeRefreshOpts.value if (!isRefresh) { @@ -162,16 +162,16 @@ export default defineComponent({ } } else if ($xeGrid) { reactData.isRefresh = true - $xeGrid.triggerToolbarCommitEvent({ code: refreshOpts.code || 'reload' }, evnt).catch((e) => e).then(() => { + $xeGrid.triggerToolbarCommitEvent({ code: refreshOpts.code || 'reload' }, $event).catch((e) => e).then(() => { reactData.isRefresh = false }) } } } - const zoomEvent = (evnt: Event) => { + const zoomEvent: VxeButtonEvents.Click = ({ $event }) => { if ($xeGrid) { - $xeGrid.triggerZoomEvent(evnt) + $xeGrid.triggerZoomEvent($event) } } @@ -270,7 +270,7 @@ export default defineComponent({ round: child.round, status: child.status, content: child.name, - onClick: (evnt: Event) => isBtn ? btnEvent(evnt, child) : tolEvent(evnt, child) + onClick: ({ $event }) => isBtn ? btnEvent($event, child) : tolEvent($event, child) }) : createCommentVNode() }) @@ -319,7 +319,7 @@ export default defineComponent({ destroyOnClose: item.destroyOnClose, placement: item.placement, transfer: item.transfer, - onClick: (evnt: Event) => btnEvent(evnt, item) + onClick: ({ $event }) => btnEvent($event, item) }, dropdowns && dropdowns.length ? { dropdowns: () => renderDropdowns(item, true) @@ -377,7 +377,7 @@ export default defineComponent({ destroyOnClose: item.destroyOnClose, placement: item.placement, transfer: item.transfer, - onClick: (evnt: Event) => tolEvent(evnt, item) + onClick: ({ $event }) => tolEvent($event, item) }, dropdowns && dropdowns.length ? { dropdowns: () => renderDropdowns(item, false)