releases 4.7.53
This commit is contained in:
@@ -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'
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -198,7 +198,8 @@ export default {
|
||||
zoomMin: 'Minimize',
|
||||
zoomIn: 'Maximize',
|
||||
zoomOut: '縮小',
|
||||
close: '閉じる'
|
||||
close: '閉じる',
|
||||
miniMaxSize: 'The number of minimized Windows cannot exceed {0}.'
|
||||
},
|
||||
drawer: {
|
||||
close: '閉じる'
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -198,7 +198,8 @@ export default {
|
||||
zoomMin: '最小化',
|
||||
zoomIn: '最大化',
|
||||
zoomOut: '还原',
|
||||
close: '关闭'
|
||||
close: '关闭',
|
||||
miniMaxSize: '最小化窗口的数量不能超过 {0} 个'
|
||||
},
|
||||
drawer: {
|
||||
close: '关闭'
|
||||
|
||||
@@ -198,7 +198,8 @@ export default {
|
||||
zoomMin: '最小化',
|
||||
zoomIn: '最大化',
|
||||
zoomOut: '還原',
|
||||
close: '關閉'
|
||||
close: '關閉',
|
||||
miniMaxSize: '最小化窗口的數量不能超過 {0} 個'
|
||||
},
|
||||
drawer: {
|
||||
close: '關閉'
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user