Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
Madara
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
viitto
Madara
Commits
93929c38
Commit
93929c38
authored
Sep 29, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
截图隐藏窗口按钮,通知消息分类
parent
afa87c41
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
91 additions
and
7 deletions
+91
-7
index.vue
src/renderer/components/index.vue
+1
-0
chateditor.vue
src/renderer/components/msssage/chateditor.vue
+54
-2
notice.vue
src/renderer/components/system/notice.vue
+36
-5
No files found.
src/renderer/components/index.vue
View file @
93929c38
...
@@ -181,6 +181,7 @@ export default {
...
@@ -181,6 +181,7 @@ export default {
that
.
atInfo
.
atName
=
''
that
.
atInfo
.
atName
=
''
}
}
that
.
MsgBus
.
$emit
(
"close-copy"
)
that
.
MsgBus
.
$emit
(
"close-copy"
)
that
.
MsgBus
.
$emit
(
"hide-this-winShow"
)
});
});
},
},
methods
:
{
methods
:
{
...
...
src/renderer/components/msssage/chateditor.vue
View file @
93929c38
...
@@ -16,6 +16,12 @@
...
@@ -16,6 +16,12 @@
<el-tooltip
class=
"item"
effect=
"dark"
content=
"截图,快捷键Ctrl+Alt+Q"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"截图,快捷键Ctrl+Alt+Q"
placement=
"top"
>
<i
class=
"iconfont iconjietu"
@
click=
"openScreenhot"
></i>
<i
class=
"iconfont iconjietu"
@
click=
"openScreenhot"
></i>
</el-tooltip>
</el-tooltip>
<div
style=
"position: relative;"
>
<i
class=
"sanjiaoxing"
@
click
.
stop=
"hideThisWin"
></i>
<div
v-if=
"hideThisWinShow"
class=
"sethide-box"
>
<el-radio
v-model=
"hideThisWinActive"
label=
"1"
@
click
.
native
.
prevent=
"setWinActive"
>
截图时隐藏当前窗口
</el-radio>
</div>
</div>
<input
<input
type=
"file"
type=
"file"
ref=
"fileToSent"
ref=
"fileToSent"
...
@@ -66,12 +72,18 @@ export default {
...
@@ -66,12 +72,18 @@ export default {
});
});
},
},
mounted
()
{
mounted
()
{
let
that
=
this
;
// 获取截图隐藏窗口
this
.
hideThisWinActive
=
window
.
localStorage
.
hideThisWinActive
?
window
.
localStorage
.
hideThisWinActive
:
''
this
.
MsgBus
.
$on
(
'hide-this-winShow'
,
function
(){
that
.
hideThisWinShow
=
false
})
// 绑定拖拽时间
// 绑定拖拽时间
this
.
addDropSupport
();
this
.
addDropSupport
();
new
kscreenshot
({
new
kscreenshot
({
key
:
65
key
:
65
});
});
let
that
=
this
;
this
.
$electron
.
ipcRenderer
.
on
(
"sending-process"
,
(
event
,
file
)
=>
{
this
.
$electron
.
ipcRenderer
.
on
(
"sending-process"
,
(
event
,
file
)
=>
{
this
.
GLOBALSENDING
.
forEach
(
x
=>
{
this
.
GLOBALSENDING
.
forEach
(
x
=>
{
if
((
x
.
msgId
=
file
.
msgId
))
{
if
((
x
.
msgId
=
file
.
msgId
))
{
...
@@ -165,7 +177,11 @@ export default {
...
@@ -165,7 +177,11 @@ export default {
inputObj
:
{
inputObj
:
{
txt
:
""
,
txt
:
""
,
file
:
[]
file
:
[]
}
},
hideThisWinActive
:
'1'
,
top
:
0
,
left
:
0
,
hideThisWinShow
:
false
,
};
};
},
},
computed
:
{
computed
:
{
...
@@ -192,6 +208,14 @@ export default {
...
@@ -192,6 +208,14 @@ export default {
}
}
},
},
methods
:
{
methods
:
{
setWinActive
(){
this
.
hideThisWinActive
=
this
.
hideThisWinActive
==
'1'
?
''
:
'1'
;
window
.
localStorage
.
hideThisWinActive
=
this
.
hideThisWinActive
this
.
hideThisWinShow
=
false
;
},
hideThisWin
(){
this
.
hideThisWinShow
=
true
;
},
forceUpdateChild
(
obj
){
forceUpdateChild
(
obj
){
this
.
inputObj
.
txt
=
obj
this
.
inputObj
.
txt
=
obj
this
.
msgToSent
=
obj
this
.
msgToSent
=
obj
...
@@ -616,6 +640,7 @@ export default {
...
@@ -616,6 +640,7 @@ export default {
.user-input-box
.tool-box
{
.user-input-box
.tool-box
{
padding
:
5px
10px
;
padding
:
5px
10px
;
-webkit-user-select
:
none
!important
;
-webkit-user-select
:
none
!important
;
display
:
flex
;
}
}
.user-input-box
.tool-box
i
{
.user-input-box
.tool-box
i
{
margin-right
:
10px
;
margin-right
:
10px
;
...
@@ -717,4 +742,31 @@ export default {
...
@@ -717,4 +742,31 @@ export default {
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
}
}
.sethide-box
{
position
:
absolute
;
top
:
20px
;
box-shadow
:
0
0
2px
#ddd
;
border-radius
:
0
;
min-width
:
100px
;
border
:
1px
solid
#ddd
;
padding
:
4px
10px
;
font-size
:
12px
;
z-index
:
50
;
background-color
:
white
;
}
.sethide-box
label
{
display
:
flex
;
align-items
:
center
;
cursor
:
pointer
;
}
.sanjiaoxing
{
width
:
0
;
border-width
:
4px
;
border-style
:
solid
;
border-color
:
#666
transparent
transparent
transparent
;
/* transparent 设置边框颜色透明 */
position
:
absolute
;
left
:
-5px
;
top
:
8px
;
}
</
style
>
</
style
>
src/renderer/components/system/notice.vue
View file @
93929c38
...
@@ -8,6 +8,14 @@
...
@@ -8,6 +8,14 @@
</el-tooltip>
</el-tooltip>
</span>
</span>
</div>
</div>
<div
class=
"notice-class"
>
<div
:class=
"
{ 'active': noticeActive == 1 }" @click="noticeActive = 1, getNotices(1)">
<span>
系统
</span>
</div>
<div
:class=
"
{ 'active': noticeActive == 2}" @click="noticeActive = 2, getNotices(1)">
<span>
酒店
</span>
</div>
</div>
<div
class=
"notice-content"
v-loading=
"loading"
>
<div
class=
"notice-content"
v-loading=
"loading"
>
<div
<div
class=
"notice"
class=
"notice"
...
@@ -53,7 +61,8 @@ export default {
...
@@ -53,7 +61,8 @@ export default {
pageIndex
:
1
pageIndex
:
1
},
},
user
:
null
,
user
:
null
,
loading
:
false
loading
:
false
,
noticeActive
:
1
,
};
};
},
},
mounted
()
{
mounted
()
{
...
@@ -86,8 +95,8 @@ export default {
...
@@ -86,8 +95,8 @@ export default {
this
.
pages
.
pageIndex
++
;
this
.
pages
.
pageIndex
++
;
this
.
getNotices
();
this
.
getNotices
();
},
},
getNotices
()
{
getNotices
(
load
)
{
if
(
this
.
pageIndex
==
1
)
{
if
(
this
.
pageIndex
==
1
||
load
)
{
this
.
notices
=
[];
this
.
notices
=
[];
}
}
this
.
loading
=
true
;
this
.
loading
=
true
;
...
@@ -101,7 +110,8 @@ export default {
...
@@ -101,7 +110,8 @@ export default {
RecPlatform
:
2
,
RecPlatform
:
2
,
Title
:
""
,
Title
:
""
,
Type
:
"1"
,
Type
:
"1"
,
ShowShortcut
:
"1"
ShowShortcut
:
"1"
,
LogType
:
this
.
noticeActive
};
};
this
.
apipost
(
this
.
apipost
(
"SystemLog_get_LogGetPageList"
,
"SystemLog_get_LogGetPageList"
,
...
@@ -179,7 +189,7 @@ export default {
...
@@ -179,7 +189,7 @@ export default {
position
:
absolute
;
position
:
absolute
;
left
:
0
;
left
:
0
;
right
:
0
;
right
:
0
;
top
:
66
px
;
top
:
78
px
;
bottom
:
10px
;
bottom
:
10px
;
overflow-y
:
auto
;
overflow-y
:
auto
;
padding
:
0
20px
;
padding
:
0
20px
;
...
@@ -262,4 +272,25 @@ export default {
...
@@ -262,4 +272,25 @@ export default {
font-size
:
120px
;
font-size
:
120px
;
color
:
#bbb
;
color
:
#bbb
;
}
}
.notice-class
{
display
:
flex
;
width
:
100%
;
height
:
30px
;
line-height
:
30px
;
margin-bottom
:
20px
;
}
.notice-class
>
div
{
flex
:
1
;
font-size
:
14px
;
text-align
:
center
;
cursor
:
pointer
;
}
.notice-class
>
div
>
span
{
padding
:
5px
0
;
border-bottom
:
2px
solid
transparent
;
}
.notice-class
>
div
.active
>
span
{
color
:
#2d98da
;
border-bottom
:
2px
solid
#2d98da
;
}
</
style
>
</
style
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment