diff --git a/package.json b/package.json index 42b6a674d..27c79d0a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table", - "version": "3.7.8-beta.0", + "version": "3.7.8", "description": "一个基于 vue 的 PC 端表单/表格组件,支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...", "scripts": { "update": "npm install --legacy-peer-deps", diff --git a/packages/filter/src/panel.js b/packages/filter/src/panel.js index 3d349375b..4d83861f3 100644 --- a/packages/filter/src/panel.js +++ b/packages/filter/src/panel.js @@ -116,7 +116,8 @@ export default { ] }, renderFooter (h) { - const { hasCheckOption, filterStore } = this + const { $parent: $xetable, hasCheckOption, filterStore } = this + const { filterOpts } = $xetable const { column, multiple } = filterStore const filterRender = column.filterRender const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null @@ -135,12 +136,12 @@ export default { on: { click: this.confirmFilter } - }, GlobalConfig.i18n('vxe.table.confirmFilter')), + }, filterOpts.confirmButtonText || GlobalConfig.i18n('vxe.table.confirmFilter')), h('button', { on: { click: this.resetFilter } - }, GlobalConfig.i18n('vxe.table.resetFilter')) + }, filterOpts.resetButtonText || GlobalConfig.i18n('vxe.table.resetFilter')) ]) ] : [] }, diff --git a/packages/table/src/cell.js b/packages/table/src/cell.js index b7fa9bb9f..c68bbdacd 100644 --- a/packages/table/src/cell.js +++ b/packages/table/src/cell.js @@ -6,7 +6,7 @@ import UtilTools, { eqEmptyValue, isEnableConf, getFuncText } from '../../tools/ import { getRowid, getColumnConfig } from './util' import { getSlotVNs } from '../../tools/vn' -function renderHelpIcon (h, params) { +function renderTitlePrefixIcon (h, params) { const { $table, column } = params const titlePrefix = column.titlePrefix || column.titleHelp return titlePrefix ? [ @@ -159,7 +159,7 @@ export const Cell = { return renderTitleContent(h, params, UtilTools.formatText(column.getTitle(), 1)) }, renderDefaultHeader (h, params) { - return renderHelpIcon(h, params).concat(Cell.renderHeaderTitle(h, params)) + return renderTitlePrefixIcon(h, params).concat(Cell.renderHeaderTitle(h, params)) }, renderDefaultCell (h, params) { const { $table, row, column } = params