zydx-plus 1.35.555 → 1.35.557

package/package.json

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

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

@@ -986,13 +986,14 @@ export default {
         // this.editor?.commands.setContent(json2html({node: "root", child: (e === undefined || e === null) ? [] : e}))
         this.editor?.commands.setContent(dataHtml)
         if (this.readOnly) {
-          if (this.page) this.editableShow = true
-          setTimeout(() => {
+          // lxq 25.7.14
+          // if (this.page) this.editableShow = true
+          // setTimeout(() => {
             if (this.page) {
               this.editableShow = false
               this.readOnlyPage()
             }
-          }, 300)
+          // }, 300)
         }
         setTimeout(() => {
           this.init = true
@@ -1005,20 +1006,21 @@ export default {
     },
     readOnly: {
       handler: function (e) {
-        let time = setInterval(() => {
+        // lxq 25.7.14
+        // let time = setInterval(() => {
           if (this.editor) { // 没有时间以后 停止定时器
             this.editor.setOptions({editable: !e})
             if (this.page) {
-              setTimeout(() => {
+              // setTimeout(() => {
                 this.editableShow = !e
                 if (e) {
                   this.readOnlyPage() // 只读分页
                 }
-              }, 300)
+              // }, 300)
             }
-            clearInterval(time) //停止计时器，清除定时器
+            // clearInterval(time) //停止计时器，清除定时器
           }
-        }, 10)
+        // }, 10)
       },
       deep: true,
       immediate: true

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

@@ -26,8 +26,8 @@
                 :style="{color: (voiceStatus)? '#4B0C77' :'#000'}">{{ voiceStatus ? '关闭语音' : '语音输入' }}
         </button>
         <button v-if='isShowAiTool' class="buts" @click="showAi">AI助手</button>
-        <button v-if="butText !== '' && readOnly" class="buts" @click="complete">{{ butText }}</button>
         <slot name='toolBtn'></slot>
+        <button v-if="butText !== '' && readOnly" class="buts" @click="complete">{{ butText }}</button>
       </div>
     </div>
     <zydx-chat v-model='isShowAi'></zydx-chat>
@@ -1073,7 +1073,7 @@ export default {
 
 .ed-head {
   display: flex;
-  justify-content: center;
+  justify-content: right;
   flex-wrap: wrap;
 }
 
@@ -1097,12 +1097,13 @@ export default {
   float: right;
 }
 .ed-title {
-  min-width: 120px;
   flex: 1;
   text-align: left;
   font-size: 16px;
-  min-width: 100px;
+  min-width: 80px;
   line-height: 24px;
+  position: relative;
+  top: -2px;
 }
 
 .enclosure-list {

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

@@ -14,6 +14,7 @@
         <img @mouseover="showSingleText=true" @mouseout="showSingleText=false" src="../img/single-page.png" alt="" title="单页查看">
       </div>
       <div class="full-screen-img" v-if="!doublePage&&isShowPen" @click.stop="showPen">
+        <!--        <div class="full-screen-title" style="" v-if="showSingleText">单页查看</div>-->
         <!--        <div class="full-screen-title" style="" v-if="showSingleText">单页查看</div>-->
         <i class="iconfont zydx-huabi1" title="笔迹"/>
       </div>
@@ -88,7 +89,7 @@
               <div class="annotationLayer" ref="annotationLayer">
                 <template v-for="(item,index) in annotations">
                   <div :style="styleAnnotation(item)" class="magnifier" v-if="item.type === 'tag'">
-                    <img @click.stop="magnifierTap($event,item)" src="../img/dingwei.svg" alt="" />
+                    <img @click.stop="magnifierTap($event,item)" src="../img/dingwei.png" alt="" />
                     <div class="magnifier-list" v-if="item.show" :style="item.style">
                       <div class="magnifier-head">
                         <div class="magnifier-title">拓展阅读</div>
@@ -166,12 +167,14 @@ import * as PdfJs from 'pdfjs-dist'
 import "pdfjs-dist/build/pdf.worker.mjs";
 import Range from "../../tagging/src/range";
 
+import img from '../img/huabi.png'
 let pdfs = {};
 
 export default {
   name: "zydx-flip",
   data() {
     return {
+      mouseImg:img,
       pdfPages: 0,
       imgArr: '',
       hei: 0,
@@ -405,6 +408,19 @@ export default {
       },
       deep: true,
       immediate: true
+    },
+    state:{
+      handler: function (val){
+        this.$nextTick(()=>{
+          if(val==='brush'){
+            this.$refs.wrapCan.setAttribute('style',`cursor:url(${this.mouseImg}) 0 16, auto;`)
+          }else {
+          this.$refs.wrapCan.style.cursor = "auto"
+          }
+        })
+      },
+      deep: true,
+      immediate: true
     }
   },
   emits: ['flip','annotationTap', 'annotationsSend', 'empty'],
@@ -1697,9 +1713,10 @@ export default {
   cursor: pointer;
 }
 .magnifier>img{
-  width: 100%;
-  height: 100%;
+  width: 80% !important;
+  height: 80% !important;
   display: block;
+  margin: 0 auto;
 }
 .magnifier-list{
   position: absolute;
@@ -1763,7 +1780,7 @@ export default {
   border-radius: 20px;
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.25);
   padding: 10px;
-  background-color: #4B0C77;
+  background-color: #DEDCDC;
   cursor: pointer;
   transform: scaleX(-1);
 }

package/src/components/sketchpad/src/sketchpad.vue

@@ -9,6 +9,7 @@ import {createRoot} from 'react-dom/client'
 import {AssetRecordType,createShapeId, Tldraw} from 'tldraw'
 import 'tldraw/tldraw.css'
 import * as buffer from "buffer";
+// import img from "@/components/flip/img/huabi.png";
 
 if (typeof window.Buffer === "undefined") { // 判断当前环境是否有Buffer对象
   window.Buffer = buffer.Buffer; // Buffer对象不存在则创建导入的buffer
@@ -79,6 +80,7 @@ export default {
   name: "zydx-sketchpad",
   data() {
     return {
+      // mouseImg:img,
       shapeArr:[],
       interval:null
       // editor: null

package/src/components/tagging/src/tagging.css

@@ -175,7 +175,7 @@
 }
 :deep(.custom-underline){
     font-style: normal;
-    background-color: rgba(0,0,0,0.1);
+    /*background-color: rgba(0,0,0,0.1);*/
     border-bottom: 1px dashed #FF0000;
 }
 .link{

package/src/components/tagging/src/tagging.vue

@@ -411,7 +411,7 @@ export default {
         classGuidance(name,state,back) {
             for (let i = 0; i < name.length; i++) {
                 name[i].style.borderBottom = state
-                name[i].style.backgroundColor = back?'rgba(0,0,0,0.2)':'rgba(0,0,0,0.1)'
+                name[i].style.backgroundColor = back?'rgba(0,0,0,0.1)':''
             }
         },
         classBackDel(name) {

package/src/index.js

@@ -89,7 +89,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.555',
+    version: '1.35.557',
     install,
     Calendar,
     Message,