mdm-im-v3 2.0.2 → 2.1.0

package/dist-h5/{indexH5-BZ77bUNH.js → indexH5-CUQe-Ize.js}

@@ -1,11 +1,11 @@
 import { computed, ref, watch, onBeforeUnmount, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, withModifiers, createTextVNode, toDisplayString, createCommentVNode, Fragment, renderList, createBlock, normalizeClass, normalizeStyle, inject, provide, onMounted, nextTick } from "vue";
 import { useRouter } from "vue-router";
 import { NavBar, Icon, Badge, PullRefresh, SwipeCell, Loading, Empty, Button, ActionSheet, Cell, showDialog, showToast } from "vant";
-import { u as useChatStore, I as IM_CVS_TYPE, g as getGroupAvatarBg, i as isDefaultAvatar, a as getAvatarBg, b as getAvatarText, c as cloneDeep, d as useMessage, e as useUsers, f as useConversations, h as useMsgList, m as mittBus, j as IM_LOGIN_STATUS, k as handleUrl, l as IM_LOGIN_PLATFORM } from "./indexH5-Cx3l8YDq.js";
+import { u as useChatStore, I as IM_CVS_TYPE, g as getGroupAvatarBg, i as isDefaultAvatar, a as getAvatarBg, b as getAvatarText, c as cloneDeep, d as getConversationBurnSetting, e as useMessage, f as useUsers, h as useConversations, j as useMsgList, m as mittBus, k as IM_LOGIN_STATUS, p as preserveBurnInEx, l as IM_LOGIN_PLATFORM, s as sleep, n as handleUrl } from "./indexH5-DAnvVyZ1.js";
 import "element-plus";
-import "./request-rky8JSGo.js";
+import "./request-CK8gkCRf.js";
 import { d as defaultAvatar } from "./default_avatar-BE2kit_X.js";
-import { J as JoinGroupDialogH5, G as GroupInfoDialogH5 } from "./GroupInfoDialogH5-fgcrbRyp.js";
+import { J as JoinGroupDialogH5, G as GroupInfoDialogH5 } from "./GroupInfoDialogH5-BHLKs62Z.js";
 const _hoisted_1 = { class: "chat-list-h5" };
 const _hoisted_2 = { key: 0 };
 const _hoisted_3 = { style: { "display": "flex", "align-items": "center", "gap": "20px" } };
@@ -21,32 +21,37 @@ const _hoisted_9 = ["src"];
 const _hoisted_10 = { class: "cvs-item__info" };
 const _hoisted_11 = { class: "cvs-item__top" };
 const _hoisted_12 = { class: "cvs-item__name" };
