zydx-plus 1.35.463 → 1.35.465

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.35.463",
+  "version": "1.35.465",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/biz_header/src/button_name.js

@@ -2281,8 +2281,7 @@ let buttonNames = {
                                 default: "demand",
                                 demand: '调查要求',
                                 resourceIndex: '调查试题',
-                                actionAnalysis: '调查点评',
-                                qualityAnalysis: '素养点评'
+                                actionAnalysis: '调查点评'
                             },
                             otherLevel: {
                                 default: "singletonClass",

package/src/components/flip/src/flip.vue

@@ -19,7 +19,7 @@
       </div>
     </div>
     <div>
-      <div class="book">
+      <div class="book" ref="book">
         <div class="pages">
           <div class="wrap-box" ref="wrap-box"  v-if="doublePage">
             <div class="wrap wrap-block" :ref="`wrap-${item.id}`" v-for="(item,index) in pageInfoArr" :key="index">
@@ -48,7 +48,7 @@
           <div class="wrap" ref="wrap" v-else>
             <div class="wrap-can" v-show="!loading" ref="wrapCan">
               <canvas @click.stop="turnText" class="wrap-can-one" @mousedown.stop="mouseDown"
-                      @mousemove.stop="mouseMove" :id="id"></canvas>
+                      @mousemove.stop="mouseMove" :id="`${id}`"></canvas>
               <canvas :id="`${id}2`"></canvas>
               <div
                   v-show="state === 'text'&&textY2>0&&textX2>0"
@@ -67,13 +67,13 @@
               </div>
             </div>
           </div>
-          <div class="page-but-left" :style="{cursor: pageIndex === 1?'default':'pointer'}" v-if="!doublePage"
+          <div class="page-but-left" :style="{cursor: pageIndex === 1?'default':'pointer'}" v-if="!loading&&!doublePage"
                @click.stop="flipRight(pageIndex-=1,false)">
             <img v-if="pageIndex !== 1"
                  src="data:image/png;base64,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"
                  alt=""/>
           </div>
-          <div class="page-but-right" :style="{cursor: pageIndex === pdfPages?'default':'pointer'}" v-if="!doublePage"
+          <div class="page-but-right" :style="{cursor: pageIndex === pdfPages?'default':'pointer'}" v-if="!loading&&!doublePage"
                @click.stop="flipLeft(pageIndex+=1,false)">
             <img v-if="pageIndex !== pdfPages"
                  src="data:image/png;base64,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"
@@ -182,7 +182,7 @@ export default {
     },
     butShow: {
       type: Boolean,
-      default: true
+      default: false
     },
     page: {
       type: Number,
@@ -299,6 +299,17 @@ export default {
       if (this.isDrawing || this.checkDrawing) this.mouseUp()
       this.textMoveStart = false
     }
+    setTimeout(()=>{
+      const el = this.$refs.book;
+      const resizeObserver = new ResizeObserver(() => {
+        if(this.doublePage){
+          this.readDoublePdf()
+        }else {
+          this.readPdf()
+        }
+      });
+      resizeObserver.observe(el);
+    },300)
   },
   beforeDestroy() {
     window.removeEventListener('keydown', this.handleKeyEvent)
@@ -1345,7 +1356,7 @@ export default {
   margin: 0 auto;
   position: relative;
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.25);
-//cursor: none;
+/*cursor: none;*/
 }
 
 .wrap-can img {
@@ -1427,7 +1438,7 @@ export default {
 
 .book {
   width: 100%;
-  min-height: 600px;
+  /*min-height: 600px;*/
   max-height: 1200px;
   overflow-y: auto;
 }
@@ -1442,7 +1453,8 @@ export default {
 }
 
 .loading-back {
-  position: absolute;
+  min-height: 600px;
+  /*position: absolute;*/
   top: 0;
   left: 0;
   right: 0;
@@ -1537,6 +1549,6 @@ div{
 .full-screen-img>img{
   width: 20px;
   height: 20px;
-//margin-left: 5px;
+/*margin-left: 5px;*/
 }
 </style>

package/src/components/read/src/read.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="read">
+  <div class="read" ref="read">
       <vue-office-docx v-if="fileType === 'docx'" :src="url" style="height: 100%;" @rendered="renderedHandler"  @error="errorHandler" />
       <vue-office-excel v-if="fileType === 'xlsx' && xlsx" :src="url" style="height: 100%;" @rendered="renderedHandler"  @error="errorHandler" />
-      <div class="view-pdf" @scroll="scroll" v-if="fileType === 'pdf'">
+      <div class="view-pdf" @scroll="scroll" ref="view-pdf" v-if="fileType === 'pdf'">
           <div class="pageContainer" v-for="(item,index) in idArr">
-              <canvas :id="item"></canvas>
-              <div class="pdfPage">{{ index + 1 }}/{{ pdfPages }}</div>
+            <canvas :id="item"></canvas>
+            <div class="pdfPage">{{ index + 1 }}/{{ pdfPages }}</div>
           </div>
       </div>
       <div class="mp4" v-if="fileType === 'mp4'">
@@ -35,6 +35,7 @@ import '@vue-office/docx/lib/index.css'
 import '@vue-office/excel/lib/index.css'
 
 import Mess from '../../tipBox/index'
+import {debounce} from "../../utils";
 let pdfs = null
 export default {
     name: "zydx-read",
@@ -127,7 +128,16 @@ export default {
                 this.loading = true
             }
             // if(this.fileType === 'mp4') this.videoFun()
-            if (this.fileType === 'pdf') this.init()
+            if (this.fileType === 'pdf') {
+              this.init()
+              setTimeout(()=>{
+                const el = this.$refs.read;
+                const resizeObserver = new ResizeObserver(() => {
+                    this.refreshCanvas()
+                });
+                resizeObserver.observe(el);
+              },300)
+            }
             setTimeout(() => {
                 this.repeat = false
             }, 1000)
@@ -150,6 +160,7 @@ export default {
             })
             loadingTask.promise.then((pdf) => {
                 pdfs = pdf
+              console.log('pdfs',pdfs)
                 that.pdfPages = pdf.numPages // 获取pdf文件的总页数
                 that.page = pdf.numPages
                 that.pageIndex = that.page > 1? 2:1
@@ -170,7 +181,7 @@ export default {
           let total = scrollTop + windowHeitht
           if(total >= scrollHeight - 50){
             if(this.pageIndex >= this.page) return
-            if((this.page - this.pageIndex) > 2) {
+            if((this.page - this.pageIndex) >= 2) {
               this.pageIndex += 2
               this.getPDF(pdfs,2)
             }else {
@@ -180,6 +191,7 @@ export default {
           }
         },
         getPDF(pdf,page) {
+          console.log('getPDF=====page',page)
             let that = this
             for (let i = 0; i < page; i++) {
                 const id = 'canvas' + Math.random().toString(36).substr(2)
@@ -188,11 +200,22 @@ export default {
                     let canvas = document.getElementById(id)
                     that.canvasArr.push(canvas)
                     let ctx = canvas.getContext('2d');
-                    let viewport = page.getViewport({scale: that.scales})
-                    canvas.width = viewport.width * 2
-                    canvas.height = viewport.height * 2
-                    canvas.style.width = viewport.width + 'px'
-                    canvas.style.height = viewport.height + 'px'
+                    // let viewport = page.getViewport({scale: that.scales})
+                    // canvas.width = viewport.width * 2
+                    // canvas.height = viewport.height * 2
+                    // canvas.style.width = viewport.width + 'px'
+                    // canvas.style.height = viewport.height + 'px'
+
+                    let boxWidth = that.$refs['view-pdf'].offsetWidth
+                    let scales=(boxWidth/846)*(boxWidth/(boxWidth-(boxWidth*0.115*2)))
+                    let viewport = page.getViewport({scale: scales})
+                    const sc = viewport.width / viewport.height
+                    const wid = boxWidth - 20
+                    const hei = wid / sc
+                    canvas.width = wid * 2
+                    canvas.height = hei * 2
+                    canvas.style.width = wid + 'px'
+                    canvas.style.height = hei + 'px'
                     let renderContext = {
                         canvasContext: ctx,
                         viewport: viewport,
@@ -202,7 +225,33 @@ export default {
                 })
             }
             that.renderedHandler()
-        }
+        },
+        refreshCanvas:debounce(function (){
+          let that = this
+          that.idArr.forEach((item,index)=>{
+            pdfs.getPage( index + 1).then(function (page) {
+              let canvas = document.getElementById(item)
+              that.canvasArr.push(canvas)
+              let ctx = canvas.getContext('2d');
+              let boxWidth = that.$refs['view-pdf'].offsetWidth
+              let scales=(boxWidth/846)*(boxWidth/(boxWidth-(boxWidth*0.115*2)))
+              let viewport = page.getViewport({scale: scales})
+              const sc = viewport.width / viewport.height
+              const wid = boxWidth - 20
+              const hei = wid / sc
+              canvas.width = wid * 2
+              canvas.height = hei * 2
+              canvas.style.width = wid + 'px'
+              canvas.style.height = hei + 'px'
+              let renderContext = {
+                canvasContext: ctx,
+                viewport: viewport,
+                transform: [2, 0, 0, 2, 0, 0]
+              }
+              page.render(renderContext)
+            })
+          })
+        },50)
     }
 }
 </script>
@@ -219,6 +268,7 @@ export default {
     width: 100%;
 }
 .pageContainer{
+    width: 100%;
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
     margin-bottom: 10px;
     display: inline-block;

package/src/components/utils/index.js

@@ -0,0 +1,13 @@
+export const debounceTimer = 500
+// 防抖
+export function debounce(fn, delay = debounceTimer) {
+    var timeoutID = null
+    return function () {
+        clearTimeout(timeoutID)
+        var args = arguments
+        var that = this
+        timeoutID = setTimeout(function () {
+            fn.apply(that, args)
+        }, delay)
+    }
+}

package/src/components/variableBox/index.vue

@@ -107,6 +107,7 @@ export default {
   width: calc(100% - 315px);
   background-color: #f1eab3;
   border-right: 2px solid #dcdfe6;
+  overflow: hidden;
 }
 .resize {
   position: relative;
@@ -123,5 +124,6 @@ export default {
   width: 310px;
   background-color: #b5ef8f;
   border-left: 2px solid #dcdfe6;
+  overflow: hidden;
 }
 </style>

package/src/index.js

@@ -87,7 +87,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.463',
+    version: '1.35.465',
     install,
     Calendar,
     Message,