From 0d3db253cad1fb49c4fae9b9a537c8c318c7172f Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 29 十一月 2023 10:23:59 +0800
Subject: [PATCH] 优化应用中心卸载
---
src/pages/desktop/index/components/DFrame.vue | 247 ++++++++++++++++++++++++++++++-------------------
1 files changed, 151 insertions(+), 96 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 582dcee..e72cc85 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -1,20 +1,33 @@
<template>
<div
v-show="data.isShow"
- :class="['d-frame', {'d-frame-full': fullScreen}]"
+ :class="['d-frame', { 'd-frame-full': fullScreen }]"
ref="dFrame"
:data-id="data.id"
- @contextmenu.prevent="openMenuList($event.offsetY,$event.offsetX,data)"
- v-bind:style="{left: data.leftOffset + 'px', top: data.topOffset + 'px', 'z-index': 125 + data.order, width: width + 'px', height: height + 'px'}"
+ @contextmenu.prevent="openMenuList($event.offsetY, $event.offsetX, data)"
+ 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='fullScreen' @click="frameClick">
+ <div class="d-frame-title" v-drag="fullScreen" @click="frameClick">
+ <div class="icon iconfont back" @click="back" v-if="isShowBack">
+ 
+ </div>
<div class="d-frame-title-operation">
- <i class="icon-minus d-frame-operation-minus" @click="minFrame(data,$event)">
+ <i class="icon-minus d-frame-operation-minus" @click="minFrame(data, $event)">
<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`"
+ :src="
+ fullScreen
+ ? `${publicPath}images/desktop/header-icon/mini.png`
+ : `${publicPath}images/desktop/header-icon/max.png`
+ "
alt
/>
</i>
@@ -23,13 +36,13 @@
<slot name="d-frame-title-content">
<div class="d-frame-title-content">
<img :src="data.icon" />
- <span>{{data.title}}</span>
+ <span>{{ data.title }}</span>
</div>
</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" :name="data.name"></iframe>
+ <div class="iframe-mask" v-if="data.order != 1" @click="frameClick"></div>
+ <iframe :src="data.url | proxyUrl" v-if="data.url" :name="data.name"></iframe>
<div v-html="data.html" v-if="data.html"></div>
<!-- <span class="d-frame-operation-resize" v-resize></span> -->
<span
@@ -39,7 +52,7 @@
@mouseup="mouseup"
></span>
</div>
- <div class="menuList" v-show="showMenu" :style="{top:menuTop+'px',left:menuLeft+'px'}">
+ <div class="menuList" v-show="showMenu" :style="{ top: menuTop + 'px', left: menuLeft + 'px' }">
<ul>
<li @click="refreshApp">閲嶆柊鍔犺浇</li>
<li @click="changeFullScreen">鏈�澶у寲</li>
@@ -51,11 +64,24 @@
</template>
<script>
-import html2canvas from 'html2canvas';
+import html2canvas from "html2canvas"
export default {
name: "DFrame",
props: {
data: Object
+ },
+ created() {
+ this.addBackListener()
+ },
+ filters: {
+ proxyUrl(srcUrl) {
+ let url = srcUrl
+ if (url.indexOf("127.0.0.1") > 0 && window.location.hostname != "127.0.0.1") {
+ url = url.replace("127.0.0.1", window.location.hostname)
+ }
+
+ return url
+ }
},
data() {
return {
@@ -63,7 +89,7 @@
showMenu: false,
menuTop: 0,
menuLeft: 0,
- fullScreen: false,
+ fullScreen: this.data.width == 0 && this.data.height == 0,
width: this.data.width || 1024,
height: this.data.height || 512,
resizeObj: {
@@ -72,90 +98,89 @@
mouX: 0,
mouY: 0,
resizeLock: false
- }
+ },
+ isShowBack: false
}
},
watch: {
showMenu(val) {
if (val) {
- document.body.addEventListener('click', this.closeMenuList)
+ document.body.addEventListener("click", this.closeMenuList)
} else {
- document.body.removeEventListener('click', this.closeMenuList)
+ document.body.removeEventListener("click", this.closeMenuList)
}
}
},
mounted() {
- window.addEventListener('message', (d) => {
- let { source, trigger, menuT, menuL } = d.data;
- if (trigger == 'contextmenu') {
+ window.addEventListener("message", (d) => {
+ let { source, trigger, menuT, menuL } = d.data
+ if (trigger == "contextmenu") {
this.openMenuList(menuT, menuL)
}
- });
+ })
},
methods: {
openMenuList(t, l, frame) {
- this.showMenu = true;
- this.menuTop = t;
- this.menuLeft = l;
+ this.showMenu = true
+ this.menuTop = t
+ this.menuLeft = l
},
closeMenuList() {
- this.showMenu = false;
+ this.showMenu = false
},
//resize
mousedown(e) {
- this.resizeObj.mouX = e.clientX;
- this.resizeObj.mouY = e.clientY;
- this.resizeObj.startW = this.width;
- this.resizeObj.startH = this.height;
- this.resizeObj.resizeLock = true;
+ this.resizeObj.mouX = e.clientX
+ this.resizeObj.mouY = e.clientY
+ this.resizeObj.startW = this.width
+ this.resizeObj.startH = this.height
+ this.resizeObj.resizeLock = true
},
mousemove(e) {
- document.onmousemove = function (e) {
+ document.onmousemove = function(e) {
if (!this.resizeObj.resizeLock) {
return
}
- e = e || window.event;
- e.preventDefault();
- let curWidth = this.resizeObj.startW + e.clientX - this.resizeObj.mouX;
- let curHeight = this.resizeObj.startH + e.clientY - this.resizeObj.mouY;
+ e = e || window.event
+ e.preventDefault()
+ 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;
+ this.width = curWidth
+ this.height = curHeight
}.bind(this)
},
mouseup() {
- this.resizeObj.resizeLock = false;
- document.onmousemove = null;
+ this.resizeObj.resizeLock = false
+ document.onmousemove = null
},
//resize end
//閲嶆柊鍔犺浇搴旂敤
refreshApp() {
window.frames[this.data.name].location.reload()
},
- closeFrame: function () {
- this.$store.dispatch('desktop/closeFrame', this.data);
+ closeFrame: function() {
+ this.$store.dispatch("desktop/closeFrame", this.data)
//this.refreshDock();
- this.$store.commit('desktop/highlight')
-
+ this.$store.commit("desktop/highlight")
},
- changeFullScreen: function () {
- this.fullScreen = !this.fullScreen;
+ changeFullScreen: function() {
+ this.fullScreen = !this.fullScreen
},
frameClick(e) {
- this.$store.commit('desktop/refreshFrame', this.data);
+ this.$store.commit("desktop/refreshFrame", this.data)
},
minFrame(data, e) {
-
//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', {
+ this.$store.commit("desktop/addMinDock", {
id: this.data.id,
src: this.data.icon,
alt: this.data.title,
- type: "3",
+ type: "3"
//screenshot: shotSrc
- });
- return false;
+ })
+ return false
//}
//鎵惧埌褰撳墠鐨刬frame
//let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
@@ -187,70 +212,93 @@
// });
// });
//return false;
-
},
+ // 鑿滃崟鏍忚繑鍥�
+ back() {
+ let active = this.$store.state.desktop.minDocks
+ active = active.filter((item) => item.highlight)
+ console.log(active)
+ const iframeArr = document.querySelectorAll("iframe")
+ iframeArr.forEach((item) => {
+ item.contentWindow.postMessage({ msg: `杩斿洖${active[0].alt}` }, "*")
+ })
+ },
+ // 娣诲姞杩斿洖鎸夐挳鐩稿叧鐩戝惉
+ addBackListener() {
+ //鏄剧ず杩斿洖鎸夐挳
+ window.addEventListener("message", (e) => {
+ if (e.data.msg === "showBack") {
+ this.isShowBack = true
+ }
+ })
+ //闅愯棌杩斿洖鎸夐挳
+ window.addEventListener("message", (e) => {
+ if (e.data.msg === "hiddenBack") {
+ this.isShowBack = false
+ }
+ })
+ }
},
directives: {
drag(el, binding) {
if (el.dragLock || binding.arg) {
return
}
- el.onmousedown = function (e) {
- console.log('binding',binding)
- if(binding.value) return;
- el.dragLock = true;
- let disx = e.clientX - el.parentElement.offsetLeft;
- let disy = e.clientY - el.parentElement.offsetTop;
- el.style.cursor = 'move';
- document.onmousemove = function (e) {
- e.preventDefault();
- window.getSelection().removeAllRanges();
- let toLeft = e.clientX - disx;
- let toTop = e.clientY - disy;
+ el.onmousedown = function(e) {
+ console.log("binding", binding)
+ if (binding.value) return
+ el.dragLock = true
+ let disx = e.clientX - el.parentElement.offsetLeft
+ let disy = e.clientY - el.parentElement.offsetTop
+ el.style.cursor = "move"
+ document.onmousemove = function(e) {
+ e.preventDefault()
+ window.getSelection().removeAllRanges()
+ let toLeft = e.clientX - disx
+ let toTop = e.clientY - disy
//杈圭晫澶勭悊
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;
+ toLeft = document.body.getBoundingClientRect().width - 46 * 3
}
- el.parentElement.style.left = toLeft + 'px';
+ el.parentElement.style.left = toLeft + "px"
if (toTop <= 40) {
toTop = 40
} else if (toTop >= document.body.getBoundingClientRect().height - 31) {
- toTop = document.body.getBoundingClientRect().height - 31;
+ toTop = document.body.getBoundingClientRect().height - 31
}
- el.parentElement.style.top = toTop + 'px';
-
- };
- document.onmouseup = function () {
- el.dragLock = false;
- document.onmousemove = document.onmouseup = null;
- el.style.cursor = 'unset';
- };
+ el.parentElement.style.top = toTop + "px"
+ }
+ document.onmouseup = function() {
+ el.dragLock = false
+ document.onmousemove = document.onmouseup = null
+ el.style.cursor = "unset"
+ }
}
},
resize(el, binding, vnode) {
if (el.resizeLock) {
- return;
+ return
}
- el.onmousedown = function (e) {
- el.resizeLock = true;
- let disx = e.clientX;
- let disy = e.clientY;
- let disw = vnode.context.width;
- let dish = vnode.context.height;
- el.style.cursor = 'nw-resize';
- document.onmousemove = function (e) {
- window.getSelection().removeAllRanges();
- vnode.context.width = disw + e.clientX - disx;
- vnode.context.height = dish + e.clientY - disy;
- };
- document.onmouseup = function () {
- el.resizeLock = false;
- document.onmousemove = document.onmouseup = null;
- el.style.cursor = 'unset';
- };
+ el.onmousedown = function(e) {
+ el.resizeLock = true
+ let disx = e.clientX
+ let disy = e.clientY
+ let disw = vnode.context.width
+ let dish = vnode.context.height
+ el.style.cursor = "nw-resize"
+ document.onmousemove = function(e) {
+ window.getSelection().removeAllRanges()
+ vnode.context.width = disw + e.clientX - disx
+ vnode.context.height = dish + e.clientY - disy
+ }
+ document.onmouseup = function() {
+ el.resizeLock = false
+ document.onmousemove = document.onmouseup = null
+ el.style.cursor = "unset"
+ }
}
}
}
@@ -303,6 +351,13 @@
z-index: 2;
}
+.back {
+ position: absolute;
+ cursor: pointer;
+ top: 8px;
+ left: 10px;
+}
+
.d-frame-title-operation i {
font-size: 18px;
display: inline-block;
@@ -337,7 +392,7 @@
.d-frame-title-content {
line-height: 30px;
text-align: center;
- background: #eeeeee;
+ background: #ffffff;
}
.d-frame-title-content img {
@@ -352,7 +407,7 @@
position: relative;
top: -1px;
font-size: 15px;
- color: #000000;
+ color: #000000;
font-family: "PingFang SC";
}
@@ -360,9 +415,9 @@
width: 100%;
height: calc(100% - 30px);
border-radius: 0 0 4px 4px;
- /* background-color: #fff; */
+ background-color: #fff;
}
-.d-frame-full .d-frame-content{
+.d-frame-full .d-frame-content {
height: calc(100% - 71px);
}
.d-frame-content iframe {
@@ -398,4 +453,4 @@
.menuList li:hover {
background: rgba(152, 170, 190, 0.7);
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0