Merge pull request #440 from wang1433256766/dev
[!] wxc-overlay添加top,距顶部距离可配置
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-slider-bar/README.md b/packages/wxc-slider-bar/README.md
index 5ce8de2..9244f3a 100644
--- a/packages/wxc-slider-bar/README.md
+++ b/packages/wxc-slider-bar/README.md
@@ -54,6 +54,7 @@
| invalidColor | `String` |`N`| `#E0E0E0`| invalid color |
| validColor | `String` |`N`| `#EE9900`| valid color |
| disabledColor| `String` |`N`| `#AAA` | disabled color |
+| selectRange | `Array` |`N`| `[0, 0]` | return value |
diff --git a/packages/wxc-slider-bar/README_cn.md b/packages/wxc-slider-bar/README_cn.md
index 82814a3..252881a 100644
--- a/packages/wxc-slider-bar/README_cn.md
+++ b/packages/wxc-slider-bar/README_cn.md
@@ -54,6 +54,7 @@
| invalidColor | `String` |`N`| `#E0E0E0`| 无效颜色 |
| validColor | `String` |`N`| `#EE9900`| 有效颜色 |
| disabledColor| `String` |`N`| `#AAA` | 禁用颜色 |
+| selectRange | `Array` |`N`| `[0, 0]` | 回传值 |
### 事件
diff --git a/packages/wxc-slider-bar/index.vue b/packages/wxc-slider-bar/index.vue
index cd7f881..eb0eb1b 100644
--- a/packages/wxc-slider-bar/index.vue
+++ b/packages/wxc-slider-bar/index.vue
@@ -61,13 +61,17 @@
barWidth: 0,
preventMoveEvent: true,
minDist: 0,
- selectRange: [0, 0],
+ // selectRange: [0, 0],
blockRadius: 28,
DPR: 1,
timeout: 100,
isAndroid: Utils.env.isAndroid()
}),
props: {
+ selectRange: {
+ type: Array,
+ default: [0, 0]
+ },
length: {
type: Number,
default: 500
