Skip to content
Open
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
8 changes: 8 additions & 0 deletions CHANGELOG.en-US.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# CHANGELOG

## NEXT_VERSION

`NEXT_VERSION`

### Feats

- `n-badge` supports negative values, closes [#6869](https://github.com/tusen-ai/naive-ui/issues/6869)

## 2.43.2

### Fixes
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.zh-CN.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# CHANGELOG

## NEXT_VERSION

`NEXT_VERSION`

### Feats

- `n-badge` 支持负数值,关闭 [#6869](https://github.com/tusen-ai/naive-ui/issues/6869)

## 2.43.2

### Fixes
Expand Down
14 changes: 11 additions & 3 deletions src/_internal/slot-machine/src/SlotMachine.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ export default defineComponent({
const numbersRef = computed(() => {
if (typeof props.value === 'string')
return []
if (props.value < 1)
if (props.value === 0)
return [0]
const numbers: number[] = []
let value = props.value
if (props.max !== undefined) {
let value = Math.abs(props.value)
if (props.max !== undefined && props.value > 0) {
value = Math.min(props.max, value)
}
while (value >= 1) {
Expand Down Expand Up @@ -74,6 +74,14 @@ export default defineComponent({
const { value, clsPrefix } = props
return typeof value === 'number' ? (
<span class={`${clsPrefix}-base-slot-machine`}>
<NFadeInExpandTransition key="-" width>
{{
default: () =>
typeof props.value === 'number' && props.value < 0 ? (
<SlotMachineNumber clsPrefix={clsPrefix} value="-" />
) : null
}}
</NFadeInExpandTransition>
<TransitionGroup name="fade-up-width-expand-transition" tag="span">
{{
default: () =>
Expand Down
2 changes: 1 addition & 1 deletion src/badge/src/Badge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default defineComponent({
props.show
&& (props.dot
|| (props.value !== undefined
&& !(!props.showZero && Number(props.value) <= 0))
&& !(!props.showZero && Number(props.value) === 0))
|| !isSlotEmpty(slots.value))
)
})
Expand Down