merge

2021-03-11 22:52:57 +08:00
parent a947018393 bfc621d3a8
commit a646e0d7f3
12 changed files with 36 additions and 18147 deletions
@@ -1,10 +0,0 @@
-<meta charset="utf-8">
-<title>index demo</title>
-<script src="./index.umd.js"></script>
-
-<link rel="stylesheet" href="./index.css">
-
-
-<script>
-console.log(index)
-</script>
@@ -1 +1,5 @@
+<<<<<<< HEAD
 <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=favicon.ico><title>Lemon IMUI</title><link href=css/index.5b3d3f23.css rel=preload as=style><link href=js/chunk-vendors.e4810482.js rel=preload as=script><link href=js/index.7d134a38.js rel=preload as=script><link href=css/index.5b3d3f23.css rel=stylesheet></head><body><noscript><strong>We're sorry but flat-im doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.e4810482.js></script><script src=js/index.7d134a38.js></script></body></html>
+=======
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=favicon.ico><title>Lemon IMUI</title><link href=css/index.fb7c8942.css rel=preload as=style><link href=js/chunk-vendors.2abee366.js rel=preload as=script><link href=js/index.b920ec2b.js rel=preload as=script><link href=css/index.fb7c8942.css rel=stylesheet></head><body><noscript><strong>We're sorry but flat-im doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.2abee366.js></script><script src=js/index.b920ec2b.js></script></body></html>
+>>>>>>> bfc621d3a862a17ba7d25cd31697536e47af83a9
@@ -1,6 +1,6 @@
 {
  "name": "lemon-imui",
-  "version": "1.7.0",
+  "version": "1.6.16",
  "main": "dist/index.umd.min.js",
  "description": "基于 VUE2.0 的 IM 聊天组件",
  "homepage": "http://june000.gitee.io/lemon-im/",
@@ -586,9 +586,7 @@ export default {
    lastContentRender(message) {
      if (!isFunction(lastContentRender[message.type])) {
        console.error(
-          `not found '${
-            message.type
-          }' of the latest message renderer,try to use ‘setLastContentRender()’`,
+          `not found '${message.type}' of the latest message renderer,try to use ‘setLastContentRender()’`,
        );
        return "";
      }
@@ -624,16 +622,20 @@ export default {
    /**
     * 设置联系人的草稿信息
     */
-    setDraft(contactId, editorValue) {
-      if (isEmpty(contactId) || isEmpty(editorValue)) return false;
-      const contact = this.findContact(contactId);
+    setDraft(cid, editorValue) {
+      if (isEmpty(cid) || isEmpty(editorValue)) return false;
+      const contact = this.findContact(cid);
+      let lastContent = contact.lastContent;
      if (isEmpty(contact)) return false;
-      this.CacheDraft.set(contactId, {
-        editorValue: editorValue,
-        lastContent: contact.lastContent,
+      if (this.CacheDraft.has(cid)) {
+        lastContent = this.CacheDraft.get(cid).lastContent;
+      }
+      this.CacheDraft.set(cid, {
+        editorValue,
+        lastContent,
      });
      this.updateContact({
-        id: contactId,
+        id: cid,
        lastContent: `<span style="color:red;">[草稿]</span><span>${this.lastContentRender(
          { type: "text", content: editorValue },
        )}</span>`,
@@ -645,10 +647,15 @@ export default {
    clearDraft(contactId) {
      const draft = this.CacheDraft.get(contactId);
      if (draft) {
+        const currentContent = this.findContact(contactId).lastContent;
+        if (
+          currentContent.indexOf('<span style="color:red;">[草稿]</span>') === 0
+        ) {
          this.updateContact({
            id: contactId,
            lastContent: draft.lastContent,
          });
+        }
        this.CacheDraft.remove(contactId);
      }
    },