修改历史版本

src/components/historyList/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog v-model="isOpen" append-to-body width="950" @close="closeOpen">
+    <el-dialog v-model="isOpen" append-to-body width="950" @close="closeOpen" class="tank">
       <template #header>
         <div class="my-header">
           <div class="title">历史版本列表 — {{ name }}</div>
@@ -13,7 +13,7 @@
           v-if="treeData.length>0"
         >
           <div
-            v-for="(item, index) in treeData"
+            v-for="(item, index) in treeData.value"
             :key="index"
             class="list-item list-item-dot"
             :class="{
@@ -29,17 +29,18 @@
           </div>
         </div>
         <div v-else style="text-align: center;">暂无历史版本记录</div>
-        <pagination
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer" style="display: flex;align-items: center;justify-content: space-between;">
+          <pagination
           v-show="total > 0"
           :total="total"
           v-model:page="pageNum"
           v-model:limit="pageSize"
           @pagination="getList"
-          style="width: 70%;height: 62px;"
+          style="width: 70%;"
         />
-      </div>
-      <template #footer>
-        <span class="dialog-footer">
           <el-button @click="closeOpen" class="cancel-button">关闭</el-button>
         </span>
       </template>
@@ -104,8 +105,7 @@ watch(
   (newValue) => {
     isOpen.value = newValue;
   }
-);
-const treeData =ref([])
+);const treeData = reactive([]);
 watchEffect(() => {
   if(props.fileUserTreeData.length>0){
     treeData.value = props.fileUserTreeData.reverse();
@@ -115,12 +115,14 @@ watchEffect(() => {
 });
 const getList=async()=>{
   console.log('page', pageNum.value)
-  nextTick(async ()=>{
-    const resHistory = await listVersion({pageNum:pageNum.value,pageSize:pageSize.value,docId: props.docId })
-  treeData.value =resHistory.rows
-  total.value=resHistory.total
-
-  })
+  try {
+    const resHistory = await listVersion({ pageNum: pageNum.value, pageSize: pageSize.value, docId: props.docId });
+    treeData.value = resHistory.rows;
+    console.log('treeData.value', treeData.value);
+    total.value = resHistory.total;
+  } catch (error) {
+    console.error(error);
+  }
 }
 //树
 const clickData = ref({});
@@ -139,6 +141,7 @@ const clickList = (index) => {
 };
 
 const closeOpen = () => {
+  console.log('first',  isOpen.value)
   isOpen.value = false;
   emit("changeMsgClose", false, "");
 };
@@ -216,6 +219,7 @@ const closeOpen = () => {
   border: none;
   width: 120px;
   height: 32px;
+  z-index: 999;
 }
 .main-conts {
   border: none;
@@ -223,6 +227,6 @@ const closeOpen = () => {
 }
 :deep(.pagination-container .el-pagination){
 left:25px;
-bottom: 22px;
+bottom: 36px;
 }
 </style>

src/views/liveChat/index.vue

@@ -218,8 +218,12 @@ const msgSendClick = (event) => {
     event.preventDefault();
   } else if (event.shiftKey && event.keyCode == 13) {
     event.preventDefault();
-  } else {
-    noMes.value = false;
+  }
+};
+const msgSendClick2 = (event) => {
+  if (!event.shiftKey && event.keyCode == 13 && !event.ctrlKey) {
+  event.preventDefault();
+  noMes.value = false;
     if (messageText.value.trim() == "") {
       return ElMessage({ message: "不能发送空白消息", type: "error" });
     }
@@ -231,11 +235,10 @@ const msgSendClick = (event) => {
     };
     websoctStore.sendMessage(message);
     boottmScroll();
-    event.preventDefault();
     messageText.value = "";
     //  将光标设置到输入框第一行
   }
-};
+}
 //发送文件确认按钮
 const fileChangeMsg = async (val) => {
   const message = {
@@ -268,20 +271,24 @@ const handleNewMessage = async () => {
 watchEffect(async() => {
   if (websoctStore.messOne?.fromId) {
     msgRecordEvent(websoctStore.messOne.fromId);
-    const res= await msgFriend();
-  //圆点======
-  searchData.value.map(k=>{
-    res.rows.map((i) => {
-    if (i.fromId == websoctStore.messOne?.fromId||i.toId == websoctStore.messOne?.fromId) {
-      k=i
-      k.showCircel = true;
-    }
-  });
-  })
-  // 圆点======
-    // getMsgList();
+    // getYuan()
+    getMsgList();
   }
 });
+  //圆点======
+// const getYuan=async ()=>{
+//   const res= await msgFriend();
+
+//   searchData.value.forEach(k=>{
+//     res.rows.forEach((i) => {
+//     if (i.fromId == websoctStore.messOne?.fromId) {
+//       k=i
+//       k.showCircel = true
+//     }
+//   });
+//   })
+// }
+  // 圆点======
 // 滚动翻页========
 const mainContainer = ref(null);
 const handleScroll = (event) => {
@@ -692,10 +699,10 @@ onMounted(() => {
               maxlength="800"
               @keyup.ctrl.enter="msgSendClick($event)"
               @keyup.shift.enter="msgSendClick($event)"
-              @keyup.enter="msgSendClick($event)"
+              @keydown.enter="msgSendClick2($event)"
             />
             <!-- 发送按钮 -->
-            <img :src="send" class="send-info" @click="msgSendClick" />
+            <img :src="send" class="send-info" @click="msgSendClick2" />
           </el-footer>
         </el-container>
       </div>