zydx-plus 1.35.506 → 1.35.508

package/package.json

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

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

@@ -206,17 +206,25 @@ 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;`;
-      } else {
-        return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;height:${this.footDownOffset}px;`;
+      if(this.zIndex > 0) {
+        if(this.autoHeight) {
+          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;z-index: ${this.zIndex}`;
+        }
+      }else {
+        if(this.autoHeight) {
+          return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;min-height:${this.footDownOffset}px;`;
+        } else {
+          return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;height:${this.footDownOffset}px;`;
+        }
       }
     },
   },
   emits: ['dragStatus', 'close', 'enlarge','updateDrag','minimize','dragMouseup'],
   methods: {
     dragTap() {
-      if(this.zIndex <= 0) return
+      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

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

@@ -1,5 +1,5 @@
 <template>
-  <dragPopup :z-index="10002" title="手写记录" @updateDrag="updateDragInit" :width="width" :height="height" :minWidth="740" :minHeight="487" @close="cancel" :minimizeCir="false" :dragTextShow="false">
+  <dragPopup2 :z-index="10002" title="手写记录" @updateDrag="updateDragInit" :width="width" :height="height" :minWidth="740" :minHeight="487" @close="cancel" :minimizeCir="false" :dragTextShow="false">
     <template #content>
       <div class="paint" :id="ids">
         <div class="paint-title"></div>
@@ -12,8 +12,8 @@
         </div>
       </div>
     </template>
-  </dragPopup>
-  <dragPopup :z-index="10003" :width="600" :height="417" v-if="show" :dragStatus="false" :minimizeCir="false" :enlargeShow="false" @close="close">
+  </dragPopup2>
+  <dragPopup2 :z-index="10003" :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'">
@@ -35,7 +35,7 @@
         </div>
       </div>
     </template>
-  </dragPopup>
+  </dragPopup2>
   <teleport to="body">
     <div class="tool-cont" :style="{left: left + 'px', top: top + 'px'}">
       <div class="tool"
@@ -112,15 +112,14 @@
 </template>
 
 <script>
-import interact from 'interactjs'
 import Sketchpad from '../../sketchpad/src/sketchpad'
-import dragPopup from '../../dragPopup/src/dragPopup'
+import dragPopup2 from '../../dragPopup2/src/dragPopup'
 import Mess from '../../tipBox/index'
 
 let stayTime = 0
 let timer = null
 export default {
-  components: {Sketchpad, dragPopup},
+  components: {Sketchpad, dragPopup2},
   data() {
     return {
       width: 940,

package/src/index.js

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