fcr-ui-scene 3.1.1 → 3.3.0

package/lib/modules/action-bar/leave/leave-meeting.d.ts

@@ -1,7 +1,17 @@
-/// <reference types="react" />
 import './index.css';
+import { FcrUserInfo, FcrUserRole } from 'agora-edu-core/lib/type';
 interface LeaveMeetingProps {
     setPopoverOpened: React.Dispatch<React.SetStateAction<boolean>>;
+    end: () => void;
+    leave: () => void;
+    isLocked: boolean;
+    keepPhoneAudioConnection: () => void;
+    localUserRole: FcrUserRole;
+    remoteUsers: FcrUserInfo[];
+    hasAssignHostBeforeLeavingPermission: boolean;
+    hasEndRoomPermission: boolean;
+    isPstnUser: boolean;
+    assignHost: (user: FcrUserInfo) => void;
 }
 export declare const LeaveMeeting: (props: LeaveMeetingProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/modules/action-bar/leave/leave-meeting.js

@@ -12,23 +12,22 @@ require("./index.css");
 var _type = require("agora-edu-core/lib/type");
 var _react = require("react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _context = require("../context");
 var _mobxReact = require("mobx-react");
 var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _jsxRuntime = require("react/jsx-runtime");
 var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (props) {
   var t = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
-    localUserRole = _useContext.localUserRole,
-    remoteUsers = _useContext.remoteUsers,
-    end = _useContext.end,
-    leave = _useContext.leave,
-    isLocked = _useContext.isLocked,
-    hasAssignHostBeforeLeavingPermission = _useContext.hasAssignHostBeforeLeavingPermission,
-    hasEndRoomPermission = _useContext.hasEndRoomPermission,
-    keepPhoneAudioConnection = _useContext.keepPhoneAudioConnection,
-    isPstnUser = _useContext.isPstnUser;
+  var localUserRole = props.localUserRole,
+    remoteUsers = props.remoteUsers,
+    end = props.end,
+    leave = props.leave,
+    isLocked = props.isLocked,
+    hasAssignHostBeforeLeavingPermission = props.hasAssignHostBeforeLeavingPermission,
+    hasEndRoomPermission = props.hasEndRoomPermission,
+    keepPhoneAudioConnection = props.keepPhoneAudioConnection,
+    isPstnUser = props.isPstnUser,
+    assignHost = props.assignHost;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     canAssign = _useState2[0],
@@ -45,9 +44,9 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
     if (remoteUsers.length > 0 && hasAssignHostBeforeLeavingPermission) {
       setCanAssign(true);
     } else {
-      props.setPopoverOpened(false);
-      leave();
       handleKeepConnect();
+      leave();
+      props.setPopoverOpened(false);
     }
   };
   var handleKeepConnect = function handleKeepConnect() {
@@ -57,19 +56,25 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
   };
   var handleConfirm = function handleConfirm() {
     props.setPopoverOpened(false);
-    leave();
     if (keepConnect && isPstnUser) {
       keepPhoneAudioConnection();
     }
+    leave();
   };
   var handleCancel = function handleCancel() {
     props.setPopoverOpened(false);
   };
   if (localUserRole === _type.FcrUserRole.HOST) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      onMouseEnter: function onMouseEnter() {
+        var _window$runtime;
+        (_window$runtime = window.runtime) === null || _window$runtime === void 0 || (_window$runtime = _window$runtime.browserWindow) === null || _window$runtime === void 0 || _window$runtime.setIgnoreMouseEvents(false);
+      },
       children: canAssign ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_assignHost.AssignHost, {
         setPopoverOpened: props.setPopoverOpened,
-        handleKeepConnect: handleKeepConnect
+        handleKeepConnect: handleKeepConnect,
+        remoteUsers: remoteUsers,
+        assignHost: assignHost
       }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "leave-container",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -101,7 +106,11 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "leave-container",
-      children: [isLocked() ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      onMouseEnter: function onMouseEnter() {
+        var _window$runtime2;
+        (_window$runtime2 = window.runtime) === null || _window$runtime2 === void 0 || (_window$runtime2 = _window$runtime2.browserWindow) === null || _window$runtime2 === void 0 || _window$runtime2.setIgnoreMouseEvents(false);
+      },
+      children: [isLocked ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: "assistant-leave-lock-info",
           children: t('fmt_actionbar_tips_locked')

package/lib/modules/action-bar/more/poppover-content.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.css';
 interface MenuItemProps {
     setVisible: React.Dispatch<React.SetStateAction<boolean>>;

package/lib/modules/action-bar/more/poppover-content.js

@@ -7,6 +7,10 @@ require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
@@ -21,6 +25,12 @@ require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.array.group.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.async-iterator.reduce.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/esnext.iterator.reduce.js");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _type = require("agora-edu-core/lib/type");
@@ -93,7 +103,7 @@ var ScreenShare = (0, _mobxReact.observer)(function (props) {
 var Chat = (0, _mobxReact.observer)(function (props) {
   var _useContext4 = (0, _react.useContext)(_context.ActionBarContext),
     toggleChat = _useContext4.toggleChat,
-    newMessageCount = _useContext4.newMessageCount;
+    allNewMessage = _useContext4.allNewMessage;
   var onClick = function onClick() {
     props.setVisible(false);
     toggleChat();
@@ -107,12 +117,12 @@ var Chat = (0, _mobxReact.observer)(function (props) {
       size: 24
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
       children: transI18n('fmt_chat_label_chat')
-    }), newMessageCount > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    }), allNewMessage > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
       className: "fcr-more-popover-content_chat_msg_count",
-      children: newMessageCount > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+      children: allNewMessage > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
         type: _type2.FcrIconType.FCR_CHAT_REDDOT,
         size: 14
-      }) : newMessageCount
+      }) : allNewMessage
     })]
   });
 });

