zydx-plus 1.35.553 → 1.35.555

package/package.json

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

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

@@ -3,6 +3,7 @@
     <drag-popup
       v-if='modelValue'
       ref="dragPopup"
+      class='popup_chat'
       :title="title"
       :width="960"
       :height="400"
@@ -340,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: {
@@ -363,6 +364,10 @@ export default {
 </script>
 
 <style scoped>
+/* 避免AI助手弹出层级小于全局弹窗 */
+.popup_chat{
+  z-index: 10001;
+}
 .disabled{
   opacity: 0.5;
 }

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

@@ -1,6 +1,6 @@
 <template>
   <div ref="only" :class="`z-editor z-editor-${refSrc}`"
-       :style="!readOnly&&showBorder?'border: 1px solid rgba(204, 204, 204, 1);':''">
+       :style="[!readOnly&&showBorder?'border:1px solid rgba(204, 204, 204, 1);':'',readOnly?'overflow-y:auto;':'']">
     <div v-show="!readOnly" class="editor-header">
       <div v-for="(item,index) in butData" :key="index" class="editor-but">
         <div v-if="uploadTypeArr.indexOf(item.key)  !== -1" class="editor-but-name">
@@ -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
@@ -3014,6 +3017,8 @@ export default {
     },
 
     async butTap(data, key, childKey) {
+      // 标志
+      if (data.key === 'signMenu') this.signMenuShow = !this.signMenuShow
       if (!key.key) return
       // 切换版式
       if (data.key === 'switchingFormat') {
@@ -3242,8 +3247,6 @@ export default {
           // }
         }*/
       }
-      // 标志
-      if (data.key === 'signMenu') this.signMenuShow = !this.signMenuShow
       // 红头文件
       if (data.key === 'redMenu') {
         const html = butJson(this.editor, this.menusText)[data.key].html
@@ -4413,7 +4416,7 @@ export default {
 
 .read-only {
   position: relative;
-  margin: 0 auto;
+  margin: 8px auto;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -4602,9 +4605,9 @@ li {
 .z-editor {
   position: relative;
   width: 100%;
-  max-height: 900px;
-  overflow-y: auto;
+  max-height: 952px;
   scrollbar-width: none;
+  overflow: hidden;
 }
 
 .editor-header {

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

@@ -26,6 +26,7 @@
                 :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>
       </div>
     </div>
@@ -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">

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

@@ -9,7 +9,6 @@ import {createRoot} from 'react-dom/client'
 import {AssetRecordType,createShapeId, Tldraw} from 'tldraw'
 import 'tldraw/tldraw.css'
 import * as buffer from "buffer";
-import {debounce} from "../../utils"; //引入buffer
 
 if (typeof window.Buffer === "undefined") { // 判断当前环境是否有Buffer对象
   window.Buffer = buffer.Buffer; // Buffer对象不存在则创建导入的buffer
@@ -80,6 +79,8 @@ export default {
   name: "zydx-sketchpad",
   data() {
     return {
+      shapeArr:[],
+      interval:null
       // editor: null
     }
   },
@@ -154,13 +155,23 @@ export default {
     },
     handleMountedEditor(editor) {
       editorAPP = editor
-      editorAPP.sideEffects.registerAfterChangeHandler('shape', debounce((prev, next)=> {
+      editorAPP.sideEffects.registerAfterChangeHandler('shape', (prev, next)=> {
         // there can only be one red shape at a time:
-        this.$emit('shapeChangeHandler', prev);
-      },200) )
-      editorAPP.sideEffects.registerAfterDeleteHandler('shape', (shape) => {
-        // if the last shape in a frame is deleted, delete the frame too:
-        this.$emit('shapeDeleteHandler', shape);
+        let typeArr = ["note","text"]
+        this.$emit('shapeChangeHandler',typeArr.indexOf(prev.type) !==-1? next : prev);
+      })
+      editorAPP.sideEffects.registerAfterDeleteHandler('shape', (shape, source) => {
+        // if the last shape in a frame is deleted, delete the frame too:\
+        this.shapeArr.push(shape)
+        if(this.shapeArr.length > 0){
+          this.interval = setInterval(() => {
+              this.$emit('shapeDeleteHandler', this.shapeArr.shift());
+            },300)
+        }else {
+          if(this.interval){
+            clearInterval(this.interval)
+          }
+        }
       })
       editorAPP.setCameraOptions({ isLocked: this.cameraIsLocked })
       editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
@@ -193,7 +204,20 @@ export default {
     },
     //
     editorCreateShape(myShape){
-      editorAPP?.createShape(myShape)
+      let shape = editorAPP?.getShape(myShape.id)
+      myShape = JSON.parse(JSON.stringify(myShape))
+      if(shape){
+        shape = JSON.parse(JSON.stringify(shape))
+        if(shape.type==="draw"){
+          shape.props.segments[0].points.push(myShape.props.segments[0].points.at(-1))
+        }else {
+          shape = myShape
+        }
+        editorAPP?.updateShape(shape)
+      }else {
+        editorAPP?.createShape(myShape)
+
+      }
     },
     editorDeleteShape(shapeId){
       editorAPP?.deleteShape(shapeId)
@@ -420,35 +444,69 @@ export default {
       editorAPP.setCurrentTool('highlight')
       editorAPP.updateInstanceState({ isToolLocked: this.isToolLocked })
     },
-    insertPicture(img) {
-      const assetId = AssetRecordType.createId()
-      editorAPP.createAssets([{
-        id: assetId,
-        type: 'image',
-        typeName: 'asset',
-        meta: {},
-        props: {
-          w: img.width,
-          h: img.height,
-          name: 'image',
-          src: img.src,
-          mimeType: 'image/*',
-          isAnimated: false,
+    insertPicture(img, type) {
+      if(type){
+        editorAPP.createAssets([{...img.asset}])
+        editorAPP.createShape({...img.img})
+      }else {
+        const assetId = AssetRecordType.createId()
+        editorAPP.createAssets([{
+          id: assetId,
+          type: 'image',
+          typeName: 'asset',
+          meta: {},
+          props: {
+            w: img.width,
+            h: img.height,
+            name: 'image',
+            src: img.src,
+            mimeType: 'image/*',
+            isAnimated: false,
+          }
+        }])
+        const imageId = createShapeId()
+        editorAPP.createShape({
+          id: imageId,
+          type: 'image',
+          x: 200,
+          y: 200,
+          isLocked: false,
+          props: {
+            w: img.width,
+            h: img.height,
+            assetId
+          },
+        })
+        let imgObj = {
+          asset:{
+            id: assetId,
+            type: 'image',
+            typeName: 'asset',
+            meta: {},
+            props: {
+              w: img.width,
+              h: img.height,
+              name: 'image',
+              src: img.src,
+              mimeType: 'image/*',
+              isAnimated: false,
+            }
+          },
+          img:{
+            id: imageId,
+            type: 'image',
+            x: 200,
+            y: 200,
+            isLocked: false,
+            props: {
+              w: img.width,
+              h: img.height,
+              assetId
+            },
+          }
         }
-      }])
-      const imageId = createShapeId()
-      editorAPP.createShape({
-        id: imageId,
-        type: 'image',
-        x: 200,
-        y: 200,
-        isLocked: false,
-        props: {
-          w: img.width,
-          h: img.height,
-          assetId
-        },
-      })
+        this.$emit('insertPicture',imgObj);
+      }
 
     },
     laser() {

package/src/index.js

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