zydx-plus 1.35.528 → 1.35.529

package/package.json

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

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

@@ -12,7 +12,8 @@
       </div>
     </div>
     <div :class="{'drag-cont2': fixedStart,'drag-conts': true}">
-      <div class="drag-cont-slot">
+      <div class="drag-cont-slot" :class="{'zIndexSlot': footIsMove}">
+        <div class="zIndexSlot" v-if="footIsMove"></div>
         <slot name="content"></slot>
       </div>
       <div v-show="!fixedStart&&!autoHeight">
@@ -194,6 +195,10 @@ export default {
         this.y = this.top - scrollTop
       }
     }
+    document.addEventListener('fullscreenchange', this.handleFullScreenChange);
+    document.addEventListener('mozfullscreenchange', this.handleFullScreenChange); // Firefox
+    document.addEventListener('webkitfullscreenchange', this.handleFullScreenChange); // Chrome, Safari and Opera
+    document.addEventListener('msfullscreenchange', this.handleFullScreenChange); // IE/Edge
     // 监听窗口变化
     window.addEventListener('resize', () => {
       const wid = document.getElementById('app').offsetWidth
@@ -218,6 +223,24 @@ export default {
   },
   emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup'],
   methods: {
+    handleFullScreenChange() {
+      if (!document.fullscreenElement) {
+        let clientWidth = window.innerWidth
+        this.x = clientWidth / 2 - this.width / 2;
+        this.y = (window.innerHeight / 2 - this.height / 2) - 80;
+        this.footDownOffset = this.height;
+        this.footRightOffset = this.width;
+        this.draggableState.draggable({enabled: true})
+        this.state = false
+        this.$emit('updateDrag', {
+          width: this.footRightOffset,
+          height: this.footDownOffset - ((this.dragTextShow)?60:30),
+          left: this.x,
+          top: this.y
+        })
+        this.$emit('enlarge', this.state)
+      }
+    },
     // 全屏
     fullScreen() {
       this.draggableState.draggable({enabled: false})
@@ -391,13 +414,13 @@ export default {
     minimizeTap() {
       this.isMove = false
       this.footIsMove = false
-      this.exitFullscreen()
+      if(this.state) this.exitFullscreen()
       this.$emit('minimize');
     },
     close() {
       this.isMove = false
       this.footIsMove = false
-      this.exitFullscreen()
+      if(this.state) this.exitFullscreen()
       this.$emit('close');
     },
     selectedDrag(){
@@ -582,4 +605,13 @@ export default {
 .zIndex10000{
   z-index: 10000;
 }
+.zIndexSlot{
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  z-index: 5;
+  background-color: rgba(255,255,255,0);
+}
 </style>

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

@@ -14,6 +14,7 @@
       </div>
       <div :class="{'drag-cont2': fixedStart,'drag-conts': true}">
         <div class="drag-cont-slot">
+          <div class="zIndexSlot" v-if="footIsMove"></div>
           <slot name="content"></slot>
         </div>
         <div v-show="!fixedStart&&!autoHeight">
@@ -197,6 +198,11 @@ export default {
         this.y = this.top - scrollTop
       }
     }
+    document.addEventListener('fullscreenchange', this.handleFullScreenChange);
+    document.addEventListener('mozfullscreenchange', this.handleFullScreenChange); // Firefox
+    document.addEventListener('webkitfullscreenchange', this.handleFullScreenChange); // Chrome, Safari and Opera
+    document.addEventListener('msfullscreenchange', this.handleFullScreenChange); // IE/Edge
+
     // 监听窗口变化
     window.addEventListener('resize', () => {
       const wid = document.getElementById('app').offsetWidth
@@ -226,6 +232,24 @@ export default {
   },
   emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup'],
   methods: {
+     handleFullScreenChange() {
+       if (!document.fullscreenElement) {
+         let clientWidth = window.innerWidth
+         this.x = clientWidth / 2 - this.width / 2;
+         this.y = (window.innerHeight / 2 - this.height / 2) - 80;
+         this.footDownOffset = this.height;
+         this.footRightOffset = this.width;
+         this.draggableState.draggable({enabled: true})
+         this.state = false
+         this.$emit('updateDrag', {
+           width: this.footRightOffset,
+           height: this.footDownOffset - ((this.dragTextShow)?60:30),
+           left: this.x,
+           top: this.y
+         })
+         this.$emit('enlarge', this.state)
+       }
+    },
     // 全屏
     fullScreen() {
       this.draggableState.draggable({enabled: false})
@@ -318,6 +342,9 @@ export default {
               if (that.y > that.clientHeight - that.footDownOffset + that.footDownOffset / 2) {
                 that.y = that.clientHeight - that.footDownOffset + that.footDownOffset / 2
               }
+            },
+            onend (event) {
+              console.log('结束')
             }
           }
         })
@@ -397,13 +424,13 @@ export default {
     minimizeTap() {
       this.isMove = false
       this.footIsMove = false
-      this.exitFullscreen()
+      if(this.state) this.exitFullscreen()
       this.$emit('minimize');
     },
     close() {
       this.isMove = false
       this.footIsMove = false
-      this.exitFullscreen()
+      if(this.state) this.exitFullscreen()
       this.$emit('close');
     },
     selectedDrag(){
@@ -588,4 +615,13 @@ export default {
 .zIndex10000{
   z-index: 10000;
 }
+.zIndexSlot{
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  z-index: 5;
+  background-color: rgba(255,255,255,0);
+}
 </style>

package/src/index.js

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