zydx-plus 1.32.199 → 1.32.201

package/package.json

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

package/src/components/dragPopup/src/dragPopup.vue

@@ -4,7 +4,7 @@
            <span @mousedown.stop="mousedown"
                  @mousemove.stop="mousemove"
                  @mouseup.stop="mouseup"
-                 @mouseleave.stop="mousemove" :style="{'text-align': title === ''? 'center':'left'}">{{ title === ''? '按住可拖动弹窗': title }}</span>
+                 @mouseleave.stop="mousemove" :style="{'text-align': title === ''? 'center':'left'}">{{ title }}</span>
            <div class="drag-i">
                <i class="disconnect" v-if="disconnectShow" @click.stop="disconnect"></i>
                <i class="enlarge" v-if="enlargeShow" @click.stop="enlarge"></i>
@@ -79,7 +79,7 @@ export default {
         },
         dragTextShow: {
             type: Boolean,
-            default: true
+            default: false
         },
     },
     watch: {

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

@@ -41,7 +41,7 @@
         <div class="complete" v-if="!readOnly && toolbar.length > 0">
             <button class="but" v-if="butShow" @click="confirm">完成</button>
         </div>
-        <div class="read-only" v-if="page&&readOnly">
+        <div class="read-only" v-if="page&&readOnly" :style="{width: (wit + 20) + 'px'}">
             <div class="editing-header" v-if="signMenuShow">
                 <img :src="menusData('signMenu')?.ico" alt=""/>
                 <span>{{ menusData('signMenu')?.text }}</span>
@@ -166,7 +166,7 @@ export default {
                             this.editableShow = false
                             this.readOnlyPage()
                         }
-                    }, 100)
+                    }, 300)
                 }
             },
             deep: true,
@@ -355,6 +355,7 @@ export default {
             this.htmlArr = []
             const data = document.querySelectorAll('.editing-cont')[0].childNodes[0].childNodes
             this.wit = document.getElementsByClassName('editor-content')[0].offsetWidth
+            if(this.wit > 900) this.wit = 900
             let max = this.wit * 1.4
             let pHeight = 0
             let html = ''
@@ -722,17 +723,13 @@ export default {
             // 文献
             if (data.key === 'literatureMenu') {
                 const html = butJson(this.editor, this.menusText)[data.key].html
-                const t = await this.signIdData('subject') // 判断是否有题目
-                const b = await this.signIdData('author') // 判断是否有作者
+                const b = await this.signIdData('paragraph')
+                const last = this.editor.state.selection.$anchor.path[0].content.size
                 const r = await this.signIdData('literature')
                 if (b === -1) {
-                    if (t === -1) {
-                        if (r === -1) this.editor.chain().focus().insertContentAt(this.selection(), html).run()
-                    } else {
-                        if (r === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('subject'), html).run()
-                    }
+                    if (r === -1) this.editor.chain().focus().insertContentAt(last, html).run()
                 } else {
-                    if (r === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('author'), html).run()
+                    if (r === -1) this.editor.chain().focus().insertContentAt(this.selectionPath('paragraph',b - 1), html).run()
                 }
             }
             // 添加标注
@@ -1034,6 +1031,20 @@ li {
 .editor-content {
     margin: 10px;
     border: 1px solid rgba(204, 204, 204, 1);
+    max-height: 900px;
+    overflow: auto;
+}
+.editor-content::-webkit-scrollbar {
+    display: none;
+}
+/** 火狐浏览器 **/
+.editor-content {
+    scrollbar-width: none;
+}
+/** IE 与微软浏览器 **/
+.editor-content {
+    -ms-overflow-style: none;
+    overflow: -moz-scrollbars-none;
 }
 .editor-content-show{
     position: fixed;
@@ -1044,7 +1055,7 @@ li {
 
 .editing {
     width: 794px;
-    min-height: 1123px;
+    min-height: 700px;
     margin: 0 auto;
     position: relative;
 }
@@ -1053,7 +1064,7 @@ li {
     padding: 100px;
     box-sizing: border-box;
     width: 794px;
-    min-height: 1123px;
+    min-height: 700px;
 }
 .loading-back{
     position: absolute;

package/src/components/read/src/read.vue

@@ -9,7 +9,7 @@
           </div>
       </div>
       <div class="mp4" v-if="fileType === 'mp4'">
-          <video :src="url" controls></video>
+          <video id="video" :src="url" controls></video>
       </div>
       <div class="mp3" v-if="fileType === 'mp3'">
           <audio :src="url" controls></audio>
@@ -43,7 +43,7 @@ export default {
             svgArr: [],
             container: null,
             pdfPages: 0,
-            loading: true,
+            loading: false,
             repeat: false,
             idArr: []
         }
@@ -66,15 +66,15 @@ export default {
             immediate: true
         }
     },
-    mounted() {
-        this.repeatInit()
-    },
     methods: {
         repeatInit() {
             if (this.repeat) return // 防止重复加载
             this.repeat = true
-            this.loading = true
             this.fileType = this.url.split('.').pop()
+            if(this.fileType === 'pdf' || this.fileType === 'docx' || this.fileType === 'xlsx') {
+                this.loading = true
+            }
+            // if(this.fileType === 'mp4') this.videoFun()
             if (this.fileType === 'pdf') this.init()
             setTimeout(() => {
                 this.repeat = false
@@ -83,6 +83,12 @@ export default {
         renderedHandler() {
             this.loading = false
         },
+        videoFun() {
+            const video = document.getElementById('video')
+            video.addEventListener('loadeddata', function() {
+                console.log(video);
+            });
+        },
         init() {
             let that = this
             const loadingTask = PdfJs.getDocument(this.url)
@@ -138,10 +144,18 @@ export default {
     position: relative;
 }
 .mp4,.mp3{
-    width: 100%;
+    max-width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
 }
 .mp4 video,.mp3 audio{
     width: 100%;
+    max-height: 100%;
+}
+.ppt{
+    width: 100%;
+    height: 100%;
 }
 .view-pdf{
     text-align: center;

package/src/components/word/src/word.vue

@@ -113,9 +113,9 @@ export default {
                     if(item.testKey) {
                         item.testKey = JSON.parse(item.testKey).map(x => {
                             if(this.ques(item.quesType)) { // 判断是否单选
-                                x.checked = x.index === item.answer;
+                                x.checked = x.index === item?.answer;
                             }else {
-                                for(let i=0; i<item.answer.length; i++) {
+                                for(let i=0; i<item?.answer?.length; i++) {
                                     if(x.index === item.answer[i]) {
                                         x.checked = true
                                         break

package/src/index.js

@@ -77,7 +77,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.199',
+    version: '1.32.201',
     install,
     Calendar,
     Message,