fcr-ui-scene 3.4.0 → 3.4.2

package/lib/fragments/control-bar/device/index.js

@@ -71,7 +71,7 @@ var VideoDeviceListPopoverContent = function VideoDeviceListPopoverContent(props
               className: "color-dark-gray-icontext1",
               children: device.deviceName
             }),
-            iconColor: 'var(--fcr_ui_scene_icontext1)',
+            iconColor: 'var(--fcr_ui_scene_ramp_brand6)',
             styleType: 'transparent',
             checked: currentDevice === device.deviceId,
             value: device.deviceId
@@ -147,8 +147,7 @@ var AudioDeviceListPopoverContent = function AudioDeviceListPopoverContent(props
               className: "color-dark-gray-icontext1",
               children: device.deviceName
             }),
-            // iconColor: 'var(--fcr_ui_scene_ramp_brand6)',
-            iconColor: 'var(--fcr_ui_scene_icontext1)',
+            iconColor: 'var(--fcr_ui_scene_ramp_brand6)',
             styleType: 'transparent',
             checked: currentSpeakerDevice === device.deviceId,
             value: device.deviceId
@@ -175,8 +174,7 @@ var AudioDeviceListPopoverContent = function AudioDeviceListPopoverContent(props
               className: "color-dark-gray-icontext1",
               children: device.deviceName
             }),
-            // iconColor: 'var(--fcr_ui_scene_ramp_brand6)',
-            iconColor: 'var(--fcr_ui_scene_icontext1)',
+            iconColor: 'var(--fcr_ui_scene_ramp_brand6)',
             styleType: 'transparent',
             checked: currentMicrophoneDevice === device.deviceId,
             value: device.deviceId

package/lib/fragments/control-bar/index.css

@@ -76,7 +76,7 @@
 .share-action-nav__popover {
   color: var(--fcr_ui_scene_icontext1);
   border: 0.5px solid var(--fcr_ui_scene_line1);
-  box-shadow: var(--fcr_web_light_dropup_m);
+  box-shadow: 0px 0px 15px var(--fcr_web_light_dropup_m);
   border-radius: var(--fcr_cornerradius_l);
   background-color: var(--fcr_mobile_ui_scene_color_popup_fill2);
 }
@@ -106,7 +106,6 @@
   gap: 8px;
   padding: 6px;
   box-sizing: border-box;
-  padding-left: 38px;
 }
 
 .share-action-nav__popover-option:hover {
@@ -119,16 +118,7 @@
   flex-wrap: nowrap;
   align-items: center;
   gap: 8px;
-  padding-left: 6px;
-}
-
-.share-action-nav__media-list-group .fcr-radio-transparent:hover span,
-.share-action-nav__popover-option:hover {
-  color: var(--fcr_web_ui_scene_mainicon2);
-}
-
-.share-action-nav__popover-option-media-setting:hover path {
-  fill: var(--fcr_ui_scene_ramp_brand6);
+  padding: 0;
 }
 
 .share-action-nav__button .fcr-radio {
@@ -187,10 +177,9 @@
   transform: translateY(-54px);
 }
 
-/* .radio-label-active {
+.radio-label-active {
   color: var(--fcr_web_ui_scene_mainicon2);
-} */
-
+}
 .radio-label-normal {
   color: var(--fcr_ui_scene_icontext1);
 }
@@ -221,6 +210,12 @@
   flex-basis: 40px;
 }
 
