zydx-plus 1.32.256 → 1.32.258

package/package.json

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

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

@@ -235,17 +235,17 @@ let buttonNames = {
                             headLevel: {
                                 default: "demand",
                                 demand: '回答要求',
-                                singletonClass: this.getCurrentPrefix(item) + '项目',
+                                singletonClass: this.getCurrentPrefix(item) + '追问',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '项目',
+                                singletonClass: this.getCurrentPrefix(item) + '追问',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             lowLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '项目',
+                                singletonClass: this.getCurrentPrefix(item) + '追问',
                                 score: '回答成绩',
                                 analysis: '统计分析',
                                 power: '学习动力'
@@ -254,17 +254,17 @@ let buttonNames = {
                         2: {
                             headLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '项目',
+                                singletonClass: this.getCurrentPrefix(item) + '追问',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '项目',
+                                singletonClass: this.getCurrentPrefix(item) + '追问',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             lowLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '项目',
+                                singletonClass: this.getCurrentPrefix(item) + '追问',
                                 score: '回答成绩',
                                 analysis: '统计分析',
                                 power: '学习动力'
@@ -1333,17 +1333,17 @@ let buttonNames = {
                             headLevel: {
                                 default: "demand",
                                 demand: '回答要求',
-                                singletonClass: this.getCurrentPrefix(item) + '项目',
+                                singletonClass: this.getCurrentPrefix(item) + '追问',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '项目',
+                                singletonClass: this.getCurrentPrefix(item) + '追问',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             lowLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '项目',
+                                singletonClass: this.getCurrentPrefix(item) + '追问',
                                 score: '学习成绩',
                                 analysis: '统计分析',
                                 power: '学习动力'

package/src/components/editor/src/butJson.js

@@ -46,13 +46,13 @@ export function butJson (editor,data) {
             name: '添加作者',
             key: 'authorMenu',
             menuKeys: [],
-            html: `<p class="author" data-signId="author" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 14px;">${menusData(data,'authorMenu').text}</span></p>`
+            html: `<p class="author" data-signId="author" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 16px;font-family: KaiT;">${menusData(data,'authorMenu').text}</span></p>`
         },
         subjectMenu: {
             name: '添加题目',
             key: 'subjectMenu',
             menuKeys: [],
-            html: `<p data-signId="subject" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 24px;">${menusData(data,'subjectMenu').text}</span></p>`
+            html: `<p data-signId="subject" style="text-align: center;padding-bottom: 30px;"><span style="color: rgb(0, 0, 0);font-size: 24px;font-family: SimHei;font-weight: 700;">${menusData(data,'subjectMenu').text}</span></p>`
         },
         paragraphMenu: {
             name: '添加落款',
@@ -73,19 +73,19 @@ export function butJson (editor,data) {
             name: '关键词',
             key: 'keywordMenu',
             menuKeys: [],
-            html: `<p class="keyword"><span style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;关键词：</span><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">关键词内容...</span></p>`
+            html: `<p class="keyword" data-signId="keyword"><span style="color: rgb(0, 0, 0);font-size: 12px;font-weight: 700;font-family: SimSun;">关键词：</span><span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiTi">关键词内容...</span></p>`
         },
         abstractMenu: {
             name: '添加摘要',
             key: 'abstractMenu',
             menuKeys: [],
-            html: `<p class="abstract"><span style="color: rgb(0, 0, 0);font-size: 14px;font-weight: 700;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;摘要：</span><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">摘要内容...</span></p>`
+            html: `<p class="abstract" data-signId="abstract"><span style="color: rgb(0, 0, 0);font-size: 12px;font-weight: 700;font-family: SimSun;">摘要：</span><span style="color: rgb(0, 0, 0);font-size: 12px;font-family: KaiTi">摘要内容...</span></p>`
         },
         literatureMenu: {
             name: '添加文献',
             key: 'literatureMenu',
             menuKeys: [],
-            html: `<p><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">[1]作者.期刊论文名称IJ1.期刊名称,发表年份(第几期):页码</span></p><p><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">[2]作者.学位论文名称[D1.毕业院校所在城市:毕业院校,论文提交年份:页码</span></p><p><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">[3]作者.著作名称[M.出版社所在城市:出版社名称,出版年份:页码.</span></p><p data-signId="literature"><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi">[4]作者.文章名称[N].报纸名称,发行日期(版面)</span></p>`
+            html: `<p><span style="color: rgb(0, 0, 0);font-size: 12px;font-family: SimSun">[1]作者.期刊论文名称IJ1.期刊名称,发表年份(第几期):页码</span></p><p><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: SimSun">[2]作者.学位论文名称[D1.毕业院校所在城市:毕业院校,论文提交年份:页码</span></p><p><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: SimSun">[3]作者.著作名称[M.出版社所在城市:出版社名称,出版年份:页码.</span></p><p data-signId="literature"><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: SimSun">[4]作者.文章名称[N].报纸名称,发行日期(版面)</span></p>`
         },
         taggingMenu: {
             name: '添加标注',
@@ -104,8 +104,8 @@ export function butJson (editor,data) {
             key: 'ackMenu',
             menuKeys: [],
             html: [
-                `<p data-signId="ack" contenteditable="false" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 24px;font-weight: bold;">致谢</span></p>`,
-                `<p><span style="color: rgb(0, 0, 0);font-size: 14px;">致谢内容...</span></p>`
+                `<p data-signId="ack" contenteditable="false" style="text-align: center;"><span style="color: rgb(0, 0, 0);font-size: 16px;font-weight: bold;">致谢</span></p>`,
+                `<p><span style="color: rgb(0, 0, 0);font-size: 14px;font-family: KaiTi;">致谢内容...</span></p>`
             ]
         },
         'group-image': {

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

@@ -69,11 +69,6 @@
                 <button class="but" @click="imgCancel">取消</button>
             </div>
         </div>
-<!--        <div v-if="loading" class="loading-back">-->
-<!--            <div class="loading-cont">-->
-<!--                <div class="loadings">Loading</div>-->
-<!--            </div>-->
-<!--        </div>-->
         <div class="down-html" id="test" v-html="htmlArr2"></div>
     </div>
 </template>
@@ -796,12 +791,14 @@ export default {
             // 关键词
             if (data.key === 'keywordMenu') {
                 const html = butJson(this.editor, this.menusText)[data.key].html
-                this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+                const r = await this.signIdData('keyword')
+                if (r === -1) this.editor.chain().focus().insertContentAt(this.selection(), html).run()
             }
             // 摘要
             if (data.key === 'abstractMenu') {
                 const html = butJson(this.editor, this.menusText)[data.key].html
-                this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+                const r = await this.signIdData('abstract')
+              if (r === -1) this.editor.chain().focus().insertContentAt(this.selection(), html).run()
             }
             // 致谢
             if (data.key === 'ackMenu') {
@@ -918,6 +915,12 @@ export default {
 .down-html :deep(img){
     padding: 5px 0;
 }
+:deep(.keyword) {
+    text-indent: 2em;
+}
+:deep(.abstract) {
+  text-indent: 2em;
+}
 .read-only {
     position: relative;
     margin: 0 auto;
@@ -925,7 +928,7 @@ export default {
 
 .read-only-page {
     width: 100%;
-    padding: 100px;
+    padding: 120px 100px 66px 100px;
     background-color: #fff;
     box-sizing: border-box;
     position: relative;
@@ -944,13 +947,19 @@ export default {
     line-height: 24px;
     text-align: justify;
 }
+:deep(p[data-signid="subject"]) {
+  padding-bottom: 30px;
+}
+:deep(.author){
+  padding-bottom: 40px;
+}
 :deep(.text){
     text-indent: 2em;
 }
 
 .read-only-a {
     position: absolute;
-    bottom: 70px;
+    bottom: 36px;
     left: 50%;
     z-index: 1;
     font-size: 14px;
@@ -1169,57 +1178,11 @@ li {
 }
 
 .editing-cont {
-    padding: 100px;
+    padding: 120px 100px 66px 100px;
     box-sizing: border-box;
     width: 794px;
     min-height: 700px;
 }
-.loading-back{
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: 100;
-    display: flex;
-    align-items: center;
-}
-.loading-cont{
-    display: inline-block;
-    margin: 0 auto;
-}
-.loadings {
-    display: inline-block;
-    font-size: 28px;
-    font-family: Arial, Helvetica, sans-serif;
-    font-weight: bold;
-    color: #fff;
-    text-shadow: 0 0 2px #ff3d00, 0 0 1px #ff3d00, 0 0 1px #ff3d00;
-    letter-spacing: 2px;
-    position: relative;
-}
-
-.loadings::after {
-    content: "Loading";
-    position: absolute;
-    left: 0;
-    top: 0;
-    color: #ff3d00;
-    width: 0%;
-    height: 100%;
-    overflow: hidden;
-    animation: loading-animation 6s linear infinite;
-}
-
-@keyframes loading-animation {
-    0% {
-        width: 0;
-    }
-
-    100% {
-        width: 100%;
-    }
-}
 .menu{
     background-color: #fff;
     padding: 5px;

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

@@ -23,7 +23,16 @@
     </div>
     <div class="ed-cont" :style="heightStyleCont">
       <div :style="{'border': (borderShow)? '1px solid #ccc': '0'}" v-if="editorShow">
-        <editor-content ref="editorRef" class="editor" :editor="editor" :style="heightStyleCont"/>
+        <editor-content @paste.native.capture.prevent="preventPaste" ref="editorRef" class="editor" :editor="editor"
+                        :style="heightStyleCont"/>
+      </div>
+      <div v-if="voiceStatus" class="speak">
+        <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>
+          <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>
@@ -80,34 +89,10 @@
         </div>
       </div>
     </div>
-    <div class="microphone" v-if="voiceStatus">
-      <div class="microphone-cont" :class="{'mic-anim': recordingStatus}">
-        <div class="microphone1">
-          <div class="microphone2">
-            <div class="microphone3" @click.stop="startVoice">
-              <svgs :vol="vol"></svgs>
-              <p v-if="recordingStatus">{{ voiceLoading? '语音转换中...': `正在说话：${countdown}s` }}</p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="microphone-text">{{ recordingStatus?'按下停止说话':'按下开始说话' }}</div>
-    </div>
-    <div class="text-editing" v-if="textEditing">
-      <div class="text-editing-cont">
-        <p>语音转换结果：</p>
-        <zydx-textarea ref="textarea" :height="130" :value="voiceContent"></zydx-textarea>
-        <div class="text-editing-but">
-          <button class="buts" @click="editingConfirm">确认</button>
-          <button class="buts" @click="editingCancel">取消</button>
-        </div>
-      </div>
-    </div>
   </div>
 </template>
 <script>
 import Recorder from 'js-audio-recorder'
-import axios from 'axios'
 import zydxTextarea from '../../textarea/src/textarea'
 import {html2json, json2html} from 'html2json'
 import {Editor, EditorContent} from '@tiptap/vue-3'
@@ -120,7 +105,7 @@ import textStyle from '@tiptap/extension-text-style'
 import {sid} from "./sign-id";
 import {FontSize} from "./font-size";
 import {titleId} from "./title-id";
-import svgs from "./microphone";
+import svgs from "./level";
 
 export default {
   name: 'zydx-xiao-editor',
@@ -137,20 +122,20 @@ export default {
       heightStyleCont: {},
       voiceStatus: false,
       recorder: null,
-      drawRecordId: null,
-      recordingStatus: false,
-      countdown: 59,
-      fileSize: 0,
+      ws: null,
+      audioContext: null,
+      audioData: [],
       vol: 0,
-      base64: '',
-      voiceContent: '',
-      voiceLoading: false,
-      textEditing: false
+      appData: {},
+      error: false,
+      time: {}
     }
   },
   beforeUnmount() {
-    this.editor.destroy()
-    this.recorder.destroy()
+    this.editor?.destroy()
+    this.recorder?.destroy()
+    this.ws?.send(JSON.stringify({"type":"CANCEL"}))
+    this.ws?.close()
   },
   props: {
     data: {
@@ -271,6 +256,7 @@ export default {
     this.editor = new Editor({
       content: json2html({node: "root", child: (this.data.html === undefined || null) ? [] : this.data.html}),
       editable: this.readOnly,
+      enablePasteRules: true,
       extensions: [
         sid,
         StarterKit,
@@ -311,16 +297,7 @@ export default {
         }
       }
     })
-    // 处理粘贴事件
-    this.$refs.editorRef.$el.addEventListener('paste', (event) => {
-      event.preventDefault();
-      const text = event.clipboardData.getData('text/plain');
-      const index = this.editor.state.selection.$anchor.path[1]
-      this.editor.chain().focus().insertContentAt(this.selection(), `<p>${text}</p>`).run()
-      const json = this.editor.getJSON()
-      json.content.splice(index, 1)
-      this.editor?.commands.setContent(json)
-    })
+    _this.appID()
     // 初始化录音
     this.recorder = new Recorder({
       sampleBits: 16, // 采样位数，支持 8 或 16，默认是16
@@ -328,116 +305,152 @@ export default {
       numChannels: 1, // 声道，支持 1 或 2， 默认是1
     })
     this.recorder.onprogress = function (params) {
-      if(_this.countdown <= 0) {
-        _this.stopRecording()
-      }else {
-        _this.countdown = 59 - parseInt(params.duration)
-        _this.fileSize = params.fileSize
-        _this.vol = params.vol
-      }
+      _this.vol = params.vol
     }
   },
   methods: {
-    editingConfirm() {
-      this.textEditing = false
-      const html = this.$refs.textarea.getContent().split('<br>')
-      let editorHtml = this.editor.getHTML()
-      for(let i=0; i< html.length; i++) {
-        editorHtml += `<p>${html[i]}</p>`
+    // 粘贴文本处理
+    preventPaste(event) {
+      const text = event.clipboardData.getData('text/plain');
+      const text2 = text.replace(/[\r\n]/g, '').replace(/\s*/g, '')
+      this.editor.chain().focus().insertContentAt(this.selection(), text2).run()
+    },
+    to16kHz(audioData, sampleRate = 44100) {
+      const data = new Float32Array(audioData);
+      const fitCount = Math.round(data.length * (16000 / sampleRate));
+      const newData = new Float32Array(fitCount);
+      const springFactor = (data.length - 1) / (fitCount - 1);
+      newData[0] = data[0];
+      for (let i = 1; i < fitCount - 1; i++) {
+        const tmp = i * springFactor;
+        const before = Math.floor(tmp).toFixed();
+        const after = Math.ceil(tmp).toFixed();
+        const atPoint = tmp - before;
+        newData[i] = data[before] + (data[after] - data[before]) * atPoint;
       }
-      this.editor.commands.setContent(editorHtml.replace(/<p><\/p>/g, ''))
-    },
-    editingCancel() {
-      this.textEditing = false
+      newData[fitCount - 1] = data[data.length - 1];
+      return newData;
+    },
+    to16BitPCM(input) {
+      const dataLength = input.length * (16 / 8);
+      const dataBuffer = new ArrayBuffer(dataLength);
+      const dataView = new DataView(dataBuffer);
+      let offset = 0;
+      for (let i = 0; i < input.length; i++, offset += 2) {
+        const s = Math.max(-1, Math.min(1, input[i]));
+        dataView.setInt16(offset, s < 0 ? s * 0x8000 : s * 0x7fff, true);
+      }
+      return dataView;
+    },
+    getAudioSuccess() {
+      let that = this
+      const mediaStreamSource = that.recorder.audioInput
+      // 创建一个音频分析对象，采样的缓冲区大小为0（自动适配），输入和输出都是单声道
+      const scriptProcessor = that.recorder.context.createScriptProcessor(1024, 1, 1);
+      scriptProcessor.onaudioprocess = (e) => {
+        // 去处理音频数据
+        const inputData = e.inputBuffer.getChannelData(0)
+        const output = that.to16kHz(inputData, that.recorder.context.sampleRate);
+        const audioData = that.to16BitPCM(output);
+        that.audioData.push(...new Int8Array(audioData.buffer));
+        if (that.audioData.length > 10240) {
+          const audioDataArray = new Int8Array(that.audioData);
+          that.ws.send(audioDataArray)
+          that.audioData = [];
+        }
+      }
+      mediaStreamSource.connect(scriptProcessor);
+      scriptProcessor.connect(that.recorder.context.destination);
     },
-    // 语音输入
     voice() {
-      this.voiceStatus = !this.voiceStatus
-      this.recorder.stop() // 停止录音
-      this.recorder.destroy() // 销毁录音
-    },
-    startVoice() {
-      if (!this.recordingStatus) {
+      let that = this
+      that.voiceStatus = !this.voiceStatus
+      if(that.voiceStatus) {
         this.recorder.start().then(() => { // 开始录音
-          this.fileSize = 0
-          this.recordingStatus = true
+          this.audioData  = []
+          this.webSocketInit()
         }, (error) => {
-          this.recordingStatus = false
+          this.$message({
+            type: 'text',
+            cancelShow: false,
+            promptContent: '录音失败，请检查麦克风是否可用'
+          })
         });
-      } else {
-        this.stopRecording()
+      }else {
+        that.close()
       }
     },
-    stopRecording() {
+    close() {
+      this.voiceStatus = false
+      this.ws.send(JSON.stringify({"type":"CANCEL"}))
+      this.ws.close()
       this.recorder.stop() // 停止录音
-      this.countdown = 59
-      this.vol = 0
-      // 获取录音文件
-      const pcm = this.recorder.getPCMBlob()
-      const file = new File([pcm], 'audio.pcm', {type: 'audio/pcm'})
-      let reader = new FileReader();
-      reader.readAsDataURL(file)
-      reader.onload = async () => {
-        this.base64 = reader.result.split('base64,')[1]
-        await this.getSpeech()
-      }
+      this.recorder.destroy()
     },
-    getAccessToken() {
-      return new Promise((rl, re) => {
-        const remember = localStorage.getItem('remember')
-        let token = ''
-        if(remember === '1') {
-          token = localStorage.getItem('sessionId')
-        }else {
-          token = sessionStorage.getItem('sessionId')
+    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.error = false
+        const json = {
+          type: 'START',
+          data: {
+            appid: Number(_this.appData.qfClientId),
+            appkey: _this.appData.qfClientSecret,
+            dev_pid: 15372,
+            cuid: 'HpURryNC91ddJmAPq7iwu26OvMDW4jMS',
+            format: 'pcm',
+            sample: 16000,
+          }
         }
-        const xhr = new XMLHttpRequest()
-        // xhr.open('POST', 'http://192.168.15.126:8888/zydx/voice/getBaiduToken')
-        xhr.open('POST', '/zydx/voice/getBaiduToken')
-        // xhr.setRequestHeader('Authorization', '5c9826f8-da53-44f1-9141-5917df6acab2')
-        xhr.setRequestHeader('Authorization', token)
-        const params = new URLSearchParams()
-        params.append('type', 'voice')
-        xhr.onreadystatechange = () => {
-          if (xhr.readyState === 4) {
-            if (xhr.status === 200) {
-              rl(JSON.parse(xhr.responseText).data)
-            }
+        _this.ws.send(JSON.stringify(json))
+        _this.getAudioSuccess()
+      }
+      _this.ws.onmessage = function (e) {
+        const data = JSON.parse(e.data)
+        if(data.err_no === 0){
+          const json = _this.editor.getJSON()
+          const index = _this.editor.state.selection.$anchor.path[1]
+          if(data.start_time === _this.time.start_time) {
+            const text = json.content[index].content[0].text
+            json.content[index].content[0].text = text.slice(0, text.length - _this.time.result.length) + data.result
+            _this.editor.commands.setContent(json)
+          }else {
+            _this.editor.chain().focus().insertContentAt(_this.selection(), data.result).run()
           }
+          _this.time = data
         }
-        xhr.send(params)
-      })
+      }
+      _this.ws.onerror = function () {
+        // 连接失败重连
+        setTimeout(() => {
+          _this.error = true
+          _this.webSocketInit()
+        }, 5000)
+      }
     },
-    async getSpeech() {
-      const _this = this
-      const obj = {
-        format: "pcm",
-        rate: 16000,
-        channel: 1,
-        cuid: "HpURryNC91ddJmAPq7iwu26OvMDW4jMS",
-        speech: this.base64,
-        len: this.recorder.fileSize,
-        token: await this.getAccessToken()
-      };
-      _this.voiceLoading = true
-      axios.post('/server_api',obj)
-          .then(function(data){
-            _this.voiceLoading = false
-            _this.voiceStatus = false
-            _this.recordingStatus = false
-            _this.textEditing = true
-            _this.voiceContent = ''
-            for(let i=0; i< data.data.result.length; i++) {
-              if((i + 1) >= data.data.result.length) {
-                _this.voiceContent += data.data.result[i]
-              }else {
-                _this.voiceContent += `${data.data.result[i]}<bt>`
-              }
-            }
-          })
-          .catch(function(err){
-            console.log(err)
-          });
+    appID() {
+      let token = null
+      let remember = localStorage.getItem('remember')
+      if(remember === '1') {
+        token = localStorage.getItem('sessionId')
+      }else {
+        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', '/zydx/voice/getDesKeyId')
+      xhr.setRequestHeader('Authorization', token)
+      xhr.onreadystatechange = () => {
+        if (xhr.readyState === 4) {
+          if (xhr.status === 200) {
+            this.appData = JSON.parse(xhr.responseText).data
+          }
+        }
+      }
+      xhr.send()
     },
     enclosureAction(v) {
       return v.map(x => {
@@ -623,6 +636,19 @@ export default {
       if (v === 'centerH2') this.editor.chain().focus().setFontSize('16px').setBold().setTextAlign('center').run()
       if (v === 'leftH2') this.editor.chain().focus().setFontSize('16px').setBold().setTextAlign('left').run()
       if (v === 'rightH2') this.editor.chain().focus().setFontSize('16px').setBold().setTextAlign('right').run()
+    },
+    getRandomCode(length) {
+      if (length > 0) {
+        let data = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
+        let nums = "";
+        for (let i = 0; i < length; i++) {
+          let r = parseInt(Math.random() * 61);
+          nums += data[r];
+        }
+        return nums.replace(/(.{4})/g, "$1-");
+      } else {
+        return false;
+      }
     }
   }
 }
@@ -630,142 +656,33 @@ export default {
 </script>
 
 <style scoped>
-.text-editing-but{
-  text-align: center;
-  margin-top: 5px;
-}
-.text-editing{
-  position: fixed;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  z-index: 50;
-  display: flex;
-  align-items: center;
-  padding-left: 320px;
+.speak{
+  text-align: right;
+  padding: 5px 0;
 }
-.text-editing-cont{
-  width: 600px;
-  padding: 20px;
-  box-sizing: border-box;
-  box-shadow: 0 0 10px rgba(204,204,204,.3);
-  background: #fff;
-  margin: 0 auto;
+.speak-cont{
+  background: rgba(67, 207, 124, 1);
+  color: #fff;
+  padding: 0 10px;
+  height: 30px;
+  line-height: 30px;
   display: inline-block;
+  border-radius: 20px;
 }
-.text-editing-cont p{
-  font-size: 16px;
-  line-height: 24px;
-  font-weight: 700;
-}
-.mic-anim .microphone1{
-  animation: mic-anim 1.5s infinite;
-}
-@keyframes mic-anim{
-  0%{
-    background: rgba(67, 207, 124, 0.2);
-  }
-  80%{
-    background: rgba(67, 207, 124, 0.4);
-  }
-  100%{
-    background: rgba(67, 207, 124, 0.2);
-  }
-}
-.mic-anim .microphone2{
-  animation: mic-anim2 1.5s infinite;
-}
-@keyframes mic-anim2{
-  0%{
-    background: rgba(67, 207, 124, 0.4);
-  }
-  40%{
-    background: rgba(67, 207, 124, 0.6);
-  }
-  80%{
-    background: rgba(67, 207, 124, 0.4);
-  }
-  100%{
-    background: rgba(67, 207, 124, 0.4);
-  }
-}
-.mic-anim .microphone3{
-  animation: mic-anim3 1.5s infinite;
+.speak-cont svg{
+  vertical-align: middle;
+  margin-top: -3px;
 }
-@keyframes mic-anim3{
-  0%{
-    background: rgba(67, 207, 124, 0.8);
-  }
-  20%{
-    background: rgba(67, 207, 124, 1);
-  }
-  40%{
-    background: rgba(67, 207, 124, 0.8);
-  }
-  100%{
-    background: rgba(67, 207, 124, 0.8);
-  }
-}
-.microphone{
-  position: fixed;
-  left: 50%;
-  top: 50%;
-  z-index: 50;
-  width: 200px;
-  margin-left: 60px;
-  margin-top: -120px;
-}
-.microphone-cont{
-  width: 200px;
-  height: 200px;
-  border-radius: 50%;
-  position: relative;
-}
-.microphone1{
-  width: 200px;
-  height: 200px;
-  border-radius: 50%;
-  background: rgba(67, 207, 124, 0.3);
-}
-.microphone2{
-  width: 160px;
-  height: 160px;
-  border-radius: 50%;
-  background: rgba(67, 207, 124, 0.5);
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  z-index: 1;
-  transform: translate(-50%,-50%);
-}
-.microphone3{
-  width: 120px;
-  height: 120px;
-  border-radius: 50%;
-  background: rgba(67, 207, 124, 0.8);
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  z-index: 1;
-  transform: translate(-50%,-50%);
-  text-align: center;
-  padding-top: 18px;
-  box-sizing: border-box;
-  cursor: pointer;
-}
-.microphone3 p{
-  font-size: 12px;
-  color: #fff;
-  line-height: 18px;
+.speak-cont span{
+  font-size: 14px;
+  padding: 0 5px;
 }
-.microphone-text{
-  text-align: center;
-  margin-top: 12px;
-  font-size: 18px;
-  line-height: 26px;
+.text-editing-cont p {
+  font-size: 16px;
+  line-height: 24px;
   font-weight: 700;
 }
+
 :deep(.imgCont) {
   line-height: 0 !important;
 }
@@ -934,6 +851,7 @@ export default {
   display: inline-block;
   position: relative;
 }
+
 .schedule span {
   font-size: 12px;
   position: absolute;

package/src/components/editor2/src/level.vue

@@ -0,0 +1,64 @@
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="14" height="14"
+       viewBox="0 0 16 16" fill="none">
+    <g opacity="1" transform="translate(0 0)  rotate(0)">
+      <mask id="bg-mask-0" fill="white">
+        <use transform="translate(0 0)  rotate(0)" xlink:href="#path_0"></use>
+      </mask>
+      <g mask="url(#bg-mask-0)">
+        <rect :fill="volFill(vol,1)" x="1" y="12" width="2" height="5"/>
+        <rect :fill="volFill(vol,2)" x="5" y="8" width="2" height="9"/>
+        <rect :fill="volFill(vol,3)" x="9" y="4" width="2" height="13"/>
+        <rect :fill="volFill(vol,4)" x="13" y="0" width="2" height="17"/>
+      </g>
+    </g>
+    <defs>
+      <rect id="path_0" x="0" y="0" width="16" height="16"/>
+    </defs>
+  </svg>
+</template>
+
+<script>
+   export default {
+     props: {
+       vol: {
+         type: Number,
+         default: 0
+       }
+     },
+     methods: {
+       volFill(v,n) {
+         v = Math.floor(v)
+         if(n === 1) {
+            if(v >= 10) {
+              return '#fff'
+            } else {
+              return '#12A64D'
+            }
+          } else if(n === 2) {
+            if(v >= 25) {
+              return '#fff'
+            } else {
+              return '#12A64D'
+            }
+          } else if(n === 3) {
+            if(v >= 35) {
+              return '#fff'
+            } else {
+              return '#12A64D'
+            }
+          } else if(n === 4) {
+            if(v >= 45) {
+              return '#fff'
+            } else {
+              return '#12A64D'
+            }
+         }
+       }
+     }
+   }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -31,7 +31,7 @@
 <script>
 import * as PdfJs from 'pdfjs-dist/legacy/build/pdf.js' // 注意导入的写法d
 PdfJs.GlobalWorkerOptions.workerSrc = require('pdfjs-dist/build/pdf.worker.entry')
-const jsdelivr = 'https://cdn.jsdelivr.net/npm/pdfjs-dist@2.16.105/cmaps/'
+const jsdelivr = '/zydx/static/cmaps/'
 export default {
     name: "zydx-flip",
     data() {

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

@@ -95,7 +95,7 @@ export default {
             let that = this
             const loadingTask = PdfJs.getDocument({
                 url: this.url,
-                cMapUrl: "https://cdn.jsdelivr.net/npm/pdfjs-dist@2.2.228/cmaps/",
+                cMapUrl: "/zydx/static/cmaps/",
                 cMapPacked: true
             })
             loadingTask.promise.then((pdf) => {

package/src/index.js

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

package/src/components/editor2/src/microphone.vue

@@ -1,47 +0,0 @@
-<template>
-  <div>
-    <svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 38 68" width="36" height="68">
-      <path id="并集_轮廓_" data-name="并集 (轮廓)" fill="#ccc"
-            d="M10,44a3,3,0,0,1-3-3V3a3,3,0,0,1,3-3H28a3,3,0,0,1,3,3V41a3,3,0,0,1-3,3Zm17-4V4H11V40ZM0,47V24a2,2,0,0,1,4,0V45a2,2,0,0,0,2,2H32a2,2,0,0,0,2-2V24a2,2,0,0,1,4,0V47a4,4,0,0,1-4,4H21v9c7.34.26,13,1.93,13,4,0,2.21-6.72,4-15,4S4,66.21,4,64c0-2,5.66-3.7,13-4V51H4A4,4,0,0,1,0,47ZM19,64h.79L19,64l-.79,0Z"/>
-      <rect fill="#fff" x="11" y="4" width="16" height="36"/>
-      <rect class="volume" :height="volume(vol)" width="12" :y="volume2(vol)" x="13" :fill="vol === 0? '#CCCCCC':'#43cf7c'"/>
-    </svg>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "microphone",
-  props: {
-    vol: {
-      type: Number,
-      default: 0
-    }
-  },
-  data() {
-    return {}
-  },
-  methods: {
-    volume(v) {
-      if(v === 0) {
-        return 32
-      }else {
-        return v/3 > 32 ? 32 : v/5
-      }
-    },
-    volume2(v) {
-      if(v === 0) {
-        return 6
-      }else {
-        return 6 + 32 - this.volume(v)
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.volume {
-  transition: all 0.2s;
-}
-</style>