fcr-ui-scene 3.4.1 → 3.4.3

package/lib/modules/dialog/components/chat/electron.js

@@ -7,20 +7,29 @@ Object.defineProperty(exports, "__esModule", {
 exports.ChatElectronDialog = void 0;
 var _constant = require("../../../../utilities/constant");
 var _useElectron = require("../../hooks/useElectron");
+var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
-var config = {
-  width: 800,
-  height: 600,
-  fullscreen: false,
-  maximizable: false
-};
 var ChatElectronDialog = exports.ChatElectronDialog = function ChatElectronDialog(_ref) {
-  var children = _ref.children,
-    chatAction = _ref.chatAction;
+  var children = _ref.children;
+  var transI18n = (0, _i18n.useI18n)();
+  var config = {
+    width: 800,
+    height: 600,
+    minWidth: 400,
+    minHeight: 400,
+    maxWidth: 1100,
+    maxHeight: 900,
+    fullscreen: false,
+    maximizable: false,
+    title: transI18n('fmt_chat_window_title'),
+    resizable: true,
+    hasShadow: true
+  };
   (0, _useElectron.useElectronDialog)({
     config: config,
-    dialogKey: _constant.DialogKey.CHAT,
-    children: children
+    dialogKey: _constant.FcrUIDialogKey.CHAT,
+    children: children,
+    hasCustomShadow: false
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
 };

package/lib/modules/dialog/components/chat/index.js

@@ -12,7 +12,7 @@ var _store = require("../../store");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _electron = require("./electron");
 var _type = require("fcr-core/lib/room-control/chatroom-control/type");
-var _dialogContainer = _interopRequireDefault(require("../../../components/dialog-container"));
+var _dialogContainer = _interopRequireDefault(require("../dialog-container"));
 var _constant = require("../../../../utilities/constant");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _iconButton = require("agora-ui-foundation/lib/components/icon-button");
@@ -46,7 +46,7 @@ var ChatDialog = exports.ChatDialog = function ChatDialog(_ref) {
     }),
     width: 800,
     height: waitingRoomState ? 630 : 600,
-    dialogKey: _constant.DialogKey.CHAT,
+    dialogKey: _constant.FcrUIDialogKey.CHAT,
     onClose: closeChatFromDialog,
     children: children
   });

package/lib/modules/dialog/components/confirm/index.js

@@ -27,7 +27,7 @@ var ConfirmDialog = exports.ConfirmDialog = function ConfirmDialog(_ref) {
   };
   (0, _env.isElectron)() && (0, _useElectron.useElectronDialog)({
     config: config,
-    dialogKey: _constant.DialogKey.CONFIRM,
+    dialogKey: _constant.FcrUIDialogKey.CONFIRM,
     children: children,
     fullScreen: true,
     scroll: false,

package/lib/modules/dialog/components/connection-gateway/electron.d.ts

@@ -1,5 +1,5 @@
 import { PropsWithChildren } from 'react';
 import { ParamsType } from '.';
-export declare const ConnectionGatewayElectronDialog: ({ children, params, }: PropsWithChildren<{
+export declare const ConnectionGatewayElectronDialog: ({ children, }: PropsWithChildren<{
     params: ParamsType;
 }>) => null;

package/lib/modules/dialog/components/connection-gateway/electron.js

@@ -7,9 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.ConnectionGatewayElectronDialog = void 0;
 var _constant = require("../../../../utilities/constant");
 var _useElectron = require("../../hooks/useElectron");
+var _i18n = require("agora-ui-foundation/lib/i18n");
 var ConnectionGatewayElectronDialog = exports.ConnectionGatewayElectronDialog = function ConnectionGatewayElectronDialog(_ref) {
-  var children = _ref.children,
-    params = _ref.params;
+  var children = _ref.children;
+  var transI18n = (0, _i18n.useI18n)();
   var config = {
     maximizable: false,
     minimizable: false,
@@ -19,17 +20,14 @@ var ConnectionGatewayElectronDialog = exports.ConnectionGatewayElectronDialog =
     trafficLightPosition: {
       x: 0,
       y: 0
-    }
+    },
+    title: transI18n('fmt_toolbar_label_connectaudio'),
+    resizable: false
   };
   (0, _useElectron.useElectronDialog)({
-    dialogKey: _constant.DialogKey.CONNECTION_GATEWAY,
+    dialogKey: _constant.FcrUIDialogKey.CONNECTION_GATEWAY,
     config: config,
-    children: children,
-    onOpened: function onOpened(_ref2) {
-      var browserWindow = _ref2.browserWindow;
-      browserWindow === null || browserWindow === void 0 || browserWindow.focus();
-      browserWindow === null || browserWindow === void 0 || browserWindow.setAlwaysOnTop(true);
-    }
+    children: children
   });
   return null;
 };

package/lib/modules/dialog/components/connection-gateway/index.d.ts

@@ -1,7 +1,9 @@
-import { FC } from 'react';
+import { FC, ReactNode } from 'react';
 export type ParamsType = {
     type: 'phone' | 'computer';
 };
 export declare const ConnectionGatewayDialog: FC<{
     params: ParamsType;
+    computerChildren?: ReactNode;
+    phoneChildren?: ReactNode;
 }>;

package/lib/modules/dialog/components/connection-gateway/index.js

@@ -7,22 +7,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ConnectionGatewayDialog = void 0;
 var _env = require("agora-foundation/lib/utilities/env");
+var _react = require("react");
 var _electron = require("./electron");
-var _mobxReact = require("mobx-react");
-var _dialogContainer = _interopRequireDefault(require("../../../components/dialog-container"));
+var _dialogContainer = _interopRequireDefault(require("../dialog-container"));
 var _constant = require("../../../../utilities/constant");
+var _tabs = require("./tabs");
+var _store = require("../../store");
 var _jsxRuntime = require("react/jsx-runtime");
-var ConnectionGatewayDialog = exports.ConnectionGatewayDialog = (0, _mobxReact.observer)(function (_ref) {
+var ConnectionGatewayDialog = exports.ConnectionGatewayDialog = function ConnectionGatewayDialog(_ref) {
   var children = _ref.children,
     _ref$params = _ref.params,
     params = _ref$params === void 0 ? {
       type: 'computer'
-    } : _ref$params;
+    } : _ref$params,
+    computerChildren = _ref.computerChildren,
+    phoneChildren = _ref.phoneChildren;
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
+    closeConnectionDialog = _useContext.closeConnectionDialog;
   var container = /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialogContainer["default"], {
     width: 400,
     height: params.type === 'phone' ? 500 : 350,
-    dialogKey: _constant.DialogKey.CONNECTION_GATEWAY,
-    children: children
+    closeInterception: function closeInterception() {
+      return closeConnectionDialog();
+    },
+    dialogKey: _constant.FcrUIDialogKey.CONNECTION_GATEWAY,
+    children: children ? children : /*#__PURE__*/(0, _jsxRuntime.jsx)(_tabs.GatewayConnectorTabs, {
+      type: params.type,
+      computerChildren: computerChildren,
+      phoneChildren: phoneChildren
+    })
   });
   if ((0, _env.isElectron)()) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_electron.ConnectionGatewayElectronDialog, {
@@ -31,4 +44,4 @@ var ConnectionGatewayDialog = exports.ConnectionGatewayDialog = (0, _mobxReact.o
     });
   }
   return container;
-});
+};

package/lib/modules/dialog/components/connection-gateway/tabs.d.ts

@@ -0,0 +1,6 @@
+import { ReactNode } from 'react';
+export declare const GatewayConnectorTabs: (props: {
+    type: string;
+    computerChildren: ReactNode;
+    phoneChildren: ReactNode;
+}) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/dialog/components/connection-gateway/tabs.js

@@ -0,0 +1,44 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.GatewayConnectorTabs = void 0;
+require("core-js/modules/es.array.concat.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _mobxReact = require("mobx-react");
+var _tabFrame = _interopRequireDefault(require("../../../components/tab-frame"));
+var _react = require("react");
+var _store = require("../../store");
+var _type = require("../../../../type");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _jsxRuntime = require("react/jsx-runtime");
+var GatewayConnectorTabs = exports.GatewayConnectorTabs = (0, _mobxReact.observer)(function (props) {
+  var type = props.type,
+    computerChildren = props.computerChildren,
+    phoneChildren = props.phoneChildren;
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
+    connectType = _useContext.connectType,
+    hasOwnPstnStream = _useContext.hasOwnPstnStream;
+  var _useState = (0, _react.useState)("".concat(type)),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    activeTabKey = _useState2[0],
+    setActiveTabKey = _useState2[1];
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tabFrame["default"], {
+    activeKey: activeTabKey,
+    onChange: function onChange(tab) {
+      return setActiveTabKey(tab);
+    },
+    tabs: [{
+      label: "".concat((0, _i18n.transI18n)('fmt_PSTN_label_pcaudio')).concat(connectType === _type.FcrUIConnectType.COMPUTER ? "-".concat((0, _i18n.transI18n)('fmt_PSTN_status_connected')) : ''),
+      key: 'computer',
+      content: computerChildren
+    }, {
+      label: "".concat((0, _i18n.transI18n)('fmt_pstn_options_phoneaudio')).concat(hasOwnPstnStream ? "-".concat((0, _i18n.transI18n)('fmt_PSTN_status_connected')) : ''),
+      key: 'phone',
+      content: phoneChildren
+    }]
+  });
+});

package/lib/modules/dialog/components/control-bar/index.d.ts

@@ -1,7 +1,11 @@
+import { AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
 import { ControlBarUIModule } from '../../../control-bar';
+import { FcrUIShareSelectionDisplayProps } from '../../../share-screen/types';
 import { PropsWithChildren } from 'react';
+import { CurrentShareBounds } from '../../../control-bar/types';
 export declare const config: Electron.BrowserWindowConstructorOptions;
 export declare const ControlBarDialog: (props: PropsWithChildren<{
-    params: any;
+    params: FcrUIShareSelectionDisplayProps;
     module: ControlBarUIModule;
 }>) => import("react/jsx-runtime").JSX.Element;
+export declare const setBounds: (currentShareId: string, currentShareType: AgoraRtcScreenCaptureType, currentShareBounds: CurrentShareBounds, browserWindow: Electron.BrowserWindow, allApplicationWindows: AgoraRtcWindowInfo[]) => Promise<void>;

package/lib/modules/dialog/components/control-bar/index.js

@@ -1,12 +1,21 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.config = exports.ControlBarDialog = void 0;
+exports.setBounds = exports.config = exports.ControlBarDialog = void 0;
+require("core-js/modules/web.timers.js");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _constant = require("../../../../utilities/constant");
+var _tools = require("../../../../utilities/tools");
 var _useElectron = require("../../hooks/useElectron");
+var _react = require("react");
+var _store = require("../../store");
+var _platform = require("../../../../utilities/platform");
+var _mobxReact = require("mobx-react");
 var _jsxRuntime = require("react/jsx-runtime");
 var config = exports.config = {
   y: 0,
@@ -22,20 +31,124 @@ var config = exports.config = {
   type: 'panel',
   skipTaskbar: true
 };
-var ControlBarDialog = exports.ControlBarDialog = function ControlBarDialog(props) {
+var ControlBarDialog = exports.ControlBarDialog = (0, _mobxReact.observer)(function (props) {
   var module = props.module,
     params = props.params;
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
+    currentShareId = _useContext.currentShareId,
+    currentShareType = _useContext.currentShareType,
+    deviceStore = _useContext.deviceStore,
+    currentShareBounds = _useContext.currentShareBounds;
   var children = function children(browserWindow) {
     return module.getComponent({
       params: params,
       browserWindow: browserWindow
     });
   };
-  (0, _useElectron.useElectronDialog)({
-    dialogKey: _constant.DialogKey.CONTROL_BAR,
-    config: config,
-    children: children,
-    hasCustomShadow: false
-  });
+  var _useElectronDialog = (0, _useElectron.useElectronDialog)({
+      dialogKey: _constant.FcrUIDialogKey.CONTROL_BAR,
+      config: config,
+      children: children,
+      hasCustomShadow: false,
+      onOpened: function onOpened(_ref) {
+        var browserWindow = _ref.browserWindow;
+        (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+          var allApplicationWindows;
+          return _regenerator["default"].wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return deviceStore.getWindowList();
+              case 2:
+                allApplicationWindows = _context.sent;
+                setBounds(params.currentShareId, params.currentShareType, params.currentShareBounds, browserWindow, allApplicationWindows);
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }))();
+      }
+    }),
+    browserWindow = _useElectronDialog.browserWindow;
+  (0, _react.useEffect)(function () {
+    (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var allApplicationWindows;
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return deviceStore.getWindowList();
+          case 2:
+            allApplicationWindows = _context2.sent;
+            browserWindow && setBounds(currentShareId, currentShareType, currentShareBounds, browserWindow, allApplicationWindows);
+          case 4:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }))();
+  }, [currentShareId]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
-};
+});
+var setBounds = exports.setBounds = /*#__PURE__*/function () {
+  var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(currentShareId, currentShareType, currentShareBounds, browserWindow, allApplicationWindows) {
+    var _getCurrentSharingWor, originWidth, originHeight, x, y, WINDOWS_SCREEN_BOUNDARY_WIDTH, width, height, firstBounds;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _getCurrentSharingWor = (0, _tools.getCurrentSharingWorkArea)({
+            currentShareId: currentShareId,
+            currentShareType: currentShareType,
+            allApplicationWindows: allApplicationWindows,
+            currentShareBounds: currentShareBounds
+          }), originWidth = _getCurrentSharingWor.width, originHeight = _getCurrentSharingWor.height, x = _getCurrentSharingWor.x, y = _getCurrentSharingWor.y;
+          /* 使用window.screen.availWidth在windows上会黑屏，详见jira:APAAS-5732
+                怀疑是在windows上BrowserWindow有一个边框，所以需要减去一定的宽度。
+                实验结果最低是4。这里减去10留一点buffer，防止其他操作系统的边框不一致。
+                */
+          WINDOWS_SCREEN_BOUNDARY_WIDTH = 10;
+          width = (0, _platform.isWindows)() ? originWidth - WINDOWS_SCREEN_BOUNDARY_WIDTH : originWidth;
+          height = originHeight; // 重新设置窗口大小
+          if ((0, _platform.isWindows)()) {
+            // 修复 windows 分辨率差别大的多显示器场景下的窗口缩放问题
+            browserWindow === null || browserWindow === void 0 || browserWindow.setBounds({
+              x: x,
+              y: y,
+              width: width,
+              height: height
+            });
+            firstBounds = browserWindow.getBounds();
+            browserWindow.setBounds({
+              x: firstBounds.x === 0 ? 0 : -firstBounds.x,
+              y: firstBounds.y === 0 ? 0 : -firstBounds.y,
+              width: width,
+              height: height
+            });
+          }
+          setTimeout(function () {
+            browserWindow === null || browserWindow === void 0 || browserWindow.setBounds({
+              x: x,
+              y: y,
+              width: originWidth,
+              height: originHeight
+            });
+            browserWindow === null || browserWindow === void 0 || browserWindow.setMaximumSize(originWidth, originHeight);
+            browserWindow.focus();
+          }, 100);
+          setTimeout(function () {
+            browserWindow === null || browserWindow === void 0 || browserWindow.setBounds({
+              width: originWidth,
+              height: originHeight
+            });
+          }, 100);
+        case 7:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function setBounds(_x, _x2, _x3, _x4, _x5) {
+    return _ref4.apply(this, arguments);
+  };
+}();

package/lib/modules/dialog/components/device-setting/electron.js

@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DeviceSettingElectronDialog = void 0;
+var _i18n = require("agora-ui-foundation/lib/i18n");
 var _constant = require("../../../../utilities/constant");
 var _useElectron = require("../../hooks/useElectron");
 var DeviceSettingElectronDialog = exports.DeviceSettingElectronDialog = function DeviceSettingElectronDialog(_ref) {
   var children = _ref.children;
+  var transI18n = (0, _i18n.useI18n)();
   var config = {
     fullscreen: false,
     maximizable: false,
@@ -21,9 +23,11 @@ var DeviceSettingElectronDialog = exports.DeviceSettingElectronDialog = function
     minWidth: 580,
     minHeight: 600,
     maxWidth: 670,
-    maxHeight: 800
+    maxHeight: 800,
+    title: transI18n('fmt_settings_option_setting'),
+    resizable: false
   };
-  var dialogKey = _constant.DialogKey.DEVICE_SETTINGS;
+  var dialogKey = _constant.FcrUIDialogKey.DEVICE_SETTINGS;
   (0, _useElectron.useElectronDialog)({
     dialogKey: dialogKey,
     config: config,

package/lib/modules/dialog/components/device-setting/index.js

@@ -11,7 +11,7 @@ var _electron = require("./electron");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 require("./index.css");
 var _constant = require("../../../../utilities/constant");
-var _dialogContainer = _interopRequireDefault(require("../../../components/dialog-container"));
+var _dialogContainer = _interopRequireDefault(require("../dialog-container"));
 var _jsxRuntime = require("react/jsx-runtime");
 var DeviceSettingDialog = function DeviceSettingDialog(_ref) {
   var children = _ref.children;
@@ -20,7 +20,7 @@ var DeviceSettingDialog = function DeviceSettingDialog(_ref) {
     title: t('fmt_modules_labels_devicesettings'),
     width: 580,
     height: 556,
-    dialogKey: _constant.DialogKey.DEVICE_SETTINGS,
+    dialogKey: _constant.FcrUIDialogKey.DEVICE_SETTINGS,
     children: children
   });
   if ((0, _env.isElectron)()) {

package/lib/modules/dialog/components/dialog-container/component/body.js

@@ -0,0 +1,75 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.push.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/es.object.to-string.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.DialogContainerBody = DialogContainerBody;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+require("core-js/modules/es.function.bind.js");
+var _react = require("react");
+require("../index.css");
+var _env = require("agora-foundation/lib/utilities/env");
+var _ = require("..");
+var _useElectron = require("../../../hooks/useElectron");
+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; }
+function DialogContainerBody(props) {
+  var actions = props.actions,
+    title = props.title,
+    children = props.children,
+    onClick = props.onClick;
+  var _useContext = (0, _react.useContext)(_.DialogContainerStore),
+    bind = _useContext.bind;
+  var _ref = (0, _env.isElectron)() ? (0, _react.useContext)(_useElectron.DialogInstanceContext) : {
+      resizable: false
+    },
+    resizable = _ref.resizable;
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "fcr-dialog-container ".concat(!resizable && 'fcr-dialog-container_shadow'),
+    onClick: function onClick(e) {
+      return e.stopPropagation();
+    },
+    children: [(title || actions) && /*#__PURE__*/(0, _jsxRuntime.jsxs)("header", _objectSpread(_objectSpread({
+      className: "fcr-dialog-container-header"
+    }, bind === null || bind === void 0 ? void 0 : bind()), {}, {
+      children: [actions && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        style: {
+          flex: 1
+        }
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
+        children: title
+      }), actions && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "fcr-dialog-container-actions",
+        children: actions
+      })]
+    })), /*#__PURE__*/(0, _jsxRuntime.jsx)("section", {
+      className: "fcr-dialog-container-content",
+      style: title || actions ? {
+        height: resizable ? 'calc(100% - 46px)' /* 当窗口需要拉伸时，会传值为 false 的 hasCustomShadow 过来，高度不需要自适应，所以内容区高度为 100vh 减去 title 高度 46px */ : !(0, _env.isElectron)() ? 'calc(100% - 46px)' /* 浏览器不需要减去阴影，高度需要 100% 减去 46px title */ : 'calc(100vh - 76px)' /* 76px 包含 46px 的 title 高度，和 30px 的阴影 */
+      } : {},
+      children: children
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
+      className: "fcr-dialog-container-close",
+      onClick: onClick,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: "\xD7"
+      })
+    })]
+  });
+}

