Merge pull request #455 from wjun94/dev
[!] wxc-radio組件修改list array時無法修改期選中項
diff --git a/package.json b/package.json
index 1db4c8c..e24bb24 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "weex-ui",
- "version": "0.6.13",
+ "version": "0.6.15",
"description": "A rich interaction, lightweight, high performance UI library based on Weex",
"main": "index.js",
"lib": "vue",
diff --git a/packages/wxc-button/index.vue b/packages/wxc-button/index.vue
index f9cb1db..94ca914 100644
--- a/packages/wxc-button/index.vue
+++ b/packages/wxc-button/index.vue
@@ -64,7 +64,7 @@
},
mrTextStyle () {
const { type, disabled, textStyle, size } = this;
- const mrTextStyle = { ...TEXT_STYLE_MAP[type], ...textStyle, ...TEXT_FONTSIZE_STYLE_MAP[size] };
+ const mrTextStyle = { ...TEXT_STYLE_MAP[type], ...TEXT_FONTSIZE_STYLE_MAP[size], ...textStyle };
return disabled ? { ...mrTextStyle, color: '#FFFFFF' } : mrTextStyle;
}
},
diff --git a/packages/wxc-overlay/README.md b/packages/wxc-overlay/README.md
index e3473f2..2c0d12d 100644
--- a/packages/wxc-overlay/README.md
+++ b/packages/wxc-overlay/README.md
@@ -51,6 +51,7 @@
| show | `Boolean` |`Y`| `false` | whether to show |
| opacity | `Number` |`N`| `0.6` | opacity `0-1` |
| left | `Number` |`N`| `0` | move left distance |
+| top | `Number` |`N`| `0` | move top distance |
| has-animation | `Boolean` |`N`| `true` | whether to animate |
| can-auto-close | `Boolean` |`N`| `true` | whether to can auto close |
| duration | `Number` | `300` |`N`| animation duration time |
diff --git a/packages/wxc-overlay/README_cn.md b/packages/wxc-overlay/README_cn.md
index bdc2874..d40f7f6 100644
--- a/packages/wxc-overlay/README_cn.md
+++ b/packages/wxc-overlay/README_cn.md
@@ -49,6 +49,7 @@
|-------------|------------|--------|-----|
| show | `Boolean` |`Y`| `false` | 是否开启 |
| left | `Number` |`N`| `0` | 向左移动距离 |
+| top | `Number` |`N`| `0` | 向上移动距离 |
| opacity | `Number` |`N`| `0.6` | 蒙层opacity度数0-1 |
| has-animation | `Boolean` |`N`| `true` | 是否开启蒙层出现动画 |
| can-auto-close | `Boolean` |`N`| `true` | 是否可以点击自动关闭 |
diff --git a/packages/wxc-overlay/index.vue b/packages/wxc-overlay/index.vue
index 60659a0..d54c0af 100644
--- a/packages/wxc-overlay/index.vue
+++ b/packages/wxc-overlay/index.vue
@@ -18,7 +18,6 @@
.wxc-overlay {
width: 750px;
position: fixed;
- top: 0;
bottom: 0;
right: 0;
}
@@ -34,6 +33,10 @@
type: Boolean,
default: true
},
+ top: {
+ type: Number,
+ default: 0
+ },
left: {
default: Number,
default: 0
@@ -64,7 +67,8 @@
return {
opacity: this.hasAnimation ? 0 : 1,
backgroundColor: `rgba(0, 0, 0,${this.opacity})`,
- left: Utils.env.isWeb() ? this.left + 'px' : 0
+ left: Utils.env.isWeb() ? this.left + 'px' : 0,
+ top: this.top
}
},
shouldShow () {