Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.6.12
+- [!] Fixed set transparency issues [wxc-lightbox](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-lightbox/).
+- [!] Fixed set transparency issues [wxc-mask](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-mask/).
+- [!] Fixed cannot click, the component cannot modify the internal style [wxc-special-rich-text](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-rich-text/).
+- [!] Fixed click no highlighting question [wxc-button](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-button/).
+
 ## 0.6.11
 - [!] Fixed the shake when change disabled about [wxc-button](https://alibaba.github.io/weex-ui/#/packages/wxc-button/).
 - [!] Fixed the line-height bug about [wxc-stepper](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-stepper/).

CHANGELOG_cn.md

@@ -1,5 +1,11 @@
 # 升级日志
 
+## 0.6.12
+- [!] 修复 [wxc-lightbox](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-lightbox/) 设置透明度问题
+- [!] 修复 [wxc-mask](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-mask/) 设置透明度问题
+- [!] 修复 [wxc-special-rich-text](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-rich-text/) 不能单击，组件不能修改内部样式的问题
+- [!] 修复 [wxc-button](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-button/) 单击没有高亮显示问题
+
 ## 0.6.11
 - [!] 修复 [wxc-button](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-button/) 动态修改 disabled 时候抖动问题
 - [!] 修复 [wxc-stepper](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-stepper/) line-height 对其问题

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.6.10</span>
+# <span style="font-weight:400;">Weex Ui</span> <span style="font-size:14px">0.6.12</span>
 
 > <span style="line-height:1.8rem;font-weight:400;font-size:1.3rem">A rich interaction, lightweight, high performance UI library.<span>
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "weex-ui",
-  "version": "0.6.11",
+  "version": "0.6.12",
   "description": "A rich interaction, lightweight, high performance UI library based on Weex",
   "main": "index.js",
   "lib": "vue",

packages/utils/index.js

@@ -110,7 +110,7 @@ const Utils = {
         && ((parseInt(window.screen.width, 10) === 375) && (parseInt(window.screen.height, 10) === 812)
         || (parseInt(window.screen.width, 10) === 414) && (parseInt(window.screen.height, 10) === 896));
       }
-      return Utils.env.isIOS() && (deviceHeight === 2436 || deviceHeight === 2688 || deviceHeight == 1792);
+      return Utils.env.isIOS() && (deviceHeight === 2436 || deviceHeight === 2688 || deviceHeight === 1792 || deviceHeight === 1624);
     },
     isAndroid () {
       const { platform } = weex.config.env;

packages/wxc-button/index.vue

@@ -81,6 +81,10 @@
     opacity: 1;
   }
 