package/lib/modules/action-bar/participants/index.css

@@ -1,5 +1,6 @@
 .fcr-action-bar-participants-wrapper {
   position: relative;
+  cursor: pointer;
 }
 .fcr-action-bar-participants-user-count {
   position: absolute;
@@ -7,3 +8,14 @@
   left: 51px;
   color: var(--fcr_web_ui_scene_mainicon1);
 }
+.fcr-action-bar-participants-icon {
+  position: relative;
+}
+.fcr-action-bar-participants-red {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background: var(--fcr_ui_scene_ramp_red6);
+  position: absolute;
+  right: 0;
+}

package/lib/modules/action-bar/participants/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Participants = void 0;
+require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -14,6 +15,7 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _item = require("../item");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
+var _icon = require("agora-ui-foundation/lib/components/icon");
 var _context = require("../context");
 var _mobxReact = require("mobx-react");
 require("./index.css");
@@ -27,7 +29,8 @@ var Participants = exports.Participants = (0, _mobxReact.observer)(function (_re
     visibleList = _useContext.visibleList;
   var _useContext2 = (0, _react.useContext)(_context.ActionBarContext),
     toggleParticipants = _useContext2.toggleParticipants,
-    totalUser = _useContext2.totalUser;
+    totalUser = _useContext2.totalUser,
+    isNewWaitingRoomUserEnter = _useContext2.isNewWaitingRoomUserEnter;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     tooltipVisible = _useState2[0],
@@ -48,28 +51,32 @@ var Participants = exports.Participants = (0, _mobxReact.observer)(function (_re
       }
     },
     content: tooltip,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      onClick: toggleParticipants,
       className: "fcr-action-bar-participants-wrapper",
       style: {
         display: visibleList.includes('Participants') ? 'flex' : 'none'
       },
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "fcr-action-bar-participants-user-count",
-        children: totalUser > 999 ? '999+' : totalUser
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
         id: id,
         order: order,
-        onClick: toggleParticipants,
-        icon: _type.FcrIconType.FCR_PEOPLE,
+        icon: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "fcr-action-bar-participants-icon",
+          children: [isNewWaitingRoomUserEnter ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "fcr-action-bar-participants-red"
+          }) : false, /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+            type: _type.FcrIconType.FCR_PEOPLE,
+            size: 32,
+            colors: {
+              iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
+            }
+          })]
+        }),
         iconColors: {
           iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
         },
