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
8dfcff0a
Commit
8dfcff0a
authored
Sep 26, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
312777e5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
chatitem.vue
src/renderer/components/msssage/chatitem.vue
+12
-4
contenteditor.vue
src/renderer/components/tools/contenteditor.vue
+1
-1
No files found.
src/renderer/components/msssage/chatitem.vue
View file @
8dfcff0a
...
...
@@ -40,7 +40,7 @@
</v-contextmenu>
<!-- v-touch:hold="revocateMsg" -->
<a
class=
"msg-head"
v-if=
"msg.avatar"
@
click=
"headAtBoxShow"
@
contextmenu=
"AtHim"
>
<img
class=
"icon u-circle"
:data-id=
"msg.from"
:data-name=
"msg.fromNick"
:data-scene=
"msg.scene"
:src=
"msg.avatar"
>
<img
class=
"icon u-circle"
:data-id=
"msg.from"
:data-name=
"msg.fromNick"
:data-
flow=
"msg.flow"
:data-
scene=
"msg.scene"
:src=
"msg.avatar"
>
</a>
<div
class=
"msg-info"
>
<div
class=
"u-member-name"
v-if=
"msg.flow=='in' && msg.scene==='team'"
>
{{
msg
.
fromNick
}}
</div>
...
...
@@ -292,11 +292,19 @@ export default {
},
methods
:
{
AtHim
(
e
){
this
.
MsgBus
.
$emit
(
'open-atBox'
,
e
.
target
.
dataset
.
name
,
e
.
clientY
,
e
.
clientX
,
e
.
target
.
dataset
.
id
,
e
.
target
.
dataset
.
scene
)
console
.
log
(
e
.
target
.
dataset
.
flow
,
e
.
target
.
dataset
.
scene
)
if
(
e
.
target
.
dataset
.
flow
==
"out"
&&
e
.
target
.
dataset
.
scene
!==
'team'
)
{
return
}
else
{
this
.
MsgBus
.
$emit
(
'open-atBox'
,
e
.
target
.
dataset
.
name
,
e
.
clientY
,
e
.
clientX
,
e
.
target
.
dataset
.
id
,
e
.
target
.
dataset
.
scene
)
}
},
headAtBoxShow
(
e
){
console
.
log
(
e
)
this
.
MsgBus
.
$emit
(
'open-card'
,
e
.
target
.
dataset
.
name
,
e
.
clientY
-
30
,
e
.
clientX
+
30
,
e
.
target
.
dataset
.
id
,
true
)
if
(
e
.
target
.
dataset
.
flow
==
"out"
&&
e
.
target
.
dataset
.
scene
!==
'team'
)
{
return
false
}
else
{
this
.
MsgBus
.
$emit
(
'open-card'
,
e
.
target
.
dataset
.
name
,
e
.
clientY
-
30
,
e
.
clientX
+
30
,
e
.
target
.
dataset
.
id
,
true
)
}
},
showMenu
()
{
let
dom
=
document
.
querySelector
(
"#chat-list"
);
...
...
src/renderer/components/tools/contenteditor.vue
View file @
8dfcff0a
...
...
@@ -75,7 +75,7 @@ export default {
},
mounted
()
{
this
.
MsgBus
.
$on
(
"send-at-name"
,
function
(
name
)
{
document
.
querySelector
(
'#msgEditorBox'
).
innerText
=
`@
${
name
}
`
document
.
querySelector
(
'#msgEditorBox'
).
innerText
=
document
.
querySelector
(
'#msgEditorBox'
).
innerText
+
`@
${
name
}
`
})
this
.
initClip
();
let
that
=
this
;
...
...
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