zydx-plus 1.35.606 → 1.35.608

package/package.json

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

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

@@ -62,7 +62,8 @@ export default {
       fixedStart: false,
       initWidth: 1280,
       draggableState: null,
-      draggableMove: false
+      draggableMove: false,
+      zIndex: 10000
     }
   },
   props: {
@@ -196,7 +197,7 @@ export default {
     let popArr = []
     const pop = sessionStorage.getItem('pop')
     popArr = (pop === null)? [] : JSON.parse(pop)
-    popArr.push(this.id)
+    popArr.push({id: this.id, zIndex: 10000})
     sessionStorage.setItem('pop', JSON.stringify(popArr))
     // 监听滚动
     window.onscroll = () => {
@@ -224,9 +225,9 @@ export default {
   computed: {
     position() {
       if(this.autoHeight) {
-        return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;min-height:${this.footDownOffset}px;`;
+        return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;min-height:${this.footDownOffset}px;z-index:${this.zIndex}`;
       } else {
-        return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;height:${this.footDownOffset}px;`;
+        return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;height:${this.footDownOffset}px;z-index:${this.zIndex}`;
       }
     },
   },
@@ -272,22 +273,21 @@ export default {
     dragTap() {
       let pop = JSON.parse(sessionStorage.getItem('pop'))
       for(let i = 0; i< pop.length; i++) {
-        if(document.getElementById(pop[i]) === null) continue
-        document.getElementById(pop[i]).classList.remove('zIndex10000')
-        // document.getElementById(pop[i]).style.zIndex = '9999'
-        document.getElementById(pop[i]).classList.add('zIndex9999')
-        // 获取所有具有指定class的元素并删除它们
-      }
-      if(document.getElementById(this.id)){
-        // document.getElementById(this.id).style.zIndex = '10000'
-        document.getElementById(this.id).classList.remove('zIndex9999')
-        document.getElementById(this.id).classList.add('zIndex10000')
+        if(!document.getElementById(pop[i].id)) continue
+        if(pop[i].id === this.id) {
+          pop[i].zIndex = 10000
+          this.zIndex = pop[i].zIndex
+        }else {
+          pop[i].zIndex = 9999
+        }
+        document.getElementById(pop[i].id).style.zIndex = pop[i].zIndex
       }
+      sessionStorage.setItem('pop', JSON.stringify(pop))
     },
     clean() {
       let pop = JSON.parse(sessionStorage.getItem('pop'))
       pop.forEach((x,i) => {
-        if(x === this.id) {
+        if(x.id === this.id) {
           pop.splice(i, 1);
         }
       })
@@ -590,11 +590,8 @@ export default {
 
 .drag-pop {
   position: fixed;
-  /* top: 0;
-  left: 0; */
   background-color: #fff;
   border-radius: 3px;
-  z-index: 9999;
   animation: linkDown .3s linear forwards;
   opacity: 0;
 }
@@ -634,6 +631,9 @@ export default {
 .zIndex10000{
   z-index: 10000;
 }
+.zIndex10001{
+  z-index: 10001;
+}
 .zIndexSlot{
   position: absolute;
   top: 0;

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

@@ -59,7 +59,8 @@ export default {
       fixedStart: false,
       initWidth: 1280,
       draggableState: null,
-      draggableMove: false
+      draggableMove: false,
+      zIndex: 10000
     }
   },
   props: {
@@ -141,10 +142,6 @@ export default {
       type: Boolean,
       default: false
     },
-    zIndex: {
-      type: Number,
-      default: 0
-    },
     share: {
       type: Boolean,
       default: false
@@ -199,7 +196,7 @@ export default {
     let popArr = []
     const pop = sessionStorage.getItem('pop')
     popArr = (pop === null)? [] : JSON.parse(pop)
-    popArr.push(this.id)
+    popArr.push({id: this.id, zIndex: 10000})
     sessionStorage.setItem('pop', JSON.stringify(popArr))
     // 监听滚动
     window.onscroll = () => {
@@ -220,9 +217,7 @@ export default {
         this.footRightOffset = wid
       }
     });
-    setTimeout(() => {
-      document.getElementById(this.id).classList.add('zIndex10000')
-    },0)
+    this.dragTap()
   },
   computed: {
     position() {
@@ -281,20 +276,18 @@ export default {
       this.state = false
     },
     dragTap() {
-      if(this.zIndex > 0) return
       let pop = JSON.parse(sessionStorage.getItem('pop'))
       for(let i = 0; i< pop.length; i++) {
-        if(document.getElementById(pop[i]) === null) continue
-        document.getElementById(pop[i]).classList.remove('zIndex10000')
-        // document.getElementById(pop[i]).style.zIndex = '9999'
-        document.getElementById(pop[i]).classList.add('zIndex9999')
-        // 获取所有具有指定class的元素并删除它们
-      }
-      if(document.getElementById(this.id)){
-        // document.getElementById(this.id).style.zIndex = '10000'
-        document.getElementById(this.id).classList.remove('zIndex9999')
-        document.getElementById(this.id).classList.add('zIndex10000')
+        if(!document.getElementById(pop[i].id)) continue
+        if(pop[i].id === this.id) {
+          pop[i].zIndex = 10000
+          this.zIndex = pop[i].zIndex
+        }else {
+          pop[i].zIndex = 9999
+        }
+        document.getElementById(pop[i].id).style.zIndex = pop[i].zIndex
       }
+      sessionStorage.setItem('pop', JSON.stringify(pop))
     },
     clean() {
       let pop = JSON.parse(sessionStorage.getItem('pop'))

package/src/index.js

@@ -87,7 +87,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.606',
+    version: '1.35.608',
     install,
     Calendar,
     Message,