@dolphinweex/weex-vue-render 0.2.43 → 0.2.45

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "compile-hero.disable-compile-files-on-did-save-code": true
+}

package/dist/index.common.js

@@ -1547,7 +1547,7 @@ function calc(x1, y1, x2, y2, x3, y3, x4, y4) {
  * @event
  * @param  {event} event
  */
-function touchstartHandler(event) {
+const touchstartHandler = throttle(function touchstartHandler(event) {
 
   if (Object.keys(gestures).length === 0) {
     docEl.addEventListener('touchmove', touchmoveHandler, true);
@@ -1603,7 +1603,7 @@ function touchstartHandler(event) {
       touchEvent: event
     });
   }
-}
+},300,true)
 
 /**
  * take over touchmove events, and handle pan and dual related gestures.
@@ -3373,8 +3373,8 @@ function watchAppear (context, fireNow) {
          * 此处延时执行是临时规避措施，后续需要优化
         */
         if (i == 0) {
-        setTimeout(() => {
-          detectAppear(el, visibleData, dir);
+          setTimeout(() => {
+            detectAppear(el, visibleData, dir);
           }, 1);
         } else {
           detectAppear(el, visibleData, dir);
@@ -5547,10 +5547,18 @@ function getInput (weex) {
     },
 
     mounted: function mounted () {
-      if (this.autofocus !== 'false' && this.autofocus !== false) {
+      if (this.autofocus !== 'false' || this.autofocus !== false) {
         this.focus(this.autofocus)
       }
     },
+    //用watch监听新值，处理可能页面可能通过setimeout重新赋值的情况
+    watch: {
+      autofocus: function autofocus(val) {
+        if (val !== 'false' || val !== false) {
+          this.focus(val)
+        }
+      },
+    },
 
     render: function render (createElement) {
       if (!this._id) {
@@ -5589,6 +5597,88 @@ var input = {
   }
 };
 
+function getImage(weex) {
+  var ref = weex.utils;
+  var dispatchNativeEvent = ref.dispatchNativeEvent;
+  return {
+    data: function data() {
+      return {
+      }
+    },
+    name: 'weex-image',
+    props: {
+      src: String,
+      saveImg: {
+        type: [String],
+        default: ''
+      },
+    },
+    created: function created() {
+      this.currentSrc = this.src;
+    },
+    mounted: function () {
+    },
+    watch: {
+      src: function src(val) {
+      }
+    },
+    methods: {
+      save: function (callback) {
+        const params = {
+          operation: 'saveImageToPhotosAlbum',
+          params: {
+            src: this.saveImg
+          }
+        }
+        weex.requireModule('bridgeModule').commandInterface(JSON.stringify(params),
+          (resData) => {
+            if (typeof callback === 'function') {
+              callback({ success: true });
+            }
+          },
+          (error) => {
+            if (typeof callback === 'function') {
+              callback({ success: false });
+            }
+          }
+        )
+      },
+      handleClick: function handleClick(event) {
+          // weex.utils.dispatchNativeEvent(this.$el, 'click')
+        if (this.$listeners && this.$listeners.click) {
+          this.$listeners.click(event);
+        }
+      },
+       _handleTouchStart: function _handleTouchStart (event) {
+          if (this.saveImg) {
+            this.save()
+          }
+       }
+    },
+    render: function render (createElement) {
+      return createElement('html:img', {
+        attrs: {
+          'weex-type': 'image',
+          src: this.src,
+        },
+        on: {
+          // click: this.handleClick,
+           touchstart: this._handleTouchStart,
+        },
+        staticClass: 'weex-image weex-el',
+        staticStyle: weex.extractComponentStyle(this)
+      })
+    }
+  }
+}
+
+
+var image = {
+  init: function init (weex) {
+    weex.registerComponent('image', getImage(weex));
+  }
+};
+
 __$styleInject("/*\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *   http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied.  See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n\n.weex-switch {\n  border: 0.013333rem solid #dfdfdf;\n  cursor: pointer;\n  vertical-align: middle;\n  -webkit-user-select: none;\n     -moz-user-select: none;\n      -ms-user-select: none;\n          user-select: none;\n  -webkit-box-sizing: content-box;\n          box-sizing: content-box;\n  background-clip: content-box;\n  color: #64bd63;\n  width: 1.333333rem;\n  height: 0.8rem;\n  background-color: white;\n  border-color: #dfdfdf;\n  -webkit-box-shadow: #dfdfdf 0 0 0 0 inset;\n          box-shadow: #dfdfdf 0 0 0 0 inset;\n  border-radius: 0.8rem;\n  -webkit-transition: border 0.4s, background-color 1.2s, -webkit-box-shadow 0.4s;\n  transition: border 0.4s, background-color 1.2s, -webkit-box-shadow 0.4s;\n  transition: border 0.4s, box-shadow 0.4s, background-color 1.2s;\n  transition: border 0.4s, box-shadow 0.4s, background-color 1.2s, -webkit-box-shadow 0.4s;\n}\n\n.weex-switch-checked {\n  background-color: #64bd63;\n  border-color: #64bd63;\n  -webkit-box-shadow: #64bd63 0 0 0 0.533333rem inset;\n          box-shadow: #64bd63 0 0 0 0.533333rem inset;\n}\n\n.weex-switch-checked.weex-switch-disabled {\n  opacity: 0.3\n}\n\n.weex-switch-disabled {\n  background-color: #EEEEEE;\n}\n\n.weex-switch-inner {\n  width: 0.8rem;\n  height: 0.8rem;\n  background: #fff;\n  border-radius: 100%;\n  -webkit-box-shadow: 0 0.013333rem 0.04rem rgba(0, 0, 0, 0.4);\n          box-shadow: 0 0.013333rem 0.04rem rgba(0, 0, 0, 0.4);\n  position: absolute;\n  top: 0;\n  left: 0;\n  -webkit-transition: background-color 0.4s, left 0.2s;\n  transition: background-color 0.4s, left 0.2s;\n}\n\n.weex-switch-checked > .weex-switch-inner {\n  left: 0.533333rem;\n}\n",undefined);
 
 /*
@@ -7180,6 +7270,9 @@ function getRefresh (weex) {
     },
     methods: {
       pulling: function pulling (offsetY) {
+        if(weex.sliderHorizontalScrolling){//轮播图滚动中不允许触发
+          return
+        }
         if ( offsetY === void 0 ) offsetY = 0;
 
         this.height = offsetY;
@@ -8260,6 +8353,10 @@ var slideMixin = {
       if (!this.scrollable || this.frameCount<=1) {
         return // 🚫 禁止滚动行为
       }
+      // if(weex.weexSliderTouchStart){ //解决weex-slider嵌套手势冲突问题
+      //   return
+      // }
+      // weex.weexSliderTouchStart = true
       this.lastMoveTime = Date.now();
       this.lastMovePosition = event.touches[0].pageX;
       var touch = event.changedTouches[0];
@@ -8294,7 +8391,9 @@ var slideMixin = {
     },
     _handleTouchMove: function _handleTouchMove (event) {
       var tp = this._touchParams;
-      if (!tp) { return }
+      if (!tp || !this.scrollable || this.frameCount<=1 || this._sliding) {
+        return // 🚫 禁止滚动行为
+      }
   
       // 如果子view已经处在swipe事件中，并切不允许事件冒泡则不处理当前的事件
       if (weex.gestureAleadyHandleSwipeOnce && !weex.gestureHandleSwipeCanPropagation) {
@@ -8316,7 +8415,7 @@ var slideMixin = {
       if (deltaTime > 0) {
         this.velocity = deltaX / deltaTime; // 像素/毫秒
         // 计算动画时间，速度越大动画时间越短
-        const baseTime = TRANSITION_TIME / 1000; // 基准时间
+        const baseTime = TRANSITION_TIME / 1200; // 基准时间
         const minTime = 0.1; // 最小动画时间（秒）
         this.transitionDuration = Math.max(minTime, baseTime / (this.velocity + 1));
       }
@@ -8328,6 +8427,7 @@ var slideMixin = {
         isV = tp.isVertical = Math.abs(offsetX) < Math.abs(offsetY);
         if (!isV) {
           this._emitScrollEvent('scrollstart');
+          weex.sliderHorizontalScrolling = true;
         }
       }
       // vertical scroll. just ignore it.
@@ -8410,6 +8510,7 @@ var slideMixin = {
     },
 
     _handleTouchEnd: function _handleTouchEnd (event) {
+      // weex.weexSliderTouchStart = false
       var inner = this.$refs.inner;
       if (touchSliderInstance == inner) {
         touchSliderInstance= null;
@@ -8436,6 +8537,7 @@ var slideMixin = {
         this._slideTo(newIndex, true ,this.transitionDuration);
       }
       delete this._touchParams;
+      weex.sliderHorizontalScrolling = false;
     },
 
     _handleTouchCancel: function _handleTouchCancel (event) {
@@ -9176,7 +9278,7 @@ var web = {
 var components = [
   // a,
   // div,
-  // image,
+  image,
   input,
   _switch,
   scrollable,
@@ -11490,6 +11592,8 @@ var valMap = {
 var vals = Object.keys(valMap);
 var defaultVal = 'stretch';
 
+
+
 var resize = {
   init: function init (weex) {
     weex.__vue__.directive('weex-resize', function (el, binding) {

package/package.json

@@ -49,5 +49,5 @@
     "type": "git",
     "url": "git+ssh://git@github.com/weexteam/weex-vue-render.git"
   },
-  "version": "0.2.43"
+  "version": "0.2.45"
 }