vxe-pc-ui 3.18.11 → 3.18.13

package/styles/components/date-range-picker.scss

@@ -2,6 +2,43 @@
 @use '../helpers/baseMixin.scss';
 @use '../helpers/placement.scss';
 
+
+// 局部变量
+.vxe-date-range-picker,
+.vxe-date-range-picker--panel {
+  --vxe-ui-date-range-picker-current-font-size: var(--vxe-ui-font-size-default);
+  --vxe-ui-date-range-picker-current-height: var(--vxe-ui-input-height-default);
+  &.size--xlarge {
+    --vxe-ui-date-range-picker-current-font-size: var(--vxe-ui-font-size-xlarge);
+    --vxe-ui-date-range-picker-current-height: var(--vxe-ui-input-height-xlarge);
+  }
+  &.size--large {
+    --vxe-ui-date-range-picker-current-font-size: var(--vxe-ui-font-size-large);
+    --vxe-ui-date-range-picker-current-height: var(--vxe-ui-input-height-large);
+  }
+  &.size--medium {
+    --vxe-ui-date-range-picker-current-font-size: var(--vxe-ui-font-size-medium);
+    --vxe-ui-date-range-picker-current-height: var(--vxe-ui-input-height-medium);
+  }
+  &.size--small {
+    --vxe-ui-date-range-picker-current-font-size: var(--vxe-ui-font-size-small);
+    --vxe-ui-date-range-picker-current-height: var(--vxe-ui-input-height-small);
+  }
+  &.size--mini {
+    --vxe-ui-date-range-picker-current-font-size: var(--vxe-ui-font-size-mini);
+    --vxe-ui-date-range-picker-current-height: var(--vxe-ui-input-height-mini);
+  }
+}
+
+.vxe-date-range-picker,
+.vxe-date-range-picker--panel {
+  font-size: var(--vxe-ui-date-range-picker-current-font-size);
+}
+.vxe-date-range-picker {
+  height: var(--vxe-ui-date-range-picker-current-height);
+  line-height: var(--vxe-ui-date-range-picker-current-height);
+}
+
 .vxe-date-range-picker--readonly {
   color: var(--vxe-ui-font-color);
   display: inline-flex;
@@ -229,24 +266,3 @@
   flex-shrink: 0;
   padding-left: 0.8em;
 }
-
-.vxe-date-range-picker {
-  font-size: var(--vxe-ui-font-size-default);
-  height: var(--vxe-ui-input-height-default);
-  line-height: var(--vxe-ui-input-height-default);
-  &.size--medium {
-    font-size: var(--vxe-ui-font-size-medium);
-    height: var(--vxe-ui-input-height-medium);
-    line-height: var(--vxe-ui-input-height-medium);
-  }
-  &.size--small {
-    font-size: var(--vxe-ui-font-size-small);
-    height: var(--vxe-ui-input-height-small);
-    line-height: var(--vxe-ui-input-height-small);
-  }
-  &.size--mini {
-    font-size: var(--vxe-ui-font-size-mini);
-    height: var(--vxe-ui-input-height-mini);
-    line-height: var(--vxe-ui-input-height-mini);
-  }
-}

package/styles/components/pulldown.scss

@@ -1,6 +1,33 @@
 @use '../helpers/baseMixin.scss';
 @use '../helpers/placement.scss';
 
+// 局部变量
+.vxe-pulldown,
+.vxe-pulldown--panel {
+  --vxe-ui-pulldown-current-font-size: var(--vxe-ui-font-size-default);
+  --vxe-ui-pulldown-current-option-height: var(--vxe-ui-pulldown-option-height-default);
+  &.size--xlarge {
+    --vxe-ui-pulldown-current-font-size: var(--vxe-ui-font-size-xlarge);
+    --vxe-ui-pulldown-current-option-height: var(--vxe-ui-pulldown-option-height-xlarge);
+  }
+  &.size--large {
+    --vxe-ui-pulldown-current-font-size: var(--vxe-ui-font-size-large);
+    --vxe-ui-pulldown-current-option-height: var(--vxe-ui-pulldown-option-height-large);
+  }
+  &.size--medium {
+    --vxe-ui-pulldown-current-font-size: var(--vxe-ui-font-size-medium);
+    --vxe-ui-pulldown-current-option-height: var(--vxe-ui-pulldown-option-height-medium);
+  }
+  &.size--small {
+    --vxe-ui-pulldown-current-font-size: var(--vxe-ui-font-size-small);
+    --vxe-ui-pulldown-current-option-height: var(--vxe-ui-pulldown-option-height-small);
+  }
+  &.size--mini {
+    --vxe-ui-pulldown-current-font-size: var(--vxe-ui-font-size-mini);
+    --vxe-ui-pulldown-current-option-height: var(--vxe-ui-pulldown-option-height-mini);
+  }
+}
+
 .vxe-pulldown {
   position: relative;
   display: inline-block;
@@ -9,6 +36,17 @@
   text-align: left;
 }
 
+.vxe-pulldown,
+.vxe-pulldown--panel {
+  font-size: var(--vxe-ui-pulldown-current-font-size);
+}
+
+.vxe-pulldown--panel {
+  .vxe-pulldown--panel-item {
+    height: var(--vxe-ui-pulldown-current-option-height);
+  }
+}
+
 .vxe-pulldown--panel {
   @include placement.createPlacementPanel();
 }
