@dolphinweex/weex-vue-render 0.2.37 → 0.2.39

package/dist/index.common.js

@@ -3367,7 +3367,14 @@ 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对话聊天窗口重叠问题
+         * 此处延时执行是临时规避措施，后续需要优化
+        */
+        setTimeout(() => {
+          detectAppear(el, visibleData, dir);
+        }, i);
       }
     };
     container.addEventListener('scroll', throttle(scrollHandler, 100, true));
@@ -5803,6 +5810,11 @@ function getThrottledScroll (context) {
 
 var scrollable$1 = {
   props: {
+    scrollable: {
+      type: [Boolean],
+      default: true
+    },
+
     loadmoreoffset: {
       type: [String, Number],
       default: DEFAULT_LOADMORE_OFFSET,
@@ -5836,6 +5848,55 @@ var scrollable$1 = {
   },
 
   methods: {
+    /**
+   * 给虚拟节点数组添加作用域ID
+   * @param {Array} vnodes - 虚拟节点数组
+   * @param {Object} context - Vue组件实例上下文
+   * @returns {Array} 添加了作用域ID的虚拟节点数组
+   */
+    applyScopeIdsToVNodes: function applyScopeIdsToVNodes (vnodes, context) {
+      const scopeIds = this.getScopeIds(context);
+      const attrs = {};
+      for (let i = 0, l = scopeIds.length; i < l; i++) {
+        attrs[scopeIds[i]] = '';
+      }
+      // 给每个子级节点添加作用域ID
+      return vnodes.map(function (vnode) {
+        if (vnode && vnode.data) {
+          // 如果vnode已有attrs，则合并作用域ID
+          if (!vnode.data.attrs) {
+            vnode.data.attrs = {};
+          }
+          Object.assign(vnode.data.attrs, attrs);
+        } else if (vnode) {
+          // 如果vnode没有data，则创建data和attrs
+          vnode.data = vnode.data || {};
+          vnode.data.attrs = Object.assign({}, attrs);
+        }
+        return vnode;
+      });
+    },
+    getScopeIds: function getScopeIds (context) {
+      // 获取父级作用域ID
+      var scopeIds = context._scopeIds;
+      if (scopeIds) {
+        return scopeIds
+      }
+      else {
+        scopeIds = [];
+      }
+      var parent = context.$parent;
+      //一般绝不可能没父级 
+      while (parent) {
+        var i = (void 0);
+        if ((i = parent.$options) && (i = i._scopeId)) {
+          scopeIds.push(i);
+        }
+        parent = parent.$parent;
+      }
+      context._scopeIds = scopeIds;
+      return scopeIds
+    },
     updateLayout: function updateLayout () {
       var wrapper = this.$refs.wrapper;
       if (wrapper) {
@@ -6038,7 +6099,9 @@ var scrollable$1 = {
       if (!this._touchParams) {
         return
       }
-
+      if (!this.scrollable) {
+        return
+      }
       var tp = this._touchParams;
       if (!tp) { return } 
 
@@ -6058,19 +6121,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
@@ -6091,6 +6142,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;
         }
       }
     },
@@ -6181,12 +6249,6 @@ function getList (weex) {
 
   return {
     name: 'weex-list',
-    props: {
-      scrollable: {
-        type: [Boolean],
-        default: true
-      }
-    },
     mixins: [scrollable$1],
     computed: {
       wrapperClass: function wrapperClass () {
@@ -6341,11 +6403,13 @@ function getScroller (weex) {
           if (!vnode.tag && !trimmedText) { return false }
           return true
         });
+        const cellsWithScopeIds = this.applyScopeIdsToVNodes(this._cells, this);
+
         return [
           h('article', {
             ref: 'inner',
             staticClass: 'weex-scroller-inner weex-ct'
-          }, this._cells)
+          }, cellsWithScopeIds)
         ]
       }
     },
@@ -6743,7 +6807,7 @@ function getWaterfall (weex) {
             },
             staticClass: 'weex-ct',
             staticStyle: {
-              width: this$1._columnWidth + 'px',
+              // width: this$1._columnWidth + 'px',
               marginLeft: i$1 === 0 ? 0 : this$1._columnGap + 'px'
             }
           }, columnCells[i$1]));
@@ -6991,7 +7055,6 @@ function getLoading () {
     methods: {
       pulling: function pulling (offsetY) {
         if ( offsetY === void 0 ) offsetY = 0;
-
         this.height = offsetY;
       },
       pullingUp: function pullingUp (offsetY) {
@@ -7000,7 +7063,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, 150)) {
           this.pulling(this.viewHeight);
           if (this.$el) {
             dispatchNativeEvent(this.$el, 'loading');
@@ -7092,6 +7155,7 @@ function getRefresh (weex) {
     },
     watch: {
       height: function height (val) {
+        if(val >150) val = 150
         this.$el.style.height = val + "px";
       },
       display: function display (val) {
@@ -10384,6 +10448,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.37"
+  "version": "0.2.39"
 }