+.leave-container {
+  position: relative;
+  padding: 20px;
+  max-height: 368px;
+}
+
 .leave-title {
   width: 100%;
   height: 39px;

package/lib/fragments/control-bar/index.js

@@ -121,9 +121,6 @@ var ControlBar = exports.ControlBar = /*#__PURE__*/function (_BaseFragment) {
         case _constant.RendererEventAction.MAIN_SET_ALLOW_SHARE_SCREEN:
           this._store.setAllowShareScreen(payload.allow);
           break;
-        case _constant.RendererEventAction.MAIN_SET_ALLOW_BOARD_WRITE:
-          this._store.setBoardWriteEnabled(payload.allow);
-          break;
         case _constant.RendererEventAction.MAIN_SET_ALLOW_UNMUTE_SELF_VIDEO:
           this._store.setAllowUnmuteSelfVideo(payload.allow);
           break;
@@ -200,27 +197,6 @@ var ControlBar = exports.ControlBar = /*#__PURE__*/function (_BaseFragment) {
         case _constant.RendererEventAction.SET_SHARE_WITH_AUDIO_CONTROL_BAR:
           this._store.setShareWithAudioStateOnly(payload.withAudio);
           break;
-        case _constant.RendererEventAction.SET_REMOTE_USERS:
-          this._store.setRemoteUsers(payload);
-          break;
-        case _constant.RendererEventAction.SET_HAS_ASSIGN_HOST_BEFORE_LEAVING_PERMISSION:
-          this._store.setHasAssignHostBeforeLeavingPermission(payload);
-          break;
-        case _constant.RendererEventAction.SET_HAS_END_ROOM_PERMISSION:
-          this._store.setHasEndRoomPermission(payload);
-          break;
-        case _constant.RendererEventAction.SET_IS_LOCKED:
-          this._store.setIsLocked(payload);
-          break;
-        case _constant.RendererEventAction.SET_IS_PSTN_USER:
-          this._store.setIsPstnUser(payload);
-          break;
-        case _constant.RendererEventAction.SET_IS_MULTI:
-          this._store.setIsMulti(payload);
-          break;
-        case _constant.RendererEventAction.SET_CONTRL_IS_WATERMARK_ENABLE:
-          this._store.setWaterMarkEnabled(payload);
-          break;
       }
     }
   }]);

package/lib/fragments/control-bar/more-actions/index.css

@@ -1,23 +1,14 @@
 .leave-room-dialog {
 }
-
 .leave-room-dialog .fcr-dialog-body {
   padding: 20px;
 }
-
-.leave-room-dialog .fcr-button-secondary-bordered:hover {
-  color: var(--fcr_ui_scene_ramp_red6);
-  background: var(--fcr_ui_scene_ramp_red1);
-  border-color: var(--fcr_ui_scene_ramp_red6);
-}
-
 .leave-room-dialog-content {
   display: flex;
   flex-direction: column;
   gap: 12px;
   width: 100%;
 }
-
 .leave-room-dialog-title {
   text-align: center;
 }
@@ -26,47 +17,3 @@
 .leave-room-dialog-content > div {
   width: 100%;
 }
-.share-action-nav__popover-inner-content {
-  position: relative;
-}
-
-.share-action-nav__popover-inner-content
-  .share-action-nav__popover-inner-content-leave-option
-  path {
-  fill: var(--fcr_ui_scene_ramp_red6);
-}
-
-.share-action-nav__popover-inner-content
-  .share-action-nav__popover-inner-content-leave-option
-  .share-action-nav__popover-option {
-  color: var(--fcr_ui_scene_ramp_red6);
-}
-
-.share-action-nav__popover-inner-content
-  .share-action-nav__popover-inner-content-leave-option
-  .share-action-nav__popover-option:hover {
-  background: var(--fcr_ui_scene_ramp_red1);
-}
-
-.share-action-nav__media-list-group .share-action-nav__popover-option-media-setting {
-  padding-left: 6px;
-}
-
-.share-action-nav__media-list-item-with-divider {
-  min-height: 32px;
-  height: auto;
-}
-
-.share-action-nav__media-list-item-with-divider:after {
-  content: '';
-  height: 1px;
-  border-bottom: 1px solid var(--fcr_ui_scene_line1);
-  width: calc(100% + 16px);
-  bottom: 0px;
-  left: 0px;
-  height: 1px;
-  display: block;
-  margin: 8px;
-  position: relative;
-  left: -16px;
-}

package/lib/fragments/control-bar/more-actions/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -23,12 +22,10 @@ var _react = require("react");
 var _constant = require("../../../utilities/constant");
 var _context = require("../context");
 require("./index.css");
-var _type2 = require("fcr-core/lib/type");
+var _type2 = require("agora-edu-core/lib/type");
 var _copyText = require("../../../utilities/copyText");
 var _toast = require("agora-ui-foundation/lib/components/toast");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _classnames = _interopRequireDefault(require("classnames"));
