robin/lemon-imui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPDATE

Browse Source
This commit is contained in:
fan
2019-10-28 12:14:44 +08:00
parent aa10592b07
commit 6f01dcf94e
12 changed files with 257 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/components/index.vue
+57 -72
View File
@@ -50,6 +50,7 @@ export default {
* 初始化时是否隐藏导航按钮上的头像
*/
hideMenuAvatar: Boolean,
hideMenu: Boolean,
user: {
type: Object,
default: () => {
@@ -198,37 +199,17 @@ export default {
file
);
},
_handleReachTop(next) {
// const messages = {
// id: "8ad7e98e-5225-4892-8131-4b2ee7797599",
// type: "text",
// status: "succeed",
// sendTime: 1564926674646,
// fromContactId: "superadmin",
// fromUser: {
// id: "hehe",
// displayName: "I KNOEW",
// avatar:
// "https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=4085009425,1005454674&fm=26&gp=0.jpg"
// },
// content: "测试消息哦..."
// };
_emitPullMessages(next) {
this.$emit(
"pull-messages",
this.currentContact,
(messages, isEnd = false) => {
this._addMessage(
Array(10).fill(messages[1]),
this.currentContactId,
0
);
this._addMessage(messages, this.currentContactId, 0);
CacheMessageLoaded.set(this.currentContactId, isEnd);
if (isEnd == true) this.$refs.messages.loaded();
next(isEnd);
}
);
// setTimeout(() => {
// CacheMessageLoaded.set(this.currentContactId, isEnd);
// }, 2000);
},
clearCacheContainer(name) {
CacheContactContainer.remove(name);
@@ -249,16 +230,17 @@ export default {
_renderMenu() {
const menuItem = this._renderMenuItem();
return (
<div class="lemon-menu">
{this.hideMenuAvatar == false && (
<div class="lemon-menu" v-show={!this.hideMenu}>
{
<lemon-avatar
v-show={!this.hideMenuAvatar}
on-click={e => {
console.log("menu avatar click");
}}
class="lemon-menu__avatar"
src="https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=400062461,2874561526&fm=26&gp=0.jpg"
src={this.user.avatar}
/>
)}
}
{menuItem.top}
{this.$slots.menu}
<div class="lemon-menu__bottom">
@@ -301,15 +283,18 @@ export default {
},
_renderSidebarMessage() {
return this._renderSidebar(
this.lastMessages.map(contact => {
return this._renderContact(
{
contact,
timeFormat: this.contactTimeFormat
},
() => this.changeContact(contact.id)
);
}),
[
useScopedSlot(this.$scopedSlots["message-sidebar"]),
this.lastMessages.map(contact => {
return this._renderContact(
{
contact,
timeFormat: this.contactTimeFormat
},
() => this.changeContact(contact.id)
);
})
],
DEFAULT_MENU_LASTMESSAGES
);
},
@@ -342,23 +327,27 @@ export default {
_renderSidebarContact() {
let prevIndex;
return this._renderSidebar(
this.contacts.map(contact => {
contact.index = contact.index.replace(/\[[0-9]*\]/, "");
const node = [
contact.index !== prevIndex && (
<p class="lemon-sidebar__label">{contact.index}</p>
),
this._renderContact(
{
contact: contact,
simple: true
},
() => this.changeContact(contact.id)
)
];
prevIndex = contact.index;
return node;
}),
[
useScopedSlot(this.$scopedSlots["contact-sidebar"]),
this.contacts.map(contact => {
if (!contact.index) return;
contact.index = contact.index.replace(/\[[0-9]*\]/, "");
const node = [
contact.index !== prevIndex && (
<p class="lemon-sidebar__label">{contact.index}</p>
),
this._renderContact(
{
contact: contact,
simple: true
},
() => this.changeContact(contact.id)
)
];
prevIndex = contact.index;
return node;
})
],
DEFAULT_MENU_CONTACTS
);
},
@@ -425,7 +414,7 @@ export default {
ref="messages"
time-format={this.messageTimeFormat}
reverse-user-id={this.user.id}
on-reach-top={this._handleReachTop}
on-reach-top={this._emitPullMessages}
messages={this.currentMessages}
/>
<lemon-editor
@@ -436,7 +425,7 @@ export default {
</div>
);
nodes.push(
<div class={cls} v-show={!curact.id}>
<div class={cls} v-show={!curact.id && this.currentIsDefSidebar}>
{this.$slots.cover}
</div>
);
@@ -455,8 +444,7 @@ export default {
this.changeContact(curact.id, DEFAULT_MENU_LASTMESSAGES);
}}
>
{" "}
发送消息{" "}
发送消息
</lemon-button>
</div>,
curact
@@ -537,16 +525,11 @@ export default {
this.$refs.messages.resetLoadState();
}
if (!messages[contactId]) {
this.$emit(
"pull-messages",
this.currentContact,
(messages, isEnd) => {
this._addMessage(messages, contactId, 0);
this.messageViewToBottom();
}
);
this._emitPullMessages(isEnd => this.messageViewToBottom());
} else {
this.messageViewToBottom();
setTimeout(() => {
this.messageViewToBottom();
}, 0);
}
}
},
@@ -570,10 +553,11 @@ export default {
updateMessage(messageId, contactId, data) {
const index = this.findMessageIndexById(messageId, contactId);
if (index !== -1) {
messages[contactId][index] = {
...messages[contactId][index],
...data
};
messages[contactId][index] = Object.assign(
messages[contactId][index],
data
);
console.log('--------',messages[contactId][index]);
this.forceUpdateMessage(messageId);
}
},
@@ -684,6 +668,7 @@ export default {
*/
sortContacts() {
this.contacts.sort((a, b) => {
if (!a.index) return;
return a.index.localeCompare(b.index);
});
},
@@ -740,8 +725,8 @@ export default {
* 返回所有消息
* @return {Object<Contact.id,Message>}
*/
getMessages() {
return messages;
getMessages(contactId) {
return (contactId ? messages[contactId] : messages) || [];
},
// appendContact(data) {
// this._addContact(data, 0);
packages/components/message/basic.vue
+18 -7
View File
@@ -1,6 +1,7 @@
<script>
export default {
name: "lemonMessageBasic",
inject: ["IMUI"],
props: {
message: {
type: Object,
@@ -35,16 +36,16 @@ export default {
size={36}
shape="square"
src={fromUser.avatar}
on-click={() => {
console.log("message avatar click");
on-click={e => {
this._emitClick(e, "avatar");
}}
/>
</div>
<div class="lemon-message__inner">
<div class="lemon-message__title">
<span
on-click={() => {
console.log("message displayname click");
on-click={e => {
this._emitClick(e, "displayName");
}}
>
{fromUser.displayName}
@@ -53,13 +54,20 @@ export default {
</div>
<div
class="lemon-message__content"
on-click={() => {
console.log("message content click");
on-click={e => {
this._emitClick(e, "content");
}}
>
{this.useScopedSlots("content", this.message)}
</div>
<div class="lemon-message__status">{this._renderStatue(status)}</div>
<div
class="lemon-message__status"
on-click={e => {
this._emitClick(e, "status");
}}
>
{this._renderStatue(status)}
</div>
</div>
</div>
);
@@ -69,6 +77,9 @@ export default {
computed: {},
watch: {},
methods: {
_emitClick(e, key) {
this.IMUI.$emit("message-click", e, key, this.message);
},
_renderStatue(status) {
if (status == "going") {
return <i class="lemon-icon-loading lemonani-spin" />;
packages/components/message/text.vue
+1 -2
View File
@@ -1,9 +1,8 @@
<script>
import IMUIProxy from "mixins/IMUIProxy";
export default {
name: "lemonMessageText",
inheritAttrs: false,
mixins: [IMUIProxy],
inject: ["IMUI"],
render() {
return (
<lemon-message-basic
packages/components/messages.vue
+19 -13
View File
@@ -22,8 +22,8 @@ export default {
},
data() {
return {
loading: false,
loadend: false
_loading: false,
_loadend: false
};
},
render() {
@@ -32,10 +32,10 @@ export default {
<div
class={[
"lemon-messages__load",
`lemon-messages__load--${this.loadend ? "end" : "ing"}`
`lemon-messages__load--${this._loadend ? "end" : "ing"}`
]}
>
{this.loadend ? this._renderLoadEnd() : this._renderLoading()}
{this._loadend ? this._renderLoadEnd() : this._renderLoading()}
</div>
{this.messages.map((message, index) => {
const node = [];
@@ -86,35 +86,40 @@ export default {
return <i class="lemon-icon-loading lemonani-spin" />;
},
_renderLoadEnd() {
return <span>暂无消息</span>;
return <span>暂无更多消息</span>;
},
loaded() {
this._loadend = true;
},
resetLoadState() {
this.loading = false;
this.loadend = false;
this._loading = false;
this._loadend = false;
},
async _handleScroll(e) {
const { target } = e;
if (
target.scrollTop == 0 &&
this.loading == false &&
this.loadend == false
this._loading == false &&
this._loadend == false
) {
this.loading = true;
this._loading = true;
await this.$nextTick();
const hst = target.scrollHeight;
this.$emit("reach-top", async isEnd => {
await this.$nextTick();
target.scrollTop = target.scrollHeight - hst;
this.loading = false;
this.loadend = !!isEnd;
this._loading = false;
this._loadend = !!isEnd;
});
}
},
async scrollToBottom() {
await this.$nextTick();
const { wrap } = this.$refs;
if (wrap) wrap.scrollTop = wrap.scrollHeight;
if (wrap) {
wrap.scrollTop = wrap.scrollHeight;
}
}
},
created() {},
@@ -133,6 +138,7 @@ export default {
text-align center
font-size 12px
+e(load)
user-select none
font-size 12px
text-align center
color #999
packages/mixins/IMUIProxy.js
-4
View File
@@ -1,4 +0,0 @@
export default {
inject: ["IMUI"],
methods: {}
};