emacroh5lib 1.0.51 → 1.0.54

package/package.json

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

package/src/views/ImageViewer/index.vue

@@ -229,35 +229,8 @@
             resetZoom(adaptive = true) {
                 const image = this.image;
 
-                let { width, height } = image;
-                if (adaptive) {
-                    let rate = 1
-                    if (width > height) {
-                        rate = width / document.body.clientWidth
-                    } else {
-                        rate = height / document.body.clientHeight
-                    }
-                    width = width / rate
-                    height = height / rate
-                }
-
-                this.setStyleByName(image, "width", `${width}px`);
-                this.setStyleByName(image, "height", `${height}px`);
-
-                if (this.listDataCache[this.index] != null) {
-                    this.listDataCache[this.index].width = `${width}px`;
-                    this.listDataCache[this.index].height = `${height}px`;
-                }
-
-
-
-                // --------------------------------------------------------------------------------------------------
-                // const imageObject = new Image();
-                // imageObject.src = this.list[this.index];
-                // const $this = this
-                // imageObject.onload = () => {
-
-                //     let { width, height } = imageObject;
+                // if (image != null && image.computed && image.width != null && image.height != null) {
+                //     let { width, height } = image;
                 //     if (adaptive) {
                 //         let rate = 1
                 //         if (width > height) {
@@ -269,13 +242,39 @@
                 //         height = height / rate
                 //     }
 
-                //     $this.setStyleByName(image, "width", `${width}px`);
-                //     $this.setStyleByName(image, "height", `${height}px`);
+                //     this.setStyleByName(image, "width", `${width}px`);
+                //     this.setStyleByName(image, "height", `${height}px`);
+
+                //     if (this.listDataCache[this.index] != null) {
+                //         this.listDataCache[this.index].width = `${width}px`;
+                //         this.listDataCache[this.index].height = `${height}px`;
+                //     }
+                // }  
+
+
+                const imageObject = new Image();
+                imageObject.src = this.list[this.index];
+                const $this = this
+                imageObject.onload = () => {
+
+                    let { width, height } = imageObject;
+                    if (adaptive) {
+                        let rate = 1
+                        if (width > height) {
+                            rate = width / document.body.clientWidth
+                        } else {
+                            rate = height / document.body.clientHeight
+                        }
+                        width = width / rate
+                        height = height / rate
+                    }
 
-                //     $this.listDataCache[this.index].width = `${width}px`;
-                //     $this.listDataCache[this.index].height = `${height}px`;
-                // }
+                    $this.setStyleByName(image, "width", `${width}px`);
+                    $this.setStyleByName(image, "height", `${height}px`);
 
+                    this.listDataCache[this.index].width = `${width}px`;
+                    this.listDataCache[this.index].height = `${height}px`;
+                }
 
             },
 
@@ -357,29 +356,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();