vxe-table 4.23.3 → 4.23.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.23.3",
+  "version": "4.23.4",
   "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",
@@ -66,7 +66,7 @@
     "typescript": "~5.9.3",
     "vue": "3.4.27",
     "vue-router": "~4.5.1",
-    "vxe-pc-ui": "4.20.17"
+    "vxe-pc-ui": "4.20.18"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/table/src/table.ts

@@ -30,7 +30,7 @@ import '../module/validator/hook'
 import '../module/custom/hook'
 import '../render'
 
-import type { VxeTooltipInstance, VxeTabsConstructor, VxeTabsPrivateMethods, ValueOf, VxeComponentSlotType, VxeComponentStyleType, VxeModalConstructor, VxeModalMethods, VxeSplitterConstructor, VxeSplitterMethods } from 'vxe-pc-ui'
+import type { VxeTooltipInstance, VxeTabsConstructor, VxeTabsPrivateMethods, ValueOf, VxeComponentSlotType, VxeComponentStyleType, VxeModalConstructor, VxeModalMethods, VxeSplitterConstructor, VxeSplitterMethods, VxeComponentSizeType } from 'vxe-pc-ui'
 import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, VxeTablePropTypes, VxeToolbarConstructor, TablePrivateMethods, VxeTablePrivateRef, VxeTablePrivateComputed, VxeTablePrivateMethods, TableMethods, VxeTableMethods, VxeTableDefines, VxeTableEmits, VxeTableProps, VxeColumnPropTypes, VxeTableCustomPanelConstructor } from '../../../types'
 
 const { warnLog, errLog } = createComponentLog('table')
@@ -1141,9 +1141,9 @@ export default defineVxeComponent({
       return { toVisibleIndex: 0, visibleSize: 6 }
     }
 
-    const calcVarRowHeightConfig = (sizeKey: 'default' | 'medium' | 'small' | 'mini', sizeEl: Element) => {
+    const calcVarRowHeightConfig = (sizeKey: VxeComponentSizeType, sizeEl: Element) => {
       const { rowHeightStore } = reactData
-      if (sizeEl && sizeEl.clientHeight) {
+      if (sizeKey && sizeEl && sizeEl.clientHeight) {
         rowHeightStore[sizeKey] = sizeEl.clientHeight
       }
     }
@@ -3591,7 +3591,9 @@ export default defineVxeComponent({
       }
       const varEl = refVarElem.value
       if (varEl) {
-        const [defEl, mediumEl, smallEl, miniEl] = varEl.children
+        const [dxlargeEl, largeEl, defEl, mediumEl, smallEl, miniEl] = varEl.children
+        calcVarRowHeightConfig('xlarge', dxlargeEl)
+        calcVarRowHeightConfig('large', largeEl)
         calcVarRowHeightConfig('default', defEl)
         calcVarRowHeightConfig('medium', mediumEl)
         calcVarRowHeightConfig('small', smallEl)
@@ -14407,12 +14409,20 @@ export default defineVxeComponent({
          * 隐藏列
          */
         h('div', {
+          key: 'tss',
           class: 'vxe-table-slots'
         }, slots.default ? slots.default({}) : []),
         h('div', {
+          key: 'tvr',
           ref: refVarElem,
           class: 'vxe-table-vars'
         }, [
+          h('div', {
+            class: 'vxe-table-var-xlarge'
+          }),
+          h('div', {
+            class: 'vxe-table-var-large'
+          }),
           h('div', {
             class: 'vxe-table-var-default'
           }),

package/styles/components/table-module/filter.scss

@@ -1,5 +1,25 @@
 @use '../../helpers/baseMixin.scss';
 
+
+.vxe-table--filter-wrapper {
+  --vxe-ui-table-filter-current-font-size: var(--vxe-ui-font-size-default);
+  &.size--xlarge {
+    --vxe-ui-table-filter-current-font-size: var(--vxe-ui-font-size-xlarge);
+  }
+  &.size--large {
+    --vxe-ui-table-filter-current-font-size: var(--vxe-ui-font-size-large);
+  }
+  &.size--medium {
+    --vxe-ui-table-filter-current-font-size: var(--vxe-ui-font-size-medium);
+  }
+  &.size--small {
+    --vxe-ui-table-filter-current-font-size: var(--vxe-ui-font-size-small);
+  }
+  &.size--mini {
+    --vxe-ui-table-filter-current-font-size: var(--vxe-ui-font-size-mini);
+  }
+}
+
 .vxe-cell--filter {
   padding: 0 0.1em 0 0.2em;
   text-align: center;
@@ -42,9 +62,14 @@
   box-shadow: var(--vxe-ui-base-popup-box-shadow);
   z-index: 15;
   max-height: var(--vxe-ui-vxe-table-filter-default-max-height);
+  &[class^="size--"],
+  &[class*=" size--"] {
+    font-size: var(--vxe-ui-table-filter-current-font-size);
+  }
   &:not(.is--multiple) {
     .vxe-table--filter-header,
-    .vxe-table--filter-body {
+    .vxe-table--filter-body,
+    .vxe-table--scrollbar-filter-body {
       text-align: center;
     }
   }
@@ -128,15 +153,3 @@
 .vxe-table--filter-option {
   @include baseMixin.createCheckboxIcon();
 }
-
-.vxe-table--filter-wrapper {
-  &.size--medium {
-    font-size: var(--vxe-ui-font-size-medium);
-  }
-  &.size--small {
-    font-size: var(--vxe-ui-font-size-small);
-  }
-  &.size--mini {
-    font-size: var(--vxe-ui-font-size-mini);
-  }
-}

package/styles/components/table.scss

@@ -71,6 +71,12 @@ $btnThemeList: (
   overflow: hidden;
   user-select: none;
   pointer-events: none;
+  .vxe-table-var-xlarge {
+    height: var(--vxe-ui-table-row-height-xlarge);
+  }
+  .vxe-table-var-large {
+    height: var(--vxe-ui-table-row-height-large);
+  }
   .vxe-table-var-default {
     height: var(--vxe-ui-table-row-height-default);
   }

package/styles/theme/base.scss

@@ -40,6 +40,7 @@
   --vxe-ui-table-row-height-medium: 44px;
   --vxe-ui-table-row-height-small: 40px;
   --vxe-ui-table-row-height-mini: 36px;
+
   --vxe-ui-table-row-line-height: 22px;
 
   --vxe-ui-table-column-icon-border-color: #c0c4cc;