+  .wxc-btn:active {
+    opacity: .8;
+  }
+
   .btn-text {
     text-overflow: ellipsis;
     lines: 1;

packages/wxc-lightbox/README.md

@@ -69,6 +69,7 @@ More details can be found in [here](https://github.com/alibaba/weex-ui/blob/mast
 | indicator-color | `Object` |`N`| `{}` | indicator style（*1）|
 | index | `Number` |`N`| `0` | the index of current shown slider|
 | interval | `Number` |`N`| `3000` | time interval for each page displayed in slider|
+| opacity | `Number` |`N`| `0.6` |  set transparency |
 
 *1 default style: 
 ```

packages/wxc-lightbox/README_cn.md

@@ -71,6 +71,7 @@
 | indicator-color | `Object` |`N`| `{}` |索引样式配置（注 1）|
 | index | `Number` |`N`| `0` | 当前初始打开选择哪一页 |
 | interval | `Number` |`N`| `3000` | 设置自动播放时候的间隔时间 |
+| opacity | `Number` |`N`| `0.6` |  设置透明度 |
 
 注 1 中样式：
 ```

packages/wxc-lightbox/index.vue

@@ -8,6 +8,7 @@
             mask-bg-color="transparent"
             overlay-opacity="0.8"
             :show="show"
+            :opacity='opacity'
             :show-close="false"
             @wxcMaskSetHidden="maskOverlayClick">
     <slider auto-play="false"
@@ -75,7 +76,11 @@
       interval:{
         type: [Number, String],
         default: 3000
-      }
+      },
+      opacity: {
+        type: [Number, String],
+        default: 0.6
+      },
     },
     computed: {
       indicatorStyle () {

packages/wxc-loading/README_cn.md

@@ -14,17 +14,20 @@
 
 ```vue
 <template>
-   <wxc-loading :show="isShow" type="trip"></wxc-loading>
-   <wxc-part-loading :show="isShow"></wxc-part-loading>
+    <div>
+        <wxc-loading :show="isShow" type="trip"></wxc-loading>
+        <wxc-part-loading :show="isShow"></wxc-part-loading>
+    </div>
 </template>
 <script>
     import { WxcLoading, WxcPartLoading } from 'weex-ui';
-      components: { WxcLoading, WxcPartLoading },
-      data () {
-        return {
-          isShow: true
-        };
-      }
+    export default {
+        components: { WxcLoading, WxcPartLoading },
+        data () {
+            return {
+                isShow: true
+            };
+        }
     };
 </script>
 ```

packages/wxc-mask/README.md

@@ -85,7 +85,7 @@ More details can be found in [here](https://github.com/alibaba/weex-ui/blob/mast
 | duration | `String` |`N`| `300` |  animation duration time |
 | timing-function | `String` |`N`| `ease-in` |  animation timing function |
 | overlay-cfg | `Object` |`N`| `{}` | [wxc-overlay](https://github.com/alibaba/weex-ui/blob/master/packages/wxc-overlay/README.md) configs |
-
+| opacity | `Number` |`N`| `0.6` |  set transparency |
 
 ### Event
 

packages/wxc-mask/README_cn.md

@@ -87,6 +87,7 @@
 | duration | `String` |`N`| `300` |  弹层出现时间 |
 | timing-function | `String` |`N`| `ease-in` |  弹层出现动画方式 |
 | overlay-cfg | `Object` |`N`| `{}` |  蒙层配置参数 [wxc-overlay](https://github.com/alibaba/weex-ui/blob/master/packages/wxc-overlay/README.md) |
+| opacity | `Number` |`N`| `0.6` |  设置透明度 |
 
 
 ### 事件回调

packages/wxc-mask/index.vue

@@ -9,6 +9,7 @@
                  v-if="show"
                  v-bind="mergeOverlayCfg"
                  :can-auto-close="overlayCanClose"
+                 :opacity='opacity'
                  @wxcOverlayBodyClicking="wxcOverlayBodyClicking"
                  @wxcOverlayBodyClicked="wxcOverlayBodyClicked"></wxc-overlay>
     <div ref="wxc-mask"
@@ -125,7 +126,11 @@
       maskBgColor: {
         type: String,
         default: '#ffffff'
-      }
+      },
+      opacity: {
+        type: [Number, String],
+        default: 0.6
+      },
     },
     data: () => ({
       closeIcon: 'https://gw.alicdn.com/tfs/TB1qDJUpwMPMeJjy1XdXXasrXXa-64-64.png',

packages/wxc-progress/README.md

@@ -84,5 +84,7 @@ More details can be found in [here](https://github.com/alibaba/weex-ui/blob/mast
 |-------------|------------|--------|-----|-----|
 | value | `Number` |`Y`| `0` | percent `(0-100)` |
 | bar-height | `Number` |`N`| `8` | progress bar height |
+| bar-color | `String` |`N`| `#FFC900` | progress bar color |
 | bar-width | `Number` |`N`| `600` | progress bar width |
 | bar-radius | `number` |`n`| `0` | progress bar radius |
+| background-color | `String` |`N`| `#f2f3f4` | overall background color |

packages/wxc-progress/README_cn.md

@@ -87,3 +87,4 @@
 | bar-width | `Number` |`N`| `600` | 长度 |
 | bar-color | `String` |`N`| `#FFC900` | 颜色 |
 | bar-radius | `Number` |`N`| `0` | 圆角 |
+| background-color | `String` |`N`| `#f2f3f4` | 整体背景色 |

packages/wxc-progress/index.vue

@@ -43,15 +43,20 @@
       value: {
         type: Number,
         default: 0
+      },
+      backgroundColor: {
+        type: String,
+        default: '#f2f3f4'
       }
     },
     computed: {
       runWayStyle () {
-        const { barWidth, barHeight, barRadius } = this;
+        const { barWidth, barHeight, barRadius, backgroundColor } = this;
         return {
           width: barWidth + 'px',
           height: barHeight + 'px',
-          borderRadius: barRadius + 'px'
+          borderRadius: barRadius + 'px',
+          backgroundColor
         }
       },
       progressStyle () {

packages/wxc-radio/item.vue

@@ -19,12 +19,14 @@
 
 <style scoped>
   .radio {
-    width: 48px;
-    height: 48px;
+    width: 36px;
+    height: 36px;
   }
 
   .title-text {
     font-size: 30px;
+    height: 40px;
+    line-height: 40px;
   }
 </style>
 

packages/wxc-rich-text/README.md

@@ -19,7 +19,7 @@
     <wxc-rich-text :config-list='configList'
                    @wxcRichTextLinkClick='wxcRichTextLinkClick'></wxc-rich-text>
      <div class='special-rich'>
-       <wxc-special-rich-text :config-list='specialConfigList'></wxc-special-rich-text>
+       <wxc-special-rich-text @wxcSpecialRichTextClick="wxcSpecialRichTextClick"  :config-list='specialConfigList'></wxc-special-rich-text>
      </div>
   </div>
   
@@ -76,6 +76,9 @@
             borderColor: '#FFC900',
             backgroundColor: '#FFC900',
             borderRadius: 14,
+          },
+          tagDivStyle: {
+            left: '50px'
           }
         },
         {
@@ -89,7 +92,8 @@
       ],
     }),
     methods: {
-      wxcRichTextLinkClick () {}
+      wxcRichTextLinkClick () {},
+      wxcSpecialRichTextClick () {}
     }
   };
 </script>
@@ -110,6 +114,7 @@ More details can be found in [here](https://github.com/alibaba/weex-ui/blob/mast
 
 ```
 @wxcRichTextLinkClick='wxcRichTextLinkClick'
+@wxcSpecialRichTextClick="wxcSpecialRichTextClick"
 ```
 
 

packages/wxc-rich-text/README_cn.md

@@ -19,7 +19,7 @@
     <wxc-rich-text :config-list="configList"
                    @wxcRichTextLinkClick="wxcRichTextLinkClick"></wxc-rich-text>
      <div class="special-rich">
-       <wxc-special-rich-text :config-list="specialConfigList"></wxc-special-rich-text>
+       <wxc-special-rich-text @wxcSpecialRichTextClick="wxcSpecialRichTextClick" :config-list="specialConfigList"></wxc-special-rich-text>
      </div>
   </div>
   
@@ -76,6 +76,9 @@
             borderColor: '#FFC900',
             backgroundColor: '#FFC900',
             borderRadius: 14,
+          },
+          tagDivStyle: {
+            left: '50px'
           }
         },
         {
@@ -89,7 +92,8 @@
       ],
     }),
     methods: {
-      wxcRichTextLinkClick () {}
+      wxcRichTextLinkClick () {},
+      wxcSpecialRichTextClick () {}
     }
   };
 </script>
@@ -110,6 +114,7 @@
 
 ```
 @wxcRichTextLinkClick="wxcRichTextLinkClick"
+@wxcSpecialRichTextClick="wxcSpecialRichTextClick"
 ```
 
 

packages/wxc-special-rich-text/index.vue

@@ -3,9 +3,9 @@
 <!-- just hack for babel-plugin-component !!!-->
 
 <template>
-  <div class="wxc-special-rich-text">
+  <div class="wxc-special-rich-text" @click="$emit('wxcSpecialRichTextClick')">
     <div class="tag-div"
-         :style="{top:top+'px'}">
+         :style="Object.assign({top:top+'px'}, newList[0].tagDivStyle)">
       <image class="wxc-image"
              v-if="newList[0] && newList[0].type === 'icon' && newList[0].src"
              :src="newList[0].src"