zydx-plus 1.32.259 → 1.32.261

package/package.json

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

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

@@ -7,6 +7,9 @@
           <button v-if="item.key === 'but'" class="buts" @click="item.onClick(item,info)"
                   :style="{color: (item.active)? '#00ff00' :'#000'}">{{ item.title }}
           </button>
+          <button v-if="item.key === 'speech'" class="buts" @mousedown.stop="speechDown" @click="item.onClick(item)"
+                  :style="{color: (item.active)? '#00ff00' :'#000'}">{{ voiceStatus ? '关闭语音' : '语音输入' }}
+          </button>
           <label v-else-if="item.key === 'upImg' || item.key === 'uploadAtt'">
             <input type="file" @change="upload($event,item.key)"
                    :accept="(item.key === 'upImg')?'image/*':'.docx,.pptx,.pdf,.xlsx,.mp3,.mp4'" style="display: none;">
@@ -14,23 +17,21 @@
           </label>
           <button v-else class="buts" @click="toolTap(item.key)">{{ item.title }}</button>
         </div>
-        <div class="voice">
-          <button class="buts" @click="voice" :style="{color: (voiceStatus)? '#00ff00' :'#000'}">
-            {{ voiceStatus ? '关闭语音' : '语音输入' }}
-          </button>
-        </div>
       </div>
     </div>
     <div class="ed-cont" :style="heightStyleCont">
-      <div :style="{'border': (borderShow)? '1px solid #ccc': '0'}" v-if="editorShow">
+      <div  :style="{'border': (borderShow)? '1px solid #ccc': '0'}" v-if="editorShow">
         <editor-content @paste.native.capture.prevent="preventPaste" ref="editorRef" class="editor" :editor="editor"
                         :style="heightStyleCont"/>
       </div>
-      <div v-if="voiceStatus" class="speak">
+      <div v-if="voiceStatus" class="speak"
+           @mousedown.stop="mousedown"
+           @mouseup.stop="mouseup"
+           :style="{transform: `translate(${x}px, ${y}px)`}">
         <div class="speak-cont">
           <svg t="1698630789078" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4553" width="15" height="15"><path d="M533.84533333 930.88426667c-13.65333333 0-24.576-10.92266667-24.576-24.576v-122.33386667c0-13.65333333 10.92266667-24.576 24.576-24.576s24.576 10.92266667 24.576 24.576v122.33386667c-0.54613333 13.65333333-11.4688 24.576-24.576 24.576zM533.84533333 686.21653333c-101.03466667 0-183.5008-82.46613333-183.5008-183.5008V258.048c0-101.03466667 82.46613333-183.5008 183.5008-183.5008s183.5008 82.46613333 183.5008 183.5008v244.66773333c0 101.03466667-82.46613333 183.5008-183.5008 183.5008z m0-563.06346666c-74.27413333 0-134.89493333 60.6208-134.89493333 134.89493333v244.66773333c0 74.27413333 60.6208 134.89493333 134.89493333 134.89493334s134.89493333-60.6208 134.89493334-134.89493334V258.048c-0.54613333-74.27413333-60.6208-134.89493333-134.89493334-134.89493333z" fill="#fff" p-id="4554"></path><path d="M533.84533333 808.5504c-168.7552 0-305.83466667-137.07946667-305.83466666-305.83466667 0-13.65333333 10.92266667-24.576 24.576-24.576s24.576 10.92266667 24.576 24.576c0 141.99466667 115.23413333 257.2288 257.2288 257.2288S790.528 644.7104 790.528 502.71573333c0-13.65333333 10.92266667-24.576 24.576-24.576s24.576 10.92266667 24.576 24.576c0 168.7552-137.07946667 305.83466667-305.83466667 305.83466667zM729.36106667 955.46026667H337.78346667c-13.65333333 0-24.576-10.92266667-24.576-24.576s10.92266667-24.576 24.576-24.576h391.5776c13.65333333 0 24.576 10.92266667 24.576 24.576s-10.92266667 24.576-24.576 24.576z" fill="#FFF" p-id="4555"></path></svg>
           <svgs :vol="vol"></svgs>
-          <span>{{ error? '开启语音失败' : '正在说话...' }}</span>
+          <span>{{ error? '连接中...' : '正在说话...' }}</span>
           <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>
@@ -128,7 +129,14 @@ export default {
       vol: 0,
       appData: {},
       error: false,
-      time: {}
+      time: {},
+      toolbars: [],
+      left: 0,
+      top: 0,
+      isMove: false,
+      x: 0,
+      y: 0,
+      speech: {}
     }
   },
   beforeUnmount() {
@@ -136,6 +144,7 @@ export default {
     this.recorder?.destroy()
     this.ws?.send(JSON.stringify({"type":"CANCEL"}))
     this.ws?.close()
+    this.ws = null
   },
   props: {
     data: {
@@ -245,6 +254,22 @@ export default {
         })
       },
       deep: true
+    },
+    toolbar: {
+      handler: function (e, oldVal) {
+        e.map(x => {
+          if (x.key === 'speech') {
+            this.voiceStatus = x.active
+            if(this.voiceStatus) {
+              this.voice()
+            }else {
+              this.close()
+            }
+          }
+          return x
+        })
+      },
+      deep: true
     }
   },
   mounted() {
@@ -297,7 +322,6 @@ export default {
         }
       }
     })