-        title: title,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "fcr-action-bar-participants-user-count",
-          children: totalUser > 999 ? '999+' : totalUser
-        })
-      })]
+        title: "".concat(title, "(").concat(totalUser > 999 ? '999+' : totalUser, ")")
+      })
     })
   });
 });

package/lib/modules/action-bar/screen-share/index.js

@@ -39,6 +39,10 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
   var transI18n = (0, _i18n.useI18n)();
   var title = transI18n('fmt_screenshare_label_screenshare');
   var tooltip = hasStartScreenSharePermission ? transI18n('fmt_screenshare_label_screenshare') : transI18n('fmt_actionbar_screenshare_tips_restrictshare');
+  (0, _react.useEffect)(function () {
+    setMenuVisible(false);
+    setTooltipVisible(false);
+  }, [hasStartScreenSharePermission]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
     mouseEnterDelay: 0,
     onVisibleChange: function onVisibleChange() {
@@ -71,7 +75,7 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
         }
       } : undefined
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
-      overlayClassName: "fcr-action-bar--popover",
+      overlayClassName: "fcr-action-bar--popover fcr-screen-share--popover",
       visible: visibleMenu,
       onVisibleChange: setMenuVisible,
       trigger: "click",

package/lib/modules/action-bar/screen-share/submenu.js

@@ -21,6 +21,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _button = require("agora-ui-foundation/lib/components/button");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _mobxReact = require("mobx-react");
+var _truncate = _interopRequireDefault(require("lodash/truncate"));
 var _jsxRuntime = require("react/jsx-runtime");
 var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_context.ActionBarContext),
@@ -35,10 +36,11 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     isScreenShareAndBoardEnabled = _useContext.isScreenShareAndBoardEnabled,
     startScreenShare = _useContext.startScreenShare,
     hasScreenShare = _useContext.hasScreenShare,
-    hasCloseWriteBoardPermission = _useContext.hasCloseWriteBoardPermission;
+    hasCloseWriteBoardPermission = _useContext.hasCloseWriteBoardPermission,
+    hasAllowWriteBoardPermission = _useContext.hasAllowWriteBoardPermission;
   var t = (0, _i18n.useI18n)();
   var hasHostPermission = [_agoraEduCore.FcrUserRole.HOST, _agoraEduCore.FcrUserRole.COHOST].includes(localUserRole);
-  var hasBoardControlPermission = boardOwnerUser && localUser.userId !== boardOwnerUser.userId && hasCloseWriteBoardPermission;
+  var hasBoardControlPermission = boardOwnerUser && localUser.userId !== boardOwnerUser.userId && hasCloseWriteBoardPermission && hasAllowWriteBoardPermission;
   // 需求变更，联席主持人也可以禁用主持人的白板，注释掉联席主持人不能禁用的逻辑
   // (FcrUserRole.HOST === localUserRole ||
   //   (FcrUserRole.COHOST === localUserRole && FcrUserRole.HOST !== boardOwnerUser?.userRole));
