emacroh5lib 1.0.46 → 1.0.49

package/package.json

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

package/src/views/ImageViewer/index.vue

@@ -227,36 +227,56 @@
 
             // Reset zoom action
             resetZoom(adaptive = true) {
-                let image = this.image;
+                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
+                }
 
-                console.log("图片宽高1", image);
-                console.log("图片宽高2", image.width);
+                this.setStyleByName(image, "width", `${width}px`);
+                this.setStyleByName(image, "height", `${height}px`);
 
-                const imageObject = new Image();
+                if (this.listDataCache[this.index] != null) {
+                    this.listDataCache[this.index].width = `${width}px`;
+                    this.listDataCache[this.index].height = `${height}px`;
+                }
 
-                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
-                    }
+                // --------------------------------------------------------------------------------------------------
+                // 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.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`;
-                }
             },
 
             // Reset all action
@@ -298,8 +318,8 @@
 
             // Get element current transform
             getCurrentTransform(obj) {
-                let value,
-                    transform = this.getStyleByName(obj, "transform");
+                let value;
+                const transform = this.getStyleByName(obj, "transform");
 
                 if (transform === "none") return;
 
@@ -337,14 +357,30 @@
 
                 setTimeout(() => {
 
-                    if (this.currentData) {
-                        this.setStyleByName(this.image, "width", this.currentData.width);
-                        this.setStyleByName(this.image, "height", this.currentData.height);
-                        this.setStyleByName(this.image, "left", this.currentData.left);
-                        this.setStyleByName(this.image, "top", this.currentData.top);
-                        this.setTransform(this.image, this.currentData.transform);
+                    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
                     }
 
+                    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.resetZoom();
                     this.resetPosition();
                 }, 100);