@dolphinweex/weex-vue-render 0.2.28 → 0.2.31

package/dist/index.common.js

@@ -2737,7 +2737,7 @@ function init$1 (viewportWidth) {
     setRootFont(screenWidth, viewportWidth);
     setMetaViewport(viewportWidth);
 
-    window.addEventListener('resize', resetDeviceHeight);
+    // window.addEventListener('resize', resetDeviceHeight);
 
     /**
      * why not to use window.screen.width to get screenWidth ? Because in some
@@ -3833,7 +3833,7 @@ function px2px(pv) {
 }
 
 const ignoreSubKey = ['scale']
-function px2rem (px, rootValue) {
+function px2rem (px, rootValue = 75) {
   // fix: 适配鸿蒙wx单位
   if (px.indexOf("--harmory") > -1) return px;
 
@@ -6909,7 +6909,7 @@ function getLoading () {
       height: function height (val) {
         var offset = val + "px";
         this.$el.style.height = offset;
-        this.$el.style.bottom = offset;
+        this.$el.style.bottom = 0;
       },
       display: function display (val) {
         if (val === 'hide') {
@@ -7353,7 +7353,7 @@ var recycleList = {
   }
 };
 
-__$styleInject("/*\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *   http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied.  See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n\nbody > .weex-list,\nbody > .weex-recycle,\nbody > .weex-scroller,\nbody > .weex-waterfall {\n  max-height: 100%;\n}\n\n.weex-list-wrapper,\n.weex-recycle-wrapper,\n.weex-scroller-wrapper,\n.weex-waterfall-wrapper {\n  -webkit-overflow-scrolling: touch;\n}\n\n.weex-list-wrapper,\n.weex-waterfall-wrapper, \n.weex-recycle-wrapper {\n  overflow-y: scroll !important;\n  overflow-x: hidden !important;\n  align-items: flex-start !important;\n  justify-content: flex-start !important;\n max-width: 100vw; \n}\n\n.weex-list-inner,\n.weex-recycle-inner,\n.weex-scroller-inner,\n.weex-waterfall-inner {\n  -webkit-overflow-scrolling: touch;\n align-items: inherit; \n flex:1; \n}\n\n.weex-waterfall-inner-columns { \n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n max-width: 100vw; \n}\n\n.weex-scroller-wrapper.weex-scroller-vertical,\n.weex-recycle-wrapper.weex-recycle-vertical  {\n  overflow-x: hidden;\n  overflow-y: scroll;\n}\n\n.weex-scroller-wrapper.weex-scroller-horizontal,\n.weex-recycle-wrapper.weex-recycle-horizontal {\n  overflow-x: scroll;\n  overflow-y: hidden;\n}\n\n.weex-scroller-wrapper.weex-scroller-disabled {\n  overflow-x: hidden !important;\n  overflow-y: hidden !important;\n}\n\n.weex-slider-wrapper.weex-slider-disabled {\n  overflow-x: hidden !important;\n  overflow-y: hidden !important;\n}\n\n.weex-list-wrapper.weex-list-disabled {\n  overflow-x: hidden !important;\n  overflow-y: hidden !important;\n}\n\n.weex-recycle-wrapper.weex-recycle-disabled {\n  overflow-x: hidden !important;\n  overflow-y: hidden !important;\n}\n\n.weex-scroller-horizontal .weex-scroller-inner,\n.weex-recycle-horizontal .weex-recycle-inner {\n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n  height: 100%;\n}\n\n.weex-cell {\n  width: 100%;\n}\n\n.weex-refresh,\n.weex-loading {\n  -webkit-box-align: center;\n  -webkit-align-items: center;\n  align-items: center;\n  -webkit-box-pack: center;\n  -webkit-justify-content: center;\n  justify-content: center;\n  width: 100%;\n  overflow: hidden;\n}\n",undefined);
+__$styleInject("/*\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *   http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied.  See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n\nbody > .weex-list,\nbody > .weex-recycle,\nbody > .weex-scroller,\nbody > .weex-waterfall {\n  max-height: 100%;\n}\n\n.weex-list-wrapper,\n.weex-recycle-wrapper,\n.weex-scroller-wrapper,\n.weex-waterfall-wrapper {\n  -webkit-overflow-scrolling: touch;\n}\n\n.weex-list-wrapper,\n.weex-waterfall-wrapper, \n.weex-recycle-wrapper {\n  overflow-y: scroll !important;\n  overflow-x: hidden !important;\n  justify-content: flex-start !important;\n max-width: 100vw; \n}\n\n.weex-list-inner,\n.weex-recycle-inner,\n.weex-scroller-inner,\n.weex-waterfall-inner {\n  -webkit-overflow-scrolling: touch;\n align-items: inherit; \n flex:1; \n}\n\n.weex-waterfall-inner-columns { \n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n max-width: 100vw; \n}\n\n.weex-scroller-wrapper.weex-scroller-vertical,\n.weex-recycle-wrapper.weex-recycle-vertical  {\n  overflow-x: hidden;\n  overflow-y: scroll;\n}\n\n.weex-scroller-wrapper.weex-scroller-horizontal,\n.weex-recycle-wrapper.weex-recycle-horizontal {\n  overflow-x: scroll;\n  overflow-y: hidden;\n}\n\n.weex-scroller-wrapper.weex-scroller-disabled {\n  overflow-x: hidden !important;\n  overflow-y: hidden !important;\n}\n\n.weex-slider-wrapper.weex-slider-disabled {\n  overflow-x: hidden !important;\n  overflow-y: hidden !important;\n}\n\n.weex-list-wrapper.weex-list-disabled {\n  overflow-x: hidden !important;\n  overflow-y: hidden !important;\n}\n\n.weex-recycle-wrapper.weex-recycle-disabled {\n  overflow-x: hidden !important;\n  overflow-y: hidden !important;\n}\n\n.weex-scroller-horizontal .weex-scroller-inner,\n.weex-recycle-horizontal .weex-recycle-inner {\n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n  height: 100%;\n}\n\n.weex-cell {\n  width: 100%;\n}\n\n.weex-refresh,\n.weex-loading {\n  -webkit-box-align: center;\n  -webkit-align-items: center;\n  align-items: center;\n  -webkit-box-pack: center;\n  -webkit-justify-content: center;\n  justify-content: center;\n  width: 100%;\n  overflow: hidden;\n}\n",undefined);
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -7534,7 +7534,7 @@ var slideMixin = {
 
       if (indicatorVnode) {
         indicatorVnode.data.attrs = indicatorVnode.data.attrs || {};
-        indicatorVnode.data.attrs.count = cells.length - (this.infinite ? 2 : 0 ); // 显示实际数量
+        indicatorVnode.data.attrs.count = cells.length; // 显示实际数量
         indicatorVnode.data.attrs.active = this.currentIndex ;
         this._indicator = indicatorVnode;
       }
@@ -7596,7 +7596,6 @@ var slideMixin = {
 
     _slideTo: function _slideTo(index, isTouchScroll) {
       var this$1 = this;
-    
       if (this.frameCount <= 0) {
         return;
       }
@@ -8120,7 +8119,7 @@ var slideMixin = {
     },
 
     _handleTouchStart: function _handleTouchStart (event) {
-      if (!this.scrollable) {
+      if (!this.scrollable || this.frameCount<=1) {
         return // 🚫 禁止滚动行为
       }
       var touch = event.changedTouches[0];
@@ -8183,7 +8182,6 @@ var slideMixin = {
               lastNode.style.position = 'absolute';
               lastNode.style.left = `-${this._wrapperWidth}px`;
               lastNode.style.opacity = '1';
-              lastNode.style.zIndex = '10';
             } else if (atLast && isLeftSwipe) {
               // 从最后一张向左滑到第一张
               var firstNode = this._cells[0].elm;
@@ -8191,7 +8189,6 @@ var slideMixin = {
               cloneNode.style.position = 'absolute';
               cloneNode.style.left = `${this.frameCount * this._wrapperWidth}px`;
               cloneNode.style.width = `${this._wrapperWidth}px`;
-              cloneNode.style.zIndex = '10';
               inner.appendChild(cloneNode);
               tp.cloneNode = cloneNode;
             }
@@ -8358,6 +8355,7 @@ var slider$1 = {
   watch: {
     index: function index () {
       this.currentIndex = this._normalizeIndex(this.index);
+      console.log('cdj----index',this.infinite,this.currentIndex)
     }
   },
 
@@ -10321,7 +10319,7 @@ var dom = {
       }
       else {}
       if (options && options.animated === false) {
-        return scrollElement.call(ct, dSuffix, offset)
+        return scrollElement.call(ct, dSuffix, 0)
       }
       step$1({
         scrollable: ct,

package/package.json

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