-    _this.appID()
     // 初始化录音
     this.recorder = new Recorder({
       sampleBits: 16, // 采样位数，支持 8 或 16，默认是16
@@ -307,8 +331,29 @@ export default {
     this.recorder.onprogress = function (params) {
       _this.vol = params.vol
     }
+    document.addEventListener('mousemove', (event) => {
+      if (!this.isMove) return
+      this.x = event.clientX - this.left;
+      this.y = event.clientY - this.top;
+    })
   },
   methods: {
+    speechDown(e) {
+      this.speech = {
+        x: e.clientX - e.offsetX,
+        y: e.clientY - e.offsetY,
+      }
+    },
+    mousedown(event) {
+      event.preventDefault()
+      //鼠标按下事件
+      this.left = event.offsetX;
+      this.top = event.offsetY;
+      this.isMove = true
+    },
+    mouseup() {
+      this.isMove = false
+    },
     // 粘贴文本处理
     preventPaste(event) {
       const text = event.clipboardData.getData('text/plain');
@@ -363,35 +408,40 @@ export default {
       scriptProcessor.connect(that.recorder.context.destination);
     },
     voice() {
-      let that = this
-      that.voiceStatus = !this.voiceStatus
-      if(that.voiceStatus) {
-        this.recorder.start().then(() => { // 开始录音
-          this.audioData  = []
-          this.webSocketInit()
-        }, (error) => {
-          this.$message({
-            type: 'text',
-            cancelShow: false,
-            promptContent: '录音失败，请检查麦克风是否可用'
-          })
-        });
-      }else {
-        that.close()
-      }
+      this.recorder.start().then(() => { // 开始录音
+        this.audioData  = []
+        this.x = this.speech.x - 85
+        const h = this.height.split('px')[0]
+        this.y = this.speech.y + ((this.height === '100%') ? 40 : Number(h) - 10)
+        this.appID()
+      }, (error) => {
+        this.$message({
+          type: 'text',
+          cancelShow: false,
+          promptContent: '录音失败，请检查麦克风是否可用'
+        })
+      });
     },
     close() {
+      if(this.ws === null) return
+      this.toolbar.map(x => {
+        if (x.key === 'speech') {
+          x.active = false
+        }
+        return x
+      })
       this.voiceStatus = false
-      this.ws.send(JSON.stringify({"type":"CANCEL"}))
-      this.ws.close()
+      this.ws?.send(JSON.stringify({"type":"CANCEL"}))
+      this.ws?.close()
+      this.ws = null
       this.recorder.stop() // 停止录音
       this.recorder.destroy()
     },
     webSocketInit() {
       const _this = this
-      _this.ws = new WebSocket(`wss://vop.baidu.com/realtime_asr?sn=${this.getRandomCode(15)}`)
-      _this.ws.binaryType = 'arraybuffer'
-      _this.ws.onopen = function () {
+      this.ws = new WebSocket(`wss://vop.baidu.com/realtime_asr?sn=${this.getRandomCode(15)}`)
+      this.ws.binaryType = 'arraybuffer'
+      this.ws.onopen = function () {
         _this.error = false
         const json = {
           type: 'START',
@@ -407,7 +457,7 @@ export default {
         _this.ws.send(JSON.stringify(json))
         _this.getAudioSuccess()
       }
-      _this.ws.onmessage = function (e) {
+      this.ws.onmessage = function (e) {
         const data = JSON.parse(e.data)
         if(data.err_no === 0){
           const json = _this.editor.getJSON()
@@ -422,10 +472,9 @@ export default {
           _this.time = data
         }
       }
-      _this.ws.onerror = function () {
+      this.ws.onerror = function () {
         // 连接失败重连
         setTimeout(() => {
-          _this.error = true
           _this.webSocketInit()
         }, 5000)
       }
@@ -439,14 +488,16 @@ export default {
         token = sessionStorage.getItem('sessionId')
       }
       const xhr = new XMLHttpRequest()
-      // xhr.open('GET', 'http://192.168.15.126:8888/zydx/voice/getDesKeyId')
-      // xhr.setRequestHeader('Authorization', 'e891f5a9-4cf0-4f9f-b969-c91d44e6648c')
+      // xhr.open('GET', 'http://192.168.15.124:8888/zydx/voice/getDesKeyId')
+      // xhr.setRequestHeader('Authorization', 'dd9fabcd-ca68-4f1a-97f0-21a66628207d')
       xhr.open('GET', '/zydx/voice/getDesKeyId')
       xhr.setRequestHeader('Authorization', token)
+      this.error = true
       xhr.onreadystatechange = () => {
         if (xhr.readyState === 4) {
           if (xhr.status === 200) {
             this.appData = JSON.parse(xhr.responseText).data
+            this.webSocketInit()
           }
         }
       }
@@ -657,8 +708,11 @@ export default {
 
 <style scoped>
 .speak{
-  text-align: right;
-  padding: 5px 0;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 50;
+  cursor: move;
 }
 .speak-cont{
   background: rgba(67, 207, 124, 1);
@@ -812,6 +866,7 @@ export default {
 .ed-cont {
   padding-top: 4px;
   margin-bottom: 14px;
+  position: relative;
 }
 
 .editor {

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

@@ -60,8 +60,10 @@
         </div>
         <div v-if="item.alist" class="subject-html" v-show="item.open">
           <div v-for="(it,ind) in item.alist">
-            <div class="subject-html-title">{{ titleText }}{{ ind + 1 }}</div>
-            <div class="subject-html-cont" v-html="it.annexContent"></div>
+            <div v-if="it.annexType === '0'">
+              <div class="subject-html-title">{{ titleText }}{{ ind + 1 }}</div>
+              <div class="subject-html-cont" v-html="it.annexContent"></div>
+            </div>
           </div>
         </div>
         <div class="choice" v-if="item.testKey" v-show="item.open">

package/src/index.js

@@ -79,7 +79,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.259',
+    version: '1.32.261',
     install,
     Calendar,
     Message,