@lynker-desktop/electron-window-manager 0.0.9-alpha.3 → 0.0.9-alpha.30

package/main/index.js

@@ -69,30 +69,50 @@ class WindowsManager {
      *   - 不带点的（如 example.com）只匹配主域名。
      *   - 'localhost'、'127.0.0.1'、'::1' 以及局域网 IP（如 192.168.x.x、10.x.x.x、172.16.x.x~172.31.x.x）都视为本地白名单。
      */
-    constructor(preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl, webviewDomainWhiteList) {
+    constructor(preload, loadingViewUrl, errorViewUrl, preloadWebContentsConfig, webviewDomainWhiteList) {
+        // 预加载的窗口
         this.preloadedBW = null;
+        // 预加载的窗口（无边框，有按钮）
         this.preloadedBW_FramelessWithButtons = null;
+        // 预加载的窗口（无边框，无按钮）
         this.preloadedBW_FramelessNoButtons = null;
+        // 预加载的浏览器视图
         this.preloadedBV = null;
         this.preloading = false;
         this.webviewDomainWhiteList = [];
+        // 创建队列相关属性
+        this.createQueue = [];
+        this.isCreating = false;
+        /**
+         * 防抖的排序方法
+         * @param window 目标窗口
+         */
+        this.sortBrowserViewsDebounced = lodash.debounce((window, view) => {
+            this._sortBrowserViews(window, view);
+        }, 50);
         this.preload = preload;
         this.windows = new Map();
         this.loadingViewUrl = `${loadingViewUrl ?? ''}`;
         this.errorViewUrl = `${errorViewUrl ?? ''}`;
-        this.preloadWebContentsUrl = `${preloadWebContentsUrl ?? ''}`;
+        this.preloadWebContentsConfig = preloadWebContentsConfig;
         this.webviewDomainWhiteList = webviewDomainWhiteList || [];
-        log('log', 'preloadWebContentsUrl: ', this.preloadWebContentsUrl);
-        if (this.preloadWebContentsUrl) {
-            electron.app.on('ready', () => {
-                this._preloadInstances();
+        log('log', 'preloadWebContentsConfig: ', this.preloadWebContentsConfig);
+        if (this.preloadWebContentsConfig) {
+            electron.app.whenReady().then(() => {
+                if (this.preloadWebContentsConfig) {
+                    this.setPreloadWebContentsConfig(this.preloadWebContentsConfig);
+                }
             });
         }
     }
-    setPreloadWebContentsUrl(preloadWebContentsUrl) {
+    /**
+     * 设置预加载的webContents配置
+     * @param preloadWebContentsConfig 预加载的webContents配置
+     */
+    setPreloadWebContentsConfig(preloadWebContentsConfig) {
         try {
-            this.preloadWebContentsUrl = preloadWebContentsUrl;
-            if (this.preloadWebContentsUrl) {
+            this.preloadWebContentsConfig = preloadWebContentsConfig;
+            if (this.preloadWebContentsConfig) {
                 this._preloadInstances();
             }
             else {
@@ -103,27 +123,65 @@ class WindowsManager {
             }
         }
         catch (error) {
-            log('error', 'setPreloadWebContentsUrl error:', error);
+            log('error', 'setPreloadWebContentsConfig error:', error);
         }
     }
+    /**
+     * 预加载实例
+     */
     async _preloadInstances() {
         if (this.preloading)
             return;
         this.preloading = true;
         try {
-            if (this.preloadWebContentsUrl) {
-                this.preloadedBW = this.preloadedBW || await this._createPreloadBW({});
-                this.preloadedBW_FramelessWithButtons = this.preloadedBW_FramelessWithButtons || await this._createPreloadBW({
-                    frame: false,
-                    transparent: true,
-                    titleBarStyle: 'hidden',
-                });
-                this.preloadedBW_FramelessNoButtons = this.preloadedBW_FramelessNoButtons || await this._createPreloadBW({
-                    frame: false,
-                    transparent: true,
-                    titleBarStyle: 'customButtonsOnHover',
-                });
-                this.preloadedBV = this.preloadedBV || await this._createPreloadBV();
+            if (this.preloadWebContentsConfig) {
+                log('log', 'preloadWebContentsConfig: ', this.preloadWebContentsConfig);
+                // 根据配置决定是否预加载普通窗口
+                if (this.preloadWebContentsConfig.enableBW !== false) {
+                    if (!this.preloadedBW) {
+                        this._createPreloadBW({}).then(i => {
+                            this.preloadedBW = i;
+                            log('log', 'init preloadedBW: ', !!this.preloadedBW);
+                        });
+                    }
+                }
+                // 根据配置决定是否预加载无边框有按钮的窗口
+                if (this.preloadWebContentsConfig.enableBW_FramelessWithButtons !== false) {
+                    if (!this.preloadedBW_FramelessWithButtons) {
+                        this._createPreloadBW({
+                            frame: false,
+                            // transparent: true,
+                            autoHideMenuBar: true,
+                            titleBarStyle: 'hidden',
+                        }).then(i => {
+                            this.preloadedBW_FramelessWithButtons = i;
+                            log('log', 'init preloadedBW_FramelessWithButtons: ', !!this.preloadedBW_FramelessWithButtons);
+                        });
+                    }
+                }
+                // 根据配置决定是否预加载无边框无按钮的窗口
+                if (this.preloadWebContentsConfig.enableBW_FramelessNoButtons !== false) {
+                    if (!this.preloadedBW_FramelessNoButtons) {
+                        this._createPreloadBW({
+                            frame: false,
+                            // transparent: true,
+                            autoHideMenuBar: true,
+                            titleBarStyle: 'default',
+                        }).then(i => {
+                            this.preloadedBW_FramelessNoButtons = i;
+                            log('log', 'init preloadedBW_FramelessNoButtons: ', !!this.preloadedBW_FramelessNoButtons);
+                        });
+                    }
+                }
+                // 根据配置决定是否预加载浏览器视图
+                if (this.preloadWebContentsConfig.enableBV !== false) {
+                    if (!this.preloadedBV) {
+                        this._createPreloadBV().then(i => {
+                            this.preloadedBV = i;
+                            log('log', 'init preloadedBV: ', !!this.preloadedBV);
+                        });
+                    }
+                }
             }
         }
         catch (e) {
@@ -131,23 +189,32 @@ class WindowsManager {
         }
         this.preloading = false;
     }
+    /**
+     * 创建预加载的窗口
+     * @param options 窗口选项
+     * @returns 预加载的窗口
+     */
     _createPreloadBW(options = {}) {
         return new Promise((resolve) => {
             const preload = this.preload;
-            const url = this.preloadWebContentsUrl;
-            if (this.preloadWebContentsUrl) {
+            const url = this.preloadWebContentsConfig?.url;
+            if (this.preloadWebContentsConfig?.url) {
+                const webPreferences = (options.webPreferences || {});
                 const instance = new electron.BrowserWindow({
+                    useContentSize: true,
                     show: false,
+                    backgroundColor: '#ffffff',
                     ...options,
                     webPreferences: {
+                        ...webPreferences,
                         webviewTag: true,
                         plugins: true,
                         nodeIntegration: true,
                         contextIsolation: false,
                         backgroundThrottling: false,
                         webSecurity: false,
-                        preload: preload,
-                        ...(options.webPreferences || {}),
+                        preload: webPreferences.preload || preload,
+                        defaultEncoding: 'utf-8',
                     }
                 });
                 try {
@@ -164,31 +231,42 @@ class WindowsManager {
                     log('error', '预加载 BW 设置 _id 失败', error);
                 }
                 // @ts-ignore
-                log('log', '创建预BW: ', instance._id, this.preloadWebContentsUrl);
-                instance.webContents.once('did-finish-load', () => {
-                    resolve(instance);
-                });
-                instance.webContents.once('did-fail-load', () => {
-                    resolve(instance);
-                });
-                instance.loadURL(url || 'about:blank');
+                log('log', '创建预BW: ', instance._id, this.preloadWebContentsConfig?.url);
+                // instance.webContents.once('did-finish-load', () => {
+                //   resolve(instance as BWItem);
+                // });
+                // instance.webContents.once('did-fail-load', () => {
+                //   resolve(instance as BWItem);
+                // });
+                instance.loadURL(url ? `${url}` : 'about:blank');
+                resolve(instance);
+            }
+            else {
+                resolve(null);
             }
         });
     }
-    _createPreloadBV() {
+    /**
+     * 创建预加载的浏览器视图
+     * @returns 预加载的浏览器视图
+     */
+    _createPreloadBV(options = {}) {
         return new Promise((resolve) => {
             const preload = this.preload;
-            const url = this.preloadWebContentsUrl;
-            if (this.preloadWebContentsUrl) {
+            const url = this.preloadWebContentsConfig?.url;
+            if (this.preloadWebContentsConfig?.url) {
+                const webPreferences = (options.webPreferences || {});
                 const instance = new electron.BrowserView({
                     webPreferences: {
+                        ...webPreferences,
                         webviewTag: true,
                         plugins: true,
                         nodeIntegration: true,
                         contextIsolation: false,
                         // backgroundThrottling: false,
                         webSecurity: false,
-                        preload: preload,
+                        preload: webPreferences.preload || preload,
+                        defaultEncoding: 'utf-8',
                     }
                 });
                 try {
@@ -200,61 +278,130 @@ class WindowsManager {
                 try {
                     // @ts-ignore
                     instance._id = instance.webContents.id;
+                    // 设置默认zIndex层级
+                    instance._zIndex = 0;
                 }
                 catch (error) {
                     log('error', '预加载 BV 设置 _id 失败', error);
                 }
                 // @ts-ignore
-                log('log', '创建预BV: ', instance._id, this.preloadWebContentsUrl);
-                instance.webContents.once('did-finish-load', () => {
-                    resolve(instance);
-                });
-                instance.webContents.once('did-fail-load', () => {
-                    resolve(instance);
-                });
+                log('log', '创建预BV: ', instance._id, this.preloadWebContentsConfig?.url);
+                // instance.webContents.once('did-finish-load', () => {
+                //   resolve(instance as BVItem);
+                // });
+                // instance.webContents.once('did-fail-load', () => {
+                //   resolve(instance as BVItem);
+                // });
                 instance.webContents.loadURL(url || 'about:blank');
+                resolve(instance);
+            }
+            else {
+                resolve(null);
             }
         });
     }
     create(options) {
+        return new Promise((resolve, reject) => {
+            // 将创建请求添加到队列
+            this.createQueue.push({ options, resolve, reject });
+            // 如果当前没有在创建，则开始处理队列
+            if (!this.isCreating) {
+                this.processCreateQueue();
+            }
+        });
+    }
+    /**
+     * 处理创建队列
+     */
+    async processCreateQueue() {
+        if (this.isCreating || this.createQueue.length === 0) {
+            return;
+        }
+        this.isCreating = true;
+        while (this.createQueue.length > 0) {
+            const { options, resolve, reject } = this.createQueue.shift();
+            try {
+                const window = await this._createWindow(options);
+                resolve(window);
+            }
+            catch (error) {
+                log('error', 'create window failed:', error);
+                reject(error);
+            }
+        }
+        this.isCreating = false;
+    }
+    /**
+     * 实际的窗口创建逻辑
+     */
+    async _createWindow(options) {
         let window;
-        const { usePreload = true, type = 'BW', name = 'anonymous', url, loadingView = { url: undefined }, errorView = { url: undefined }, browserWindow: browserWindowOptions, openDevTools = false, preventOriginClose = false, } = options;
+        const { usePreload = true, type = 'BW', name = 'anonymous', url, loadingView = { url: undefined }, errorView = { url: undefined }, browserWindow: browserWindowOptions, openDevTools = false, preventOriginClose = false, zIndex = 0, } = options;
         options.type = type;
         // 优先复用预创建实例
         let preloadWin = null;
-        if (type === 'BW' && usePreload && this.preloadWebContentsUrl) {
+        if (type === 'BW' && usePreload && this.preloadWebContentsConfig?.url) {
             const bwOptions = browserWindowOptions || {};
-            if (bwOptions.frame === false && bwOptions.titleBarStyle === 'hidden') {
-                preloadWin = this.preloadedBW_FramelessWithButtons;
-                this.preloadedBW_FramelessWithButtons = null;
-                setTimeout(() => this._createPreloadBW({ frame: false, transparent: true, titleBarStyle: 'hidden' }), 0);
-            }
-            else if (bwOptions.frame === false && bwOptions.titleBarStyle === 'customButtonsOnHover') {
-                preloadWin = this.preloadedBW_FramelessNoButtons;
-                this.preloadedBW_FramelessNoButtons = null;
-                setTimeout(() => this._createPreloadBW({ frame: false, transparent: true, titleBarStyle: 'customButtonsOnHover' }), 0);
+            if (bwOptions.frame === false) {
+                if (bwOptions.titleBarStyle === 'default' || !bwOptions.titleBarStyle) {
+                    if (this.preloadWebContentsConfig.enableBW_FramelessNoButtons !== false && this.preloadedBW_FramelessNoButtons) {
+                        preloadWin = this.preloadedBW_FramelessNoButtons;
+                        this.preloadedBW_FramelessNoButtons = await this._createPreloadBW({
+                            frame: false,
+                            // transparent: true,
+                            titleBarStyle: 'default',
+                            webPreferences: {
+                                preload: bwOptions?.webPreferences?.preload || this.preload,
+                            }
+                        });
+                    }
+                }
+                else {
+                    if (this.preloadWebContentsConfig.enableBW_FramelessWithButtons !== false && this.preloadedBW_FramelessWithButtons) {
+                        preloadWin = this.preloadedBW_FramelessWithButtons;
+                        this.preloadedBW_FramelessWithButtons = await this._createPreloadBW({
+                            frame: false,
+                            // transparent: true,
+                            titleBarStyle: 'hidden',
+                            webPreferences: {
+                                preload: this.preload,
+                            }
+                        });
+                    }
+                }
             }
             else {
-                preloadWin = this.preloadedBW;
-                this.preloadedBW = null;
-                setTimeout(() => this._createPreloadBW({}), 0);
+                if (this.preloadWebContentsConfig.enableBW !== false && this.preloadedBW) {
+                    preloadWin = this.preloadedBW;
+                    this.preloadedBW = await this._createPreloadBW({
+                        webPreferences: {
+                            preload: bwOptions?.webPreferences?.preload || this.preload,
+                        }
+                    });
+                }
             }
         }
-        if (type === 'BV' && usePreload && this.preloadWebContentsUrl) {
-            preloadWin = this.preloadedBV;
-            this.preloadedBV = null;
-            setTimeout(() => this._createPreloadBV(), 0);
+        if (type === 'BV' && usePreload && this.preloadWebContentsConfig?.url) {
+            const bvOptions = browserWindowOptions || {};
+            if (this.preloadWebContentsConfig.enableBV !== false && this.preloadedBV) {
+                preloadWin = this.preloadedBV;
+                this.preloadedBV = await this._createPreloadBV({
+                    webPreferences: {
+                        preload: bvOptions?.webPreferences?.preload || this.preload,
+                    }
+                });
+            }
         }
         if (preloadWin) {
             const win = preloadWin;
-            log('log', `${name} 使用预加载窗口`, win._id);
+            log('log', `${name} 使用预加载窗口(${type})`, win._id);
             win._type = 'BW';
             win._name = options.name || 'anonymous';
             win._extraData = `${options?.extraData || ''}`;
             win._initUrl = `${options?.url || ''}`;
             // @ts-ignore
-            win?.removeAllListeners && win?.removeAllListeners?.();
-            win.webContents.removeAllListeners && win.webContents.removeAllListeners();
+            // win?.removeAllListeners && win?.removeAllListeners?.();
+            // win.webContents.removeAllListeners && win.webContents.removeAllListeners();
             if (type === 'BW') {
                 // @ts-ignore
                 this._applyBrowserWindowOptions(win, options);
@@ -262,27 +409,79 @@ class WindowsManager {
             if (type === 'BV') {
                 this._applyBrowserViewOptions(win, options);
             }
+            if (typeof this.preloadWebContentsConfig?.customLoadURL === 'function') {
+                try {
+                    if (type === 'BW') {
+                        // @ts-ignore
+                        const originLoadURL = win.loadURL;
+                        // @ts-ignore
+                        win.loadURL = async (url) => {
+                            return new Promise(async (resolve, reject) => {
+                                try {
+                                    console.error('customLoadURL win.loadURL');
+                                    // @ts-ignore
+                                    await this.preloadWebContentsConfig.customLoadURL(url || 'about:blank', (url) => originLoadURL.call(win, url), win.webContents);
+                                    try {
+                                        win.emit('ready-to-show');
+                                    }
+                                    catch (error) {
+                                        log('error', 'emit ready-to-show event failed:', error);
+                                    }
+                                    resolve(undefined);
+                                }
+                                catch (error) {
+                                    reject(error);
+                                }
+                            });
+                        };
+                    }
+                    const originWebContentsLoadURL = win.webContents.loadURL;
+                    // @ts-ignore
+                    win.webContents.loadURL = async (url) => {
+                        return new Promise(async (resolve, reject) => {
+                            try {
+                                console.error('customLoadURL win.webContents.loadURL');
+                                // @ts-ignore
+                                await this.preloadWebContentsConfig.customLoadURL(url || 'about:blank', (url) => originWebContentsLoadURL.call(win.webContents, url), win.webContents);
+                                try {
+                                    win.webContents.emit('ready-to-show');
+                                }
+                                catch (error) {
+                                    log('error', 'emit ready-to-show event failed:', error);
+                                }
+                                resolve(undefined);
+                            }
+                            catch (error) {
+                                reject(error);
+                            }
+                        });
+                    };
+                }
+                catch (error) {
+                    console.error('customLoadURL error', error);
+                }
+            }
             window = win;
         }
         try {
-            try {
-                loadingView.url = `${loadingView?.url ?? this.loadingViewUrl}`;
-                lodash.merge(options, {
-                    loadingView,
-                });
-            }
-            catch (error) {
-                log('error', 'loadingView error:', loadingView, this.loadingViewUrl);
-            }
-            try {
-                errorView.url = `${errorView?.url ?? this.errorViewUrl}`;
-                lodash.merge(options, {
-                    errorView,
-                });
-            }
-            catch (error) {
-                log('error', 'errorView error:', errorView, this.errorViewUrl);
-            }
+            loadingView.url = `${loadingView?.url ?? this.loadingViewUrl}`;
+            lodash.merge(options, {
+                loadingView,
+            });
+        }
+        catch (error) {
+            log('error', 'loadingView error:', loadingView, this.loadingViewUrl);
+        }
+        try {
+            errorView.url = `${errorView?.url ?? this.errorViewUrl}`;
+            lodash.merge(options, {
+                errorView,
+            });
+        }
+        catch (error) {
+            log('error', 'errorView error:', errorView, this.errorViewUrl);
+        }
+        try {
             let parentWin = undefined;
             if (typeof browserWindowOptions?.parent === 'number') {
                 parentWin = electron.BrowserWindow.fromId(browserWindowOptions?.parent) || undefined;
@@ -310,6 +509,7 @@ class WindowsManager {
                             nativeWindowOpen: true,
                             webSecurity: false,
                             preload: preload,
+                            defaultEncoding: 'utf-8',
                         }, browserWindowOptions?.webPreferences || {})
                     }))
                     : new electron.BrowserWindow(lodash.merge({
@@ -326,6 +526,7 @@ class WindowsManager {
                             nativeWindowOpen: true,
                             webSecurity: false,
                             preload: preload,
+                            defaultEncoding: 'utf-8',
                         }, browserWindowOptions?.webPreferences || {})
                     }));
                 log('log', `${name} 不使用 ${type === 'BV' ? 'preloadedBV' : 'preloadedBW'}`, window?.webContents?.id);
@@ -336,6 +537,8 @@ class WindowsManager {
                     log('error', 'enable: ', error);
                 }
             }
+            // 停止加载
+            // window.webContents?.stop?.();
             // @ts-ignore
             try {
                 window.id = Number(`${window.id || window.webContents.id}`);
@@ -354,6 +557,8 @@ class WindowsManager {
             window._name = name;
             window._extraData = `${options?.extraData || ''}`;
             window._initUrl = `${options?.url || ''}`;
+            // 设置zIndex层级
+            window._zIndex = options.zIndex ?? 0;
             log('log', 'create 5: ', window.id, window._id, window._name);
             if (loadingView?.url) {
                 if (type === 'BW') {
@@ -364,7 +569,7 @@ class WindowsManager {
             if (errorView?.url) {
                 if (type === 'BW') {
                     const showErrorView = lodash.debounce(() => {
-                        const _url = window?.webContents?.getURL?.() || url;
+                        const _url = window._initUrl;
                         /**
                          * 判断是否是错误视图
                          */
@@ -378,16 +583,37 @@ class WindowsManager {
                 sessionStorage.setItem(key, "${_url}");
               `);
                         }
-                    }, 300);
+                    }, 1000);
                     // @ts-ignore
                     window.webContents.on('did-fail-load', (event, errorCode, errorDescription, validatedURL, isMainFrame) => {
                         if (isMainFrame) {
                             showErrorView();
                         }
                     });
+                    // 当开始加载时取消错误视图
                     window.webContents.on('did-start-loading', () => {
                         showErrorView.cancel();
                     });
+                    // 当导航开始时取消错误视图
+                    window.webContents.on('did-start-navigation', () => {
+                        showErrorView.cancel();
+                    });
+                    // 当页面重新加载时取消错误视图
+                    window.webContents.on('did-navigate', () => {
+                        showErrorView.cancel();
+                    });
+                    // 当页面完成加载时取消错误视图
+                    window.webContents.on('did-finish-load', () => {
+                        showErrorView.cancel();
+                    });
+                    // 当窗口关闭时取消错误视图
+                    window.webContents.on('close', () => {
+                        showErrorView.cancel();
+                    });
+                    // 当窗口销毁时取消错误视图
+                    window.webContents.on('destroyed', () => {
+                        showErrorView.cancel();
+                    });
                 }
             }
             window.webContents.on('did-attach-webview', (_event, webContents) => {
@@ -469,10 +695,6 @@ class WindowsManager {
                 parentWin?.addBrowserView(window);
                 log('log', 'create - addBrowserView');
             }
-            // @ts-ignore
-            window.loadURL ? window.loadURL(options.url) : window.webContents.loadURL(options.url);
-            // @ts-ignore
-            window.focus ? window.focus() : window.webContents.focus();
             this.windows.set(window.id || window._id || window.webContents.id, window);
             log('log', 'create', this.windows.keys());
             // 初始化值
@@ -542,29 +764,51 @@ class WindowsManager {
                 });
                 try {
                     const _addBrowserView = window.addBrowserView;
-                    window.addBrowserView = (view) => {
+                    window.addBrowserView = (view, isSort = false) => {
                         _addBrowserView.call(window, view);
                         handleBrowserViewFocus(view);
+                        // 添加BrowserView后重新排序（如果未禁用自动排序）
+                        log('log', 'addBrowserView-sort', isSort, window.getBrowserViews());
+                        if (isSort) {
+                            this.sortBrowserViewsDebounced(window, view);
+                        }
                     };
                     const _removeBrowserView = window.removeBrowserView;
-                    window.removeBrowserView = (view) => {
+                    window.removeBrowserView = (view, isSort = false) => {
                         _removeBrowserView.call(window, view);
                         handleBrowserViewBlur(view);
+                        // 移除BrowserView后重新排序（如果未禁用自动排序）
+                        log('log', 'removeBrowserView-sort', isSort);
+                        if (isSort) {
+                            this.sortBrowserViewsDebounced(window, view);
+                        }
                     };
                     const _setBrowserView = window.setBrowserView;
-                    window.setBrowserView = (view) => {
+                    window.setBrowserView = (view, isSort = false) => {
                         const views = window.getBrowserViews() || [];
                         for (const view of views) {
                             handleBrowserViewBlur(view);
                         }
                         _setBrowserView.call(window, view);
                         handleBrowserViewFocus(view);
+                        log('log', 'setBrowserView-sort', isSort);
+                        if (isSort) {
+                            this.sortBrowserViewsDebounced(window, view);
+                        }
                     };
                 }
                 catch (error) {
                     log('error', 'focus', error);
                 }
             }
+            if (options.url) {
+                // @ts-ignore
+                window.loadURL ? window.loadURL(options.url) : window.webContents.loadURL(options.url);
+                if (options.browserWindow?.focusable !== false) {
+                    window?.focus?.();
+                }
+                window?.webContents?.focus?.();
+            }
         }
         catch (error) {
             log('error', 'create', error);
@@ -588,7 +832,7 @@ class WindowsManager {
             }
             const loadLoadingView = () => {
                 const [viewWidth, viewHeight] = window.getSize();
-                window.setBrowserView(_loadingView);
+                window.addBrowserView(_loadingView);
                 _loadingView.setBounds({
                     x: 0,
                     y: 0,
@@ -628,7 +872,7 @@ class WindowsManager {
                     return;
                 }
                 if (_loadingView.webContents && !_loadingView.webContents.isDestroyed()) {
-                    window.setBrowserView(_loadingView);
+                    window.addBrowserView(_loadingView);
                 }
                 else {
                     // if loadingView has been destroyed
@@ -828,6 +1072,86 @@ class WindowsManager {
         if (typeof browserWindowOptions.alwaysOnTop === 'boolean') {
             win.setAlwaysOnTop(browserWindowOptions.alwaysOnTop);
         }
+        // 设置背景颜色
+        if (typeof browserWindowOptions.backgroundColor === 'string') {
+            win.setBackgroundColor(browserWindowOptions.backgroundColor);
+        }
+        // 居中
+        if (browserWindowOptions?.center !== false) {
+            win.center();
+        }
+        // 设置窗口移动
+        if (typeof browserWindowOptions.movable === 'boolean') {
+            win.setMovable(browserWindowOptions.movable);
+        }
+        // 设置窗口大小调整
+        if (typeof browserWindowOptions.resizable === 'boolean') {
+            win.setResizable(browserWindowOptions.resizable);
+        }
+        // 设置全屏模式
+        if (typeof browserWindowOptions.fullscreenable === 'boolean') {
+            win.setFullScreenable(browserWindowOptions.fullscreenable);
+        }
+        // 设置窗口阴影
+        if (typeof browserWindowOptions.hasShadow === 'boolean') {
+            win.setHasShadow(browserWindowOptions.hasShadow);
+        }
+        // 设置窗口最小尺寸
+        if (typeof browserWindowOptions.minWidth === 'number' && typeof browserWindowOptions.minHeight === 'number') {
+            win.setMinimumSize(browserWindowOptions.minWidth, browserWindowOptions.minHeight);
+        }
+        // 设置窗口最大尺寸
+        if (typeof browserWindowOptions.maxWidth === 'number' && typeof browserWindowOptions.maxHeight === 'number') {
+            win.setMaximumSize(browserWindowOptions.maxWidth, browserWindowOptions.maxHeight);
+        }
+        // 设置窗口位置
+        if (typeof browserWindowOptions.x === 'number' && typeof browserWindowOptions.y === 'number') {
+            win.setPosition(browserWindowOptions.x, browserWindowOptions.y);
+        }
+        // 设置窗口标题
+        if (typeof browserWindowOptions.title === 'string') {
+            win.setTitle(browserWindowOptions.title);
+        }
+        // 设置窗口图标
+        if (typeof browserWindowOptions.icon === 'string') {
+            win.setIcon(browserWindowOptions.icon);
+        }
+        // 设置窗口菜单栏可见性
+        if (typeof browserWindowOptions.autoHideMenuBar === 'boolean') {
+            win.setAutoHideMenuBar(browserWindowOptions.autoHideMenuBar);
+        }
+        // 设置窗口最小化按钮
+        if (browserWindowOptions.minimizable === false) {
+            win.setMinimizable(false);
+        }
+        // 设置窗口最大化按钮
+        if (browserWindowOptions.maximizable === false) {
+            win.setMaximizable(false);
+        }
+        // 设置窗口关闭按钮
+        if (browserWindowOptions.closable === false) {
+            win.setClosable(false);
+        }
+        // 设置窗口焦点
+        if (browserWindowOptions.focusable === false) {
+            win.setFocusable(false);
+        }
+        // 设置窗口全屏
+        if (browserWindowOptions.fullscreen === true) {
+            win.setFullScreen(true);
+        }
+        // 设置窗口背景材质
+        if (typeof browserWindowOptions.vibrancy === 'string') {
+            win.setVibrancy(browserWindowOptions.vibrancy);
+        }
+        // 设置窗口透明度
+        if (typeof browserWindowOptions.opacity === 'number') {
+            win.setOpacity(browserWindowOptions.opacity);
+        }
+        // 设置窗口显示状态
+        if (browserWindowOptions.show === false) {
+            win.hide();
+        }
         // 可继续扩展其他动态属性
     }
     _applyBrowserViewOptions(view, options) {
@@ -843,12 +1167,26 @@ class WindowsManager {
         if (typeof browserWindowOptions.width === 'number' && typeof browserWindowOptions.height === 'number') {
             view.setBounds({ x: 0, y: 0, width: browserWindowOptions.width, height: browserWindowOptions.height });
         }
+        // 设置视图位置
+        if (typeof browserWindowOptions.x === 'number' && typeof browserWindowOptions.y === 'number') {
+            const bounds = view.getBounds();
+            view.setBounds({
+                x: browserWindowOptions.x,
+                y: browserWindowOptions.y,
+                width: bounds.width,
+                height: bounds.height
+            });
+        }
+        // 设置视图背景颜色
+        if (typeof browserWindowOptions.backgroundColor === 'string') {
+            view.setBackgroundColor(browserWindowOptions.backgroundColor);
+        }
         // 可继续扩展其他动态属性
     }
     // 生成一个bv 做为预加载资源窗口，加载完成后销毁
     async createPreloadWebContents(url) {
         return new Promise(async (resolve, reject) => {
-            let bv = this.create({
+            let bv = await this.create({
                 type: 'BV',
                 url,
                 name: `preload-web-contents-${md5(url)}`,
@@ -867,11 +1205,108 @@ class WindowsManager {
             bv.webContents.loadURL(url);
         });
     }
+    async getWindowForWebContentsId(wcId) {
+        const wc = electron.webContents.fromId(wcId);
+        if (!wc)
+            return undefined;
+        // Case 1: BrowserView
+        for (const win of electron.BrowserWindow.getAllWindows()) {
+            for (const view of win.getBrowserViews()) {
+                if (view.webContents.id === wcId) {
+                    return win;
+                }
+            }
+        }
+        // Case 2: WebView
+        // webview 有 hostWebContents，指向它所在的 BrowserWindow 的 webContents
+        if (wc.hostWebContents) {
+            return electron.BrowserWindow.fromWebContents(wc.hostWebContents);
+        }
+        // Case 3: 普通 window 本身
+        const win = electron.BrowserWindow.fromWebContents(wc);
+        if (win)
+            return win;
+        return undefined;
+    }
+    /**
+     * 手动对BrowserView进行排序
+     * @param windowId 窗口ID或名称
+     */
+    sortBrowserViews(windowId) {
+        const window = this.get(windowId);
+        if (window && window._type === 'BW') {
+            this._sortBrowserViews(window);
+        }
+    }
+    /**
+     * 对BrowserView进行排序
+     * @param window 目标窗口
+     */
+    _sortBrowserViews(window, addView) {
+        try {
+            const views = window.getBrowserViews() || [];
+            if (views.length <= 1)
+                return;
+            log('log', 'sortBrowserViews', views?.map(i => i.webContents.id));
+            // 按zIndex层级排序，数值小的在前
+            const sortedViews = views.sort((a, b) => {
+                const zIndexA = a._zIndex ?? 0;
+                const zIndexB = b._zIndex ?? 0;
+                return zIndexA - zIndexB;
+            });
+            // 检查是否已经按正确顺序排列
+            let needsReorder = false;
+            for (let i = 0; i < views.length; i++) {
+                // @ts-ignore
+                if (views[i].webContents.id !== sortedViews[i].webContents.id) {
+                    needsReorder = true;
+                    break;
+                }
+            }
+            log('log', 'sortBrowserViews needsReorder', needsReorder, sortedViews?.map(i => i.webContents.id));
+            // 如果已经按正确顺序排列，则不需要重新排序
+            if (!needsReorder)
+                return;
+            // 使用批量操作来减少闪烁
+            // 临时隐藏窗口内容
+            const wasVisible = window.isVisible();
+            if (wasVisible) {
+                // window.hide();
+            }
+            // 移除所有BrowserView
+            views.forEach(view => {
+                if (addView?.webContents?.id !== view.webContents.id) {
+                    // @ts-ignore
+                    window.removeBrowserView(view, false);
+                }
+            });
+            // 按正确顺序重新添加
+            sortedViews.forEach((view, index) => {
+                if (index === 0) {
+                    // 第一个设置为当前视图
+                    // @ts-ignore
+                    window.setBrowserView(view, false);
+                }
+                else {
+                    // 其他视图添加到后面
+                    // @ts-ignore
+                    window.addBrowserView(view, false);
+                }
+            });
+            // 恢复窗口显示
+            if (wasVisible) {
+                // window.show();
+            }
+        }
+        catch (error) {
+            log('error', 'sortBrowserViews error:', error);
+        }
+    }
 }
 // @ts-ignore
 global['__ELECTRON_WINDOWS_MANAGER__'] = undefined;
 exports.isInitialized = false;
-const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl, webviewDomainWhiteList) => {
+const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsConfig, webviewDomainWhiteList) => {
     // @ts-ignore
     if (exports.isInitialized && global['__ELECTRON_WINDOWS_MANAGER__']) {
         // @ts-ignore
@@ -879,7 +1314,7 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl
     }
     exports.isInitialized = true;
     // @ts-ignore
-    const wm = global['__ELECTRON_WINDOWS_MANAGER__'] = new WindowsManager(preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl, webviewDomainWhiteList);
+    const wm = global['__ELECTRON_WINDOWS_MANAGER__'] = new WindowsManager(preload, loadingViewUrl, errorViewUrl, preloadWebContentsConfig, webviewDomainWhiteList);
     eIpc.mainIPC.handleRenderer('__ELECTRON_WINDOW_MANAGER_IPC_CHANNEL__', async (data) => {
         if (data?.type === 'create') {
             const opt = data;
@@ -895,21 +1330,39 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl
                         findWin.webContents.reload();
                     }, 100);
                 }
+                if (opt.data.browserWindow?.parent) {
+                    try {
+                        if (findWin._type === 'BW') {
+                            findWin.setParentWindow(electron.BrowserWindow.fromId(Number(opt.data.browserWindow.parent)));
+                        }
+                        if (findWin._type === 'BV') {
+                            electron.BrowserWindow.fromId(Number(opt.data.browserWindow.parent))?.addBrowserView(findWin);
+                        }
+                    }
+                    catch (error) {
+                        log('error', 'setParentWindow error:', error);
+                    }
+                }
+                if (findWin?._type === 'BV' && opt.data.zIndex) {
+                    findWin._zIndex = opt.data.zIndex;
+                }
                 return {
                     winId: Number(`${findWin?.id || findWin?._id || -1}`),
                     winName: `${findWin?._name || ''}`,
                     winType: `${findWin?._type || ''}`,
                     winExtraData: `${findWin?._extraData || ''}`,
                     winInitUrl: `${findWin?._initUrl || ''}`,
+                    winZIndex: `${findWin._zIndex || 0}`,
                 };
             }
-            const res = wm.create(opt.data);
+            const res = await wm.create(opt.data);
             return {
                 winId: Number(`${res.id || res._id || -1}`),
                 winName: `${res?._name || ''}`,
                 winType: `${res?._type || ''}`,
                 winExtraData: `${res?._extraData || ''}`,
                 winInitUrl: `${res?._initUrl || ''}`,
+                winZIndex: `${res?._zIndex || 0}`,
             };
         }
         if (data?.type === 'get') {
@@ -921,6 +1374,7 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl
                 winType: `${res?._type || ''}`,
                 winExtraData: `${res?._extraData || ''}`,
                 winInitUrl: `${res?._initUrl || ''}`,
+                winZIndex: `${res?._zIndex || 0}`,
             };
         }
         if (data?.type === 'getAll') {
@@ -934,6 +1388,7 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl
                     winType: `${i?._type || ''}`,
                     winExtraData: `${i?._extraData || ''}`,
                     winInitUrl: `${i?._initUrl || ''}`,
+                    winZIndex: `${i?._zIndex || 0}`,
                 };
             });
             return obj;
@@ -957,6 +1412,7 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl
                     winType: `${res?._type || ''}`,
                     winExtraData: `${res?._extraData || ''}`,
                     winInitUrl: `${res?._initUrl || ''}`,
+                    winZIndex: `${res?._zIndex || 0}`,
                 };
             }
             return undefined;
@@ -971,34 +1427,16 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl
                     winType: `${res?._type || ''}`,
                     winExtraData: `${res?._extraData || ''}`,
                     winInitUrl: `${res?._initUrl || ''}`,
+                    winZIndex: `${res?._zIndex || 0}`,
                 };
             }
             return undefined;
         }
-        if (data?.type === 'getWindowForWebContentId') {
+        if (data?.type === 'getWindowForWebContentsId') {
             const opt = data;
-            const targetWebContents = electron.webContents.fromId(opt.data);
-            if (targetWebContents) {
-                let win = electron.BrowserWindow.fromWebContents(targetWebContents);
-                if (!win) {
-                    // 获取所有的 BrowserWindows
-                    let allWindows = electron.BrowserWindow.getAllWindows();
-                    // 遍历所有窗口，检查每个窗口的 BrowserView
-                    for (let _win of allWindows) {
-                        let views = _win.getBrowserViews();
-                        // 遍历窗口的所有 BrowserView
-                        for (let view of views) {
-                            if (view.webContents === targetWebContents) {
-                                win = _win;
-                                break;
-                            }
-                        }
-                        if (win)
-                            break;
-                    }
-                }
-                // @ts-ignore
-                return win?.id || win?._id;
+            const res = await wm.getWindowForWebContentsId(opt.data);
+            if (res) {
+                return res?.id;
             }
             return undefined;
         }
@@ -1039,15 +1477,20 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl
             return undefined;
         }
         // 是否开启预加载窗口
-        if (data?.type === 'setPreloadWebContentsUrl') {
+        if (data?.type === 'setPreloadWebContentsConfig') {
             const opt = data;
-            wm.setPreloadWebContentsUrl(opt.data);
+            wm.setPreloadWebContentsConfig(opt.data);
         }
         if (data?.type === 'createPreloadWebContents') {
             const opt = data;
             const res = await wm.createPreloadWebContents(opt.data);
             return res;
         }
+        if (data?.type === 'sortBrowserViews') {
+            const opt = data;
+            wm.sortBrowserViews(opt.data);
+            return true;
+        }
         return undefined;
     });
     return wm;