Skip to content

Commit

Permalink
releases 4.2.26
Browse files Browse the repository at this point in the history
  • Loading branch information
xuliangzhan committed Nov 8, 2024
1 parent 43e53b0 commit 277fd1e
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vxe-pc-ui",
"version": "4.2.45",
"version": "4.2.46",
"description": "A vue based PC component library",
"scripts": {
"update": "npm install --legacy-peer-deps",
Expand Down
2 changes: 1 addition & 1 deletion packages/number-input/src/number-input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ export default defineComponent({
const { inputValue } = reactData
const inputReadonly = computeInputReadonly.value
if (!inputReadonly) {
if (inputValue) {
if (inputValue || (min || max)) {
let inpNumVal: number | string = type === 'integer' ? XEUtils.toInteger(handleNumber(inputValue)) : XEUtils.toNumber(handleNumber(inputValue))
if (!validMinNum(inpNumVal)) {
inpNumVal = min
Expand Down
24 changes: 22 additions & 2 deletions types/components/table.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,12 @@ export namespace VxeTablePropTypes {
row: D
column: VxeTableDefines.ColumnInfo<D>
}): boolean
/**
* 自定义提示内容
*/
rowTooltipMethod?(params: {
row: D
}): string | number | null
/**
* 拖拽开始时是否允许行拖拽调整顺序的方法,该方法的返回值用来决定是否允许被拖拽
*/
Expand All @@ -409,6 +415,12 @@ export namespace VxeTablePropTypes {
* 拖拽结束时是否允许行拖拽调整顺序的方法,该方法的返回值用来决定是否允许被拖拽调整顺序
*/
dragEndMethod?(params: Omit<VxeTableDefines.RowDragendEventParams<D>, '_index'>): Promise<boolean> | boolean
/**
* 自定义插槽模板
*/
slots?: {
rowTip?: string | ((params: VxeTableDefines.DragSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
}
}

/**
Expand Down Expand Up @@ -500,7 +512,7 @@ export namespace VxeTablePropTypes {
columnIndex: number
$columnIndex: number
$rowIndex: number
cell: HTMLElement
cell?: HTMLElement
}) => number | string)
/**
* 列宽拖动的最大宽度
Expand All @@ -511,7 +523,7 @@ export namespace VxeTablePropTypes {
columnIndex: number
$columnIndex: number
$rowIndex: number
cell: HTMLElement
cell?: HTMLElement
}) => number | string)
}
export interface ResizableOpts<D = VxeTablePropTypes.Row> extends ResizableConfig<D> { }
Expand Down Expand Up @@ -1408,6 +1420,10 @@ export namespace VxeTablePropTypes {
* - full - 全量提示
*/
msgMode?: 'single' | 'full' | null | ''
/**
* 提示消息主题样式
*/
theme?: 'normal' | 'beautify' | ''
/**
* 当点击表格之外或者其他列之后,是否自动清除单元格的校验消息
*/
Expand Down Expand Up @@ -4080,6 +4096,10 @@ export namespace VxeTableDefines {
isAllIndeterminate: boolean
}

export interface DragSlotParams<D = any> {
row: D
}

export interface MenuSlotParams {

}
Expand Down

0 comments on commit 277fd1e

Please sign in to comment.