emacroh5lib 1.0.51 → 1.0.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/emacroh5lib.min.js +1 -1
  2. package/package.json +1 -1
  3. package/src/views/ImageViewer/index.vue +42 -42
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "emacroh5lib",
3
- "version": "1.0.51",
3
+ "version": "1.0.52",
4
4
  "description": "EMacro前端组件库",
5
5
  "main": "dist/emacroh5lib.min.js",
6
6
  "scripts": {
package/src/views/ImageViewer/index.vue CHANGED
@@ -229,53 +229,53 @@
229
229
  resetZoom(adaptive = true) {
230
230
  const image = this.image;
231
231
 
232
- let { width, height } = image;
233
- if (adaptive) {
234
- let rate = 1
235
- if (width > height) {
236
- rate = width / document.body.clientWidth
237
- } else {
238
- rate = height / document.body.clientHeight
232
+ if (image != null && image.computed && image.width != null && image.height != null) {
233
+ let { width, height } = image;
234
+ if (adaptive) {
235
+ let rate = 1
236
+ if (width > height) {
237
+ rate = width / document.body.clientWidth
238
+ } else {
239
+ rate = height / document.body.clientHeight
240
+ }
241
+ width = width / rate
242
+ height = height / rate
239
243
  }
240
- width = width / rate
241
- height = height / rate
242
- }
243
-
244
- this.setStyleByName(image, "width", `${width}px`);
245
- this.setStyleByName(image, "height", `${height}px`);
246
-
247
- if (this.listDataCache[this.index] != null) {
248
- this.listDataCache[this.index].width = `${width}px`;
249
- this.listDataCache[this.index].height = `${height}px`;
250
- }
251
-
252
-
253
-
254
- // --------------------------------------------------------------------------------------------------
255
- // const imageObject = new Image();
256
- // imageObject.src = this.list[this.index];
257
- // const $this = this
258
- // imageObject.onload = () => {
259
244
 
260
- // let { width, height } = imageObject;
261
- // if (adaptive) {
262
- // let rate = 1
263
- // if (width > height) {
264
- // rate = width / document.body.clientWidth
265
- // } else {
266
- // rate = height / document.body.clientHeight
267
- // }
268
- // width = width / rate
269
- // height = height / rate
270
- // }
245
+ this.setStyleByName(image, "width", `${width}px`);
246
+ this.setStyleByName(image, "height", `${height}px`);
271
247
 
272
- // $this.setStyleByName(image, "width", `${width}px`);
273
- // $this.setStyleByName(image, "height", `${height}px`);
248
+ if (this.listDataCache[this.index] != null) {
249
+ this.listDataCache[this.index].width = `${width}px`;
250
+ this.listDataCache[this.index].height = `${height}px`;
251
+ }
252
+ } else {
253
+ const imageObject = new Image();
254
+ imageObject.src = this.list[this.index];
255
+ const $this = this
256
+ imageObject.onload = () => {
257
+
258
+ let { width, height } = imageObject;
259
+ if (adaptive) {
260
+ let rate = 1
261
+ if (width > height) {
262
+ rate = width / document.body.clientWidth
263
+ } else {
264
+ rate = height / document.body.clientHeight
265
+ }
266
+ width = width / rate
267
+ height = height / rate
268
+ }
274
269
 
275
- // $this.listDataCache[this.index].width = `${width}px`;
276
- // $this.listDataCache[this.index].height = `${height}px`;
277
- // }
270
+ $this.setStyleByName(image, "width", `${width}px`);
271
+ $this.setStyleByName(image, "height", `${height}px`);
278
272
 
273
+ if (this.listDataCache[this.index] != null) {
274
+ this.listDataCache[this.index].width = `${width}px`;
275
+ this.listDataCache[this.index].height = `${height}px`;
276
+ }
277
+ }
278
+ }
279
279
 
280
280
  },
281
281