vxe-table 4.7.51 → 4.7.53

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.51";
+const version = "4.7.53";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.51";
+core_.VxeUI.tableVersion = "4.7.53";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2331,7 +2331,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.51"}`;
+const log_version = `table v${"4.7.53"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7479,7 +7479,7 @@ const {
       } = column;
       const compConf = isEnableConf(filterRender) ? panel_renderer.get(filterRender.name) : null;
       const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
-      return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false) : true) ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false) : true) ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table--filter-footer'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
         class: {
@@ -9505,14 +9505,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       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;
@@ -16457,6 +16453,7 @@ hook_hooks.add('tableFilterModule', {
       internalData
     } = $xeTable;
     const {
+      refTableHeader,
       refTableBody,
       refTableFilter
     } = $xeTable.getRefMaps();
@@ -16531,31 +16528,34 @@ hook_hooks.add('tableFilterModule', {
           filterStore.visible = true;
           initStore.filter = true;
           (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+            const tableHeader = refTableHeader.value;
             const tableBody = refTableBody.value;
+            const headerElem = tableHeader ? tableHeader.$el : null;
             const bodyElem = tableBody.$el;
+            if (!bodyElem) {
+              return;
+            }
             const tableFilter = refTableFilter.value;
             const filterWrapperElem = tableFilter ? tableFilter.$el : null;
-            let filterWidth = 0;
-            let filterHeight = 0;
-            let filterHeadElem = null;
-            let filterFootElem = 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('.vxe-table--filter-header');
+            const filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
             const centerWidth = filterWidth / 2;
             const minMargin = 10;
             const maxLeft = bodyElem.clientWidth - filterWidth - minMargin;
             let left, right;
             const style = {
-              top: `${targetElem.offsetTop + targetElem.offsetParent.offsetTop + targetElem.offsetHeight + 8}px`
+              top: `${targetElem.offsetTop + targetElem.offsetParent.offsetTop + targetElem.offsetHeight}px`
             };
             // 判断面板不能大于表格高度
             let maxHeight = 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;
@@ -24253,7 +24253,8 @@ const Grid = VxeGrid;
       zoomMin: '最小化',
       zoomIn: '最大化',
       zoomOut: '还原',
-      close: '关闭'
+      close: '关闭',
+      miniMaxSize: '最小化窗口的数量不能超过 {0} 个'
     },
     drawer: {
       close: '关闭'