emacroh5lib 1.0.49 → 1.0.52

package/package.json

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

package/src/views/ImageViewer/index.vue

@@ -136,7 +136,7 @@
             initListDataCache(index = 0) {
                 const promises = [];
 
-                const $this = null
+                const $this = this
 
                 this.list.forEach((item, i) => {
                     const imageObject = new Image();
@@ -229,53 +229,53 @@
             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
+                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
                     }
-                    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) {
-                //             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`;
+                    }
+                } 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.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`);
 
+                        if (this.listDataCache[this.index] != null) {
+                            this.listDataCache[this.index].width = `${width}px`;
+                            this.listDataCache[this.index].height = `${height}px`;
+                        }
+                    }
+                }
 
             },
 
@@ -370,8 +370,8 @@
                         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) {
+                    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
                     }