Merge branch 'develop' into 'test'

src/components/input/ImageUploader/ImageUploader.vue

@@ -2,8 +2,7 @@
   <div class="image-uploader">
     <div
       v-if="done"
-      @mouseover="toogleDelIcon"
-      @mouseout="toogleDelIcon"
+      @mouseenter="showDelIcon"
       class="image-uploader-done"
     >
       <div
@@ -12,6 +11,7 @@
       >
         <div
           @click="delImg"
+          @mouseout.stop="hideDelIcon"
           class="delimg icon"
         >
           <img src="@/assets/icons/svg/delimg.svg" />
@@ -113,7 +113,16 @@ export default {
       this.url = val ? val : '';
       this.fileName = val ? val.replace(this.domain, '') : '';
     },
+    showDelIcon() {
+      console.log('in showDelIcon');
+      this.showDel = true;
+    },
+    hideDelIcon() {
+      console.log('in hideDelIcon');
+      this.showDel = false;
+    },
     toogleDelIcon() {
+      console.log('in ');
       this.showDel = !this.showDel;
     },
     getImgToken(isReload) {