This is an automated email from the ASF dual-hosted git repository. tw93 pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/incubator-weex-ui.git
The following commit(s) were added to refs/heads/dev by this push: new 10f97fa [+] add show-indicator param 10f97fa is described below commit 10f97fa91559afa1ecd437eee07f6f794c74cb8c Author: Tw93 <t...@qq.com> AuthorDate: Wed Feb 12 14:54:46 2020 +0800 [+] add show-indicator param --- CHANGELOG.md | 3 +++ CHANGELOG_cn.md | 3 +++ docs/_coverpage.md | 2 +- example/lightbox/index.vue | 1 - package.json | 2 +- packages/wxc-lightbox/index.vue | 9 +++++++-- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cc9ac1..edae158 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log +## 0.8.4 +- [+] [wxc-lightbox](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-lightbox) add `show-indicator` param to show indicator + ## 0.8.3 - [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/packages/wxc-loading) add `loading-pic` param. - [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/packages/wxc-slider-bar) add `block-color` param. diff --git a/CHANGELOG_cn.md b/CHANGELOG_cn.md index d1b20b9..1e6fbb3 100644 --- a/CHANGELOG_cn.md +++ b/CHANGELOG_cn.md @@ -1,5 +1,8 @@ # 升级日志 +## 0.8.4 +- [+] [wxc-lightbox](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-lightbox) 增加 `show-indicator` 参数控制是否显示indicator + ## 0.8.3 - [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-loading) 增加 `loading-pic` 参数用于覆盖原有 loading 图片. - [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-slider-bar) 增加 `block-color` 参数用于覆盖原有滑块颜色. diff --git a/docs/_coverpage.md b/docs/_coverpage.md index 587ad77..bb46245 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -1,6 +1,6 @@ <img src="https://img.alicdn.com/tfs/TB1kCs_er_I8KJjy1XaXXbsxpXa-419-495.png" width="146px"> -# <span style="font-weight:400;">Weex Ui</span> <span style="font-size:14px">0.8.3</span> +# <span style="font-weight:400;">Weex Ui</span> <span style="font-size:14px">0.8.4</span> > <span style="line-height:1.8rem;font-weight:400;font-size:1.3rem">A rich > interaction, lightweight, high performance UI library.<span> diff --git a/example/lightbox/index.vue b/example/lightbox/index.vue index 9648009..418ea31 100644 --- a/example/lightbox/index.vue +++ b/example/lightbox/index.vue @@ -38,7 +38,6 @@ under the License. </div> <wxc-lightbox ref="wxc-lightbox" - :show-indicator="true" height="800" :index="1" :image-list="imageList" diff --git a/package.json b/package.json index 4fd45a0..78bf5cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "weex-ui", - "version": "0.8.3", + "version": "0.8.4", "description": "A rich interaction, lightweight, high performance UI library based on Weex", "main": "index.js", "lib": "vue", diff --git a/packages/wxc-lightbox/index.vue b/packages/wxc-lightbox/index.vue index 2e34167..ae73412 100644 --- a/packages/wxc-lightbox/index.vue +++ b/packages/wxc-lightbox/index.vue @@ -41,6 +41,7 @@ under the License. :style="{ height: height + 'px', width: width + 'px'}"></image> </div> <indicator class="indicator" + v-if="showIndicator" :style="indicatorStyle"></indicator> </slider> </wxc-mask> @@ -77,6 +78,10 @@ under the License. type: Boolean, default: false }, + showIndicator: { + type: Boolean, + default: true + }, imageList: Array, indicatorColor: { type: Object, @@ -90,14 +95,14 @@ under the License. type: [Number, String], default: 0 }, - interval:{ + interval: { type: [Number, String], default: 3000 }, opacity: { type: [Number, String], default: 0.6 - }, + } }, computed: { indicatorStyle () {