-const _hoisted_13 = { class: "cvs-item__time" };
-const _hoisted_14 = { class: "cvs-item__msg" };
-const _hoisted_15 = {
+const _hoisted_13 = {
+  key: 0,
+  title: "你已开启阅后即焚",
+  style: { "margin-left": "2px", "font-size": "11px", "line-height": "1" }
+};
+const _hoisted_14 = { class: "cvs-item__time" };
+const _hoisted_15 = { class: "cvs-item__msg" };
+const _hoisted_16 = {
   key: 0,
   class: "cvs-item__msg-prefix"
 };
-const _hoisted_16 = ["innerHTML"];
-const _hoisted_17 = {
+const _hoisted_17 = ["innerHTML"];
+const _hoisted_18 = {
   key: 1,
   class: "iconfont mdm-icon-miandarao cvs-item__msg-mute"
 };
-const _hoisted_18 = { class: "swipe-actions" };
-const _hoisted_19 = ["onClick"];
+const _hoisted_19 = { class: "swipe-actions" };
 const _hoisted_20 = ["onClick"];
 const _hoisted_21 = ["onClick"];
-const _hoisted_22 = {
+const _hoisted_22 = ["onClick"];
+const _hoisted_23 = {
   key: 1,
   class: "cvs-loading-more"
 };
-const _hoisted_23 = {
+const _hoisted_24 = {
   key: 2,
   class: "cvs-loading-finished"
 };
-const _hoisted_24 = { class: "more-actions-list" };
-const _hoisted_25 = { class: "more-action-item" };
-const _hoisted_26 = { class: "more-action-text" };
+const _hoisted_25 = { class: "more-actions-list" };
+const _hoisted_26 = { class: "more-action-item" };
+const _hoisted_27 = { class: "more-action-text" };
 const _sfc_main$1 = {
   __name: "ChatListH5",
   props: {
@@ -77,6 +82,10 @@ const _sfc_main$1 = {
     const chatMessage = useChatStore();
     computed(() => chatMessage.getBaseUrl);
     const unReadCount = computed(() => chatMessage.getUnReadCount);
+    const hasBurnSetting = (cvs) => {
+      var _a;
+      return getConversationBurnSetting(cvs, (_a = chatMessage.getUserInfo) == null ? void 0 : _a.userID).enabled;
+    };
     const router = useRouter();
     const emits = __emit;
     ref("");
@@ -385,7 +394,7 @@ const _sfc_main$1 = {
                     "right-width": effectiveUnreadCount(item) > 0 ? 195 : 130
                   }, {
                     right: withCtx(() => [
-                      createElementVNode("div", _hoisted_18, [
+                      createElementVNode("div", _hoisted_19, [
                         effectiveUnreadCount(item) > 0 ? (openBlock(), createElementBlock("span", {
                           key: 0,
                           class: "swipe-btn swipe-btn--read",
@@ -393,7 +402,7 @@ const _sfc_main$1 = {
                         }, [..._cache[6] || (_cache[6] = [
                           createElementVNode("i", { class: "iconfont mdm-icon-clear" }, null, -1),
                           createElementVNode("span", null, "已读", -1)
-                        ])], 8, _hoisted_19)) : createCommentVNode("", true),
+                        ])], 8, _hoisted_20)) : createCommentVNode("", true),
                         createElementVNode("span", {
                           class: normalizeClass(["swipe-btn", item.isPinned ? "swipe-btn--unpin" : "swipe-btn--pin"]),
                           onClick: withModifiers(($event) => handleTogglePinItem(item), ["stop"])
@@ -402,14 +411,14 @@ const _sfc_main$1 = {
                             class: normalizeClass(item.isPinned ? "iconfont mdm-icon-quxiaozhiding" : "iconfont mdm-icon-zhiding")
                           }, null, 2),
                           createElementVNode("span", null, toDisplayString(item.isPinned ? "取消置顶" : "置顶"), 1)
-                        ], 10, _hoisted_20),
+                        ], 10, _hoisted_21),
                         createElementVNode("span", {
                           class: "swipe-btn swipe-btn--delete",
                           onClick: withModifiers(($event) => handleDeleteItem(item), ["stop"])
                         }, [..._cache[7] || (_cache[7] = [
                           createElementVNode("i", { class: "iconfont mdm-icon-yichu" }, null, -1),
                           createElementVNode("span", null, "删除", -1)
-                        ])], 8, _hoisted_21)
+                        ])], 8, _hoisted_22)
                       ])
                     ]),
                     default: withCtx(() => [
@@ -449,16 +458,19 @@ const _sfc_main$1 = {
                         ]),
                         createElementVNode("div", _hoisted_10, [
                           createElementVNode("div", _hoisted_11, [
-                            createElementVNode("span", _hoisted_12, toDisplayString(item.showName), 1),
-                            createElementVNode("span", _hoisted_13, toDisplayString(item.latestMsgSendTimeStr), 1)
+                            createElementVNode("span", _hoisted_12, [
+                              createTextVNode(toDisplayString(item.showName) + " ", 1),
+                              hasBurnSetting(item) ? (openBlock(), createElementBlock("span", _hoisted_13, "🔥")) : createCommentVNode("", true)
+                            ]),
+                            createElementVNode("span", _hoisted_14, toDisplayString(item.latestMsgSendTimeStr), 1)
                           ]),
-                          createElementVNode("div", _hoisted_14, [
-                            item.recvMsgOpt !== 0 && effectiveUnreadCount(item) ? (openBlock(), createElementBlock("span", _hoisted_15, " [" + toDisplayString(effectiveUnreadCount(item)) + "条] ", 1)) : createCommentVNode("", true),
+                          createElementVNode("div", _hoisted_15, [
+                            item.recvMsgOpt !== 0 && effectiveUnreadCount(item) ? (openBlock(), createElementBlock("span", _hoisted_16, " [" + toDisplayString(effectiveUnreadCount(item)) + "条] ", 1)) : createCommentVNode("", true),
                             createElementVNode("span", {
                               class: "cvs-item__msg-text",
                               innerHTML: item.latestMsg
-                            }, null, 8, _hoisted_16),
-                            item.recvMsgOpt !== 0 ? (openBlock(), createElementBlock("span", _hoisted_17)) : createCommentVNode("", true)
+                            }, null, 8, _hoisted_17),
+                            item.recvMsgOpt !== 0 ? (openBlock(), createElementBlock("span", _hoisted_18)) : createCommentVNode("", true)
                           ])
                         ])
                       ], 42, _hoisted_6)
@@ -467,10 +479,10 @@ const _sfc_main$1 = {
                   }, 1032, ["right-width"]);
                 }), 128))
               ])) : createCommentVNode("", true),
