Merge branch 'master' of http://gitlab.oytour.com/viitto/madara

src/renderer/components/msssage/index.vue

@@ -112,8 +112,11 @@
               <div class="msgbase">
                 <div class="last">
                   <span class="at-me" v-if="session.atId">[有人@我]</span>
-                  <span v-if="session.isMute && session.unread>0">[{{session.unread}}]</span>
-                  {{session.lastMsgShow}}
+                  <tenplate  v-if="session.isMute && session.unread>0 && !session.historiMsg">
+                    <span>[{{session.unread}}]</span>
+                  </tenplate>
+                  <span v-if="!session.historiMsg">{{session.lastMsgShow}}</span>
+                  <span v-if="session.historiMsg && currentSession.id !== session.id" style="color: red">[草稿]</span>{{session.historiMsg}}
                 </div>
                 <div class="no-tip" v-if="session.isMute">
                   <i class="iconfont iconmiandarao-kai"></i>
@@ -155,8 +158,11 @@
               <div class="msgbase">
                 <div class="last">
                   <span class="at-me" v-if="session.atId">[有人@我]</span>
-                  <span v-if="session.isMute && session.unread>0">[{{session.unread}}]</span>
-                  {{session.lastMsgShow}}
+                  <tenplate  v-if="session.isMute && session.unread>0 && !session.historiMsg">
+                    <span>[{{session.unread}}]</span>
+                  </tenplate>
+                  <span v-if="!session.historiMsg">{{session.lastMsgShow}}</span>
+                  <span v-if="session.historiMsg && currentSession.id !== session.id" style="color: red">[草稿]</span>{{session.historiMsg}}
                 </div>
                 <div class="no-tip" v-if="session.isMute">
                   <i class="iconfont iconmiandarao-kai"></i>
@@ -328,10 +334,7 @@ export default {
         this.$electron.ipcRenderer.send("close-team-box");
         this.$store.dispatch('resetNoMoreHistoryMsgs');
         this.currentSession.id = '';
-        let _this = this;
-        // setTimeout(()=>{
-          _this.currentSession = session;
-        // }, 20)
+        this.currentSession = session;
         if(session.atId){
           this.clearAtMe()
           this.atIds=session.atId
@@ -453,6 +456,9 @@ export default {
     }
   },
   mounted() {
+    this.MsgBus.$on('change-historic', function (){
+      console.log("asdasd 哈哈哈哈")
+    })
     this.audio_base=this.$electron.remote.getGlobal("AUDIO_PATH")+'audio/'
     if (window.localStorage.top) {
       this.TOPSESSION = JSON.parse(window.localStorage.top);
@@ -638,7 +644,6 @@ export default {
         }
         if (item.scene !== "team") {
           item.isMute = false;
-
           this.$store.state.mutelist.forEach(x => {
             if (x.account == item.to) {
               item.isMute = true;
@@ -662,12 +667,16 @@ export default {
         }
         if (historicList && historicList.length > 0){
           let sessionlist = this.sessionlistArr
-          historicList.map(y=>{
+          historicList.map((y, i)=>{
             if (item.id == y.id) {
               item.historiMsg = y.innerHTML
+              if (y.innerHTML.replace(/\s+/g,"") == '') {
+                historicList.splice(i, 1);
+              }
             }
           })
         }
+        window.localStorage.historicList = JSON.stringify(historicList)
         return item;
       });
       if (!this.$electron.remote.getCurrentWindow().isVisible()) {

src/renderer/components/tools/contenteditor.vue

@@ -267,10 +267,6 @@ export default {
         for(let i = 0; i < historicList.length; i++) {
           if (this.chatId === historicList[i].id) {
             rp = true
-            if (sessionText.replace(/\s+/g,"") == '') {
-              historicList.splice(i, 1);
-              break;
-            }
             historicList[i].innerHTML = sessionText
             break;
           }
@@ -378,6 +374,7 @@ export default {
       while (dom.hasChildNodes()) {
         dom.removeChild(dom.firstChild);
       }
+      this.changeTxt()
     },
     addContent(txt) {
       var txtElement = document.createTextNode(txt);