From 7a75b3ecd06ef0ad9b9288530e3eade3c453c1dc Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期三, 05 八月 2020 11:01:54 +0800
Subject: [PATCH] 修复最小化应用快照显示
---
src/pages/desktop/index/components/DFrame.vue | 53 ++++++++++++++++++++++++-----------------------------
1 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index c19e0fc..86c96e5 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -8,15 +8,15 @@
<div class="d-frame-title" v-drag @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="">
+ <img :src="`${publicPath}images/desktop/header-icon/min.png`" alt />
</i>
<i class="icon-screen-toggle d-frame-operation-full" @click="changeFullScreen($event)">
- <img :src="fullScreen?`${publicPath}images/desktop/header-icon/mini.png`:`${publicPath}images/desktop/header-icon/max.png`" alt="">
+ <img
+ :src="fullScreen?`${publicPath}images/desktop/header-icon/mini.png`:`${publicPath}images/desktop/header-icon/max.png`"
+ alt
+ />
</i>
- <i class="icon-close d-frame-operation-close" @click="closeFrame($event)">
-
- </i>
-
+ <i class="icon-close d-frame-operation-close" @click="closeFrame($event)"></i>
</div>
<slot name="d-frame-title-content">
<div class="d-frame-title-content">
@@ -62,13 +62,6 @@
}
}
},
- mounted() {
- window.addEventListener('message', e => {
- if (e.data && e.data.msg == "logout") {
- location.assign("/");
- }
- })
- },
methods: {
//resize
mousedown(e) {
@@ -102,10 +95,10 @@
this.fullScreen = !this.fullScreen;
},
frameClick: function () {
+ debugger
this.$store.commit('desktop/refreshFrame', this.data);
},
- minFrame (data,e) {
- //e.stopPropagation()
+ minFrame(data, e) {
//鎵惧埌褰撳墠鐨刬frame
let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
//淇濆瓨褰撳墠搴旂敤蹇収
@@ -124,8 +117,8 @@
type: "3",
screenshot: shotSrc
});
- })
-
+ });
+ return false;
//this.refreshDock();
},
refreshDock: function () {
@@ -156,16 +149,16 @@
let toLeft = e.clientX - disx;
let toTop = e.clientY - disy;
//杈圭晫澶勭悊
- if(toLeft <= 0 ){
+ if (toLeft <= 0) {
toLeft = 0
- }else if(toLeft >= document.body.getBoundingClientRect().width-40){
- toLeft = document.body.getBoundingClientRect().width-40;
+ } else if (toLeft >= document.body.getBoundingClientRect().width - 40) {
+ toLeft = document.body.getBoundingClientRect().width - 40;
}
el.parentElement.style.left = toLeft + 'px';
- if(toTop <= 40 ){
+ if (toTop <= 40) {
toTop = 40
- }else if(toTop >= document.body.getBoundingClientRect().height-40){
- toTop = document.body.getBoundingClientRect().height-40;
+ } else if (toTop >= document.body.getBoundingClientRect().height - 40) {
+ toTop = document.body.getBoundingClientRect().height - 40;
}
el.parentElement.style.top = toTop + 'px';
};
@@ -226,17 +219,17 @@
border-top: 1px solid #d0d0d0;
border-left: 1px solid #d0d0d0;
border-right: 1px solid #d0d0d0;
-
}
-.d-frame-title .icon-close{
+.d-frame-title .icon-close {
border-radius: 0 4px 0 0;
- background:url('/images/desktop/header-icon/close.png') no-repeat 50%;
+ background: url("/images/desktop/header-icon/close.png") no-repeat 50%;
}
.d-frame-title-operation {
position: absolute;
top: 0;
right: 0;
height: 30px;
+ z-index: 2;
}
.d-frame-title-operation i {
@@ -246,13 +239,15 @@
width: 46px;
text-align: center;
vertical-align: middle;
+ cursor: pointer;
}
-.d-frame-title-operation i:hover{
+
+.d-frame-title-operation i:hover {
background-color: #c7cacf;
}
-.d-frame-title-operation .icon-close:hover{
+.d-frame-title-operation .icon-close:hover {
background-color: red;
- background-image: url('/images/desktop/header-icon/close-hover.png')
+ background-image: url("/images/desktop/header-icon/close-hover.png");
}
/* .d-frame-title-operation:hover .d-frame-operation-close::before {
--
Gitblit v1.8.0