From 45e847caa8deadc09db26f3e2e0fce146feeedb5 Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 5 Sep 2018 15:02:57 +0800 Subject: [PATCH] [Doc] add Tab preview (#501) --- docs/src/Preview.vue | 1 + example/pages/tab/index.wxml | 2 +- example/pages/tab/index.wxss | 4 ++++ packages/button/index.js | 30 ++++++++++-------------------- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/docs/src/Preview.vue b/docs/src/Preview.vue index c209c306..d79fea36 100644 --- a/docs/src/Preview.vue +++ b/docs/src/Preview.vue @@ -35,6 +35,7 @@ const MAP = { steps: 'steps-201808092138.png', switch: 'switch-201808092138.png', 'switch-cell': 'switch-cell-201808221124.png', + tab: 'tab-201809051457.png', tag: 'tag-201808092138.png', tabbar: 'tabbar-201808160922.png', toast: 'toast-201808191046.png', diff --git a/example/pages/tab/index.wxml b/example/pages/tab/index.wxml index 0a553e7c..f37ef876 100644 --- a/example/pages/tab/index.wxml +++ b/example/pages/tab/index.wxml @@ -48,7 +48,7 @@ wx:key="index" title="{{ '标签' + item }}" > - + {{ '内容' + item }} diff --git a/example/pages/tab/index.wxss b/example/pages/tab/index.wxss index 559600a6..461e9a8f 100644 --- a/example/pages/tab/index.wxss +++ b/example/pages/tab/index.wxss @@ -2,3 +2,7 @@ padding: 20px; background-color: #fff; } + +.content-2 { + padding: 20px; +} \ No newline at end of file diff --git a/packages/button/index.js b/packages/button/index.js index 2247c09f..98d38b8f 100644 --- a/packages/button/index.js +++ b/packages/button/index.js @@ -1,6 +1,11 @@ import buttonBehaviors from '../behaviors/button'; import classnames from '../common/classnames'; +const booleanProp = { + type: Boolean, + observer: 'setClasses' +}; + Component({ options: { addGlobalClass: true @@ -21,26 +26,11 @@ Component({ value: 'normal', observer: 'setClasses' }, - plain: { - type: Boolean, - observer: 'setClasses' - }, - disabled: { - type: Boolean, - observer: 'setClasses' - }, - loading: { - type: Boolean, - observer: 'setClasses' - }, - block: { - type: Boolean, - observer: 'setClasses' - }, - square: { - type: Boolean, - observer: 'setClasses' - } + plain: booleanProp, + block: booleanProp, + square: booleanProp, + loading: booleanProp, + disabled: booleanProp }, attached() {