diff --git a/README.en.md b/README.en.md index d47380cc4..56e71306b 100644 --- a/README.en.md +++ b/README.en.md @@ -169,6 +169,12 @@ Compile packaging, generated compiled directory: es,lib npm run lib ``` +## Contributors + +Thank you to everyone who contributed to this project. + +[![vxe-table](https://contrib.rocks/image?repo=x-extends/vxe-table)](https://github.com/x-extends/vxe-table/graphs/contributors) + ## License [MIT](LICENSE) © 2019-present, Xu Liangzhan diff --git a/README.md b/README.md index b7c4e107c..ca143c4f6 100644 --- a/README.md +++ b/README.md @@ -177,6 +177,12 @@ npm run serve npm run lib ``` +## Contributors + +Thank you to everyone who contributed to this project. + +[![vxe-table](https://contrib.rocks/image?repo=x-extends/vxe-table)](https://github.com/x-extends/vxe-table/graphs/contributors) + ## License [MIT](LICENSE) © 2019-present, Xu Liangzhan diff --git a/README.zh-TW.md b/README.zh-TW.md index 138a0e783..2bbcb4859 100644 --- a/README.zh-TW.md +++ b/README.zh-TW.md @@ -168,6 +168,12 @@ npm run serve npm run lib ``` +## Contributors + +Thank you to everyone who contributed to this project. + +[![vxe-table](https://contrib.rocks/image?repo=x-extends/vxe-table)](https://github.com/x-extends/vxe-table/graphs/contributors) + ## License [MIT](LICENSE) © 2019-present, Xu Liangzhan diff --git a/examples/views/tooltip/Tooltip.vue b/examples/views/tooltip/Tooltip.vue index 9c776f155..9842eb7d8 100644 --- a/examples/views/tooltip/Tooltip.vue +++ b/examples/views/tooltip/Tooltip.vue @@ -47,13 +47,6 @@

- -

{{ $t('app.body.button.showCode') }}

