@dolphinweex/weex-vue-render 0.2.38 → 0.2.40

package/dist/index.common.js

@@ -3367,7 +3367,18 @@ function watchAppear (context, fireNow) {
         var el = watchAppearList[i];
         var appearOffset = getAppearOffset(el);
         var visibleData = isElementVisible(el, container, dir, appearOffset);
-        detectAppear(el, visibleData, dir);
+        /**
+         * BUG2025052771230
+         * triggerAppearEvent 执行过快可能会导致AI对话聊天窗口重叠问题
+         * 此处延时执行是临时规避措施，后续需要优化
+        */
+        if (i == 0) {
+          setTimeout(() => {
+            detectAppear(el, visibleData, dir);
+          }, 1);
+        } else {
+          detectAppear(el, visibleData, dir);
+        }
       }
     };
     container.addEventListener('scroll', throttle(scrollHandler, 100, true));
@@ -6054,7 +6065,11 @@ var scrollable$1 = {
 
     reachTop: function reachTop () {
       var wrapper = this.$refs.wrapper;
-      return (!!wrapper) && (wrapper.scrollTop <= 0)
+      let flag = (!!wrapper) && (wrapper.scrollTop <= 0)
+      if (wrapper.style.transform === 'rotate(180deg)') {
+        return flag | this.reachBottom()
+      }
+      return flag
     },
 
     reachBottom: function reachBottom (offset) {
@@ -6095,7 +6110,6 @@ var scrollable$1 = {
       if (!this.scrollable) {
         return
       }
-
       var tp = this._touchParams;
       if (!tp) { return } 
 
@@ -6115,19 +6129,7 @@ var scrollable$1 = {
       // 如果是水平滚动，并且手势是水平方向，则阻止冒泡
       // 如果是垂直滚动，并且手势是垂直方向，则阻止冒泡
       var isScrollHorizontal = this.$el.classList.value.indexOf("weex-scroller-horizontal") > -1 || this.$el.classList.value.indexOf("weex-recycle-horizontal") > -1
-      console.log("dom", this.$el.classList.value)
-      if (isScrollHorizontal) {
-        if (!isV) {
-          // 水平
-          event.stopPropagation();
-          return;
-        } 
-        return;
-      }else {
-        if (!isV) {
-          return;
-        }
-      }
+
       
       if (!this._refresh && !this._loading) {
         return
@@ -6148,6 +6150,23 @@ var scrollable$1 = {
         }
         else if (this._loading && (dir === 'up') && reachBottom) {
           this._loading.pullingUp(-offsetY);
+          var wrapper = this.$refs.wrapper;
+          if (wrapper) {
+            // 增加 1 像素，强制 scroll 区域“撑开”
+            wrapper.scrollTop = wrapper.scrollTop + 5;
+          }
+        }
+      }
+      if (isScrollHorizontal) {
+        if (!isV) {
+          // 水平
+          event.stopPropagation();
+          return;
+        } 
+        return;
+      }else {
+        if (!isV) {
+          return;
         }
       }
     },
@@ -7044,7 +7063,6 @@ function getLoading () {
     methods: {
       pulling: function pulling (offsetY) {
         if ( offsetY === void 0 ) offsetY = 0;
-
         this.height = offsetY;
       },
       pullingUp: function pullingUp (offsetY) {
@@ -7053,7 +7071,7 @@ function getLoading () {
       },
       pullingEnd: function pullingEnd () {
         this.$el && (this.$el.style.transition = "height .2s");
-        if (this.height >= this.viewHeight) {
+        if ( this.height >= Math.max(this.viewHeight, 200)) {
           this.pulling(this.viewHeight);
           if (this.$el) {
             dispatchNativeEvent(this.$el, 'loading');
@@ -7145,6 +7163,7 @@ function getRefresh (weex) {
     },
     watch: {
       height: function height (val) {
+        if(val >150) val = 150
         this.$el.style.height = val + "px";
       },
       display: function display (val) {
@@ -7733,123 +7752,117 @@ var slideMixin = {
           return;
         }
       }
-
+  
       if (!this._preIndex && this._preIndex !== 0) {
         this._preIndex = this.currentIndex || 0;
       }
-    
+  
       if (this._sliding) {
         return;
       }
       this._sliding = true;
-    
+  
       var inner = this.$refs.inner;
       var step = this._step = this.frameCount <= 1 ? 0 : this._preIndex - index;
-    
+  
       if (inner) {
         this._prepareNodes();
-        var innerX = parseFloat(inner.style.left) || 0;
-        var dist = innerX - this.innerOffset + step;
-    
-        // 处理无限轮播的边界情况 将目标元素先定位到目的地 动画结束后再回归原位
+        var currentX = this._getPosition(inner);
+        var dist = currentX - this.innerOffset + step;
+  
+        // 处理无限轮播的边界情况
         if (this.infinite && this.infinite !== 'false') {
           if (index < 0) {
             // 从第一张向左滑
             var lastIndex = this.frameCount - 1;
-
-            // 先将最后一张放到左侧
             var lastNode = this._cells[lastIndex].elm;
             lastNode.style.position = 'absolute';
-            lastNode.style.left = `-${this._wrapperWidth}px`;
+            this._setPosition(lastNode, -this._wrapperWidth);
             lastNode.style.opacity = '1';
             lastNode.style.zIndex = '10';
+            
             // 执行向左滑动动画
-          inner.style.transition = `left ${TRANSITION_TIME / 1000}s ease-in-out`;
+            inner.style.transition = this.isTransform ? `transform ${TRANSITION_TIME / 1000}s ease-in-out` : `left ${TRANSITION_TIME / 1000}s ease-in-out`;
             this.innerOffset += this._wrapperWidth;
-          inner.style.left = `${this.innerOffset}px`;
-
-            // 动画结束后第一张在充值回原先位置
-          setTimeout(() => {
-            inner.style.transition = 'none'; 
+            this._setPosition(inner, this.innerOffset);
+  
+            // 动画结束后重置回原先位置
+            setTimeout(() => {
+              inner.style.transition = 'none';
               lastNode.style.position = '';
-              lastNode.style.left = '';
+              this._setPosition(lastNode, 0);
               this.innerOffset = -lastIndex * this._wrapperWidth;
-            inner.style.left = `${this.innerOffset}px`;
-
+              this._setPosition(inner, this.innerOffset);
+  
               setTimeout(() => {
-                inner.style.transition = `left ${TRANSITION_TIME / 1000}s ease-in-out`;
+                inner.style.transition = this.isTransform ? `transform ${TRANSITION_TIME / 1000}s ease-in-out` : `left ${TRANSITION_TIME / 1000}s ease-in-out`;
               }, 50);
-          }, TRANSITION_TIME);
-
+            }, TRANSITION_TIME);
+  
             index = lastIndex;
           } else if (index >= this.frameCount) {
             // 从最后一张向右滑
-            // 克隆第一张图片并放置在适当位置
             var firstNode = this._cells[0].elm;
             var cloneNode = firstNode.cloneNode(true);
             cloneNode.style.position = 'absolute';
-            cloneNode.style.left = `${this.frameCount * this._wrapperWidth}px`;
+            this._setPosition(cloneNode, this.frameCount * this._wrapperWidth);
             cloneNode.style.width = `${this._wrapperWidth}px`;
             cloneNode.style.zIndex = '10';
             inner.appendChild(cloneNode);
-
+  
             // 执行向右滑动动画
-          inner.style.transition = `left ${TRANSITION_TIME / 1000}s ease-in-out`;
+            inner.style.transition = this.isTransform ? `transform ${TRANSITION_TIME / 1000}s ease-in-out` : `left ${TRANSITION_TIME / 1000}s ease-in-out`;
             this.innerOffset -= this._wrapperWidth;
-          inner.style.left = `${this.innerOffset}px`;
-
+            this._setPosition(inner, this.innerOffset);
+  
             // 动画结束后重置位置
-          setTimeout(() => {
-              // 移除过渡效果
-            inner.style.transition = 'none'; 
-
-              // 移除克隆节点
+            setTimeout(() => {
+              inner.style.transition = 'none';
+  
               if (cloneNode.parentNode) {
                 inner.removeChild(cloneNode);
               }
-
-              // 重置位置到第一张
+  
               this.innerOffset = 0;
-              inner.style.left = '0px';
-
-              // 短暂延迟后恢复过渡效果
+              this._setPosition(inner, 0);
+  
               setTimeout(() => {
-                inner.style.transition = `left ${TRANSITION_TIME / 1000}s ease-in-out`;
+                inner.style.transition = this.isTransform ? `transform ${TRANSITION_TIME / 1000}s ease-in-out` : `left ${TRANSITION_TIME / 1000}s ease-in-out`;
               }, 50);
-          }, TRANSITION_TIME);
-
+            }, TRANSITION_TIME);
+  
             index = 0;
-        } else {
-          // 正常切换
+          } else {
+            // 正常切换
             this.innerOffset = -index * this._wrapperWidth;
-            inner.style.transition = `left ${TRANSITION_TIME / 1000}s ease-in-out`;
-            inner.style.left = `${this.innerOffset}px`;
+            inner.style.transition = this.isTransform ? `transform ${TRANSITION_TIME / 1000}s ease-in-out` : `left ${TRANSITION_TIME / 1000}s ease-in-out`;
+            this._setPosition(inner, this.innerOffset);
           }
         } else {
           // 非无限轮播的正常切换
           this.innerOffset = -index * this._wrapperWidth;
-          inner.style.transition = `left ${TRANSITION_TIME / 1000}s ease-in-out`;
-          inner.style.left = `${this.innerOffset}px`;
+          inner.style.transition = this.isTransform ? `transform ${TRANSITION_TIME / 1000}s ease-in-out` : `left ${TRANSITION_TIME / 1000}s ease-in-out`;
+          this._setPosition(inner, this.innerOffset);
         }
-    
+  
         // 触发滚动事件
         if (!isTouchScroll) {
           this._emitScrollEvent('scrollstart');
         }
-
+  
         setTimeout(() => {
           this$1._throttleEmitScroll(dist, () => {
             this$1._emitScrollEvent('scrollend');
           });
         }, THROTTLE_SCROLL_TIME);
-    
+  
         this._loopShowNodes(step);
-    
+  
         setTimeout(() => {
           if (this$1.isNeighbor) {
             this$1._setNeighbors();
           }
-    
+  
           setTimeout(() => {
             inner.style.transition = '';
             for (var i = this$1._showStartIdx; i <= this$1._showEndIdx; i++) {
@@ -7863,13 +7876,13 @@ var slideMixin = {
           }, NEIGHBOR_SCALE_TIME);
         }, TRANSITION_TIME);
       }
-    
+  
       if (index !== this._preIndex) {
         weex.utils.dispatchNativeEvent(this.$el, 'change', {
           index: index
         });
       }
-
+  
       this.currentIndex = index;
       this._preIndex = index;
     },
@@ -8256,16 +8269,32 @@ var slideMixin = {
         timeStamp: event.timeStamp
       };
     },
-
+    _setPosition(element, offset) {
+      if (this.isTransform) {
+        element.style.transform = `translateX(${offset}px)`;
+      } else {
+        element.style.left = `${offset}px`;
+      }
+    },
+  
+    _getPosition(element) {
+      if (this.isTransform) {
+        const currentTransform = getComputedStyle(element).transform;
+        const matrix = new WebKitCSSMatrix(currentTransform);
+        return matrix.m41;
+      } else {
+        return parseFloat(element.style.left) || 0;
+      }
+    },
     _handleTouchMove: function _handleTouchMove (event) {
       var tp = this._touchParams;
       if (!tp) { return }
-
+  
       // 如果子view已经处在swipe事件中，并切不允许事件冒泡则不处理当前的事件
       if (weex.gestureAleadyHandleSwipeOnce && !weex.gestureHandleSwipeCanPropagation) {
         return;
       }
-
+  
       var ref = this._touchParams;
       var startX = ref.startX;
       var startY = ref.startY;
@@ -8301,14 +8330,14 @@ var slideMixin = {
               var lastIndex = this.frameCount - 1;
               var lastNode = this._cells[lastIndex].elm;
               lastNode.style.position = 'absolute';
-              lastNode.style.left = `-${this._wrapperWidth}px`;
+              this._setPosition(lastNode, -this._wrapperWidth);
               lastNode.style.opacity = '1';
             } else if (atLast && isLeftSwipe) {
               // 从最后一张向左滑到第一张
               var firstNode = this._cells[0].elm;
               var cloneNode = firstNode.cloneNode(true);
               cloneNode.style.position = 'absolute';
-              cloneNode.style.left = `${this.frameCount * this._wrapperWidth}px`;
+              this._setPosition(cloneNode, this.frameCount * this._wrapperWidth);
               cloneNode.style.width = `${this._wrapperWidth}px`;
               inner.appendChild(cloneNode);
               tp.cloneNode = cloneNode;
@@ -8324,19 +8353,19 @@ var slideMixin = {
         event.stopPropagation();
         return
       }
-
+  
       var inner = this.$refs.inner;
       // 如果已经有一个激活的slider，则不再处理其他slider
       if (touchSliderInstance && touchSliderInstance != inner) {
         event.stopPropagation();
         return;
       }
-
+  
       // horizontal scroll. trigger scroll event.
       event.stopPropagation()
-
+  
       touchSliderInstance = inner;
-
+  
       if (!this.autoPlay && !this.infinite) {
         // 如果不是自动播放，则当滚动到最后一页时，offsetX不能 < 0
         // 如果不是自动播放，则当滚动到第一页时，offsetX不能 > 0
@@ -8347,7 +8376,7 @@ var slideMixin = {
           offsetX = Math.min(offsetX, 0)
         }
       }
-
+  
       if (inner && offsetX) {
         if (!this._nodesOffsetCleared) {
           this._nodesOffsetCleared = true;
@@ -8356,7 +8385,7 @@ var slideMixin = {
         this._emitScrollEvent('weex$scroll', {
           offsetXRatio: offsetX / this._wrapperWidth
         });
-        inner.style.left = (this .innerOffset + offsetX) + 'px'
+        this._setPosition(inner, this.innerOffset + offsetX);
       }
     },
 
@@ -8470,6 +8499,10 @@ var slider$1 = {
     infinite: {
       type: [String, Boolean],
       default: true
+    },
+    isTransform:{
+      type: Boolean,
+      default: false
     }
   },
 
@@ -10437,6 +10470,13 @@ var dom = {
       var offset = (isWindow ? 0 : ct[("scroll" + dSuffix)]) + elRect[dir] - ctRect[dir];
       if (options) {
         offset += options.offset && options.offset * weex.config.env.scale || 0;
+         /**
+         * 计算出的 offset 不适配 小美 AI 聊天框消息滑到底部; 通过传入的标志, 把计算出的 offset 重置为 0
+         * 此为临时方案，后续需要优化
+        */
+        if(options.isReset){
+          offset = 0
+        }
       }
       else {}
       if (options && options.animated === false) {

package/package.json

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