@@ -49,13 +51,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     key: 'allow_attendee_title',
     type: 'title'
   }, {
-    icon: boardOwnerUser && hasHostPermission ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-      type: _type.FcrIconType.FCR_WHITEBOARD,
-      size: 24,
-      colors: {
-        iconPrimary: '#FB584E'
-      }
-    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+    icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
       type: _type.FcrIconType.FCR_SCREENSHARING,
       size: 24,
       colors: {
@@ -70,16 +66,10 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
       //   ? setAllowScreenShare(FcrWhiteboardState.OFF)
       //   : startScreenShare();
       startScreenShare();
-    },
-    classNames: 'fcr-icon-green'
+    }
+    // classNames: 'fcr-icon-green',
   }, {
-    icon: boardOwnerUser && hasHostPermission ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-      type: _type.FcrIconType.FCR_WHITEBOARD,
-      size: 24,
-      colors: {
-        iconPrimary: '#FB584E'
-      }
-    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+    icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
       type: _type.FcrIconType.FCR_WHITEBOARD,
       size: 24,
       colors: {
@@ -89,14 +79,15 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     disabled: boardOwnerUser && (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) !== localUser.userId,
     title: !boardOwnerUser ? t('fmt_screenshare_button_sharewhiteboard') : (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUser.userId ? t('fmt_screenshare_button_chosewhiteboard') : t('fmt_screenshare_options_alreadyopend'),
     key: 'allow_attendee_title',
+    type: boardOwnerUser && (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUser.userId ? 'danger' : 'primary',
     onButtonClick: function onButtonClick() {
       if ((boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUser.userId) {
         closeWhiteboard();
       } else {
         openWhiteboard();
       }
-    },
-    classNames: 'fcr-icon-blue'
+    }
+    // classNames: 'fcr-icon-blue',
   }];
   var menusElectronOnly = [];
   var hostMenus = [{
@@ -106,7 +97,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
   }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
       checked: isScreenShareAndBoardEnabled,
-      label: t('fmt_screenshare_controlbar_security_list_participant_screenshare'),
+      label: t('fmt_screenshare_screen_and_board'),
       styleType: "white"
     }),
     key: 'enable_sharescreen',
@@ -132,9 +123,13 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
       size: "XS",
       styleType: "danger",
+      shape: "rounded",
       block: true,
       children: t('fmt_screenshare_button_disableshare', {
-        reason1: boardOwnerUser ? boardOwnerUser.userName : t('fmt_actionbar_screenshare_labels_others')
+        reason1: boardOwnerUser ? (0, _truncate["default"])(boardOwnerUser.userName, {
+          length: 8,
+          separator: ' '
+        }) : t('fmt_actionbar_screenshare_labels_others')
       })
     }),
     key: 'enable_whiteboard',

package/lib/modules/action-bar/security/drop-menu.js

@@ -1,18 +1,43 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SecurityMenu = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.map.js");
 var _dropMenu = require("agora-ui-foundation/lib/components/drop-menu");
 var _context = require("../context");
 var _react = require("react");
 var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 var _mobxReact = require("mobx-react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _icon = require("agora-ui-foundation/lib/components/icon");
+var _type = require("agora-ui-foundation/lib/components/icon/type");
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
+var _type2 = require("agora-edu-core/lib/type");
 var _jsxRuntime = require("react/jsx-runtime");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     isLockRoomEnabled = _useContext.isLockRoomEnabled,
@@ -33,9 +58,24 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
     hasEnableStartVideoPermission = _useContext.hasEnableStartVideoPermission,
     hasEnableChangeNamePermission = _useContext.hasEnableChangeNamePermission,
     hasAllowWriteBoardPermission = _useContext.hasAllowWriteBoardPermission,
-    isScreenShareAndBoardEnabled = _useContext.isScreenShareAndBoardEnabled;
+    isScreenShareAndBoardEnabled = _useContext.isScreenShareAndBoardEnabled,
+    setEnableWaitingRoom = _useContext.setEnableWaitingRoom,
+    isWaitingRoomEnabled = _useContext.isWaitingRoomEnabled,
+    hasWaitingRoomPermission = _useContext.hasWaitingRoomPermission,
+    localUserRole = _useContext.localUserRole,
+    isWaterMarkEnabled = _useContext.isWaterMarkEnabled,
+    isMulti = _useContext.isMulti,
+    setAllowWaterMark = _useContext.setAllowWaterMark,
+    setWaterMarkLineType = _useContext.setWaterMarkLineType,
+    hasWatermarkEnablePermission = _useContext.hasWatermarkEnablePermission,
+    hasWatermarkDisablePermission = _useContext.hasWatermarkDisablePermission;
   var transI18n = (0, _i18n.useI18n)();
   var allActions = [];
+  allActions.push({
+    title: transI18n('fmt_security_setting_label_security_setting'),
+    key: 'meeting_security_title',
+    type: 'title'
+  });
   if (hasLockRoomPermission) {
     allActions.push({
       title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
@@ -50,17 +90,75 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
       }
     });
   }