package/lib/modules/{components → dialog/components}/dialog-container/index.css

@@ -1,13 +1,16 @@
 .fcr-dialog-container {
   background: var(--fcr_mobile_ui_scene_color_popup_fill2);
-  border: 1px solid var(--fcr_ui_scene_line1);
-  box-shadow: var(--fcr_web_light_dropup);
-  border-radius: var(--fcr_cornerradius_xl);
   position: relative;
   flex: 1;
   width: 100%;
 }
 
+.fcr-dialog-container_shadow {
+  box-shadow: var(--fcr_web_light_dropup);
+  border: 1px solid var(--fcr_ui_scene_line1);
+  border-radius: var(--fcr_cornerradius_xl);
+}
+
 .fcr-dialog-container-header {
   width: 100%;
   height: 46px;

package/lib/modules/{components → dialog/components}/dialog-container/index.d.ts

@@ -1,11 +1,16 @@
 import { PropsWithChildren } from 'react';
-import { DialogKey } from '../../../utilities/constant';
+import { FcrUIDialogKey } from '../../../../utilities/constant';
+import React from 'react';
+export declare const DialogContainerStore: React.Context<{
+    bind: () => object;
+}>;
 declare const DialogContainer: (props: PropsWithChildren<{
     width?: number;
     height?: number;
-    dialogKey: DialogKey;
+    dialogKey: FcrUIDialogKey;
     title?: string;
     onClose?: () => void;
+    closeInterception?: () => boolean;
     actions?: React.ReactNode;
 }>) => import("react/jsx-runtime").JSX.Element;
 export default DialogContainer;