update the master branch to the latest

src/components/badge/badge.vue

@@ -0,0 +1,121 @@
+<template>
+    <span v-if="dot" :class="classes" ref="badge">
+        <slot></slot>
+        <sup :class="dotClasses" :style="styles" v-show="badge"></sup>
+    </span>
+    <span v-else-if="status" :class="classes" class="ivu-badge-status" ref="badge">
+        <span :class="statusClasses"></span>
+        <span class="ivu-badge-status-text">{{ text }}</span>
+    </span>
+    <span v-else :class="classes" ref="badge">
+        <slot></slot>
+        <sup v-if="hasCount" :style="styles" :class="countClasses" v-show="badge">{{ finalCount }}</sup>
+    </span>
+</template>
+<script>
+    import { oneOf } from '../../utils/assist';
+    const prefixCls = 'ivu-badge';
+
+    export default {
+        name: 'Badge',
+        props: {
+            count: Number,
+            dot: {
+                type: Boolean,
+                default: false
+            },
+            overflowCount: {
+                type: [Number, String],
+                default: 99
+            },
+            className: String,
+            showZero: {
+                type: Boolean,
+                default: false
+            },
+            text: {
+                type: String,
+                default: ''
+            },
+            status: {
+                validator (value) {
+                    return oneOf(value, ['success', 'processing', 'default', 'error', 'warning']);
+                }
+            },
+            type: {
+                validator (value) {
+                    return oneOf(value, ['success', 'primary', 'normal', 'error', 'warning', 'info']);
+                }
+            },
+            offset: {
+                type: Array
+            }
+        },
+        computed: {
+            classes () {
+                return `${prefixCls}`;
+            },
+            dotClasses () {
+                return `${prefixCls}-dot`;
+            },
+            countClasses () {
+                return [
+                    `${prefixCls}-count`,
+                    {
+                        [`${this.className}`]: !!this.className,
+                        [`${prefixCls}-count-alone`]: this.alone,
+                        [`${prefixCls}-count-${this.type}`]: !!this.type
+                    }
+                ];
+            },
+            statusClasses () {
+                return [
+                    `${prefixCls}-status-dot`,
+                    {
+                        [`${prefixCls}-status-${this.status}`]: !!this.status
+                    }
+                ];
+            },
+            styles () {
+                const style = {};
+                if (this.offset && this.offset.length === 2) {
+                    style['margin-top'] = `${this.offset[0]}px`;
+                    style['margin-right'] = `${this.offset[1]}px`;
+                }
+                return style;
+            },
+            finalCount () {
+                if (this.text !== '') return this.text;
+                return parseInt(this.count) >= parseInt(this.overflowCount) ? `${this.overflowCount}+` : this.count;
+            },
+            badge () {
+                let status = false;
+
+                if (this.count) {
+                    status = !(parseInt(this.count) === 0);
+                }
+
+                if (this.dot) {
+                    status = true;
+                    if (this.count !== null) {
+                        if (parseInt(this.count) === 0) {
+                            status = false;
+                        }
+                    }
+                }
+
+                if (this.text !== '') status = true;
+
+                return status || this.showZero;
+            },
+            hasCount() {
+                if(this.count || this.text !== '') return true;
+                if(this.showZero && parseInt(this.count) === 0) return true;
+                else return false;
+            },
+            alone () {
+                return this.$slots.default === undefined;
+            }
+        }
+    };
+</script>

src/components/badge/index.js

@@ -0,0 +1,2 @@
+import Badge from './badge.vue';
+export default Badge;