Skip to content

Commit

Permalink
fix(comp:desc): use div to wrap header slot (#1752)
Browse files Browse the repository at this point in the history
  • Loading branch information
threedayAAAAA committed Dec 1, 2023
1 parent 9d996ce commit dd31ee4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
Expand Up @@ -2,7 +2,9 @@

exports[`Desc > render work 1`] = `
"<div class=\\"ix-row ix-desc ix-desc-md\\">
<!---->
<div class=\\"ix-desc-header\\">
<!---->
</div>
<div class=\\"ix-col ix-col-span-8 ix-desc-item\\">
<div class=\\"ix-desc-item-label ix-desc-item-label-colon\\"><label>A</label></div>
<div class=\\"ix-desc-content\\"><span>aaa</span></div>
Expand Down
11 changes: 3 additions & 8 deletions packages/components/desc/src/Desc.tsx
Expand Up @@ -10,7 +10,6 @@ import { computed, defineComponent, normalizeClass, provide } from 'vue'
import { ɵHeader } from '@idux/components/_private/header'
import { useGlobalConfig } from '@idux/components/config'
import { IxRow } from '@idux/components/grid'
import { IxHeader } from '@idux/components/header'

import { descToken } from './token'
import { descProps } from './types'
Expand Down Expand Up @@ -39,22 +38,18 @@ export default defineComponent({
[`${prefixCls}-vertical`]: layout === 'vertical',
})
})
const headerClasses = computed(() => `${mergedPrefixCls.value}-header`)

return () => {
return (
<IxRow class={classes.value}>
{slots.header ? (
<IxHeader
v-slots={{ default: slots.header, closeIcon: slots.suffix }}
size={mergedSize.value === 'lg' ? 'md' : 'sm'}
/>
) : (
<div class={headerClasses.value}>
<ɵHeader
v-slots={{ header: slots.header, closeIcon: slots.suffix }}
header={props.header}
size={mergedSize.value === 'lg' ? 'md' : 'sm'}
/>
)}
</div>
{slots.default && slots.default()}
</IxRow>
)
Expand Down
4 changes: 4 additions & 0 deletions packages/components/desc/style/index.less
@@ -1,6 +1,10 @@
@import '../../style/mixins/reset.less';

.@{desc-prefix} {
&-header{
width: 100%
}

&-item {
.reset-component();

Expand Down

0 comments on commit dd31ee4

Please sign in to comment.