mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-12 19:35:50 +00:00
no message
This commit is contained in:
parent
79065a7675
commit
956b68a545
@ -712,3 +712,4 @@ body {
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
}
|
||||
.mce-content-body img{max-width:100%}
|
||||
|
||||
File diff suppressed because one or more lines are too long
1
public/js/tinymce/skins/ui/oxide/content.css
vendored
1
public/js/tinymce/skins/ui/oxide/content.css
vendored
@ -730,3 +730,4 @@ body {
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
}
|
||||
.mce-content-body img{max-width:100%}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -407,6 +407,7 @@ export default {
|
||||
const readOnly = this.readOnlyFull === null ? this.readOnly : this.readOnlyFull;
|
||||
if (readOnly) {
|
||||
this.editorT.setMode('readonly');
|
||||
this.addClickEvent(e, true);
|
||||
} else {
|
||||
this.editorT.setMode('design');
|
||||
}
|
||||
@ -432,6 +433,7 @@ export default {
|
||||
this.editor.setContent(this.content);
|
||||
if (this.readOnly) {
|
||||
this.editor.setMode('readonly');
|
||||
this.addClickEvent(e, false);
|
||||
} else {
|
||||
this.editor.setMode('design');
|
||||
}
|
||||
@ -612,6 +614,25 @@ export default {
|
||||
this.$store.dispatch("previewImage", {index, list: array})
|
||||
},
|
||||
|
||||
addClickEvent({target}, isFull) {
|
||||
target.getBody().addEventListener('click', (e) => {
|
||||
if (isFull) {
|
||||
const readOnly = this.readOnlyFull === null ? this.readOnly : this.readOnlyFull;
|
||||
if (!readOnly) {
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (!this.readOnly) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (e.target.nodeName === 'IMG') {
|
||||
this.operateImg = e.target.src;
|
||||
this.onImagePreview();
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
/********************文件上传部分************************/
|
||||
|
||||
handleProgress(event, file) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="vmpreview-wrapper">
|
||||
<div class="vmpreview-wrapper" @click="handleClick">
|
||||
<v-md-preview :text="value"/>
|
||||
</div>
|
||||
</template>
|
||||
@ -70,6 +70,19 @@ export default {
|
||||
// md.set(option).use(plugin);
|
||||
},
|
||||
});
|
||||
},
|
||||
|
||||
methods: {
|
||||
handleClick({target}) {
|
||||
if (target.nodeName === 'IMG') {
|
||||
const list = [...this.$el.querySelectorAll('img').values()].map(img => img.src)
|
||||
if (list.length === 0) {
|
||||
return
|
||||
}
|
||||
const index = Math.max(0, list.indexOf(target.src))
|
||||
this.$store.dispatch("previewImage", {index, list})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -131,7 +131,7 @@
|
||||
<div class="label">{{items.az}}</div>
|
||||
<ul>
|
||||
<li v-for="(user, index) in items.list" :key="index" @click="openContacts(user)">
|
||||
<div class="avatar"><UserAvatar :userid="user.userid" :size="30"/></div>
|
||||
<div class="avatar"><UserAvatar :userid="user.userid" :size="contactAvatarSize"/></div>
|
||||
<div class="nickname">
|
||||
<em>{{user.nickname}}</em>
|
||||
<div v-if="user.tags" class="tags">
|
||||
@ -314,6 +314,10 @@ export default {
|
||||
return this.$route.name
|
||||
},
|
||||
|
||||
contactAvatarSize() {
|
||||
return this.windowPortrait ? 36 : 30
|
||||
},
|
||||
|
||||
typeItems() {
|
||||
const {dialogActive, dialogMenus, dialogHistory} = this
|
||||
const types = []
|
||||
|
||||
@ -19,6 +19,11 @@
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.file-preview {
|
||||
border-radius: 0;
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
import TEditor from "../../components/TEditor.vue";
|
||||
|
||||
|
||||
@ -221,6 +221,7 @@
|
||||
> li {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
list-style: none;
|
||||
height: 100%;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
|
||||
5
resources/assets/sass/pages/common.scss
vendored
5
resources/assets/sass/pages/common.scss
vendored
@ -749,6 +749,11 @@ body {
|
||||
&.common-drawer-modal{
|
||||
.ivu-modal-body{
|
||||
padding: 0 !important;
|
||||
.dialog-wrapper{
|
||||
&.inde-list{
|
||||
border-radius: 0
|
||||
}
|
||||
}
|
||||
}
|
||||
.ivu-modal-close{
|
||||
z-index: 3;
|
||||
|
||||
20
resources/assets/sass/pages/page-messenger.scss
vendored
20
resources/assets/sass/pages/page-messenger.scss
vendored
@ -394,9 +394,13 @@
|
||||
padding-left: 4px;
|
||||
margin-top: 6px;
|
||||
margin-bottom: 6px;
|
||||
margin-right: 2px;
|
||||
height: 34px;
|
||||
line-height: 34px;
|
||||
position: relative;
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 3;
|
||||
background: #ffffff;
|
||||
&:after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
@ -680,6 +684,20 @@ body.window-portrait {
|
||||
}
|
||||
&.contacts {
|
||||
user-select: none;
|
||||
> li {
|
||||
&.loaded {
|
||||
height: 58px;
|
||||
}
|
||||
> ul {
|
||||
> li {
|
||||
height: 58px;
|
||||
.avatar {
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -712,3 +712,4 @@ body {
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
}
|
||||
.mce-content-body img{max-width:100%}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -730,3 +730,4 @@ body {
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
}
|
||||
.mce-content-body img{max-width:100%}
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user