feat:v0.5.12=>v0.5.13 (#396)

TaleLin · Aug 4, 2019 · a6ffb9e · a6ffb9e
2 parents 6463b49 + c0845c3
commit a6ffb9e
Show file tree

Hide file tree

Showing 99 changed files with 1,425 additions and 1,138 deletions.
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.12-3963bc.svg)
+![](https://img.shields.io/badge/version-0.5.13-3963bc.svg)
 ![](https://img.shields.io/badge/license-MIT-3963bc.svg)
 
 </div>
@@ -39,7 +39,7 @@ Lin UI 是基于 **微信小程序原生语法** 实现的组件库。遵循简
 
 ## 最新版本
 
-核心库：0.5.12
+核心库：0.5.13
 
 示例工程：0.0.1-alpha.2
 

diff --git a/build/build-prod.js b/build/build-prod.js
@@ -13,7 +13,6 @@ gulp.task('dispose-js', () => {
     .pipe(gulp.dest('../dist/'));
 });
 
-
 gulp.task('dispose-wxss', () => {
   const path = isCustom ? `../src/${result}/*.less` : '../src/**/*.less',
     remainPath = isCustom ? `!../src/${result}/_*.less` : '!../src/**/_*.less';

diff --git a/config/component.json b/config/component.json
@@ -1,5 +1,3 @@
 {
-  "components": [
-
-  ]
+  "components": []
 }
diff --git a/dist/action-sheet/index.js b/dist/action-sheet/index.js
@@ -87,7 +87,7 @@ Component({
         success
       } = this.data;
       success && success({ ...e.currentTarget.dataset });
-      this.triggerEvent('linitemtap', { ...e.currentTarget.dataset });
+      this.triggerEvent('linitemtap', { ...e.currentTarget.dataset },{ bubbles: true, composed: true });
       this._hideActionSheet();
     },
 
@@ -112,7 +112,7 @@ Component({
       });
       this.triggerEvent('lincancel', {
         errMsg: 'showactionsheet:fail cancel'
-      });
+      },{ bubbles: true, composed: true });
       this._hideActionSheet();
     },
 

diff --git a/dist/badge/index.js b/dist/badge/index.js
@@ -1,5 +1,5 @@
 Component({
-  externalClasses: ['l-class','l-class-self'],
+  externalClasses: ['l-class', 'l-class-self'],
   properties: {
     // 红点模式
     dot: {
@@ -32,32 +32,34 @@ Component({
     // 最终数字
     finalCount() {
       switch (this.data.countType) {
-        case 'overflow':
-          this.setData({
-            finalCount: parseInt(this.data.count) >= parseInt(this.data.maxCount) ? `${this.data.maxCount}+` : this.data.count
-          });
-          break;
-        case 'ellipsis':
-          this.setData({
-            finalCount: parseInt(this.data.count) >= parseInt(this.data.maxCount) ? `...` : this.data.count
-          });
-          break;
-        case 'limit':
-          this.setData({
-            finalCount: parseInt(this.data.count) >= 999 ? (parseInt(this.data.count) >= 9999 ? Math.floor(this.data.count / 10000 * 100) / 100 + `w` : Math.floor(this.data.count / 1000 * 100) / 100 + `k`) : this.data.count
-          })
-          break;
-        default:
-          this.setData({
-            finalCount: parseInt(this.data.count)
-          })
-          break;
+      case 'overflow':
+        this.setData({
+          finalCount: parseInt(this.data.count) >= parseInt(this.data.maxCount) ? `${this.data.maxCount}+` : this.data.count
+        });
+        break;
+      case 'ellipsis':
+        this.setData({
+          finalCount: parseInt(this.data.count) >= parseInt(this.data.maxCount) ? `...` : this.data.count
+        });
+        break;
+      case 'limit':
+        this.setData({
+          finalCount: parseInt(this.data.count) >= 999 ? (parseInt(this.data.count) >= 9999 ? Math.floor(this.data.count / 10000 * 100) / 100 + `w` : Math.floor(this.data.count / 1000 * 100) / 100 + `k`) : this.data.count
+        });
+        break;
+      default:
+        this.setData({
+          finalCount: parseInt(this.data.count)
+        });
+        break;
       }
     },
     // 点击事件
     handleTap() {
-      this.triggerEvent('lintap');
-      this.triggerEvent('lintapcatch', {}, { bubbles: true });
+      this.triggerEvent('lintap', {}, {
+        bubbles: true,
+        composed: true
+      });
     },
   }
 });
diff --git a/dist/button/index.js b/dist/button/index.js
@@ -32,10 +32,11 @@ Component({
       value: false,
     },
     // 微信原生接口
-    width:Number,
-    height:Number,
+    width: Number,
+    height: Number,
     icon: String,
     image: String,
+    bgColor: String,
     iconStyle: {
       type: String,
       value: 'size:20;color:#3683D6'
@@ -68,8 +69,10 @@ Component({
     // button点击事件
     handleTap() {
       if (this.data.disabled) return false;
-      this.triggerEvent('lintap');
-      this.triggerEvent('lintapcatch',{},{ bubbles: true });
+      this.triggerEvent('lintap', {}, {
+        bubbles: true,
+        composed: true
+      });
     },
     // 开放能力事件回调
     openTypeEvent(data) {

diff --git a/dist/button/index.wxml b/dist/button/index.wxml
@@ -10,7 +10,7 @@
           hover-stop-propagation="{{hoverStopPropagation}}"
           hover-start-time="{{hoverStartTime}}"
           hover-stay-time="{{hoverStayTime}}"
-          style="{{width?'min-width:'+width+'rpx;':''}} {{height?'height:'+height+'rpx;'+'line-height:'+height+'rpx;':''}} {{size=='long'?'border-radius:0':''}}">
+          style="{{width?'min-width:'+width+'rpx;':''}} {{height?'height:'+height+'rpx;'+'line-height:'+height+'rpx;':''}} {{size=='long'?'border-radius:0;':''}} {{'background-color:'+bgColor}}">
       <view wx:if="{{loading}}" class="l-btn-loading {{'margin-' + size}} {{ plain ?'l-btn-loading-' + type : '' }}"></view>
       <l-icon class="{{'margin-' + size}}" wx:if="{{icon}}" name="{{icon}}" color="{{iconColor}}" size="{{iconSize}}" />
       <slot/>

diff --git a/dist/card/index.js b/dist/card/index.js
@@ -35,4 +35,4 @@ Component({
   methods: {
 
   }
-})
+});
diff --git a/dist/count-selector/index.js b/dist/count-selector/index.js
@@ -1,7 +1,7 @@
 Component({
   externalClasses: [
-    'l-class', 
-    'l-symbol-class', 
+    'l-class',
+    'l-symbol-class',
     'l-count-class',
     'l-disabled-class'
   ],
@@ -41,67 +41,76 @@ Component({
     onBlur(e) {
       let {
         value
-      } = e.detail
+      } = e.detail;
       setTimeout(() => {
-        this.blurCount(value)
-      }, 50)
+        this.blurCount(value);
+      }, 50);
     },
 
     blurCount(value) {
       if (value) {
         if (value > this.properties.max) this.setData({
           count: this.properties.max
-        })
+        });
         else if (value < this.properties.min) this.setData({
           count: this.properties.min
-        })
+        });
         else this.setData({
           count: value
-        })
+        });
       } else {
         this.setData({
           count: this.properties.count
-        })
+        });
       }
       let detail = {
         count: this.data.count,
         type: 'blur'
-      }
-      this.triggerEvent('lintap', detail)
+      };
+      this.triggerEvent('lintap', detail, {
+        bubbles: true,
+        composed: true
+      });
     },
 
     reduceTap() {
-      let distance = this.data.count - this.properties.step
+      let distance = this.data.count - this.properties.step;
       if (distance <= this.properties.min) {
-        this.data.count = this.properties.min
+        this.data.count = this.properties.min;
       } else {
-        this.data.count -= this.properties.step
+        this.data.count -= this.properties.step;
       }
       this.setData({
         count: this.data.count
-      })
+      });
       let detail = {
         count: this.data.count,
         type: 'reduce'
-      }
-      this.triggerEvent('lintap', detail)
+      };
+      this.triggerEvent('lintap', detail, {
+        bubbles: true,
+        composed: true
+      });
     },
 
     addTap() {
       let distance = this.data.count + this.properties.step;
       if (distance >= this.properties.max) {
-        this.data.count = this.properties.max
+        this.data.count = this.properties.max;
       } else {
         this.data.count += this.properties.step;
       }
       this.setData({
         count: this.data.count
-      })
+      });
       let detail = {
         count: this.data.count,
         type: 'add'
-      }
-      this.triggerEvent('lintap', detail)
+      };
+      this.triggerEvent('lintap', detail, {
+        bubbles: true,
+        composed: true
+      });
     },
   }
