emacroh5lib 1.0.44 → 1.0.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emacroh5lib",
-  "version": "1.0.44",
+  "version": "1.0.47",
   "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);
                 })
 
@@ -224,22 +227,16 @@
 
             // Reset zoom action
             resetZoom(adaptive = true) {
-                let image = this.image;
-                const imageObject = new Image();
-
-                imageObject.src = this.list[this.index];
-
-                let { width, height } = imageObject;
+                const image = this.image;
 
+                let { width, height } = image;
                 if (adaptive) {
                     let rate = 1
                     if (width > height) {
                         rate = width / document.body.clientWidth
-                    }
-                    else {
+                    } else {
                         rate = height / document.body.clientHeight
                     }
-
                     width = width / rate
                     height = height / rate
                 }
@@ -249,6 +246,36 @@
 
                 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.listDataCache[this.index].width = `${width}px`;
+                //     $this.listDataCache[this.index].height = `${height}px`;
+                // }
+
             },
 
             // Reset all action
@@ -286,7 +313,6 @@
             // Set style by name
             setStyleByName(obj, key, value) {
                 obj && (obj.style[key] = value);
-
             },
 
             // Get element current transform
@@ -330,14 +356,12 @@
 
                 setTimeout(() => {
 
-                    try {
+                    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);
-                    } catch (error) {
-                        console.log("switchAction", error, this.image, this.currentData);
                     }
 
                     this.resetZoom();