Merge branch '02/23reviewBUG' into jenkins

src/layout/components/AppMain.vue

@@ -557,6 +557,7 @@ export default {
     right: 0;
   top: 250px;
     position: absolute;
+    z-index: 5000;
   }
 }
 

src/utils/draggable.js

@@ -1,8 +1,10 @@
 const draggable = {
   inserted: function (el) {
+    let wrap =  document.getElementsByClassName('app-main draggable-box')[0]
     el.style.cursor = 'move'
     let firstTime='',lastTime='';
     el.onmousedown = function (e) {
+
       el.setAttribute('data-flag',false)
       firstTime = new Date().getTime();
       let disx = e.pageX - el.offsetLeft
@@ -28,14 +30,21 @@ const draggable = {
           y = maxY
         }
 
+        if(x>wrap.offsetWidth-35){
+          x = wrap.offsetWidth-35
+        }
         el.style.left = x + 'px'
+
+        console.log(x,'新坐标',el)
         el.style.top = y + 'px'
         lastTime = new Date().getTime();
         if( (lastTime - firstTime) < 200){
           el.setAttribute('data-flag',true)
+          wrap.style.userSelect ='none'
           }
       }
       document.onmouseup = function () {
+        wrap.style.userSelect ='auto'
         document.onmousemove = document.onmouseup = null
       }
     }