From ccee429d379e0108b7445f72ade8d97c110a6fb3 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 09 十一月 2021 18:01:59 +0800
Subject: [PATCH] 问题修复
---
src/pages/desktop/index/components/DFrame.vue | 96 +++++++++++++++++++++++------------------------
1 files changed, 47 insertions(+), 49 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index b4f33a0..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 />
@@ -29,7 +29,7 @@
</div>
<div class="d-frame-content">
<div class="iframe-mask" v-if="data.order!=1" @click="frameClick"></div>
- <iframe :src="data.url" v-if="data.url" :name="data.name" ></iframe>
+ <iframe :src="data.url" v-if="data.url" :name="data.name"></iframe>
<div v-html="data.html" v-if="data.html"></div>
<!-- <span class="d-frame-operation-resize" v-resize></span> -->
<span
@@ -52,7 +52,6 @@
<script>
import html2canvas from 'html2canvas';
-
export default {
name: "DFrame",
props: {
@@ -77,32 +76,30 @@
}
},
watch: {
- showMenu(val){
- if(val){
- document.body.addEventListener('click',this.closeMenuList)
- }else{
- document.body.removeEventListener('click',this.closeMenuList)
+ showMenu(val) {
+ if (val) {
+ document.body.addEventListener('click', this.closeMenuList)
+ } else {
+ document.body.removeEventListener('click', this.closeMenuList)
}
}
},
- mounted(){
+ mounted() {
console.log(document.querySelectorAll('iframe'))
- window.addEventListener('message',(d)=>{
- let {source,trigger,menuT,menuL} = d.data;
- debugger
- if(trigger == 'contextmenu'){
- this.openMenuList(menuT,menuL)
+ window.addEventListener('message', (d) => {
+ let { source, trigger, menuT, menuL } = d.data;
+ if (trigger == 'contextmenu') {
+ this.openMenuList(menuT, menuL)
}
});
-
},
methods: {
- openMenuList(t,l,frame){
+ openMenuList(t, l, frame) {
this.showMenu = true;
this.menuTop = t;
this.menuLeft = l;
},
- closeMenuList(){
+ closeMenuList() {
this.showMenu = false;
},
//resize
@@ -122,7 +119,7 @@
e.preventDefault();
let curWidth = this.resizeObj.startW + e.clientX - this.resizeObj.mouX;
let curHeight = this.resizeObj.startH + e.clientY - this.resizeObj.mouY;
-
+
this.width = curWidth;
this.height = curHeight;
}.bind(this)
@@ -137,11 +134,10 @@
window.frames[this.data.name].location.reload()
},
closeFrame: function () {
- debugger
this.$store.dispatch('desktop/closeFrame', this.data);
//this.refreshDock();
this.$store.commit('desktop/highlight')
-
+
},
changeFullScreen: function () {
this.fullScreen = !this.fullScreen;
@@ -150,20 +146,20 @@
this.$store.commit('desktop/refreshFrame', this.data);
},
minFrame(data, e) {
-
+
//if(data.name=='cameraVideo'||data.name=='search'||data.name=='library'||data.name=='cameraAccess'||data.name=='dataStack'){
- //let shotSrc = canvas.toDataURL();
- this.$store.commit('desktop/addMinDock', {
- id: this.data.id,
- src: this.data.icon,
- alt: this.data.title,
- type: "3",
- //screenshot: shotSrc
- });
- return false;
+ //let shotSrc = canvas.toDataURL();
+ this.$store.commit('desktop/addMinDock', {
+ id: this.data.id,
+ src: this.data.icon,
+ alt: this.data.title,
+ type: "3",
+ //screenshot: shotSrc
+ });
+ return false;
//}
//鎵惧埌褰撳墠鐨刬frame
- let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
+ //let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
//淇濆瓨褰撳墠搴旂敤蹇収
// html2canvas(curIframe.contentWindow.document.body, {
// dpi: window.devicePixelRatio * 4,
@@ -192,17 +188,18 @@
// });
// });
//return false;
-
+
},
-
+
},
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;
@@ -213,10 +210,10 @@
let toLeft = e.clientX - disx;
let toTop = e.clientY - disy;
//杈圭晫澶勭悊
- if (toLeft <= -(el.parentElement.offsetWidth-46*3)) {
- toLeft = -(el.parentElement.offsetWidth-46*3)
- } else if (toLeft >= document.body.getBoundingClientRect().width - 46*3) {
- toLeft = document.body.getBoundingClientRect().width - 46*3;
+ if (toLeft <= -(el.parentElement.offsetWidth - 46 * 3)) {
+ toLeft = -(el.parentElement.offsetWidth - 46 * 3)
+ } else if (toLeft >= document.body.getBoundingClientRect().width - 46 * 3) {
+ toLeft = document.body.getBoundingClientRect().width - 46 * 3;
}
el.parentElement.style.left = toLeft + 'px';
if (toTop <= 40) {
@@ -225,6 +222,7 @@
toTop = document.body.getBoundingClientRect().height - 31;
}
el.parentElement.style.top = toTop + 'px';
+
};
document.onmouseup = function () {
el.dragLock = false;
@@ -267,7 +265,7 @@
}
.d-frame {
position: fixed;
- box-shadow: 0 5px 10px rgba(0,0,0,.5);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.5);
}
.d-frame.d-frame-full {
@@ -285,9 +283,8 @@
border-top: 1px solid #d0d0d0;
border-left: 1px solid #d0d0d0;
border-right: 1px solid #d0d0d0;
-
}
-.iframe-mask{
+.iframe-mask {
position: absolute;
top: 30px;
left: 0;
@@ -365,9 +362,10 @@
height: calc(100% - 30px);
border-radius: 0 0 4px 4px;
background-color: #fff;
-
}
-
+.d-frame-full .d-frame-content{
+ height: calc(100% - 71px);
+}
.d-frame-content iframe {
width: 100%;
height: 100%;
@@ -384,7 +382,7 @@
cursor: nwse-resize;
background: url("/images/desktop/resize.png") no-repeat;
}
-.menuList{
+.menuList {
background: #fff;
position: absolute;
z-index: 100;
@@ -392,13 +390,13 @@
text-align: left;
border: 1px solid #ccc;
}
-.menuList li{
+.menuList li {
line-height: 28px;
height: 28px;
padding-left: 24px;
background: #fff;
}
-.menuList li:hover{
- background: rgba(152, 170, 190,.7);
+.menuList li:hover {
+ background: rgba(152, 170, 190, 0.7);
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0