feat:增加badge组件show属性

张寸起 · 7insummer · commit df48c0e53e4b · 2019-08-14T21:12:01.000+08:00
diff --git a/dist/badge/index.js b/dist/badge/index.js
@@ -23,7 +23,11 @@ Component({
       value: 'overflow'
     },
     // 文字内容
-    content: String
+    content: String,
+    show: {
+      type: Boolean,
+      value: true
+    }
   },
   data: {
     finalCount: 0
diff --git a/dist/badge/index.wxml b/dist/badge/index.wxml
@@ -1,6 +1,8 @@
 <view class="l-badge" bindtap="handleTap">
   <slot/>
-  <view class="l-badge-content l-class l-class-self" wx:if="{{finalCount}}">{{finalCount}}</view>
-  <view wx:if="{{content}}" class="l-badge-content l-class l-class-self">{{content}}</view>
-  <view wx:if="{{dot}}" class="l-badge-dot  l-class l-class-self"></view>
+  <block wx:if="{{show}}">
+    <view class="l-badge-content l-class l-class-self" wx:if="{{finalCount}}">{{finalCount}}</view>
+    <view wx:if="{{content}}" class="l-badge-content l-class l-class-self">{{content}}</view>
+    <view wx:if="{{dot}}" class="l-badge-dot  l-class l-class-self"></view>
+  </block>
 </view>  
diff --git a/dist/count-selector/index.wxss b/dist/count-selector/index.wxss
@@ -1 +1 @@
-.container-count{display:flex;flex-direction:row}.symbol{height:56rpx;width:56rpx;display:inline-block;vertical-align:middle;text-align:center;line-height:56rpx;font-size:42rpx}.disabled{background-color:#f3f3f3;color:#c4c9d2}.abled{background-color:#ecf1f8;color:#596c8e}.count{height:56rpx;width:64rpx;line-height:56rpx;font-size:24rpx;color:#596c8e;background:#f6f7f9;margin:0 4rpx;text-align:center}
+.container-count{display:flex;flex-direction:row}.symbol{height:56rpx;width:56rpx;display:inline-block;vertical-align:middle;text-align:center;line-height:56rpx;font-size:42rpx}.disabled{background-color:#f3f3f3;color:#c4c9d2}.abled{background-color:#ecf1f8;color:#596c8e}.count{height:56rpx;width:64rpx;min-height:56rpx;line-height:56rpx;font-size:24rpx;color:#596c8e;background:#f6f7f9;margin:0 4rpx;text-align:center}
diff --git a/dist/loadmore/index.wxml b/dist/loadmore/index.wxml
@@ -7,7 +7,7 @@
   <view wx:elif="{{custom && type==='loading'}}">
     <slot name="loading" />
   </view>
-  <view class="loading" wx:else>
+  <view class="loading l-class" wx:else>
     <view class="line" 
           style="{{'background-color:'+color}}" 
           wx:if="{{line}}"></view>
diff --git a/dist/tag/index.js b/dist/tag/index.js
@@ -3,6 +3,7 @@ Component({
   properties: {
     // 标签名称
     name: Object,
+    cell: String,
     // 标签颜色
     type:{
       type: String,
@@ -50,6 +51,7 @@ Component({
       if (this.properties.disabled) return false;
       let options = {
         name: this.properties.name,
+        cell: this.properties.cell,
         select: this.properties.select
       };
       this.triggerEvent('lintap', options, {
diff --git a/examples/components/content-title/index.wxss b/examples/components/content-title/index.wxss
@@ -6,7 +6,7 @@ page{
   display: flex;
   flex-direction: column;
   align-items: center;
-  background: #f7f7f7;
+  background: transparent;
   box-sizing: border-box; 
   padding-bottom: 160rpx;
 }
diff --git a/examples/dist/badge/index.js b/examples/dist/badge/index.js
@@ -23,7 +23,11 @@ Component({
       value: 'overflow'
     },
     // 文字内容
-    content: String
+    content: String,
+    show: {
+      type: Boolean,
+      value: true
+    }
   },
   data: {
     finalCount: 0
diff --git a/examples/dist/badge/index.wxml b/examples/dist/badge/index.wxml
@@ -1,6 +1,8 @@
 <view class="l-badge" bindtap="handleTap">
   <slot/>
-  <view class="l-badge-content l-class l-class-self" wx:if="{{finalCount}}">{{finalCount}}</view>
-  <view wx:if="{{content}}" class="l-badge-content l-class l-class-self">{{content}}</view>
-  <view wx:if="{{dot}}" class="l-badge-dot  l-class l-class-self"></view>
+  <block wx:if="{{show}}">
+    <view class="l-badge-content l-class l-class-self" wx:if="{{finalCount}}">{{finalCount}}</view>
+    <view wx:if="{{content}}" class="l-badge-content l-class l-class-self">{{content}}</view>
+    <view wx:if="{{dot}}" class="l-badge-dot  l-class l-class-self"></view>
+  </block>
 </view>  
diff --git a/examples/dist/count-selector/index.wxss b/examples/dist/count-selector/index.wxss
@@ -1 +1 @@
-.container-count{display:flex;flex-direction:row}.symbol{height:56rpx;width:56rpx;display:inline-block;vertical-align:middle;text-align:center;line-height:56rpx;font-size:42rpx}.disabled{background-color:#f3f3f3;color:#c4c9d2}.abled{background-color:#ecf1f8;color:#596c8e}.count{height:56rpx;width:64rpx;line-height:56rpx;font-size:24rpx;color:#596c8e;background:#f6f7f9;margin:0 4rpx;text-align:center}
+.container-count{display:flex;flex-direction:row}.symbol{height:56rpx;width:56rpx;display:inline-block;vertical-align:middle;text-align:center;line-height:56rpx;font-size:42rpx}.disabled{background-color:#f3f3f3;color:#c4c9d2}.abled{background-color:#ecf1f8;color:#596c8e}.count{height:56rpx;width:64rpx;min-height:56rpx;line-height:56rpx;font-size:24rpx;color:#596c8e;background:#f6f7f9;margin:0 4rpx;text-align:center}
diff --git a/examples/dist/loadmore/index.wxml b/examples/dist/loadmore/index.wxml
@@ -7,7 +7,7 @@
   <view wx:elif="{{custom && type==='loading'}}">
     <slot name="loading" />
   </view>
-  <view class="loading" wx:else>
+  <view class="loading l-class" wx:else>
     <view class="line" 
           style="{{'background-color:'+color}}" 
           wx:if="{{line}}"></view>
diff --git a/examples/dist/tag/index.js b/examples/dist/tag/index.js
@@ -3,6 +3,7 @@ Component({
   properties: {
     // 标签名称
     name: Object,
+    cell: String,
     // 标签颜色
     type:{
       type: String,
@@ -50,6 +51,7 @@ Component({
       if (this.properties.disabled) return false;
       let options = {
         name: this.properties.name,
+        cell: this.properties.cell,
         select: this.properties.select
       };
       this.triggerEvent('lintap', options, {
diff --git a/src/badge/index.js b/src/badge/index.js
@@ -23,7 +23,11 @@ Component({
       value: 'overflow'
     },
     // 文字内容
-    content: String
+    content: String,
+    show: {
+      type: Boolean,
+      value: true
+    }
   },
   data: {
     finalCount: 0
diff --git a/src/badge/index.wxml b/src/badge/index.wxml
@@ -1,6 +1,8 @@
 <view class="l-badge" bindtap="handleTap">
   <slot/>
-  <view class="l-badge-content l-class l-class-self" wx:if="{{finalCount}}">{{finalCount}}</view>
-  <view wx:if="{{content}}" class="l-badge-content l-class l-class-self">{{content}}</view>
-  <view wx:if="{{dot}}" class="l-badge-dot  l-class l-class-self"></view>
+  <block wx:if="{{show}}">
+    <view class="l-badge-content l-class l-class-self" wx:if="{{finalCount}}">{{finalCount}}</view>
+    <view wx:if="{{content}}" class="l-badge-content l-class l-class-self">{{content}}</view>
+    <view wx:if="{{dot}}" class="l-badge-dot  l-class l-class-self"></view>
+  </block>
 </view>  
diff --git a/src/count-selector/index.less b/src/count-selector/index.less
@@ -26,6 +26,7 @@
 .count {
   height: 56rpx;
   width: 64rpx;
+  min-height: 56rpx;
   line-height: 56rpx;
   font-size: 24rpx;
   color: #596c8e;
diff --git a/src/loadmore/index.wxml b/src/loadmore/index.wxml
@@ -7,7 +7,7 @@
   <view wx:elif="{{custom && type==='loading'}}">
     <slot name="loading" />
   </view>
-  <view class="loading" wx:else>
+  <view class="loading l-class" wx:else>
     <view class="line" 
           style="{{'background-color:'+color}}" 
           wx:if="{{line}}"></view>
diff --git a/src/tag/index.js b/src/tag/index.js
@@ -3,6 +3,7 @@ Component({
   properties: {
     // 标签名称
     name: Object,
+    cell: String,
     // 标签颜色
     type:{
       type: String,
@@ -50,6 +51,7 @@ Component({
       if (this.properties.disabled) return false;
       let options = {
         name: this.properties.name,
+        cell: this.properties.cell,
         select: this.properties.select
       };
       this.triggerEvent('lintap', options, {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-.container-count{display:flex;flex-direction:row}.symbol{height:56rpx;width:56rpx;display:inline-block;vertical-align:middle;text-align:center;line-height:56rpx;font-size:42rpx}.disabled{background-color:#f3f3f3;color:#c4c9d2}.abled{background-color:#ecf1f8;color:#596c8e}.count{height:56rpx;width:64rpx;line-height:56rpx;font-size:24rpx;color:#596c8e;background:#f6f7f9;margin:0 4rpx;text-align:center}`
	`1`	`+.container-count{display:flex;flex-direction:row}.symbol{height:56rpx;width:56rpx;display:inline-block;vertical-align:middle;text-align:center;line-height:56rpx;font-size:42rpx}.disabled{background-color:#f3f3f3;color:#c4c9d2}.abled{background-color:#ecf1f8;color:#596c8e}.count{height:56rpx;width:64rpx;min-height:56rpx;line-height:56rpx;font-size:24rpx;color:#596c8e;background:#f6f7f9;margin:0 4rpx;text-align:center}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ page{`
`6`	`6`	`display: flex;`
`7`	`7`	`flex-direction: column;`
`8`	`8`	`align-items: center;`
`9`		`- background: #f7f7f7;`
	`9`	`+ background: transparent;`
`10`	`10`	`box-sizing: border-box;`
`11`	`11`	`padding-bottom: 160rpx;`
`12`	`12`	`}`