Merge branch 'dev'

Author: tw93

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.7.1
+- [+] [wxc-slider-bar](https://alibaba.github.io/weex-ui/#/cn/packages/slider-bar) add `wxcSliderBarTouchEnd` event.
+- [!] Fixed [wxc-mask](https://alibaba.github.io/weex-ui/#/cn/packages/mask) jitter bug when inputting.
+- [!] Fixed the problem that the QR code does not display when debugging.
+
 ## 0.7.0
 - [-] Remove alipay util,Preventing audit issues [issue/467](https://github.com/alibaba/weex-ui/issues/467)
 - [!] [wxc-tab-bar](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-tab-bar) add `supportXBar` param.

CHANGELOG_cn.md

@@ -1,5 +1,11 @@
 # 升级日志
 
+## 0.7.1
+- [+] [wxc-slider-bar](https://alibaba.github.io/weex-ui/#/cn/packages/slider-bar) 新增 `wxcSliderBarTouchEnd` 事件.
+- [!] 修复 [wxc-mask](https://alibaba.github.io/weex-ui/#/cn/packages/mask) 输入时候抖动问题
+- [!] 修复调试时候 console 不显示二维码的问题
+
+
 ## 0.7.0
 - [-] 移除支付宝判断，防止审核问题 [issue/467](https://github.com/alibaba/weex-ui/issues/467)
 - [!] [wxc-tab-bar](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-tab-bar) 增加 `supportXBar` 参数可用于设置不要 iPhone X 底部 bar 的增高兼容效果

example/_public/index.html

@@ -30,6 +30,6 @@
 <script src="//h5.m.taobao.com/js/trip/weex-ui/vue.runtime.min.js"></script>
 <script src="//h5.m.taobao.com/js/trip/weex-ui/weex-vue-render-next.min.js"></script>
 <script src="./index.web.js"></script>
-<script src="//h5.m.taobao.com/js/trip/weex-ui/qrcode.js"></script>
+<script src="//qpluspicture.oss-cn-beijing.aliyuncs.com/ts-upload/1573807857-qrcode.js"></script>
 </body>
 </html>

example/popup/index.vue

@@ -62,7 +62,8 @@ under the License.
         <div class="demo-content">
           <image src="https://img.alicdn.com/tfs/TB1ojYvOXXXXXaOXFXXXXXXXXXX-180-41.png"
                  class="demo-image"></image>
-          <text>与 Web App、HTML5 App 或 hybrid App 不同，您可以使用 Weex 构建一个真正的原生应用。更贴心的是你的代码只需使用 HTML、CSS、JavaScript 可以构建原生应用，上手非常简单。</text>
+          <text>与 Web App、HTML5 App 或 hybrid App 不同，您可以使用 Weex 构建一个真正的原生应用。更贴心的是你的代码只需使用 HTML、CSS、JavaScript
+            可以构建原生应用，上手非常简单。</text>
         </div>
       </wxc-popup>
 
@@ -75,6 +76,7 @@ under the License.
                  :show="isRightShow"
                  pos="right"
                  ref="wxcPopup"
+                 :overlay-cfg="{'can-auto-close': false}"
                  @wxcPopupOverlayClicked="popupOverlayRightClick">
         <div @click="onHideClick"
              class="btn blue hide-auto">
@@ -183,47 +185,47 @@ under the License.
       isRightShow: false,
       isAutoShow: false,
       isTrue: true,
-      height: 400
+      height: 400,
     }),
-    created () {
+    created() {
       setTitle('Popup');
     },
     methods: {
-      openBottomPopup () {
+      openBottomPopup() {
         this.isBottomShow = true;
       },
-      openTopPopup () {
+      openTopPopup() {
         this.isTopShow = true;
       },
-      openLeftPopup () {
+      openLeftPopup() {
         this.isLeftShow = true;
       },
-      openRightPopup () {
+      openRightPopup() {
         this.isRightShow = true;
       },
-      popupOverlayTopClick () {
+      popupOverlayTopClick() {
         this.isTopShow = false;
       },
-      popupOverlayBottomClick () {
+      popupOverlayBottomClick() {
         this.isBottomShow = false;
       },
-      popupOverlayLeftClick () {
+      popupOverlayLeftClick() {
         this.isLeftShow = false;
       },
-      popupOverlayRightClick () {
+      popupOverlayRightClick() {
         this.isRightShow = false;
       },
 
-      popupOverlayAutoClick () {
+      popupOverlayAutoClick() {
         this.isAutoShow = false;
       },
 
-      openAutoPopup () {
+      openAutoPopup() {
         const height = this.height;
         this.height = height === 400 ? 800 : 400;
         this.isAutoShow = true;
       },
-      onHideClick () {
+      onHideClick() {
         this.$refs.wxcPopup.hide();
       }
     }

example/slider-bar/index.vue

@@ -27,12 +27,13 @@ under the License.
         <div class="demo-container">
           <text class="label">单滑块水平选择条</text>
           <text class="value-text">取值：{{barValue}}</text>
-          <wxc-slider-bar v-bind="sliderBarCfg1" @updateValue="updateValue"></wxc-slider-bar>
+          <wxc-slider-bar v-bind="sliderBarCfg1" @updateValue="updateValue"
+                          @wxcSliderBarTouchEnd="wxcSliderBarTouchEnd"></wxc-slider-bar>
         </div>
         <div class="demo-container">
           <text class="label">双滑块范围水平选择条</text>
           <text class="value-text">取值范围：{{minValue}} --- {{maxValue}}</text>
-          <wxc-slider-bar v-bind="sliderBarCfg2" @updateValue="updateValue"></wxc-slider-bar>
+          <wxc-slider-bar v-bind="sliderBarCfg2" @updateValue="updateValue" @wxcSliderBarTouchEnd="wxcSliderBarTouchEnd"></wxc-slider-bar>
         </div>
         <div class="demo-container">
           <text class="label">单滑块水平选择条禁用</text>
@@ -91,6 +92,8 @@ under the License.
   import { WxcSliderBar } from '../../index';
   import { setTitle } from '../_mods/set-nav';
 
+  const modal = weex.requireModule("modal");
+
   export default {
     components: { Title, Category, WxcSliderBar },
     data: () => ({
@@ -148,6 +151,11 @@ under the License.
           this.minValue = value[0];
           this.maxValue = value[1];
         }
+      },
+      wxcSliderBarTouchEnd(value) {
+        modal.toast({
+          message: `end touch: ${value}`
+        })
       }
     }
   }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "weex-ui",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "A rich interaction, lightweight, high performance UI library based on Weex",
   "main": "index.js",
   "lib": "vue",
@@ -67,10 +67,10 @@
     "vue-loader": "^12.2.2",
     "vue-template-compiler": "^2.5.3",
     "webpack": "^2.7.0",
-    "weex-loader": "^0.6.0",
-    "weex-vue-loader": "^0.5.0",
-    "weex-vue-precompiler": "^0.1.17",
-    "weex-vue-render": "^1.0.17"
+    "weex-loader": "^0.7.12",
+    "weex-vue-loader": "^0.7.0",
+    "weex-vue-precompiler": "^0.1.26",
+    "weex-vue-render": "^1.0.36"
   },
   "dependencies": {
     "url-parse": "^1.4.3",

package.json

@@ -59,10 +59,6 @@ under the License.
 
   .wxc-mask {
     position: fixed;
-    top: 300px;
-    left: 60px;
-    width: 702px;
-    height: 800px;
   }
 
   .mask-bottom {

packages/wxc-mask/index.vue

@@ -47,7 +47,7 @@ More details can be found in [here](https://github.com/alibaba/weex-ui/blob/mast
 ### API
 
 | Prop | Type | Required | Default | Description |
-|-------------|------------|--------|-----|
+|-------------|------------|--------|-----|-----|
 | show | `Boolean` |`Y`| `false` | whether to show  |
 | opacity | `Number` |`N`| `0.6` | opacity `0-1` |
 | left | `Number` |`N`| `0` | move left distance  |

packages/wxc-overlay/README.md

@@ -55,7 +55,7 @@ under the License.
         default: 0
       },
       left: {
-        default: Number,
+        type: Number,
         default: 0
       },
       hasAnimation: {