zydx-plus 1.32.263 → 1.32.265

package/package.json

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

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

@@ -7,9 +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>
+<!--          <button v-else-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;">
@@ -17,6 +17,9 @@
           </label>
           <button v-else class="buts" @click="toolTap(item.key)">{{ item.title }}</button>
         </div>
+        <button v-if="voiceShow" class="buts" @mousedown.stop="speechDown" @click="voice()"
+                :style="{color: (voiceStatus)? '#00ff00' :'#000'}">{{ voiceStatus ? '关闭语音' : '语音输入' }}
+        </button>
       </div>
     </div>
     <div class="ed-cont" :style="heightStyleCont">
@@ -24,7 +27,7 @@
         <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="voiceShows" class="speak"
            @mousedown.stop="mousedown"
            @mouseup.stop="mouseup"
            :style="{transform: `translate(${x}px, ${y}px)`}">
@@ -137,7 +140,9 @@ export default {
       isMove: false,
       x: 0,
       y: 0,
-      speech: {}
+      speech: {},
+      limits: false,
+      voiceShows: false
     }
   },
   beforeUnmount() {
@@ -236,6 +241,10 @@ export default {
     placeholder: {
       type: String,
       default: '请输入内容'
+    },
+    voiceShow: {
+      type: Boolean,
+      default: true
     }
   },
   emits: ['see', 'del', 'complete', 'update:data', 'enclosureSuccess', 'download', 'updateData'],
@@ -256,22 +265,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
-    }
+    // 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() {
     let _this = this
@@ -311,7 +320,15 @@ export default {
           html: html2json(editor.getHTML()).child,
           enclosure: this.uploadAttData
         })
-      }
+      },
+      onBlur: ({editor}) => {
+        this.limits = false
+        this.close()
+      },
+      // 获取焦点
+      onFocus: ({editor}) => {
+        this.limits = true
+      },
     })
     document.addEventListener('keydown', function (e) {
       if (e.keyCode === 8 || e.keyCode === 46) {
@@ -335,9 +352,14 @@ export default {
     }
     document.addEventListener('mousemove', (event) => {
       if (!this.isMove) return
+      this.limits = true
       this.x = event.clientX - this.left;
       this.y = event.clientY - this.top;
     })
+    document.addEventListener('click', (event) => {
+      if(this.limits) return
+      this.close()
+    })
   },
   methods: {
     speechDown(e) {
@@ -355,6 +377,9 @@ export default {
     },
     mouseup() {
       this.isMove = false
+      setTimeout(() => {
+        this.limits = false
+      },10)
     },
     // 粘贴文本处理
     preventPaste(event) {
@@ -410,29 +435,37 @@ export default {
       scriptProcessor.connect(that.recorder.context.destination);
     },
     voice() {
-      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: '录音失败，请检查麦克风是否可用'
-        })
-      });
+      this.voiceStatus = !this.voiceStatus
+      this.limits = false
+      if(this.voiceStatus) {
+        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.voiceShows = this.voiceStatus
+          this.appID()
+        }, (error) => {
+          this.$message({
+            type: 'text',
+            cancelShow: false,
+            promptContent: '录音失败，请检查麦克风是否可用'
+          })
+        });
+      }else {
+        this.close()
+      }
     },
     close() {
       if(this.ws === null) return
-      this.toolbar.map(x => {
-        if (x.key === 'speech') {
-          x.active = false
-        }
-        return x
-      })
+      // this.toolbar.map(x => {
+      //   if (x.key === 'speech') {
+      //     x.active = false
+      //   }
+      //   return x
+      // })
       this.voiceStatus = false
+      this.voiceShows = this.voiceStatus
       this.ws?.send(JSON.stringify({"type":"CANCEL"}))
       this.ws?.close()
       this.ws = null
@@ -490,10 +523,10 @@ export default {
         token = sessionStorage.getItem('sessionId')
       }
       const xhr = new XMLHttpRequest()
-      // 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)
+      xhr.open('GET', 'http://192.168.15.124:8888/zydx/voice/getDesKeyId')
+      xhr.setRequestHeader('Authorization', '7a129186-7e51-431d-b965-735dfed8e459')
+      // xhr.open('GET', '/zydx/voice/getDesKeyId')
+      // xhr.setRequestHeader('Authorization', token)
       this.error = true
       xhr.onreadystatechange = () => {
         if (xhr.readyState === 4) {
@@ -820,7 +853,7 @@ export default {
 }
 
 .ed-head-but label span {
-  line-height: 15px !important;
+  line-height: 16px !important;
 }
 
 .ed-title {
@@ -905,6 +938,7 @@ export default {
   display: inline-block;
   line-height: 16px;
   box-sizing: border-box;
+  font-family: Arial;
 }
 
 .but-f {
@@ -925,4 +959,12 @@ export default {
   transform: scale(.8);
   color: #fff;
 }
+@-moz-document url-prefix() {
+  .buts {
+    line-height: 1px;
+  }
+  .ed-head-but label span {
+    line-height: 14px !important;
+  }
+}
 </style>

package/src/components/preface/src/preface.vue

@@ -114,7 +114,7 @@ export default {
     overflow: hidden;
 }
 .preface-input>input{
-    width: 50px;
+    width: 55px;
     height: 29px;
     border: none;
     padding-left: 5px;

package/src/components/tipBox/src/main.vue

@@ -35,7 +35,7 @@
                         </div>
                         <div class="tip-img" v-if="type === 'input'">
                             <div class="tip-input" v-for="(item,index) in inputArr" :key="index">
-                                <span v-if="item.name"><em>{{ item.name }}</em><i v-if="item.required">*</i></span>
+                                <span v-if="item.name"><em>{{ item.name.replace(/：/g,"").replace(/:/g,"") }}</em><b>:</b><i v-if="item.required">*</i></span>
                                 <div v-if="item.type === 'file'" class="file-cont">
                                     <em>{{ fileName }}</em>
                                     <label>

package/src/components/tipBox/src/zydxStyle.css

@@ -92,7 +92,7 @@
 .tip-btnBox > div {
     width: 60px;
     height: 22px;
-    line-height: 22px;
+    line-height: 20px;
     margin-right: 10px;
     border-radius: 3px;
     border: 1px solid #000000;
@@ -143,6 +143,8 @@
     min-width: 65px;
     display: inline-block;
     text-align-last: justify;
+    word-break: break-all;
+    text-justify: distribute;
 }
 
 .tip-input > span > i {
@@ -339,4 +341,4 @@
     top: 3px;
     left: 0;
     z-index: 1;
-}
+}

package/src/index.js

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