@dolphinweex/weex-vue-render 0.2.50 → 0.2.52

package/dist/index.common.js

@@ -5616,71 +5616,105 @@ function getImage(weex) {
       src: String,
       saveImg: {
         type: [String],
-        default: ''
+        default: "",
+      },
+    },
+    watch: {
+      src: function (newVal, oldVal) {
+         if (newVal !== oldVal) {
+           this.loadImage();
+         }
       },
     },
     created: function created() {
-      this.currentSrc = this.src;
+      // this.currentSrc = this.src;
     },
+
     mounted: function () {
-      this.locationSrc = this.removeHtmlAndAfter(window.location.href)
+      // this.locationSrc = this.removeHtmlAndAfter(window.location.href);
     },
     methods: {
-      save: function (callback) {
+      loadImage: function loadImage() {
+        const img = new Image();
+        img.src = this.src;
+        img.onload = (event) => {
+          // 触发load事件并传递参数
+          this.$emit("load", {
+            success: true,
+            size: {
+              naturalWidth: img.width,
+              naturalHeight: img.height,
+            },
+          });
+        };
+        img.onerror = (event) => {
+          // 触发error事件并传递参数
+          this.$emit("error", {
+            success: false,
+          });
+        };
+      },
+      save: function save(callback) {
         const params = {
-          operation: 'saveImageToPhotosAlbum',
+          operation: "saveImageToPhotosAlbum",
           params: {
-            src: this.saveImg
-          }
-        }
-        weex.requireModule('bridgeModule').commandInterface(JSON.stringify(params),
+            src: this.saveImg,
+          },
+        };
+        weex.requireModule("bridgeModule").commandInterface(
+          JSON.stringify(params),
           (resData) => {
-            if (typeof callback === 'function') {
+            if (typeof callback === "function") {
               callback({ success: true });
             }
           },
           (error) => {
-            if (typeof callback === 'function') {
+            if (typeof callback === "function") {
               callback({ success: false });
             }
           }
-        )
+        );
       },
       handleClick: function handleClick(event) {
-        this.$emit('weex$tap', event); 
+        this.$emit("weex$tap", event);
       },
       _handleTouchStart: function _handleTouchStart(event) {
-          if (this.saveImg) {
-            this.save()
-          }
-       },
-       removeHtmlAndAfter(url) {
+        if (this.saveImg) {
+          this.save();
+        }
+      },
+      removeHtmlAndAfter(url) {
         const baseUrl = url.split(/[?#]/)[0];
         // 找到最后一个/和.html的位置
-        const lastSlashIndex = baseUrl.lastIndexOf('/');
-        const htmlIndex = baseUrl.indexOf('.html', lastSlashIndex);
-  
+        const lastSlashIndex = baseUrl.lastIndexOf("/");
+        const htmlIndex = baseUrl.indexOf(".html", lastSlashIndex);
+
         return htmlIndex !== -1
           ? baseUrl.substring(0, lastSlashIndex)
           : baseUrl;
       },
       processAndConcatenate(baseUrl, appendStr) {
-        if (appendStr.startsWith('http') || appendStr.startsWith('meiju://') || appendStr.startsWith('file')|| appendStr.startsWith('data:image')) {
-          return appendStr
-        }
-        const path = baseUrl + '/'
+        if (
+          appendStr.startsWith("http") ||
+          appendStr.startsWith("meiju://") ||
+          appendStr.startsWith("file") ||
+          appendStr.startsWith("data:image")
+        ) {
+          return appendStr;
+        }
+        const path = baseUrl + "/";
         if (!baseUrl && !appendStr) {
-          return appendStr
+          return appendStr;
         }
         let processedAppendStr = appendStr;
-  
-        if (/^[a-zA-Z]/i.test(appendStr) && appendStr.includes('/')) {
+
+        if (/^[a-zA-Z]/i.test(appendStr) && appendStr.includes("/")) {
           return path + appendStr; // 直接返回绝对路径
         }
         if (processedAppendStr.startsWith("/")) {
-          return path + appendStr
+          return path + appendStr;
         }
-  
+
         // 去除 @、./、../
         if (processedAppendStr.startsWith("@")) {
           processedAppendStr = processedAppendStr.slice(1);
@@ -5695,34 +5729,40 @@ function getImage(weex) {
             processedAppendStr = processedAppendStr.slice(3);
           }
         }
-  
-  
+
         // 查找非路径分隔符和特殊前缀的字符串起始位置
         let startIndex = 0;
-        while (startIndex < processedAppendStr.length &&
-          (processedAppendStr[startIndex] === '.' || processedAppendStr[startIndex] === '/')) {
+        while (
+          startIndex < processedAppendStr.length &&
+          (processedAppendStr[startIndex] === "." ||
+            processedAppendStr[startIndex] === "/")
+        ) {
           startIndex++;
         }
         processedAppendStr = processedAppendStr.slice(startIndex);
-  
+
         return path + processedAppendStr;
       },
     },
 
-    render: function render (createElement) {
-      return createElement('html:img', {
+    render: function render(createElement) {
+      return createElement("figure", {
         attrs: {
-          'weex-type': 'img',
-          src: this.processAndConcatenate(this.locationSrc, this.src),
+          "weex-type": "img",
+          src: this.src,
         },
         on: {
-          'weex$tap': this.handleClick,
+          weex$tap: this.handleClick,
         },
-        staticClass: 'weex-image weex-el',
-        staticStyle: weex.extractComponentStyle(this)
-      })
-    }
-  }
+        staticClass: "weex-image weex-el",
+        staticStyle: {
+          backgroundImage: `url(${this.src})`,
+          backgroundSize: this.resize || "stretch",
+          backgroundRepeat: "no-repeat",
+        },
+      });
+    },
+  };
 }
 
 
@@ -8708,6 +8748,7 @@ var slideMixin = {
     },
 
     _handleTouchEnd: function _handleTouchEnd (event) {
+      this._startAutoPlay();
       // weex.weexSliderTouchBoundary = false
       // weex.weexSliderTouchStart = false
       var inner = this.$refs.inner;
@@ -8718,7 +8759,6 @@ var slideMixin = {
         return;
       }
 
-      this._startAutoPlay();
       var tp = this._touchParams;
       if (!tp) { return }
       var isV = tp.isVertical;
@@ -9089,7 +9129,7 @@ var indicator$1 = {
   }
 };
 
-__$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 \n.weex-slider-wrapper {\n  overflow: hidden;\n}\n\n.weex-slider-inner {\n  width: 100%;\n  height: 100%;\n  overflow: visible;\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n  -webkit-flex-direction: row;\n          flex-direction: row;\n}\n\n.weex-slider-cell {\n  width: 100%;\n  height: 100%;\n  float:left;\n  top: 0px;\n  left: 0px;\n  background: transparent !important;\n  overflow: hidden;\n  -webkit-box-align: center;\n  -webkit-align-items: flex-start;\n          align-items: flex-start;\n  -webkit-box-pack: center;\n}\n\n.neighbor-cell {\n  overflow: visible !important;\n}\n\nnav.weex-indicator {\n  position: absolute;\n  ;\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n  -webkit-flex-direction: row;\n          flex-direction: row;\n  margin: 0;\n  padding: 0;\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  -webkit-transform: translate(-10rem, 0px);\n          transform: translate(-10rem, 0px)\n}\n\ndiv.weex-indicator-inner {\n  -webkit-transform: translate(10rem, 0px);\n          transform: translate(10rem, 0px);\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n  -webkit-flex-direction: row;\n          flex-direction: row;\n display: flex; \n}\n\n.weex-indicator-item {\n  display: inline-block;\n  position: relative;\n  border-radius: 50%;\n  width: 0.266667rem;\n  height: 0.266667rem;\n  background-color: #BBBBBB;\n}\n.weex-indicator-item + .weex-indicator-item {\n  margin-left: 0.133333rem;\n}\n\n.weex-indicator-item-active {\n  background-color: blue;\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 \n.weex-slider-wrapper {\n  overflow: hidden;\n}\n\n.weex-slider-inner {\n  width: 100%;\n  height: 100%;\n  overflow: visible;\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n  -webkit-flex-direction: row;\n          flex-direction: row;\n}\n\n.weex-slider-cell {\n  width: 100%;\n  height: 100%;\n  float:left;\n  top: 0px;\n  left: 0px;\n  background: transparent !important;\n  overflow: hidden;\n  -webkit-box-align: center;\n  -webkit-align-items: flex-start;\n          align-items: flex-start;\n  -webkit-box-pack: center;\n}\n\n.neighbor-cell {\n  overflow: visible !important;\n}\n\nnav.weex-indicator {\n z-index:10; \n  position: absolute;\n  ;\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n  -webkit-flex-direction: row;\n          flex-direction: row;\n  margin: 0;\n  padding: 0;\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  -webkit-transform: translate(-10rem, 0px);\n          transform: translate(-10rem, 0px)\n}\n\ndiv.weex-indicator-inner {\n height: inherit; \n overflow: hidden;\n     align-items: center; \n  -webkit-transform: translate(10rem, 0px);\n          transform: translate(10rem, 0px);\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n  -webkit-flex-direction: row;\n          flex-direction: row;\n display: flex; \n}\n\n.weex-indicator-item {\n  display: inline-block;\n  position: relative;\n  border-radius: 50%;\n  width: 0.266667rem;\n  height: 0.266667rem;\n  background-color: #BBBBBB;\n}\n.weex-indicator-item + .weex-indicator-item {\n  margin-left: 0.133333rem;\n}\n\n.weex-indicator-item-active {\n  background-color: blue;\n}",undefined);
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -10638,9 +10678,13 @@ function transitionOnce (vnode, config, callback) {
       if (config.styles["transform"]) {
         config.styles["transform"] = config.styles["transform"].replace(/(translate\([^,]+,[^,]+),[^)]+\)/, '$1)')
       }
+      var toCss = toCSSText(styleObject2rem(config.styles, DESIGN_ROOT_VALUE) || {})
+
+      //  给dom上标记是动画修改的style
+      if(!dom.animation_style) { dom.animation_style = "" }
+      dom.animation_style += toCss
 
-      dom.style.cssText
-        += toCSSText(styleObject2rem(config.styles, DESIGN_ROOT_VALUE) || {});
+      dom.style.cssText += toCss;
     });
 }
 

package/package.json

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