@tencentcloud/roomkit-electron-vue3 2.4.1 → 2.5.0

package/es/services/roomService.mjs

@@ -7,7 +7,7 @@ var __publicField = (obj, key, value) => {
 import mitt from "mitt";
 import useGetRoomEngine from "../hooks/useRoomEngine.mjs";
 import { EventType } from "./types.mjs";
-import TUIRoomEngine, { TUIRoomEvents, TUIKickedOutOfRoomReason, TUIRole, TRTCVideoMirrorType, TRTCVideoRotation, TRTCVideoFillMode } from "@tencentcloud/tuiroom-engine-electron";
+import TUIRoomEngine__default, { TUIRoomEvents, TUIKickedOutOfRoomReason, TUIRole, TRTCVideoMirrorType, TRTCVideoRotation, TRTCVideoFillMode } from "@tencentcloud/tuiroom-engine-electron";
 import { useBasicStore } from "../stores/basic.mjs";
 import { useRoomStore } from "../stores/room.mjs";
 import { useChatStore } from "../stores/chat.mjs";
@@ -23,6 +23,8 @@ import { LifeCycleManager } from "./manager/lifeCycleManager.mjs";
 import { RoomActionManager } from "./manager/roomActionManager.mjs";
 import { WaterMark } from "./function/waterMark.mjs";
 import { VirtualBackground } from "./function/virtualBackground.mjs";
+import { ScheduleConferenceManager } from "./manager/scheduleConferenceManager.mjs";
+import { ErrorHandler } from "./function/errorHandler.mjs";
 const { t } = i18n.global;
 const logPrefix = "[RoomService]";
 const roomEngine = useGetRoomEngine();
@@ -36,13 +38,16 @@ const _RoomService = class _RoomService {
     __publicField(this, "roomActionManager", new RoomActionManager(this));
     __publicField(this, "waterMark", new WaterMark(this));
     __publicField(this, "virtualBackground", new VirtualBackground(this));
+    __publicField(this, "scheduleConferenceManager", new ScheduleConferenceManager(this));
+    __publicField(this, "errorHandler", new ErrorHandler(this));
     __publicField(this, "roomEngine", roomEngine);
     __publicField(this, "t", t);
     this.lifeCycleManager.start();
     this.initEventCtx();
-    TUIRoomEngine.once("ready", () => {
+    TUIRoomEngine__default.once("ready", () => {
       this.bindRoomEngineEvents();
       this.handleRoomEngineReady();
+      this.emit(EventType.SERVICE_READY);
     });
   }
   get basicStore() {
@@ -65,6 +70,8 @@ const _RoomService = class _RoomService {
     this.onKickedOffLine = this.onKickedOffLine.bind(this);
     this.onAllUserCameraDisableChanged = this.onAllUserCameraDisableChanged.bind(this);
     this.onAllUserMicrophoneDisableChanged = this.onAllUserMicrophoneDisableChanged.bind(this);
+    this.onScreenShareForAllUserDisableChanged = this.onScreenShareForAllUserDisableChanged.bind(this);
+    this.onUserInfoChanged = this.onUserInfoChanged.bind(this);
   }
   static getInstance() {
     if (!_RoomService.instance) {
@@ -79,6 +86,7 @@ const _RoomService = class _RoomService {
     _RoomService.instance.unBindRoomEngineEvents();
     _RoomService.instance.waterMark.dispose();
     _RoomService.instance.virtualBackground.dispose();
+    _RoomService.instance.scheduleConference.dispose();
     _RoomService.instance = void 0;
   }
   useExtension(extension) {
@@ -91,7 +99,7 @@ const _RoomService = class _RoomService {
     useDeviceManager({ listenForDeviceChange: true });
   }
   bindRoomEngineEvents() {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     (_a = roomEngine.instance) == null ? void 0 : _a.on(TUIRoomEvents.onError, this.onError);
     (_b = roomEngine.instance) == null ? void 0 : _b.on(TUIRoomEvents.onRoomDismissed, this.onRoomDismissed);
     (_c = roomEngine.instance) == null ? void 0 : _c.on(TUIRoomEvents.onUserVoiceVolumeChanged, this.onUserVoiceVolumeChanged);
@@ -105,9 +113,14 @@ const _RoomService = class _RoomService {
     (_h = roomEngine.instance) == null ? void 0 : _h.on(TUIRoomEvents.onKickedOffLine, this.onKickedOffLine);
     (_i = roomEngine.instance) == null ? void 0 : _i.on(TUIRoomEvents.onAllUserCameraDisableChanged, this.onAllUserCameraDisableChanged);
     (_j = roomEngine.instance) == null ? void 0 : _j.on(TUIRoomEvents.onAllUserMicrophoneDisableChanged, this.onAllUserMicrophoneDisableChanged);
+    (_k = roomEngine.instance) == null ? void 0 : _k.on(
+      TUIRoomEvents.onScreenShareForAllUserDisableChanged,
+      this.onScreenShareForAllUserDisableChanged
+    );
+    (_l = roomEngine.instance) == null ? void 0 : _l.on(TUIRoomEvents.onUserInfoChanged, this.onUserInfoChanged);
   }
   unBindRoomEngineEvents() {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     (_a = roomEngine.instance) == null ? void 0 : _a.off(TUIRoomEvents.onError, this.onError);
     (_b = roomEngine.instance) == null ? void 0 : _b.off(TUIRoomEvents.onRoomDismissed, this.onRoomDismissed);
     (_c = roomEngine.instance) == null ? void 0 : _c.off(TUIRoomEvents.onUserVoiceVolumeChanged, this.onUserVoiceVolumeChanged);
@@ -118,19 +131,15 @@ const _RoomService = class _RoomService {
     (_h = roomEngine.instance) == null ? void 0 : _h.off(TUIRoomEvents.onKickedOffLine, this.onKickedOffLine);
     (_i = roomEngine.instance) == null ? void 0 : _i.off(TUIRoomEvents.onAllUserCameraDisableChanged, this.onAllUserCameraDisableChanged);
     (_j = roomEngine.instance) == null ? void 0 : _j.off(TUIRoomEvents.onAllUserMicrophoneDisableChanged, this.onAllUserMicrophoneDisableChanged);
+    (_k = roomEngine.instance) == null ? void 0 : _k.off(
+      TUIRoomEvents.onScreenShareForAllUserDisableChanged,
+      this.onScreenShareForAllUserDisableChanged
+    );
+    (_l = roomEngine.instance) == null ? void 0 : _l.off(TUIRoomEvents.onUserInfoChanged, this.onUserInfoChanged);
   }
   onError(error) {
     logger.error("roomEngine.onError: ", error);
-    if (error.message === "enter trtc room failed , error code : -1") {
-      this.emit(EventType.ROOM_NOTICE_MESSAGE_BOX, {
-        type: "warning",
-        message: t("Failed to enter the meeting"),
-        callback: () => {
-          this.emit(EventType.ROOM_ERROR);
-          this.resetStore();
-        }
-      });
-    }
+    this.errorHandler.handleError(error, "onError");
   }
   onRoomDismissed(eventInfo) {
     const { roomId } = eventInfo;
@@ -235,6 +244,15 @@ const _RoomService = class _RoomService {
       await ((_a = roomEngine.instance) == null ? void 0 : _a.closeLocalCamera());
     }
   }
+  async onUserInfoChanged(eventInfo) {
+    const { userId, nameCard } = eventInfo.userInfo;
+    const isLocal = this.roomStore.localUser.userId === userId;
+    if (isLocal) {
+      this.roomStore.setLocalUser({ nameCard });
+    } else {
+      this.roomStore.setRemoteUserNameCard(userId, nameCard);
+    }
+  }
   async onAllUserMicrophoneDisableChanged(eventInfo) {
     const { isDisable } = eventInfo;
     if (isDisable !== this.roomStore.isMicrophoneDisableForAllUser && this.roomStore.localUser.userRole === TUIRole.kGeneralUser) {
@@ -255,6 +273,10 @@ const _RoomService = class _RoomService {
       await ((_a = roomEngine.instance) == null ? void 0 : _a.muteLocalAudio());
     }
   }
+  async onScreenShareForAllUserDisableChanged(eventInfo) {
+    const { isDisable } = eventInfo;
+    this.roomStore.setDisableScreenShareForAllUserByAdmin(isDisable);
+  }
   resetStore() {
     this.basicStore.reset();
     this.chatStore.reset();
@@ -267,8 +289,9 @@ const _RoomService = class _RoomService {
   async initRoomKit(option) {
     this.storeInit(option);
     const { sdkAppId, userId, userSig, userName = userId, avatarUrl = "" } = option;
-    await TUIRoomEngine.login({ sdkAppId, userId, userSig });
-    await TUIRoomEngine.setSelfInfo({ userName, avatarUrl });
+    await TUIRoomEngine__default.login({ sdkAppId, userId, userSig });
+    await TUIRoomEngine__default.setSelfInfo({ userName, avatarUrl });
+    this.emit(EventType.ROOM_LOGIN);
   }
   async start(roomId, params) {
     return this.roomActionManager.start(roomId, params);
@@ -331,6 +354,9 @@ const _RoomService = class _RoomService {
   setSelfInfo(options) {
     return this.userManager.setSelfInfo(options);
   }
+  getDisplayName(options) {
+    return this.userManager.getDisplayName(options);
+  }
 };
 __publicField(_RoomService, "instance");
 let RoomService = _RoomService;

package/es/services/types.d.ts

@@ -1,3 +1,6 @@
+import { ErrorHandler } from './function/errorHandler';
+import { RoomActionManager } from './manager/roomActionManager';
+import { ScheduleConferenceManager } from './manager/scheduleConferenceManager';
 import { LifeCycleManager } from './manager/lifeCycleManager';
 import { useChatStore } from '../stores/chat';
 import { useRoomStore } from '../stores/room';
@@ -11,6 +14,9 @@ export interface IRoomService {
     roomStore: ReturnType<typeof useRoomStore>;
     chatStore: ReturnType<typeof useChatStore>;
     lifeCycleManager: LifeCycleManager;
+    roomActionManager?: RoomActionManager;
+    scheduleConferenceManager: ScheduleConferenceManager;
+    errorHandler: ErrorHandler;
     on: (eventType: EventType, callback: (data?: any) => any) => void;
     off: (eventType: EventType, callback: (data?: any) => void) => void;
     emit: (eventType: EventType, data?: any) => void;
@@ -37,6 +43,8 @@ export interface RoomParam {
     defaultSpeakerId?: string;
 }
 export declare enum EventType {
+    SERVICE_READY = "ServiceReady",
+    ROOM_LOGIN = "RoomLogin",
     ROOM_CONTAINER_RESIZE = "RoomContainerResize",
     ROOM_NOTICE_MESSAGE = "RoomNoticeMessage",
     ROOM_NOTICE_MESSAGE_BOX = "RoomNoticeMessageBox",

package/es/services/types.mjs

@@ -1,4 +1,6 @@
 var EventType = /* @__PURE__ */ ((EventType2) => {
+  EventType2["SERVICE_READY"] = "ServiceReady";
+  EventType2["ROOM_LOGIN"] = "RoomLogin";
   EventType2["ROOM_CONTAINER_RESIZE"] = "RoomContainerResize";
   EventType2["ROOM_NOTICE_MESSAGE"] = "RoomNoticeMessage";
   EventType2["ROOM_NOTICE_MESSAGE_BOX"] = "RoomNoticeMessageBox";

package/es/stores/basic.mjs

@@ -2,7 +2,13 @@ import { defineStore } from "pinia";
 import { getLanguage } from "../utils/common.mjs";
 import { LAYOUT } from "../constants/render.mjs";
 import { isUndefined } from "../utils/utils.mjs";
-import { isWeChat, isElectron, isMobile } from "../utils/environment.mjs";
+import { isElectron, isWeChat, isMobile } from "../utils/environment.mjs";
+function getDefaultLayout() {
+  if (isMobile) {
+    return isWeChat ? LAYOUT.SIX_EQUAL_POINTS : LAYOUT.LARGE_SMALL_WINDOW;
+  }
+  return LAYOUT.NINE_EQUAL_POINTS;
+}
 const useBasicStore = defineStore("basic", {
   state: () => ({
     sdkAppId: 0,
@@ -14,7 +20,7 @@ const useBasicStore = defineStore("basic", {
     roomId: "",
     roomMode: "FreeSpeech",
     isSidebarOpen: false,
-    layout: isWeChat ? LAYOUT.SIX_EQUAL_POINTS : LAYOUT.NINE_EQUAL_POINTS,
+    layout: getDefaultLayout(),
     showSettingDialog: false,
     showApplyUserList: false,
     activeSettingTab: "audio",
@@ -156,7 +162,7 @@ const useBasicStore = defineStore("basic", {
     },
     reset() {
       this.isSidebarOpen = false;
-      this.layout = isWeChat ? LAYOUT.SIX_EQUAL_POINTS : LAYOUT.NINE_EQUAL_POINTS;
+      this.layout = getDefaultLayout();
       this.showSettingDialog = false;
       this.activeSettingTab = "audio";
       this.isLocalStreamMirror = true;

package/es/stores/room.d.ts

@@ -4,6 +4,7 @@ export type StreamInfo = {
     userId: string;
     userName?: string;
     avatarUrl?: string;
+    nameCard?: string;
     hasAudioStream?: boolean;
     hasVideoStream?: boolean;
     hasScreenStream?: boolean;
@@ -14,6 +15,7 @@ export type UserInfo = {
     userId: string;
     userName?: string;
     avatarUrl?: string;
+    nameCard?: string;
     hasAudioStream?: boolean;
     hasVideoStream?: boolean;
     hasScreenStream?: boolean;

package/es/stores/room.mjs

@@ -11,6 +11,7 @@ const useRoomStore = defineStore("room", {
       userId: "",
       userName: "",
       avatarUrl: "",
+      nameCard: "",
       hasAudioStream: false,
       hasVideoStream: false,
       hasScreenStream: false,
@@ -20,6 +21,7 @@ const useRoomStore = defineStore("room", {
         userId: "",
         userName: "",
         avatarUrl: "",
+        nameCard: "",
         hasAudioStream: false,
         hasVideoStream: false,
         streamType: TUIVideoStreamType.kCameraStream,
@@ -29,6 +31,7 @@ const useRoomStore = defineStore("room", {
         userId: "",
         userName: "",
         avatarUrl: "",
+        nameCard: "",
         hasScreenStream: false,
         streamType: TUIVideoStreamType.kScreenStream,
         isVisible: true
@@ -50,6 +53,7 @@ const useRoomStore = defineStore("room", {
     masterUserId: "",
     isMicrophoneDisableForAllUser: false,
     isCameraDisableForAllUser: false,
+    isScreenShareDisableForAllUser: false,
     isSeatEnabled: false,
     seatMode: TUISeatMode.kFreeToTake,
     maxMembersCount: 5,
@@ -105,10 +109,10 @@ const useRoomStore = defineStore("room", {
       return cameraForbidden || this.isAudience;
     },
     localStream: (state) => {
-      const { userId, userName, avatarUrl, hasAudioStream, hasVideoStream } = state.localUser;
+      const { userId, userName, avatarUrl, nameCard, hasAudioStream, hasVideoStream } = state.localUser;
       Object.assign(
         state.localUser.cameraStreamInfo,
-        { userId, userName, avatarUrl, hasAudioStream, hasVideoStream }
+        { userId, userName, avatarUrl, nameCard, hasAudioStream, hasVideoStream }
       );
       return state.localUser.cameraStreamInfo;
     },
@@ -127,6 +131,7 @@ const useRoomStore = defineStore("room", {
           userId,
           avatarUrl,
           userName,
+          nameCard,
           onSeat,
           hasAudioStream,
           hasVideoStream,
@@ -135,10 +140,10 @@ const useRoomStore = defineStore("room", {
           isScreenVisible
         } = userInfo;
         if (onSeat) {
-          obj[`${userId}_${TUIVideoStreamType.kCameraStream}`] = Object.assign(userInfo.cameraStreamInfo, { userId, avatarUrl, userName, hasAudioStream, hasVideoStream, streamType: TUIVideoStreamType.kCameraStream, isVisible: isVideoVisible });
+          obj[`${userId}_${TUIVideoStreamType.kCameraStream}`] = Object.assign(userInfo.cameraStreamInfo, { userId, avatarUrl, userName, nameCard, hasAudioStream, hasVideoStream, streamType: TUIVideoStreamType.kCameraStream, isVisible: isVideoVisible });
         }
         if (hasScreenStream) {
-          obj[`${userId}_${TUIVideoStreamType.kScreenStream}`] = Object.assign(userInfo.screenStreamInfo, { userId, avatarUrl, userName, hasScreenStream, streamType: TUIVideoStreamType.kScreenStream, isVisible: isScreenVisible });
+          obj[`${userId}_${TUIVideoStreamType.kScreenStream}`] = Object.assign(userInfo.screenStreamInfo, { userId, avatarUrl, userName, nameCard, hasScreenStream, streamType: TUIVideoStreamType.kScreenStream, isVisible: isScreenVisible });
         }
       });
       return obj;
@@ -153,12 +158,20 @@ const useRoomStore = defineStore("room", {
       }
       return list;
     },
+    cameraStreamList() {
+      const list = [
+        this.localStream,
+        ...Object.values(this.remoteStreamObj).filter((stream) => stream.streamType === TUIVideoStreamType.kCameraStream)
+      ];
+      return list;
+    },
     streamNumber() {
       return this.streamList.length;
     },
     remoteUserList: (state) => [...Object.values(state.remoteUserObj)],
     remoteAnchorList: (state) => [...Object.values(state.remoteUserObj)].filter((item) => item.onSeat),
     userList: (state) => [state.localUser, ...Object.values(state.remoteUserObj)],
+    generalUserScreenStreamList: (state) => [...Object.values(state.remoteUserObj)].filter((item) => item.hasScreenStream && item.userRole === TUIRole.kGeneralUser),
     userNumber() {
       return this.userList.length;
     },
@@ -166,6 +179,15 @@ const useRoomStore = defineStore("room", {
     applyToAnchorList: (state) => [...Object.values(state.remoteUserObj)].filter((item) => item.isUserApplyingToAnchor).sort((item1, item2) => ((item1 == null ? void 0 : item1.applyToAnchorTimestamp) || 0) - ((item2 == null ? void 0 : item2.applyToAnchorTimestamp) || 0)) || [],
     defaultStreamType() {
       return Object.keys(this.hasVideoStreamObject).length > this.maxMembersCount ? TUIVideoStreamType.kCameraStreamLow : TUIVideoStreamType.kCameraStream;
+    },
+    getDisplayName: (state) => {
+      return (userId) => {
+        const userInfo = userId === state.localUser.userId ? state.localUser : state.remoteUserObj[userId];
+        if (userInfo) {
+          const { nameCard, userName, userId: userId2 } = userInfo;
+          return nameCard || userName || userId2;
+        }
+      };
     }
   },
   actions: {
@@ -176,11 +198,11 @@ const useRoomStore = defineStore("room", {
       Object.assign(this.localStream, obj);
     },
     getUserName(userId) {
-      var _a;
+      var _a, _b;
       if (userId === this.localUser.userId) {
-        return this.localUser.userName || userId;
+        return this.localUser.nameCard || this.localUser.userName || userId;
       }
-      return ((_a = this.remoteUserObj[userId]) == null ? void 0 : _a.userName) || userId;
+      return ((_a = this.remoteUserObj[userId]) == null ? void 0 : _a.nameCard) || ((_b = this.remoteUserObj[userId]) == null ? void 0 : _b.userName) || userId;
     },
     getUserRole(userId) {
       var _a;
@@ -194,6 +216,7 @@ const useRoomStore = defineStore("room", {
         userId,
         userName: "",
         avatarUrl: "",
+        nameCard: "",
         hasAudioStream: false,
         hasVideoStream: false,
         hasScreenStream: false,
@@ -208,6 +231,7 @@ const useRoomStore = defineStore("room", {
           userId,
           userName: "",
           avatarUrl: "",
+          nameCard: "",
           hasAudioStream: false,
           hasVideoStream: false,
           streamType: TUIVideoStreamType.kCameraStream,
@@ -217,6 +241,7 @@ const useRoomStore = defineStore("room", {
           userId,
           userName: "",
           avatarUrl: "",
+          nameCard: "",
           hasScreenStream: false,
           streamType: TUIVideoStreamType.kScreenStream,
           isVisible: false
@@ -420,14 +445,17 @@ const useRoomStore = defineStore("room", {
       this.currentSpeakerId = deviceId;
     },
     setRoomInfo(roomInfo) {
+      if (!roomInfo)
+        return;
       const {
-        roomOwner,
-        isMicrophoneDisableForAllUser,
-        isCameraDisableForAllUser,
-        isSeatEnabled,
-        seatMode,
-        maxSeatCount,
-        roomName
+        roomOwner = this.masterUserId,
+        isMicrophoneDisableForAllUser = this.isMicrophoneDisableForAllUser,
+        isCameraDisableForAllUser = this.isCameraDisableForAllUser,
+        isScreenShareDisableForAllUser = this.isScreenShareDisableForAllUser,
+        isSeatEnabled = this.isSeatEnabled,
+        seatMode = this.seatMode,
+        maxSeatCount = this.maxSeatCount,
+        roomName = this.roomName
       } = roomInfo;
       if (this.localUser.userId === roomOwner) {
         this.localUser.userRole = TUIRole.kRoomOwner;
@@ -435,12 +463,13 @@ const useRoomStore = defineStore("room", {
       this.masterUserId = roomOwner;
       this.isMicrophoneDisableForAllUser = isMicrophoneDisableForAllUser;
       this.isCameraDisableForAllUser = isCameraDisableForAllUser;
+      this.isScreenShareDisableForAllUser = isScreenShareDisableForAllUser;
       this.isSeatEnabled = isSeatEnabled;
       this.seatMode = seatMode;
-      this.canControlSelfAudio = !this.isMicrophoneDisableForAllUser;
-      this.canControlSelfVideo = !this.isCameraDisableForAllUser;
       this.maxSeatCount = maxSeatCount;
       this.roomName = roomName;
+      this.canControlSelfAudio = !this.isMicrophoneDisableForAllUser;
+      this.canControlSelfVideo = !this.isCameraDisableForAllUser;
     },
     setDisableMicrophoneForAllUserByAdmin(isDisable) {
       this.isMicrophoneDisableForAllUser = isDisable;
@@ -448,6 +477,9 @@ const useRoomStore = defineStore("room", {
     setDisableCameraForAllUserByAdmin(isDisable) {
       this.isCameraDisableForAllUser = isDisable;
     },
+    setDisableScreenShareForAllUserByAdmin(isDisable) {
+      this.isScreenShareDisableForAllUser = isDisable;
+    },
     setMasterUserId(userId) {
       this.masterUserId = userId;
     },
@@ -516,14 +548,6 @@ const useRoomStore = defineStore("room", {
         this.setCurrentSpeakerId(deviceList[0].deviceId);
       }
     },
-    // Set everyone's mute status when banning/cancelling the ban
-    setMicrophoneDisableState(isDisable) {
-      this.isMicrophoneDisableForAllUser = isDisable;
-    },
-    // Set everyone's video banned status when banning/cancelling a ban
-    setCameraDisableState(isDisable) {
-      this.isCameraDisableForAllUser = isDisable;
-    },
     // Moderator individually modifies the mute status of a user's outgoing text messages
     setMuteUserChat(userId, muted) {
       const remoteUserInfo = this.remoteUserObj[userId];
@@ -537,6 +561,12 @@ const useRoomStore = defineStore("room", {
         remoteUserInfo.userRole = role;
       }
     },
+    setRemoteUserNameCard(userId, nameCard) {
+      const remoteUserInfo = this.remoteUserObj[userId];
+      if (remoteUserInfo) {
+        remoteUserInfo.nameCard = nameCard;
+      }
+    },
     setRequestUserOpenMic(options) {
       const { userId, isRequesting, requestId } = options;
       const remoteUserInfo = this.remoteUserObj[userId];
@@ -637,6 +667,7 @@ const useRoomStore = defineStore("room", {
       this.masterUserId = "";
       this.isMicrophoneDisableForAllUser = false;
       this.isCameraDisableForAllUser = false;
+      this.isScreenShareDisableForAllUser = false;
       this.isSeatEnabled = false;
       this.seatMode = TUISeatMode.kFreeToTake;
       this.hasVideoStreamObject = {};

package/es/utils/adapter.mjs

@@ -1,11 +1,17 @@
 import { isWeChat } from "./environment.mjs";
-const clipBoard = (data) => new Promise((resolve, reject) => {
+const clipBoard = (data) => new Promise(async (resolve, reject) => {
   if (!isWeChat) {
+    const textString = data.toString();
     try {
-      navigator.clipboard.writeText(`${data}`);
+      await navigator.clipboard.writeText(`${data}`);
       resolve({ code: 0, data });
     } catch (err) {
-      reject({ code: -1, err });
+      try {
+        copyTextByDocumentExecCommand(textString);
+        resolve({ code: 0, data });
+      } catch (err2) {
+        reject({ code: -1, err: err2 });
+      }
     }
     return;
   }
@@ -26,6 +32,36 @@ const clipBoard = (data) => new Promise((resolve, reject) => {
     }
   });
 });
+function copyTextByDocumentExecCommand(textString) {
+  try {
+    const input = document.createElement("input");
+    input.id = "copy-input";
+    input.readOnly = true;
+    input.style.position = "absolute";
+    input.style.left = "-1000px";
+    input.style.zIndex = "-1000";
+    document.body.appendChild(input);
+    input.value = textString;
+    selectText(input, 0, textString.length);
+    if (document.execCommand("copy")) {
+      document.execCommand("copy");
+    }
+    input.blur();
+  } catch (err) {
+  }
+}
+function selectText(textbox, startIndex, stopIndex) {
+  if (textbox.createTextRange) {
+    const range = textbox.createTextRange();
+    range.collapse(true);
+    range.moveStart("character", startIndex);
+    range.moveEnd("character", stopIndex - startIndex);
+    range.select();
+  } else {
+    textbox.setSelectionRange(startIndex, stopIndex);
+    textbox.focus();
+  }
+}
 export {
   clipBoard
 };

package/es/utils/utils.d.ts

@@ -51,3 +51,6 @@ export declare const isNumber: (value: any) => boolean;
 export declare const isStringNumber: (value: any) => boolean;
 export declare const isFunction: (value: any) => boolean;
 export declare function addSuffix(value: string | number, suffix?: string): string | number;
+export declare function getUrlWithRoomId(roomId: string): string;
+export declare function calculateByteLength(str: string): number;
+export declare function objectMerge(...args: any[]): any;

package/es/utils/utils.mjs

@@ -54,6 +54,28 @@ function getUrlParam(key) {
   const paramMatch = url == null ? void 0 : url.match(regexp);
   return paramMatch ? paramMatch[2] : null;
 }
+function deepClone(data) {
+  let res = null;
+  const reference = [Date, RegExp, Set, WeakSet, Map, WeakMap, Error];
+  if (reference.includes(data == null ? void 0 : data.constructor)) {
+    res = new data.constructor(data);
+  } else if (Array.isArray(data)) {
+    res = [];
+    data.forEach((e, i) => {
+      res[i] = deepClone(e);
+    });
+  } else if (typeof data === "object" && data !== null) {
+    res = {};
+    Object.keys(data).forEach((key) => {
+      if (Object.hasOwnProperty.call(data, key)) {
+        res[key] = deepClone(data[key]);
+      }
+    });
+  } else {
+    res = data;
+  }
+  return res;
+}
 const isUndefined = (value) => typeof value === "undefined";
 const isNumber = (value) => typeof value === "number";
 const isStringNumber = (value) => typeof value === "string" && !isNaN(Number(value));
@@ -64,15 +86,57 @@ function addSuffix(value, suffix = "px") {
   }
   return value;
 }
+function getUrlWithRoomId(roomId) {
+  const currentUrl = window.location.href;
+  const urlObj = new URL(currentUrl);
+  const params = new URLSearchParams(urlObj.search);
+  if (params.has("roomId")) {
+    params.delete("roomId");
+  }
+  params.append("roomId", roomId);
+  return `${urlObj.origin + urlObj.pathname + "#/home?" + params.toString()}`;
+}
+function calculateByteLength(str) {
+  let byteLength = 0;
+  for (let i = 0; i < str.length; i++) {
+    const code = str.charCodeAt(i);
+    if (code <= 127) {
+      byteLength += 1;
+    } else if (code <= 2047) {
+      byteLength += 2;
+    } else if (code <= 65535) {
+      byteLength += 3;
+    } else {
+      byteLength += 4;
+    }
+  }
+  return byteLength;
+}
+function objectMerge(...args) {
+  return args.reduce((acc, cur) => {
+    Object.keys(cur).forEach((key) => {
+      if (acc[key] && typeof acc[key] === "object") {
+        acc[key] = objectMerge(acc[key], cur[key]);
+      } else {
+        acc[key] = cur[key];
+      }
+    });
+    return acc;
+  }, {});
+}
 export {
   addSuffix,
+  calculateByteLength,
   debounce,
+  deepClone,
   exitFullScreen,
   getUrlParam,
+  getUrlWithRoomId,
   isFunction,
   isNumber,
   isStringNumber,
   isUndefined,
+  objectMerge,
   setFullScreen,
   throttle
 };

package/lib/components/Chat/ChatEditor/useChatEditor.js

@@ -53,7 +53,7 @@ function useChatEditor() {
         payload: {
           text: result
         },
-        nick: roomStore.localUser.userName || roomStore.localUser.userId,
+        nick: roomStore.localUser.nameCard || roomStore.localUser.userName || roomStore.localUser.userId,
         from: roomStore.localUser.userId,
         flow: "out",
         sequence: Math.random()

package/lib/components/Chat/MessageList/index.vue.js

@@ -3,5 +3,5 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const index_vue_vue_type_script_setup_true_lang = require("./index.vue2.js");
 require("./index.vue3.js");
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
-const MessageList = /* @__PURE__ */ _pluginVue_exportHelper.default(index_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-277e0346"]]);
+const MessageList = /* @__PURE__ */ _pluginVue_exportHelper.default(index_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-1b057af9"]]);
 exports.default = MessageList;

package/lib/components/Chat/MessageList/index.vue2.js

@@ -1,17 +1,21 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const Vue = require("vue");
+const pinia = require("pinia");
 const MessageText = require("../MessageTypes/MessageText.vue.js");
 const environment = require("../../../utils/environment.js");
 const useMessageListHook = require("./useMessageListHook.js");
 const domOperation = require("../../../utils/domOperation.js");
 const utils = require("../../../utils/utils.js");
+const room = require("../../../stores/room.js");
 const _hoisted_1 = ["title"];
 const _hoisted_2 = { class: "message-body" };
 const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
   __name: "index",
   setup(__props) {
     const messageListRef = Vue.ref();
+    const roomStore = room.useRoomStore();
+    const { getDisplayName } = pinia.storeToRefs(roomStore);
     const {
       messageList,
       setMessageListInfo,
@@ -82,7 +86,7 @@ const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
                 key: 0,
                 class: "message-header",
                 title: item.nick || item.from
-              }, Vue.toDisplayString(item.nick || item.from), 9, _hoisted_1)) : Vue.createCommentVNode("", true),
+              }, Vue.toDisplayString(Vue.unref(getDisplayName)(item.from)), 9, _hoisted_1)) : Vue.createCommentVNode("", true),
               Vue.createElementVNode("div", _hoisted_2, [
                 Vue.createVNode(MessageText.default, {
                   data: item.payload.text

package/lib/components/Chat/MessageList/useMessageListHook.js

@@ -66,8 +66,9 @@ function useMessageList() {
     if (!options || !options.data) {
       return;
     }
+    const currentConversationId = `GROUP${roomId.value}`;
     options.data.forEach((message) => {
-      if (message.type !== TUIRoomEngine.TencentCloudChat.TYPES.MSG_TEXT) {
+      if (message.conversationID !== currentConversationId || message.type !== TUIRoomEngine.TencentCloudChat.TYPES.MSG_TEXT) {
         return;
       }
       const { ID, payload: { text }, nick: userName, from: userId } = message;