Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
497c2c33
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 3 年多
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
497c2c33
编写于
3月 19, 2021
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/master'
上级
6251fa18
6446024c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
86 addition
and
19 deletion
+86
-19
frontend/src/business/components/common/components/MsDrawer.vue
...nd/src/business/components/common/components/MsDrawer.vue
+13
-14
frontend/src/business/components/common/components/MsFullScreenButton.vue
...iness/components/common/components/MsFullScreenButton.vue
+37
-0
frontend/src/business/components/common/components/MsModuleMinder.vue
.../business/components/common/components/MsModuleMinder.vue
+36
-5
未找到文件。
frontend/src/business/components/common/components/MsDrawer.vue
浏览文件 @
497c2c33
...
...
@@ -8,8 +8,7 @@
<div
class=
"ms-drawer-header"
>
<slot
name=
"header"
></slot>
<i
v-if=
"isShowClose"
class=
"el-icon-close"
@
click=
"close"
/>
<font-awesome-icon
v-if=
"!isFullScreen && showFullScreen"
class=
"alt-ico"
:icon=
"['fa', 'expand-alt']"
size=
"lg"
@
click=
"fullScreen"
/>
<font-awesome-icon
v-if=
"isFullScreen && showFullScreen"
class=
"alt-ico"
:icon=
"['fa', 'compress-alt']"
size=
"lg"
@
click=
"unFullScreen"
/>
<ms-full-screen-button
v-if=
"showFullScreen"
:is-full-screen.sync=
"isFullScreen"
/>
</div>
<div
class=
"ms-drawer-body"
>
<slot></slot>
...
...
@@ -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
:
{
Ms
FullScreenButton
,
Ms
Bottom2TopDragBar
,
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
;
}
</
style
>
frontend/src/business/components/common/components/MsFullScreenButton.vue
0 → 100644
浏览文件 @
497c2c33
<
template
>
<span
class=
"fulls-screen-btn"
>
<font-awesome-icon
v-if=
"!isFullScreen"
class=
"alt-ico"
:icon=
"['fa', 'expand-alt']"
size=
"lg"
@
click=
"change(true)"
/>
<font-awesome-icon
v-if=
"isFullScreen"
class=
"alt-ico"
:icon=
"['fa', 'compress-alt']"
size=
"lg"
@
click=
"change(false)"
/>
</span>
</
template
>
<
script
>
export
default
{
name
:
"
MsFullScreenButton
"
,
props
:
{
isFullScreen
:
{
type
:
Boolean
,
default
:
false
},
},
methods
:
{
change
(
bool
)
{
this
.
$emit
(
"
update:isFullScreen
"
,
bool
);
}
}
}
</
script
>
<
style
scoped
>
.alt-ico
:hover
{
color
:
black
;
font-size
:
18px
;
}
.alt-ico
{
font-size
:
15px
;
color
:
#8c939d
;
}
</
style
>
frontend/src/business/components/common/components/MsModuleMinder.vue
浏览文件 @
497c2c33
<
template
>
<div
class=
"minder"
>
<div
class=
"minder"
:class=
"
{'full-screen': isFullScreen}">
<ms-full-screen-button
:is-full-screen.sync=
"isFullScreen"
/>
<minder-editor
v-if=
"isActive"
class=
"minder-container"
:import-json=
"importJson"
:height=
"700"
:progress-enable=
"false"
:tags=
"tags"
:distinct-tags=
"distinctTags"
...
...
@@ -15,9 +15,10 @@
<
script
>
import
MsFullScreenButton
from
"
@/business/components/common/components/MsFullScreenButton
"
;
export
default
{
name
:
"
MsModuleMinder
"
,
components
:
{},
components
:
{
MsFullScreenButton
},
props
:
{
treeNodes
:
{
type
:
Array
,
...
...
@@ -58,10 +59,11 @@ export default {
},
"
template
"
:
"
default
"
},
isActive
:
true
isActive
:
true
,
isFullScreen
:
false
}
},
moun
ted
()
{
crea
ted
()
{
},
watch
:
{
dataMap
()
{
...
...
@@ -128,4 +130,33 @@ export default {
bottom
:
auto
;
top
:
30px
;
}
.minder
{
position
:
relative
;
}
.fulls-screen-btn
{
position
:
absolute
;
top
:
10px
;
right
:
10px
;
z-index
:
1
;
}
.full-screen
{
position
:
fixed
;
top
:
0px
;
left
:
0px
;
width
:
100%
;
background
:
white
;
height
:
100vh
;
z-index
:
999999
;
}
.full-screen
>>>
.minder-container
{
height
:
calc
(
100vh
-
109px
)
!important
;
}
.full-screen
.fulls-screen-btn
{
right
:
30px
;
}
</
style
>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录