@dolphinweex/weex-vue-render 0.2.37 → 0.2.38

package/dist/index.common.js

@@ -5803,6 +5803,11 @@ function getThrottledScroll (context) {
 
 var scrollable$1 = {
   props: {
+    scrollable: {
+      type: [Boolean],
+      default: true
+    },
+
     loadmoreoffset: {
       type: [String, Number],
       default: DEFAULT_LOADMORE_OFFSET,
@@ -5836,6 +5841,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,6 +6092,9 @@ var scrollable$1 = {
       if (!this._touchParams) {
         return
       }
+      if (!this.scrollable) {
+        return
+      }
 
       var tp = this._touchParams;
       if (!tp) { return } 
@@ -6181,12 +6238,6 @@ function getList (weex) {
 
   return {
     name: 'weex-list',
-    props: {
-      scrollable: {
-        type: [Boolean],
-        default: true
-      }
-    },
     mixins: [scrollable$1],
     computed: {
       wrapperClass: function wrapperClass () {
@@ -6341,11 +6392,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 +6796,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]));

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.38"
 }