vxe-table 3.19.43 → 3.19.45

package/lib/vxe-toolbar/style/style.css

@@ -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);
@@ -94,13 +94,17 @@
 
 .vxe-toolbar {
   font-size: var(--vxe-ui-font-size-default);
+  min-height: var(--vxe-ui-toolbar-height-default);
 }
 .vxe-toolbar.size--medium {
   font-size: var(--vxe-ui-font-size-medium);
+  min-height: var(--vxe-ui-toolbar-height-medium);
 }
 .vxe-toolbar.size--small {
   font-size: var(--vxe-ui-font-size-small);
+  min-height: var(--vxe-ui-toolbar-height-small);
 }
 .vxe-toolbar.size--mini {
   font-size: var(--vxe-ui-font-size-mini);
+  min-height: var(--vxe-ui-toolbar-height-mini);
 }

package/lib/vxe-toolbar/style/style.min.css

@@ -1 +1 @@
-.vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:var(--vxe-ui-toolbar-custom-active-background-color);border-radius:50%}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-tool--item-wrapper{flex-grow:1}.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{flex-shrink:0}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--item-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{display:flex;align-items:center;flex-wrap:wrap}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini)}
+.vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.5em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:var(--vxe-ui-toolbar-custom-active-background-color);border-radius:50%}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-tool--item-wrapper{flex-grow:1}.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{flex-shrink:0}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--item-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{display:flex;align-items:center;flex-wrap:wrap}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default);min-height:var(--vxe-ui-toolbar-height-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium);min-height:var(--vxe-ui-toolbar-height-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small);min-height:var(--vxe-ui-toolbar-height-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini);min-height:var(--vxe-ui-toolbar-height-mini)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.19.43",
+  "version": "3.19.45",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/locale/lang/ar-EG.ts

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

package/packages/locale/lang/de-DE.ts

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

package/packages/locale/lang/en-US.ts

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

package/packages/locale/lang/es-ES.ts

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

package/packages/locale/lang/fr-FR.ts

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

package/packages/locale/lang/hu-HU.ts

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

package/packages/locale/lang/hy-AM.ts

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

package/packages/locale/lang/id-ID.ts

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

package/packages/locale/lang/it-IT.ts

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

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/render/index.ts

@@ -793,6 +793,17 @@ function handleNumberCell (h: CreateElement, renderOpts: VxeGlobalRendererHandle
     : {})
 }
 
+function handleFormatDatePicker (renderOpts: VxeGlobalRendererHandles.RenderTableDefaultOptions, params: VxeGlobalRendererHandles.TableCellFormatterParams) {
+  const { props = {} } = renderOpts
+  const { cellValue } = params
+  if (cellValue) {
+    if (props.type !== 'time') {
+      return getLabelFormatDate(cellValue, props)
+    }
+  }
+  return cellValue
+}
+
 function handleFormatSelect (renderOpts: VxeGlobalRendererHandles.RenderTableDefaultOptions, params: VxeGlobalRendererHandles.TableCellFormatterParams | VxeGlobalRendererHandles.TableCellCopyMethodParams) {
   const { cellValue } = params
   return handleSelectCellValue(cellValue, renderOpts)
@@ -1022,6 +1033,7 @@ renderer.mixin({
       }
       return getCellLabelVNs(h, renderOpts, params, cellValue)
     },
+    tableCellFormatter: handleFormatDatePicker,
     renderTableDefault: defaultEditRender,
     createTableFilterOptions: defaultFilterOptions,
     renderTableFilter: defaultFilterRender,

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
@@ -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/table-module/filter.scss

@@ -39,7 +39,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;
   &:not(.is--multiple) {
     .vxe-table--filter-header,
     .vxe-table--filter-body {

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;
 }