@dolphinweex/weex-vue-render 0.2.47 → 0.2.49

package/dist/index.common.js

@@ -1547,7 +1547,7 @@ function calc(x1, y1, x2, y2, x3, y3, x4, y4) {
  * @event
  * @param  {event} event
  */
-const touchstartHandler = throttle(function touchstartHandler(event) {
+function touchstartHandler(event) {
 
   if (Object.keys(gestures).length === 0) {
     docEl.addEventListener('touchmove', touchmoveHandler, true);
@@ -1603,7 +1603,7 @@ const touchstartHandler = throttle(function touchstartHandler(event) {
       touchEvent: event
     });
   }
-},300,true)
+}
 
 /**
  * take over touchmove events, and handle pan and dual related gestures.
@@ -2919,6 +2919,9 @@ function mapFormEvents (context) {
   var eventMap = {};['input', 'change', 'focus', 'blur', 'return'].forEach(function (type) {
     eventMap[type] = function (event) {
       if (context.$el) {
+        if(context.maxlength){
+          context.value = context.value.slice(0,context.maxlength)
+        }
         event.value = context.$el.value;
         // for the sake of v-model, a input event must be emitted.
         if (type === 'input') {
@@ -3475,6 +3478,18 @@ function applySrc (item, src, placeholderSrc) {
   function isEncoded(url) { //检查 % 后是否是合法的编码
     return /%[0-9A-Fa-f]{2}/.test(url);
   }
+  
+  // 优化：如果是clone节点且原始图片已加载，直接复制背景图片
+  if (item._isClone && item._originalNode) {
+    var originalBg = item._originalNode.style.backgroundImage;
+    if (originalBg && originalBg !== 'none') {
+      item.style.backgroundImage = originalBg;
+      item.removeAttribute(lazyloadAttr);
+      finallCb();
+      return;
+    }
+  }
+  
   /**
    * 1. apply src immediately in case javscript blocks the image loading
    *  before next tick.
@@ -5593,6 +5608,7 @@ function getImage(weex) {
   return {
     data: function data() {
       return {
+        locationSrc:'',
       }
     },
     name: 'weex-image',
@@ -5607,6 +5623,7 @@ function getImage(weex) {
       this.currentSrc = this.src;
     },
     mounted: function () {
+      this.locationSrc = this.removeHtmlAndAfter(window.location.href)
     },
     methods: {
       save: function (callback) {
@@ -5632,17 +5649,71 @@ function getImage(weex) {
       handleClick: function handleClick(event) {
         this.$emit('weex$tap', event); 
       },
-       _handleTouchStart: function _handleTouchStart (event) {
+      _handleTouchStart: function _handleTouchStart(event) {
           if (this.saveImg) {
             this.save()
           }
-       }
+       },
+       removeHtmlAndAfter(url) {
+        const baseUrl = url.split(/[?#]/)[0];
+        // 找到最后一个/和.html的位置
+        const lastSlashIndex = baseUrl.lastIndexOf('/');
+        const htmlIndex = baseUrl.indexOf('.html', lastSlashIndex);
+  
+        return htmlIndex !== -1
+          ? baseUrl.substring(0, lastSlashIndex)
+          : baseUrl;
+      },
+      processAndConcatenate(baseUrl, appendStr) {
+        if (appendStr.startsWith('http') || appendStr.startsWith('meiju://') || appendStr.startsWith('file')) {
+          return appendStr
+        }
+        const path = baseUrl + '/'
+        if (!baseUrl && !appendStr) {
+          return appendStr
+        }
+        let processedAppendStr = appendStr;
+  
+        if (/^[a-zA-Z]/i.test(appendStr) && appendStr.includes('/')) {
+          return path + appendStr; // 直接返回绝对路径
+        }
+        if (processedAppendStr.startsWith("/")) {
+          return path + appendStr
+        }
+  
+        // 去除 @、./、../
+        if (processedAppendStr.startsWith("@")) {
+          processedAppendStr = processedAppendStr.slice(1);
+        }
+        if (processedAppendStr.startsWith("./")) {
+          while (processedAppendStr.startsWith("./")) {
+            processedAppendStr = processedAppendStr.slice(2);
+          }
+        }
+        if (processedAppendStr.startsWith("../")) {
+          while (processedAppendStr.startsWith("../")) {
+            processedAppendStr = processedAppendStr.slice(3);
+          }
+        }
+  
+  
+        // 查找非路径分隔符和特殊前缀的字符串起始位置
+        let startIndex = 0;
+        while (startIndex < processedAppendStr.length &&
+          (processedAppendStr[startIndex] === '.' || processedAppendStr[startIndex] === '/')) {
+          startIndex++;
+        }
+        processedAppendStr = processedAppendStr.slice(startIndex);
+  
+        return path + processedAppendStr;
+      },
     },
+
     render: function render (createElement) {
       return createElement('html:img', {
         attrs: {
           'weex-type': 'img',
-          src: this.src,
+          src: this.processAndConcatenate(this.locationSrc, this.src),
         },
         on: {
           'weex$tap': this.handleClick,
@@ -6245,20 +6316,21 @@ var scrollable$1 = {
     },
 
     handleTouchEnd: function handleTouchEnd (event) {
+      weex.sliderHorizontalScrolling = false;
       if (!this._touchParams || !this._refresh && !this._loading) {
         return
       }
       var tp = this._touchParams;
       var isV = tp.isVertical;
-      if (this.scrollDirection === 'horizontal' && !isV) {
-        // 水平
-        // event.stopPropagation();
-      }else if (isV) {
-        // 垂直
-        // event.stopPropagation();
-      }else {
-        return;
-      } 
+      // if (this.scrollDirection === 'horizontal' && !isV) {
+      //   // 水平
+      //   // event.stopPropagation();
+      // }else if (isV) {
+      //   // 垂直
+      //   // event.stopPropagation();
+      // }else {
+      //   return;
+      // } 
 
       var inner = this.$refs.inner;
       var ref = this._touchParams;
@@ -7136,6 +7208,15 @@ function getLoading () {
       }
     },
     methods: {
+      isElementFullyInViewport(el) {
+        const rect = this.$el.getBoundingClientRect();
+        return (
+          rect.top >= 0 &&
+          rect.left >= 0 &&
+          rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) + 5 &&
+          rect.right <= (window.innerWidth || document.documentElement.clientWidth) + 5
+        );
+      },
       pulling: function pulling (offsetY) {
         if ( offsetY === void 0 ) offsetY = 0;
         this.height = offsetY;
@@ -7146,7 +7227,7 @@ function getLoading () {
       },
       pullingEnd: function pullingEnd () {
         this.$el && (this.$el.style.transition = "height .2s");
-        if ( this.height >= Math.max(this.viewHeight, 200)) {
+        if ( this.height >= Math.max(this.viewHeight, 150) && this.isElementFullyInViewport()) {
           this.pulling(this.viewHeight);
           if (this.$el) {
             dispatchNativeEvent(this.$el, 'loading');
@@ -7661,6 +7742,9 @@ var slideMixin = {
     this._clones = [];
     this.innerOffset = 0;
     this._indicator = null;
+    
+    // 向上寻找nav组件（父级weex-slider）
+    this._findParentNav();
   },
 
   beforeUpdate: function beforeUpdate () {
@@ -7718,9 +7802,45 @@ var slideMixin = {
     this._getWrapperSize();
     this._slideTo(this.currentIndex);
     weex.utils.fireLazyload(this.$el, true);
+    document.addEventListener('visibilitychange', this.handleVisibilityChange);
+  },
+  beforeDestroy() {
+    document.removeEventListener('visibilitychange', this.handleVisibilityChange);
   },
-
   methods: {
+    // 向上寻找nav组件（父级weex-slider），最多向上找10层
+    _findParentNav: function _findParentNav () {
+      var maxLevels = 10;  // 最大搜索层数
+      var currentParent = this.$parent;
+      var level = 0;
+      
+      this._parentNav = null;  // 初始化为null
+      
+      while (currentParent && level < maxLevels) {
+        // 判断父组件是否是weex-slider（nav组件）
+        if (currentParent.$options._componentTag === 'slider' ||
+            (currentParent.$vnode && currentParent.$vnode.componentOptions && 
+             currentParent.$vnode.componentOptions.tag === 'slider')) {
+          this._parentNav = currentParent;
+          console.log('找到父级nav组件(weex-slider)在第' + (level + 1) + '层:', this._parentNav);
+          break;  // 找到就停止
+        }
+        
+        currentParent = currentParent.$parent;
+        level++;
+      }
+      
+      if (!this._parentNav && level >= maxLevels) {
+        console.log('在' + maxLevels + '层内未找到父级nav组件(weex-slider)');
+      }
+    },
+    
+    
+    handleVisibilityChange(){
+      if (!document.hidden) {
+           this._startAutoPlay()
+      }
+    },
     _getWrapperSize: function _getWrapperSize () {
       var wrapper = this.$refs.wrapper;
       if (wrapper) {
@@ -7882,12 +8002,14 @@ var slideMixin = {
           } else if (index >= this.frameCount) {
             // 从最后一张向右滑
             var firstNode = this._cells[0].elm;
-            var cloneNode = firstNode.cloneNode(true);
+            var cloneNode = this._getPreloadedClone(0) || this._createOptimizedClone(firstNode);
             cloneNode.style.position = 'absolute';
             this._setPosition(cloneNode, this.frameCount * this._wrapperWidth);
             cloneNode.style.width = `${this._wrapperWidth}px`;
             cloneNode.style.zIndex = '10';
-            inner.appendChild(cloneNode);
+            if (!cloneNode.parentNode) {
+              inner.appendChild(cloneNode);
+            }
   
             // 执行向右滑动动画
             inner.style.transition = slideTranstionTime;
@@ -8069,6 +8191,17 @@ var slideMixin = {
         });
         this$1._clones[key] = [];
       });
+      
+      // 优化：清理预加载的clone节点
+      if (this._preloadedClones) {
+        Object.keys(this._preloadedClones).forEach(function (key) {
+          var clone = this$1._preloadedClones[key];
+          if (clone && clone.parentNode) {
+            clone.parentNode.removeChild(clone);
+          }
+        });
+        this._preloadedClones = {};
+      }
     },
 
     // reset nodes' index and _inShow state. But leave the styles
@@ -8084,6 +8217,7 @@ var slideMixin = {
     },
 
     _initNodes: function _initNodes () {
+      var this$1 = this;
       this._cells.forEach(function (cell, idx) {
         var node = cell.elm;
         node.index = idx;
@@ -8091,6 +8225,13 @@ var slideMixin = {
         node.style.zIndex = 0;
         // node.style.opacity = 0;
       });
+      
+      // 优化：延迟预加载clone节点，避免阻塞初始化
+      setTimeout(function() {
+        if (this$1.infinite && this$1.frameCount > 1) {
+          this$1._preloadClones();
+        }
+      }, 100);
     },
 
     _positionNodes: function _positionNodes (begin, end, step, anim) {
@@ -8147,6 +8288,74 @@ var slideMixin = {
       }
     },
 
+    // 优化：获取预加载的clone节点
+    _getPreloadedClone: function _getPreloadedClone (index) {
+      var key = 'preloaded_' + index;
+      var clone = this._preloadedClones && this._preloadedClones[key];
+      if (clone && clone.parentNode) {
+        // 如果clone已经在DOM中，重置其样式
+        clone.style.visibility = 'visible';
+        clone.style.top = '0px';
+        clone.style.zIndex = '10';
+        return clone;
+      }
+      return null;
+    },
+
+    // 优化：创建优化的clone节点，预设图片
+    _createOptimizedClone: function _createOptimizedClone (originalNode) {
+      var cloneNode = originalNode.cloneNode(true);
+      cloneNode._isClone = true;
+      cloneNode._originalNode = originalNode;
+      
+      // 预设所有图片元素的背景图片，避免重新加载
+      var originalImages = originalNode.querySelectorAll('[style*="background-image"]');
+      var clonedImages = cloneNode.querySelectorAll('[style*="background-image"], [data-img-src]');
+      
+      for (var i = 0; i < originalImages.length && i < clonedImages.length; i++) {
+        var originalBg = originalImages[i].style.backgroundImage;
+        if (originalBg && originalBg !== 'none') {
+          clonedImages[i].style.backgroundImage = originalBg;
+          clonedImages[i].removeAttribute('data-img-src');
+          clonedImages[i]._isClone = true;
+          clonedImages[i]._originalNode = originalImages[i];
+        }
+      }
+      
+      return cloneNode;
+    },
+
+    // 优化：预加载常用的clone节点
+    _preloadClones: function _preloadClones () {
+      if (!this._preloadedClones) {
+        this._preloadedClones = {};
+      }
+      
+      // 预加载第一张和最后一张的clone，这是最常用的
+      if (this.frameCount > 1) {
+        var firstKey = 'preloaded_0';
+        var lastKey = 'preloaded_' + (this.frameCount - 1);
+        
+        if (!this._preloadedClones[firstKey]) {
+          var firstClone = this._createOptimizedClone(this._cells[0].elm);
+          firstClone.style.visibility = 'hidden';
+          firstClone.style.position = 'absolute';
+          firstClone.style.top = '-9999px';
+          this.$refs.inner.appendChild(firstClone);
+          this._preloadedClones[firstKey] = firstClone;
+        }
+        
+        if (!this._preloadedClones[lastKey]) {
+          var lastClone = this._createOptimizedClone(this._cells[this.frameCount - 1].elm);
+          lastClone.style.visibility = 'hidden';
+          lastClone.style.position = 'absolute';
+          lastClone.style.top = '-9999px';
+          this.$refs.inner.appendChild(lastClone);
+          this._preloadedClones[lastKey] = lastClone;
+        }
+      }
+    },
+
     _hideNode: function _hideNode (node) {
       node._inShow = false;
       node.style.zIndex = 0;
@@ -8335,10 +8544,12 @@ var slideMixin = {
       if (!this.scrollable || this.frameCount<=1) {
         return // 🚫 禁止滚动行为
       }
-      // if(weex.weexSliderTouchStart){ //解决weex-slider嵌套手势冲突问题
-      //   return
-      // }
-      // weex.weexSliderTouchStart = true
+      console.log(weex.weexSliderTouchBoundary,'cdj----weex.weexSliderTouchBoundary')
+      if(weex.weexSliderTouchStart && !weex.weexSliderTouchBoundary){
+        return
+      }
+      weex.weexSliderTouchStart = true
+
       this.lastMoveTime = Date.now();
       this.lastMovePosition = event.touches[0].pageX;
       var touch = event.changedTouches[0];
@@ -8421,6 +8632,13 @@ var slideMixin = {
       const isRightSwipe = offsetX > 0;
       const atFirst = this._preIndex === 0;
       const atLast = this._preIndex === this.frameCount - 1;
+      if (!this.infinite && !this.autoPlay && ((atLast && isLeftSwipe) || (atFirst && isRightSwipe)) && !weex.weexSliderTouchBoundary) {
+        weex.weexSliderTouchBoundary = true
+        this._parentNav._touchParams = ref
+        //如果是边界并继续滑动
+        return
+      }
+
       //修改自动轮播或者无缝轮播边界滚动的过渡动画
       if (this.infinite && this.infinite !== 'false') {
         var inner = this.$refs.inner;
@@ -8435,22 +8653,21 @@ var slideMixin = {
               this._setPosition(lastNode, -this._wrapperWidth);
               lastNode.style.opacity = '1';
             } else if (atLast && isLeftSwipe) {
-              // 从最后一张向左滑到第一张
+              // 从最后一张向左滑到第一张 - 优化版本
               var firstNode = this._cells[0].elm;
-              var cloneNode = firstNode.cloneNode(true);
+              var cloneNode = this._getPreloadedClone(0) || this._createOptimizedClone(firstNode);
               cloneNode.style.position = 'absolute';
               this._setPosition(cloneNode, this.frameCount * this._wrapperWidth);
               cloneNode.style.width = `${this._wrapperWidth}px`;
-              inner.appendChild(cloneNode);
+              if (!cloneNode.parentNode) {
+                inner.appendChild(cloneNode);
+              }
               tp.cloneNode = cloneNode;
             }
           }
         }
       }
-      if (!this.infinite && !this.autoPlay && ((atLast && isLeftSwipe) || (atFirst && isRightSwipe))) {
-        // ✅ 如果是边界并继续滑动，就放手，不拦截
-        return;
-      }
+
       if (this._sliding) {
         event.stopPropagation();
         return
@@ -8492,8 +8709,10 @@ var slideMixin = {
     },
 
     _handleTouchEnd: function _handleTouchEnd (event) {
-      // weex.weexSliderTouchStart = false
+      weex.weexSliderTouchBoundary = false
+      weex.weexSliderTouchStart = false
       var inner = this.$refs.inner;
+      this._refresh && this._refresh.pullingEnd();
       if (touchSliderInstance == inner) {
         touchSliderInstance= null;
       } else {
@@ -8613,7 +8832,6 @@ var slider$1 = {
   watch: {
     index: function index () {
       this.currentIndex = this._normalizeIndex(this.index);
-      console.log('cdj----index',this.infinite,this.currentIndex)
     }
   },
 
@@ -11644,26 +11862,11 @@ if (global.Vue) {
 return weex;
 
 })));
-var isNotReload = false
-const globalEvent333 = weex.requireModule('globalEvent')
-globalEvent333.addEventListener("videoFullscreen",()=>{
-  isNotReload = true
-})
 
 // 一多适配不同宽高比例的屏幕，使用resetViewport也能适配宽度，
 // 但项目存在没有使用rem的元素，且页面高度重置方法也因项目而异。
 // 后续联合所有页面统一做了适配后可删除此段代码
-var resetDeviceWidth = function () {
-  if( !isNotReload ){
-    location.reload()
-  }
-  if(isNotReload){
-    isNotReload = false
-  }
-};
-
-window.addEventListener('resize', () => {
-  setTimeout(() => {
-    resetDeviceWidth()
-  }, 100)
-});
+const globalEventForReload = weex.requireModule('globalEvent')
+globalEventForReload.addEventListener("WebReload",()=>{
+  location.reload()
+})

package/package.json

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