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

fix(comp:badge): the count should support non-numeric types #1399

Merged
merged 1 commit into from
Jan 11, 2023
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
6 changes: 6 additions & 0 deletions packages/components/badge/__tests__/badge.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ describe('Badge', () => {

expect(countCurrents[0].text()).toBe('5')
expect(countCurrents[1].text()).toBe('0')

// 非 number 情况
await wrapper.setProps({ count: 'New' })

expect(wrapper.find('.ix-badge-count-current').exists()).toBe(false)
expect(wrapper.find('.ix-badge-count').text()).toBe('New')
})

test('count slot work', async () => {
Expand Down
8 changes: 7 additions & 1 deletion packages/components/badge/src/Badge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { computed, defineComponent, normalizeClass } from 'vue'

import { convertNumber } from '@idux/cdk/utils'
import { convertNumber, isNumeric } from '@idux/cdk/utils'
import { useGlobalConfig } from '@idux/components/config'

import BadgeSub from './BadgeSub'
Expand All @@ -27,6 +27,11 @@ export default defineComponent({
const mergedOverflowCount = computed(() =>
Math.max(0, convertNumber(props.overflowCount ?? config.overflowCount, Number.MAX_VALUE)),
)
// 兼容之前的用法
const mergedText = computed(() => {
const { count } = props
return isNumeric(count) ? undefined : (count as string)
})

const classes = computed(() => {
const prefixCls = mergedPrefixCls.value
Expand Down Expand Up @@ -62,6 +67,7 @@ export default defineComponent({
prefixCls={prefixCls}
showZero={mergedShowZero.value}
status={props.status}
text={mergedText.value}
title={props.title}
/>
)}
Expand Down
8 changes: 5 additions & 3 deletions packages/components/badge/src/BadgeSub.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,13 @@ export default defineComponent({
})

return () => {
const { prefixCls, dot } = props
if (dot) {
const { prefixCls, dot, text } = props
if (dot || text) {
return (
<Transition name={`${prefixCls}-sub`} appear>
<sup class={classes.value} title={props.title}></sup>
<sup class={classes.value} title={props.title}>
{text && <span class={`${prefixCls}-sub-text`}>{text}</span>}
</sup>
</Transition>
)
}
Expand Down
1 change: 1 addition & 0 deletions packages/components/badge/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ export const badgeSubProps = {
prefixCls: { type: String, required: true },
showZero: { type: Boolean, required: true },
status: { type: String as PropType<'success' | 'info' | 'error' | 'warning'>, required: true },
text: { type: String },
title: { type: String },
} as const
4 changes: 3 additions & 1 deletion packages/components/badge/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
border-radius: calc(@badge-count-size / 2);
box-shadow: 0 0 0 1px @badge-color;
text-align: center;
white-space: nowrap;

&-track {
position: relative;
Expand All @@ -88,7 +89,8 @@
}
}

&-count-multiple {
&-count-multiple,
&-sub-text {
padding: 0 4px;
}

Expand Down