vxe-table 4.3.5 → 4.3.6-beta.0

package/types/column.d.ts

@@ -22,6 +22,7 @@ export namespace VxeColumnPropTypes {
   export type Title = string
   export type Width = number | string
   export type MinWidth = number | string
+  export type MaxWidth = number | string
   export type Resizable = boolean
   export type Fixed = 'left' | 'right' | null
   export type Align = 'left' | 'center' | 'right' | null
@@ -45,7 +46,7 @@ export namespace VxeColumnPropTypes {
     row: any
     column: VxeTableDefines.ColumnInfo
   }) => string | number)
-  export type SortType = 'string' | 'number' | null
+  export type SortType = 'auto' | 'string' | 'number' | null
 
   export interface Filter {
     label?: string | number
@@ -247,6 +248,10 @@ export type VxeColumnProps = {
    * 列最小宽度，把剩余宽度按比例分配
    */
   minWidth?: VxeColumnPropTypes.MinWidth
+  /**
+   * 列最大宽度
+   */
+  maxWidth?: VxeColumnPropTypes.MaxWidth
   /**
    * 是否允许拖动列宽调整大小
    */

package/types/list.d.ts

@@ -65,24 +65,24 @@ export interface ListMethods {
   /**
    * 重新计算列表
    */
-  recalculate(): Promise<any>
+  recalculate(): Promise<void>
 
   /**
    * 如果有滚动条，则滚动到对应的位置
    * @param scrollLeft 左边距离
    * @param scrollTop 顶部距离
    */
-  scrollTo(scrollLeft: number | null, scrollTop?: number | null): Promise<any>
+  scrollTo(scrollLeft: number | null, scrollTop?: number | null): Promise<void>
 
   /**
    * 刷新滚动操作，手动同步滚动相关位置
    */
-  refreshScroll(): Promise<any>
+  refreshScroll(): Promise<void>
 
   /**
    * 手动清除滚动相关信息，还原到初始状态
    */
-  clearScroll(): Promise<any>
+  clearScroll(): Promise<void>
 }
 export interface VxeListMethods extends ListMethods { }
 

package/types/pulldown.d.ts

@@ -1,30 +1,24 @@
 import { RenderFunction, SetupContext, ComponentPublicInstance, Ref } from 'vue'
 import { VXEComponent, VxeComponentBase, SizeType, VNodeStyle, VxeEvent, ValueOf } from './component'
 
-/**
- * 组件 - 下拉容器
- * @example import { Pulldown as VxePulldown } from 'vxe-table'
- */
-export const VxePulldown: VXEComponent<VxePulldownProps, VxePulldownEventProps>
-/**
- * 组件 - 下拉容器
- */
-export const Pulldown: VXEComponent<VxePulldownProps, VxePulldownEventProps>
-
-export type VxePulldownInstance = ComponentPublicInstance<VxePulldownProps, VxePulldownConstructor>
+export type VxePulldownEmits = [
+  'update:modelValue',
+  'hide-panel'
+]
 
-export interface VxePulldownConstructor extends VxeComponentBase, VxePulldownMethods {
-  props: VxePulldownProps
-  context: SetupContext<VxePulldownEmits>
-  reactData: PulldownReactData
-  getRefMaps(): PulldownPrivateRef
-  renderVN: RenderFunction
+export namespace VxePulldownPropTypes {
+  export type ModelValue = boolean
+  export type Size = SizeType
+  export type Disabled = boolean
+  export type Placement = string
+  export type DestroyOnClose = boolean
+  export type Transfer = boolean
 }
 
 export interface PulldownPrivateRef {
   refElem: Ref<HTMLDivElement>
 }
-export interface VxePulldownPrivateRef extends PulldownPrivateRef { }
+export type VxePulldownPrivateRef = PulldownPrivateRef
 
 export interface PulldownReactData {
   inited: boolean
@@ -36,6 +30,30 @@ export interface PulldownReactData {
   isActivated: boolean
 }
 
+export interface PulldownPrivateMethods {}
+export type VxePulldownPrivateMethods = PulldownPrivateMethods
+
+export type VxePulldownProps = {
+  size?: VxePulldownPropTypes.Size
+  modelValue?: VxePulldownPropTypes.ModelValue
+  /**
+   * 是否禁用
+   */
+  disabled?: VxePulldownPropTypes.Disabled
+  /**
+   * 固定显示下拉面板的方向
+   */
+  placement?: VxePulldownPropTypes.Placement
+  /**
+   * 在下拉容器关闭时销毁内容
+   */
+  destroyOnClose?: VxePulldownPropTypes.DestroyOnClose
+  /**
+   * 是否将弹框容器插入于 body 内（对于嵌入到表格或者弹窗中被遮挡时需要设置为 true）
+   */
+  transfer?: VxePulldownPropTypes.Transfer
+}
+
 export interface PulldownMethods {
   dispatchEvent(type: ValueOf<VxePulldownEmits>, params: any, evnt: Event): void
   /**
@@ -46,57 +64,29 @@ export interface PulldownMethods {
   /**
    * 切换下拉面板
    */
-  togglePanel(): Promise<any>
+  togglePanel(): Promise<void>
 
   /**
    * 显示下拉面板
    */
-  showPanel(): Promise<any>
+  showPanel(): Promise<void>
 
   /**
    * 隐藏下拉面板
    */
-  hidePanel(): Promise<any>
+  hidePanel(): Promise<void>
 }
-export interface VxePulldownMethods extends PulldownMethods { }
-
-export interface PulldownPrivateMethods { }
-export interface VxePulldownPrivateMethods extends PulldownPrivateMethods { }
-
-export type VxePulldownEmits = [
-  'update:modelValue',
-  'hide-panel'
-]
+export type VxePulldownMethods = PulldownMethods
 
-export namespace VxePulldownPropTypes {
-  export type ModelValue = boolean
-  export type Size = SizeType
-  export type Disabled = boolean
-  export type Placement = string
-  export type DestroyOnClose = boolean
-  export type Transfer = boolean
+export interface VxePulldownConstructor extends VxeComponentBase, VxePulldownMethods {
+  props: VxePulldownProps
+  context: SetupContext<VxePulldownEmits>
+  reactData: PulldownReactData
+  getRefMaps(): PulldownPrivateRef
+  renderVN: RenderFunction
 }
 
-export type VxePulldownProps = {
-  size?: VxePulldownPropTypes.Size
-  modelValue?: VxePulldownPropTypes.ModelValue
-  /**
-   * 是否禁用
-   */
-  disabled?: VxePulldownPropTypes.Disabled
-  /**
-   * 固定显示下拉面板的方向
-   */
-  placement?: VxePulldownPropTypes.Placement
-  /**
-   * 在下拉容器关闭时销毁内容
-   */
-  destroyOnClose?: VxePulldownPropTypes.DestroyOnClose
-  /**
-   * 是否将弹框容器插入于 body 内（对于嵌入到表格或者弹窗中被遮挡时需要设置为 true）
-   */
-  transfer?: VxePulldownPropTypes.Transfer
-}
+export type VxePulldownInstance = ComponentPublicInstance<VxePulldownProps, VxePulldownConstructor>
 
 export namespace VxePulldownDefines {
   interface PulldownEventParams extends VxeEvent {
@@ -104,7 +94,11 @@ export namespace VxePulldownDefines {
   }
 
   export interface HidePanelParams { }
-  export interface HidePanelEventParams extends HidePanelParams { }
+  export type HidePanelEventParams = HidePanelParams
+}
+
+export namespace VxePulldownEvents {
+  export type HidePanel = (params: VxePulldownDefines.HidePanelEventParams) => void
 }
 
 export type VxePulldownEventProps = {
@@ -115,6 +109,12 @@ export interface VxePulldownListeners {
   hidePanel?: VxePulldownEvents.HidePanel
 }
 
-export namespace VxePulldownEvents {
-  export type HidePanel = (params: VxePulldownDefines.HidePanelEventParams) => void
-}
+/**
+ * 组件 - 下拉容器
+ * @example import { Pulldown as VxePulldown } from 'vxe-table'
+ */
+export const VxePulldown: VXEComponent<VxePulldownProps, VxePulldownEventProps>
+/**
+  * 组件 - 下拉容器
+  */
+export const Pulldown: VXEComponent<VxePulldownProps, VxePulldownEventProps>

package/types/table.d.ts

@@ -613,7 +613,7 @@ export interface TablePublicMethods {
    * @param scrollLeft 左边距离
    * @param scrollTop 顶部距离
    */
-  scrollTo(scrollLeft: number | null, scrollTop?: number | null): Promise<any>
+  scrollTo(scrollLeft: number | null, scrollTop?: number | null): Promise<void>
   /**
    * 如果有滚动条，则滚动到对应的行
    * @param row 指定行
@@ -1241,6 +1241,7 @@ export namespace VxeTablePropTypes {
     resizable?: VxeColumnPropTypes.Resizable
     width?: VxeColumnPropTypes.Width
     minWidth?: VxeColumnPropTypes.MinWidth
+    maxWidth?: VxeColumnPropTypes.MaxWidth
   }
   export interface ColumnOpts extends ColumnConfig { }
 
@@ -1280,6 +1281,14 @@ export namespace VxeTablePropTypes {
       $rowIndex: number
       cell: HTMLElement
     }) => number | string)
+    maxWidth?: number | string | ((params: {
+      $table: VxeTableConstructor & VxeTablePrivateMethods
+      column: VxeTableDefines.ColumnInfo
+      columnIndex: number
+      $columnIndex: number
+      $rowIndex: number
+      cell: HTMLElement
+    }) => number | string)
   }
   export interface ResizableOpts extends ResizableConfig { }
 
@@ -2182,6 +2191,7 @@ export namespace VxeTableDefines {
     title: VxeColumnPropTypes.Title
     width: VxeColumnPropTypes.Width
     minWidth: VxeColumnPropTypes.MinWidth
+    maxWidth: VxeColumnPropTypes.MaxWidth
     resizable: VxeColumnPropTypes.Resizable
     fixed: VxeColumnPropTypes.Fixed
     align: VxeColumnPropTypes.Align