-})
+});
diff --git a/dist/custom-tab-bar/index.js b/dist/custom-tab-bar/index.js
@@ -90,7 +90,7 @@ Component({
         idx,
         path:this.route
       };
-      let option = {};
+      let option = { bubbles: true, composed: true };
       this.triggerEvent('lintap', detail, option);
     },
     showRedDot(idx) {

diff --git a/dist/dialog/index.js b/dist/dialog/index.js
@@ -155,7 +155,7 @@ Component({
     onCancelTap(e) {
 
       let detail = 'cancel';
-      let option = {};
+      let option = { bubbles: true, composed: true };
 
       const {
         success
@@ -175,7 +175,7 @@ Component({
     // 背景点击事件
     onDialogTap(e) {
       let detail = true;
-      let option = {};
+      let option = { bubbles: true, composed: true };
 
       if (this.data.locked !== true) {
         this.setData({

diff --git a/dist/grid-item/index.js b/dist/grid-item/index.js
@@ -22,9 +22,7 @@ Component({
         tapGridItem(e) {
             this.triggerEvent('lintap', {
                 ...e
-            }, {
-                composed: true
-            })
+            }, { bubbles: true, composed: true })
         },
     }
 });
diff --git a/dist/grid/index.js b/dist/grid/index.js
@@ -70,7 +70,7 @@ Component({
         tapGrid(e) {
             this.triggerEvent('lintap', {
                 index:this.data.currentIndex
-            })
+            },{ bubbles: true, composed: true })
         }
     }
 });
diff --git a/dist/list/index.js b/dist/list/index.js
@@ -77,7 +77,7 @@ Component({
             }
             this.triggerEvent('lintap', {
                 e
-            }, {})
+            }, { bubbles: true, composed: true })
         }
     }
 });
diff --git a/dist/loading/index.js b/dist/loading/index.js
@@ -1,5 +1,5 @@
 Component({
-  externalClasses: ['l-container-class','l-class'],
+  externalClasses: ['l-container-class', 'l-class'],
   properties: {
     // 显示与隐藏
     show: {
@@ -32,9 +32,39 @@ Component({
       value: false,
     }
   },
+
+  attached() {
+    this._init();
+  },
+
   methods: {
+    _init() {
+      wx.lin = wx.lin || {};
+      wx.lin.showLoading = (options) => {
+        const {
+          custom = false,
+          fullScreen = false,
+          color = '',
+          type = 'rotate',
+          size = 'default'
+        } = { ...options };
+        this.setData({
+          custom,
+          fullScreen,
+          color,
+          type,
+          size,
+          show: true
+        });
+      };
+      wx.lin.hideLoading = () => {
+        this.setData({
+          show: false
+        });
+      };
+    },
     // 阻止滑动
-    doNothingMove(e) {
+    doNothingMove() {
       // do nothing……
     },
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,4 +35,4 @@ Component({ @@
       methods: {
       }
-    })
+    });