zydx-plus 1.33.434 → 1.33.435

package/package.json

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

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

@@ -425,6 +425,12 @@ export function butJson(editor, data) {
                     childMenuKeys: [],
                     html: `<p data-signId="enclosure"><span style="font-weight: 700;font-size: 16px;">附件列表：</span></p>`
                 },
+                {
+                    name: '插入白板',
+                    key: 'paint',
+                    childMenuKeys: [],
+                    html: ''
+                }
             ],
         }
     }

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

@@ -565,6 +565,7 @@
         </zydx-drag-popup>-->
 
   </div>
+  <Paint v-if="paintShow" title="插入白板" @exportImg="exportImg" :uploadImage="uploadImage" :url="uploadImage?.url" @cancel="paintCancel"></Paint>
 </template>
 
 <script lang="jsx">
@@ -613,6 +614,7 @@ import MarginNarrow from "../src/margin-narrow.vue";
 import MarginStandard from "../src/margin-standard.vue";
 import MarginWide from "../src/margin-wide.vue";
 import isSelect from "../src/isSelect.vue";
+import Paint from '../../paint/src/paint'
 
 const img = require('./image/annotation.png')
 export default {
@@ -630,7 +632,7 @@ export default {
     zydxColoring,
     zydxDragPopup,
     zydxSelect,
-    delSvg, editSvg, viewSvg
+    delSvg, editSvg, viewSvg,Paint
   },
   beforeUnmount() {
     this.editor.destroy()
@@ -641,6 +643,7 @@ export default {
   },
   data() {
     return {
+      paintShow: false,
       pageMarginSvg: [
         {
           iconName: 'MarginStandard',
@@ -1343,6 +1346,20 @@ export default {
   },
   emits: ['confirm', 'enclosure', 'enlDownload', 'enlSee'],
   methods: {
+    // 插入白板数据
+    exportImg(e) {
+      this.uploadFile(e, this.uploadImage).then(r => {
+        this.paintShow = false
+        this.uploadImage.customInsert(r, (e) => {
+          this.imgUrl = e
+          this.imgPopType = 'insertImage'
+          this.imgConfirm()
+        })
+      })
+    },
+    paintCancel() {
+      this.paintShow = false
+    },
     selectMargin(selectItem) {
       this.pageMarginSvg.forEach(item => {
         item.isSelect = item.title === selectItem.title;
@@ -3208,6 +3225,9 @@ export default {
         if (key.key === 'group-upload') {
           this.isShowUpload = true
         }
+        if (key.key === 'paint') {
+          this.paintShow = true
+        }
         // 添加图片
         if (key.key === 'group-image') {
           if (childKey.key === 'insertImage') {
@@ -4105,9 +4125,6 @@ label {
   height: 10px;
 }
 
-:deep(.imgCont) {
-  line-height: 0 !important;
-}
 
 .img-pop {
   position: absolute;
@@ -4540,7 +4557,10 @@ li {
   align-items: flex-start;
   font-size: 12px;
 }
-
+:deep(p:has(>img)) {
+  line-height: 0 !important;
+  text-indent: 0 !important;
+}
 .tip-btnBox > div {
   width: 60px;
   height: 20px;

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

@@ -15,6 +15,7 @@
           </label>
           <button v-else class="buts" @click="toolTap(item.key)">{{ item.title }}</button>
         </div>
+        <button class="buts" @click="toolTap('paint')">插入白板</button>
         <button v-if="voiceShow" class="buts" @mousedown.stop="speechDown" @click="voice()"
                 :style="{color: (voiceStatus)? '#4B0C77' :'#000'}">{{ voiceStatus ? '关闭语音' : '语音输入' }}
         </button>

package/src/components/paint/src/paint.vue

@@ -215,6 +215,10 @@ export default {
     url: {
       type: String,
       default: ''
+    },
+    uploadImage: {
+      type: Object,
+      default: () => {}
     }
   },
   emits: ['cancel','exportImg'],
@@ -366,14 +370,20 @@ export default {
         let formData = new FormData();
         formData.append('file', file);
         // xhr.open('POST', 'https://192.168.8.81:8081/zydx/latex/get')
-        // xhr.setRequestHeader('Authorization', '276b6213-5937-49bd-9019-498ddb4dfd4f')
+        // xhr.setRequestHeader('Authorization', '80f6a0c2-eb43-4f4a-8f3e-ab3bf7b447be')
         xhr.open('GET', '/zydx/latex/get')
         xhr.setRequestHeader('Authorization', token)
         this.error = true
         xhr.onreadystatechange = () => {
           if (xhr.readyState === 4) {
             if (xhr.status === 200) {
-              rl(`${this.url}${JSON.parse(xhr.responseText).data}`)
+              if(this.url) {
+                rl(`${this.url}${JSON.parse(xhr.responseText).data}`)
+              }else {
+                this.uploadImage.customInsert(JSON.parse(xhr.responseText), (r) => {
+                  rl(r)
+                })
+              }
             }
           }
         }

package/src/index.js

@@ -83,7 +83,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.33.434',
+    version: '1.33.435',
     install,
     Calendar,
     Message,