vxe-table 3.19.43 → 3.19.45

package/es/table/module/filter/panel.js

@@ -4,6 +4,7 @@ import { formatText, isEnableConf } from '../../../ui/src/utils';
 import { getPropClass, toCssUnit } from '../../../ui/src/dom';
 import { getSlotVNs } from '../../../ui/src/vn';
 import { warnLog } from '../../../ui/src/log';
+import XEUtils from 'xe-utils';
 const { getI18n, getIcon, renderer, globalMixins, renderEmptyElement } = VxeUI;
 // 全部筛选事件
 function filterCheckAllEvent($xeFilterPanel, evnt, value) {
@@ -234,9 +235,17 @@ export default {
             const filterOpts = $xeTable.computeFilterOpts;
             const hasCheckOption = $xeFilterPanel.computeHasCheckOption;
             const { filterRender, filterMultiple } = column;
+            const { confirmButtonText, resetButtonText, showFooter } = filterOpts;
             const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
             const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
-            return filterMultiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false) : true)
+            let showFlFoot = !!filterMultiple;
+            if (XEUtils.isBoolean(showFooter)) {
+                showFlFoot = showFooter;
+            }
+            else if (compConf) {
+                showFlFoot = !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false);
+            }
+            return showFlFoot
                 ? [
                     h('div', {
                         class: 'vxe-table--filter-footer'
@@ -251,12 +260,12 @@ export default {
                             on: {
                                 click: $xeFilterPanel.confirmFilter
                             }
-                        }, filterOpts.confirmButtonText || getI18n('vxe.table.confirmFilter')),
+                        }, confirmButtonText || getI18n('vxe.table.confirmFilter')),
                         h('button', {
                             on: {
                                 click: $xeFilterPanel.resetFilter
                             }
-                        }, filterOpts.resetButtonText || getI18n('vxe.table.resetFilter'))
+                        }, resetButtonText || getI18n('vxe.table.resetFilter'))
                     ])
                 ]
                 : [];

package/es/table/render/index.js

@@ -725,6 +725,16 @@ function handleNumberCell(h, renderOpts, params) {
         }
         : {});
 }
+function handleFormatDatePicker(renderOpts, params) {
+    const { props = {} } = renderOpts;
+    const { cellValue } = params;
+    if (cellValue) {
+        if (props.type !== 'time') {
+            return getLabelFormatDate(cellValue, props);
+        }
+    }
+    return cellValue;
+}
 function handleFormatSelect(renderOpts, params) {
     const { cellValue } = params;
     return handleSelectCellValue(cellValue, renderOpts);
@@ -954,6 +964,7 @@ renderer.mixin({
             }
             return getCellLabelVNs(h, renderOpts, params, cellValue);
         },
+        tableCellFormatter: handleFormatDatePicker,
         renderTableDefault: defaultEditRender,
         createTableFilterOptions: defaultFilterOptions,
         renderTableFilter: defaultFilterRender,

package/es/table/src/table.js

@@ -1624,7 +1624,7 @@ export default {
         const internalData = $xeTable;
         XEUtils.assign(internalData, createInternalData());
         handleKeyField($xeTable);
-        const { exportConfig, importConfig, treeConfig } = props;
+        const { exportConfig, importConfig, treeConfig, minHeight } = props;
         const { scrollXStore, scrollYStore } = internalData;
         const columnOpts = $xeTable.computeColumnOpts;
         const columnDragOpts = $xeTable.computeColumnDragOpts;
@@ -1793,6 +1793,9 @@ export default {
         if (checkboxOpts.halfField) {
             warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
         }
+        if (props.editConfig && isEnableConf(editOpts) && props.editRules && (minHeight === 0 || minHeight === '0')) {
+            warnLog('vxe.error.reqSupportProp', ['edit-config & edit-rules', 'min-height']);
+        }
         if (treeConfig) {
             XEUtils.arrayEach(['rowField', 'parentField', 'childrenField', 'hasChildField', 'mapChildrenField'], key => {
                 const val = treeOpts[key];

package/es/table/style.css

@@ -1523,7 +1523,7 @@
   border: 1px solid var(--vxe-ui-base-popup-border-color);
   color: var(--vxe-ui-font-color);
   box-shadow: var(--vxe-ui-base-popup-box-shadow);
-  z-index: 10;
+  z-index: 15;
 }
 .vxe-table--filter-wrapper:not(.is--multiple) .vxe-table--filter-header,
 .vxe-table--filter-wrapper:not(.is--multiple) .vxe-table--filter-body {