zydx-plus 1.33.388 → 1.33.389

package/package.json

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

package/src/components/editor2/src/editor.vue

@@ -409,14 +409,15 @@ export default {
     })
   },
   methods: {
-      // 下面三个方法是改变图片大小的方法
     changeAlign(tag) {
+        // 图片对齐方式
         this.editor.chain().setTextAlign(tag).run()
     },
     changePercent(e) {
+        // 改变图片百分比
         if(parseInt(e.target.value) > 100) {
             this.imgSizeVal = 100
-            this.editor.chain().setImageWidth('100%').run()
+            this.editor.chain().setImageWidth('100%').focus().run()
         } else if(parseInt(e.target.value) < 10) {
         } else {
             if(this.lock) {
@@ -429,6 +430,7 @@ export default {
         }
     },
     shouldShowFn({ editor, view, state, oldState, from, to }) {
+        // BubbleMenu是否显示
         this.$nextTick(() => {
             this.showBubble =  editor.isActive('image')
             if(editor.isActive('image')) {
@@ -907,6 +909,7 @@ export default {
 
 :deep(.imgCont) {
   line-height: 0 !important;
+  text-indent: 0 !important;
 }
 
 :deep(.ProseMirror-separator) {
@@ -954,7 +957,7 @@ export default {
 }
 
 :deep(.editor-img) {
-  max-width: calc(100% - 4em);
+  max-width: 100%;
   padding: 2px 0;
 }
 

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

@@ -2,11 +2,11 @@
   <div class="docView">
     <div class="full-screen">
       <div class="full-screen-img" @click.stop="fullScreen">
-<!--        <div class="full-screen-title" style="" v-if="showText">全屏查看</div>-->
+        <!--        <div class="full-screen-title" style="" v-if="showText">全屏查看</div>-->
         <img @mouseover="showText=true" @mouseout="showText=false" src="../img/full-screen.png" alt="" title="全屏查看">
       </div>
       <div class="full-screen-img" v-if="doublePage" @click.stop="changeView">
-<!--        <div class="full-screen-title" style="" v-if="showMultiText">多页查看</div>-->
+        <!--        <div class="full-screen-title" style="" v-if="showMultiText">多页查看</div>-->
         <img @mouseover="showMultiText=true" @mouseout="showMultiText=false" src="../img/multi-page.png" alt="" title="多页查看">
       </div>
       <div class="full-screen-img" v-else @click.stop="changeView">
@@ -17,7 +17,7 @@
     <div>
       <div class="book">
         <div class="pages">
-          <div class="wrap-box" v-if="doublePage">
+          <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">
               <div class="wrap-can" v-show="!loading" ref="wrapCan">
                 <canvas @click.stop="turnText" class="wrap-can-one" @mousedown.stop="mouseDown"
@@ -164,6 +164,7 @@ export default {
       showText:false,
       showMultiText:false,
       showSingleText:false,
+      boxWidth:''
     }
   },
   props: {
@@ -185,7 +186,7 @@ export default {
     },
     scale: {
       type: Number,
-      default: 1.3
+      default: 1.35
     },
     scaleStyle: {
       type: Object,
@@ -261,15 +262,13 @@ export default {
       deep: true,
       immediate: true
     },
-    // pageInfoArr:{
-    //   handler: function (val){
-    //     if(val.length===this.pdfPages){
-    //       this.sourceUrl()
-    //     }
-    //   },
-    //   deep: true,
-    //   immediate: true
-    // }
+    scale:{
+      handler: function (val){
+        this.scales = val
+      },
+      deep: true,
+      immediate: true
+    }
   },
   emits: ['flip'],
   mounted() {
@@ -288,7 +287,10 @@ export default {
   },
   methods: {
     changeView(){
-      this.doublePage=! this.doublePage
+      this.$emit('changeViewDoublePage',!this.doublePage)
+      setTimeout(()=>{
+        this.doublePage = !this.doublePage
+      },500)
     },
     fullScreen(){
       window.open(this.source)
@@ -1148,6 +1150,7 @@ export default {
         let ctx2 = canvas2.getContext('2d');
         let viewport = page.getViewport({scale: that.scales})
         const sc = viewport.width / viewport.height
+        that.boxWidth = that.$refs.wrap.offsetWidth
         const wid = that.$refs.wrap.offsetWidth - 10
         const hei = wid / sc
         canvas.width = wid * that.sratio
@@ -1198,7 +1201,9 @@ export default {
           let canvas2 = document.getElementById(`${item.id}2`)
           item.ctx = canvas.getContext('2d');
           item.ctx2 = canvas2.getContext('2d');
-          let viewport = page.getViewport({scale: that.scales/2})
+          let wrapBoxWidth = that.$refs['wrap-box'].offsetWidth
+          let newScale=(wrapBoxWidth/that.boxWidth)*that.scales
+          let viewport = page.getViewport({scale: newScale/2})
           const sc = viewport.width / viewport.height
           const wid = that.$refs[`wrap-${item.id}`][0].offsetWidth-15
           const hei = wid / sc
@@ -1500,6 +1505,6 @@ div{
 .full-screen-img>img{
   width: 20px;
   height: 20px;
-  //margin-left: 5px;
+//margin-left: 5px;
 }
 </style>

package/src/components/treeList/src/treeList.vue

@@ -5,11 +5,12 @@
                  :style="{'border-bottom': (link)? '1px solid #ccc': '0', 'color': (active === index)? activeColor : '#333'}"
                  @click="listTap(item,index)" v-for="(item,index) in list" :key="index">
                 <div class="list-title">
-                    <span :style="{'font-size': column[0].fontSize + 'px', 'font-weight': column[0].fontWeight}">{{
+                    <!-- <span :style="{'font-size': column[0].fontSize + 'px', 'font-weight': column[0].fontWeight}">{{
                         index + 1
                         }}. {{ (angleBrackets) ? '《' : '' }} {{ item[column[0].label] }} {{
                         (angleBrackets) ? '》' : ''
-                        }}</span>
+                        }}</span> -->
+                    <span :style="{'font-size': column[0].fontSize + 'px', 'font-weight': column[0].fontWeight}" v-html="(index + 1) + '.' + (angleBrackets ? '《' : '') + item[column[0].label] + (angleBrackets ? '》' : '')"></span>
                     <button v-if="delShow" @click="del(item)">{{ delText }}</button>
                 </div>
                 <div class="list-cont" v-if="open">

package/src/index.js

@@ -83,7 +83,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.33.388',
+    version: '1.33.389',
     install,
     Calendar,
     Message,