zydx-plus 1.35.554 → 1.35.556

package/package.json

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

package/src/components/chat/src/chat.vue

@@ -341,7 +341,7 @@ export default {
         url: '/zydx/voice/getBaiduToken',
         method: 'post',
         headers: {
-          'Authorization':  localStorage.getItem('sessionId'),
+          'Authorization':  localStorage.getItem('sessionId') || sessionStorage.getItem('sessionId'),
           'Content-Type': 'application/x-www-form-urlencoded'
         },
         params: {

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

@@ -873,7 +873,8 @@ export default {
           headers: {
             Authorization: localStorage.getItem("remember") === "1" ? localStorage.getItem('sessionId') : sessionStorage.getItem('sessionId')
           },
-          server: '/zydx/lessonResource/editOfficeFile',
+          server: '/zydx/open/function/lessonResource/editOfficeFile',
+          // server: '/zydx/lessonResource/editOfficeFile',
         }
       }
     },
@@ -2008,6 +2009,7 @@ export default {
     enlSee() {
       this.$emit('enlSee', this.encIndex)
       let id = this.encIndex.signId.split('u-').join('')
+      console.log('interpositionData',this.interpositionData);
       this.interpositionData.forEach(item => {
         if (item.id === id) {
           item.isShow = true
@@ -2587,6 +2589,7 @@ export default {
                 fileName: name,
                 url: url
               }
+              console.log('11111',dataInfo)
               //linkCourseware
               if (v === 'linkCourseware') {
                 let officeInfo = this.getOffice

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

@@ -27,6 +27,7 @@
         </button>
         <button v-if='isShowAiTool' class="buts" @click="showAi">AI助手</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>
@@ -85,9 +86,9 @@
           <svg style="cursor: pointer" @click="close" t="1698630749910" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4415" width="20" height="20"><path d="M726.976 274.432a16 16 0 0 0-22.656 0L512 466.752l-192.32-192.32a16 16 0 0 0-22.624 0l-22.656 22.624a16 16 0 0 0 0 22.624l192.32 192.32-192.32 192.32a16 16 0 0 0 0 22.656l22.656 22.624a16 16 0 0 0 22.624 0l192.32-192.32 192.32 192.32a16 16 0 0 0 22.656 0l22.624-22.624a16 16 0 0 0 0-22.624L557.28 512l192.32-192.352a16 16 0 0 0 0-22.624l-22.624-22.624z" fill="#fff" p-id="4416"></path></svg>
         </div>
       </div>
-      <div class="editor-but" v-if="butText !== '' && readOnly">
-        <button class="buts" @click="complete">{{ butText }}</button>
-      </div>
+<!--      <div class="editor-but" v-if="butText !== '' && readOnly">-->
+<!--        <button class="buts" @click="complete">{{ butText }}</button>-->
+<!--      </div>-->
       <div class="enclosure" v-if="uploadAttData.length > 0 && enclosureShow">
         <p :style="enclosureStyle">{{ enclosureText }}</p>
         <div class="enclosure-list" v-for="(item,index) in uploadAttData">
@@ -1072,7 +1073,7 @@ export default {
 
 .ed-head {
   display: flex;
-  justify-content: center;
+  justify-content: right;
   flex-wrap: wrap;
 }
 
@@ -1096,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.554',
+    version: '1.35.556',
     install,
     Calendar,
     Message,