From d629b29ffb3b9ee47258794172dacb0fe3e88f01 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Wed, 11 May 2022 11:51:36 +0800
Subject: [PATCH] fix: merge network request for image

---
 src/core/view/components/image/index.vue | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/core/view/components/image/index.vue b/src/core/view/components/image/index.vue
index 69c9570d7..f08c6b047 100644
--- a/src/core/view/components/image/index.vue
+++ b/src/core/view/components/image/index.vue
@@ -4,11 +4,6 @@
       ref="content"
       :style="style"
     />
-    <img
-      v-if="contentPath"
-      :src="contentPath"
-      :draggable="draggable"
-    >
     <v-uni-resize-sensor
       v-if="mode === 'widthFix' || mode === 'heightFix'"
       ref="sensor"
@@ -128,6 +123,12 @@ export default {
       if (newValue === 'widthFix' || newValue === 'heightFix') {
         this._fixSize()
       }
+    },
+    contentPath (val) {
+      if (!val && this.__img) {
+        this.__img.remove()
+        delete this.__img
+      }
     }
   },
   mounted () {
@@ -177,6 +178,12 @@ export default {
           this._fixSize()
 
           this.contentPath = realImagePath
+          img.draggable = this.draggable
+          if (this.__img) {
+            this.__img.remove()
+          }
+          this.__img = img
+          this.$el.appendChild(img)
 
           this.$trigger('load', $event, {
             width: img.width,
@@ -224,12 +231,12 @@ uni-image[hidden] {
   display: none;
 }
 
-uni-image > div {
+uni-image>div {
   width: 100%;
   height: 100%;
 }
 
-uni-image > img {
+uni-image>img {
   -webkit-touch-callout: none;
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -242,7 +249,7 @@ uni-image > img {
   opacity: 0;
 }
 
-uni-image > .uni-image-will-change {
+uni-image>.uni-image-will-change {
   will-change: transform;
 }
 </style>
-- 
GitLab