vxe-table 3.19.43 → 3.19.44

package/lib/index.umd.js

@@ -11487,6 +11487,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
 
 
 
+
 const {
   getI18n: filter_panel_getI18n,
   getIcon: filter_panel_getIcon,
@@ -11733,9 +11734,20 @@ function filterCheckAllEvent($xeFilterPanel, evnt, value) {
         filterRender,
         filterMultiple
       } = column;
+      const {
+        confirmButtonText,
+        resetButtonText,
+        showFooter
+      } = filterOpts;
       const compConf = isEnableConf(filterRender) ? panel_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) ? [h('div', {
+      let showFlFoot = !!filterMultiple;
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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'
       }, [h('button', {
         class: {
@@ -11747,11 +11759,11 @@ function filterCheckAllEvent($xeFilterPanel, evnt, value) {
         on: {
           click: $xeFilterPanel.confirmFilter
         }
-      }, filterOpts.confirmButtonText || filter_panel_getI18n('vxe.table.confirmFilter')), h('button', {
+      }, confirmButtonText || filter_panel_getI18n('vxe.table.confirmFilter')), h('button', {
         on: {
           click: $xeFilterPanel.resetFilter
         }
-      }, filterOpts.resetButtonText || filter_panel_getI18n('vxe.table.resetFilter'))])] : [];
+      }, resetButtonText || filter_panel_getI18n('vxe.table.resetFilter'))])] : [];
     },
     renderVN(h) {
       const $xeFilterPanel = this;
@@ -20361,7 +20373,8 @@ function renderBody(h, $xeTable) {
     const {
       exportConfig,
       importConfig,
-      treeConfig
+      treeConfig,
+      minHeight
     } = props;
     const {
       scrollXStore,
@@ -20536,6 +20549,9 @@ function renderBody(h, $xeTable) {
     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) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(['rowField', 'parentField', 'childrenField', 'hasChildField', 'mapChildrenField'], key => {
         const val = treeOpts[key];
@@ -26182,6 +26198,10 @@ const Toolbar = VxeToolbar;
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '¥'
     },