zydx-plus 1.33.437 → 1.33.439

package/package.json

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

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

@@ -8,7 +8,7 @@
       </div>
     </div>
     <div class="paint-cont">
-      <Sketchpad ref="sketchpad"></Sketchpad>
+      <Sketchpad ref="sketchpad" :top="false"></Sketchpad>
     </div>
     <div class="tool-cont" :style="{left: left + 'px', top: top + 'px'}">
       <div class="tool"
@@ -82,7 +82,7 @@
         </div>
       </div>
     </div>
-    <dragPopup v-if="show" :dragStatus="false" :minimizeCir="false" :enlargeShow="false" @close="close">
+    <dragPopup :width="600" :height="417" v-if="show" :dragStatus="false" :minimizeCir="false" :enlargeShow="false" @close="close">
       <template #content>
         <div class="can">
           <div class="can-cont" :id="ids + 'cont'">
@@ -111,6 +111,7 @@
 <script>
 import Sketchpad from '../../sketchpad/src/sketchpad'
 import dragPopup from '../../dragPopup/src/dragPopup'
+import Mess from '../../tipBox/index'
 
 let stayTime = 0
 let timer = null
@@ -136,6 +137,7 @@ export default {
         {id: 'formula', img: require('../src/img/gongsi.png'), name: '公式'},
         {id: 'rubber', img: require('../src/img/shanchu.png'), name: '橡皮'},
         {id: 'clear', img: require('../src/img/qingchu.png'), name: '清屏'},
+        {id: 'full', img: require('../src/img/quanping.png'), name: '全屏'},
       ],
       colorData: [
         {color: 'rgb(29, 29, 29)', name: '颜色-黑色', id: 'black'},
@@ -204,7 +206,8 @@ export default {
       num: '',
       ctx: null,
       canvasEle: null,
-      appData: ''
+      appData: '',
+      full: false
     }
   },
   props: {
@@ -238,9 +241,17 @@ export default {
   },
   methods: {
     exportTap() {
-      this.$refs.sketchpad.exportImg().then(res => {
-        document.body.style.overflow = 'visible'
-        this.$emit('exportImg', res)
+      Mess({
+        type: 'text',
+        cancelShow: false,
+        promptContent: '保存白板后，白板内容将无法再做修改'
+      }).then((res) => {
+        this.$refs.sketchpad.exportImg().then(res => {
+          document.body.style.overflow = 'visible'
+          this.$emit('exportImg', res)
+        })
+      }).catch(() => {
+        console.log('取消')
       })
     },
     // 添加公式图片
@@ -334,6 +345,34 @@ export default {
           this.link() // 画线
         }, 0)
       }
+      if(this.toolId === 'full') {
+        if(this.full) {
+          this.cancelFullscreen()
+        }else {
+          this.fullScreen(document.getElementById(this.ids))
+        }
+        this.full = !this.full
+      }
+    },
+    fullScreen(element) {
+      if (element.requestFullScreen) {
+        element.requestFullScreen()
+      } else if (element.webkitRequestFullScreen) {
+        element.webkitRequestFullScreen()
+      } else if (element.mozRequestFullScreen) {
+        element.mozRequestFullScreen()
+      }
+    },
+    cancelFullscreen() {
+      if (document.exitFullscreen) {
+        document.exitFullscreen();
+      } else if (document.msExitFullscreen) {
+        document.msExitFullscreen();
+      } else if (document.mozCancelFullScreen) {
+        document.mozCancelFullScreen();
+      } else if (document.webkitExitFullscreen) {
+        document.webkitExitFullscreen();
+      }
     },
     dataURLtoBlob(dataurl) {
       let arr = dataurl.split(',');
@@ -372,7 +411,7 @@ export default {
         formData.append('file', file);
         // xhr.open('POST', 'https://192.168.8.81:8081/zydx/latex/get')
         // xhr.setRequestHeader('Authorization', '80f6a0c2-eb43-4f4a-8f3e-ab3bf7b447be')
-        xhr.open('GET', '/zydx/latex/get')
+        xhr.open('POST', '/zydx/latex/get')
         xhr.setRequestHeader('Authorization', token)
         this.error = true
         xhr.onreadystatechange = () => {
@@ -530,6 +569,7 @@ export default {
 .can {
   padding: 10px;
   height: 100%;
+  box-sizing: border-box;
 }
 .can-pop-but-cont{
   text-align: center;

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

@@ -77,6 +77,12 @@ export default {
       // editor: null
     }
   },
+  props: {
+    top: {
+      type: Boolean,
+      default: true
+    }
+  },
   mounted() {
     // 鼠标移入
     this.$refs.reactRef.addEventListener('mouseover', () => {
@@ -131,9 +137,11 @@ export default {
     },
     handleMountedEditor(editor) {
       editorAPP = editor
-      setTimeout(() => {
-        document.documentElement.scrollTop = 0
-      }, 0)
+      if(this.top) {
+        setTimeout(() => {
+          document.documentElement.scrollTop = 0
+        }, 0)
+      }
     },
     setOpacityForNextShapes(opacity){
       editorAPP.setOpacityForNextShapes(opacity)

package/src/index.js

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