diff --git a/package.json b/package.json index 0cc3b44958..af3de80979 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table", - "version": "4.7.52", + "version": "4.7.53", "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.68" + "vxe-pc-ui": "^4.0.70" }, "devDependencies": { "@types/resize-observer-browser": "^0.1.11", diff --git a/packages/locale/lang/en-US.ts b/packages/locale/lang/en-US.ts index aa04ce50cb..678d027c12 100644 --- a/packages/locale/lang/en-US.ts +++ b/packages/locale/lang/en-US.ts @@ -198,7 +198,8 @@ export default { zoomMin: 'Minimize', zoomIn: 'Maximize', zoomOut: 'Reduction', - close: 'Close' + close: 'Close', + miniMaxSize: 'The number of minimized Windows cannot exceed {0}.' }, drawer: { close: 'Close' diff --git a/packages/locale/lang/es-ES.ts b/packages/locale/lang/es-ES.ts index 1a832b6406..433fe67f3e 100644 --- a/packages/locale/lang/es-ES.ts +++ b/packages/locale/lang/es-ES.ts @@ -198,7 +198,8 @@ export default { zoomMin: 'Minimize', zoomIn: 'Maximize', zoomOut: 'Reducir', - close: 'Cerrar' + close: 'Cerrar', + miniMaxSize: 'The number of minimized Windows cannot exceed {0}.' }, drawer: { close: 'Cerrar' diff --git a/packages/locale/lang/ja-JP.ts b/packages/locale/lang/ja-JP.ts index 0c45d2084d..997ce4f181 100644 --- a/packages/locale/lang/ja-JP.ts +++ b/packages/locale/lang/ja-JP.ts @@ -198,7 +198,8 @@ export default { zoomMin: 'Minimize', zoomIn: 'Maximize', zoomOut: '縮小', - close: '閉じる' + close: '閉じる', + miniMaxSize: 'The number of minimized Windows cannot exceed {0}.' }, drawer: { close: '閉じる' diff --git a/packages/locale/lang/pt-BR.ts b/packages/locale/lang/pt-BR.ts index 6c5f5421cc..32f5290a31 100644 --- a/packages/locale/lang/pt-BR.ts +++ b/packages/locale/lang/pt-BR.ts @@ -198,7 +198,8 @@ export default { zoomMin: 'Minimize', zoomIn: 'Maximize', zoomOut: 'Restaurar', - close: 'Fechar' + close: 'Fechar', + miniMaxSize: 'The number of minimized Windows cannot exceed {0}.' }, drawer: { close: 'Fechar' diff --git a/packages/locale/lang/zh-CN.ts b/packages/locale/lang/zh-CN.ts index 8ad4ce20ad..c7579c0890 100644 --- a/packages/locale/lang/zh-CN.ts +++ b/packages/locale/lang/zh-CN.ts @@ -198,7 +198,8 @@ export default { zoomMin: '最小化', zoomIn: '最大化', zoomOut: '还原', - close: '关闭' + close: '关闭', + miniMaxSize: '最小化窗口的数量不能超过 {0} 个' }, drawer: { close: '关闭' diff --git a/packages/locale/lang/zh-TC.ts b/packages/locale/lang/zh-TC.ts index 30a4657a5f..51af889c15 100644 --- a/packages/locale/lang/zh-TC.ts +++ b/packages/locale/lang/zh-TC.ts @@ -198,7 +198,8 @@ export default { zoomMin: '最小化', zoomIn: '最大化', zoomOut: '還原', - close: '關閉' + close: '關閉', + miniMaxSize: '最小化窗口的數量不能超過 {0} 個' }, drawer: { close: '關閉' diff --git a/packages/table/module/filter/panel.ts b/packages/table/module/filter/panel.ts index d70534bf78..2bcd61ae02 100644 --- a/packages/table/module/filter/panel.ts +++ b/packages/table/module/filter/panel.ts @@ -193,7 +193,7 @@ export default defineComponent({ const { filterRender } = column const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate - return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false) : true) + return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false) : true) ? [ h('div', { class: 'vxe-table--filter-footer' diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts index b613f6cb5b..43ccfa2d80 100644 --- a/packages/table/src/table.ts +++ b/packages/table/src/table.ts @@ -1242,21 +1242,16 @@ export default defineComponent({ }) } internalData.headerHeight = headerHeight - let overflowX = false let footerHeight = 0 let scrollbarHeight = 0 if (footerElem) { footerHeight = footerElem.offsetHeight overflowX = tableWidth > footerElem.clientWidth - if (overflowX) { - scrollbarHeight = Math.max(footerHeight - footerElem.clientHeight, 0) - } + scrollbarHeight = Math.max(footerHeight - footerElem.clientHeight, 0) } else { overflowX = tableWidth > bodyWidth - if (overflowX) { - scrollbarHeight = Math.max(tableHeight - bodyElem.clientHeight, 0) - } + scrollbarHeight = Math.max(tableHeight - bodyElem.clientHeight, 0) } internalData.footerHeight = footerHeight reactData.overflowX = overflowX