vxe-table 3.19.42 → 3.19.44

package/packages/locale/lang/ja-JP.ts

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/ko-KR.ts

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/ms-MY.ts

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/nb-NO.ts

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/pt-BR.ts

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/ru-RU.ts

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/th-TH.ts

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '$'
     },

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

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/uk-UA.ts

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/uz-UZ.ts

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '¥'
     },

package/packages/locale/lang/vi-VN.ts

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '$'
     },

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

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '¥'
     },

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

@@ -333,6 +333,10 @@ export default {
         }
       }
     },
+    calendar: {
+      yearLabel: '{0} 年',
+      monthLabel: '{0} 月'
+    },
     numberInput: {
       currencySymbol: '¥'
     },

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

@@ -5,6 +5,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'
 
 import type { VxeGlobalRendererOptions, VxeComponentSizeType } from 'vxe-pc-ui'
 import type { VxeTableConstructor, VxeTablePrivateMethods, TableInternalData, VxeTableDefines, VxeColumnPropTypes } from '../../../../types'
@@ -272,9 +273,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
       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'
@@ -289,12 +297,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
                 on: {
                   click: ($xeFilterPanel as any).confirmFilter
                 }
-              }, filterOpts.confirmButtonText || getI18n('vxe.table.confirmFilter')),
+              }, confirmButtonText || getI18n('vxe.table.confirmFilter')),
               h('button', {
                 on: {
                   click: ($xeFilterPanel as any).resetFilter
                 }
-              }, filterOpts.resetButtonText || getI18n('vxe.table.resetFilter'))
+              }, resetButtonText || getI18n('vxe.table.resetFilter'))
             ])
           ]
         : []

package/packages/table/src/table.ts

@@ -1756,7 +1756,7 @@ export default {
 
     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
@@ -1871,8 +1871,8 @@ export default {
         errLog('vxe.error.notProp', ['mouse-config.area'])
         return
       }
-      if (areaOpts.selectCellByHeader && columnOpts.drag && columnDragOpts.trigger === 'cell') {
-        errLog('vxe.error.notSupportProp', ['area-config.selectCellByHeader & column-config.drag', 'column-drag-config.trigger=cell', 'column-drag-config.trigger=default'])
+      if (mouseOpts.area && areaOpts.selectCellByHeader && columnOpts.drag && columnDragOpts.trigger === 'cell') {
+        errLog('vxe.error.notSupportProp', ['area-config.selectCellByHeader & column-config.drag', 'column-drag-config.trigger=cell', 'column-drag-config.trigger=default | area-config.selectCellByHeader=false'])
       }
     }
     if (!$xeTable.handlePivotTableAggregateData) {
@@ -1927,6 +1927,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 => {

package/styles/components/toolbar.scss

@@ -4,7 +4,7 @@
   display: flex;
   flex-direction: row;
   align-items: center;
-  padding: 0.6em 0;
+  padding: 0.5em 0;
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
   background-color: var(--vxe-ui-layout-background-color);
@@ -104,13 +104,17 @@
 
 .vxe-toolbar {
   font-size: var(--vxe-ui-font-size-default);
+  min-height: var(--vxe-ui-toolbar-height-default);
   &.size--medium {
     font-size: var(--vxe-ui-font-size-medium);
+    min-height: var(--vxe-ui-toolbar-height-medium);
   }
   &.size--small {
     font-size: var(--vxe-ui-font-size-small);
+    min-height: var(--vxe-ui-toolbar-height-small);
   }
   &.size--mini {
     font-size: var(--vxe-ui-font-size-mini);
+    min-height: var(--vxe-ui-toolbar-height-mini);
   }
 }

package/styles/theme/base.scss

@@ -84,4 +84,8 @@
 
   /*toolbar*/
   --vxe-ui-toolbar-custom-active-background-color: #D9DADB;
+  --vxe-ui-toolbar-height-default: 48px;
+  --vxe-ui-toolbar-height-medium: 46px;
+  --vxe-ui-toolbar-height-small: 44px;
+  --vxe-ui-toolbar-height-mini: 42px;
 }