From f5a0751be938eefbd3c327fd50b9234f49b98440 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期二, 04 八月 2020 14:49:33 +0800
Subject: [PATCH] 修改iconfont 引入方式,添加到index.html
---
src/pages/desktop/index/components/DFrame.vue | 97 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 75 insertions(+), 22 deletions(-)
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index cfe46e1..5589cdc 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">
@@ -21,13 +21,20 @@
<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 +45,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 +62,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();
@@ -64,12 +101,12 @@
//鎵惧埌褰撳墠鐨刬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,
+ html2canvas(curIframe.contentWindow.document.body, {
+ dpi: window.devicePixelRatio * 4,
logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
removeContainer: true,
- imageTimeout : 0,
- useCORS : true //寮�鍚法鍩熼厤缃�
+ imageTimeout: 0,
+ useCORS: true //寮�鍚法鍩熼厤缃�
}).then(canvas => {
let shotSrc = canvas.toDataURL();
this.$store.commit('desktop/addMinDock', {
@@ -106,9 +143,23 @@
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';
+ let toLeft = e.clientX - disx;
+ let toTop = e.clientY - disy;
+ //杈圭晫澶勭悊
+ if(toLeft <= 0 ){
+ toLeft = 0
+ }else if(toLeft >= document.body.getBoundingClientRect().width-40){
+ toLeft = document.body.getBoundingClientRect().width-40;
+ }
+ el.parentElement.style.left = toLeft + 'px';
+ if(toTop <= 0 ){
+ toTop = 0
+ }else if(toTop >= document.body.getBoundingClientRect().height-40){
+ toTop = document.body.getBoundingClientRect().height-40;
+ }
+ el.parentElement.style.top = toTop + 'px';
};
document.onmouseup = function () {
el.dragLock = false;
@@ -145,8 +196,9 @@
</script>
<style scoped>
-html,body{
- heiht: 100%;
+html,
+body {
+ height: 100%;
}
.d-frame {
position: fixed;
@@ -176,31 +228,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;
@@ -242,6 +295,6 @@
height: 15px;
z-index: 1000;
cursor: nwse-resize;
- background: url("/images/resize.png") no-repeat;
+ background: url("/images/desktop/resize.png") no-repeat;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0