feat:发布0.5.6 (#343)

7insummer · web-flow · commit 922cbb0e2bb4 · 2019-07-03T21:37:14.000+08:00
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 <div align="center">
 
 ![](https://img.shields.io/badge/build-passing-00d508.svg)
-![](https://img.shields.io/badge/version-0.5.5-3963bc.svg)
+![](https://img.shields.io/badge/version-0.5.6-3963bc.svg)
 ![](https://img.shields.io/badge/license-MIT-3963bc.svg)
 
 </div>
@@ -39,7 +39,7 @@ Lin UI 是基于 **微信小程序原生语法** 实现的组件库。遵循简
 
 ## 最新版本
 
-核心库：0.5.5
+核心库：0.5.6
 
 示例工程：0.0.1-alpha.2
 
diff --git a/dist/action-sheet/index.wxss b/dist/action-sheet/index.wxss
@@ -1 +1 @@
-.l-action-sheet{background:#f7f7f7}.l-item-button{height:88rpx;line-height:88rpx;text-align:center;background:#fff;border-bottom:2rpx solid #f3f3f3;font-size:28rpx;color:#45526b;display:flex;align-items:center;justify-content:center}.l-cancel{margin-top:12rpx}.l-cancel-x .l-item-button{padding-bottom:44rpx}.l-image-button>text{margin-left:20rpx}
+.l-action-sheet{background:#f7f7f7}.l-item-button{height:88rpx;line-height:88rpx;text-align:center;background:#fff;border-bottom:2rpx solid #f3f3f3;font-size:28rpx;color:#45526b;display:flex;align-items:center;justify-content:center;width:100%}.l-cancel{margin-top:12rpx}.l-cancel-x .l-item-button{padding-bottom:44rpx}.l-image-button>text{margin-left:20rpx}
diff --git a/dist/behaviors/countdown.js b/dist/behaviors/countdown.js
@@ -4,8 +4,8 @@ module.exports = Behavior({
         time: {
             type: Date,
             value: new Date().getTime() + 86400000,
-            observer:function(newVal,oldVal) {
-                if(newVal && !oldVal) {
+            observer: function (newVal, oldVal) {
+                if (newVal && !oldVal) {
                     this.getLatestTime();
                 }
             }
@@ -36,6 +36,10 @@ module.exports = Behavior({
         countdownType: {
             type: String,
             value: "normal"
+        },
+        isClearInterval: {
+            type: Boolean,
+            value: true
         }
     },
     data: {
@@ -48,15 +52,22 @@ module.exports = Behavior({
     },
 
     detached: function () {
-        clearInterval(this.data.timer);
+        if (this.data.isClearInterval) {
+            clearInterval(this.data.timer);
+        }
     },
 
     pageLifetimes: {
         hide() {
-            clearInterval(this.data.timer);
+            if (this.data.isClearInterval) {
+                clearInterval(this.data.timer);
+            }
+
         },
         show() {
-            this.getLatestTime();
+            if (this.data.isClearInterval) {
+                this.getLatestTime();
+            }
         }
     },
 
diff --git a/dist/input/index.js b/dist/input/index.js
@@ -21,6 +21,11 @@ Component({
       type: Boolean,
       value: false
     },
+    // 是否显示下划线
+    showRow: {
+      type: Boolean,
+      value: true
+    },
     // 是否必选
     required: {
       type: Boolean,
diff --git a/dist/input/index.wxml b/dist/input/index.wxml
@@ -3,7 +3,7 @@
   class='form-item {{disabled? "disabled": ""}} l-class form-item-{{labelLayout}}'
   style="width:{{width}}rpx">
   <view class='mask' wx:if="{{disabled}}"></view>
-  <view class='row' style="width:{{width}}rpx;"></view>
+  <view class='row' hidden="{{ showRow ? '' : 'hidden' }}" style="width:{{width}}rpx;"></view>
   <view wx:if="{{label && !labelCustom}}" class='form-label l-label-class form-label-{{labelLayout}}' style='{{labelLayout !== "top" ? "width:"+ labelWidth+ "rpx;" : "" }} height:{{labelLayout== "top" ? labelWidth + "rpx" : "" }}'>
     <text><text class='text-require' wx:if="{{required}}">* </text>{{label}}<text wx:if="{{colon}}">：</text>
     </text>
diff --git a/dist/input/index.wxss b/dist/input/index.wxss
@@ -1 +1 @@
-.form-item{position:relative;font-size:28rpx;color:#333;width:750rpx;height:88rpx;display:flex;flex-direction:row;align-items:center;padding-right:25rpx;box-sizing:border-box}.row{position:absolute;bottom:0;right:0;height:1rpx;width:730rpx;background:#f3f3f3}.text-require{color:#e23;vertical-align:middle}.form-label{display:flex;flex-direction:row;align-items:center;height:88rpx;padding-left:25rpx;padding-right:15rpx;box-sizing:border-box}.disabled{color:#9a9a9a!important}.mask{position:absolute;z-index:999;height:100%;width:100%}.form-label-right{justify-content:flex-end}.form-label-left{justify-content:flex-start}.input{height:100%;line-height:100%;flex:1}.close{height:30rpx;width:30rpx;background:#ddd;display:flex;flex-direction:row;align-items:center;justify-content:center;border-radius:50%;margin-right:20rpx}.pls-class{color:#9a9a9a}
+.form-item{position:relative;font-size:28rpx;color:#333;width:750rpx;height:88rpx;display:flex;flex-direction:row;align-items:center;padding-right:25rpx;box-sizing:border-box}.row{position:absolute;bottom:0;right:0;height:2rpx;width:730rpx;background:#f3f3f3}.text-require{color:#e23;vertical-align:middle}.form-label{display:flex;flex-direction:row;align-items:center;height:88rpx;padding-left:25rpx;padding-right:15rpx;box-sizing:border-box}.disabled{color:#9a9a9a!important}.mask{position:absolute;z-index:999;height:100%;width:100%}.form-label-right{justify-content:flex-end}.form-label-left{justify-content:flex-start}.input{height:100%;line-height:100%;flex:1}.close{height:30rpx;width:30rpx;background:#ddd;display:flex;flex-direction:row;align-items:center;justify-content:center;border-radius:50%;margin-right:20rpx}.pls-class{color:#9a9a9a}
diff --git a/examples/dist/action-sheet/index.wxss b/examples/dist/action-sheet/index.wxss
@@ -1 +1 @@
-.l-action-sheet{background:#f7f7f7}.l-item-button{height:88rpx;line-height:88rpx;text-align:center;background:#fff;border-bottom:2rpx solid #f3f3f3;font-size:28rpx;color:#45526b;display:flex;align-items:center;justify-content:center}.l-cancel{margin-top:12rpx}.l-cancel-x .l-item-button{padding-bottom:44rpx}.l-image-button>text{margin-left:20rpx}
+.l-action-sheet{background:#f7f7f7}.l-item-button{height:88rpx;line-height:88rpx;text-align:center;background:#fff;border-bottom:2rpx solid #f3f3f3;font-size:28rpx;color:#45526b;display:flex;align-items:center;justify-content:center;width:100%}.l-cancel{margin-top:12rpx}.l-cancel-x .l-item-button{padding-bottom:44rpx}.l-image-button>text{margin-left:20rpx}
diff --git a/examples/dist/behaviors/countdown.js b/examples/dist/behaviors/countdown.js
@@ -4,8 +4,8 @@ module.exports = Behavior({
         time: {
             type: Date,
             value: new Date().getTime() + 86400000,
-            observer:function(newVal,oldVal) {
-                if(newVal && !oldVal) {
+            observer: function (newVal, oldVal) {
+                if (newVal && !oldVal) {
                     this.getLatestTime();
                 }
             }
@@ -36,6 +36,10 @@ module.exports = Behavior({
         countdownType: {
             type: String,
             value: "normal"
+        },
+        isClearInterval: {
+            type: Boolean,
+            value: true
         }
     },
     data: {
@@ -48,15 +52,22 @@ module.exports = Behavior({
     },
 
     detached: function () {
-        clearInterval(this.data.timer);
+        if (this.data.isClearInterval) {
+            clearInterval(this.data.timer);
+        }
     },
 
     pageLifetimes: {
         hide() {
-            clearInterval(this.data.timer);
+            if (this.data.isClearInterval) {
+                clearInterval(this.data.timer);
+            }
+
         },
         show() {
-            this.getLatestTime();
+            if (this.data.isClearInterval) {
+                this.getLatestTime();
+            }
         }
     },
 
diff --git a/examples/dist/input/index.js b/examples/dist/input/index.js
@@ -21,6 +21,11 @@ Component({
       type: Boolean,
       value: false
     },
+    // 是否显示下划线
+    showRow: {
+      type: Boolean,
+      value: true
+    },
     // 是否必选
     required: {
       type: Boolean,
diff --git a/examples/dist/input/index.wxml b/examples/dist/input/index.wxml
@@ -3,7 +3,7 @@
   class='form-item {{disabled? "disabled": ""}} l-class form-item-{{labelLayout}}'
   style="width:{{width}}rpx">
   <view class='mask' wx:if="{{disabled}}"></view>
-  <view class='row' style="width:{{width}}rpx;"></view>
+  <view class='row' hidden="{{ showRow ? '' : 'hidden' }}" style="width:{{width}}rpx;"></view>
   <view wx:if="{{label && !labelCustom}}" class='form-label l-label-class form-label-{{labelLayout}}' style='{{labelLayout !== "top" ? "width:"+ labelWidth+ "rpx;" : "" }} height:{{labelLayout== "top" ? labelWidth + "rpx" : "" }}'>
     <text><text class='text-require' wx:if="{{required}}">* </text>{{label}}<text wx:if="{{colon}}">：</text>
     </text>
diff --git a/examples/dist/input/index.wxss b/examples/dist/input/index.wxss
@@ -1 +1 @@
-.form-item{position:relative;font-size:28rpx;color:#333;width:750rpx;height:88rpx;display:flex;flex-direction:row;align-items:center;padding-right:25rpx;box-sizing:border-box}.row{position:absolute;bottom:0;right:0;height:1rpx;width:730rpx;background:#f3f3f3}.text-require{color:#e23;vertical-align:middle}.form-label{display:flex;flex-direction:row;align-items:center;height:88rpx;padding-left:25rpx;padding-right:15rpx;box-sizing:border-box}.disabled{color:#9a9a9a!important}.mask{position:absolute;z-index:999;height:100%;width:100%}.form-label-right{justify-content:flex-end}.form-label-left{justify-content:flex-start}.input{height:100%;line-height:100%;flex:1}.close{height:30rpx;width:30rpx;background:#ddd;display:flex;flex-direction:row;align-items:center;justify-content:center;border-radius:50%;margin-right:20rpx}.pls-class{color:#9a9a9a}
+.form-item{position:relative;font-size:28rpx;color:#333;width:750rpx;height:88rpx;display:flex;flex-direction:row;align-items:center;padding-right:25rpx;box-sizing:border-box}.row{position:absolute;bottom:0;right:0;height:2rpx;width:730rpx;background:#f3f3f3}.text-require{color:#e23;vertical-align:middle}.form-label{display:flex;flex-direction:row;align-items:center;height:88rpx;padding-left:25rpx;padding-right:15rpx;box-sizing:border-box}.disabled{color:#9a9a9a!important}.mask{position:absolute;z-index:999;height:100%;width:100%}.form-label-right{justify-content:flex-end}.form-label-left{justify-content:flex-start}.input{height:100%;line-height:100%;flex:1}.close{height:30rpx;width:30rpx;background:#ddd;display:flex;flex-direction:row;align-items:center;justify-content:center;border-radius:50%;margin-right:20rpx}.pls-class{color:#9a9a9a}
diff --git a/examples/pages/components/basic/pages/button/index.wxml b/examples/pages/components/basic/pages/button/index.wxml
@@ -105,8 +105,8 @@
     </view>
   </content-card>
 
-  <l-button special="true" openType="getUserInfo" bind:getuserinfo="getUserInfo">
+  <!-- <l-button special="true" openType="getUserInfo" bind:getuserinfo="getUserInfo">
       <image src="/images/basic/icon-button.png" class='test-img'></image>
-  </l-button>
+  </l-button> -->
 
 </content-title>
diff --git a/examples/pages/components/form/pages/input/index.json b/examples/pages/components/form/pages/input/index.json
@@ -3,6 +3,7 @@
     "content-title": "/components/content-title/index",
     "content-card": "/components/content-card/index",
     "l-toast": "/dist/toast/index",
+    "l-icon": "/dist/icon/index",
     "l-input": "/dist/input/index"
   }
 }
diff --git a/examples/pages/components/form/pages/input/index.wxml b/examples/pages/components/form/pages/input/index.wxml
@@ -95,19 +95,48 @@
       </view>
     </content-card>
 
-        <content-card
+    <content-card
       class="content"
-      name="自定义右边栏"
+      name="经典案例"
     >
       <view class='buttun-wrapper'>
         <l-input
-          label="验证码" 
+          placeholder="请输入手机号"
+          show-row="{{ false }}"
+          width="600"
+          l-class='input-phone'
+          label-width="120"
+          clear="{{true}}"
+        >
+          <l-icon class='input-icon' slot="left" name="phone"/>
+        </l-input>
+      </view>
+      <view class='buttun-wrapper'>
+        <l-input
+          show-row="{{ false }}"
+          width="600"
+          l-class='input-phone'
+          clear="{{true}}"
+
           placeholder="请输入验证码"     
-          label-width="170"
+          label-width="120"
         >
+          <l-icon class='input-icon' slot="left" name="picture"/>
           <image slot="right"  class='img' bindtap='onYzmTap' src="/images/static/yzm.png" />
         </l-input>
       </view>
+      <view class='buttun-wrapper'>
+        <l-input
+          placeholder="请输入密码"
+          show-row="{{ false }}"
+          width="600"
+          l-class='input-phone'
+          label-width="120"
+          clear="{{true}}"
+        >
+          <l-icon class='input-icon' slot="left" name="password"/>
+        </l-input>
+      </view>
     </content-card>
   </content-title>
 </view>
diff --git a/examples/pages/components/form/pages/input/index.wxss b/examples/pages/components/form/pages/input/index.wxss
@@ -12,3 +12,14 @@
   height: 50rpx;
 }
 
+.input-phone{
+  margin-top: 20rpx;
+  border-radius: 60rpx;
+  border: 2rpx solid #eee;
+  background: #eaf0f7;
+  color: red
+}
+
+.input-icon{
+  margin-left: 15rpx;
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lin-ui",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "A high quality UI components library with MiniProgram",
   "main": "app.js",
   "directories": {
diff --git a/src/action-sheet/index.less b/src/action-sheet/index.less
@@ -14,6 +14,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  width: 100%;
 }
 
 .l-cancel {
diff --git a/src/behaviors/countdown.js b/src/behaviors/countdown.js
@@ -4,8 +4,8 @@ module.exports = Behavior({
         time: {
             type: Date,
             value: new Date().getTime() + 86400000,
-            observer:function(newVal,oldVal) {
-                if(newVal && !oldVal) {
+            observer: function (newVal, oldVal) {
+                if (newVal && !oldVal) {
                     this.getLatestTime();
                 }
             }
@@ -36,6 +36,10 @@ module.exports = Behavior({
         countdownType: {
             type: String,
             value: "normal"
+        },
+        isClearInterval: {
+            type: Boolean,
+            value: true
         }
     },
     data: {
@@ -48,15 +52,22 @@ module.exports = Behavior({
     },
 
     detached: function () {
-        clearInterval(this.data.timer);
+        if (this.data.isClearInterval) {
+            clearInterval(this.data.timer);
+        }
     },
 
     pageLifetimes: {
         hide() {
-            clearInterval(this.data.timer);
+            if (this.data.isClearInterval) {
+                clearInterval(this.data.timer);
+            }
+
         },
         show() {
-            this.getLatestTime();
+            if (this.data.isClearInterval) {
+                this.getLatestTime();
+            }
         }
     },
 
diff --git a/src/input/index.js b/src/input/index.js
@@ -21,6 +21,11 @@ Component({
       type: Boolean,
       value: false
     },
+    // 是否显示下划线
+    showRow: {
+      type: Boolean,
+      value: true
+    },
     // 是否必选
     required: {
       type: Boolean,
diff --git a/src/input/index.less b/src/input/index.less
@@ -19,7 +19,7 @@
   position: absolute;
   bottom: 0;
   right: 0;
-  height: 1rpx;
+  height: 2rpx;
   width: 730rpx;
   background: #f3f3f3;
 }
diff --git a/src/input/index.wxml b/src/input/index.wxml
@@ -3,7 +3,7 @@
   class='form-item {{disabled? "disabled": ""}} l-class form-item-{{labelLayout}}'
   style="width:{{width}}rpx">
   <view class='mask' wx:if="{{disabled}}"></view>
-  <view class='row' style="width:{{width}}rpx;"></view>
+  <view class='row' hidden="{{ showRow ? '' : 'hidden' }}" style="width:{{width}}rpx;"></view>
   <view wx:if="{{label && !labelCustom}}" class='form-label l-label-class form-label-{{labelLayout}}' style='{{labelLayout !== "top" ? "width:"+ labelWidth+ "rpx;" : "" }} height:{{labelLayout== "top" ? labelWidth + "rpx" : "" }}'>
     <text><text class='text-require' wx:if="{{required}}">* </text>{{label}}<text wx:if="{{colon}}">：</text>
     </text>
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-.l-action-sheet{background:#f7f7f7}.l-item-button{height:88rpx;line-height:88rpx;text-align:center;background:#fff;border-bottom:2rpx solid #f3f3f3;font-size:28rpx;color:#45526b;display:flex;align-items:center;justify-content:center}.l-cancel{margin-top:12rpx}.l-cancel-x .l-item-button{padding-bottom:44rpx}.l-image-button>text{margin-left:20rpx}`
	`1`	`+.l-action-sheet{background:#f7f7f7}.l-item-button{height:88rpx;line-height:88rpx;text-align:center;background:#fff;border-bottom:2rpx solid #f3f3f3;font-size:28rpx;color:#45526b;display:flex;align-items:center;justify-content:center;width:100%}.l-cancel{margin-top:12rpx}.l-cancel-x .l-item-button{padding-bottom:44rpx}.l-image-button>text{margin-left:20rpx}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-.form-item{position:relative;font-size:28rpx;color:#333;width:750rpx;height:88rpx;display:flex;flex-direction:row;align-items:center;padding-right:25rpx;box-sizing:border-box}.row{position:absolute;bottom:0;right:0;height:1rpx;width:730rpx;background:#f3f3f3}.text-require{color:#e23;vertical-align:middle}.form-label{display:flex;flex-direction:row;align-items:center;height:88rpx;padding-left:25rpx;padding-right:15rpx;box-sizing:border-box}.disabled{color:#9a9a9a!important}.mask{position:absolute;z-index:999;height:100%;width:100%}.form-label-right{justify-content:flex-end}.form-label-left{justify-content:flex-start}.input{height:100%;line-height:100%;flex:1}.close{height:30rpx;width:30rpx;background:#ddd;display:flex;flex-direction:row;align-items:center;justify-content:center;border-radius:50%;margin-right:20rpx}.pls-class{color:#9a9a9a}
	`1`	+.form-item{position:relative;font-size:28rpx;color:#333;width:750rpx;height:88rpx;display:flex;flex-direction:row;align-items:center;padding-right:25rpx;box-sizing:border-box}.row{position:absolute;bottom:0;right:0;height:2rpx;width:730rpx;background:#f3f3f3}.text-require{color:#e23;vertical-align:middle}.form-label{display:flex;flex-direction:row;align-items:center;height:88rpx;padding-left:25rpx;padding-right:15rpx;box-sizing:border-box}.disabled{color:#9a9a9a!important}.mask{position:absolute;z-index:999;height:100%;width:100%}.form-label-right{justify-content:flex-end}.form-label-left{justify-content:flex-start}.input{height:100%;line-height:100%;flex:1}.close{height:30rpx;width:30rpx;background:#ddd;display:flex;flex-direction:row;align-items:center;justify-content:center;border-radius:50%;margin-right:20rpx}.pls-class{color:#9a9a9a}