-var _leaveMeeting = require("../../../modules/action-bar/leave/leave-meeting");
 var _jsxRuntime = require("react/jsx-runtime");
 var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(function (props) {
   var ref = (0, _react.useRef)(null);
@@ -44,18 +41,7 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
     hasStartCloudRecordingPermission = _useContext.hasStartCloudRecordingPermission,
     hasStartLiveStreamingPermission = _useContext.hasStartLiveStreamingPermission,
     hasGetLiveStreamingUrlPermission = _useContext.hasGetLiveStreamingUrlPermission,
-    hasStopLiveStreamingPermission = _useContext.hasStopLiveStreamingPermission,
-    setShowMeetingDetailPortal = _useContext.setShowMeetingDetailPortal,
-    setMeetingDetailPortalPosition = _useContext.setMeetingDetailPortalPosition,
-    localUserRole = _useContext.localUserRole,
-    hasAssignHostBeforeLeavingPermission = _useContext.hasAssignHostBeforeLeavingPermission,
-    isPstnUser = _useContext.isPstnUser,
-    remoteUsers = _useContext.remoteUsers,
-    hasEndRoomPermission = _useContext.hasEndRoomPermission,
-    sendLeave = _useContext.sendLeave,
-    sendEnd = _useContext.sendEnd,
-    keepPhoneAudioConnection = _useContext.keepPhoneAudioConnection,
-    sendAssign = _useContext.sendAssign;
+    hasStopLiveStreamingPermission = _useContext.hasStopLiveStreamingPermission;
   var transI18n = (0, _i18n.useI18n)();
   var onItemClick = function onItemClick(item) {
     if (item.onClick) {
@@ -89,7 +75,6 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
           children: transI18n('fmt_popup_button_endmeeting')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
           size: "S",
-          type: "secondary-bordered",
           onClick: function onClick() {
             _dialog.FcrDialogApi.close('leave-room');
             window.runtime.browserWindow.setIgnoreMouseEvents(true, {
@@ -100,7 +85,6 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
           children: transI18n('fmt_popup_button_leavemeeting')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
           size: "S",
-          type: "secondary-bordered",
           onClick: function onClick() {
             window.runtime.browserWindow.setIgnoreMouseEvents(true, {
               forward: true
@@ -137,15 +121,11 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
       })]
     });
   };
-
-  // 分割线
   var moreOptions = [{
-    icon: _type.FcrIconType.FCR_WEB_CHAT,
     text: transI18n('fmt_chat_label_chat'),
     displayWhenNoPermission: 'hidden',
     key: _constant.RendererEventAction.OPEN_CHAT,
-    hasPermission: hasChatPermission,
-    classNames: 'share-action-nav__media-list-item-with-divider'
+    hasPermission: hasChatPermission
   }, {
     icon: _type.FcrIconType.FCR_EMO,
     text: transI18n('fmt_popup_label_expression'),
@@ -153,8 +133,6 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
     key: 'emoji',
     hasPermission: false
   }, {
-    icon: _type.FcrIconType.FCR_CLOUDRECORD,
-    classNames: 'share-action-nav__media-list-item-with-divider',
     text: transI18n('fmt_screenshare_controlbar_button_more_cloudRecord'),
     displayWhenNoPermission: 'hidden',
     key: cloudRecordingState === _type2.FcrRecordingState.Stopped ? _constant.RendererEventAction.CLOUD_RECORDING_START : _constant.RendererEventAction.CLOUD_RECORDING_STOP,
@@ -169,7 +147,6 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
   //     hasStartCloudRecordingPermission && cloudRecordingState === FcrRecordingState.Stopped,
   // },
   {
-    classNames: 'share-action-nav__media-list-item-with-divider',
     icon: _type.FcrIconType.FCR_LIVE,
     text: transI18n('fmt_screenshare_controlbar_button_more_live'),
     displayWhenNoPermission: 'hidden',
@@ -181,29 +158,14 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
       });
       handleMoreClick(_constant.RendererEventAction.OPEN_LIVE_STEAMING_DIALOG);
     }
-  }, {
-    icon: _type.FcrIconType.FCR_EXCLAMATIONMASK,
-    text: transI18n('fmt_popup_button_meetinginfor'),
-    classNames: 'share-action-nav__media-list-item-with-divider',
-    displayWhenNoPermission: 'hidden',
-    key: 'copyMeetingInfo',
-    hasPermission: true,
-    onClick: function onClick() {
-      closePopover();
-      var currentPopoverPosition = document.getElementsByClassName('share-action-nav__popover')[0].getBoundingClientRect();
-      setMeetingDetailPortalPosition(currentPopoverPosition.x || 0, currentPopoverPosition.y || 0);
-      setShowMeetingDetailPortal(true);
-    }
   }, {
     icon: _type.FcrIconType.FCR_SETTING,
-    classNames: 'share-action-nav__media-list-item-with-divider',
     text: transI18n('fmt_screenshare_controlbar_button_more_setting'),
     displayWhenNoPermission: 'hidden',
     key: _constant.RendererEventAction.OPEN_SETTING,
     hasPermission: true
   }, {
     icon: _type.FcrIconType.FCR_ATTACH,
-    classNames: 'share-action-nav__media-list-item-with-divider',
     text: transI18n('fmt_live_label_copylink'),
     displayWhenNoPermission: 'hidden',
     key: 'copyLiveLink',
@@ -220,40 +182,43 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
       });
     }
   }, {
-    icon: _type.FcrIconType.FCR_ENDMEETING,
-    key: _constant.RendererEventAction.LEAVE_ROOM,
-    classNames: 'share-action-nav__popover-inner-content-leave-option',
-    text: isHost ? transI18n('fmt_popup_button_endmeeting') : transI18n('fmt_popup_button_leavemeeting'),
-    hasPermission: true,
+    icon: _type.FcrIconType.FCR_ATTACH,
+    text: transI18n('fmt_popup_button_meetinginfor'),
+    displayWhenNoPermission: 'hidden',
+    key: 'copyMeetingInfo',
+    hasPermission: false,
     onClick: function onClick() {
-      window.runtime.browserWindow.setIgnoreMouseEvents(false);
-      _dialog.FcrDialogApi.info({
-        id: 'leave-room',
-        dialogProps: {
-          content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_leaveMeeting.LeaveMeeting, {
-            setPopoverOpened: function setPopoverOpened(value) {
-              if (!value) {
-                _dialog.FcrDialogApi.close('leave-room');
-              }
-            },
-            localUserRole: localUserRole,
-            leave: sendLeave,
-            isLocked: false,
-            hasAssignHostBeforeLeavingPermission: hasAssignHostBeforeLeavingPermission,
-            hasEndRoomPermission: hasEndRoomPermission,
-            keepPhoneAudioConnection: keepPhoneAudioConnection,
-            isPstnUser: isPstnUser,
-            remoteUsers: remoteUsers,
-            end: sendEnd,
-            assignHost: sendAssign
-          }),
-          width: 255,
-          closable: false,
-          rootClassName: 'leave-room-dialog'
-        }
+      closePopover();
+      (0, _copyText.copyText)('TODO 会议信息').then(function () {
+        _toast.FcrToastApi.open({
+          id: 'copy-live-link',
+          toastProps: {
+            type: 'info',
+            content: transI18n('fmt_statusbar_status_coppied')
+          }
+        });
       });
     }
-  }];
+  }
+  // {
+  //   icon: FcrIconType.FCR_ENDMEETING,
+  //   key: RendererEventAction.LEAVE_ROOM,
+  //   text: isHost ? '结束会议' : '离开会议',
+  //   hasPermission: true,
+  //   onClick: () => {
+  //     window.runtime.browserWindow.setIgnoreMouseEvents(false);
+  //     FcrDialogApi.info({
+  //       id: 'leave-room',
+  //       dialogProps: {
+  //         content: <LeaveRoomContent />,
+  //         width: 256,
+  //         closable: false,
+  //         rootClassName: 'leave-room-dialog',
+  //       },
+  //     });
+  //   },
+  // },
+  ];
   (0, _react.useEffect)(function () {
     function handleClickOutside(event) {
       if (ref.current && !ref.current.contains(event.target)) {
@@ -274,7 +239,7 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
     className: "share-action-nav__popover-inner-content share-action-nav__not-draggable",
     children: moreOptionsFilter.map(function (item, index) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: (0, _classnames["default"])('share-action-nav__media-list-group', item.classNames),
+        className: "share-action-nav__media-list-group",
         onClick: function onClick(e) {
           e.stopPropagation();
           onItemClick(item);

package/lib/fragments/control-bar/security-content/index.css

@@ -8,7 +8,6 @@
 }
 .security-content .fcr-drop-menu-title {
   text-align: left;
-  font-size: 500;
 }
 .security-content .fcr-checkbox-inner {
   background-color: transparent;
@@ -22,78 +21,4 @@
 .security-content .fcr-checkbox-label {
   display: inline-block;
   flex: 1;
-  font-weight: 500;
-}
-
-.security-content .fcr-checkbox path {
-  fill: var(--fcr_ui_scene_mainicon1);
-}
-
-.fcr-drop-menu-option-primary:hover path {
-  fill: var(--fcr_ui_scene_ramp_brand6);
-}
-
-.room-control-options-box {
-  display: flex;
-  justify-content: space-between;
-}
-.room-control-options-box .fcr-checkbox {
-  width: fit-content;
-}
-
-.room-control-options-watermark-btns {
-  min-width: 104px;
-  height: 24px;
-  display: flex;
-  background-color: var(--fcr_mobile_ui_scene_fill1);
-  align-items: center;
-  padding: 2px;
-}
-
-.room-control-options-watermark-btn {
-  min-width: 50px;
-  height: 20px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  color: var(--fcr_ui_scene_icontext1);
-  font-size: 12px;
-  background-color: transparent;
-  padding: 0px 4px;
-  width: auto !important;
-}
-
-.security-content-more-dropdown .fcr-tooltip-inner {
-  min-width: 302px !important;
-  width: auto !important;
-}
-
-.security-content-more-dropdown .fcr-drop-menu-option {
-  width: auto !important;
-}
-
-.room-control-options-watermark-btn--active {
-  background-color: #ffffff;
-  color: var(--fcr_ui_scene_ramp_brand6);
-}
-
-.room-control-options-watermark-title-box {
-  display: flex;
-  align-items: center;
-  font-size: 13px;
-}
-
-.room-control-drop-with-under-line::after {
-  content: '';
-  position: absolute;
-  left: -10px;
-  right: -10px;
-  bottom: -12px;
-  border-top: 1px solid var(--fcr_ui_scene_line1);
-  margin: 8px 0;
-}
-
-.room-control-drop-disable {
-  opacity: 0.5;
-  cursor: not-allowed;
 }

package/lib/fragments/control-bar/security-content/index.js

@@ -17,10 +17,6 @@ var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 require("./index.css");
 var _mobxReact = require("mobx-react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _type = require("fcr-core/lib/type");
-var _icon = require("agora-ui-foundation/lib/components/icon");
-var _type2 = require("agora-ui-foundation/lib/components/icon/type");
-var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _jsxRuntime = require("react/jsx-runtime");
 var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_context.StoreContext),
@@ -28,8 +24,6 @@ var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(functio
     isLockRoomEnabled = _useContext.isLockRoomEnabled,
     allowShareScreen = _useContext.allowShareScreen,
     updateAllowShareScreen = _useContext.updateAllowShareScreen,
-    allowBoardWrite = _useContext.allowBoardWrite,
-    updateBoardWriteEnabled = _useContext.updateBoardWriteEnabled,
     allowChat = _useContext.allowChat,
     updateAllowChat = _useContext.updateAllowChat,
     allowUnmuteSelfAudio = _useContext.allowUnmuteSelfAudio,
@@ -41,23 +35,9 @@ var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(functio
     hasEnableStartAudioPermission = _useContext.hasEnableStartAudioPermission,
     hasEnableChangeNamePermission = _useContext.hasEnableChangeNamePermission,
     hasEnableStartVideoPermission = _useContext.hasEnableStartVideoPermission,
-    hasLockRoomPermission = _useContext.hasLockRoomPermission,
-    hasAllowWriteBoardPermission = _useContext.hasAllowWriteBoardPermission,
-    hasWaitingRoomPermission = _useContext.hasWaitingRoomPermission,
-    updateWaitingRoomEnabled = _useContext.updateWaitingRoomEnabled,
-    isWaitingRoomEnabled = _useContext.isWaitingRoomEnabled,
-    isWaterMarkEnabled = _useContext.isWaterMarkEnabled,
-    hasWatermarkEnablePermission = _useContext.hasWatermarkEnablePermission,
-    hasWatermarkDisablePermission = _useContext.hasWatermarkDisablePermission,
-    isMulti = _useContext.isMulti,
-    setWaterMarkLineType = _useContext.setWaterMarkLineType,
-    setAllowWaterMark = _useContext.setAllowWaterMark;
+    hasLockRoomPermission = _useContext.hasLockRoomPermission;
   var transI18n = (0, _i18n.useI18n)();
   var allActions = [{
-    title: transI18n('fmt_security_setting_label_security_setting'),
-    key: 'meeting_security_title',
-    type: 'title'
-  }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
       checked: isLockRoomEnabled,
       label: transI18n('fmt_screenshare_controlbar_security_list_lock'),
@@ -71,65 +51,14 @@ var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(functio
     }
   }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-      checked: isWaitingRoomEnabled,
+      checked: false,
       label: transI18n('fmt_security_options_activatewaitingroom'),
       styleType: "white"
     }),
     key: 'enable_waiting_room',
-    hasPermission: hasWaitingRoomPermission,
-    onButtonClick: function onButtonClick() {
-      return updateWaitingRoomEnabled(!isWaitingRoomEnabled);
-    },
-    classNames: 'room-control-drop-with-under-line'
-  }, {
-    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: _type2.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(_type.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(_type.FcrLineType.MULTI_ROW);
-          },
-          children: transI18n('fmt_security_setting_mobile_option_watermark_style_multi')
-        })]
-      })]
-    }),
-    key: 'enable_watermark',
-    type: 'primary',
-    hasPermission: hasWatermarkEnablePermission && hasWatermarkDisablePermission,
-    onButtonClick: function onButtonClick() {
-      setAllowWaterMark();
-    },
+    type: 'disabled',
+    hasPermission: true,
+    onButtonClick: function onButtonClick() {},
     classNames: 'room-control-drop-with-under-line'
   }, {
     title: transI18n('fmt_screenshare_options_allow'),
@@ -139,7 +68,7 @@ var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(functio
   }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
       checked: allowShareScreen,
-      label: transI18n('fmt_screenshare_screen_and_board'),
+      label: transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare'),
       styleType: "white"
     }),
     key: 'share_screen',
