From 83aeab26c0474a2e3b048962fd0ebfddb66126ce Mon Sep 17 00:00:00 2001 From: wangyupei <2311595895@qq.com> Date: Wed, 16 Mar 2022 14:46:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20Badge=E7=BB=84=E4=BB=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0common=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/devui-vue/devui/badge/src/badge-types.ts | 4 ++-- packages/devui-vue/devui/badge/src/badge.scss | 5 +++++ packages/devui-vue/docs/components/badge/index.md | 15 +++++++-------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/devui-vue/devui/badge/src/badge-types.ts b/packages/devui-vue/devui/badge/src/badge-types.ts index ee212e5311..e8215c82b9 100644 --- a/packages/devui-vue/devui/badge/src/badge-types.ts +++ b/packages/devui-vue/devui/badge/src/badge-types.ts @@ -1,9 +1,9 @@ import type { PropType, ExtractPropTypes } from 'vue'; -export type BadgeStatusType = 'danger' | 'warning' | 'waiting' | 'success' | 'info'; +export type BadgeStatusType = 'danger' | 'warning' | 'waiting' | 'success' | 'info' | 'common'; export type BadgePositionType = 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right'; -const badgeStatusType = ['danger', 'warning', 'waiting', 'success', 'info']; +const badgeStatusType = ['danger', 'warning', 'waiting', 'success', 'info', 'common']; const badgePositionType = ['top-left', 'top-right', 'bottom-left', 'bottom-right']; export const badgeProps = { diff --git a/packages/devui-vue/devui/badge/src/badge.scss b/packages/devui-vue/devui/badge/src/badge.scss index 9f72576e39..e8ab08b92f 100644 --- a/packages/devui-vue/devui/badge/src/badge.scss +++ b/packages/devui-vue/devui/badge/src/badge.scss @@ -39,6 +39,11 @@ background: $devui-info; } + &-common { + background: $devui-unavailable; + color: $devui-aide-text; + } + &-top-left { left: 0; top: 0; diff --git a/packages/devui-vue/docs/components/badge/index.md b/packages/devui-vue/docs/components/badge/index.md index 5597e7fe30..2092fea73d 100644 --- a/packages/devui-vue/docs/components/badge/index.md +++ b/packages/devui-vue/docs/components/badge/index.md @@ -70,28 +70,27 @@ ``` @@ -179,7 +178,7 @@ ### BadgeStatusType 类型 ```typescript -type BadgeStatusType = 'danger' | 'warning' | 'waiting' | 'success' | 'info'; +type BadgeStatusType = 'danger' | 'warning' | 'waiting' | 'success' | 'info' | 'common'; ``` ### BadgePositionType 类型