fix:wx.lin 调用时机修改 (#387)

7insummer · web-flow · commit 962fee4c3eb9 · 2019-07-31T20:41:39.000+08:00
diff --git a/build/build-prod.js b/build/build-prod.js
@@ -4,7 +4,7 @@ const cssmin = require('gulp-clean-css');
 const rename = require('gulp-rename');
 const componentData = require('./build-tool');
 const result = `{common,behaviors,${componentData()}}`;
-const isCustom = result == `{common,behaviors}`;
+const isCustom = (result != `{common,behaviors,}`);
 
 // js => js
 gulp.task('dispose-js', () => {
@@ -61,4 +61,4 @@ gulp.task('default', gulp.series(
   'dispose-wxs',
   'dispose-copy',
   'dispose-json'
-));
+));
diff --git a/dist/action-sheet/index.js b/dist/action-sheet/index.js
@@ -27,7 +27,7 @@ Component({
     this.initUIAdapter();
   },
 
-  lifetimes: {
+  pageLifetimes: {
     show() {
       if (this.data.openApi) {
         this.initActionSheet();
diff --git a/dist/dialog/index.js b/dist/dialog/index.js
@@ -72,7 +72,7 @@ Component({
     }
   },
 
-  lifetimes: {
+  pageLifetimes: {
     show() {
       if (this.data.openApi) {
         this.initDialog();
diff --git a/dist/message/index.js b/dist/message/index.js
@@ -27,7 +27,7 @@ Component({
     this.initMessage();
   },
 
-  lifetimes: {
+  pageLifetimes: {
     show() {
       this.initMessage();
     },
diff --git a/dist/toast/index.js b/dist/toast/index.js
@@ -94,7 +94,7 @@ Component({
     }
   },
 
-  lifetimes: {
+  pageLifetimes: {
     show() {
       if (this.data.openApi) {
         this.initToast();
diff --git a/examples/dist/action-sheet/index.js b/examples/dist/action-sheet/index.js
@@ -27,7 +27,7 @@ Component({
     this.initUIAdapter();
   },
 
-  lifetimes: {
+  pageLifetimes: {
     show() {
       if (this.data.openApi) {
         this.initActionSheet();
diff --git a/examples/dist/dialog/index.js b/examples/dist/dialog/index.js
@@ -72,7 +72,7 @@ Component({
     }
   },
 
-  lifetimes: {
+  pageLifetimes: {
     show() {
       if (this.data.openApi) {
         this.initDialog();
diff --git a/examples/dist/message/index.js b/examples/dist/message/index.js
@@ -27,7 +27,7 @@ Component({
     this.initMessage();
   },
 
-  lifetimes: {
+  pageLifetimes: {
     show() {
       this.initMessage();
     },
diff --git a/examples/dist/toast/index.js b/examples/dist/toast/index.js
@@ -94,7 +94,7 @@ Component({
     }
   },
 
-  lifetimes: {
+  pageLifetimes: {
     show() {
       if (this.data.openApi) {
         this.initToast();
diff --git a/examples/pages/components/layout/pages/grid/index.wxml b/examples/pages/components/layout/pages/grid/index.wxml
@@ -21,8 +21,8 @@
     </content-card>
 
     <content-card class="content" name="显示边框">
-      <view class="view-container">
-        <l-grid  show-border="{{true}}">
+      <view class="view-container" >
+        <l-grid  show-border="{{true}}" l-class="grid-container">
           <l-grid-item wx:for="{{grids1}}" wx:key="{{index}}" key="{{index}}" slot="{{index}}" l-grid-item="grid-item">
             <l-icon name="{{item.image}}" />
             <view class="text">{{item.text}}</view>
diff --git a/examples/pages/components/layout/pages/grid/index.wxss b/examples/pages/components/layout/pages/grid/index.wxss
@@ -22,4 +22,4 @@
 
 .grid-item {
   height: 200rpx;
-}
+} 
diff --git a/src/action-sheet/index.js b/src/action-sheet/index.js
@@ -27,7 +27,7 @@ Component({
     this.initUIAdapter();
   },
 
-  lifetimes: {
+  pageLifetimes: {
     show() {
       if (this.data.openApi) {
         this.initActionSheet();
diff --git a/src/dialog/index.js b/src/dialog/index.js
@@ -72,7 +72,7 @@ Component({
     }
   },
 
-  lifetimes: {
+  pageLifetimes: {
     show() {
       if (this.data.openApi) {
         this.initDialog();
diff --git a/src/message/index.js b/src/message/index.js
@@ -27,7 +27,7 @@ Component({
     this.initMessage();
   },
 
-  lifetimes: {
+  pageLifetimes: {
     show() {
       this.initMessage();
     },
diff --git a/src/toast/index.js b/src/toast/index.js
@@ -94,7 +94,7 @@ Component({
     }
   },
 
-  lifetimes: {
+  pageLifetimes: {
     show() {
       if (this.data.openApi) {
         this.initToast();

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ Component({`
`72`	`72`	`}`
`73`	`73`	`},`
`74`	`74`
`75`		`- lifetimes: {`
	`75`	`+ pageLifetimes: {`
`76`	`76`	`show() {`
`77`	`77`	`if (this.data.openApi) {`
`78`	`78`	`this.initDialog();`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ Component({`
`94`	`94`	`}`
`95`	`95`	`},`
`96`	`96`
`97`		`- lifetimes: {`
	`97`	`+ pageLifetimes: {`
`98`	`98`	`show() {`
`99`	`99`	`if (this.data.openApi) {`
`100`	`100`	`this.initToast();`