From 81afc2e465c68f8b14b54a7ec350f28d09583cf1 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 03 八月 2020 11:28:00 +0800
Subject: [PATCH] iframe窗口操作图标替换el-icon,删除天气json
---
src/pages/desktop/index/components/DFrame.vue | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index cfe46e1..f79110a 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -7,9 +7,9 @@
>
<div class="d-frame-title" v-drag @click="frameClick()">
<div class="d-frame-title-operation">
- <i class="fa fa-circle d-frame-operation-close" @click="closeFrame()"></i>
- <i class="fa fa-circle d-frame-operation-minus" @click="minFrame(data)"></i>
- <i class="fa fa-circle d-frame-operation-full" @click="changeFullScreen()"></i>
+ <i class="el-icon-error d-frame-operation-close" @click="closeFrame()"></i>
+ <i class="el-icon-remove d-frame-operation-minus" @click="minFrame(data)"></i>
+ <i class="el-icon-circle-plus d-frame-operation-full" @click="changeFullScreen()"></i>
</div>
<slot name="d-frame-title-content">
<div class="d-frame-title-content">
@@ -19,15 +19,18 @@
</slot>
</div>
<div class="d-frame-content">
+
<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>
+ <!-- <span class="d-frame-operation-resize" v-resize></span> -->
+ <span class="d-frame-operation-resize" @mousedown="mousedown" @mousemove.prevent="mousemove" @mouseup="mouseup"></span>
</div>
</div>
</template>
<script>
-import html2canvas from 'html2canvas'
+import html2canvas from 'html2canvas';
+
export default {
name: "DFrame",
props: {
@@ -38,8 +41,13 @@
fullScreen: false,
width: this.data.width || 1024,
height: this.data.height || 512,
- dragLock: false,
- resizeLock: false
+ resizeObj: {
+ startW : 0,
+ startH: 0,
+ mouX: 0,
+ mouY: 0,
+ resizeLock: false
+ }
}
},
mounted() {
@@ -50,6 +58,31 @@
})
},
methods: {
+ //resize
+ mousedown(e){
+ debugger
+ 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){
+ if(!this.resizeObj.resizeLock){
+ return
+ }
+ 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;
+ }.bind(this)
+ },
+ mouseup(){
+ this.resizeObj.resizeLock = false;
+ document.onmousemove = null;
+ },
+ //resize end
closeFrame: function () {
this.$store.dispatch('desktop/closeFrame', this.data);
this.refreshDock();
@@ -106,6 +139,7 @@
let disy = e.clientY - el.parentElement.offsetTop;
el.style.cursor = 'move';
document.onmousemove = function (e) {
+ e.preventDefault();
window.getSelection().removeAllRanges();
el.parentElement.style.left = e.clientX - disx + 'px';
el.parentElement.style.top = e.clientY - disy + 'px';
@@ -176,31 +210,32 @@
.d-frame-title-operation i {
margin: 0 3px;
+ font-size:18px;
}
.d-frame-operation-close {
color: red;
}
-.d-frame-title-operation:hover .d-frame-operation-close::before {
+/* .d-frame-title-operation:hover .d-frame-operation-close::before {
content: "\f057";
-}
+} */
.d-frame-operation-minus {
color: #fbb450;
}
-.d-frame-title-operation:hover .d-frame-operation-minus::before {
+/* .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 {
+/* .d-frame-title-operation:hover .d-frame-operation-full::before {
content: "\f055";
-}
+} */
.d-frame-title-content {
line-height: 30px;
--
Gitblit v1.8.0