diff --git a/frontend/src/business/components/common/components/MsDrawer.vue b/frontend/src/business/components/common/components/MsDrawer.vue index fa675d267f..472c8007ad 100644 --- a/frontend/src/business/components/common/components/MsDrawer.vue +++ b/frontend/src/business/components/common/components/MsDrawer.vue @@ -8,8 +8,7 @@
- - +
@@ -23,9 +22,10 @@ import MsRight2LeftDragBar from "./dragbar/MsRight2LeftDragBar"; import MsLeft2RightDragBar from "./dragbar/MsLeft2RightDragBar"; import MsBottom2TopDragBar from "./dragbar/MsBottom2TopDragBar"; + import MsFullScreenButton from "@/business/components/common/components/MsFullScreenButton"; export default { name: "MsDrawer", - components: {MsBottom2TopDragBar, MsLeft2RightDragBar, MsRight2LeftDragBar}, + components: {MsFullScreenButton, MsBottom2TopDragBar, MsLeft2RightDragBar, MsRight2LeftDragBar}, data() { return { x: 0, @@ -74,6 +74,15 @@ mounted() { this.init(); }, + watch: { + isFullScreen() { + if (this.isFullScreen) { + this.fullScreen() + } else { + this.unFullScreen(); + } + } + }, methods: { init() { // todo 其他方向待优化 @@ -123,12 +132,10 @@ this.originalH = this.h; this.w = document.body.clientWidth; this.h = document.body.clientHeight; - this.isFullScreen = true; }, unFullScreen() { this.w = this.originalW; this.h = this.originalH; - this.isFullScreen = false; }, close() { this.$emit('close') @@ -206,18 +213,10 @@ color: red; } - .alt-ico { + /deep/ .alt-ico { position: absolute; - font-size: 15px; right: 40px; top: 15px; - color: #8c939d; } - .alt-ico:hover { - color: black; - font-size: 18px; - } - - diff --git a/frontend/src/business/components/common/components/MsFullScreenButton.vue b/frontend/src/business/components/common/components/MsFullScreenButton.vue new file mode 100644 index 0000000000..44ddc031cb --- /dev/null +++ b/frontend/src/business/components/common/components/MsFullScreenButton.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/frontend/src/business/components/common/components/MsModuleMinder.vue b/frontend/src/business/components/common/components/MsModuleMinder.vue index 9f879a88fc..ac8df743b5 100644 --- a/frontend/src/business/components/common/components/MsModuleMinder.vue +++ b/frontend/src/business/components/common/components/MsModuleMinder.vue @@ -1,10 +1,10 @@