Skip to content

Commit

Permalink
releases 4.3.40
Browse files Browse the repository at this point in the history
  • Loading branch information
xuliangzhan committed Dec 20, 2024
1 parent 97029f6 commit 573a31a
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 3 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.3.39",
"version": "4.3.40",
"description": "A vue based PC component library",
"scripts": {
"update": "npm install --legacy-peer-deps",
Expand Down
2 changes: 2 additions & 0 deletions packages/checkbox/src/checkbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,13 @@ export default defineComponent({
Object.assign($xeCheckbox, checkboxMethods)

const renderVN = () => {
const { label } = props
const vSize = computeSize.value
const isDisabled = computeIsDisabled.value
const isChecked = computeIsChecked.value
const indeterminate = !isChecked && props.indeterminate
return h('label', {
key: label,
class: ['vxe-checkbox', {
[`size--${vSize}`]: vSize,
'is--indeterminate': indeterminate,
Expand Down
1 change: 1 addition & 0 deletions packages/checkbox/src/group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ export default defineComponent({
: (options
? options.map(item => {
return h(VxeCheckboxComponent, {
key: item[valueField],
label: item[valueField],
content: item[labelField],
disabled: item[disabledField]
Expand Down
2 changes: 1 addition & 1 deletion packages/list/src/list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export default defineComponent({
if (firstItemElem) {
rowHeight = firstItemElem.offsetHeight
}
rowHeight = Math.max(20, rowHeight)
rowHeight = Math.max(12, rowHeight)
scrollYStore.rowHeight = rowHeight
// 计算 Y 逻辑
if (scrollYLoad) {
Expand Down
2 changes: 2 additions & 0 deletions packages/radio/src/button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,14 @@ export default defineComponent({
}

const renderVN = () => {
const { label } = props
const vSize = computeSize.value
const isDisabled = computeIsDisabled.value
const name = computeName.value
const isChecked = computeChecked.value

return h('label', {
key: label,
class: ['vxe-radio', 'vxe-radio-button', {
[`size--${vSize}`]: vSize,
'is--disabled': isDisabled
Expand Down
1 change: 1 addition & 0 deletions packages/radio/src/group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ export default defineComponent({
: (options
? options.map(item => {
return h(btnComp, {
key: item[valueField],
label: item[valueField],
content: item[labelField],
disabled: item[disabledField]
Expand Down
2 changes: 2 additions & 0 deletions packages/radio/src/radio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,13 @@ export default defineComponent({
Object.assign($xeRadio, radioMethods, radioPrivateMethods)

const renderVN = () => {
const { label } = props
const vSize = computeSize.value
const isDisabled = computeIsDisabled.value
const name = computeName.value
const isChecked = computeChecked.value
return h('label', {
key: label,
class: ['vxe-radio', {
[`size--${vSize}`]: vSize,
'is--checked': isChecked,
Expand Down
2 changes: 1 addition & 1 deletion types/components/table.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ export namespace VxeTablePropTypes {
/**
* 垂直对齐方式
*/
verticalAlign?: '' | 'top' | 'center'
verticalAlign?: '' | 'top' | 'center' | null
}

/**
Expand Down

0 comments on commit 573a31a

Please sign in to comment.