Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue

docs/examples-docs/badge.md

@@ -2,13 +2,28 @@
 
 ### 基础用法
 
+<script>
+  export default {
+    data() {
+      return {
+        activeKey: '2'
+      };
+    },
+    methods: {
+      onItemClick(e, data) {
+        this.activeKey = data.mark;
+      }
+    }
+  };
+</script>
+
 :::demo 基础用法
 ```html
-<zan-badge-group active-key="2">
-  <zan-badge mark="0" title="热销榜" info="8" url="http://baidu.com"></zan-badge>
-  <zan-badge mark="1" title="花式寿司" info="99"></zan-badge>
-  <zan-badge mark="2" title="火炽寿司"></zan-badge>
-  <zan-badge mark="3" title="手握寿司" info="199"></zan-badge>
+<zan-badge-group :active-key="activeKey">
+  <zan-badge mark="0" title="热销榜" info="8" url="http://baidu.com" @click="onItemClick"></zan-badge>
+  <zan-badge mark="1" title="花式寿司" info="99" @click="onItemClick"></zan-badge>
+  <zan-badge mark="2" title="火炽寿司" @click="onItemClick"></zan-badge>
+  <zan-badge mark="3" title="手握寿司" info="199" @click="onItemClick"></zan-badge>
 </zan-badge-group>
 ```
 :::

packages/badge/src/badge-group.vue

@@ -14,12 +14,6 @@
         type: [Number, String],
         default: 0
       }
-    },
-
-    data() {
-      return {
-        computedActiveKey: this.activeKey
-      };
     }
   };
 </script>

packages/badge/src/badge.vue

@@ -19,21 +19,27 @@ export default {
       required: true
     },
     url: {
-      type: String
+      type: String,
+      default: 'javascript:;'
     },
     info: {
       type: String
     }
   },
   methods: {
-    handleClick() {
-      this.$parent.computedActiveKey = this.mark;
+    handleClick(e) {
+      this.$emit('click', e, {
+        mark: this.mark,
+        title: this.title,
+        url: this.url,
+        info: this.info
+      });
     }
   },
   computed: {
     classNames() {
       return {
-        'is-select': this.mark === this.$parent.computedActiveKey
+        'is-select': this.mark === this.$parent.activeKey
       };
     }
   }

packages/zanui-css/src/badge.css

@@ -13,14 +13,14 @@
         display: block;
         overflow: hidden;
         position: relative;
-        padding: 20px 15px;
+        padding: 20px 12px;
         box-sizing: border-box;
-        line-height: 14px;
+        line-height: 1.4;
         background-color: $c-background;
         color: $c-gray-darker;
         font-size: 14px;
         text-decoration: none;
-        white-space: nowrap;
+        word-break: break-all;
         @e active {
             display: none;
             position: absolute;
@@ -68,4 +68,4 @@
           }
         }
     }
-}
+}