diff --git a/package.json b/package.json index 16289ace3..9a5b3f499 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table", - "version": "4.6.13", + "version": "4.6.14-beta.0", "description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、列拖拽,懒加载、快捷菜单、数据校验、树形结构、打印导出、自定义模板、渲染器、JSON 配置式...", "scripts": { "update": "npm install --legacy-peer-deps", diff --git a/packages/pager/src/pager.ts b/packages/pager/src/pager.ts index 2caddae17..e11cd72f8 100644 --- a/packages/pager/src/pager.ts +++ b/packages/pager/src/pager.ts @@ -44,8 +44,8 @@ export default defineComponent({ iconJumpNext: String as PropType, iconNextPage: String as PropType, iconJumpMore: String as PropType, - iconHomePage: String as PropType, - iconEndPage: String as PropType + iconHomePage: String as PropType, + iconEndPage: String as PropType }, emits: [ 'update:pageSize', diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts index 2f716be33..ada15e482 100644 --- a/packages/table/src/table.ts +++ b/packages/table/src/table.ts @@ -6341,12 +6341,12 @@ export default defineComponent({ if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') { 'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => { ($xetable as any)[name] = function () { - errLog('vxe.error.reqModule', ['Export']) + errLog('vxe.error.reqModule', ['VxeTableExportModule']) } }) 'clearValidate,fullValidate,validate'.split(',').forEach(name => { ($xetable as any)[name] = function () { - errLog('vxe.error.reqModule', ['Validator']) + errLog('vxe.error.reqModule', ['VxeTableValidatorModule']) } }) } diff --git a/packages/toolbar/src/toolbar.ts b/packages/toolbar/src/toolbar.ts index 3951f34e7..a4d7ab40f 100644 --- a/packages/toolbar/src/toolbar.ts +++ b/packages/toolbar/src/toolbar.ts @@ -110,13 +110,19 @@ export default defineComponent({ const handleClickSettingEvent = ({ $event }: any) => { if ($xetable) { - $xetable.triggerCustomEvent($event) + if ($xetable.triggerCustomEvent) { + $xetable.triggerCustomEvent($event) + } else { + errLog('vxe.error.reqModule', ['VxeTableCustomModule']) + } } } const handleMouseenterSettingEvent = ({ $event }: any) => { if ($xetable) { $xetable.customOpenEvent($event) + } else { + errLog('vxe.error.reqModule', ['VxeTableCustomModule']) } } diff --git a/types/pager.d.ts b/types/pager.d.ts index 89ca0e56f..dc740d0d6 100644 --- a/types/pager.d.ts +++ b/types/pager.d.ts @@ -91,8 +91,8 @@ export type VxePagerProps = { iconJumpNext?: VxePagerPropTypes.IconJumpNext iconNextPage?: VxePagerPropTypes.IconNextPage iconJumpMore?: VxePagerPropTypes.IconJumpMore - iconHome?: VxePagerPropTypes.IconHome - iconEnd?: VxePagerPropTypes.IconEnd + iconHomePage?: VxePagerPropTypes.IconHomePage + iconEndPage?: VxePagerPropTypes.IconEndPage } export namespace VxePagerPropTypes { @@ -118,8 +118,8 @@ export namespace VxePagerPropTypes { export type IconJumpNext = string export type IconNextPage = string export type IconJumpMore = string - export type IconHome = string - export type IconEnd = string + export type IconHomePage = string + export type IconEndPage = string } export type PageSizeItemType = number | {