diff --git a/dist/behaviors/button.js b/dist/behaviors/button.js
index 5473fcf4..82ee5675 100644
--- a/dist/behaviors/button.js
+++ b/dist/behaviors/button.js
@@ -1,4 +1,4 @@
-module.exports = Behavior({
+export default Behavior({
properties: {
loading: Boolean,
// 在自定义组件中，无法与外界的 form 组件联动，暂时不开放
diff --git a/dist/behaviors/touch.js b/dist/behaviors/touch.js
index 729db5a2..19ce84a2 100644
--- a/dist/behaviors/touch.js
+++ b/dist/behaviors/touch.js
@@ -1,4 +1,4 @@
-module.exports = Behavior({
+export default Behavior({
methods: {
touchStart(event) {
this.direction = '';
diff --git a/dist/behaviors/transition.js b/dist/behaviors/transition.js
new file mode 100644
index 00000000..54f3489f
--- /dev/null
+++ b/dist/behaviors/transition.js
@@ -0,0 +1,52 @@
+export default Behavior({
+ properties: {
+ customStyle: String,
+ show: {
+ value: true,
+ type: Boolean,
+ observer(value) {
+ if (value) {
+ this.show();
+ } else {
+ this.setData({
+ type: 'leave'
+ });
+ }
+ }
+ },
+ duration: {
+ type: Number,
+ value: 300
+ }
+ },
+
+ data: {
+ type: '',
+ inited: false,
+ display: false
+ },
+
+ attached() {
+ if (this.data.show) {
+ this.show();
+ }
+ },
+
+ methods: {
+ show() {
+ this.setData({
+ inited: true,
+ display: true,
+ type: 'enter'
+ });
+ },
+
+ onAnimationEnd() {
+ if (!this.data.show) {
+ this.setData({
+ display: false
+ });
+ }
+ }
+ }
+});
diff --git a/dist/button/behaviors.js b/dist/button/behaviors.js
deleted file mode 100644
index 5473fcf4..00000000
--- a/dist/button/behaviors.js
+++ /dev/null
@@ -1,57 +0,0 @@
-module.exports = Behavior({
- properties: {
- loading: Boolean,
- // 在自定义组件中，无法与外界的 form 组件联动，暂时不开放
- // formType: String,
- openType: String,
- appParameter: String,
- // 暂时不开放，直接传入无法设置样式
- // hoverClass: {
- // type: String,
- // value: 'button-hover'
- // },
- hoverStopPropagation: Boolean,
- hoverStartTime: {
- type: Number,
- value: 20
- },
- hoverStayTime: {
- type: Number,
- value: 70
- },
- lang: {
- type: String,
- value: 'en'
- },
- sessionFrom: {
- type: String,
- value: ''
- },
- sendMessageTitle: String,
- sendMessagePath: String,
- sendMessageImg: String,
- showMessageCard: String
- },
-
- methods: {
- bindgetuserinfo(event = {}) {
- this.triggerEvent('getuserinfo', event.detail || {});
- },
-
- bindcontact(event = {}) {
- this.triggerEvent('contact', event.detail || {});
- },
-
- bindgetphonenumber(event = {}) {
- this.triggerEvent('getphonenumber', event.detail || {});
- },
-
- bindopensetting(event = {}) {
- this.triggerEvent('opensetting', event.detail || {});
- },
-
- binderror(event = {}) {
- this.triggerEvent('error', event.detail || {});
- }
- }
-});
diff --git a/dist/button/index.js b/dist/button/index.js
index 9f1f18c8..2247c09f 100644
--- a/dist/button/index.js
+++ b/dist/button/index.js
@@ -1,9 +1,5 @@
-const buttonBehaviors = require('../behaviors/button');
-const classnames = require('../common/classnames');
-
-const observer = function() {
- this.setClasses();
-};
+import buttonBehaviors from '../behaviors/button';
+import classnames from '../common/classnames';
Component({
options: {
@@ -18,32 +14,32 @@ Component({
type: {
type: String,
value: 'default',
- observer
+ observer: 'setClasses'
},
size: {
type: String,
value: 'normal',
- observer
+ observer: 'setClasses'
},
plain: {
type: Boolean,
- observer
+ observer: 'setClasses'
},
disabled: {
type: Boolean,
- observer
+ observer: 'setClasses'
},
loading: {
type: Boolean,
- observer
+ observer: 'setClasses'
},
block: {
type: Boolean,
- observer
+ observer: 'setClasses'
},
square: {
type: Boolean,
- observer
+ observer: 'setClasses'
}
},
diff --git a/dist/common/classnames.js b/dist/common/classnames.js
index 71c74a3e..12904405 100644
--- a/dist/common/classnames.js
+++ b/dist/common/classnames.js
@@ -1,6 +1,6 @@
const hasOwn = {}.hasOwnProperty;
-module.exports = function classNames() {
+export default function classNames() {
const classes = [];
for (let i = 0; i < arguments.length; i++) {
diff --git a/dist/popup/index.js b/dist/popup/index.js
index 047ea7ef..51d41237 100644
--- a/dist/popup/index.js
+++ b/dist/popup/index.js
@@ -1,3 +1,5 @@
+import transitionBehaviors from '../behaviors/transition';
+
Component({
options: {
addGlobalClass: true
@@ -8,9 +10,23 @@ Component({
'overlay-class'
],
+ behaviors: [transitionBehaviors],
+
properties: {
- show: Boolean,
overlayStyle: String,
+ show: {
+ value: false,
+ type: Boolean,
+ observer(value) {
+ if (value) {
+ this.show();
+ } else {
+ this.setData({
+ type: 'leave'
+ });
+ }
+ }
+ },
overlay: {
type: Boolean,
value: true
diff --git a/dist/popup/index.json b/dist/popup/index.json
index 467ce294..0dd2931d 100644
--- a/dist/popup/index.json
+++ b/dist/popup/index.json
@@ -1,3 +1,6 @@
{
- "component": true
+ "component": true,
+ "usingComponents": {
+ "van-overlay": "../overlay/index"
+ }
}
diff --git a/dist/popup/index.wxml b/dist/popup/index.wxml
index daf74aa9..83b9bb1d 100644
--- a/dist/popup/index.wxml
+++ b/dist/popup/index.wxml
@@ -1,9 +1,14 @@
-
-