From ddb0df2153bc75e54c3f7c1049be663d4d2dba96 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 15 八月 2020 19:10:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/vue-smart-ai
---
src/pages/desktop/index/components/DFrame.vue | 94 +++++++++++++++++++++++++++++------------------
1 files changed, 58 insertions(+), 36 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 93f431f..2b3f22d 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -2,21 +2,22 @@
<div
v-show="data.isShow"
:class="['d-frame', {'d-frame-full': fullScreen}]"
+ ref="dFrame"
:data-id="data.id"
- v-bind:style="{left: data.leftOffset + '%', top: data.topOffset + '%', 'z-index': 125 + data.order, width: width + 'px', height: height + 'px'}"
+ 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 @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">
@@ -26,6 +27,7 @@
</slot>
</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"></iframe>
<div v-html="data.html" v-if="data.html"></div>
<!-- <span class="d-frame-operation-resize" v-resize></span> -->
@@ -62,13 +64,7 @@
}
}
},
- mounted() {
- window.addEventListener('message', e => {
- if (e.data && e.data.msg == "logout") {
- location.assign("/");
- }
- })
- },
+
methods: {
//resize
mousedown(e) {
@@ -85,8 +81,11 @@
}
e = e || window.event;
e.preventDefault();
- this.width = this.resizeObj.startW + e.clientX - this.resizeObj.mouX;
- this.height = this.resizeObj.startH + e.clientY - this.resizeObj.mouY;
+ 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)
},
mouseup() {
@@ -95,17 +94,20 @@
},
//resize end
closeFrame: function () {
+ debugger
this.$store.dispatch('desktop/closeFrame', this.data);
- this.refreshDock();
+ //this.refreshDock();
+ this.$store.commit('desktop/highlight')
+
},
changeFullScreen: function () {
this.fullScreen = !this.fullScreen;
},
- frameClick: function () {
- debugger
+ frameClick(e) {
this.$store.commit('desktop/refreshFrame', this.data);
},
- minFrame (data,e) {
+ minFrame(data, e) {
+ debugger
//鎵惧埌褰撳墠鐨刬frame
let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
//淇濆瓨褰撳墠搴旂敤蹇収
@@ -114,7 +116,8 @@
logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
removeContainer: true,
imageTimeout: 0,
- useCORS: true //寮�鍚法鍩熼厤缃�
+ useCORS: true, //寮�鍚法鍩熼厤缃�
+ //allowTaint: true
}).then(canvas => {
let shotSrc = canvas.toDataURL();
this.$store.commit('desktop/addMinDock', {
@@ -123,6 +126,15 @@
alt: this.data.title,
type: "3",
screenshot: shotSrc
+ });
+ }).catch(e=>{
+ console.log(e);
+ this.$store.commit('desktop/addMinDock', {
+ id: this.data.id,
+ src: this.data.icon,
+ alt: this.data.title,
+ type: "3",
+ screenshot: ''
});
});
return false;
@@ -156,16 +168,16 @@
let toLeft = e.clientX - disx;
let toTop = e.clientY - disy;
//杈圭晫澶勭悊
- if(toLeft <= 0 ){
- toLeft = 0
- }else if(toLeft >= document.body.getBoundingClientRect().width-40){
- toLeft = document.body.getBoundingClientRect().width-40;
+ 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 ){
+ 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 - 31) {
+ toTop = document.body.getBoundingClientRect().height - 31;
}
el.parentElement.style.top = toTop + 'px';
};
@@ -210,27 +222,36 @@
}
.d-frame {
position: fixed;
+ box-shadow: 0 5px 10px rgba(0,0,0,.5);
}
.d-frame.d-frame-full {
width: 100% !important;
height: 100% !important;
left: 0 !important;
- top: 0 !important;
+ top: 40px !important;
}
.d-frame .d-frame-title {
+ /* min-width: 378px; */
height: 30px;
background-color: #e0e0e0;
border-radius: 4px 4px 0 0;
border-top: 1px solid #d0d0d0;
border-left: 1px solid #d0d0d0;
border-right: 1px solid #d0d0d0;
-
}
-.d-frame-title .icon-close{
+.iframe-mask{
+ position: absolute;
+ top: 30px;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: transparent;
+}
+.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;
@@ -248,14 +269,15 @@
text-align: center;
vertical-align: middle;
cursor: pointer;
+ line-height: 28px;
}
-.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