-              listLoading.value ? (openBlock(), createElementBlock("div", _hoisted_22, [
+              listLoading.value ? (openBlock(), createElementBlock("div", _hoisted_23, [
                 createVNode(unref(Loading), { size: "20" }),
                 _cache[8] || (_cache[8] = createElementVNode("span", null, "加载中...", -1))
-              ])) : listFinished.value && displayList.value.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_23, "没有更多了")) : createCommentVNode("", true)
+              ])) : listFinished.value && displayList.value.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_24, "没有更多了")) : createCommentVNode("", true)
             ]),
             _: 1
           }, 8, ["modelValue"]),
@@ -508,7 +520,7 @@ const _sfc_main$1 = {
           "cancel-text": "取消"
         }, {
           default: withCtx(() => [
-            createElementVNode("div", _hoisted_24, [
+            createElementVNode("div", _hoisted_25, [
               (openBlock(true), createElementBlock(Fragment, null, renderList(moreActionItems.value, (action) => {
                 return openBlock(), createBlock(unref(Cell), {
                   key: action.value,
@@ -516,11 +528,11 @@ const _sfc_main$1 = {
                   onClick: ($event) => onMoreActionSelect(action)
                 }, {
                   title: withCtx(() => [
-                    createElementVNode("div", _hoisted_25, [
+                    createElementVNode("div", _hoisted_26, [
                       createElementVNode("i", {
                         class: normalizeClass(["iconfont", action.icon, "more-action-icon"])
                       }, null, 2),
-                      createElementVNode("span", _hoisted_26, toDisplayString(action.text), 1)
+                      createElementVNode("span", _hoisted_27, toDisplayString(action.text), 1)
                     ])
                   ]),
                   _: 2
@@ -608,7 +620,7 @@ const _sfc_main = {
       provide("loadMessageCount", pageCount);
     }
     const chatMessage = useChatStore();
-    const { initIMSDK } = useMessage();
+    const { initIMSDK, waitForSyncFinish } = useMessage();
     const baseUrl = computed(() => chatMessage.getBaseUrl);
     const localUser = computed(() => chatMessage.getUserInfo);
     computed(() => chatMessage.getLoginStatus);
@@ -660,9 +672,11 @@ const _sfc_main = {
     };
     const onHideCvs = async (conversationID) => {
       if (!conversationID || !imInstance) return;
+      const target = conversationList.value.find((item) => item.conversationID === conversationID);
       const bool = await (imInstance == null ? void 0 : imInstance.setConversation({
         conversationID,
-        ex: JSON.stringify({ isHidden: true })
+        // 隐藏标记与阅后即焚配置共存于 ex，写入时需保留 burn
+        ex: preserveBurnInEx(JSON.stringify({ isHidden: true }), target == null ? void 0 : target.ex)
       }));
       if (bool) {
         const list = cloneDeep(conversationList.value);
@@ -700,12 +714,14 @@ const _sfc_main = {
     };
     const onMarkUnread = async (conversationID) => {
       if (!conversationID || !imInstance) return;
+      const target = conversationList.value.find((item) => item.conversationID === conversationID);
       try {
         await (imInstance == null ? void 0 : imInstance.setConversation({
           conversationID,
           isRead: false,
           recvMsgOpt: 0,
-          ex: JSON.stringify({ isRead: true })
+          // 保留 burn（阅后即焚）配置
+          ex: preserveBurnInEx(JSON.stringify({ isRead: true }), target == null ? void 0 : target.ex)
         }));
         showToast("已标记为未读");
       } catch {
@@ -714,12 +730,14 @@ const _sfc_main = {
     };
     const onClearMarkUnread = async (conversationID) => {
       if (!conversationID || !imInstance) return;
+      const target = conversationList.value.find((item) => item.conversationID === conversationID);
       try {
         await (imInstance == null ? void 0 : imInstance.setConversation({
           conversationID,
           isRead: true,
           recvMsgOpt: 0,
-          ex: ""
+          // 清除 isRead 标记时保留 burn（阅后即焚）配置
+          ex: preserveBurnInEx("", target == null ? void 0 : target.ex)
         }));
         showToast("已清除未读标记");
       } catch {
@@ -789,7 +807,9 @@ const _sfc_main = {
         info.onlineStatus = statusInfo == null ? void 0 : statusInfo.status;
         info.platformIDs = (statusInfo == null ? void 0 : statusInfo.platformIDs) || [];
         if (info.ex && (info.ex.indexOf("isHidden") > -1 || info.ex.indexOf("isDelete") > -1) && info.conversationID) {
-          await (imInstance == null ? void 0 : imInstance.setConversation({ conversationID: info.conversationID, ex: "" }));
+          const restoredEx = preserveBurnInEx("", info.ex);
+          await (imInstance == null ? void 0 : imInstance.setConversation({ conversationID: info.conversationID, ex: restoredEx }));
+          info.ex = restoredEx;
           handleConversationList([info], "add");
           await nextTick();
           (_b = chatListRef.value) == null ? void 0 : _b.handleSelectChat(info.conversationID);
@@ -817,6 +837,8 @@ const _sfc_main = {
     const getCvsList = async () => {
       const allData = [];
       const allValidData = [];
+      startIndex = 0;
+      initCount = 0;
       while (allValidData.length < 100 && initCount < 3) {
         let currentPage = [];
         let retryCount = 0;
@@ -831,14 +853,14 @@ const _sfc_main = {
             initCount++;
           }
           if (retryCount >= 3) break;
+          await sleep(300 * retryCount);
         }
         allData.push(...currentPage);
-        const validItems = currentPage.filter(
-          (item) => {
-            var _a, _b, _c;
-            return !item.ex || (((_a = item.ex) == null ? void 0 : _a.indexOf("isHidden")) > -1 || ((_b = item.ex) == null ? void 0 : _b.indexOf("isDeleted")) > -1) && item.unreadCount > 0 || ((_c = item.ex) == null ? void 0 : _c.indexOf("isRead")) > -1;
-          }
-        );
+        const validItems = currentPage.filter((item) => {
+          const ex = typeof item.ex === "string" ? item.ex : "";
+          const hidden = ex.indexOf("isHidden") > -1 || ex.indexOf("isDeleted") > -1;
+          return !hidden || item.unreadCount > 0;
+        });
         allValidData.push(...validItems);
         if (allValidData.length >= pageSize) break;
         const nextStart = startIndex + pageSize;
@@ -872,42 +894,48 @@ const _sfc_main = {
         }
       }
     };
-    const afterLogged = () => {
+    const afterLogged = async () => {
       imInstance = window["imInstance"];
       fetchAllApplications();
+      const syncDone = await waitForSyncFinish();
+      console.log(`[IM] 服务端同步${syncDone ? "已完成" : "等待超时"}，开始拉取会话列表`);
       if (effectiveGroupID.value) {
-        setTimeout(async () => {
-          try {
-            const info = await (imInstance == null ? void 0 : imInstance.getOneConversation(effectiveGroupID.value, IM_CVS_TYPE.Group));
-            if (info == null ? void 0 : info.conversationID) {
-              handleConversationList([info], "init", handleMessage);
-            }
-          } catch {
+        try {
+          const info = await (imInstance == null ? void 0 : imInstance.getOneConversation(effectiveGroupID.value, IM_CVS_TYPE.Group));
+          if (info == null ? void 0 : info.conversationID) {
+            handleConversationList([info], "init", handleMessage);
           }
-        }, 500);
+        } catch {
+        }
       } else {
-        setTimeout(async () => {
-          const list = await getCvsList();
-          if ((list == null ? void 0 : list.length) > 0) {
-            handleConversationList(list, "init", handleMessage);
-            const hideCvsList = list.filter((item) => {
-              var _a, _b;
-              return ((_a = item.ex) == null ? void 0 : _a.indexOf("isHidden")) > -1 || ((_b = item.ex) == null ? void 0 : _b.indexOf("isDeleted")) > -1;
-            });
-            if (hideCvsList.length > 0) {
-              for (let i = 0; i < hideCvsList.length; i++) {
-                const cvs = hideCvsList[i];
-                const bool = await (imInstance == null ? void 0 : imInstance.setConversation({ conversationID: cvs.conversationID, ex: "" }));
-                if (bool) {
-                  cvs.ex = "";
-                  handleConversationList([cvs], "update", handleMessage);
-                }
+        const list = await getCvsList();
+        if ((list == null ? void 0 : list.length) > 0) {
+          const localFallbacks = conversationList.value.filter((item) => item.isLocalFallback);
+          handleConversationList(list, "init", handleMessage);
+          const restFallbacks = localFallbacks.filter(
+            (item) => !conversationList.value.some((cvs) => cvs.conversationID === item.conversationID)
+          );
+          if (restFallbacks.length > 0) {
+            conversationList.value = [...restFallbacks, ...conversationList.value];
+          }
+          const hideCvsList = list.filter((item) => {
+            var _a, _b;
+            return ((_a = item.ex) == null ? void 0 : _a.indexOf("isHidden")) > -1 || ((_b = item.ex) == null ? void 0 : _b.indexOf("isDeleted")) > -1;
+          });
+          if (hideCvsList.length > 0) {
+            for (let i = 0; i < hideCvsList.length; i++) {
+              const cvs = hideCvsList[i];
+              const restoredEx = preserveBurnInEx("", cvs.ex);
+              const bool = await (imInstance == null ? void 0 : imInstance.setConversation({ conversationID: cvs.conversationID, ex: restoredEx }));
+              if (bool) {
+                cvs.ex = restoredEx;
+                handleConversationList([cvs], "update", handleMessage);
               }
             }
           }
-          await nextTick();
-          initMessagePage();
-        }, 500);
+        }
+        await nextTick();
+        initMessagePage();
       }
     };
     const handleGroupApplicationAdded = (data) => {