From fdafcd2cc519033af68dca396078cb1f1b00beb1 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Thu, 21 Jun 2018 11:34:25 +0800
Subject: [PATCH] Badge add text prop

---
 examples/routers/badge.vue       |  9 ++++++---
 examples/routers/cell.vue        |  4 +++-
 src/components/badge/badge.vue   | 20 ++++++++++++++++++--
 src/styles/components/badge.less |  1 +
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/examples/routers/badge.vue b/examples/routers/badge.vue
index 49a04f0..0215c70 100644
--- a/examples/routers/badge.vue
+++ b/examples/routers/badge.vue
@@ -14,14 +14,17 @@
 </style>
 <template>
     <div>
-        <Badge dot :count="count">
+        <Badge :count="count">
             <a href="#" class="demo-badge"></a>
         </Badge>
         <Badge :count="0" showZero>
             <a href="#" class="demo-badge"></a>
         </Badge>
         <Button @click="setCount">set count</Button>
-        
+        <br><br>
+        <Badge text="hot">
+            <Button type="ghost">Hello</Button>
+        </Badge>
     </div>
 </template>
 <script>
@@ -29,7 +32,7 @@
         props: {},
         data () {
             return {
-                count: 50
+                count: 5
             };
         },
         methods: {
diff --git a/examples/routers/cell.vue b/examples/routers/cell.vue
index e2fcecc..95290b2 100644
--- a/examples/routers/cell.vue
+++ b/examples/routers/cell.vue
@@ -2,7 +2,9 @@
     <div style="margin: 100px;background: #f8f8f9;padding: 100px;">
         <Card title="选项" :padding="0" shadow style="width: 300px;">
             <CellGroup @on-click="handleClick">
-                <Cell title="标题一" name="a1" label="附属内容" to="/button"></Cell>
+                <Cell title="标题一" name="a1" label="附属内容" to="/button">
+                    <Badge count="10" slot="extra"></Badge>
+                </Cell>
                 <Cell title="标题一" name="a2" label="附属内容" extra="详细信息"></Cell>
                 <Cell title="标题一" name="a3" label="附属内容" extra="详细信息" to="/button"></Cell>
                 <Cell title="标题一" name="a4" label="附属内容" selected></Cell>
diff --git a/src/components/badge/badge.vue b/src/components/badge/badge.vue
index 37fa3f2..53f265c 100644
--- a/src/components/badge/badge.vue
+++ b/src/components/badge/badge.vue
@@ -9,12 +9,13 @@
     </span>
 </template>
 <script>
+    import { oneOf } from '../../utils/assist';
     const prefixCls = 'ivu-badge';
 
     export default {
         name: 'Badge',
         props: {
-            count: [Number, String],
+            count: Number,
             dot: {
                 type: Boolean,
                 default: false
@@ -27,6 +28,18 @@
             showZero: {
                 type: Boolean,
                 default: false
+            },
+            text: {
+                type: String,
+                default: ''
+            },
+            status: {
+                validator (value) {
+                    return oneOf(value, ['success', 'processing', 'default', 'error', 'warning']);
+                }
+            },
+            offset: {
+                type: Array
             }
         },
         computed: {
@@ -46,6 +59,7 @@
                 ];
             },
             finalCount () {
+                if (this.text !== '') return this.text;
                 return parseInt(this.count) >= parseInt(this.overflowCount) ? `${this.overflowCount}+` : this.count;
             },
             badge () {
@@ -64,10 +78,12 @@
                     }
                 }
 
+                if (this.text !== '') status = true;
+
                 return status || this.showZero;
             },
             hasCount() {
-                if(this.count) return true;
+                if(this.count || this.text !== '') return true;
                 if(this.showZero && parseInt(this.count) === 0) return true;
                 else return false;
             },
diff --git a/src/styles/components/badge.less b/src/styles/components/badge.less
index b4c8350..59a97c5 100644
--- a/src/styles/components/badge.less
+++ b/src/styles/components/badge.less
@@ -1,6 +1,7 @@
 @badge-prefix-cls: ~"@{css-prefix}badge";
 
 .@{badge-prefix-cls} {
+    font-family: "Monospaced Number";
     position: relative;
     display: inline-block;
     line-height: 1;
--
libgit2 0.21.4