emacroh5lib 1.0.44 → 1.0.45

package/package.json

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

package/src/views/ImageViewer/index.vue

@@ -54,7 +54,7 @@
                 viewerSrc: "",
                 image: null,
                 listDataCache: [],
-                index: 0,
+                index: 0
             };
         },
         props: {
@@ -123,6 +123,8 @@
                 }
             },
         },
+        mounted() {
+        },
         methods: {
             // Global init
             init() {
@@ -133,7 +135,8 @@
             // Init listDataCache
             initListDataCache(index = 0) {
                 const promises = [];
-                let $this = this;
+
+                const $this = null
 
                 this.list.forEach((item, i) => {
                     const imageObject = new Image();
@@ -176,24 +179,24 @@
                     // $this.setStyleByName($this.image, "width", width);
                     // $this.setStyleByName($this.image, "height", height);
 
-                    $this.image = $this.$refs["duoViewerImage"];
-                    $this.initDrag();
-                    $this.$emit("loadComplete");
-                    const { width, height } = $this.listDataCache[index];
-                    $this.setStyleByName($this.image, "width", width);
-                    $this.setStyleByName($this.image, "height", height);
+                    this.image = this.$refs["duoViewerImage"];
+                    this.initDrag();
+                    this.$emit("loadComplete");
+                    const { width, height } = this.listDataCache[index];
+                    this.setStyleByName(this.image, "width", width);
+                    this.setStyleByName(this.image, "height", height);
                 })
 
                 Promise.race(promises).then((data) => {
-                    $this.image = $this.$refs["duoViewerImage"];
-                    $this.initDrag();
+                    this.image = this.$refs["duoViewerImage"];
+                    this.initDrag();
                     this.$emit("loadComplete");
-                    const { width, height } = $this.listDataCache[index];
-                    $this.setStyleByName($this.image, "width", width);
-                    $this.setStyleByName($this.image, "height", height);
+                    const { width, height } = this.listDataCache[index];
+                    this.setStyleByName(this.image, "width", width);
+                    this.setStyleByName(this.image, "height", height);
 
                     setTimeout(() => {
-                        $this.resetZoom();
+                        this.resetZoom();
                     }, 100);
                 })
 
@@ -225,30 +228,35 @@
             // Reset zoom action
             resetZoom(adaptive = true) {
                 let image = this.image;
+
+                console.log("图片宽高1", image);
+                console.log("图片宽高2", image.width);
+
                 const imageObject = new Image();
 
                 imageObject.src = this.list[this.index];
 
-                let { width, height } = imageObject;
+                const $this = this
+                imageObject.onload = () => {
 
-                if (adaptive) {
-                    let rate = 1
-                    if (width > height) {
-                        rate = width / document.body.clientWidth
-                    }
-                    else {
-                        rate = height / document.body.clientHeight
+                    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
                     }
 
-                    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`);
 
-                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`;
+                }
             },
 
             // Reset all action
@@ -286,7 +294,6 @@
             // Set style by name
             setStyleByName(obj, key, value) {
                 obj && (obj.style[key] = value);
-
             },
 
             // Get element current transform