Merge branch 'master' of https://github.com/alibaba/weex-ui

apache · Mar 11, 2019 · 7ef4729 · 7ef4729
2 parents aec3839 + 3db7425
commit 7ef4729
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/packages/wxc-icon/README.md b/packages/wxc-icon/README.md
@@ -32,7 +32,7 @@ Also you can copy the `name` from [demo](https://h5.m.taobao.com/trip/wx-detecti
 | Prop | Type | Required | Default | Description |
 | ---- |:----:|:---:|:-------:| :----------:|
 | **`name`** | `string` | `Y` | `-` | icon name (*1)|
-| **`size`** | `String` | `N` | `small` | icon size `xs`/`small`/`medium`/`large`|
+| **`size`** | `String` | `N` | `small` | icon size `xs`/`small`/`medium`/`big`|
 | **`icon-style`** | `Object` | `N` | `{}` |style override (*2)|
 
 - *1：icon name list：`['less', 'more_unfold', 'back', 'more', 'add', 'subtract', 'close', 'cry', 'search', 'delete', 'help', 'refresh', 'success', 'warning', 'wrong', 'clock', 'scanning', 'filter', 'map', 'play']`

diff --git a/packages/wxc-icon/README_cn.md b/packages/wxc-icon/README_cn.md
@@ -31,7 +31,7 @@
 | Prop | Type | Required | Default | Description |
 | ---- |:----:|:---:|:-------:| :----------:|
 | **`name`** | `string` | `Y` | `-` | icon 的名称 (注1)|
-| **`size`** | `String` | `N` | `small` | icon的尺寸 `xs`/`small`/`medium`/`large`|
+| **`size`** | `String` | `N` | `small` | icon的尺寸 `xs`/`small`/`medium`/`big`|
 | **`icon-style`** | `Object` | `N` | `{}` |样式覆盖 (注2)|
 
 - 注1：icon的名称详细如下：`['less', 'more_unfold', 'back', 'more', 'add', 'subtract', 'close', 'cry', 'search', 'delete', 'help', 'refresh', 'success', 'warning', 'wrong', 'clock', 'scanning', 'filter', 'map', 'play']`

diff --git a/packages/wxc-rich-text/wxc-rich-text-text.vue b/packages/wxc-rich-text/wxc-rich-text-text.vue
@@ -58,19 +58,12 @@
     },
     computed: {
       themeStyle () {
-        let style = {};
-        const textStyle = this.textStyle;
-        if (textStyle && textStyle.fontSize) {
+        let style = { ...this.textStyle };
+        if (style && (style.fontSize || style['font-size'])) {
           style = {
             ...style,
-            fontSize: `${textStyle.fontSize}px`,
-            height: `${textStyle.fontSize * 1.2}px`
-          }
-        }
-        if (textStyle && textStyle.color) {
-          style = {
-            ...style,
-            color: textStyle.color
+            fontSize: `${style.fontSize || style['font-size']}px`,
+            height: `${(style.fontSize || style['font-size']) * 1.2}px`
           }
         }
         return style;