From a5e8ef032f149ac7a3827169a8affa8ecd4cb4f9 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期三, 19 八月 2020 18:06:51 +0800
Subject: [PATCH] 打开应用异步抓取快照去掉最小化快照,应用中心界面调整,初始应用窗口计算修改
---
src/pages/desktop/index/components/DFrame.vue | 62 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index ac00319..3c5fe82 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -64,7 +64,7 @@
}
}
},
-
+
methods: {
//resize
mousedown(e) {
@@ -94,8 +94,11 @@
},
//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;
@@ -104,28 +107,48 @@
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鍐呴儴鎵ц娴佺▼
- removeContainer: true,
- imageTimeout: 0,
- useCORS: true, //寮�鍚法鍩熼厤缃�
- //allowTaint: true
- }).then(canvas => {
- let shotSrc = canvas.toDataURL();
+
+ //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
+ //screenshot: shotSrc
});
- });
- return false;
+ return false;
+ //}
+ //鎵惧埌褰撳墠鐨刬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鍐呴儴鎵ц娴佺▼
+ // removeContainer: true,
+ // imageTimeout: 0,
+ // 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;
//this.refreshDock();
},
refreshDock: function () {
@@ -221,12 +244,14 @@
}
.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;
+
}
.iframe-mask{
position: absolute;
@@ -314,6 +339,7 @@
height: calc(100% - 30px);
border-radius: 0 0 4px 4px;
background-color: #fff;
+
}
.d-frame-content iframe {
--
Gitblit v1.8.0