Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(alert): [alert] display title when size is large #2744

Merged
merged 3 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions examples/sites/demos/apis/alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,20 @@ export default {
pcDemo: 'show-icon',
mfDemo: ''
},
{
name: 'show-title',
type: 'boolean',
defaultValue: 'true',
desc: {
'zh-CN': '是否显示标题,在 size 为 large 时有效',
'en-US': 'Display title,valid when size is large'
},
mode: ['pc'],
pcDemo: 'title',
meta: {
stable: '3.21.0'
}
},
{
name: 'single-line',
type: 'String',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<template #title>通过 slot 设置自定义 title</template>
</tiny-alert>
<br />
<tiny-alert size="large" description="描述内容"></tiny-alert>
<tiny-alert size="large" :show-title="false" description="描述内容"></tiny-alert>
<br />
<tiny-alert size="large" type="success" description="描述内容"></tiny-alert>
<br />
Expand Down
3 changes: 3 additions & 0 deletions examples/sites/demos/pc/app/alert/title.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@ test('测试 Alert 自定义标题', async ({ page }) => {
const title = alert.locator('.tiny-alert__title')
await expect(title).toHaveCount(1)
await expect(title).toHaveText('通过属性设置自定义 title')

const alert1 = page.locator('.tiny-alert--large').nth(2)
await expect(alert1).not.toHaveText('消息')
})
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/alert/title.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<template #title>通过 slot 设置自定义 title</template>
</tiny-alert>
<br />
<tiny-alert size="large" description="描述内容"></tiny-alert>
<tiny-alert size="large" :show-title="false" description="描述内容"></tiny-alert>
<br />
<tiny-alert size="large" type="success" description="描述内容"></tiny-alert>
<br />
Expand Down
2 changes: 1 addition & 1 deletion examples/sites/demos/pc/app/alert/webdoc/alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default {
'en-US': 'Custom Title'
},
desc: {
'zh-CN': `当 <code>size</code> 为 <code>large</code> 时,通过 <code>title </code>属性或 <code>title </code>插槽,可以自定义组件的标题<br>
'zh-CN': `当 <code>size</code> 为 <code>large</code> 时,通过 <code>title </code>属性或 <code>title </code>插槽,可以自定义组件的标题 ,通过 <code> show-title </code>属性 控制标题是否显示<br>
如果未自定义标题,会根据对应的 <code>type</code> 显示相应的默认标题。`,
'en-US':
'<p>When <code>size</code> is set to large, the title is displayed. You can set <code>title</code> or <code>slot</code> to customize the title. <br>The default title is displayed according to the set <code>type</code> . </p>'
Expand Down
2 changes: 2 additions & 0 deletions packages/theme/src/alert/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
font-size: var(--tv-Alert-desc-font-size);
font-weight: var(--tv-Alert-desc-font-weight);
color: var(--tv-Alert-desc-text-color);
// 由于close-icon是abs, 需要给出安全边距防止重叠
margin-right: calc(var(--tv-Alert-close-icon-font-size) + var(--tv-Alert-close-icon-right) + 16px);
}

.@{alert-prefix-cls}__opration {
Expand Down
4 changes: 4 additions & 0 deletions packages/vue/src/alert/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ export const alertProps = {
type: Boolean,
default: false
},
showTitle: {
type: Boolean,
default: true
},
target: {
type: String,
default: ''
Expand Down
7 changes: 3 additions & 4 deletions packages/vue/src/alert/src/pc.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@
>
<component v-if="showIcon" :is="state.getIcon" class="tiny-svg-size tiny-alert__icon" />
<div class="tiny-alert__content" :class="{ 'close-hidden': !closable }">
<div v-if="size === 'large'" class="tiny-alert__title">
<slot name="title">
{{ state.getTitle }}
</slot>
<div v-if="size === 'large' && showTitle" class="tiny-alert__title">
<slot name="title"> {{ state.getTitle }}</slot>
</div>
<div
:class="[
Expand Down Expand Up @@ -67,6 +65,7 @@ export default defineComponent({
'closable',
'center',
'showIcon',
'showTitle',
'closeText',
'customClass'
],
Expand Down
Loading