@lynker-desktop/electron-window-manager 0.0.9-alpha.5 → 0.0.9-alpha.50

package/main/index.js

@@ -3,6 +3,7 @@ const electron = require('electron');
 const remote = require('@electron/remote/main');
 const eIpc = require('@lynker-desktop/electron-ipc/main');
 const md5 = require('md5');
+const PQueue = require('p-queue');
 
 function _interopNamespaceDefault(e) {
   const n = Object.create(null);
@@ -17,6 +18,16 @@ function _interopNamespaceDefault(e) {
 
 const remote__namespace = /*#__PURE__*/_interopNamespaceDefault(remote);
 
+const getQueue = (() => {
+    let queue;
+    return async () => {
+        if (!queue) {
+            // const { default: PQueue } = await import('p-queue')
+            queue = new PQueue({ concurrency: 1 });
+        }
+        return queue;
+    };
+})();
 const getCustomSession = (() => {
     let customSession;
     return () => {
@@ -69,7 +80,9 @@ 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) {
+        // 按名称索引的 Map，用于加速查找
+        this.windowsByName = new Map();
         // 预加载的窗口
         this.preloadedBW = null;
         // 预加载的窗口（无边框，有按钮）
@@ -80,33 +93,50 @@ class WindowsManager {
         this.preloadedBV = null;
         this.preloading = false;
         this.webviewDomainWhiteList = [];
-        // 创建队列相关属性
-        this.createQueue = [];
-        this.isCreating = false;
+        // 窗口销毁检查的防抖函数，避免频繁检查
+        this.cleanupDestroyedWindowsDebounced = lodash.debounce(() => {
+            this._cleanupDestroyedWindows();
+        }, 500);
+        /**
+         * 防抖的排序方法
+         * @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', () => {
-                if (this.preloadWebContentsUrl) {
-                    this.setPreloadWebContentsUrl(this.preloadWebContentsUrl);
+        log('log', 'preloadWebContentsConfig: ', this.preloadWebContentsConfig);
+        if (this.preloadWebContentsConfig) {
+            if (this.preloadWebContentsConfig.nodeIntegration === undefined) {
+                this.preloadWebContentsConfig.nodeIntegration = true;
+            }
+            if (this.preloadWebContentsConfig.contextIsolation === undefined) {
+                this.preloadWebContentsConfig.contextIsolation = false;
+            }
+            getQueue();
+            electron.app.whenReady().then(() => {
+                if (this.preloadWebContentsConfig) {
+                    this.setPreloadWebContentsConfig(this.preloadWebContentsConfig);
                 }
             });
         }
     }
     /**
-     * 设置预加载的webContents的url
-     * @param preloadWebContentsUrl 预加载的webContents的url
+     * 设置预加载的webContents配置
+     * @param preloadWebContentsConfig 预加载的webContents配置
      */
-    setPreloadWebContentsUrl(preloadWebContentsUrl) {
+    setPreloadWebContentsConfig(preloadWebContentsConfig) {
         try {
-            this.preloadWebContentsUrl = preloadWebContentsUrl;
-            if (this.preloadWebContentsUrl) {
-                this._preloadInstances();
+            this.preloadWebContentsConfig = preloadWebContentsConfig;
+            if (this.preloadWebContentsConfig) {
+                getQueue().then(q => q.add(async () => {
+                    return await this._preloadInstances();
+                }));
             }
             else {
                 this.preloadedBW = null;
@@ -116,9 +146,23 @@ class WindowsManager {
             }
         }
         catch (error) {
-            log('error', 'setPreloadWebContentsUrl error:', error);
+            log('error', 'setPreloadWebContentsConfig error:', error);
         }
     }
+    /**
+     * Promise 超时包装函数
+     * @param promise 要包装的 Promise
+     * @param timeout 超时时间（毫秒）
+     * @param errorMessage 超时错误信息
+     */
+    async _withTimeout(promise, timeout, errorMessage) {
+        const timeoutPromise = new Promise((_, reject) => {
+            setTimeout(() => {
+                reject(new Error(errorMessage));
+            }, timeout);
+        });
+        return Promise.race([promise, timeoutPromise]);
+    }
     /**
      * 预加载实例
      */
@@ -127,23 +171,64 @@ class WindowsManager {
             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',
-                });
-                // 预加载的BV
-                this.preloadedBV = this.preloadedBV || await this._createPreloadBV();
+            if (this.preloadWebContentsConfig) {
+                log('log', 'preloadWebContentsConfig: ', this.preloadWebContentsConfig);
+                const preloadPromises = [];
+                // 根据配置决定是否预加载普通窗口
+                if (this.preloadWebContentsConfig.enableBW !== false && !this.preloadedBW) {
+                    preloadPromises.push(this._createPreloadBW({}).then(i => {
+                        this.preloadedBW = i;
+                        log('log', 'init preloadedBW: ', !!this.preloadedBW);
+                    }).catch(error => {
+                        log('error', '预加载 BW 失败:', error);
+                    }));
+                }
+                // 根据配置决定是否预加载无边框有按钮的窗口
+                if (this.preloadWebContentsConfig.enableBW_FramelessWithButtons !== false && !this.preloadedBW_FramelessWithButtons) {
+                    preloadPromises.push(this._createPreloadBW({
+                        frame: false,
+                        autoHideMenuBar: true,
+                        titleBarStyle: 'hidden',
+                    }).then(i => {
+                        this.preloadedBW_FramelessWithButtons = i;
+                        log('log', 'init preloadedBW_FramelessWithButtons: ', !!this.preloadedBW_FramelessWithButtons);
+                    }).catch(error => {
+                        log('error', '预加载 BW_FramelessWithButtons 失败:', error);
+                    }));
+                }
+                // 根据配置决定是否预加载无边框无按钮的窗口
+                if (this.preloadWebContentsConfig.enableBW_FramelessNoButtons !== false && !this.preloadedBW_FramelessNoButtons) {
+                    preloadPromises.push(this._createPreloadBW({
+                        frame: false,
+                        autoHideMenuBar: true,
+                        titleBarStyle: 'default',
+                    }).then(i => {
+                        this.preloadedBW_FramelessNoButtons = i;
+                        log('log', 'init preloadedBW_FramelessNoButtons: ', !!this.preloadedBW_FramelessNoButtons);
+                    }).catch(error => {
+                        log('error', '预加载 BW_FramelessNoButtons 失败:', error);
+                    }));
+                }
+                // 根据配置决定是否预加载浏览器视图
+                if (this.preloadWebContentsConfig.enableBV !== false && !this.preloadedBV) {
+                    preloadPromises.push(this._createPreloadBV().then(i => {
+                        this.preloadedBV = i;
+                        log('log', 'init preloadedBV: ', !!this.preloadedBV);
+                    }).catch(error => {
+                        log('error', '预加载 BV 失败:', error);
+                    }));
+                }
+                if (preloadPromises.length > 0) {
+                    // 添加超时机制，默认 10 秒超时
+                    const timeout = 10000; // 10 秒
+                    try {
+                        await this._withTimeout(Promise.allSettled(preloadPromises), timeout, `预加载超时（${timeout}ms）`);
+                    }
+                    catch (error) {
+                        log('error', '预加载超时:', error);
+                        // 超时后继续执行，不阻塞后续流程
+                    }
+                }
             }
         }
         catch (e) {
@@ -159,20 +244,25 @@ class WindowsManager {
     _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({
-                    ...options,
+                    useContentSize: true,
                     show: false,
+                    backgroundColor: '#ffffff',
+                    ...options,
                     webPreferences: {
-                        ...(options.webPreferences || {}),
+                        ...webPreferences,
+                        sandbox: false,
                         webviewTag: true,
                         plugins: true,
-                        nodeIntegration: true,
-                        contextIsolation: false,
+                        nodeIntegration: this.preloadWebContentsConfig?.nodeIntegration ?? true,
+                        contextIsolation: this.preloadWebContentsConfig?.contextIsolation ?? false,
                         backgroundThrottling: false,
                         webSecurity: false,
-                        preload: preload,
+                        preload: webPreferences.preload || preload,
+                        defaultEncoding: 'utf-8',
                     }
                 });
                 try {
@@ -189,14 +279,19 @@ 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);
-                });
+                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);
+                // });
+                // @ts-ignore
                 instance.loadURL(url ? `${url}` : 'about:blank');
+                resolve(instance);
+            }
+            else {
+                resolve(null);
             }
         });
     }
@@ -204,20 +299,24 @@ class WindowsManager {
      * 创建预加载的浏览器视图
      * @returns 预加载的浏览器视图
      */
-    _createPreloadBV() {
+    _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,
+                        sandbox: false,
                         webviewTag: true,
                         plugins: true,
-                        nodeIntegration: true,
-                        contextIsolation: false,
+                        nodeIntegration: this.preloadWebContentsConfig?.nodeIntegration ?? true,
+                        contextIsolation: this.preloadWebContentsConfig?.contextIsolation ?? false,
                         // backgroundThrottling: false,
                         webSecurity: false,
-                        preload: preload,
+                        preload: webPreferences.preload || preload,
+                        defaultEncoding: 'utf-8',
                     }
                 });
                 try {
@@ -229,98 +328,111 @@ 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);
+                // });
+                // @ts-ignore
                 instance.webContents.loadURL(url || 'about:blank');
+                resolve(instance);
             }
