zydx-plus 1.35.549 → 1.35.551

package/package.json

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

package/src/components/biz_header/src/button_name.js

@@ -3616,6 +3616,47 @@ let buttonNames = {
                         }
                     }
                 },
+                
+                resource_lesson023: {
+                    actionName: '经典文章',
+                    buttonList: {
+                        0: {
+                            headLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '文章',
+                                btnIndex2: this.getPrefix(item) + '文章'
+                            },
+                            otherLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '文章',
+                                btnIndex2: this.getPrefix(item) + '文章'
+                            },
+                            lowLevel: {
+                                default: "viewResource",
+                                // createResource: '创建文章',
+                                viewResource: '文章列表',
+                                // selectResource: '查找资源',
+                            }
+                        },
+                        2: {
+                            headLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '文章',
+                                btnIndex2: this.getPrefix(item) + '文章'
+                            },
+                            otherLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: this.getCurrentPrefix(item) + '文章',
+                                btnIndex2: this.getPrefix(item) + '文章'
+                            },
+                            lowLevel: {
+                                default: "viewResource",
+                                viewResource: '文章列表',
+                                // selectResource: '查找资源',
+                            }
+                        }
+                    }
+                },
                 resource_lesson024: {
                     actionName: '思想宝库',
                     buttonList: {

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

@@ -484,7 +484,6 @@ export default {
       if(this.doublePage) return;
       if(e.target.nodeName === 'SPAN') {
         const wid = this.$refs.wrap.offsetWidth - 10
-        const hei = this.$refs.wrap.offsetHeight - 10
         const endOffset = this.getRange().endOffset
         const style = e.target.attributes.style.value
         const size = style.match(/font-size:\s*([^;]+)/)[1].trim().replace(/px/g, "")
@@ -497,7 +496,7 @@ export default {
         this.rightMenuShow = true
         this.extendStyle = {
           left: left + 'px',
-          top: Number(topMatch) - ((size/hei)*240) + '%'
+          top: `calc(${Number(topMatch) + '%'} - 50px)`
         }
         this.annData = {
           rect: [x1/this.scales,y1/this.scales,x2/this.scales,y2/this.scales],

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

@@ -11,10 +11,10 @@
       </div>
     </div>
     <div v-if="fileType === 'mp4'" class="mp4">
-      <video id="video" :src="url" controls></video>
+      <video ref="videoRef" id="video" :src="url" controls controlsList='nodownload noremote footbar'></video>
     </div>
     <div v-if="fileType === 'mp3'" class="mp3">
-      <audio :src="url" controls></audio>
+      <audio ref="audioRef" id="audio" :src="url" controls controlsList='nodownload noremote footbar'></audio>
     </div>
     <div v-if="loading" class="loading-back">
       <div class="loading-cont">
@@ -40,6 +40,10 @@ import '@vue-office/excel/lib/index.css'
 import Mess from '../../tipBox/index'
 import {debounce} from "../../utils";
 
+import VideoJS from 'video.js';
+import 'videojs-contrib-hls';
+import 'video.js/dist/video-js.css';
+
 let pdfs = {}
 export default {
   name: "zydx-read",
@@ -65,6 +69,7 @@ export default {
       resizeObserver: {},
       loadingTask: {},
       // pdfs:null
+      player:null
     }
   },
   props: {
@@ -148,6 +153,31 @@ export default {
           this.resizeObserver[`${this.refSrc}`].observe(el);
         }, 300)
       }
+      if(this.fileType === 'mp4'){
+        this.$nextTick(() => {
+          if (this.$refs.videoRef) {
+            this.player = VideoJS('video');
+            this.$refs.videoRef.addEventListener('play', () => {
+              this.$emit('playingEvent')
+            });
+            this.$refs.videoRef.addEventListener('pause', () => {
+              this.$emit('pausedEvent')
+            });
+          }
+        })
+      }
+      if(this.fileType === 'mp3') {
+        this.$nextTick(()=>{
+          if (this.$refs.audioRef) {
+            this.$refs.audioRef.addEventListener('play', () => {
+              this.$emit('playingEvent')
+            });
+            this.$refs.audioRef.addEventListener('pause', () => {
+              this.$emit('pausedEvent')
+            });
+          }
+        })
+      }
       setTimeout(() => {
         this.repeat = false
       }, 1000)
@@ -161,6 +191,34 @@ export default {
         console.log(video);
       });
     },
+    readPlay(){
+      if(this.fileType === 'mp4'){
+        this.$nextTick(() => {
+          this.player.play()
+        })
+      }
+      if(this.fileType === 'mp3') {
+        this.$nextTick(()=>{
+          if (this.$refs.audioRef) {
+            this.$refs.audioRef.play();
+          }
+        })
+      }
+    },
+    readPause(){
+      if(this.fileType === 'mp4'){
+        this.$nextTick(() => {
+          this.player.pause()
+        })
+      }
+      if(this.fileType === 'mp3') {
+        this.$nextTick(()=>{
+          if (this.$refs.audioRef) {
+            this.$refs.audioRef.pause();
+          }
+        })
+      }
+    },
     init() {
       let that = this
       this.canvasArr[`${this.refSrc}`] = []

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

@@ -193,10 +193,10 @@ export default {
     },
     //
     editorCreateShape(myShape){
-      editorAPP.createShape(myShape)
+      editorAPP?.createShape(myShape)
     },
     editorDeleteShape(shapeId){
-      editorAPP.deleteShape(shapeId)
+      editorAPP?.deleteShape(shapeId)
     },
     // 添加快照
     setSnapshot(v) {

package/src/components/variableBox/index.vue

@@ -142,6 +142,7 @@ export default {
   background-position: center;
   border-right: 2px solid #dcdfe6;
   border-left: 2px solid #dcdfe6;
+  z-index: 999;
 }
 .resize:hover {
   background-color: white;

package/src/index.js

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