You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by tw...@apache.org on 2020/02/09 13:11:12 UTC
[incubator-weex-ui] branch dev updated: [+] add loading-pic param
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 c299f64 [+] add loading-pic param
c299f64 is described below
commit c299f64b4ef8283e12d937c431a8b9710612b7ce
Author: Tw93 <tw...@qq.com>
AuthorDate: Sun Feb 9 21:10:29 2020 +0800
[+] add loading-pic param
---
CHANGELOG.md | 7 +++++--
CHANGELOG_cn.md | 7 +++++--
package.json | 2 +-
packages/wxc-loading/README.md | 1 +
packages/wxc-loading/README_cn.md | 2 ++
packages/wxc-loading/index.vue | 12 ++++++++----
6 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63a7e73..f6c45dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,14 @@
# Change Log
+## 0.8.2
+- [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-loading) add `loading-pic` param.
+
## 0.8.0
- [!]From alibaba/weex-ui to [apcahe/incubator-weex-ui](https://github.com/apache/incubator-weex-ui)
## 0.7.1
-- [+] [wxc-slider-bar](https://apache.github.io/incubator-weex-ui/#/cn/packages/slider-bar) add `wxcSliderBarTouchEnd` event.
-- [!] Fixed [wxc-mask](https://apache.github.io/incubator-weex-ui/#/cn/packages/mask) jitter bug when inputting.
+- [+] [wxc-slider-bar](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-slider-bar) add `wxcSliderBarTouchEnd` event.
+- [!] Fixed [wxc-mask](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-mask) jitter bug when inputting.
- [!] Fixed the problem that the QR code does not display when debugging.
## 0.7.0
diff --git a/CHANGELOG_cn.md b/CHANGELOG_cn.md
index e3b97e8..3c82f98 100644
--- a/CHANGELOG_cn.md
+++ b/CHANGELOG_cn.md
@@ -1,12 +1,15 @@
# 升级日志
+## 0.8.2
+- [+] [wxc-loading](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-loading) 增加 `loading-pic` 参数用于覆盖原有 loading 图片.
+
## 0.8.0
- [!]从 alibaba/weex-ui 迁移到 [apcahe/incubator-weex-ui](https://github.com/apache/incubator-weex-ui)
## 0.7.1
-- [+] [wxc-slider-bar](https://apache.github.io/incubator-weex-ui/#/cn/packages/slider-bar) 新增 `wxcSliderBarTouchEnd` 事件.
-- [!] 修复 [wxc-mask](https://apache.github.io/incubator-weex-ui/#/cn/packages/mask) 输入时候抖动问题
+- [+] [wxc-slider-bar](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-slider-bar) 新增 `wxcSliderBarTouchEnd` 事件.
+- [!] 修复 [wxc-mask](https://apache.github.io/incubator-weex-ui/#/cn/packages/wxc-mask) 输入时候抖动问题
- [!] 修复调试时候 console 不显示二维码的问题
diff --git a/package.json b/package.json
index bf660f4..e859cea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "weex-ui",
- "version": "0.8.1",
+ "version": "0.8.2",
"description": "A rich interaction, lightweight, high performance UI library based on Weex",
"main": "index.js",
"lib": "vue",
diff --git a/packages/wxc-loading/README.md b/packages/wxc-loading/README.md
index 62f7449..d3bd613 100644
--- a/packages/wxc-loading/README.md
+++ b/packages/wxc-loading/README.md
@@ -42,6 +42,7 @@ More details can be found in [here](https://github.com/apache/incubator-weex-ui/
| type | `String` | `N`|`default` | loading image `default`/`trip`|
| need-mask | `Bool` | `N`|`false` | whether to need a covered mask |
| mask-style | `Object` | `N`|`{}` | mask style |
+| loading-pic | `String` | `N`|`` | Overwrite original image |
### 事件回调
diff --git a/packages/wxc-loading/README_cn.md b/packages/wxc-loading/README_cn.md
index 6b8b403..fba4c67 100644
--- a/packages/wxc-loading/README_cn.md
+++ b/packages/wxc-loading/README_cn.md
@@ -46,6 +46,8 @@
| type | `String` | `N`|`default` |图案类别`default`/`trip`|
| need-mask | `Bool` | `N`|`false` | 加载时候是都需要一个蒙层防止用于误点 |
| mask-style | `Object` | `N`|`{}` | 蒙层样式覆盖 |
+| loading-pic | `String` | `N`|`` | 覆盖原有图片 |
+
### Event
diff --git a/packages/wxc-loading/index.vue b/packages/wxc-loading/index.vue
index 9cfff72..148eda6 100644
--- a/packages/wxc-loading/index.vue
+++ b/packages/wxc-loading/index.vue
@@ -25,7 +25,7 @@ under the License.
:style="maskStyle">
<div class="wxc-loading" :style="{ top: topPosition +'px'}" v-if="showLoading">
<div :class="['loading-box',loading.class]" :aria-hidden="true">
- <image :src="loading.url"
+ <image :src="loadingPic || loading.url"
class="loading-trip-image"
resize="contain"
quality="original"></image>
@@ -37,9 +37,9 @@ under the License.
</template>
<style scoped>
- .loading-container{
- position: relative;
- }
+ .loading-container {
+ position: relative;
+ }
.loading-need-mask {
position: absolute;
@@ -101,6 +101,10 @@ under the License.
type: String,
default: ''
},
+ loadingPic: {
+ type: String,
+ default: ''
+ },
type: {
type: String,
default: 'default'