- - 
-      {{ demoCodes[0] }}
-      {{ demoCodes[1] }}
-
@@ -85,88 +78,7 @@ export default defineComponent({ demo1, xTip5, cellMouseenterEvent, - cellMouseleaveEvent, - demoCodes: [ - ` -

- - 文字提示 - -

- -

- - 点击触发 - - - Hover 触发 - - - 设置 Enterable - -

- -

- - 手动模式 - -

- -

- - 高性能模式，只创建一个实例 -

- -

- - - - - - - -

- `, - ` - import { defineComponent, reactive, ref } from 'vue' - import { VxeTooltipInstance } from 'vxe-table' - - export default defineComponent({ - setup () { - const demo1 = reactive({ - value1: false, - tableData: [ - { id: 10001, name: 'Test1', role: 'Develop', sex: 'Man', age: 28, address: 'test abc' }, - { id: 10002, name: 'Test2', role: 'Test', sex: 'Women', age: 22, address: 'Guangzhou' }, - { id: 10003, name: 'Test3', role: 'PM', sex: 'Man', age: 32, address: 'Shanghai' }, - { id: 10004, name: 'Test4', role: 'Designer', sex: 'Women', age: 24, address: 'Shanghai' } - ] - }) - const xTip5 = ref({} as VxeTooltipInstance) - const cellMouseenterEvent = ({ cell }: any) => { - const $tooltip5 = xTip5.value - $tooltip5.open(cell, \`自定义提示内容：\${cell.innerText}\`) - } - const cellMouseleaveEvent = () => { - const $tooltip5 = xTip5.value - $tooltip5.close() - } - return { - demo1, - xTip2, - cellMouseenterEvent, - cellMouseleaveEvent - } - } - } - ` - ] + cellMouseleaveEvent } } }) diff --git a/package.json b/package.json index ffa569750..9a49d6ecb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table", - "version": "4.6.12", + "version": "4.6.13-beta.3", "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...", "scripts": { "update": "npm install --legacy-peer-deps", diff --git a/packages/custom/src/panel.ts b/packages/custom/src/panel.ts index 9a68164c2..6eb422dfb 100644 --- a/packages/custom/src/panel.ts +++ b/packages/custom/src/panel.ts @@ -250,11 +250,11 @@ export default defineComponent({ return } if (dragHintEl) { - const warpperEl = bodyEl.parentNode as HTMLElement - const warpperRect = warpperEl.getBoundingClientRect() + const wrapperEl = bodyEl.parentNode as HTMLElement + const wrapperRect = wrapperEl.getBoundingClientRect() dragHintEl.style.display = 'block' - dragHintEl.style.top = `${Math.min(warpperEl.clientHeight - warpperEl.scrollTop - dragHintEl.clientHeight, evnt.clientY - warpperRect.y)}px` - dragHintEl.style.left = `${Math.min(warpperEl.clientWidth - warpperEl.scrollLeft - dragHintEl.clientWidth - 16, evnt.clientX - warpperRect.x)}px` + dragHintEl.style.top = `${Math.min(wrapperEl.clientHeight - wrapperEl.scrollTop - dragHintEl.clientHeight, evnt.clientY - wrapperRect.y)}px` + dragHintEl.style.left = `${Math.min(wrapperEl.clientWidth - wrapperEl.scrollLeft - dragHintEl.clientWidth - 16, evnt.clientX - wrapperRect.x)}px` } } @@ -315,7 +315,7 @@ export default defineComponent({ 'is--checked': column.fixed === 'left', 'is--disabled': isMaxFixedColumn && !column.fixed }], - title: GlobalConfig.i18n(column.fixed === 'left' ? 'vxe.toolbar.cancelfixed' : 'vxe.toolbar.fixedLeft'), + title: GlobalConfig.i18n(column.fixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft'), onClick: () => { changeFixedOption(column, 'left') } @@ -325,7 +325,7 @@ export default defineComponent({ 'is--checked': column.fixed === 'right', 'is--disabled': isMaxFixedColumn && !column.fixed }], - title: GlobalConfig.i18n(column.fixed === 'right' ? 'vxe.toolbar.cancelfixed' : 'vxe.toolbar.fixedRight'), + title: GlobalConfig.i18n(column.fixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight'), onClick: () => { changeFixedOption(column, 'right') } @@ -552,7 +552,7 @@ export default defineComponent({ h(TransitionGroup, { class: 'vxe-table-custom--body', tag: 'tbody', - name: 'vxe-table-custom--flip' + name: 'vxe-table-custom--list' }, { default: () => trVNs }) diff --git a/packages/grid/src/grid.ts b/packages/grid/src/grid.ts index e7a1675a5..39f05c80f 100644 --- a/packages/grid/src/grid.ts +++ b/packages/grid/src/grid.ts @@ -255,10 +255,11 @@ export default defineComponent({ const getRespMsg = (rest: any, defaultMsg: string) => { const proxyOpts = computeProxyOpts.value - const { props: proxyProps = {} } = proxyOpts + const resConfigs = proxyOpts.response || proxyOpts.props || {} + const messageProp = resConfigs.message let msg - if (rest && proxyProps.message) { - msg = XEUtils.get(rest, proxyProps.message) + if (rest && messageProp) { + msg = XEUtils.isFunction(messageProp) ? messageProp({ data: rest, $grid: $xegrid }) : XEUtils.get(rest, messageProp) } return msg || GlobalConfig.i18n(defaultMsg) } @@ -718,7 +719,8 @@ export default defineComponent({ const proxyOpts = computeProxyOpts.value const pagerOpts = computePagerOpts.value const toolbarOpts = computeToolbarOpts.value - const { beforeQuery, afterQuery, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {}, props: proxyProps = {} } = proxyOpts + const { beforeQuery, afterQuery, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {} } = proxyOpts + const resConfigs = proxyOpts.response || proxyOpts.props || {} const $xetable = refTable.value let button: VxeToolbarPropTypes.ButtonConfig | null = null let code: string | null = null @@ -828,16 +830,19 @@ export default defineComponent({ reactData.tableLoading = false if (rest) { if (pagerConfig && isEnableConf(pagerOpts)) { - const total = XEUtils.get(rest, proxyProps.total || 'page.total') || 0 + const totalProp = resConfigs.total + const total = (XEUtils.isFunction(totalProp) ? totalProp({ data: rest, $grid: $xegrid }) : XEUtils.get(rest, totalProp || 'page.total')) || 0 tablePage.total = XEUtils.toNumber(total) - reactData.tableData = XEUtils.get(rest, proxyProps.result || 'result') || [] + const resultProp = resConfigs.result + reactData.tableData = (XEUtils.isFunction(resultProp) ? resultProp({ data: rest, $grid: $xegrid }) : XEUtils.get(rest, resultProp || 'result')) || [] // 检验当前页码，不能超出当前最大页数 const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1) if (tablePage.currentPage > pageCount) { tablePage.currentPage = pageCount } } else { - reactData.tableData = (proxyProps.list ? XEUtils.get(rest, proxyProps.list) : rest) || [] + const listProp = resConfigs.list + reactData.tableData = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $grid: $xegrid }) : XEUtils.get(rest, listProp)) : rest) || [] } } else { reactData.tableData = [] @@ -1213,6 +1218,13 @@ export default defineComponent({ if (isEnableConf(proxyConfig) && (data || (proxyOpts.form && formOpts.data))) { errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']) } + + // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') { + // if (proxyOpts.props) { + // warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response']) + // } + // } + if (columns && columns.length) { $xegrid.loadColumn(columns) } diff --git a/packages/hooks/size.ts b/packages/hooks/size.ts index dcc453c48..173620712 100644 --- a/packages/hooks/size.ts +++ b/packages/hooks/size.ts @@ -2,7 +2,7 @@ import { computed, inject, provide, ComputedRef } from 'vue' import { SizeType } from '../../types/all' -export function useSize (props: { size: SizeType }) { +export function useSize (props: { size?: SizeType }) { // 组件尺寸上下文 const xesize = inject('xesize', null as ComputedRef | null) const computeSize = computed(() => { diff --git a/packages/locale/lang/en-US.ts b/packages/locale/lang/en-US.ts index b49256cfd..715227819 100644 --- a/packages/locale/lang/en-US.ts +++ b/packages/locale/lang/en-US.ts @@ -202,7 +202,7 @@ export default { customRestore: 'Reset', fixedLeft: 'Freeze on the left', fixedRight: 'Freeze on the right', - cancelfixed: 'Unfreeze column' + cancelFixed: 'Unfreeze column' }, input: { date: { diff --git a/packages/locale/lang/es-ES.ts b/packages/locale/lang/es-ES.ts index cffbcb1c3..58dbb2dbb 100644 --- a/packages/locale/lang/es-ES.ts +++ b/packages/locale/lang/es-ES.ts @@ -202,7 +202,7 @@ export default { customRestore: 'Restaurar', fixedLeft: 'Freeze on the left', fixedRight: 'Freeze on the right', - cancelfixed: 'Unfreeze column' + cancelFixed: 'Unfreeze column' }, entrada: { fecha: { diff --git a/packages/locale/lang/ja-JP.ts b/packages/locale/lang/ja-JP.ts index f3f93feb2..961eefbba 100644 --- a/packages/locale/lang/ja-JP.ts +++ b/packages/locale/lang/ja-JP.ts @@ -202,7 +202,7 @@ export default { customRestore: 'リセット', fixedLeft: '左側に固定', fixedRight: '右側に固定', - cancelfixed: '列固定を取消' + cancelFixed: '列固定を取消' }, input: { date: { diff --git a/packages/locale/lang/pt-BR.ts b/packages/locale/lang/pt-BR.ts index e69dee619..66d5a0236 100644 --- a/packages/locale/lang/pt-BR.ts +++ b/packages/locale/lang/pt-BR.ts @@ -202,7 +202,7 @@ export default { customRestore: 'Redefinir', fixedLeft: 'Freeze on the left', fixedRight: 'Freeze on the right', - cancelfixed: 'Unfreeze column' + cancelFixed: 'Unfreeze column' }, input: { date: { diff --git a/packages/locale/lang/zh-CN.ts b/packages/locale/lang/zh-CN.ts index 77d57355d..86966f378 100644 --- a/packages/locale/lang/zh-CN.ts +++ b/packages/locale/lang/zh-CN.ts @@ -202,7 +202,7 @@ export default { customRestore: '重置', fixedLeft: '冻结在左侧', fixedRight: '冻结在右侧', - cancelfixed: '取消冻结列' + cancelFixed: '取消冻结列' }, input: { date: { diff --git a/packages/locale/lang/zh-TC.ts b/packages/locale/lang/zh-TC.ts index c81b9854f..382736170 100644 --- a/packages/locale/lang/zh-TC.ts +++ b/packages/locale/lang/zh-TC.ts @@ -202,7 +202,7 @@ export default { customRestore: '重置', fixedLeft: '冻结在左側', fixedRight: '冻结在右側', - cancelfixed: '取消冻结列' + cancelFixed: '取消冻结列' }, input: { date: { diff --git a/packages/table/src/footer.ts b/packages/table/src/footer.ts index 29694ccbd..248c93fd9 100644 --- a/packages/table/src/footer.ts +++ b/packages/table/src/footer.ts @@ -183,6 +183,7 @@ export default defineComponent({ $table: $xetable, $grid: $xetable.xegrid, row: list, + rowIndex: _rowIndex, _rowIndex, $rowIndex, column, diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts index b67b9cdcc..2f716be33 100644 --- a/packages/table/src/table.ts +++ b/packages/table/src/table.ts @@ -4425,7 +4425,10 @@ export default defineComponent({ errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']) } setMerges(merges, reactData.mergeList, internalData.afterFullData) - return nextTick().then(() => tableMethods.updateCellAreas()) + return nextTick().then(() => { + tableMethods.updateCellAreas() + return updateStyle() + }) }, /** * 移除单元格合并 @@ -4438,6 +4441,7 @@ export default defineComponent({ const rest = removeMerges(merges, reactData.mergeList, internalData.afterFullData) return nextTick().then(() => { tableMethods.updateCellAreas() + updateStyle() return rest }) }, @@ -4452,14 +4456,19 @@ export default defineComponent({ */ clearMergeCells () { reactData.mergeList = [] - return nextTick() + return nextTick().then(() => { + return updateStyle() + }) }, setMergeFooterItems (merges) { if (props.footerSpanMethod) { errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']) } setMerges(merges, reactData.mergeFooterList) - return nextTick().then(() => tableMethods.updateCellAreas()) + return nextTick().then(() => { + tableMethods.updateCellAreas() + return updateStyle() + }) }, removeMergeFooterItems (merges) { if (props.footerSpanMethod) { @@ -4468,6 +4477,7 @@ export default defineComponent({ const rest = removeMerges(merges, reactData.mergeFooterList) return nextTick().then(() => { tableMethods.updateCellAreas() + updateStyle() return rest }) }, @@ -4482,7 +4492,9 @@ export default defineComponent({ */ clearMergeFooterItems () { reactData.mergeFooterList = [] - return nextTick() + return nextTick().then(() => { + return updateStyle() + }) }, updateCellAreas () { const { mouseConfig } = props diff --git a/packages/tooltip/src/tooltip.ts b/packages/tooltip/src/tooltip.ts index 38f082f55..e633c7de7 100644 --- a/packages/tooltip/src/tooltip.ts +++ b/packages/tooltip/src/tooltip.ts @@ -13,8 +13,8 @@ export default defineComponent({ props: { modelValue: Boolean, size: { type: String as PropType, default: () => GlobalConfig.tooltip.size || GlobalConfig.size }, - trigger: { type: String as PropType, default: () => GlobalConfig.tooltip.trigger }, - theme: { type: String as PropType, default: () => GlobalConfig.tooltip.theme }, + trigger: { type: String as PropType, default: () => GlobalConfig.tooltip.trigger || 'hover' }, + theme: { type: String as PropType, default: () => GlobalConfig.tooltip.theme || 'dark' }, content: { type: [String, Number] as PropType, default: null }, useHTML: Boolean as PropType, zIndex: [String, Number] as PropType, diff --git a/packages/v-x-e-table/index.ts b/packages/v-x-e-table/index.ts index d7af0a79d..44636c937 100644 --- a/packages/v-x-e-table/index.ts +++ b/packages/v-x-e-table/index.ts @@ -7,7 +7,7 @@ import { menus } from './src/menus' import { formats } from './src/formats' import { validators } from './src/validators' import { hooks } from './src/hooks' -import { config } from './src/config' +import { setConfig } from './src/config' import { setTheme } from './src/theme' import { getLastZIndex, nextZIndex } from '../tools/utils' @@ -82,14 +82,14 @@ export const v = 'v4' /** * @deprecated */ -export const setup = config +export const setup = setConfig export const globalStore = {} export const VXETable = { v, version: process.env.VUE_APP_VXE_TABLE_VERSION, - config, + setConfig, globalStore, interceptor, renderer, @@ -103,6 +103,7 @@ export const VXETable = { _t, // 已废弃 + config: setConfig, setup, globalConfs } as VXETableCore diff --git a/packages/v-x-e-table/src/conf.ts b/packages/v-x-e-table/src/conf.ts index 9a65d255a..b9bd14363 100644 --- a/packages/v-x-e-table/src/conf.ts +++ b/packages/v-x-e-table/src/conf.ts @@ -138,6 +138,53 @@ const GlobalConfig: VXETableConfigOptions = { export: { types: {} }, + grid: { + // size: null, + // zoomConfig: { + // escRestore: true + // }, + formConfig: { + enabled: true + }, + pagerConfig: { + enabled: true + // perfect: false + }, + toolbarConfig: { + enabled: true + // perfect: false + }, + proxyConfig: { + enabled: true, + autoLoad: true, + message: true, + props: { + list: null, + result: 'result', + total: 'page.total', + message: 'message' + } + // beforeItem: null, + // beforeColumn: null, + // beforeQuery: null, + // afterQuery: null, + // beforeDelete: null, + // afterDelete: null, + // beforeSave: null, + // afterSave: null + } + }, + toolbar: { + // size: null, + // import: { + // mode: 'covering' + // }, + // export: { + // types: ['csv', 'html', 'xml', 'txt'] + // }, + // buttons: [] + }, + icon: { // loading LOADING: iconPrefix + 'spinner roll vxe-loading--default-icon', @@ -220,42 +267,6 @@ const GlobalConfig: VXETableConfigOptions = { FORM_FOLDING: iconPrefix + 'arrow-up rotate180', FORM_UNFOLDING: iconPrefix + 'arrow-up' }, - grid: { - // size: null, - // zoomConfig: { - // escRestore: true - // }, - formConfig: { - enabled: true - }, - pagerConfig: { - enabled: true - // perfect: false - }, - toolbarConfig: { - enabled: true - // perfect: false - }, - proxyConfig: { - enabled: true, - autoLoad: true, - message: true, - props: { - list: null, - result: 'result', - total: 'page.total', - message: 'message' - } - // beforeItem: null, - // beforeColumn: null, - // beforeQuery: null, - // afterQuery: null, - // beforeDelete: null, - // afterDelete: null, - // beforeSave: null, - // afterSave: null - } - }, tooltip: { // size: null, trigger: 'hover', @@ -313,16 +324,6 @@ const GlobalConfig: VXETableConfigOptions = { // }, multiCharOverflow: 8 }, - toolbar: { - // size: null, - // import: { - // mode: 'covering' - // }, - // export: { - // types: ['csv', 'html', 'xml', 'txt'] - // }, - // buttons: [] - }, button: { // size: null, // transfer: false diff --git a/packages/v-x-e-table/src/config.ts b/packages/v-x-e-table/src/config.ts index b56e47ebb..0a18ad0aa 100644 --- a/packages/v-x-e-table/src/config.ts +++ b/packages/v-x-e-table/src/config.ts @@ -8,7 +8,7 @@ import { VxeGlobalConfigMethod } from '../../../types/all' /** * 全局参数设置 */ -export const config: VxeGlobalConfigMethod = (options) => { +export const setConfig: VxeGlobalConfigMethod = (options) => { if (options) { if (options.theme) { setTheme(options) @@ -19,3 +19,5 @@ export const config: VxeGlobalConfigMethod = (options) => { } return XEUtils.merge(GlobalConfig, options) } + +export const config = setConfig diff --git a/packages/v-x-e-table/src/store.ts b/packages/v-x-e-table/src/store.ts index 874b9b1ad..9b5e84ff2 100644 --- a/packages/v-x-e-table/src/store.ts +++ b/packages/v-x-e-table/src/store.ts @@ -22,18 +22,18 @@ export class Store { return this.store[name] } - add (name: string, render: any): Store { + add (name: string, options: any): Store { const conf = this.store[name] // 检测是否覆盖 if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') { const confKeys = XEUtils.keys(conf) - XEUtils.each(render, (item, key) => { + XEUtils.each(options, (item, key) => { if (confKeys.includes(key)) { warnLog('vxe.error.coverProp', [name, key]) } }) } - this.store[name] = conf ? XEUtils.merge(conf, render) : render + this.store[name] = conf ? XEUtils.merge(conf, options) : options return this } diff --git a/styles/custom.scss b/styles/custom.scss index 3f225c641..ff87b7cc9 100644 --- a/styles/custom.scss +++ b/styles/custom.scss @@ -263,7 +263,7 @@ } } -.vxe-table-custom--flip-move { +.vxe-table-custom--list-move { transition: transform 0.35s; } diff --git a/types/column.d.ts b/types/column.d.ts index 5f7b67303..8c2a0caa2 100644 --- a/types/column.d.ts +++ b/types/column.d.ts @@ -414,6 +414,8 @@ export namespace VxeColumnSlotTypes { } export interface FooterSlotParams { + row: D + rowIndex: number column: VxeTableDefines.ColumnInfo columnIndex: number _columnIndex: number diff --git a/types/grid.d.ts b/types/grid.d.ts index 23999446c..dea782a9e 100644 --- a/types/grid.d.ts +++ b/types/grid.d.ts @@ -243,11 +243,23 @@ export namespace VxeGridPropTypes { sort?: boolean filter?: boolean form?: boolean - props?: { - list?: string | null - result?: string - total?: string - message?: string + response?: { + list?: string | null | ((params: { + data: any + $grid: VxeGridConstructor + }) => any[]) + result?: string | ((params: { + data: any + $grid: VxeGridConstructor + }) => any[]) + total?: string | ((params: { + data: any + $grid: VxeGridConstructor + }) => number) + message?: string | ((params: { + data: any + $grid: VxeGridConstructor + }) => string) } ajax?: { query?(params: ProxyAjaxQueryParams, ...args: any[]): Promise @@ -256,6 +268,33 @@ export namespace VxeGridPropTypes { save?(params: ProxyAjaxSaveParams, ...args: any[]): Promise } [key: string]: any + + /** + * 已废弃，请使用 proxy-config.response + * @deprecated + */ + props?: { + /** + * 已废弃，请使用 proxy-config.response.list + * @deprecated + */ + list?: string | null + /** + * 已废弃，请使用 proxy-config.response.result + * @deprecated + */ + result?: string + /** + * 已废弃，请使用 proxy-config.response.total + * @deprecated + */ + total?: string + /** + * 已废弃，请使用 proxy-config.response.message + * @deprecated + */ + message?: string + } } export interface ProxyOpts extends ProxyConfig { } diff --git a/types/pager.d.ts b/types/pager.d.ts index 0dcb0f752..89ca0e56f 100644 --- a/types/pager.d.ts +++ b/types/pager.d.ts @@ -157,10 +157,10 @@ export interface PagerMethods { export interface VxePagerMethods extends PagerMethods { } export interface PagerPrivateMethods { - handlePrevPage(evnt: Event): void, - handleNextPage(evnt: Event): void, - handlePrevJump(evnt: Event): void, - handleNextJump(evnt: Event): void, + handlePrevPage(evnt: Event): void + handleNextPage(evnt: Event): void + handlePrevJump(evnt: Event): void + handleNextJump(evnt: Event): void } export interface VxePagerPrivateMethods extends PagerPrivateMethods { } diff --git a/types/table.d.ts b/types/table.d.ts index f10ec492c..23c69015c 100644 --- a/types/table.d.ts +++ b/types/table.d.ts @@ -3048,7 +3048,8 @@ export namespace VxeTableDefines { export interface CellRenderFooterParams { $table: VxeTableConstructor & VxeTablePrivateMethods $grid: VxeGridConstructor | null - row: any + row: D + rowIndex: number _rowIndex: number $rowIndex: number column: ColumnInfo @@ -3059,6 +3060,7 @@ export namespace VxeTableDefines { type: string data: any[][] + // 兼容旧 itemIndex: number items: any[] } diff --git a/types/v-x-e-table/index.d.ts b/types/v-x-e-table/index.d.ts index 04ccbd64d..3c2e5902b 100644 --- a/types/v-x-e-table/index.d.ts +++ b/types/v-x-e-table/index.d.ts @@ -34,7 +34,7 @@ export type VxeGlobalI18n = (key: string, args?: any) => string export type VxeGlobalTranslate = (key: string, args?: any) => string export type VxeGlobalUse = (plugin: VXETablePluginObject, ...options: any[]) => VXETableCore -export const config: VxeGlobalConfigMethod +export const setConfig: VxeGlobalConfigMethod export const interceptor: VxeGlobalInterceptor export const renderer: VxeGlobalRenderer export const commands: VxeGlobalCommands @@ -50,6 +50,7 @@ export const t: VxeGlobalI18n export const _t: VxeGlobalTranslate export const use: VxeGlobalUse +export const config: VxeGlobalConfigMethod /** * 请使用 config * @deprecated @@ -88,7 +89,7 @@ export interface VXETableCore { /** * 设置全局参数/获取所有参数 */ - config: VxeGlobalConfigMethod + setConfig: VxeGlobalConfigMethod /** * 读取内部数据 */ @@ -149,6 +150,7 @@ export interface VXETableCore { t: VxeGlobalI18n _t: VxeGlobalTranslate + config: VxeGlobalConfigMethod /** * @deprecated 已废弃 */