@tencentcloud/roomkit-electron-vue3 2.4.2 → 2.5.0

package/lib/services/roomService.js

@@ -25,6 +25,8 @@ const lifeCycleManager = require("./manager/lifeCycleManager.js");
 const roomActionManager = require("./manager/roomActionManager.js");
 const waterMark = require("./function/waterMark.js");
 const virtualBackground = require("./function/virtualBackground.js");
+const scheduleConferenceManager = require("./manager/scheduleConferenceManager.js");
+const errorHandler = require("./function/errorHandler.js");
 const { t } = index.default.global;
 const logPrefix = "[RoomService]";
 const roomEngine = useRoomEngine.default();
@@ -38,6 +40,8 @@ const _RoomService = class _RoomService {
     __publicField(this, "roomActionManager", new roomActionManager.RoomActionManager(this));
     __publicField(this, "waterMark", new waterMark.WaterMark(this));
     __publicField(this, "virtualBackground", new virtualBackground.VirtualBackground(this));
+    __publicField(this, "scheduleConferenceManager", new scheduleConferenceManager.ScheduleConferenceManager(this));
+    __publicField(this, "errorHandler", new errorHandler.ErrorHandler(this));
     __publicField(this, "roomEngine", roomEngine);
     __publicField(this, "t", t);
     this.lifeCycleManager.start();
@@ -45,6 +49,7 @@ const _RoomService = class _RoomService {
     TUIRoomEngine.once("ready", () => {
       this.bindRoomEngineEvents();
       this.handleRoomEngineReady();
+      this.emit(types.EventType.SERVICE_READY);
     });
   }
   get basicStore() {
@@ -67,6 +72,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) {
@@ -81,6 +88,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) {
@@ -93,7 +101,7 @@ const _RoomService = class _RoomService {
     useDeviceManager.default({ 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(TUIRoomEngine.TUIRoomEvents.onError, this.onError);
     (_b = roomEngine.instance) == null ? void 0 : _b.on(TUIRoomEngine.TUIRoomEvents.onRoomDismissed, this.onRoomDismissed);
     (_c = roomEngine.instance) == null ? void 0 : _c.on(TUIRoomEngine.TUIRoomEvents.onUserVoiceVolumeChanged, this.onUserVoiceVolumeChanged);
@@ -107,9 +115,14 @@ const _RoomService = class _RoomService {
     (_h = roomEngine.instance) == null ? void 0 : _h.on(TUIRoomEngine.TUIRoomEvents.onKickedOffLine, this.onKickedOffLine);
     (_i = roomEngine.instance) == null ? void 0 : _i.on(TUIRoomEngine.TUIRoomEvents.onAllUserCameraDisableChanged, this.onAllUserCameraDisableChanged);
     (_j = roomEngine.instance) == null ? void 0 : _j.on(TUIRoomEngine.TUIRoomEvents.onAllUserMicrophoneDisableChanged, this.onAllUserMicrophoneDisableChanged);
+    (_k = roomEngine.instance) == null ? void 0 : _k.on(
+      TUIRoomEngine.TUIRoomEvents.onScreenShareForAllUserDisableChanged,
+      this.onScreenShareForAllUserDisableChanged
+    );
+    (_l = roomEngine.instance) == null ? void 0 : _l.on(TUIRoomEngine.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(TUIRoomEngine.TUIRoomEvents.onError, this.onError);
     (_b = roomEngine.instance) == null ? void 0 : _b.off(TUIRoomEngine.TUIRoomEvents.onRoomDismissed, this.onRoomDismissed);
     (_c = roomEngine.instance) == null ? void 0 : _c.off(TUIRoomEngine.TUIRoomEvents.onUserVoiceVolumeChanged, this.onUserVoiceVolumeChanged);
@@ -120,19 +133,15 @@ const _RoomService = class _RoomService {
     (_h = roomEngine.instance) == null ? void 0 : _h.off(TUIRoomEngine.TUIRoomEvents.onKickedOffLine, this.onKickedOffLine);
     (_i = roomEngine.instance) == null ? void 0 : _i.off(TUIRoomEngine.TUIRoomEvents.onAllUserCameraDisableChanged, this.onAllUserCameraDisableChanged);
     (_j = roomEngine.instance) == null ? void 0 : _j.off(TUIRoomEngine.TUIRoomEvents.onAllUserMicrophoneDisableChanged, this.onAllUserMicrophoneDisableChanged);
+    (_k = roomEngine.instance) == null ? void 0 : _k.off(
+      TUIRoomEngine.TUIRoomEvents.onScreenShareForAllUserDisableChanged,
+      this.onScreenShareForAllUserDisableChanged
+    );
+    (_l = roomEngine.instance) == null ? void 0 : _l.off(TUIRoomEngine.TUIRoomEvents.onUserInfoChanged, this.onUserInfoChanged);
   }
   onError(error) {
     index$1.default.error("roomEngine.onError: ", error);
-    if (error.message === "enter trtc room failed , error code : -1") {
-      this.emit(types.EventType.ROOM_NOTICE_MESSAGE_BOX, {
-        type: "warning",
-        message: t("Failed to enter the meeting"),
-        callback: () => {
-          this.emit(types.EventType.ROOM_ERROR);
-          this.resetStore();
-        }
-      });
-    }
+    this.errorHandler.handleError(error, "onError");
   }
   onRoomDismissed(eventInfo) {
     const { roomId } = eventInfo;
@@ -237,6 +246,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 === TUIRoomEngine.TUIRole.kGeneralUser) {
@@ -257,6 +275,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();
@@ -271,6 +293,7 @@ const _RoomService = class _RoomService {
     const { sdkAppId, userId, userSig, userName = userId, avatarUrl = "" } = option;
     await TUIRoomEngine.login({ sdkAppId, userId, userSig });
     await TUIRoomEngine.setSelfInfo({ userName, avatarUrl });
+    this.emit(types.EventType.ROOM_LOGIN);
   }
   async start(roomId, params) {
     return this.roomActionManager.start(roomId, params);
@@ -333,6 +356,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/lib/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/lib/services/types.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 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/lib/stores/basic.js

@@ -5,6 +5,12 @@ const common = require("../utils/common.js");
 const render = require("../constants/render.js");
 const utils = require("../utils/utils.js");
 const environment = require("../utils/environment.js");
+function getDefaultLayout() {
+  if (environment.isMobile) {
+    return environment.isWeChat ? render.LAYOUT.SIX_EQUAL_POINTS : render.LAYOUT.LARGE_SMALL_WINDOW;
+  }
+  return render.LAYOUT.NINE_EQUAL_POINTS;
+}
 const useBasicStore = pinia.defineStore("basic", {
   state: () => ({
     sdkAppId: 0,
@@ -16,7 +22,7 @@ const useBasicStore = pinia.defineStore("basic", {
     roomId: "",
     roomMode: "FreeSpeech",
     isSidebarOpen: false,
-    layout: environment.isWeChat ? render.LAYOUT.SIX_EQUAL_POINTS : render.LAYOUT.NINE_EQUAL_POINTS,
+    layout: getDefaultLayout(),
     showSettingDialog: false,
     showApplyUserList: false,
     activeSettingTab: "audio",
@@ -158,7 +164,7 @@ const useBasicStore = pinia.defineStore("basic", {
     },
     reset() {
       this.isSidebarOpen = false;
-      this.layout = environment.isWeChat ? render.LAYOUT.SIX_EQUAL_POINTS : render.LAYOUT.NINE_EQUAL_POINTS;
+      this.layout = getDefaultLayout();
       this.showSettingDialog = false;
       this.activeSettingTab = "audio";
       this.isLocalStreamMirror = true;

package/lib/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/lib/stores/room.js

@@ -13,6 +13,7 @@ const useRoomStore = pinia.defineStore("room", {
       userId: "",
       userName: "",
       avatarUrl: "",
+      nameCard: "",
       hasAudioStream: false,
       hasVideoStream: false,
       hasScreenStream: false,
@@ -22,6 +23,7 @@ const useRoomStore = pinia.defineStore("room", {
         userId: "",
         userName: "",
         avatarUrl: "",
+        nameCard: "",
         hasAudioStream: false,
         hasVideoStream: false,
         streamType: TUIRoomEngine.TUIVideoStreamType.kCameraStream,
@@ -31,6 +33,7 @@ const useRoomStore = pinia.defineStore("room", {
         userId: "",
         userName: "",
         avatarUrl: "",
+        nameCard: "",
         hasScreenStream: false,
         streamType: TUIRoomEngine.TUIVideoStreamType.kScreenStream,
         isVisible: true
@@ -52,6 +55,7 @@ const useRoomStore = pinia.defineStore("room", {
     masterUserId: "",
     isMicrophoneDisableForAllUser: false,
     isCameraDisableForAllUser: false,
+    isScreenShareDisableForAllUser: false,
     isSeatEnabled: false,
     seatMode: TUIRoomEngine.TUISeatMode.kFreeToTake,
     maxMembersCount: 5,
@@ -107,10 +111,10 @@ const useRoomStore = pinia.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;
     },
@@ -129,6 +133,7 @@ const useRoomStore = pinia.defineStore("room", {
           userId,
           avatarUrl,
           userName,
+          nameCard,
           onSeat,
           hasAudioStream,
           hasVideoStream,
@@ -137,10 +142,10 @@ const useRoomStore = pinia.defineStore("room", {
           isScreenVisible
         } = userInfo;
         if (onSeat) {
-          obj[`${userId}_${TUIRoomEngine.TUIVideoStreamType.kCameraStream}`] = Object.assign(userInfo.cameraStreamInfo, { userId, avatarUrl, userName, hasAudioStream, hasVideoStream, streamType: TUIRoomEngine.TUIVideoStreamType.kCameraStream, isVisible: isVideoVisible });
+          obj[`${userId}_${TUIRoomEngine.TUIVideoStreamType.kCameraStream}`] = Object.assign(userInfo.cameraStreamInfo, { userId, avatarUrl, userName, nameCard, hasAudioStream, hasVideoStream, streamType: TUIRoomEngine.TUIVideoStreamType.kCameraStream, isVisible: isVideoVisible });
         }
         if (hasScreenStream) {
-          obj[`${userId}_${TUIRoomEngine.TUIVideoStreamType.kScreenStream}`] = Object.assign(userInfo.screenStreamInfo, { userId, avatarUrl, userName, hasScreenStream, streamType: TUIRoomEngine.TUIVideoStreamType.kScreenStream, isVisible: isScreenVisible });
+          obj[`${userId}_${TUIRoomEngine.TUIVideoStreamType.kScreenStream}`] = Object.assign(userInfo.screenStreamInfo, { userId, avatarUrl, userName, nameCard, hasScreenStream, streamType: TUIRoomEngine.TUIVideoStreamType.kScreenStream, isVisible: isScreenVisible });
         }
       });
       return obj;
@@ -155,12 +160,20 @@ const useRoomStore = pinia.defineStore("room", {
       }
       return list;
     },
+    cameraStreamList() {
+      const list = [
+        this.localStream,
+        ...Object.values(this.remoteStreamObj).filter((stream) => stream.streamType === TUIRoomEngine.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 === TUIRoomEngine.TUIRole.kGeneralUser),
     userNumber() {
       return this.userList.length;
     },
@@ -168,6 +181,15 @@ const useRoomStore = pinia.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 ? TUIRoomEngine.TUIVideoStreamType.kCameraStreamLow : TUIRoomEngine.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: {
@@ -178,11 +200,11 @@ const useRoomStore = pinia.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;
@@ -196,6 +218,7 @@ const useRoomStore = pinia.defineStore("room", {
         userId,
         userName: "",
         avatarUrl: "",
+        nameCard: "",
         hasAudioStream: false,
         hasVideoStream: false,
         hasScreenStream: false,
@@ -210,6 +233,7 @@ const useRoomStore = pinia.defineStore("room", {
           userId,
           userName: "",
           avatarUrl: "",
+          nameCard: "",
           hasAudioStream: false,
           hasVideoStream: false,
           streamType: TUIRoomEngine.TUIVideoStreamType.kCameraStream,
@@ -219,6 +243,7 @@ const useRoomStore = pinia.defineStore("room", {
           userId,
           userName: "",
           avatarUrl: "",
+          nameCard: "",
           hasScreenStream: false,
           streamType: TUIRoomEngine.TUIVideoStreamType.kScreenStream,
           isVisible: false
@@ -422,14 +447,17 @@ const useRoomStore = pinia.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 = TUIRoomEngine.TUIRole.kRoomOwner;
@@ -437,12 +465,13 @@ const useRoomStore = pinia.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;
@@ -450,6 +479,9 @@ const useRoomStore = pinia.defineStore("room", {
     setDisableCameraForAllUserByAdmin(isDisable) {
       this.isCameraDisableForAllUser = isDisable;
     },
+    setDisableScreenShareForAllUserByAdmin(isDisable) {
+      this.isScreenShareDisableForAllUser = isDisable;
+    },
     setMasterUserId(userId) {
       this.masterUserId = userId;
     },
@@ -518,14 +550,6 @@ const useRoomStore = pinia.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];
@@ -539,6 +563,12 @@ const useRoomStore = pinia.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];
@@ -639,6 +669,7 @@ const useRoomStore = pinia.defineStore("room", {
       this.masterUserId = "";
       this.isMicrophoneDisableForAllUser = false;
       this.isCameraDisableForAllUser = false;
+      this.isScreenShareDisableForAllUser = false;
       this.isSeatEnabled = false;
       this.seatMode = TUIRoomEngine.TUISeatMode.kFreeToTake;
       this.hasVideoStreamObject = {};

package/lib/utils/adapter.js

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const environment = require("./environment.js");
-const clipBoard = (data) => new Promise((resolve, reject) => {
+const clipBoard = (data) => new Promise(async (resolve, reject) => {
   if (!environment.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;
   }
@@ -28,4 +34,34 @@ 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();
+  }
+}
 exports.clipBoard = clipBoard;

package/lib/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/lib/utils/utils.js

@@ -56,6 +56,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));
@@ -66,13 +88,55 @@ 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;
+  }, {});
+}
 exports.addSuffix = addSuffix;
+exports.calculateByteLength = calculateByteLength;
 exports.debounce = debounce;
+exports.deepClone = deepClone;
 exports.exitFullScreen = exitFullScreen;
 exports.getUrlParam = getUrlParam;
+exports.getUrlWithRoomId = getUrlWithRoomId;
 exports.isFunction = isFunction;
 exports.isNumber = isNumber;
 exports.isStringNumber = isStringNumber;
 exports.isUndefined = isUndefined;
+exports.objectMerge = objectMerge;
 exports.setFullScreen = setFullScreen;
 exports.throttle = throttle;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencentcloud/roomkit-electron-vue3",
-  "version": "2.4.2",
+  "version": "2.5.0",
   "main": "./lib/index.js",
   "module": "./es/index.mjs",
   "types": "./es/index.d.ts",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@tencentcloud/chat": "latest",
     "@tencentcloud/tui-core": "latest",
-    "@tencentcloud/tuiroom-engine-electron": "^2.4.2",
+    "@tencentcloud/tuiroom-engine-electron": "^2.5.0",
     "@tencentcloud/universal-api": "^2.0.9",
     "interactjs": "^1.10.26",
     "mitt": "^3.0.0"

package/src/TUIRoom/assets/style/black-theme.scss

@@ -11,6 +11,7 @@
   --background-color-10: #2B2F38;
   --background-color-11: #2B303A;
   --background-color-12: #4F586B;
+  --hover-background-colo-1: rgba(213, 224, 242, 0.5);
   --font-color-1: #D5E0F2;
   --font-color-2: #6B758A;
   --font-color-3: #B3B8C8;
@@ -19,6 +20,8 @@
   --font-color-6: #CFD5E6;
   --font-color-7: #FFFFFF;
   --font-color-8: #8F9AB2;
+  --font-color-9: #969EB4;
+  --font-color-10: #FF643D;
   --title-color: #000000;
   --stroke-color: rgba(79, 88, 107, 0.30);
   --stroke-color-2: #434956;
@@ -156,5 +159,4 @@
   --user-extra-info-color-h5: #FFFFFF;
   --apply-container-background-outline-h5: #292D38;
   --apply-container-outline-h5: #CFD5E6;
-  --mute-all-h5: #FF2E2E
 }

package/src/TUIRoom/assets/style/white-theme.scss

@@ -11,6 +11,7 @@
   --background-color-10: #E7EAF7;
   --background-color-11: #F0F3FA;
   --background-color-12: #FFFFFF;
+  --hover-background-color-1: rgba(213, 224, 242, 0.5);
   --font-color-1: #4F586B;
   --font-color-2: #B2BBD1;
   --font-color-3: #000000;
@@ -19,6 +20,8 @@
   --font-color-6: #0F1014;
   --font-color-7: #FFFFFF;
   --font-color-8: #4F586B;
+  --font-color-9: #969EB4;
+  --font-color-10: #FF643D;
   --title-color: #0F1014;
   --stroke-color: #E4EAF7;
   --stroke-color-2: #EAEFF8;
@@ -154,5 +157,4 @@
   --user-extra-info-color-h5: #FFFFFF;
   --apply-container-background-outline-h5: #006EFF;
   --apply-container-outline-h5: #FFFFFF;
-  --mute-all-h5: #FFFFFF
 }

package/src/TUIRoom/components/Chat/ChatEditor/useChatEditor.ts

@@ -53,7 +53,7 @@ export default 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(),