@@ -148,16 +77,6 @@ var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(functio
     onButtonClick: function onButtonClick() {
       updateAllowShareScreen(!allowShareScreen);
     }
-  }, {
-    title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-      checked: allowBoardWrite,
-      label: transI18n('fmt_screenshare_options_editable'),
-      styleType: "white"
-    }),
-    key: 'enable_whiteboard',
-    type: 'primary',
-    hasPermission: hasAllowWriteBoardPermission,
-    onButtonClick: updateBoardWriteEnabled
   }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
       checked: allowChat,
@@ -205,25 +124,20 @@ var SecurityContent = exports.SecurityContent = (0, _mobxReact.observer)(functio
       updateAllowUnmuteSelfVideo(!allowUnmuteSelfVideo);
     },
     classNames: 'room-control-drop-with-under-line'
-  }
-  // 功能没实现，暂时注释
-  // {
-  //   title: (
-  //     <FcrCheckbox
-  //       checked={false}
-  //       label={transI18n('fmt_security_options_removemultiple')}
-  //       styleType="white"
-  //     />
-  //   ),
-  //   key: 'remove_fcr-participants',
-  //   type: 'danger',
-  //   hasPermission: true,
-  //   onButtonClick: () => {},
-  //   classNames: 'room-control-drop-disable',
-  // },
-  ];
+  }, {
+    title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+      checked: false,
+      label: transI18n('fmt_security_options_removemultiple'),
+      styleType: "white"
+    }),
+    key: 'remove_fcr-participants',
+    type: 'danger',
+    hasPermission: true,
+    onButtonClick: function onButtonClick() {},
+    classNames: 'room-control-drop-disable'
+  }];
   var securityHasPermissionActions = allActions.filter(function (item) {
-    return item.hasPermission || item.type === 'title';
+    return item.hasPermission;
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "security-content",

package/lib/fragments/control-bar/share-state-nav/index.js

@@ -16,7 +16,7 @@ var _mobxReact = require("mobx-react");
 var _context = require("../context");
 var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _type2 = require("fcr-core/lib/type");
+var _type2 = require("agora-edu-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _meetingTime = require("../../../hooks/meeting-time");
 var _jsxRuntime = require("react/jsx-runtime");