askbot-dragon 1.5.39-beta → 1.5.41-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.5.39-beta",
+  "version": "1.5.41-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/assets/js/hammer.js

@@ -1,9 +1,12 @@
 //定义缩放方法，接收一个element参数：使用export暴露该方法
-export function zoomElement (el) {
+export function zoomElement (el,transScale) {
 	let store = {
 		scale: 1
 	};
-	let scale = 1;
+	if (!el){
+		return
+	}
+	let scale = transScale;
 	if (el.style.transform){
 		let transForm = el.style.transform;
 		var values = transForm.split('(')[1].split(')')[0].split(',');

package/src/components/pdfPosition.vue

@@ -293,23 +293,23 @@ export default {
             const canvas = document.createElement('canvas');
             const context = canvas.getContext('2d');
             // canvas.getContext('2d');
-            canvas.height = this.pageSize.height * CSS_UNITS;
-            canvas.width = this.pageSize.width * CSS_UNITS;
+            canvas.height = this.pageSize.height * (this.fileName ? CSS_UNITS : 1);
+            canvas.width = this.pageSize.width * (this.fileName ? CSS_UNITS : 1);
             canvas.style.position = 'relative'
             canvas.style.top = -3 + 'px'
             // 创建渲染的dom
             const pageDom = document.createElement('div');
             pageDom.style.position = 'absolute';
-            pageDom.style.top = `${((pageNo - 1) * (this.pageSize.height + this.PAGE_INTVERVAL) * CSS_UNITS) + this.PAGE_INTVERVAL}px`;
-            pageDom.style.width = `${this.pageSize.width * CSS_UNITS}px`;
-            pageDom.style.height = `${this.pageSize.height * CSS_UNITS}px`;
+            pageDom.style.top = `${((pageNo - 1) * (this.pageSize.height + this.PAGE_INTVERVAL) * (this.fileName ? CSS_UNITS : 1)) + this.PAGE_INTVERVAL}px`;
+            pageDom.style.width = `${this.pageSize.width * (this.fileName ? CSS_UNITS : 1)}px`;
+            pageDom.style.height = `${this.pageSize.height * (this.fileName ? CSS_UNITS : 1)}px`;
             pageDom.setAttribute('data-id', 'page' + pageNo)
             // pageDom.appendChild(canvas);
             // 渲染内容
             let renderContext = {
                 canvasContext: context,
                 viewport: viewport,
-                transform: [CSS_UNITS, 0, 0, CSS_UNITS, 0, 0],
+                transform: this.fileName ? [CSS_UNITS, 0, 0, CSS_UNITS, 0, 0] : '',
             }
             await pdfPage.render(renderContext).promise.then(() => {
               const html = canvas.toDataURL();
@@ -346,11 +346,11 @@ export default {
                                     let postionArr = lines[index].location
                                     let div = document.createElement('div')
                                     div.style.position = 'absolute';
-                                    div.style.left = postionArr[0] * this.scale * CSS_UNITS + 'px',
+                                    div.style.left = postionArr[0] * this.scale * (this.fileName ? CSS_UNITS : 1) + 'px',
                                     // 后端返回的坐标有基线对齐的问题，top 值是后端算好（基线top - 文字高度），在此加上文字高度的 1/9 （大致比例）为实际展示出文字的top值
-                                    div.style.top = postionArr[1] * this.scale * CSS_UNITS + 'px'
-                                    div.style.height = postionArr[3] * this.scale * CSS_UNITS + 'px';
-                                    div.style.width = postionArr[2] * this.scale * CSS_UNITS + 'px'
+                                    div.style.top = postionArr[1] * this.scale * (this.fileName ? CSS_UNITS : 1) + 'px'
+                                    div.style.height = postionArr[3] * this.scale * (this.fileName ? CSS_UNITS : 1) + 'px';
+                                    div.style.width = postionArr[2] * this.scale * (this.fileName ? CSS_UNITS : 1) + 'px'
                                     div.style.backgroundColor = 'rgba(54, 106, 255, 0.3)'
                                     div.classList.add('lineHeight')
                                     rectdom.appendChild(div)
@@ -554,10 +554,10 @@ export default {
                 return
             }
             const pageDom = document.createElement('div');
-            pageDom.style.width = `${this.pageSize.width * CSS_UNITS}px`;
-            pageDom.style.height = `${this.pageSize.height * CSS_UNITS}px`;
+            pageDom.style.width = `${this.pageSize.width * (this.fileName ? CSS_UNITS : 1)}px`;
+            pageDom.style.height = `${this.pageSize.height * (this.fileName ? CSS_UNITS : 1)}px`;
             pageDom.style.position = 'absolute';
-            pageDom.style.top = `${((pageNo - 1) * (this.pageSize.height + this.PAGE_INTVERVAL) * CSS_UNITS) + this.PAGE_INTVERVAL
+            pageDom.style.top = `${((pageNo - 1) * (this.pageSize.height + this.PAGE_INTVERVAL) * (this.fileName ? CSS_UNITS : 1)) + this.PAGE_INTVERVAL
                 }px`;
             pageDom.style.backgroundImage = `url('https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/images/loading.gif')`
             pageDom.style.backgroundPosition = 'center'

package/src/components/previewPdf.vue

@@ -54,7 +54,7 @@
     </div>
     <div id="drawer_content_pre">
       <template v-if="tagIds && tagIds.length != 0 && drawer">
-        <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord" :fileName="fileName"></pdfPosition>
+        <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord" :fileName="fileName" ref="pdfPosition"></pdfPosition>
       </template>
       <template v-else>
         <div v-if="fileType == 'VIDEO'" style="width: 100%;">
@@ -128,7 +128,10 @@ export default {
         if(value) {
           this.$nextTick(() =>{
             setTimeout(() => {
-              zoomElement(document.getElementById('contentView'))
+              if (this.tagIds && this.tagIds.length != 0){
+                let transScale = this.$refs.pdfPosition.transformSalce
+                zoomElement(document.getElementById('contentView'),transScale)
+              }
             },1000)
           })
         }