Merge branch 'develop-zhouyi' into 'develop'

fix(invoice): 查看影像卡顿等问题

See merge request GFP/RBC/rbc-frontend!145

develop/@gms/gms-plugin-billexpand/src/actions/deleteInvoiceAction.js

@@ -10,10 +10,17 @@ export default {
         const tableObj = targetSubTable[i]
         const invoiceId = tableObj.getValue('imageId')
         if (invoiceId == imageId) {
-          curbill.deleteSubData(param.param.targetTableName, i, true)
+          curbill.deleteSubData(param.param.targetTableName, i, false, tableObj.getData())
         }
       }
     }
-    curbill.deleteSubData(param.param.tableName, curbill.getSubFocus(), true)
+
+    for (let i = imageTable.length - 1; i >= 0; --i) {
+      const tableObj = imageTable[i]
+      const id = tableObj.getValue('imageId')
+      if (id == imageId) {
+        curbill.deleteSubData(param.param.tableName, i, true)
+      }
+    }
   }
 }
\ No newline at end of file

develop/@gms/gms-plugin-billexpand/src/components-control/invoice-modal.vue

@@ -55,7 +55,9 @@ export default {
             }
             this.bill.refreshSubDataRow(subBillName)
           })
-          this.componentName && GMS.$hideContainer.remove(this.componentName)
+          setTimeout(() => {
+            this.componentName && GMS.$hideContainer.remove(this.componentName)
+          }, 500);
         })
       }
       

develop/@gms/gms-plugin-billexpand/src/emcon.js

@@ -1817,6 +1817,7 @@ export default {
 			"description": "",
 			"title": "财务_影像电子凭证[CW_imageView]",
 			"value": "CW_imageView",
+			"alwaysUse":true
 		},
 		{
 			"discard": false,

develop/@rbc/invoice/src/components/image-view-modal/image-view-modal.vue

@@ -14,7 +14,7 @@
           :currentIndex="currentImgIndex"
         />
       </div>
-      <div class="right">
+      <div class="right" v-if="imgList && imgList.length">
         <div class="tool-bar">
           <div class="info">
             第<span class="number">{{currentImgIndex + 1}}</span>张，共<span class="number">{{imgList.length}}</span>张
@@ -50,7 +50,6 @@ export default {
       yearFlag: null,
       yearFlags: [],
       currentImgIndex: 0,
-      imgUrlSet: new Set(),
       imageTableName: null,
       componentName: null,
     };
@@ -58,20 +57,20 @@ export default {
   watch: {
     modalVisible(visible) {
       if (!visible) {
-        for (let o of this.imgUrlSet) {
-          window.URL.revokeObjectURL(o)
+        for (let o of this.imgList) {
+          window.URL.revokeObjectURL(o.imgUrl)
         }
-        this.imgUrlSet = new Set()
         this.bill = null
         this.imageId = null
         this.yearFlags = []
-        this.componentName && window.GMS.$hideContainer.remove(this.componentName)
+        setTimeout(() => {
+          this.componentName && window.GMS.$hideContainer.remove(this.componentName)
+        }, 500);
       }
     },
     imageId(id) {
       if (!id) return
       getImgUrl(id, this.yearFlag).then(({ url, fileName }) => {
-        this.imgUrlSet.add(url)
         this.imgList = [{
           imgUrl: url,
           id,

develop/@rbc/invoice/src/components/image-view-modal/image-viewer.vue

@@ -53,7 +53,7 @@
       </svg>
     </div>
     <div class="viewer-container">
-      <img style="display: none" id="invoice-viewerjs-imgsource" :src="img.imgUrl" :alt="img.fileName">
+      <img style="display: none" ref="imgEle" id="invoice-viewerjs-imgsource" :src="img.imgUrl" :alt="img.fileName">
     </div>
   </div>
 </template>
@@ -84,7 +84,7 @@ export default {
           console.log('viewer already destroyed?')
         }
         this.viewer = null
-        const ele = document.getElementById('invoice-viewerjs-imgsource')
+        const ele = this.$refs.imgEle
         const parentEle = ele.parentElement
         const childList = Array.from(parentEle.children)
         childList.forEach((node) => {
@@ -103,7 +103,7 @@ export default {
   },
   methods: {
     createViewer() {
-      this.viewer = new Viewer(document.getElementById('invoice-viewerjs-imgsource'), {
+      this.viewer = new Viewer(this.$refs.imgEle, {
         inline: true,
         toolbar: 0,
         title: false,