From cfe33505dc83ecaff395e9d207139d3b43e5a9b6 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 06 十一月 2020 16:46:14 +0800
Subject: [PATCH] 规则列表加入事件声音;数据栈目录树样式优化;集群目录树关键字搜索框查询修复

---
 src/pages/desktop/index/components/DFrame.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 2df51c1..0527cc0 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -7,7 +7,7 @@
     @contextmenu.prevent="openMenuList($event.offsetY,$event.offsetX,data)"
     v-bind:style="{left: data.leftOffset + 'px', top: data.topOffset + 'px', 'z-index': 125 + data.order, width: width + 'px', height: height + 'px'}"
   >
-    <div class="d-frame-title" v-drag @click="frameClick">
+    <div class="d-frame-title" v-drag='fullScreen' @click="frameClick">
       <div class="d-frame-title-operation">
         <i class="icon-minus d-frame-operation-minus" @click="minFrame(data,$event)">
           <img :src="`${publicPath}images/desktop/header-icon/min.png`" alt />
@@ -52,7 +52,6 @@
 
 <script>
 import html2canvas from 'html2canvas';
-
 export default {
   name: "DFrame",
   props: {
@@ -93,7 +92,6 @@
         this.openMenuList(menuT, menuL)
       }
     });
-
   },
   methods: {
     openMenuList(t, l, frame) {
@@ -195,12 +193,13 @@
 
   },
   directives: {
-    drag(el) {
-
-      if (el.dragLock) {
+    drag(el, binding) {
+      if (el.dragLock || binding.arg) {
         return
       }
       el.onmousedown = function (e) {
+        console.log('binding',binding)
+        if(binding.value) return;
         el.dragLock = true;
         let disx = e.clientX - el.parentElement.offsetLeft;
         let disy = e.clientY - el.parentElement.offsetTop;
@@ -223,6 +222,7 @@
             toTop = document.body.getBoundingClientRect().height - 31;
           }
           el.parentElement.style.top = toTop + 'px';
+          
         };
         document.onmouseup = function () {
           el.dragLock = false;

--
Gitblit v1.8.0