@dolphinweex/weex-vue-render 0.2.90 → 0.2.92

package/dist/index.common.js

@@ -5911,6 +5911,7 @@ function getImage(weex) {
           backgroundImage: displaySrc ? `url(${this.checkTrim(displaySrc)})` : '',
           backgroundSize: this.resize || "stretch",
           backgroundRepeat: "no-repeat",
+          zIndex: 1,
         },
       });
     },
@@ -8183,7 +8184,6 @@ var slideMixin = {
             lastNode.style.position = 'absolute';
             this._setPosition(lastNode, -this._wrapperWidth);
             lastNode.style.opacity = '1';
-            lastNode.style.zIndex = '10';
             
             // 执行向左滑动动画
             inner.style.transition = slideTranstionTime;
@@ -8211,7 +8211,6 @@ var slideMixin = {
             cloneNode.style.position = 'absolute';
             this._setPosition(cloneNode, this.frameCount * this._wrapperWidth);
             cloneNode.style.width = `${this._wrapperWidth}px`;
-            cloneNode.style.zIndex = '10';
             if (!cloneNode.parentNode) {
               inner.appendChild(cloneNode);
             }
@@ -8476,11 +8475,11 @@ var slideMixin = {
       // clone 中的 embed 需要保留以维持布局，但必须修改 id 防止触发同层渲染 CREATE 生命周期
       // （CREATE 会替换原始 embed 的 controller，导致原视频失去 rootNode）
       // 约定：id 以 "clone_" 开头的 embed 在 SameLayerManager 里会被直接忽略
-      // var cloneEmbeds = clone.querySelectorAll('embed');
-      // for (var ci = 0; ci < cloneEmbeds.length; ci++) {
-      //   var origId = cloneEmbeds[ci].getAttribute('id') || '';
-      //   cloneEmbeds[ci].setAttribute('id', 'weexVueRender_clone_' + origId);
-      // }
+      var cloneEmbeds = clone.querySelectorAll('embed');
+      for (var ci = 0; ci < cloneEmbeds.length; ci++) {
+        var origId = cloneEmbeds[ci].getAttribute('id') || '';
+        cloneEmbeds[ci].setAttribute('id', 'native_disabled_' + origId);
+      }
       this.$refs.inner.appendChild(clone);
       arr.push(clone);
       return clone
@@ -8523,11 +8522,11 @@ var slideMixin = {
       
       // clone 中的 embed 需要保留以维持布局，但必须修改 id 防止触发同层渲染 CREATE 生命周期
       // 约定：id 以 "clone_" 开头的 embed 在 SameLayerManager 里会被直接忽略
-      // var cloneEmbeds = cloneNode.querySelectorAll('embed');
-      // for (var ci = 0; ci < cloneEmbeds.length; ci++) {
-      //   var origId = cloneEmbeds[ci].getAttribute('id') || '';
-      //   cloneEmbeds[ci].setAttribute('id', 'weexVueRender_clone_' + origId);
-      // }
+      var cloneEmbeds = cloneNode.querySelectorAll('embed');
+      for (var ci = 0; ci < cloneEmbeds.length; ci++) {
+        var origId = cloneEmbeds[ci].getAttribute('id') || '';
+        cloneEmbeds[ci].setAttribute('id', 'native_disabled_' + origId);
+      }
 
       // 预设所有图片元素的背景图片，避免重新加载
       var originalImages = originalNode.querySelectorAll('[style*="background-image"]');
@@ -8900,16 +8899,21 @@ var slideMixin = {
               this._setPosition(lastNode, -this._wrapperWidth);
               lastNode.style.opacity = '1';
             } else if (atLast && isLeftSwipe) {
-              // 从最后一张向左滑到第一张 - 优化版本
+              // 从最后一张向左滑到第一张：
+              // 第一张在列表开头，不能脱离文档流，否则会导致当前最后一张区域出现黑块。
+              // 这里保留其布局位置，只做视觉位移到最右侧。
               var firstNode = this._cells[0].elm;
-              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`;
-              if (!cloneNode.parentNode) {
-                inner.appendChild(cloneNode);
+              console.log('cdj-touchmove-last-to-first', { currentIndex: this.currentIndex, preIndex: this._preIndex, frameCount: this.frameCount });
+              firstNode.style.position = this.isTransform ? '' : 'relative';
+              this._setPosition(firstNode, this.frameCount * this._wrapperWidth);
+              firstNode.style.opacity = '1';
+              var firstInner = firstNode.firstElementChild;
+              if (firstInner) {
+                firstInner.style.opacity = '1';
+                firstInner.style.transition = 'none';
+                firstInner.style.transform = '';
               }
-              tp.cloneNode = cloneNode;
+              tp.boundaryFirstNode = firstNode;
             }
           }
         }
@@ -8998,6 +9002,7 @@ var slideMixin = {
         }
         
         var newIndex = shouldSwitch ? (this.currentIndex - direction) : this.currentIndex;
+        console.log('cdj-touchend-decision', { currentIndex: this.currentIndex, preIndex: this._preIndex, newIndex: newIndex, moveRatio: moveRatio, velocity: this.velocity, shouldSwitch: shouldSwitch, duration: animationDuration });
         
         // 边界检查
         if (!this.infinite || this.infinite === 'false') {
@@ -9007,6 +9012,15 @@ var slideMixin = {
         
         // 如果是复位操作（没有切换页面），使用更平滑的动画
         if (newIndex === this.currentIndex) {
+          if (tp.boundaryFirstNode) {
+            tp.boundaryFirstNode.style.position = '';
+            tp.boundaryFirstNode.style.zIndex = '';
+            var rollbackInner = tp.boundaryFirstNode.firstElementChild;
+            if (rollbackInner) {
+              rollbackInner.style.transition = '';
+            }
+            this._setPosition(tp.boundaryFirstNode, 0);
+          }
           this._smoothResetPosition(inner, animationDuration);
         } else {
           this._smoothSlideTo(newIndex, animationDuration, moveRatio);
@@ -9074,8 +9088,9 @@ var slideMixin = {
        var currentOffset = this._getPosition(inner);
        var targetOffset;
        var needsReset = false;
-       var cloneNode = null;
-       var lastNode = null;
+      var cloneNode = null;
+      var lastNode = null;
+      var firstNode = null;
        
        // 使用更自然的缓动函数
        var easing = Math.abs(moveRatio) > 0.4 ? 
@@ -9091,11 +9106,11 @@ var slideMixin = {
          if (newIndex < 0) {
            // 从第一张向右滑到最后一张
            newIndex = this.frameCount - 1;
+          console.log('cdj-smooth-boundary-first-to-last', { targetIndex: newIndex, innerOffset: this.innerOffset, wrapperWidth: this._wrapperWidth });
            lastNode = this._cells[newIndex].elm;
            lastNode.style.position = 'absolute';
            this._setPosition(lastNode, -this._wrapperWidth);
            lastNode.style.opacity = '1';
-           lastNode.style.zIndex = '10';
            
            // 目标是向右滑动到左侧的最后一张图片
            targetOffset = this.innerOffset + this._wrapperWidth;
@@ -9103,17 +9118,18 @@ var slideMixin = {
          } else if (newIndex >= this.frameCount) {
            // 从最后一张向左滑到第一张
            newIndex = 0;
-           var firstNode = this._cells[0].elm;
-           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';
-           if (!cloneNode.parentNode) {
-             inner.appendChild(cloneNode);
-           }
+          firstNode = this._cells[0].elm;
+          firstNode.style.position = this.isTransform ? '' : 'relative';
+          this._setPosition(firstNode, this.frameCount * this._wrapperWidth);
+          firstNode.style.opacity = '1';
+          var smoothFirstInner = firstNode.firstElementChild;
+          if (smoothFirstInner) {
+            smoothFirstInner.style.opacity = '1';
+            smoothFirstInner.style.transition = 'none';
+            smoothFirstInner.style.transform = '';
+          }
            
-           // 目标是向左滑动到右侧的克隆图片
+          // 目标是向左滑动到右侧的第一张图片
            targetOffset = this.innerOffset - this._wrapperWidth;
            needsReset = true;
          } else {
@@ -9153,10 +9169,20 @@ var slideMixin = {
              this$1._setPosition(lastNode, 0);
            }
            
-           if (cloneNode && cloneNode.parentNode) {
-             // 移除克隆节点
-             inner.removeChild(cloneNode);
-           }
+          if (cloneNode && cloneNode.parentNode) {
+            // 兼容旧逻辑，兜底移除clone
+            inner.removeChild(cloneNode);
+          }
+          if (firstNode) {
+            // 重置第一张图片位置
+            firstNode.style.position = '';
+            firstNode.style.zIndex = '';
+            var resetFirstInner = firstNode.firstElementChild;
+            if (resetFirstInner) {
+              resetFirstInner.style.transition = '';
+            }
+            this$1._setPosition(firstNode, 0);
+          }
            
            // 重置到正确的最终位置
            this$1.innerOffset = -newIndex * this$1._wrapperWidth;
@@ -9182,7 +9208,7 @@ var slideMixin = {
          this$1.currentIndex = newIndex;
          this$1._preIndex = newIndex;
          this$1._emitScrollEvent('scrollend');
-       }, duration * 800);
+      }, duration * 1000);
      },
 
     _handleTouchCancel: function _handleTouchCancel (event) {

package/package.json

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