zydx-plus 1.35.515 → 1.35.517

package/package.json

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

package/src/components/dragPopup/src/dragPopup.vue

@@ -215,6 +215,33 @@ export default {
   },
   emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup'],
   methods: {
+    // 全屏
+    fullScreen() {
+      const myElement = document.body;
+      if (myElement.requestFullscreen) {
+        myElement.requestFullscreen();
+      } else if (myElement.mozRequestFullScreen) { // Firefox
+        myElement.mozRequestFullScreen();
+      } else if (myElement.webkitRequestFullscreen) { // Chrome, Safari and Opera
+        myElement.webkitRequestFullscreen();
+      } else if (myElement.msRequestFullscreen) { // IE and Edge
+        myElement.msRequestFullscreen();
+      }
+      this.state = true
+    },
+    // 退出全屏
+    exitFullscreen() {
+      if (document.exitFullscreen) {
+        document.exitFullscreen();
+      } else if (document.mozCancelFullScreen) {
+        document.mozCancelFullScreen();
+      } else if (document.webkitExitFullscreen) {
+        document.webkitExitFullscreen();
+      } else if (document.msExitFullscreen) {
+        document.msExitFullscreen();
+      }
+      this.state = false
+    },
     dragTap() {
       let pop = JSON.parse(sessionStorage.getItem('pop'))
       for(let i = 0; i< pop.length; i++) {
@@ -328,21 +355,21 @@ export default {
       this.footIsMove = false;
     },
     enlarge() {
-      this.state = false
-      let clientWidth = document.documentElement.clientWidth;
-      let clientHeight = document.documentElement.clientHeight;
-      if (clientWidth === this.footRightOffset && clientHeight === this.footDownOffset) {
+      let clientWidth = window.innerWidth
+      if(this.state) {
+        this.exitFullscreen()
         this.x = clientWidth / 2 - this.width / 2;
-        this.y = clientHeight / 2 - this.height / 2;
+        this.y = window.innerHeight / 2 - this.height / 2;
         this.footDownOffset = this.height;
         this.footRightOffset = this.width;
-        this.state = false
-      } else {
-        this.x = 0;
-        this.y = 0;
-        this.footDownOffset = clientHeight;
-        this.footRightOffset = clientWidth;
-        this.state = true
+      }else {
+        this.fullScreen()
+        setTimeout(() => {
+          this.x = 0;
+          this.y = 0;
+          this.footDownOffset = window.innerHeight;
+          this.footRightOffset = clientWidth;
+        },100)
       }
       this.$emit('updateDrag', {
         width: this.footRightOffset,
@@ -355,11 +382,13 @@ export default {
     minimizeTap() {
       this.isMove = false
       this.footIsMove = false
+      this.exitFullscreen()
       this.$emit('minimize');
     },
     close() {
       this.isMove = false
       this.footIsMove = false
+      this.exitFullscreen()
       this.$emit('close');
     },
     selectedDrag(){

package/src/components/dragPopup2/src/dragPopup.vue

@@ -223,6 +223,33 @@ export default {
   },
   emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup'],
   methods: {
+    // 全屏
+    fullScreen() {
+      const myElement = document.body;
+      if (myElement.requestFullscreen) {
+        myElement.requestFullscreen();
+      } else if (myElement.mozRequestFullScreen) { // Firefox
+        myElement.mozRequestFullScreen();
+      } else if (myElement.webkitRequestFullscreen) { // Chrome, Safari and Opera
+        myElement.webkitRequestFullscreen();
+      } else if (myElement.msRequestFullscreen) { // IE and Edge
+        myElement.msRequestFullscreen();
+      }
+      this.state = true
+    },
+    // 退出全屏
+    exitFullscreen() {
+      if (document.exitFullscreen) {
+        document.exitFullscreen();
+      } else if (document.mozCancelFullScreen) {
+        document.mozCancelFullScreen();
+      } else if (document.webkitExitFullscreen) {
+        document.webkitExitFullscreen();
+      } else if (document.msExitFullscreen) {
+        document.msExitFullscreen();
+      }
+      this.state = false
+    },
     dragTap() {
       if(this.zIndex > 0) return
       let pop = JSON.parse(sessionStorage.getItem('pop'))
@@ -334,21 +361,21 @@ export default {
       this.footIsMove = false;
     },
     enlarge() {
-      this.state = false
-      let clientWidth = document.documentElement.clientWidth;
-      let clientHeight = document.documentElement.clientHeight;
-      if (clientWidth === this.footRightOffset && clientHeight === this.footDownOffset) {
+      let clientWidth = window.innerWidth
+      if(this.state) {
+        this.exitFullscreen()
         this.x = clientWidth / 2 - this.width / 2;
-        this.y = clientHeight / 2 - this.height / 2;
+        this.y = window.innerHeight / 2 - this.height / 2;
         this.footDownOffset = this.height;
         this.footRightOffset = this.width;
-        this.state = false
-      } else {
-        this.x = 0;
-        this.y = 0;
-        this.footDownOffset = clientHeight;
-        this.footRightOffset = clientWidth;
-        this.state = true
+      }else {
+        this.fullScreen()
+        setTimeout(() => {
+          this.x = 0;
+          this.y = 0;
+          this.footDownOffset = window.innerHeight;
+          this.footRightOffset = clientWidth;
+        },100)
       }
       this.$emit('updateDrag', {
         width: this.footRightOffset,

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

@@ -314,14 +314,14 @@ export default {
       // 清屏
       if (this.toolId === 'clear') {
         this.$refs.sketchpad.clear()
-        setTimeout(() => { // 解决清屏篡位的问题
-          this.width = this.width2 - 0.02
-          this.height = this.height2 - 0.02
-          setTimeout(() => {
-            this.width2 = this.width
-            this.height2 = this.height
-          },10)
-        },10)
+        // setTimeout(() => { // 解决清屏篡位的问题
+        //   this.width = this.width2 - 0.02
+        //   this.height = this.height2 - 0.02
+        //   setTimeout(() => {
+        //     this.width2 = this.width
+        //     this.height2 = this.height
+        //   },10)
+        // },10)
       }
       // 橡皮
       if (this.toolId === 'rubber') {
@@ -546,11 +546,13 @@ export default {
       }, 100)
     },
     mousemove(e) {
+      e.stopPropagation()
       if (!this.pressDown) return
       this.left = e.clientX - this.leftOffset;
       this.top = e.clientY - this.topOffset;
     },
     mouseup(e) {
+      e.stopPropagation()
       clearInterval(timer)
       if (!this.pressDown) {
         stayTime = 0

package/src/index.js

@@ -89,7 +89,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.515',
+    version: '1.35.517',
     install,
     Calendar,
     Message,