From 59ad7ba6452b2028fd7faca000c626a148256620 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期二, 01 九月 2020 23:29:50 +0800
Subject: [PATCH] fix: do not allow empty data to be saved. for area manager
---
src/pages/desktop/index/components/DFrame.vue | 85 ++++++++++++++++++++++++++++++++----------
1 files changed, 64 insertions(+), 21 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 3c5fe82..b4f33a0 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -4,6 +4,7 @@
: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'}"
>
<div class="d-frame-title" v-drag @click="frameClick">
@@ -28,7 +29,7 @@
</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>
+ <iframe :src="data.url" 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
@@ -37,6 +38,14 @@
@mousemove.prevent="mousemove"
@mouseup="mouseup"
></span>
+ </div>
+ <div class="menuList" v-show="showMenu" :style="{top:menuTop+'px',left:menuLeft+'px'}">
+ <ul>
+ <li @click="refreshApp">閲嶆柊鍔犺浇</li>
+ <li @click="changeFullScreen">鏈�澶у寲</li>
+ <li @click="minFrame">鏈�灏忓寲</li>
+ <li @click="closeFrame">鍏抽棴</li>
+ </ul>
</div>
</div>
</template>
@@ -52,6 +61,9 @@
data() {
return {
publicPath: process.env.BASE_URL,
+ showMenu: false,
+ menuTop: 0,
+ menuLeft: 0,
fullScreen: false,
width: this.data.width || 1024,
height: this.data.height || 512,
@@ -64,8 +76,35 @@
}
}
},
-
+ watch: {
+ showMenu(val){
+ if(val){
+ document.body.addEventListener('click',this.closeMenuList)
+ }else{
+ document.body.removeEventListener('click',this.closeMenuList)
+ }
+ }
+ },
+ mounted(){
+ console.log(document.querySelectorAll('iframe'))
+ window.addEventListener('message',(d)=>{
+ let {source,trigger,menuT,menuL} = d.data;
+ debugger
+ if(trigger == 'contextmenu'){
+ this.openMenuList(menuT,menuL)
+ }
+ });
+
+ },
methods: {
+ openMenuList(t,l,frame){
+ this.showMenu = true;
+ this.menuTop = t;
+ this.menuLeft = l;
+ },
+ closeMenuList(){
+ this.showMenu = false;
+ },
//resize
mousedown(e) {
this.resizeObj.mouX = e.clientX;
@@ -93,6 +132,10 @@
document.onmousemove = null;
},
//resize end
+ //閲嶆柊鍔犺浇搴旂敤
+ refreshApp() {
+ window.frames[this.data.name].location.reload()
+ },
closeFrame: function () {
debugger
this.$store.dispatch('desktop/closeFrame', this.data);
@@ -149,18 +192,9 @@
// });
// });
//return false;
- //this.refreshDock();
+
},
- refreshDock: function () {
- setTimeout(function () {
- const dockItems = document.getElementsByClassName('dock-item');
- const dockMask = document.getElementsByClassName('dock-mask')[0];
- for (let i = 0; i < dockItems.length; i++) {
- dockItems[i].width = 60;
- }
- //dockMask.style.width = dockItems.length * 60 + 40 + 'px';
- }, 10);
- }
+
},
directives: {
drag(el) {
@@ -300,17 +334,9 @@
color: #fbb450;
}
-/* .d-frame-title-operation:hover .d-frame-operation-minus::before {
- content: "\f056";
-} */
-
.d-frame-operation-full {
color: #00d800;
}
-
-/* .d-frame-title-operation:hover .d-frame-operation-full::before {
- content: "\f055";
-} */
.d-frame-title-content {
line-height: 30px;
@@ -358,4 +384,21 @@
cursor: nwse-resize;
background: url("/images/desktop/resize.png") no-repeat;
}
+.menuList{
+ background: #fff;
+ position: absolute;
+ z-index: 100;
+ width: 180px;
+ text-align: left;
+ border: 1px solid #ccc;
+}
+.menuList li{
+ line-height: 28px;
+ height: 28px;
+ padding-left: 24px;
+ background: #fff;
+}
+.menuList li:hover{
+ background: rgba(152, 170, 190,.7);
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0