-        });
-    }
-    create(options) {
-        return new Promise((resolve, reject) => {
-            // 将创建请求添加到队列
-            this.createQueue.push({ options, resolve, reject });
-            // 如果当前没有在创建，则开始处理队列
-            if (!this.isCreating) {
-                this.processCreateQueue();
+            else {
+                resolve(null);
             }
         });
     }
-    /**
-     * 处理创建队列
-     */
-    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 create(options) {
+        const queue = await getQueue();
+        const win = await queue.add(async () => {
+            const window = await this._createWindow(options);
+            return window;
+        });
+        return win;
     }
     /**
      * 实际的窗口创建逻辑
      */
     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;
+        const existingWinId = this.windowsByName.get(options.name);
+        if (existingWinId) {
+            window = this.windows.get(existingWinId);
+            if (window) {
+                return window;
+            }
+            // 清理无效的引用
+            this.windowsByName.delete(options.name);
+        }
         options.type = type;
         // 优先复用预创建实例
         let preloadWin = null;
-        if (type === 'BW' && usePreload && this.preloadWebContentsUrl) {
+        if (type === 'BW' && usePreload && this.preloadWebContentsConfig?.url) {
             const bwOptions = browserWindowOptions || {};
-            console.log(11111, bwOptions);
-            if (bwOptions.frame === false && bwOptions.titleBarStyle === 'hidden') {
-                if (this.preloadedBW_FramelessWithButtons) {
-                    preloadWin = this.preloadedBW_FramelessWithButtons;
-                    this.preloadedBW_FramelessWithButtons = null;
-                    setTimeout(async () => this.preloadedBW_FramelessWithButtons = await this._createPreloadBW({ frame: false, transparent: true, titleBarStyle: 'hidden' }), 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 (bwOptions.frame === false && bwOptions.titleBarStyle === 'customButtonsOnHover') {
-                if (this.preloadedBW_FramelessNoButtons) {
-                    preloadWin = this.preloadedBW_FramelessNoButtons;
-                    this.preloadedBW_FramelessNoButtons = null;
-                    setTimeout(async () => this.preloadedBW_FramelessNoButtons = await this._createPreloadBW({ frame: false, transparent: true, titleBarStyle: 'customButtonsOnHover' }), 0);
+                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 {
-                if (this.preloadedBW) {
+                if (this.preloadWebContentsConfig.enableBW !== false && this.preloadedBW) {
                     preloadWin = this.preloadedBW;
-                    this.preloadedBW = null;
-                    setTimeout(async () => this.preloadedBW = await this._createPreloadBW({}), 0);
+                    this.preloadedBW = await this._createPreloadBW({
+                        webPreferences: {
+                            preload: bwOptions?.webPreferences?.preload || this.preload,
+                        }
+                    });
                 }
             }
         }
-        if (type === 'BV' && usePreload && this.preloadWebContentsUrl) {
-            if (this.preloadedBV) {
+        if (type === 'BV' && usePreload && this.preloadWebContentsConfig?.url) {
+            const bvOptions = browserWindowOptions || {};
+            if (this.preloadWebContentsConfig.enableBV !== false && this.preloadedBV) {
                 preloadWin = this.preloadedBV;
-                this.preloadedBV = null;
-                setTimeout(async () => this.preloadedBV = await this._createPreloadBV(), 0);
+                this.preloadedBV = await this._createPreloadBV({
+                    webPreferences: {
+                        preload: bvOptions?.webPreferences?.preload || this.preload,
+                    }
+                });
             }
         }
         if (preloadWin) {
             const win = preloadWin;
             log('log', `${name} 使用预加载窗口(${type})`, win._id);
-            win._type = 'BW';
+            win._type = type;
             win._name = options.name || 'anonymous';
             win._extraData = `${options?.extraData || ''}`;
             win._initUrl = `${options?.url || ''}`;
@@ -334,27 +446,101 @@ 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, useNativeLoadURL = false) => {
+                            return new Promise(async (resolve, reject) => {
+                                if (useNativeLoadURL) {
+                                    log('log', 'useNativeLoadURL win.loadURL');
+                                    try {
+                                        await originLoadURL.call(win, url);
+                                        resolve(undefined);
+                                    }
+                                    catch (error) {
+                                        reject(error);
+                                    }
+                                    return;
+                                }
+                                try {
+                                    log('log', '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, useNativeLoadURL = false) => {
+                        return new Promise(async (resolve, reject) => {
+                            if (useNativeLoadURL) {
+                                log('log', 'useNativeLoadURL win.webContents.loadURL');
+                                try {
+                                    await originWebContentsLoadURL.call(win.webContents, url);
+                                    resolve(undefined);
+                                }
+                                catch (error) {
+                                    reject(error);
+                                }
+                                return;
+                            }
+                            try {
+                                log('log', '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) {
+                    log('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;
@@ -372,6 +558,7 @@ class WindowsManager {
                 window = type === 'BV' ?
                     new electron.BrowserView(lodash.merge((browserWindowOptions || {}), {
                         webPreferences: lodash.merge({
+                            sandbox: false,
                             webviewTag: true,
                             // session: getCustomSession(),
                             plugins: true,
@@ -382,6 +569,7 @@ class WindowsManager {
                             nativeWindowOpen: true,
                             webSecurity: false,
                             preload: preload,
+                            defaultEncoding: 'utf-8',
                         }, browserWindowOptions?.webPreferences || {})
                     }))
                     : new electron.BrowserWindow(lodash.merge({
@@ -389,6 +577,7 @@ class WindowsManager {
                     }, (browserWindowOptions || {}), {
                         parent: parentWin,
                         webPreferences: lodash.merge({
+                            sandbox: false,
                             webviewTag: true,
                             // session: getCustomSession(),
                             plugins: true,
@@ -398,6 +587,7 @@ class WindowsManager {
                             nativeWindowOpen: true,
                             webSecurity: false,
                             preload: preload,
+                            defaultEncoding: 'utf-8',
                         }, browserWindowOptions?.webPreferences || {})
                     }));
                 log('log', `${name} 不使用 ${type === 'BV' ? 'preloadedBV' : 'preloadedBW'}`, window?.webContents?.id);
@@ -408,6 +598,8 @@ class WindowsManager {
                     log('error', 'enable: ', error);
                 }
             }
+            // 停止加载
+            // window.webContents?.stop?.();
             // @ts-ignore
             try {
                 window.id = Number(`${window.id || window.webContents.id}`);
@@ -426,14 +618,16 @@ 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 (loadingView?.url && loadingView?.url !== 'about:blank') {
                 if (type === 'BW') {
                     // @ts-ignore
                     this._setLoadingView(window, options);
                 }
             }
-            if (errorView?.url) {
+            if (errorView?.url && errorView?.url !== 'about:blank') {
                 if (type === 'BW') {
                     const showErrorView = lodash.debounce(() => {
                         const _url = window._initUrl;
@@ -485,46 +679,45 @@ class WindowsManager {
             }
             window.webContents.on('did-attach-webview', (_event, webContents) => {
                 const tryEnable = () => {
-                    const url = webContents.getURL();
-                    // 判断是否本地/内网IP
-                    const isLocalhost = (hostname) => {
-                        return (hostname === 'localhost' ||
-                            hostname === '127.0.0.1' ||
-                            hostname === '::1' ||
-                            /^192\.168\./.test(hostname) ||
-                            /^10\./.test(hostname) ||
-                            /^172\.(1[6-9]|2[0-9]|3[0-1])\./.test(hostname));
-                    };
-                    if (this.webviewDomainWhiteList && this.webviewDomainWhiteList.length > 0) {
-                        try {
-                            const { hostname } = new URL(url);
-                            // 优化白名单判断，支持 .example.com 形式的子域名通配和本地/内网IP
-                            const isWhiteListed = this.webviewDomainWhiteList.some(domain => {
-                                if (domain === 'localhost' || domain === '127.0.0.1' || domain === '::1') {
-                                    return isLocalhost(hostname);
-                                }
-                                if (domain.startsWith('.')) {
-                                    // .example.com 允许所有 *.example.com
-                                    return hostname === domain.slice(1) || hostname.endsWith(domain);
+                    try {
+                        const url = webContents.getURL();
+                        if (!url || url === 'about:blank') {
+                            return;
+                        }
+                        if (this.webviewDomainWhiteList && this.webviewDomainWhiteList.length > 0) {
+                            try {
+                                const { hostname } = new URL(url);
+                                // 优化白名单判断，支持 .example.com 形式的子域名通配和本地/内网IP
+                                const isWhiteListed = this.webviewDomainWhiteList.some(domain => {
+                                    if (domain === 'localhost' || domain === '127.0.0.1' || domain === '::1') {
+                                        return this._isLocalhost(hostname);
+                                    }
+                                    if (domain.startsWith('.')) {
+                                        // .example.com 允许所有 *.example.com
+                                        return hostname === domain.slice(1) || hostname.endsWith(domain);
+                                    }
+                                    else {
+                                        // 精确匹配
+                                        return hostname === domain;
+                                    }
+                                }) || this._isLocalhost(hostname); // 允许本地回环和内网地址
+                                if (isWhiteListed) {
+                                    enable(webContents);
                                 }
                                 else {
-                                    // 精确匹配
-                                    return hostname === domain;
+                                    log('log', 'webview 域名未在白名单，未启用 remote', url);
                                 }
-                            }) || isLocalhost(hostname); // 允许本地回环和内网地址
-                            if (isWhiteListed) {
-                                enable(webContents);
                             }
-                            else {
-                                log('log', 'webview 域名未在白名单，未启用 remote', url);
+                            catch {
+                                log('log', 'webview url 解析失败，未启用 remote', url);
                             }
                         }
-                        catch {
-                            log('log', 'webview url 解析失败，未启用 remote', url);
+                        else {
+                            enable(webContents); // 没有配置白名单则全部允许
                         }
                     }
-                    else {
-                        enable(webContents); // 没有配置白名单则全部允许
+                    catch (error) {
+                        log('error', 'tryEnable webview error:', error);
                     }
                 };
                 // 只监听一次，防止多次触发
@@ -536,11 +729,14 @@ class WindowsManager {
                 webContents.on('did-navigate', onDidNavigate);
                 webContents.on('did-finish-load', onDidNavigate);
             });
-            window.webContents.on('close', () => {
-                this.windows.delete(window.id || window._id);
-            });
+            // window.webContents.on('close', () => {
+            //   this.windows.delete(window.id || window._id)
+            // })
             window.webContents.on('destroyed', () => {
-                this.windows.delete(window.id || window._id);
+                const winId = window.id || window._id;
+                this.windows.delete(winId);
+                // 同步清理名称索引
+                this.windowsByName.delete(window._name);
             });
             window.webContents.on('dom-ready', () => {
                 if (openDevTools) {
@@ -555,22 +751,28 @@ class WindowsManager {
                 // @ts-ignore
                 window.on('closed', () => {
                     log('log', 'closed', window.id, window._name);
-                    this.windows.delete(window.id || window._id);
+                    const winId = window.id || window._id;
+                    this.windows.delete(winId);
+                    // 同步清理名称索引
+                    this.windowsByName.delete(window._name);
                 });
             }
             if (type === 'BV') {
                 parentWin?.addBrowserView(window);
                 log('log', 'create - addBrowserView');
             }
-            this.windows.set(window.id || window._id || window.webContents.id, window);
+            const winId = window.id || window._id || window.webContents.id;
+            this.windows.set(winId, window);
+            // 同步更新名称索引
+            this.windowsByName.set(window._name, winId);
             log('log', 'create', this.windows.keys());
             // 初始化值
             window.webContents.on('did-finish-load', () => {
-                console.error('did-finish-load', window.webContents.id);
+                log('log', 'did-finish-load', window.webContents.id);
                 initWebContentsVal(window, `${preload || ''}`);
             });
             window.webContents.on('did-start-loading', () => {
-                console.error('did-start-loading', window.webContents.id);
+                log('log', 'did-start-loading', window.webContents.id);
                 initWebContentsVal(window, `${preload || ''}`);
             });
             if (type === 'BW') {
@@ -581,7 +783,7 @@ class WindowsManager {
               try {
                 window.dispatchEvent(new Event('focus'));
               } catch (error) {
-                console.error('focus', error);
+                // 忽略错误，避免影响主流程
               }
             `);
                     }
@@ -595,7 +797,7 @@ class WindowsManager {
               try {
                 window.dispatchEvent(new Event('blur'));
               } catch (error) {
-                console.error('blur', error);
+                // 忽略错误，避免影响主流程
               }
             `);
                     }
@@ -631,39 +833,58 @@ 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);
+                        for (const existingView of views) {
+                            handleBrowserViewBlur(existingView);
                         }
                         _setBrowserView.call(window, view);
                         handleBrowserViewFocus(view);
+                        log('log', 'setBrowserView-sort', isSort);
+                        if (isSort) {
+                            this.sortBrowserViewsDebounced(window, view);
+                        }
                     };
                 }
                 catch (error) {
                     log('error', 'focus', error);
                 }
             }
-            console.log('message xxxx', options.url);
             if (options.url) {
                 // @ts-ignore
                 window.loadURL ? window.loadURL(options.url) : window.webContents.loadURL(options.url);
-                // @ts-ignore
-                window.focus ? window.focus() : window.webContents.focus();
+                if (options.browserWindow?.focusable !== false) {
+                    window?.focus?.();
+                }
+                window?.webContents?.focus?.();
             }
         }
         catch (error) {
             log('error', 'create', error);
+            throw error;
+        }
+        if (!window) {
+            throw new Error(`Failed to create window: ${name}`);
         }
         return window;
     }
@@ -672,6 +893,7 @@ class WindowsManager {
             const { loadingView, preventOriginNavigate = false, } = createOptions;
             let _loadingView = new electron.BrowserView({
                 webPreferences: {
+                    sandbox: false,
                     // session: getCustomSession(),
                     contextIsolation: false,
                     nodeIntegration: true,
@@ -684,7 +906,7 @@ class WindowsManager {
             }
             const loadLoadingView = () => {
                 const [viewWidth, viewHeight] = window.getSize();
-                window.setBrowserView(_loadingView);
+                window.addBrowserView(_loadingView);
                 _loadingView.setBounds({
                     x: 0,
                     y: 0,
@@ -724,7 +946,7 @@ class WindowsManager {
                     return;
                 }
                 if (_loadingView.webContents && !_loadingView.webContents.isDestroyed()) {
-                    window.setBrowserView(_loadingView);
+                    window.addBrowserView(_loadingView);
                 }
                 else {
                     // if loadingView has been destroyed
@@ -740,149 +962,215 @@ class WindowsManager {
             window.webContents.on('did-stop-loading', onFailure);
         }
     }
+    /**
+     * 检查窗口是否已销毁
+     */
+    _isWindowDestroyed(win) {
+        try {
+            return !win || !win.webContents || win.webContents.isDestroyed();
+        }
+        catch {
+            return true;
+        }
+    }
+    /**
+     * 判断是否本地/内网IP
+     */
+    _isLocalhost(hostname) {
+        return (hostname === 'localhost' ||
+            hostname === '127.0.0.1' ||
+            hostname === '::1' ||
+            /^192\.168\./.test(hostname) ||
+            /^10\./.test(hostname) ||
+            /^172\.(1[6-9]|2[0-9]|3[0-1])\./.test(hostname));
+    }
+    /**
+     * 清理已销毁的窗口（延迟执行，避免频繁检查）
+     */
+    _cleanupDestroyedWindows() {
+        const toDelete = [];
+        this.windows.forEach((win, key) => {
+            if (this._isWindowDestroyed(win)) {
+                toDelete.push(key);
+                // 同步清理名称索引
+                if (win?._name) {
+                    this.windowsByName.delete(win._name);
+                }
+            }
+        });
+        toDelete.forEach(key => this.windows.delete(key));
+    }
     get(idOrName) {
         log('log', 'get', idOrName);
         let win;
-        this.windows.forEach((i, key) => {
-            try {
-                if (!(i && i?.webContents?.isDestroyed && !i?.webContents?.isDestroyed?.())) {
-                    this.windows.delete(key);
-                }
-            }
-            catch (error) {
-                log('error', 'get');
+        if (typeof idOrName === 'number') {
+            // 按 ID 查找（O(1)）
+            win = this.windows.get(idOrName);
+            // 如果找不到，尝试按 _id 查找
+            if (!win) {
+                this.windows.forEach(w => {
+                    if (w._id === idOrName) {
+                        win = w;
+                    }
+                });
             }
-            if (typeof idOrName === 'number') {
-                if (i?.id === idOrName || i?._id === idOrName) {
-                    win = i;
-                }
+        }
+        else if (typeof idOrName === 'string') {
+            // 按名称查找（O(1)，使用索引）
+            const winId = this.windowsByName.get(idOrName);
+            if (winId !== undefined) {
+                win = this.windows.get(winId);
             }
-            else if (typeof idOrName === 'string') {
-                if (i?._name === idOrName) {
-                    win = i;
-                }
+            // 如果索引中找不到，回退到遍历查找（兼容旧数据）
+            if (!win) {
+                this.windows.forEach(w => {
+                    if (w._name === idOrName) {
+                        win = w;
+                        // 更新索引
+                        this.windowsByName.set(idOrName, w.id || w._id);
+                    }
+                });
             }
-        });
-        // @ts-ignore
-        if (win && win?.webContents?.isDestroyed && !win?.webContents?.isDestroyed?.()) {
+        }
+        // 检查找到的窗口是否已销毁
+        if (win && !this._isWindowDestroyed(win)) {
             return win;
         }
+        // 窗口已销毁，触发清理
+        if (win) {
+            const winId = win.id || win._id;
+            if (winId !== undefined) {
+                this.windows.delete(winId);
+            }
+            if (win._name) {
+                this.windowsByName.delete(win._name);
+            }
+        }
+        // 延迟清理其他已销毁的窗口
+        this.cleanupDestroyedWindowsDebounced();
         return undefined;
     }
     getAll(type) {
         log('log', 'getAll');
-        const bwWindows = new Map();
-        const bvWindows = new Map();
+        // 先清理已销毁的窗口
+        const toDelete = [];
         this.windows.forEach((win, key) => {
-            if (!(win && win?.webContents?.isDestroyed && !win?.webContents?.isDestroyed?.())) {
-                this.windows.delete(key);
-            }
-            if (win?._type === 'BW') {
-                bwWindows.set(key, win);
-            }
-            if (win?._type === 'BV') {
-                bvWindows.set(key, win);
+            if (this._isWindowDestroyed(win)) {
+                toDelete.push(key);
+                if (win?._name) {
+                    this.windowsByName.delete(win._name);
+                }
             }
         });
-        if (type === 'BW') {
-            return bwWindows;
-        }
-        if (type === 'BV') {
-            return bvWindows;
+        toDelete.forEach(key => this.windows.delete(key));
+        if (!type) {
+            return this.windows;
         }
-        return this.windows;
+        const result = new Map();
+        this.windows.forEach((win, key) => {
+            if (!this._isWindowDestroyed(win) && win._type === type) {
+                result.set(key, win);
+            }
+        });
+        // 使用类型断言，TypeScript 会通过方法重载确保类型正确
+        return result;
     }
     close(idOrName) {
         log('log', 'close', idOrName);
-        let win = undefined;
-        this.windows.forEach((i) => {
-            if (typeof idOrName === 'number') {
-                if (i?.id === idOrName || i?._id === idOrName) {
-                    win = i;
-                }
-            }
-            else if (typeof idOrName === 'string') {
-                if (i?._name === idOrName) {
-                    win = i;
-                }
-            }
-        });
-        // @ts-ignore
-        win && this.windows.delete(win?.id);
-        // @ts-ignore
-        if (win) {
-            // @ts-ignore
+        const win = this.get(idOrName);
+        if (!win) {
+            return false;
+        }
+        const winId = win.id || win._id;
+        this.windows.delete(winId);
+        if (win._name) {
+            this.windowsByName.delete(win._name);
+        }
+        try {
             if (win._type === 'BV') {
+                // 从所有 BW 窗口中移除该 BV
                 this.windows.forEach(i => {
-                    if (i?._type === 'BW') {
+                    if (i?._type === 'BW' && !this._isWindowDestroyed(i)) {
                         const _win = i;
-                        _win.removeBrowserView(win);
+                        try {
+                            _win.removeBrowserView(win);
+                        }
+                        catch (error) {
+                            // 忽略错误，可能已经移除
+                        }
                     }
                 });
             }
             // @ts-ignore
-            win?.webContents?.destroy?.();
+            win.webContents?.destroy?.();
             // @ts-ignore
-            win?.close?.();
+            win.close?.();
             // @ts-ignore
-            win?.destroy?.();
+            win.destroy?.();
+        }
+        catch (error) {
+            log('error', 'close window error:', error);
         }
         return true;
     }
     closeAll() {
         log('log', 'closeAll');
-        this.windows.forEach((win) => {
+        const windowsToClose = Array.from(this.windows.values());
+        // 先清空 Map，避免在遍历过程中修改
+        this.windows.clear();
+        this.windowsByName.clear();
+        // 收集所有 BW 窗口，用于批量移除 BV
+        const bwWindows = windowsToClose.filter(w => w._type === 'BW' && !this._isWindowDestroyed(w));
+        const bvWindows = windowsToClose.filter(w => w._type === 'BV');
+        // 先从所有 BW 窗口中移除 BV
+        bvWindows.forEach(bv => {
+            bwWindows.forEach(bw => {
+                try {
+                    bw.removeBrowserView(bv);
+                }
+                catch (error) {
+                    // 忽略错误，可能已经移除
+                }
+            });
+        });
+        // 然后销毁所有窗口
+        windowsToClose.forEach((win) => {
             try {
-                win && this.windows.delete(win?.id);
-                // @ts-ignore
-                if (win._type === 'BV') {
-                    this.windows.forEach(i => {
-                        if (i?._type === 'BW') {
-                            const _win = i;
-                            _win.removeBrowserView(win);
-                        }
-                    });
+                if (this._isWindowDestroyed(win)) {
+                    return;
                 }
                 // @ts-ignore
-                win?.webContents?.destroy?.();
+                win.webContents?.destroy?.();
                 // @ts-ignore
-                win?.close?.();
+                win.close?.();
                 // @ts-ignore
-                win?.destroy?.();
+                win.destroy?.();
             }
             catch (error) {
+                log('error', 'closeAll error:', error);
             }
         });
     }
     rename(idOrName, newName) {
         log('log', 'rename', idOrName, newName);
-        let win = undefined;
-        // 先查找目标窗口
-        if (typeof idOrName === 'number') {
-            win = this.get(idOrName);
-        }
-        else if (typeof idOrName === 'string') {
-            this.windows.forEach(i => {
-                if (i?._name === idOrName) {
-                    win = i;
-                }
-            });
-        }
+        const win = this.get(idOrName);
         if (!win) {
-            // 没有找到目标窗口
             return undefined;
         }
-        // 检查新名字是否已存在
-        let nameExists = false;
-        this.windows.forEach(i => {
-            if (i !== win && i?._name === newName) {
-                nameExists = true;
+        // 检查新名字是否已存在（使用索引加速）
+        const existingWinId = this.windowsByName.get(newName);
+        if (existingWinId !== undefined) {
+            const existingWin = this.windows.get(existingWinId);
+            if (existingWin && existingWin !== win && !this._isWindowDestroyed(existingWin)) {
+                // 新名字已被占用
+                return undefined;
             }
-        });
-        if (nameExists) {
-            // 新名字已被占用
-            return undefined;
         }
+        // 更新名称索引
+        const oldName = win._name;
+        const winId = win.id || win._id;
+        this.windowsByName.delete(oldName);
+        this.windowsByName.set(newName, winId);
         // 修改名字并同步 webContents
         win._name = newName;
         initWebContentsVal(win, `${this.preload || ''}`);
@@ -890,12 +1178,7 @@ class WindowsManager {
     }
     reInitUrl(idOrName, url) {
         log('log', 'reInitUrl', idOrName, url);
-        let win = undefined;
-        this.windows.forEach(i => {
-            if (i?._name === idOrName) {
-                win = i;
-            }
-        });
+        const win = this.get(idOrName);
         if (!win) {
             return undefined;
         }
@@ -924,6 +1207,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) {
@@ -939,35 +1302,171 @@ 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 = await this.create({
+        let bv = null;
+        try {
+            bv = await this.create({
                 type: 'BV',
                 url,
                 name: `preload-web-contents-${md5(url)}`,
                 extraData: `${url}`
             });
-            bv.webContents.on('did-finish-load', () => {
-                this.close(bv.id || bv._id);
-                resolve(true);
-                bv = null;
+            return new Promise((resolve, reject) => {
+                const winId = bv.id || bv._id;
+                if (!winId) {
+                    reject(new Error('Failed to get window ID'));
+                    return;
+                }
+                bv.webContents.on('did-finish-load', () => {
+                    if (winId) {
+                        this.close(winId);
+                    }
+                    resolve(true);
+                    bv = null;
+                });
+                bv.webContents.on('did-fail-load', () => {
+                    if (winId) {
+                        this.close(winId);
+                    }
+                    reject(new Error('Failed to load web contents'));
+                    bv = null;
+                });
+                bv.webContents.loadURL(url);
             });
-            bv.webContents.on('did-fail-load', () => {
-                this.close(bv.id || bv._id);
-                reject(false);
-                bv = null;
+        }
+        catch (error) {
+            if (bv) {
+                const winId = bv.id || bv._id;
+                if (winId) {
+                    this.close(winId);
+                }
+            }
+            throw error;
+        }
+    }
+    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 {
+            if (window.isDestroyed()) {
+                return;
+            }
+            const views = window.getBrowserViews() || [];
+            if (views.length <= 1)
+                return;
+            log('log', 'sortBrowserViews', views?.map(i => i.webContents.id));
+            // 创建排序后的视图数组（不修改原数组）
+            const sortedViews = [...views].sort((a, b) => {
+                const zIndexA = a._zIndex ?? 0;
+                const zIndexB = b._zIndex ?? 0;
+                return zIndexA - zIndexB;
             });
-            bv.webContents.loadURL(url);
-        });
+            // 检查是否已经按正确顺序排列（优化：提前退出）
+            let needsReorder = false;
+            for (let i = 0; i < views.length; i++) {
+                const view = views[i];
+                const sortedView = sortedViews[i];
+                if (!view || !sortedView || view.webContents.id !== sortedView.webContents.id) {
+                    needsReorder = true;
+                    break;
+                }
+            }
+            log('log', 'sortBrowserViews needsReorder', needsReorder, sortedViews?.map(i => i.webContents.id));
+            // 如果已经按正确顺序排列，则不需要重新排序
+            if (!needsReorder)
+                return;
+            // 移除所有BrowserView（排除刚添加的视图，避免不必要的操作）
+            views.forEach(view => {
+                if (addView?.webContents?.id !== view.webContents.id) {
+                    try {
+                        // @ts-ignore
+                        window.removeBrowserView(view, false);
+                    }
+                    catch (error) {
+                        // 忽略错误，视图可能已经被移除
+                    }
+                }
+            });
+            // 按正确顺序重新添加
+            sortedViews.forEach((view, index) => {
+                try {
+                    if (index === 0) {
+                        // 第一个设置为当前视图
+                        // @ts-ignore
+                        window.setBrowserView(view, false);
+                    }
+                    else {
+                        // 其他视图添加到后面
+                        // @ts-ignore
+                        window.addBrowserView(view, false);
+                    }
+                }
+                catch (error) {
+                    log('error', 'addBrowserView in sortBrowserViews error:', error);
+                }
+            });
+        }
+        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
@@ -975,7 +1474,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;
@@ -991,12 +1490,29 @@ 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 = await wm.create(opt.data);
@@ -1006,6 +1522,7 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl
                 winType: `${res?._type || ''}`,
                 winExtraData: `${res?._extraData || ''}`,
                 winInitUrl: `${res?._initUrl || ''}`,
+                winZIndex: `${res?._zIndex || 0}`,
             };
         }
         if (data?.type === 'get') {
@@ -1017,20 +1534,24 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl
                 winType: `${res?._type || ''}`,
                 winExtraData: `${res?._extraData || ''}`,
                 winInitUrl: `${res?._initUrl || ''}`,
+                winZIndex: `${res?._zIndex || 0}`,
             };
         }
         if (data?.type === 'getAll') {
             const res = wm.getAll();
             const obj = {};
             res.forEach(i => {
-                // @ts-ignore
-                obj[i.id || i._id] = {
-                    winId: Number(`${i?.id || i?._id || -1}`),
-                    winName: `${i?._name || ''}`,
-                    winType: `${i?._type || ''}`,
-                    winExtraData: `${i?._extraData || ''}`,
-                    winInitUrl: `${i?._initUrl || ''}`,
-                };
+                const winId = i.id || i._id;
+                if (winId !== undefined) {
+                    obj[winId] = {
+                        winId: Number(`${winId}`),
+                        winName: `${i?._name || ''}`,
+                        winType: `${i?._type || ''}`,
+                        winExtraData: `${i?._extraData || ''}`,
+                        winInitUrl: `${i?._initUrl || ''}`,
+                        winZIndex: `${i?._zIndex || 0}`,
+                    };
+                }
             });
             return obj;
         }
@@ -1053,6 +1574,7 @@ const initialize = (preload, loadingViewUrl, errorViewUrl, preloadWebContentsUrl
                     winType: `${res?._type || ''}`,
                     winExtraData: `${res?._extraData || ''}`,
                     winInitUrl: `${res?._initUrl || ''}`,
+                    winZIndex: `${res?._zIndex || 0}`,
                 };
             }
             return undefined;
@@ -1067,34 +1589,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;
         }
@@ -1135,15 +1639,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;