From 4882dfd65cf8a53fa585d41cdd92900a4c62bc5d Mon Sep 17 00:00:00 2001 From: cjz Date: Fri, 22 Apr 2022 10:59:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(Badge):=20Badge=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=97=A0status=E5=80=BC=E4=B8=8D=E6=98=BE=E7=A4=BAdot=20(#507)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/devui-vue/devui/badge/src/badge-types.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/devui-vue/devui/badge/src/badge-types.ts b/packages/devui-vue/devui/badge/src/badge-types.ts index e8215c82b9..931de6fe3f 100644 --- a/packages/devui-vue/devui/badge/src/badge-types.ts +++ b/packages/devui-vue/devui/badge/src/badge-types.ts @@ -21,6 +21,7 @@ export const badgeProps = { status: { type: String as PropType, validator: (val: string): boolean => badgeStatusType.includes(val), + default: 'danger' }, position: { type: String as PropType, From 41a00b0afd68d1f513a77f18a6a0c90a315306e9 Mon Sep 17 00:00:00 2001 From: cjz Date: Fri, 22 Apr 2022 11:07:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?docs(Badge):=20=E4=BF=AE=E6=94=B9Badge?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=96=87=E6=A1=A3api=E4=B8=ADstatus=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=8F=8F=E8=BF=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/devui-vue/docs/components/badge/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devui-vue/docs/components/badge/index.md b/packages/devui-vue/docs/components/badge/index.md index 02264d16cc..da457a00bd 100644 --- a/packages/devui-vue/docs/components/badge/index.md +++ b/packages/devui-vue/docs/components/badge/index.md @@ -169,7 +169,7 @@ | count | `number` | -- | 可选，设置基本徽章和计数徽章中显示的数目 | | max-count | `number` | 99 | 可选，设置基本徽章和计数徽章最大可显示数目，
当 count > `max-count` 时显示 `max-count+` | | show-dot | `boolean` | false | 可选，true 时为点状徽章(有包裹)或状态徽章(无包裹)，
false 时为基本徽章(有包裹)或计数徽章(无包裹) | -| status | [BadgeStatusType](#badgestatustype) | -- | 可选，状态色 | +| status | [BadgeStatusType](#badgestatustype) | 'danger' | 可选，状态色 | | position | [BadgePositionType](#badgepositiontype) | 'top-right' | 可选，徽标位置 | | bg-color | `string` | -- | 可选，自定义徽标色，此时 status 参数设置的徽章状态色失效 | | text-color | `string` | -- | 可选, 可自定义徽标文字颜色 | From f65e0232be3b5e4cf812a8103b6536d7d9b57e20 Mon Sep 17 00:00:00 2001 From: cjz Date: Fri, 22 Apr 2022 16:51:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(Badge):=20=E4=BF=AE=E6=94=B9=20Badge=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20status=20=E5=B1=9E=E6=80=A7=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA=20info=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/devui-vue/devui/badge/src/badge-types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devui-vue/devui/badge/src/badge-types.ts b/packages/devui-vue/devui/badge/src/badge-types.ts index 931de6fe3f..0c112714f0 100644 --- a/packages/devui-vue/devui/badge/src/badge-types.ts +++ b/packages/devui-vue/devui/badge/src/badge-types.ts @@ -21,7 +21,7 @@ export const badgeProps = { status: { type: String as PropType, validator: (val: string): boolean => badgeStatusType.includes(val), - default: 'danger' + default: 'info' }, position: { type: String as PropType, From 15e5a175f1d7c3c92160e9f0fcb38aa42d0dfee0 Mon Sep 17 00:00:00 2001 From: zcj <18137693952@163.com> Date: Sun, 24 Apr 2022 18:06:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?docs(Badge):=20=E4=BF=AE=E6=94=B9Badge?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=96=87=E6=A1=A3=20status=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=8F=8F=E8=BF=B0=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA?= =?UTF-8?q?'info'=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/devui-vue/docs/components/badge/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devui-vue/docs/components/badge/index.md b/packages/devui-vue/docs/components/badge/index.md index da457a00bd..a4f77cc5e7 100644 --- a/packages/devui-vue/docs/components/badge/index.md +++ b/packages/devui-vue/docs/components/badge/index.md @@ -169,7 +169,7 @@ | count | `number` | -- | 可选，设置基本徽章和计数徽章中显示的数目 | | max-count | `number` | 99 | 可选，设置基本徽章和计数徽章最大可显示数目，
当 count > `max-count` 时显示 `max-count+` | | show-dot | `boolean` | false | 可选，true 时为点状徽章(有包裹)或状态徽章(无包裹)，
false 时为基本徽章(有包裹)或计数徽章(无包裹) | -| status | [BadgeStatusType](#badgestatustype) | 'danger' | 可选，状态色 | +| status | [BadgeStatusType](#badgestatustype) | 'info' | 可选，状态色 | | position | [BadgePositionType](#badgepositiontype) | 'top-right' | 可选，徽标位置 | | bg-color | `string` | -- | 可选，自定义徽标色，此时 status 参数设置的徽章状态色失效 | | text-color | `string` | -- | 可选, 可自定义徽标文字颜色 |