From d969c4735bfa4cfc21dda697c56cfae542a43017 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 11 八月 2020 19:52:22 +0800
Subject: [PATCH] 根据当前用户屏幕分辨率动态展示相关应用窗口的宽高
---
src/pages/desktop/index/components/DFrame.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 92b7284..7dcebb3 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> -->
@@ -80,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() {
@@ -97,7 +101,6 @@
this.fullScreen = !this.fullScreen;
},
frameClick(e) {
- debugger
this.$store.commit('desktop/refreshFrame', this.data);
},
minFrame(data, e) {
@@ -109,7 +112,7 @@
//logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
removeContainer: true,
imageTimeout: 0,
- useCORS: true //寮�鍚法鍩熼厤缃�
+ //useCORS: true //寮�鍚法鍩熼厤缃�
}).then(canvas => {
let shotSrc = canvas.toDataURL();
@@ -224,6 +227,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