vxe-pc-ui 4.11.43 → 4.11.45

package/packages/tree-select/src/tree-select.ts

@@ -48,12 +48,20 @@ export default defineVxeComponent({
     filterConfig: Object as PropType<VxeTreeSelectPropTypes.FilterConfig>,
     multiple: Boolean as PropType<VxeTreeSelectPropTypes.Multiple>,
     className: [String, Function] as PropType<VxeTreeSelectPropTypes.ClassName>,
+    /**
+     * 已废弃，请使用 popupConfig.className
+     * @deprecated
+     */
     popupClassName: [String, Function] as PropType<VxeTreeSelectPropTypes.PopupClassName>,
     prefixIcon: String as PropType<VxeTreeSelectPropTypes.PrefixIcon>,
     placement: String as PropType<VxeTreeSelectPropTypes.Placement>,
     lazyOptions: Array as PropType<VxeTreeSelectPropTypes.LazyOptions>,
     options: Array as PropType<VxeTreeSelectPropTypes.Options>,
     optionProps: Object as PropType<VxeTreeSelectPropTypes.OptionProps>,
+    /**
+     * 已废弃，请使用 popupConfig.zIndex
+     * @deprecated
+     */
     zIndex: Number as PropType<VxeTreeSelectPropTypes.ZIndex>,
     size: {
       type: String as PropType<VxeTreeSelectPropTypes.Size>,
@@ -169,8 +177,12 @@ export default defineVxeComponent({
 
     const computeBtnTransfer = computed(() => {
       const { transfer } = props
+      const popupOpts = computePopupOpts.value
+      if (XEUtils.isBoolean(popupOpts.transfer)) {
+        return popupOpts.transfer
+      }
       if (transfer === null) {
-        const globalTransfer = getConfig().select.transfer
+        const globalTransfer = getConfig().treeSelect.transfer
         if (XEUtils.isBoolean(globalTransfer)) {
           return globalTransfer
         }
@@ -386,9 +398,10 @@ export default defineVxeComponent({
     }
 
     const updateZindex = () => {
-      const { zIndex } = props
-      if (zIndex) {
-        reactData.panelIndex = zIndex
+      const popupOpts = computePopupOpts.value
+      const customZIndex = popupOpts.zIndex || props.zIndex
+      if (customZIndex) {
+        reactData.panelIndex = XEUtils.toNumber(customZIndex)
       } else if (reactData.panelIndex < getLastZIndex()) {
         reactData.panelIndex = nextZIndex()
       }
@@ -400,9 +413,10 @@ export default defineVxeComponent({
       const targetElem = refElem.value
       const panelElem = refOptionPanel.value
       const btnTransfer = computeBtnTransfer.value
+      const popupOpts = computePopupOpts.value
       const handleStyle = () => {
         const ppObj = updatePanelPlacement(targetElem, panelElem, {
-          placement,
+          placement: popupOpts.placement || placement,
           teleportTo: btnTransfer
         })
         const panelStyle: { [key: string]: string | number } = Object.assign(ppObj.style, {
@@ -680,7 +694,7 @@ export default defineVxeComponent({
       const footerSlot = slots.footer
       const prefixSlot = slots.prefix
       const popupOpts = computePopupOpts.value
-      const popupClassName = popupOpts.className || props.popupClassName
+      const ppClassName = popupOpts.className || props.popupClassName
 
       if (formReadonly) {
         return h('div', {
@@ -762,7 +776,7 @@ export default defineVxeComponent({
         }, [
           h('div', {
             ref: refOptionPanel,
-            class: ['vxe-table--ignore-clear vxe-tree-select--panel', popupClassName ? (XEUtils.isFunction(popupClassName) ? popupClassName({ $treeSelect: $xeTreeSelect }) : popupClassName) : '', {
+            class: ['vxe-table--ignore-clear vxe-tree-select--panel', ppClassName ? (XEUtils.isFunction(ppClassName) ? ppClassName({ $treeSelect: $xeTreeSelect }) : ppClassName) : '', {
               [`size--${vSize}`]: vSize,
               'is--transfer': btnTransfer,
               'ani--leave': !loading && isAniVisible,

package/types/components/button.d.ts

@@ -26,10 +26,18 @@ export interface VxeButtonPrivateRef extends ButtonPrivateRef { }
 
 export namespace VxeButtonPropTypes {
   export type Size = VxeComponentSizeType
+  /**
+   * 已废弃，请使用 PopupConfig.zIndex
+   * @deprecated
+   */
   export type ZIndex = number
   export type Type = string
   export type Mode = null | '' | 'button' | 'text'
   export type ClassName = string | ((params: { $button: VxeButtonConstructor }) => string)
+  /**
+   * 已废弃，请使用 PopupConfig.className
+   * @deprecated
+   */
   export type PopupClassName = string | ((params: { $button: VxeButtonConstructor }) => string)
   export type Name = string | number
   export type RouterLink = {
@@ -82,6 +90,15 @@ export namespace VxeButtonPropTypes {
 
   export type ShowDropdownIcon = boolean
   export type DestroyOnClose = boolean
+  export interface PopupConfig {
+    /**
+     * 设置弹出面板方向
+     */
+    placement?: 'top' | 'bottom' | '' | null
+    transfer?: boolean
+    zIndex?: number | string
+    className?: string | ((params: { $button: VxeButtonConstructor }) => string)
+  }
   export type Transfer = boolean
 }
 
@@ -171,6 +188,7 @@ export interface VxeButtonProps {
    * 是否将弹框容器插入于 body 内
    */
   transfer?: VxeButtonPropTypes.Transfer
+  popupConfig?: VxeButtonPropTypes.PopupConfig
 }
 
 export interface ButtonPrivateComputed {

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

@@ -34,6 +34,10 @@ export namespace VxeDatePickerPropTypes {
   export type Name = string
   export type Type = VxeDatePanelPropTypes.Type
   export type Clearable = boolean
+  /**
+   * 已废弃，请使用 PopupConfig.zIndex
+   * @deprecated
+   */
   export type ZIndex = number
   export type Readonly = boolean
   export type Disabled = boolean
@@ -74,6 +78,10 @@ export namespace VxeDatePickerPropTypes {
      */
     trigger?: 'default' | 'icon' | 'manual' | '' | null
     transfer?: boolean
+    width?: number | string
+    height?: number | string
+    zIndex?: number | string
+    className?: string | ((params: { $datePicker: VxeDatePickerConstructor }) => string)
   }
   export interface ShortcutConfig {
     enabled?: boolean

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

@@ -36,6 +36,10 @@ export namespace VxeDateRangePickerPropTypes {
   export type Name = string
   export type Type = VxeDatePanelPropTypes.Type
   export type Clearable = boolean
+  /**
+   * 已废弃，请使用 PopupConfig.zIndex
+   * @deprecated
+   */
   export type ZIndex = number
   export type Readonly = boolean
   export type Disabled = boolean
@@ -78,6 +82,10 @@ export namespace VxeDateRangePickerPropTypes {
      */
     trigger?: 'default' | 'icon' | 'manual' | '' | null
     transfer?: boolean
+    width?: number | string
+    height?: number | string
+    zIndex?: number | string
+    className?: string | ((params: { $dateRangePicker: VxeDateRangePickerConstructor }) => string)
   }
   export interface ShortcutConfig {
     enabled?: boolean

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

@@ -27,6 +27,10 @@ export namespace VxeIconPickerPropTypes {
   export type Placeholder = string
   export type Size = VxeComponentSizeType
   export type ClassName = string | ((params: { $iconPicker: VxeIconPickerConstructor }) => string)
+  /**
+   * 已废弃，请使用 PopupConfig.className
+   * @deprecated
+   */
   export type PopupClassName = string | ((params: {$iconPicker: VxeIconPickerConstructor }) => string)
   export type Readonly = boolean
   export type Disabled = boolean
@@ -38,6 +42,21 @@ export namespace VxeIconPickerPropTypes {
   export type Clearable = boolean
   export type ShowIconTitle = boolean
   export type Placement = 'top' | 'bottom' | '' | null
+  export interface PopupConfig {
+    /**
+     * 设置弹出面板方向
+     */
+    placement?: 'top' | 'bottom' | '' | null
+    /**
+     * 触发方式
+     */
+    trigger?: 'default' | 'icon' | 'manual' | '' | null
+    transfer?: boolean
+    width?: number | string
+    height?: number | string
+    zIndex?: number | string
+    className?: string | ((params: { $iconPicker: VxeIconPickerConstructor }) => string)
+  }
   export type Transfer = boolean
 }
 
@@ -49,6 +68,10 @@ export type VxeIconPickerProps = {
   placeholder?: VxeIconPickerPropTypes.Placeholder
   size?: VxeIconPickerPropTypes.Size
   className?: VxeIconPickerPropTypes.ClassName
+  /**
+   * 已废弃，请使用 popup-config.className
+   * @deprecated
+   */
   popupClassName?: VxeIconPickerPropTypes.PopupClassName
   readonly?: VxeIconPickerPropTypes.Readonly
   disabled?: VxeIconPickerPropTypes.Disabled
@@ -56,6 +79,7 @@ export type VxeIconPickerProps = {
   clearable?: VxeIconPickerPropTypes.Clearable
   showIconTitle?: VxeIconPickerPropTypes.ShowIconTitle
   placement?: VxeIconPickerPropTypes.Placement
+  popupConfig?: VxeIconPickerPropTypes.PopupConfig
   transfer?: VxeIconPickerPropTypes.Transfer
 }
 

package/types/components/pulldown.d.ts

@@ -26,6 +26,10 @@ export namespace VxePulldownPropTypes {
   export type ModelValue = boolean
   export type Size = VxeComponentSizeType
   export type Disabled = boolean
+  /**
+   * 已废弃，请使用 PopupConfig.zIndex
+   * @deprecated
+   */
   export type ZIndex = number
   export type Placement = '' | 'top' | 'bottom'
   export type Trigger = '' | 'manual' | 'click'
@@ -36,7 +40,22 @@ export namespace VxePulldownPropTypes {
   }
   export type Options = Option[]
   export type ClassName = string | ((params: { $pulldown: VxePulldownConstructor }) => string)
+  /**
+   * 已废弃，请使用 PopupConfig.className
+   * @deprecated
+   */
   export type PopupClassName = string | ((params: { $pulldown: VxePulldownConstructor }) => string)
+  export interface PopupConfig {
+    /**
+     * 设置弹出面板方向
+     */
+    placement?: 'top' | 'bottom' | '' | null
+    transfer?: boolean
+    width?: number | string
+    height?: number | string
+    zIndex?: number | string
+    className?: string | ((params: { $pulldown: VxePulldownConstructor }) => string)
+  }
   export type ShowPopupShadow = boolean
   export type DestroyOnClose = boolean
   export type Transfer = boolean
@@ -49,15 +68,24 @@ export interface VxePulldownProps {
    * 是否禁用
    */
   disabled?: VxePulldownPropTypes.Disabled
+  /**
+   * 已废弃，请使用 popup-config.zIndex
+   * @deprecated
+   */
   zIndex?: VxePulldownPropTypes.ZIndex
   options?: VxePulldownPropTypes.Options
   className?: VxePulldownPropTypes.ClassName
+  /**
+   * 已废弃，请使用 popup-config.className
+   * @deprecated
+   */
   popupClassName?: VxePulldownPropTypes.PopupClassName
   /**
    * 固定显示下拉面板的方向
    */
   placement?: VxePulldownPropTypes.Placement
   trigger?: VxePulldownPropTypes.Trigger
+  popupConfig?: VxePulldownPropTypes.PopupConfig
   showPopupShadow?: VxePulldownPropTypes.ShowPopupShadow
   /**
    * 在下拉容器关闭时销毁内容

package/types/components/select.d.ts

@@ -34,6 +34,10 @@ export namespace VxeSelectPropTypes {
     selectMode?: 'all' | 'first' | 'last'
   }
   export type Clearable = boolean
+  /**
+   * 已废弃，请使用 PopupConfig.zIndex
+   * @deprecated
+   */
   export type ZIndex = number
   export type Placeholder = string
   export type Readonly = boolean
@@ -43,6 +47,10 @@ export namespace VxeSelectPropTypes {
   export type ShowCheckedButoon = boolean
   export type ShowClearButton = boolean
   export type ClassName = string | ((params: { $select: VxeSelectConstructor }) => string)
+  /**
+   * 已废弃，请使用 PopupConfig.className
+   * @deprecated
+   */
   export type PopupClassName = string | ((params: { $select: VxeSelectConstructor }) => string)
   export type Multiple = boolean
   export type MultiCharOverflow = number | string
@@ -72,6 +80,23 @@ export namespace VxeSelectPropTypes {
   }) => boolean
   export type Remote = boolean
 
+  export interface FilterConfig {
+    /**
+     * 是否在关闭下拉面板时自动清空筛选条件
+     */
+    clearOnClose?: boolean
+    /**
+     * 自定义筛选方法
+     */
+    filterMethod?: (params: {
+      $select: VxeSelectConstructor
+      group: any
+      option: any
+      searchValue: string
+      value: ModelValue | undefined
+    }) => boolean
+  }
+
   export interface RemoteConfig {
     /**
      * 是否启用
@@ -81,6 +106,10 @@ export namespace VxeSelectPropTypes {
      * 当列表为空时，是否默认自动调用远程查询方法
      */
     autoLoad?: boolean
+    /**
+     * 是否在关闭下拉面板时自动清空筛选条件
+     */
+    clearOnClose?: boolean
     /**
      * 远程查询方法
      */
@@ -105,8 +134,18 @@ export namespace VxeSelectPropTypes {
   export type OptionKey = boolean
   export type Transfer = boolean
   export interface PopupConfig {
+    /**
+     * 设置弹出面板方向
+     */
+    placement?: 'top' | 'bottom' | '' | null
+    /**
+     * 触发方式
+     */
+    trigger?: 'default' | 'icon' | 'manual' | '' | null
+    transfer?: boolean
     width?: number | string
     height?: number | string
+    zIndex?: number | string
     className?: string | ((params: { $select: VxeSelectConstructor }) => string)
   }
 
@@ -142,6 +181,10 @@ export interface VxeSelectProps {
   modelValue?: VxeSelectPropTypes.ModelValue
   defaultConfig?: VxeSelectPropTypes.DefaultConfig
   clearable?: VxeSelectPropTypes.Clearable
+  /**
+   * 已废弃，请使用 popup-config.zIndex
+   * @deprecated
+   */
   zIndex?: VxeSelectPropTypes.ZIndex
   placeholder?: VxeSelectPropTypes.Placeholder
   readonly?: VxeSelectPropTypes.Readonly
@@ -151,6 +194,10 @@ export interface VxeSelectProps {
   showCheckedButoon?: VxeSelectPropTypes.ShowCheckedButoon
   showClearButton?: VxeSelectPropTypes.ShowClearButton
   className?: VxeSelectPropTypes.ClassName
+  /**
+   * 已废弃，请使用 popup-config.className
+   * @deprecated
+   */
   popupClassName?: VxeSelectPropTypes.PopupClassName
   multiple?: VxeSelectPropTypes.Multiple
   multiCharOverflow?: VxeSelectPropTypes.MultiCharOverflow
@@ -164,13 +211,36 @@ export interface VxeSelectProps {
   optionGroupProps?: VxeSelectPropTypes.OptionGroupProps
   optionConfig?: VxeSelectPropTypes.OptionConfig
   emptyText?: VxeSelectPropTypes.EmptyText
+  /**
+   * 是否启用本地筛选
+   */
   filterable?: VxeSelectPropTypes.Filterable
+  /**
+   * 已废弃，被 filter-config.filterMethod 替换
+   * @deprecated
+   */
   filterMethod?: VxeSelectPropTypes.FilterMethod
+  /**
+   * 本地筛选配置项
+   */
+  filterConfig?: VxeSelectPropTypes.FilterConfig
+  /**
+   * 是否启用远程筛选
+   */
   remote?: VxeSelectPropTypes.Remote
+  /**
+   * 远程筛选配置项
+   */
   remoteConfig?: VxeSelectPropTypes.RemoteConfig
   max?: VxeSelectPropTypes.Max
   transfer?: VxeSelectPropTypes.Transfer
+  /**
+   * 下拉面板弹出层配置项
+   */
   popupConfig?: VxeSelectPropTypes.PopupConfig
+  /**
+   * 纵向虚拟滚动配置项
+   */
   virtualYConfig?: VxeSelectPropTypes.VirtualYConfig
 
   /**

package/types/components/table-select.d.ts

@@ -47,8 +47,18 @@ export namespace VxeTableSelectPropTypes {
   }
   export type Transfer = boolean
   export interface PopupConfig {
+    /**
+     * 设置弹出面板方向
+     */
+    placement?: 'top' | 'bottom' | '' | null
+    /**
+     * 触发方式
+     */
+    trigger?: 'default' | 'icon' | 'manual' | '' | null
+    transfer?: boolean
     width?: number | string
     height?: number | string
+    zIndex?: number | string
     className?: string | ((params: { $tableSelect: VxeTableSelectConstructor }) => string)
   }
   export type GridConfig<D = any> = Omit<VxeGridProps<D>, 'data' | 'height' | 'maxHeight' | 'minHeight' | 'size'>
@@ -58,7 +68,6 @@ export interface VxeTableSelectProps<D = any> {
   size?: VxeTableSelectPropTypes.Size
   modelValue?: VxeTableSelectPropTypes.ModelValue
   clearable?: VxeTableSelectPropTypes.Clearable
-  zIndex?: VxeTableSelectPropTypes.ZIndex
   placeholder?: VxeTableSelectPropTypes.Placeholder
   readonly?: VxeTableSelectPropTypes.Readonly
   loading?: VxeTableSelectPropTypes.Loading
@@ -74,6 +83,12 @@ export interface VxeTableSelectProps<D = any> {
   transfer?: VxeTableSelectPropTypes.Transfer
   popupConfig?: VxeTableSelectPropTypes.PopupConfig
   gridConfig?: VxeTableSelectPropTypes.GridConfig<D>
+
+  /**
+   * 已废弃，请使用 popup-config.zIndex
+   * @deprecated
+   */
+  zIndex?: VxeTableSelectPropTypes.ZIndex
 }
 
 export interface TableSelectPrivateComputed {

package/types/components/table.d.ts

@@ -2624,7 +2624,7 @@ export namespace VxeTablePropTypes {
     /**
      * 预加载数量
      */
-    preSize?: Number
+    preSize?: number
     /**
      * 是否启用，支持局部/全局启用
      */
@@ -2655,7 +2655,7 @@ export namespace VxeTablePropTypes {
     /**
      * 预加载数量
      */
-    preSize?: Number
+    preSize?: number
     /**
      * 是否启用，支持局部/全局启用
      */

package/types/components/tree-select.d.ts

@@ -27,6 +27,10 @@ export namespace VxeTreeSelectPropTypes {
   export type Size = VxeComponentSizeType
   export type ModelValue = any
   export type Clearable = boolean
+  /**
+   * 已废弃，请使用 PopupConfig.zIndex
+   * @deprecated
+   */
   export type ZIndex = number
   export type Placeholder = string
   export type Readonly = boolean
@@ -39,7 +43,7 @@ export namespace VxeTreeSelectPropTypes {
   export type ShowClearButton = boolean
   export type ClassName = string | ((params: { $treeSelect: VxeTreeSelectConstructor }) => string)
   /**
-   * 已废弃，请使用 VxeTreeSelectPropTypes.PopupConfig
+   * 已废弃，请使用 PopupConfig.className
    * @deprecated
    */
   export type PopupClassName = string | ((params: { $treeSelect: VxeTreeSelectConstructor }) => string)
@@ -99,8 +103,18 @@ export namespace VxeTreeSelectPropTypes {
 
   export type Transfer = boolean
   export interface PopupConfig {
+    /**
+     * 设置弹出面板方向
+     */
+    placement?: 'top' | 'bottom' | '' | null
+    /**
+     * 触发方式
+     */
+    trigger?: 'default' | 'icon' | 'manual' | '' | null
+    transfer?: boolean
     width?: number | string
     height?: number | string
+    zIndex?: number | string
     className?: string | ((params: { $treeSelect: VxeTreeSelectConstructor }) => string)
   }
   export interface TreeConfig<D = any> extends Omit<VxeTreeProps<D>, 'data' | 'size' | 'menuConfig'> {
@@ -132,7 +146,6 @@ export interface VxeTreeSelectProps<D = any> {
   size?: VxeTreeSelectPropTypes.Size
   modelValue?: VxeTreeSelectPropTypes.ModelValue
   clearable?: VxeTreeSelectPropTypes.Clearable
-  zIndex?: VxeTreeSelectPropTypes.ZIndex
   placeholder?: VxeTreeSelectPropTypes.Placeholder
   readonly?: VxeTreeSelectPropTypes.Readonly
   loading?: VxeTreeSelectPropTypes.Loading
@@ -159,6 +172,11 @@ export interface VxeTreeSelectProps<D = any> {
   menuConfig?: VxeTreeSelectPropTypes.MenuConfig<D>
   virtualYConfig?: VxeTreeSelectPropTypes.VirtualYConfig
 
+  /**
+   * 已废弃，请使用 popup-config.zIndex
+   * @deprecated
+   */
+  zIndex?: VxeTreeSelectPropTypes.ZIndex
   /**
    * 已废弃，被 remote-config.queryMethod 替换
    * @deprecated

package/types/components/upload.d.ts

@@ -60,7 +60,7 @@ export namespace VxeUploadPropTypes {
   export type UrlMode = boolean
   export type UrlArgs = boolean
   export type Multiple = boolean
-  export type LimitSize = number | String
+  export type LimitSize = number | string
   export type ShowLimitSize = boolean
   export type LimitSizeText = number | string | ((params: {
     maxSize: number