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 | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 28280ff..2b3f22d 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -27,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> -->
@@ -63,7 +64,7 @@
}
}
},
-
+
methods: {
//resize
mousedown(e) {
@@ -93,35 +94,47 @@
},
//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(e) {
- debugger
this.$store.commit('desktop/refreshFrame', this.data);
},
minFrame(data, e) {
+ debugger
//鎵惧埌褰撳墠鐨刬frame
let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
//淇濆瓨褰撳墠搴旂敤蹇収
html2canvas(curIframe.contentWindow.document.body, {
dpi: window.devicePixelRatio * 4,
- //logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
+ logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
removeContainer: true,
imageTimeout: 0,
- useCORS: true //寮�鍚法鍩熼厤缃�
+ useCORS: true, //寮�鍚法鍩熼厤缃�
+ //allowTaint: true
}).then(canvas => {
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
+ });
+ }).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;
@@ -220,6 +233,7 @@
}
.d-frame .d-frame-title {
+ /* min-width: 378px; */
height: 30px;
background-color: #e0e0e0;
border-radius: 4px 4px 0 0;
@@ -227,6 +241,14 @@
border-left: 1px solid #d0d0d0;
border-right: 1px solid #d0d0d0;
}
+.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%;
--
Gitblit v1.8.0