fcr-ui-scene 3.8.1 → 3.9.0-alpha

package/lib/providers/window/provider.js

@@ -75,7 +75,7 @@ var FcrUIWindowProviderImpl = exports.FcrUIWindowProviderImpl = /*#__PURE__*/fun
       prefix: 'FcrUIWindowProvider'
     })));
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
-    (0, _defineProperty2["default"])(this, "_windows", new Map());
+    (0, _defineProperty2["default"])(this, "_windowWithObserverMap", new Map());
     (0, _defineProperty2["default"])(this, "_windowOptions", new Map());
     this._renderer = renderer;
     this._currentWindow = new _mainWindow.FcrUICurrentWindowImpl(renderer);
@@ -96,7 +96,7 @@ var FcrUIWindowProviderImpl = exports.FcrUIWindowProviderImpl = /*#__PURE__*/fun
     value: function hasWindow(key) {
       var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : key;
       var index = "".concat(key, "-").concat(id);
-      return this._windows.has(index);
+      return this._windowWithObserverMap.has(index);
     }
   }, {
     key: "getCurrentWindow",
@@ -111,22 +111,30 @@ var FcrUIWindowProviderImpl = exports.FcrUIWindowProviderImpl = /*#__PURE__*/fun
   }, {
     key: "getWindowById",
     value: function getWindowById(key) {
-      var _this = this;
+      var _this$_windowWithObse,
+        _this = this;
       var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : key;
       if (!id) {
         throw new Error('window id is required');
       }
       var index = "".concat(key, "-").concat(id);
-      var windowImpl = this._windows.get(index);
+      var windowImpl = (_this$_windowWithObse = this._windowWithObserverMap.get(index)) === null || _this$_windowWithObse === void 0 ? void 0 : _this$_windowWithObse.window;
       if (!windowImpl) {
         var options = this._windowOptions.get(key);
         windowImpl = new _rendererWindow.FcrUIWindowImpl(key, this._renderer, options);
-        windowImpl.addObserver({
+        var windowObserver = {
+          onReady: function onReady() {
+            _this._observable.notifyObservers('onWindowReady', key, id, windowImpl);
+          },
           onClosed: function onClosed() {
             _this._handleWindowClosed(index);
           }
+        };
+        windowImpl.addObserver(windowObserver);
+        this._windowWithObserverMap.set(index, {
+          window: windowImpl,
+          windowObserver: windowObserver
         });
-        this._windows.set(index, windowImpl);
         this.logger.info("created FcrUIWindow wrapper for ".concat(index, ", options: ").concat((0, _misc.jsonstring)(options)));
         this._observable.notifyObservers('onWindowCreated', key, id, windowImpl);
       }
@@ -140,17 +148,20 @@ var FcrUIWindowProviderImpl = exports.FcrUIWindowProviderImpl = /*#__PURE__*/fun
     key: "release",
     value: function release() {
       this._currentWindow.release();
-      this._windows.forEach(function (window) {
-        window.release();
+      this._windowWithObserverMap.forEach(function (windowWithObserver) {
+        windowWithObserver.window.removeObserver(windowWithObserver.windowObserver);
+        windowWithObserver.window.release();
       });
-      this._windows.clear();
+      this._windowWithObserverMap.clear();
     }
   }, {
     key: "_handleWindowClosed",
     value: function _handleWindowClosed(index) {
-      var window = this._windows.get(index);
-      if (window) {
-        this._windows["delete"](index);
+      var windowWithObserver = this._windowWithObserverMap.get(index);
+      if (windowWithObserver) {
+        windowWithObserver.window.removeObserver(windowWithObserver.windowObserver);
+        windowWithObserver.window.release();
+        this._windowWithObserverMap["delete"](index);
       }
 
       // this.logger.info(`window ${index} closed and removed from provider`);

package/lib/providers/window/renderer-window.d.ts

@@ -1,7 +1,9 @@
-import { FcrUIWindow, FcrUIWindowBounds, FcrUIWindowObjectObserver, FcrUIWindowOptions, FcrUIWindowShowOptions } from './type';
+import { FcrUIWindow, FcrUIWindowBounds, FcrUIWindowObjectObserver, FcrUIWindowShowOptions } from './type';
 import { FcrUIManagedObject } from '../../object-manager';
 import { FcrUIRendererWrapper } from '../../utilities/renderer';
 import { BrowserWindowProxy } from '../../runtime';
+import { FcrUIDialogKey } from '../../utilities/constant';
+import { FcrUIElectronDialogConfig } from '../../modules/dialog/dialogConfig/electron';
 /**
  * FcrUIWindow的实现类，封装Electron BrowserWindow
  */
@@ -20,6 +22,7 @@ export declare class FcrUIWindowImpl implements FcrUIWindow, FcrUIManagedObject
     private _ignoreMouseEvents?;
     private _ignoreMouseEventsOptions?;
     private _alwaysOnTop?;
+    private _defaultWindowsAlwaysOnTopLevel;
     private _alwaysOnTopLevel?;
     private _relativeLevel?;
     private _visibleOnAllWorkspaces?;
@@ -37,7 +40,7 @@ export declare class FcrUIWindowImpl implements FcrUIWindow, FcrUIManagedObject
     private _resizeObserver?;
     private _browserWindowListeners;
     private _rootNode;
-    constructor(windowName: string, renderer: FcrUIRendererWrapper, options?: FcrUIWindowOptions);
+    constructor(windowName: FcrUIDialogKey, renderer: FcrUIRendererWrapper, windowOptions?: FcrUIElectronDialogConfig);
     setResizable(resizable: boolean): void;
     setAspectRatio(aspectRatio: number): void;
     setMinimumSize(width: number, height: number): void;
@@ -81,5 +84,8 @@ export declare class FcrUIWindowImpl implements FcrUIWindow, FcrUIManagedObject
     release(): void;
     private _setupEventListeners;
     private _synBrowserWindowStateToInnerState;
+    private _setWindowInitialSize;
+    private _addDialogContentResizeObserver;
+    private _removeDialogContentResizeObserver;
     private _addLogObserver;
 }

package/lib/providers/window/renderer-window.js

@@ -2,21 +2,36 @@
 
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.iterator.js");
 require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.from.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.array.slice.js");
 require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.date.to-string.js");
 require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.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/es.regexp.exec.js");
+require("core-js/modules/es.regexp.test.js");
+require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/esnext.function.metadata.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/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -32,6 +47,7 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -50,8 +66,15 @@ var _observable = require("agora-foundation/lib/utilities/observable");
 var _log = require("agora-foundation/lib/decorator/log");
 var _logger = require("../../utilities/logger");
 var _isBoolean = _interopRequireDefault(require("lodash/isBoolean"));
+var _electron = require("../../modules/dialog/dialogConfig/electron");
+var _env = require("agora-foundation/lib/utilities/env");
 var _FcrUIWindowImpl;
 var _initProto;
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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 _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -63,7 +86,7 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
   function FcrUIWindowImpl(windowName, renderer) {
     var _this = this;
-    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var windowOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     (0, _classCallCheck2["default"])(this, FcrUIWindowImpl);
     (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUIWindowImpl'
@@ -78,6 +101,7 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_isClosed", false);
     // inner state
     (0, _defineProperty2["default"])(this, "_isBrowserWindowReady", false);
+    (0, _defineProperty2["default"])(this, "_defaultWindowsAlwaysOnTopLevel", 'pop-up-menu');
     (0, _defineProperty2["default"])(this, "_isReleased", false);
     (0, _defineProperty2["default"])(this, "_browserWindowListeners", {
       onShow: function onShow() {
@@ -96,21 +120,23 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
         _this._observable.notifyObservers('onClose');
       },
       onClosed: function onClosed() {
-        _this.rootNode.remove();
         _this.browserWindow.hide();
-        _this.browserWindowProxy.destroy();
         _this._observable.notifyObservers('onClosed');
-        _this._rendererWindow = null;
-        _this._rootNode = null;
-        _this._browserWindowProxy = null;
-        if (_this._resizeObserver) {
-          _this._resizeObserver.disconnect();
-          _this._resizeObserver = undefined;
-        }
       }
     });
     (0, _defineProperty2["default"])(this, "_rootNode", null);
+    var options = _objectSpread(_objectSpread({}, _electron.defaultElectronWindowConfig), windowOptions);
     this._renderer = renderer;
+    this._alwaysOnTop = options.alwaysOnTop;
+    /** Workaround: 
+         现象: windows 环境下 setAlwaysOnTop(flag, level, relativeLevel);
+              当传递flag 为true时 必须传递第二个level为'pop-up-menu' 才会将渲染窗口 置于主窗口上方
+       修复方案：windows 环境下 alwaysOnTop为true 主动将alwaysOnTopLevel 置为'pop-up-menu'
+              待后续dialog 层级管理优化后 移除该修复方案
+     */
+    if (this._alwaysOnTop && (0, _env.isWindows)()) {
+      this._alwaysOnTopLevel = this._defaultWindowsAlwaysOnTopLevel;
+    }
     this._renderer.openRendererWindow(windowName, function (dom, windowId, rendererWindow) {
       var renderer = _this._renderer;
       _this._isBrowserWindowReady = true;
@@ -123,26 +149,17 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
       _this._browserWindowProxy = renderer.createWindowProxy(windowId);
       _this._setupEventListeners();
       _this._synBrowserWindowStateToInnerState();
-      _this._observable.notifyObservers('onReady');
-      if (options.needResizeObserver && _this._rootNode) {
-        // @ts-ignore
-        _this._resizeObserver = new _this.rendererWindow.ResizeObserver(function () {
-          if (_this._rootNode) {
-            var bounds = _this._rootNode.getBoundingClientRect();
-            _this.setBounds({
-              x: _this.getBounds().x,
-              y: _this.getBounds().y,
-              width: bounds.width,
-              height: bounds.height
-            });
-          }
-        });
-        // @ts-ignore
-        _this._resizeObserver.observe(_this._rootNode);
+      if (options.needResizeObserver) {
+        _this._setWindowInitialSize(options);
+        _this._addDialogContentResizeObserver(options);
       }
+      _this._observable.notifyObservers('onReady');
     }, options);
     this._addLogObserver();
     this._rootNode = document.createElement('div');
+    if (!options.resizable && !options.width && !options.height) {
+      this._rootNode.style.display = 'inline-flex';
+    }
     this.logger.info("initialized, windowName: ".concat(windowName));
   }
   return (0, _createClass2["default"])(FcrUIWindowImpl, [{
@@ -301,6 +318,9 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
     value: function setAlwaysOnTop(flag, level, relativeLevel) {
       this._alwaysOnTop = flag;
       this._alwaysOnTopLevel = level;
+      if ((0, _env.isWindows)() && flag) {
+        this._alwaysOnTopLevel = level !== null && level !== void 0 ? level : this._defaultWindowsAlwaysOnTopLevel;
+      }
       this._relativeLevel = relativeLevel;
       if (this._isBrowserWindowReady) {
         this.browserWindow.setAlwaysOnTop(flag, level, relativeLevel);
@@ -439,16 +459,12 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
   }, {
     key: "release",
     value: function release() {
-      if (this._resizeObserver) {
-        this._resizeObserver.disconnect();
-        this._resizeObserver = undefined;
-      }
-      if (this._browserWindowProxy && !this._browserWindowProxy.isDestroyed()) {
-        this._browserWindowProxy.removeAllListeners();
-      }
+      this._removeDialogContentResizeObserver();
       this._rendererWindow = null;
+      this.rootNode.remove();
       this._rootNode = null;
       if (this._browserWindowProxy) {
+        this._browserWindowProxy.removeAllListeners();
         this._browserWindowProxy.destroy();
         this._browserWindowProxy = null;
       }
@@ -567,6 +583,75 @@ var FcrUIWindowImpl = exports.FcrUIWindowImpl = /*#__PURE__*/function () {
         this.browserWindow.setFullScreen(this._fullscreen);
       }
     }
+  }, {
+    key: "_setWindowInitialSize",
+    value: function _setWindowInitialSize(options) {
+      var width = options.width,
+        height = options.height,
+        resizable = options.resizable;
+      if (!width || !height) {
+        if (this._rootNode) {
+          var _this$_rootNode$getBo = this._rootNode.getBoundingClientRect(),
+            elementWidth = _this$_rootNode$getBo.width,
+            elementHeight = _this$_rootNode$getBo.height;
+          this.setBounds({
+            x: this.getBounds().x,
+            y: this.getBounds().y,
+            width: Math.ceil(width ? width : elementWidth),
+            height: Math.ceil(height ? height : elementHeight)
+          });
+          if (resizable) {
+            this._rootNode.style.display = 'block';
+          }
+        }
+      }
+    }
+  }, {
+    key: "_addDialogContentResizeObserver",
+    value: function _addDialogContentResizeObserver(options) {
+      var _this2 = this;
+      var width = options.width,
+        height = options.height,
+        needResizeObserver = options.needResizeObserver,
+        resizable = options.resizable;
+      if (needResizeObserver && (!width || !height) && !resizable) {
+        if (!this._resizeObserver && this._rootNode) {
+          this._resizeObserver = new ResizeObserver(function (entries) {
+            var _iterator = _createForOfIteratorHelper(entries),
+              _step;
+            try {
+              for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                var entry = _step.value;
+                var _entry$contentRect = entry.contentRect,
+                  newWidth = _entry$contentRect.width,
+                  newHeight = _entry$contentRect.height;
+                _this2.setBounds({
+                  x: _this2.getBounds().x,
+                  y: _this2.getBounds().y,
+                  width: Math.ceil(width ? width : newWidth),
+                  height: Math.ceil(height ? height : newHeight)
+                });
+              }
+            } catch (err) {
+              _iterator.e(err);
+            } finally {
+              _iterator.f();
+            }
+          });
+          this._resizeObserver.observe(this._rootNode);
+        } else {
+          this.logger.error('root node is not initialized yet.');
+        }
+      }
+    }
+  }, {
+    key: "_removeDialogContentResizeObserver",
+    value: function _removeDialogContentResizeObserver() {
+      if (this._resizeObserver) {
+        this._resizeObserver.disconnect();
+        this._resizeObserver = undefined;
+      }
+    }
   }, {
     key: "_addLogObserver",
     value: function _addLogObserver() {

package/lib/providers/window/type.d.ts

@@ -110,6 +110,7 @@ export interface FcrUICurrentWindow {
 }
 export interface FcrUIWindowObserver {
     onWindowCreated?(key: FcrUIDialogKey, id: string, window: FcrUIWindow): void;
+    onWindowReady?(key: FcrUIDialogKey, id: string, window: FcrUIWindow): void;
 }
 export interface FcrUIWindowProvider {
     hasWindow(key: FcrUIDialogKey, id?: string): boolean;
@@ -122,6 +123,3 @@ export interface FcrUIWindowProvider {
 export type FcrUIWindowProviderConstructorArgs = {
     renderer: FcrUIRendererWrapper;
 };
-export type FcrUIWindowOptions = {
-    needResizeObserver?: boolean;
-} & Electron.BrowserWindowConstructorOptions;

package/lib/runtime.d.ts

@@ -14,32 +14,29 @@ export interface RendererCustomEvent {
 export interface CpuInfo {
     model: string;
 }
-interface WindowManagerIRectangle {
-    x?: number;
-    y?: number;
-    width?: number;
-    height?: number;
-}
 export type WindowInfo = {
     id: number;
-    processId: number;
-    getBounds(): WindowManagerIRectangle;
-    setBounds(bounds: WindowManagerIRectangle): void;
+    getBounds(): Electron.Rectangle;
     getTitle(): string;
 };
 export interface BrowserWindowProxy {
+    /**
+     * 窗口标识 ID，BrowserWindow.id
+     */
     get windowId(): string;
+    /**
+     * 窗口代理标识 ID，窗口代理对象唯一标识，窗口在不同时间创建的代理对象 proxyId 不同
+     */
+    get proxyId(): string;
     /**
      * 检查窗口是否已销毁
      */
     isDestroyed(): boolean;
     /**
-     * 窗口设置方法
+     * 设置是否阻止窗口关闭
+     * @param prevent
      */
     setPreventClose(prevent: boolean): Promise<void>;
-    /**
-     * 事件监听方法
-     */
     addListener(event: string, listener: Function): void;
     removeListener(event: string, listener: Function): void;
     removeAllListeners(event?: string): void;
@@ -90,11 +87,13 @@ export interface Runtime {
     getAllDisplays(): Electron.Display[];
     getPrimaryDisplay(): Electron.Display;
     getDisplayNearestPoint(point: Electron.Point): Electron.Display;
+    getWindowInfoList(): WindowInfo[];
 }
 export interface CppSdkHelper {
     getLaunchOptions?(): Promise<Record<string, any>>;
     launch?(options: any): void;
     setInMeetingState(state: 0 | 1): void;
+    setMainWindowDisplaySupport(isSupported: boolean): void;
     getBundleType(): Promise<'JS_BUNDLE' | 'NATIVE_BUNDLE'>;
     onCreatorInit?: (initOptions: any) => void;
     onSettingOpen?: () => void;