diff --git a/packages/components/table/__tests__/__snapshots__/table.spec.ts.snap b/packages/components/table/__tests__/__snapshots__/table.spec.ts.snap index b057722d9..6ca481332 100644 --- a/packages/components/table/__tests__/__snapshots__/table.spec.ts.snap +++ b/packages/components/table/__tests__/__snapshots__/table.spec.ts.snap @@ -36,8 +36,9 @@ exports[`Table > basic work > render work 1`] = ` - expandable + expandable + + Edrward 0 + 18 + London Park no. 0 + NICE DEVELOPER + Invite Edrward 0Delete expandable + expandable + + Edrward 1 + 19 + London Park no. 1 + NICE DEVELOPER + Invite Edrward 1Delete expandable + expandable + + Edrward 2 + 20 + London Park no. 2 + NICE DEVELOPER + Invite Edrward 2Delete - expandable + expandable + + Edrward 3 + 21 + London Park no. 3 + NICE DEVELOPER + Invite Edrward 3Delete expandable + expandable + + Edrward 4 + 22 + London Park no. 4 + NICE DEVELOPER + Invite Edrward 4Delete expandable + expandable + + Edrward 5 + 23 + London Park no. 5 + NICE DEVELOPER + Invite Edrward 5Delete - expandable + expandable + + Edrward 6 + 24 + London Park no. 6 + NICE DEVELOPER + Invite Edrward 6Delete expandable + expandable + + Edrward 7 + 25 + London Park no. 7 + NICE DEVELOPER + Invite Edrward 7Delete expandable + expandable + + Edrward 8 + 26 + London Park no. 8 + NICE DEVELOPER + Invite Edrward 8Delete - expandable + expandable + + Edrward 9 + 27 + London Park no. 9 + NICE DEVELOPER + Invite Edrward 9Delete diff --git a/packages/components/table/src/main/body/BodyCell.tsx b/packages/components/table/src/main/body/BodyCell.tsx index 9bec4b9cf..3cd9fec09 100644 --- a/packages/components/table/src/main/body/BodyCell.tsx +++ b/packages/components/table/src/main/body/BodyCell.tsx @@ -9,7 +9,7 @@ import { type ComputedRef, type Slots, type VNodeChild, computed, defineComponen import { isFunction, isNil, isString } from 'lodash-es' -import { Logger, convertArray, convertCssPixel } from '@idux/cdk/utils' +import { Logger, convertArray, convertCssPixel, isEmptyNode } from '@idux/cdk/utils' import { IxCheckbox } from '@idux/components/checkbox' import { TableConfig } from '@idux/components/config' import { IxIcon } from '@idux/components/icon' @@ -137,6 +137,9 @@ export default defineComponent({ return ( {type === 'expandable' && renderExpandableChildren(props, slots, expandable, mergedPrefixCls.value)} + {type === 'expandable' && !isEmptyNode(children) && ( + + )} {children} ) diff --git a/packages/components/table/style/index.less b/packages/components/table/style/index.less index b46e14eef..7800f548f 100644 --- a/packages/components/table/style/index.less +++ b/packages/components/table/style/index.less @@ -171,7 +171,7 @@ cursor: unset; } - & + * { + &-gap { margin-left: @spacing-xs; } } diff --git a/packages/pro/transfer/__tests__/__snapshots__/proTransfer.spec.ts.snap b/packages/pro/transfer/__tests__/__snapshots__/proTransfer.spec.ts.snap index d7c0baf55..147514fcf 100644 --- a/packages/pro/transfer/__tests__/__snapshots__/proTransfer.spec.ts.snap +++ b/packages/pro/transfer/__tests__/__snapshots__/proTransfer.spec.ts.snap @@ -207,6 +207,7 @@ exports[`ProTransfer > table transfer render work 1`] = ` +