zydx-plus 1.19.93 → 1.19.94

package/package.json

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

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

@@ -3,7 +3,11 @@
       <div style="height: 100%;">
           <div class="book">
               <div class="pages">
-                  <div class="wrap" id="canvas-wrap"></div>
+                  <div class="wrap" id="canvas-wrap">
+                      <div class="wrap-can">
+                          <canvas id="the-canvas"></canvas>
+                      </div>
+                  </div>
                   <div class="page-but-left" :style="{cursor: pageIndex === 1?'default':'pointer'}" @click="flipLeft(pageIndex-=1,false)"></div>
                   <div class="page-but-right" :style="{cursor: pageIndex === pdfPages?'default':'pointer'}" @click="flipRight(pageIndex+=1,false)"></div>
 <!--                  <div class="paper z-in" :class="{'data-right': pages}">-->
@@ -26,6 +30,7 @@
 
 <script>
 import * as PdfJs from 'pdfjs-dist/legacy/build/pdf.js' // 注意导入的写法
+import { TextLayerBuilder } from 'pdfjs-dist/web/pdf_viewer'
 PdfJs.GlobalWorkerOptions.workerSrc = require('pdfjs-dist/build/pdf.worker.entry')
 export default {
   name: "zydx-flip",
@@ -108,19 +113,19 @@ export default {
           loadingTask.promise.then((pdf) => {
               that.pdfPages = pdf.numPages // 获取pdf文件的总页数
               pdf.getPage(that.pageIndex).then(function (page) {
+                  let canvas = document.getElementById('the-canvas')
+                  let ctx = canvas.getContext('2d');
                   let viewport = page.getViewport({scale: 1})
-                  document.getElementById('canvas-wrap').innerHTML = ''
-                  let container = document.createElement('div')
-                  container.style.width = viewport.width + 'px'
-                  container.style.height = viewport.height + 'px'
-                  container.style.margin = '0 auto'
-                  document.getElementById('canvas-wrap').appendChild(container)
-                  return page.getOperatorList().then(function(opList) {
-                      let svgGfx = new PdfJs.SVGGraphics(page.commonObjs, page.objs)
-                      return svgGfx.getSVG(opList, viewport).then(function(svg) {
-                          container.appendChild(svg)
-                      })
-                  })
+                  canvas.width = viewport.width * 2
+                  canvas.height = viewport.height * 2
+                  canvas.style.width = viewport.width + 'px'
+                  canvas.style.height = viewport.height + 'px'
+                  let renderContext = {
+                      canvasContext: ctx,
+                      viewport: viewport,
+                      transform: [2, 0, 0, 2, 0, 0]//这里会进行放大，解决模糊问题
+                  }
+                  page.render(renderContext)
               })
           })
       }
@@ -132,64 +137,21 @@ export default {
 .wrap{
     width: 100%;
     height: 100%;
+    display: flex;
+    align-items: center;
+}
+.wrap-can{
+    display: inline-block;
+    margin: 0 auto;
 }
 .but-wrap{
     text-align: center;
 }
-.z-in{
-    z-index: 2;
-}
-.z-in-ac{
-    z-index: 1;
-}
 .pages{
     width: 100%;
     height: 100%;
     position: relative;
 }
-.paper{
-    position: absolute;
-    right: 0;
-    transform-style: preserve-3d;
-    width: 100%;
-}
-.page{
-    position: absolute;
-    text-align: center;
-}
-.page img{
-    width: 100%;
-    height: 100%;
-}
-.data-right {
-    opacity: 1;
-    transform-origin: left center;
-    animation: flip-to-left 1.5s ease-in-out forwards;
-}
-.data-left{
-    right: auto;
-    left: 0;
-}
-@keyframes flip-to-left {
-    0% {
-        transform: perspective(3000px) rotateY(0);
-    }
-    95% {
-        transform: perspective(3000px) rotateY(-180deg);
-    }
-    100% {
-        transform: perspective(3000px) rotateY(-180deg);
-    }
-}
-.page-1-back, .page-2-back {
-    transform: scale(-1, 1);
-}
-.page-1, .page-2 {
-    transform: translateZ(1px);
-}
-
-
-
 
 .page-but-left{
     position: absolute;

package/src/components/tab/src/tab.vue

@@ -35,6 +35,15 @@ export default {
       default: () => ['name']
     },
   },
+    watch: {
+        active(val) {
+            this.list.forEach((item, index) => {
+                if (item[this.activeId] === val) {
+                    this.actives = index
+                }
+            })
+        }
+    },
     mounted() {
       if (this.activeId) {
         this.list.forEach((item, index) => {

package/src/index.js

@@ -57,7 +57,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.19.93',
+    version: '1.19.94',
     install,
     Calendar,
     Message,