@@ -38,38 +76,3 @@
     }
   }
 }
-
-.vxe-pulldown,
-.vxe-pulldown--panel {
-  font-size: var(--vxe-ui-font-size-default);
-  &.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);
-  }
-}
-
-.vxe-pulldown--panel {
-  .vxe-pulldown--panel-item {
-    height: var(--vxe-ui-pulldown-option-height-default);
-  }
-  &.size--medium {
-    .vxe-pulldown--panel-item {
-      height: var(--vxe-ui-pulldown-option-height-medium);
-    }
-  }
-  &.size--small {
-    .vxe-pulldown--panel-item {
-      height: var(--vxe-ui-pulldown-option-height-medium);
-    }
-  }
-  &.size--mini {
-    .vxe-pulldown--panel-item {
-      height: var(--vxe-ui-pulldown-option-height-medium);
-    }
-  }
-}

package/types/components/date-picker.d.ts

@@ -51,6 +51,12 @@ export namespace VxeDatePickerPropTypes {
   export type LabelFormat = string
   export type ValueFormat = string
   export type TimeFormat = string
+  export type ParseMethod = (params: {
+    $datePicker: VxeDatePickerConstructor
+    inputValue: string
+    type: VxeDatePanelPropTypes.Type
+    valueFormat: string
+  }) => Date | null | undefined | void
   export type Editable = boolean
   export type FestivalMethod = VxeDatePanelPropTypes.FestivalMethod
   export type DisabledMethod = VxeDatePanelPropTypes.DisabledMethod
@@ -171,6 +177,10 @@ export interface VxeDatePickerProps {
   labelFormat?: VxeDatePickerPropTypes.LabelFormat
   valueFormat?: VxeDatePickerPropTypes.ValueFormat
   timeFormat?: VxeDatePickerPropTypes.TimeFormat
+  /**
+   * 自定义解析方法
+   */
+  parseMethod?: VxeDatePickerPropTypes.ParseMethod
   editable?: VxeDatePickerPropTypes.Editable
   festivalMethod?: VxeDatePickerPropTypes.FestivalMethod
   disabledMethod?: VxeDatePickerPropTypes.DisabledMethod

package/types/components/table-module/filter.d.ts

@@ -91,15 +91,15 @@ export interface TableFilterPrivateMethods<D = any> {
   /**
    * @private
    */
-  handleClearFilter(column: any): void
+  handleClearFilter(column: VxeTableDefines.ColumnInfo): void
   /**
    * @private
    */
-  triggerFilterEvent(evnt: any, column: any, params: any): void
+  triggerFilterEvent(evnt: Event, column: VxeTableDefines.ColumnInfo, params: any): void
   /**
    * @private
    */
-  handleOpenFilterColumn(evnt: any, btnEl: HTMLElement | null, cellEl: HTMLElement, column: any, params: any): void
+  handleOpenFilterColumn(evnt: Event, btnEl: HTMLElement | null, cellEl: HTMLElement, column: VxeTableDefines.ColumnInfo, params: any): void
   /**
    * @private
    */

package/types/components/table.d.ts

@@ -1,6 +1,6 @@
 import { VNode, CreateElement } from 'vue'
 import { NormalizedScopedSlot } from 'vue/types/vnode'
-import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, VxeComponentSizeType, ValueOf, VxeGlobalConfig, VxeComponentStyleType, VxeComponentSlotType } from '@vxe-ui/core'
+import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, VxeComponentSizeType, ValueOf, VxeGlobalConfig, VxeComponentStyleType, VxeComponentSlotType, VxeGlobalRendererOptions } from '@vxe-ui/core'
 import { VxeColumnPropTypes, VxeColumnProps, VxeColumnSlotTypes } from './column'
 import { VxeTableExtendCellAreaDefines, VxeTableExtendCellAreaEmits } from './table-plugins'
 import { VxeGridConstructor } from './grid'
@@ -2976,13 +2976,21 @@ export namespace VxeTablePropTypes {
     y?: ScrollbarYConfig
   }
 
+  /**
+   * 渲染器配置项
+   */
+  export type RendererConfig = Record<string, VxeGlobalRendererOptions>
+
   export type Params = any
 
   /**
      * 导入参数
      */
   export interface ImportConfig<D = any> {
-    // 内置属性
+    /**
+     * 内置属性
+     * @private
+     */
     _typeMaps?: Record<string, number>
 
     /**
@@ -3806,6 +3814,10 @@ export interface VxeTableProps<D = any> {
    * 滚动条配置项
    */
   scrollbarConfig?: VxeTablePropTypes.ScrollbarConfig
+  /**
+   * 渲染器配置项
+   */
+  rendererConfig?: VxeTablePropTypes.RendererConfig
   /**
    * 自定义参数（可以用来存放一些自定义的数据）
    */
@@ -4005,6 +4017,7 @@ export interface TablePrivateComputed<D = any> {
   computeRowGroupColumns: VxeTableDefines.ColumnInfo[]
   computeAggFuncColumns: VxeTableDefines.ColumnInfo[]
   computeUndoRedoHistoryOpts: VxeTablePropTypes.UndoRedoHistoryConfig
+  computeRendererOpts: VxeTablePropTypes.RendererConfig
 
   computeTableBorder: 'default' | 'full' | 'outer' | 'inner' | 'none'