emacroh5lib 1.0.53 → 1.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emacroh5lib",
-  "version": "1.0.53",
+  "version": "1.0.56",
   "description": "EMacro前端组件库",
   "main": "dist/emacroh5lib.min.js",
   "scripts": {

package/src/views/ImageViewer/index.vue

@@ -54,7 +54,9 @@
                 viewerSrc: "",
                 image: null,
                 listDataCache: [],
-                index: 0
+                index: 0,
+                _shrink: 0.4,
+                _enlarge: 0.6,
             };
         },
         props: {
@@ -124,6 +126,8 @@
             },
         },
         mounted() {
+            this._shrink = 1 - this.shrink
+            this._enlarge = 1 + this.enlarge
         },
         methods: {
             // Global init
@@ -356,29 +360,17 @@
 
                 setTimeout(() => {
 
-                    let data = {
-                        transform: {
-                            scaleX: "1",
-                            skewY: "0",
-                            translateX: "-50%",
-                            translateY: "-50%",
-                            rotate: "0deg",
-                        },
-                        left: "50%",
-                        top: "50%",
-                        width: `${imageObject.width}px`,
-                        height: `${imageObject.height}px`,
-                    };
-                    if (this.currentData != null && this.currentData.width != null && this.currentData.height != null &&
-                        this.currentData.left != null && this.currentData.top != null && this.currentData.transform != null) {
-                        data = this.currentData
-                    }
+                    try {
+                        const data = this.currentData
 
-                    this.setStyleByName(this.image, "width", data.width);
-                    this.setStyleByName(this.image, "height", data.height);
-                    this.setStyleByName(this.image, "left", data.left);
-                    this.setStyleByName(this.image, "top", data.top);
-                    this.setTransform(this.image, data.transform);
+                        this.setStyleByName(this.image, "width", data.width);
+                        this.setStyleByName(this.image, "height", data.height);
+                        this.setStyleByName(this.image, "left", data.left);
+                        this.setStyleByName(this.image, "top", data.top);
+                        this.setTransform(this.image, data.transform);
+                    } catch (error) {
+                        console.log("switchAction", error, this.currentData);
+                    }
 
                     this.resetZoom();
                     this.resetPosition();
@@ -426,21 +418,29 @@
             // Zoom action
             zoom(type) {
                 let image = this.image;
+
                 let w = +this.getStyleByName(image, "width").split("px")[0];
                 let h = +this.getStyleByName(image, "height").split("px")[0];
 
                 if (h <= 20 && type === "out") return;
 
                 if (type === "out") {
-                    this.setStyleByName(image, "width", `${w * (1 - this.shrink)}px`);
-                    this.setStyleByName(image, "height", `${h * (1 - this.shrink)}px`);
+                    this.setStyleByName(image, "width", `${w * this._shrink}px`);
+                    this.setStyleByName(image, "height", `${h * this._shrink}px`);
                 } else {
-                    this.setStyleByName(image, "width", `${w * (1 + this.enlarge)}px`);
-                    this.setStyleByName(image, "height", `${h * (1 + this.enlarge)}px`);
+                    this.setStyleByName(image, "width", `${w * this._enlarge}px`);
+                    this.setStyleByName(image, "height", `${h * this._enlarge}px`);
+                }
+
+                // console.log("报错6", this.currentData);
+                // console.log("报错7", image);
+                // console.log("报错8", this.image);
+
+                if (this.currentData) {
+                    this.currentData.width = this.getStyleByName(this.image, "width");
+                    this.currentData.height = this.getStyleByName(this.image, "height");
                 }
 
-                this.currentData.width = this.getStyleByName(this.image, "width");
-                this.currentData.height = this.getStyleByName(this.image, "height");
             },
 
             // FullScreen action