emacroh5lib 1.0.52 → 1.0.53

package/package.json

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

package/src/views/ImageViewer/index.vue

@@ -229,8 +229,35 @@
             resetZoom(adaptive = true) {
                 const image = this.image;
 
-                if (image != null && image.computed && image.width != null && image.height != null) {
-                    let { width, height } = image;
+                // if (image != null && image.computed && image.width != null && image.height != null) {
+                //     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 (adaptive) {
                         let rate = 1
                         if (width > height) {
@@ -242,39 +269,11 @@
                         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`;
-                    }
-                } else {
-                    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.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`;
-                        }
-                    }
+                    this.listDataCache[this.index].width = `${width}px`;
+                    this.listDataCache[this.index].height = `${height}px`;
                 }
 
             },