From ec98cecfdc87c4289b1fdfc11716a61d459e7878 Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Tue, 22 Nov 2022 17:22:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9B=B8=E5=85=B3=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue             |  2 +-
 src/msg-sdk/lib/msg.vue | 31 ++++++++++++++++++-------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ea27381..d87a2fd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,7 +19,7 @@
           <page404></page404>
         </div>
       </div>
-      <msg v-model="readFlag" v-show="readFlag"></msg>
+      <msg v-model="readFlag"></msg>
     </el-config-provider>
   </div>
 </template>
diff --git a/src/msg-sdk/lib/msg.vue b/src/msg-sdk/lib/msg.vue
index a3f3eb4..ea2d5c7 100644
--- a/src/msg-sdk/lib/msg.vue
+++ b/src/msg-sdk/lib/msg.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="msg-container-bdx12"  @click.stop>
-    <el-dialog title="详情" v-model="dialogVisible" width="640px" custom-class="dialog_box1">
+    <el-dialog title="详情" v-model="dialogVisible" width="640px"  custom-class="dialog_box1">
       <div>
         <detail-table2 :list="detailData">
           <template v-slot:action="{data}">
@@ -42,7 +42,7 @@
         <div class="msg-title">消息盒子</div>
         <div class="msg-action">
           <el-input prefix-icon="Search" v-model.trim ="msgText" style="width:240px;border-color: #dadee7;" @input="changeText" placeholder="请输入搜索内容"></el-input>
-          <bg-icon class="el-icon-close" icon="#bg-ic-close" style="font-size:14px;margin-left: 16px;color: #909bb6;"></bg-icon>
+          <bg-icon @click="closeRead" class="el-icon-close" icon="#bg-ic-close" style="font-size:14px;margin-left: 16px;color: #909bb6;"></bg-icon>
         </div>
       </div>
 
@@ -62,7 +62,7 @@
         <div class="msg-box-list content-no-scroll">
           <div class="msg-box-item" v-for="(item,index) in msgList" :key="'msgitem'+index">
             <p :class="{'msg-title':item.readStatus==1}" class="msg-title1">{{item.msgTitle}}</p>
-            <p>{{megDeal(item)}}</p>
+            <p v-html="megDeal(item)"></p>
             <p>
               <span>{{item.createTime}}</span>
               <span>{{item.systemName}}</span>
@@ -85,6 +85,8 @@ import "github-markdown-css/github-markdown.css";
 import detailTable2 from "./detail-table2.vue";
 import MarkdownIt from "markdown-it";
 import axios from "axios";
+import { h } from 'vue'
+console.log(h);
 var md = new MarkdownIt();
 export default {
   // model: {
@@ -197,21 +199,18 @@ export default {
     },
     //消息推送
     msgTipsAdd(data) {
-      const h = this.$createElement;
       this.$notify({
         title: data.msgTitle,
         dangerouslyUseHTMLString: true,
         message: h("div", { class: "msg-tips-xxb1" }, [
-          h("div", { class: "msg-text-xxb1" }, this.megDeal(data)),
+          h("div", { class: "msg-text-xxb1" ,innerHTML:this.megDeal(data)}),
           h(
             "p",
             {
               class: "detail-xxb1",
-              on: {
-                click: () => {
-                  this.getDetail(data.msgId);
-                },
-              },
+              onclick:()=>{
+                this.getDetail(data.msgId);
+              }
             },
             "查看详情"
           ),
@@ -220,7 +219,7 @@ export default {
             h("span", data.systemName),
           ]),
         ]),
-        iconClass: "el-icon-info",
+        type: 'info',
       });
     },
     //获取详情
@@ -371,7 +370,7 @@ export default {
     },
     // 关闭消息列表
     closeRead() {
-      this.$emit("update:modelValu", false);
+      this.$emit("update:modelValue", false);
     },
     //全部已读
     allRead() {
@@ -413,7 +412,7 @@ export default {
       //文本
       // debugger
       if(obj.msgType==1){
-        return obj.msgInfo 
+        return this.quickDeal(obj.msgInfo) 
       }else if(obj.msgType==2){//图文
         let img = obj.image||[]
         let str = ''
@@ -432,6 +431,12 @@ export default {
         return actStr
       }
     },
+    //简短消息处理
+    quickDeal(str){
+      var reg = /\[([\u4e00-\u9fa5a-zA-Z0-9]*)\]\(([\-\_\#\=\?\/\u4e00-\u9fa5a-zA-Z0-9]*)\)/g
+      var str1 = str.replace(reg, '<a target="_blank" class="can_click_text" href="$2">$1</a>')
+      return str1
+    },
     replaceImg(html) {
       let imgReg = /<img[^>]+>/g;
       let text = html.replace(imgReg, "[图片]");
-- 
2.26.0