-  allActions.push({
-    title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-      checked: false,
-      label: transI18n('fmt_security_options_activatewaitingroom'),
-      styleType: "white"
-    }),
-    key: 'enable_waiting_room',
-    type: 'disabled',
-    onButtonClick: function onButtonClick() {},
-    classNames: 'room-control-drop-with-under-line'
-  });
+  if (hasWaitingRoomPermission) {
+    allActions.push({
+      title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+        checked: isWaitingRoomEnabled(),
+        label: transI18n('fmt_security_options_activatewaitingroom'),
+        styleType: "white"
+      }),
+      key: 'enable_waiting_room',
+      type: 'primary',
+      onButtonClick: function onButtonClick() {
+        setEnableWaitingRoom(!isWaitingRoomEnabled(), true);
+      },
+      classNames: 'room-control-drop-with-under-line'
+    });
+  }
+
+  /** 主持人和联席主持人 可以进行开启单行双行水印 */
+  if (hasWatermarkEnablePermission && hasWatermarkDisablePermission) {
+    allActions.push({
+      title: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "room-control-options-box",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "room-control-options-watermark-title-box",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+            checked: isWaterMarkEnabled,
+            label: transI18n('fmt_security_setting_mobile_label_watermark'),
+            styleType: "white"
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+            mouseEnterDelay: 0,
+            trigger: "hover",
+            placement: "top",
+            content: transI18n('fmt_security_setting_popup_tip_watermark_voice_active_prioritized'),
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)("button", {
+              style: {
+                marginLeft: '6px'
+              },
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+                type: _type.FcrIconType.FCR_HELPQUESTION,
+                size: 16
+              })
+            })
+          })]
+        }), isWaterMarkEnabled && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "room-control-options-watermark-btns",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "room-control-options-watermark-btn ".concat(isMulti ? '' : 'room-control-options-watermark-btn--active'),
+            onClick: function onClick(e) {
+              e.stopPropagation();
+              setWaterMarkLineType(_type2.FcrLineType.SINGLE_ROW);
+            },
+            children: transI18n('fmt_security_setting_mobile_option_watermark_style_single')
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "room-control-options-watermark-btn ".concat(isMulti ? 'room-control-options-watermark-btn--active' : ''),
+            onClick: function onClick(e) {
+              e.stopPropagation();
+              setWaterMarkLineType(_type2.FcrLineType.MULTI_ROW);
+            },
+            children: transI18n('fmt_security_setting_mobile_option_watermark_style_multi')
+          })]
+        })]
+      }),
+      key: 'enable_watermark',
+      type: 'primary',
+      onButtonClick: function onButtonClick() {
+        setAllowWaterMark();
+      },
+      classNames: 'room-control-drop-with-under-line'
+    });
+  }
   allActions.push({
     title: transI18n('fmt_screenshare_options_allow'),
     key: 'allow_attendee_title',
@@ -70,7 +168,7 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
     allActions.push({
       title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
         checked: isScreenShareAndBoardEnabled,
-        label: transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare'),
+        label: transI18n('fmt_screenshare_screen_and_board'),
         styleType: "white"
       }),
       key: 'share_screen',
@@ -159,6 +257,18 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
     classNames: 'room-control-drop-disable'
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropMenu.FcrDropMenu, {
-    options: allActions
+    options: allActions.filter(function (v) {
+      return v.type !== 'disabled';
+    }).map(function (v) {
+      if (v.type === 'primary') {
+        return _objectSpread(_objectSpread({}, v), {}, {
+          title: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "security-drop-menu-checkbox",
+            children: v.title
+          })
+        });
+      }
+      return _objectSpread({}, v);
+    })
   });
 });

package/lib/modules/action-bar/security/index.js

@@ -30,7 +30,7 @@ var Security = exports.Security = (0, _mobxReact.observer)(function (_ref) {
         content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropMenu.SecurityMenu, {}),
         overlayClassName: 'attendee__footer-more-actions',
         overlayInnerStyle: {
-          boxShadow: 'none',
+          boxShadow: 'var(--fcr_web_light_dropup_m)',
           border: 'none',
           width: '256px'
         },

package/lib/modules/action-bar/settings/index.js

@@ -30,7 +30,7 @@ var Settings = exports.Settings = function Settings(_ref) {
       title: title,
       onClick: function onClick() {
         openDeviceSettingDialog({
-          activeTab: _store.DeviceSettingTab.VIDEO
+          activeTab: _store.DeviceSettingTab.GENERAL
         });
       },
       iconColors: {