zydx-plus 1.35.474 → 1.35.475

package/package.json

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

package/src/components/dragPopup/src/dragPopup.vue

@@ -199,6 +199,7 @@ export default {
         this.x = this.left + (wid-this.initWidth)/2
       }
     });
+    this.dragTap()
   },
   computed: {
     position() {
@@ -215,10 +216,15 @@ export default {
       let pop = JSON.parse(sessionStorage.getItem('pop'))
       for(let i = 0; i< pop.length; i++) {
         if(document.getElementById(pop[i]) === null) continue
-          document.getElementById(pop[i]).style.zIndex = '9999'
+        document.getElementById(pop[i]).classList.remove('zIndex10000')
+        // document.getElementById(pop[i]).style.zIndex = '9999'
+        document.getElementById(pop[i]).classList.add('zIndex9999')
+        // 获取所有具有指定class的元素并删除它们
       }
       if(document.getElementById(this.id)){
-        document.getElementById(this.id).style.zIndex = '10000'
+        // document.getElementById(this.id).style.zIndex = '10000'
+        document.getElementById(this.id).classList.remove('zIndex9999')
+        document.getElementById(this.id).classList.add('zIndex10000')
       }
     },
     clean() {
@@ -520,4 +526,10 @@ export default {
   height: 100% !important;
   position: relative;
 }
+.zIndex9999{
+  z-index: 9999;
+}
+.zIndex10000{
+  z-index: 10000;
+}
 </style>

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

@@ -1,9 +1,9 @@
 <template>
-  <div class="read" ref="read">
+  <div class="read" :ref="refSrc">
       <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" ref="view-pdf" v-if="fileType === 'pdf'">
-          <div class="pageContainer" v-for="(item,index) in idArr">
+          <div class="pageContainer" v-for="(item,index) in idArr[`${refSrc}`]" :key="index">
             <canvas :id="item"></canvas>
             <div class="pdfPage">{{ index + 1 }}/{{ pdfPages }}</div>
           </div>
@@ -36,27 +36,31 @@ import '@vue-office/excel/lib/index.css'
 
 import Mess from '../../tipBox/index'
 import {debounce} from "../../utils";
-let pdfs = null
+let pdfs = {}
 export default {
     name: "zydx-read",
     components: {VueOfficeDocx,VueOfficeExcel},
     data() {
         return {
-            fileType: null,
-            PdfJs: null,
-            svgArr: [],
-            container: null,
-            pdfPages: 0,
-            loading: false,
-            repeat: false,
-            idArr: [],
-            scales: 1.35,
+          fileType: null,
+          PdfJs: null,
+          svgArr: [],
+          container: null,
+          pdfPages: 0,
+          loading: false,
+          repeat: false,
+          idArr: {},
+          scales: 1.35,
           timer: null,
           pdf: null,
           page: 0,
           xlsx: true,
-          canvasArr: [],
-          pageIndex: 0
+          canvasArr: {},
+          pageIndex: 0,
+          refSrc:'',
+          resizeObserver:{},
+          loadingTask:{},
+          // pdfs:null
         }
     },
     props: {
@@ -75,8 +79,9 @@ export default {
     },
     watch: {
         url: {
-            handler: function (val, oldVal) {
-                this.idArr = []
+            handler: function () {
+                this.refSrc=this.randomId()
+                this.idArr[`${this.refSrc}`] = []
                 this.repeatInit()
             },
             deep: true,
@@ -96,7 +101,7 @@ export default {
             }
             if(this.fileType === 'pdf') {
               if(val.width >= 800) return
-              this.canvasArr.map(item => {
+              this.canvasArr[`${this.refSrc}`].map(item => {
                 item.style.width = val.width + 'px'
                 item.style.height = val.width*1.35 + 'px'
               })
@@ -113,7 +118,7 @@ export default {
       }
     },
     methods: {
-      errorHandler() {
+        errorHandler() {
         Mess({
           promptContent: '文件加载错误',
           cancelShow: false
@@ -131,11 +136,11 @@ export default {
             if (this.fileType === 'pdf') {
               this.init()
               setTimeout(()=>{
-                const el = this.$refs.read;
-                const resizeObserver = new ResizeObserver(() => {
-                    this.refreshCanvas()
+                const el = this.$refs[`${this.refSrc}`];
+                this.resizeObserver[`${this.refSrc}`] = new ResizeObserver(() => {
+                  this.refreshCanvas()
                 });
-                resizeObserver.observe(el);
+                this.resizeObserver[`${this.refSrc}`].observe(el);
               },300)
             }
             setTimeout(() => {
@@ -152,15 +157,14 @@ export default {
             });
         },
         init() {
-            let that = this
-            const loadingTask = PdfJs.getDocument({
+          let that = this
+          this.loadingTask[`${this.refSrc}`] = PdfJs.getDocument({
                 url: this.url,
                 cMapUrl: "/zydx/static/cmaps/",
                 cMapPacked: true
             })
-            loadingTask.promise.then((pdf) => {
-                pdfs = pdf
-              console.log('pdfs',pdfs)
+          this.loadingTask[`${this.refSrc}`].promise.then((pdf) => {
+                pdfs[`${that.refSrc}`] = pdf
                 that.pdfPages = pdf.numPages // 获取pdf文件的总页数
                 that.page = pdf.numPages
                 that.pageIndex = that.page > 1? 2:1
@@ -183,22 +187,23 @@ export default {
             if(this.pageIndex >= this.page) return
             if((this.page - this.pageIndex) >= 2) {
               this.pageIndex += 2
-              this.getPDF(pdfs,2)
+              this.getPDF(pdfs[`${this.refSrc}`],2)
             }else {
               this.pageIndex += 1
-              this.getPDF(pdfs,1)
+              this.getPDF(pdfs[`${this.refSrc}`],1)
             }
           }
         },
         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)
-                that.idArr.push(id)
+                that.idArr[`${that.refSrc}`].push(id)
                 pdf.getPage(this.pageIndex === 1? 1:this.pageIndex + i - 1).then(function (page) {
+                    // let canvas = document.createElement('canvas')
                     let canvas = document.getElementById(id)
-                    that.canvasArr.push(canvas)
+                    that.canvasArr[`${that.refSrc}`]=[]
+                    that.canvasArr[`${that.refSrc}`].push(canvas)
                     let ctx = canvas.getContext('2d');
                     // let viewport = page.getViewport({scale: that.scales})
                     // canvas.width = viewport.width * 2
@@ -228,10 +233,12 @@ export default {
         },
         refreshCanvas:debounce(function (){
           let that = this
-          that.idArr.forEach((item,index)=>{
-            pdfs.getPage( index + 1).then(function (page) {
+          that.idArr[`${that.refSrc}`].forEach((item,index)=>{
+            pdfs[`${this.refSrc}`].getPage( index + 1).then(function (page) {
+              // let canvas = document.createElement('canvas')
               let canvas = document.getElementById(item)
-              that.canvasArr.push(canvas)
+              that.canvasArr[`${that.refSrc}`]=[]
+              that.canvasArr[`${that.refSrc}`].push(canvas)
               let ctx = canvas.getContext('2d');
               let boxWidth = that.$refs['view-pdf'].offsetWidth
               let scales=(boxWidth/846)*(boxWidth/(boxWidth-(boxWidth*0.115*2)))
@@ -251,7 +258,11 @@ export default {
               page.render(renderContext)
             })
           })
-        },50)
+        },50),
+        randomId() {
+          const id = Math.random().toString(36).substr(2)
+          return id.replace(/[0-9]/g, '')
+        }
     }
 }
 </script>

package/src/components/textarea/src/textarea.vue

@@ -135,9 +135,12 @@ export default {
 
 .num {
   position: absolute;
-  bottom: 10px;
-  right: 10px;
+  bottom: 0;
+  right: 5px;
   z-index: 1;
+  font-size: 12px;
+  transform: scale(0.8);
+  color: #666;
 }
 
 .text {

package/src/index.js

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