emacroh5lib 1.0.55 → 1.0.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emacroh5lib",
-  "version": "1.0.55",
+  "version": "1.0.58",
   "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
@@ -185,6 +189,11 @@
                     const { width, height } = this.listDataCache[index];
                     this.setStyleByName(this.image, "width", width);
                     this.setStyleByName(this.image, "height", height);
+
+                    setTimeout(() => {
+                        this.resetZoom();
+                        this.resetPosition();
+                    }, 100);
                 })
 
                 Promise.race(promises).then((data) => {
@@ -195,9 +204,10 @@
                     this.setStyleByName(this.image, "width", width);
                     this.setStyleByName(this.image, "height", height);
 
-                    setTimeout(() => {
-                        this.resetZoom();
-                    }, 100);
+                    // setTimeout(() => {
+                    //     this.resetZoom();
+                    //     this.resetPosition();
+                    // }, 100);
                 })
 
             },
@@ -272,8 +282,10 @@
                     $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`;
+                    if (this.listDataCache[this.index]) {
+                        this.listDataCache[this.index].width = `${width}px`;
+                        this.listDataCache[this.index].height = `${height}px`;
+                    }
                 }
 
             },
@@ -415,30 +427,22 @@
             zoom(type) {
                 let image = this.image;
 
-                console.log("报错1", 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") {
-                    console.log("报错2", `${w * (1 - this.shrink)}px`);
-                    this.setStyleByName(image, "width", `${w * (1 - this.shrink)}px`);
-                    this.setStyleByName(image, "height", `${h * (1 - this.shrink)}px`);
-                    console.log("报错3");
+                    this.setStyleByName(image, "width", `${w * this._shrink}px`);
+                    this.setStyleByName(image, "height", `${h * this._shrink}px`);
                 } else {
-                    console.log("报错4", `${w * (1 + this.enlarge)}px`);
-                    this.setStyleByName(image, "width", `${w * (1 + this.enlarge)}px`);
-                    this.setStyleByName(image, "height", `${h * (1 + this.enlarge)}px`);
-                    console.log("报错5");
+                    this.setStyleByName(image, "width", `${w * this._enlarge}px`);
+                    this.setStyleByName(image, "height", `${h * this._enlarge}px`);
+                }
+                if (this.currentData) {
+                    this.currentData.width = this.getStyleByName(this.image, "width");
+                    this.currentData.height = this.getStyleByName(this.image, "height");
                 }
-
-                console.log("报错6", this.currentData);
-                console.log("报错7", image);
-                console.log("报错8", this.image);
-
-                this.currentData.width = this.getStyleByName(this.image, "width");
-                this.currentData.height = this.getStyleByName(this.image, "height");
             },
 
             // FullScreen action