vxe-table 4.7.51 → 4.7.53

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const log=_core.VxeUI["log"],version="table v4.7.51",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const log=_core.VxeUI["log"],version="table v4.7.53",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.7.51",
+  "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.67"
+    "vxe-pc-ui": "^4.0.70"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

package/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'

package/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'

package/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: '閉じる'

package/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'

package/packages/locale/lang/zh-CN.ts

@@ -198,7 +198,8 @@ export default {
       zoomMin: '最小化',
       zoomIn: '最大化',
       zoomOut: '还原',
-      close: '关闭'
+      close: '关闭',
+      miniMaxSize: '最小化窗口的数量不能超过 {0} 个'
     },
     drawer: {
       close: '关闭'

package/packages/locale/lang/zh-TC.ts

@@ -198,7 +198,8 @@ export default {
       zoomMin: '最小化',
       zoomIn: '最大化',
       zoomOut: '還原',
-      close: '關閉'
+      close: '關閉',
+      miniMaxSize: '最小化窗口的數量不能超過 {0} 個'
     },
     drawer: {
       close: '關閉'

package/packages/table/module/filter/hook.ts

@@ -14,7 +14,7 @@ const tableFilterMethodKeys: (keyof TableFilterMethods)[] = ['setFilter', 'clear
 hooks.add('tableFilterModule', {
   setupTable ($xeTable) {
     const { props, reactData, internalData } = $xeTable
-    const { refTableBody, refTableFilter } = $xeTable.getRefMaps()
+    const { refTableHeader, refTableBody, refTableFilter } = $xeTable.getRefMaps()
     const { computeFilterOpts, computeMouseOpts } = $xeTable.getComputeMaps()
 
     const filterPrivateMethods: TableFilterPrivateMethods = {
@@ -63,31 +63,34 @@ hooks.add('tableFilterModule', {
           filterStore.visible = true
           initStore.filter = true
           nextTick(() => {
+            const tableHeader = refTableHeader.value
             const tableBody = refTableBody.value
+            const headerElem = tableHeader ? tableHeader.$el as HTMLDivElement : null
             const bodyElem = tableBody.$el as HTMLDivElement
+            if (!bodyElem) {
+              return
+            }
             const tableFilter = refTableFilter.value
             const filterWrapperElem = tableFilter ? tableFilter.$el as HTMLDivElement : null
-            let filterWidth = 0
-            let filterHeight = 0
-            let filterHeadElem: HTMLDivElement | null = null
-            let filterFootElem: HTMLDivElement | null = null
-            if (filterWrapperElem) {
-              filterWidth = filterWrapperElem.offsetWidth
-              filterHeight = filterWrapperElem.offsetHeight
-              filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header')
-              filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer')
+            if (!filterWrapperElem) {
+              return
             }
+            const filterWidth = filterWrapperElem.offsetWidth
+            const filterHeight = filterWrapperElem.offsetHeight
+            const filterHeadElem = filterWrapperElem.querySelector<HTMLDivElement>('.vxe-table--filter-header')
+            const filterFootElem = filterWrapperElem.querySelector<HTMLDivElement>('.vxe-table--filter-footer')
             const centerWidth = filterWidth / 2
             const minMargin = 10
             const maxLeft = bodyElem.clientWidth - filterWidth - minMargin
             let left, right
             const style: any = {
-              top: `${targetElem.offsetTop + targetElem.offsetParent.offsetTop + targetElem.offsetHeight + 8}px`
+              top: `${targetElem.offsetTop + targetElem.offsetParent.offsetTop + targetElem.offsetHeight}px`
             }
             // 判断面板不能大于表格高度
             let maxHeight: number | null = null
-            if (filterHeight >= bodyElem.clientHeight) {
-              maxHeight = Math.max(60, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0))
+            const bodyHeight = bodyElem.clientHeight - (headerElem ? headerElem.clientHeight / 2 : 0)
+            if (filterHeight >= bodyHeight) {
+              maxHeight = Math.max(40, bodyHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0))
             }
             if (column.fixed === 'left') {
               left = targetElem.offsetLeft + targetElem.offsetParent.offsetLeft - centerWidth

package/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'

package/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