dsh-db-tool 1.5.5 → 1.5.7

package/client/client.js

@@ -92,11 +92,8 @@ window.__ModuleLoader__.load({
 			emptyStructure: "暂无字段信息",
 			emptyData: "暂无数据",
 			retry: "重试",
-			browsePanelHint: "数据浏览已在浮动窗口打开，可继续操作其他功能。",
-			reopenBrowse: "打开数据浏览",
 			selectTableHint: "在左侧选择表后查看数据",
-			// 单元格查看/编辑（Navicat 式就地写回）
-			editCell: "编辑",
+			// 单元格底部详情栏（Navicat 式就地写回）
 			cellValue: "完整值",
 			copyBtn: "复制",
 			copied: "已复制",
@@ -201,11 +198,8 @@ window.__ModuleLoader__.load({
 			emptyStructure: "No columns",
 			emptyData: "No rows",
 			retry: "Retry",
-			browsePanelHint: "Browse is open in a floating window; you can keep working here.",
-			reopenBrowse: "Open Data Browser",
 			selectTableHint: "Select a table on the left to view data",
-			// Cell view/edit (Navicat-style in-place write-back)
-			editCell: "Edit",
+			// Cell bottom detail bar (Navicat-style in-place write-back)
 			cellValue: "Full value",
 			copyBtn: "Copy",
 			copied: "Copied",
@@ -322,22 +316,25 @@ window.__ModuleLoader__.load({
 			if (styleEl) return;
 			styleEl = document.createElement("style");
 			styleEl.textContent = [
-				"/* ===== Apple-style Design Tokens（dark 基线，light 经 media query 反转；.dbt-browse-root 并入以承载 portal 弹窗） ===== */",
+				"/* ===== Apple-style Design Tokens（dark 基线，light 经 media query 反转；.dbt-browse-root 并入以承载内嵌浏览面板与单元格浮层） ===== */",
 				".dbt-panel,.dbt-browse-root{--dbt-accent:var(--dsh-accent,#0a84ff);--dbt-bg:transparent;--dbt-surface:rgba(120,120,128,.12);--dbt-surface-strong:rgba(120,120,128,.18);--dbt-separator:rgba(120,120,128,.24);--dbt-text:rgba(235,235,245,.92);--dbt-text-secondary:rgba(235,235,245,.6);--dbt-danger:#ff453a;--dbt-success:#30d158;--dbt-warning:#ffd60a;--dbt-dialog-bg:rgba(40,40,44,.85);--dbt-th-bg:rgba(30,30,32,.72);--dbt-seg-active:rgba(255,255,255,.14);--dbt-shadow:0 8px 32px rgba(0,0,0,.28);--dbt-radius-card:12px;--dbt-radius-ctrl:8px;--dbt-radius-pill:6px;--dbt-ease:cubic-bezier(.25,.1,.25,1);--dbt-mono:ui-monospace,'SF Mono',Menlo,Consolas,monospace;font-family:-apple-system,BlinkMacSystemFont,'SF Pro Text','Segoe UI',system-ui,sans-serif;}",
 				"@media (prefers-color-scheme: light){.dbt-panel,.dbt-browse-root{--dbt-accent:var(--dsh-accent,#007aff);--dbt-surface:rgba(120,120,128,.08);--dbt-surface-strong:rgba(120,120,128,.14);--dbt-separator:rgba(60,60,67,.18);--dbt-text:rgba(30,30,32,.92);--dbt-text-secondary:rgba(60,60,67,.6);--dbt-danger:#ff3b30;--dbt-success:#34c759;--dbt-warning:#ff9f0a;--dbt-dialog-bg:rgba(252,252,252,.9);--dbt-th-bg:rgba(255,255,255,.72);--dbt-seg-active:rgba(255,255,255,.9);--dbt-shadow:0 8px 32px rgba(0,0,0,.12);}}",
-				// 弹窗根自持文字色：portal 挂 document.body 后不再依赖侧栏祖先的 color 继承（ocr medium）
+				// 浏览面板根自持文字色：PiP 独立文档挂 body 后无侧栏祖先 color 可继承（内嵌/浮窗两态共用）
 				".dbt-browse-root{color:var(--dbt-text);}",
 				"/* ===== 根容器 ===== */",
-				".dbt-panel{font-size:13px;line-height:1.45;display:flex;flex-direction:column;gap:12px;padding:16px;height:100%;box-sizing:border-box;overflow-y:auto;}",
+				".dbt-panel{font-size:13px;line-height:1.45;display:flex;flex-direction:column;gap:10px;padding:16px;height:100%;box-sizing:border-box;overflow-y:auto;}",
 				"/* ===== iOS segmented control（顶部 tab） ===== */",
 				".dbt-tabs{display:flex;gap:2px;background:var(--dbt-surface);border-radius:var(--dbt-radius-ctrl);padding:2px;}",
 				".dbt-tabs button{flex:1;border:none;background:transparent;color:inherit;border-radius:var(--dbt-radius-pill);padding:5px 8px;font-size:12px;font-weight:500;cursor:pointer;transition:all .18s var(--dbt-ease);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}",
 				".dbt-tabs button.active{background:var(--dbt-seg-active);font-weight:600;box-shadow:0 1px 3px rgba(0,0,0,.12);}",
 				"/* ===== inset grouped 卡片 ===== */",
-				".dbt-card{background:var(--dbt-surface);border:none;border-radius:var(--dbt-radius-card);padding:12px;display:flex;flex-direction:column;gap:10px;}",
+				".dbt-card{background:var(--dbt-surface);border:none;border-radius:var(--dbt-radius-card);padding:12px;display:flex;flex-direction:column;gap:8px;}",
 				".dbt-row{display:flex;gap:8px;align-items:center;flex-wrap:wrap;}",
+				"/* ===== 共享列布局（T1 逐步替换各视图内联 flex-column） ===== */",
+				".dbt-col{display:flex;flex-direction:column;gap:8px;}",
+				".dbt-col.dbt-col-tight{gap:2px;}",
 				"/* ===== 填充式无边框输入 ===== */",
-				".dbt-row input,.dbt-row select,.dbt-card input,.dbt-card select,.dbt-card textarea,.dbt-group input,.dbt-group select{flex:1;min-width:60px;background:var(--dbt-surface-strong);border:none;color:inherit;border-radius:var(--dbt-radius-ctrl);padding:6px 10px;font-size:13px;font-family:inherit;transition:all .18s var(--dbt-ease);}",
+				".dbt-row input,.dbt-row select,.dbt-card input,.dbt-card select,.dbt-card textarea,.dbt-group input,.dbt-group select{flex:1;min-width:60px;background:var(--dbt-surface-strong);border:none;color:inherit;border-radius:var(--dbt-radius-ctrl);padding:5px 12px;font-size:13px;font-family:inherit;transition:all .18s var(--dbt-ease);}",
 				".dbt-row input:focus,.dbt-row select:focus,.dbt-card input:focus,.dbt-card select:focus,.dbt-card textarea:focus,.dbt-group input:focus,.dbt-group select:focus{outline:2px solid var(--dbt-accent);outline-offset:-1px;}",
 				".dbt-card textarea{font-family:var(--dbt-mono);min-height:96px;resize:vertical;}",
 				"/* ===== 按钮 ===== */",
@@ -350,24 +347,25 @@ window.__ModuleLoader__.load({
 				".dbt-btn.danger:hover{background:rgba(255,69,58,.12);}",
 				".dbt-btn:disabled{opacity:.4;cursor:default;transform:none;}",
 				"/* ===== 文本反馈 ===== */",
+				".dbt-panel strong,.dbt-browse-root strong{font-size:13px;font-weight:600;}",
 				".dbt-muted,.dbt-readhint{color:var(--dbt-text-secondary);font-size:11px;}",
 				".dbt-err{color:var(--dbt-danger);font-size:12px;white-space:pre-wrap;}",
 				".dbt-msg{color:var(--dbt-success);font-size:12px;white-space:pre-wrap;}",
 				"/* ===== 行 hairline 表格 + 毛玻璃 sticky 表头 ===== */",
 				".dbt-table{width:100%;border-collapse:collapse;font-size:12px;}",
-				".dbt-table th,.dbt-table td{border:none;border-bottom:1px solid var(--dbt-separator);padding:6px 8px;text-align:left;max-width:260px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}",
-				".dbt-table th{position:sticky;top:0;z-index:1;background:var(--dbt-th-bg);-webkit-backdrop-filter:blur(20px) saturate(180%);backdrop-filter:blur(20px) saturate(180%);font-weight:600;font-size:11px;}",
+				".dbt-table th,.dbt-table td{border:none;border-bottom:1px solid var(--dbt-separator);padding:7px 10px;text-align:left;max-width:260px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}",
+				".dbt-table th{position:sticky;top:0;z-index:1;background:var(--dbt-th-bg);-webkit-backdrop-filter:blur(20px) saturate(180%);backdrop-filter:blur(20px) saturate(180%);font-weight:600;font-size:12px;}",
 				".dbt-table td{font-family:var(--dbt-mono);}",
 				".dbt-tablewrap{border:none;border-radius:var(--dbt-radius-card);overflow:auto;max-height:320px;background:var(--dbt-surface);}",
-				"/* ===== 浏览弹窗表格：列分明（列间 hairline + 表头加深一档 + 行 hover） ===== */",
+				"/* ===== 浏览面板表格：列分明（列间 hairline + 表头加深一档 + 行 hover） ===== */",
 				".dbt-browse-root .dbt-table th + th,.dbt-browse-root .dbt-table td + td{border-left:1px solid var(--dbt-separator);}",
-				".dbt-browse-root .dbt-table th{background:rgba(30,30,32,.85);font-size:12px;}",
-				".dbt-browse-root .dbt-table td{font-size:13px;padding:7px 10px;}",
+				".dbt-browse-root .dbt-table th{background:rgba(30,30,32,.85);}",
+				".dbt-browse-root .dbt-table td{font-size:12px;}",
 				".dbt-browse-root .dbt-table tbody tr:hover td{background:var(--dbt-surface-strong);}",
 				"@media (prefers-color-scheme: light){.dbt-browse-root .dbt-table th{background:rgba(242,242,247,.9);}}",
 				"/* ===== 对话框（macOS alert 材质） ===== */",
 				".dbt-overlay{position:fixed;inset:0;background:rgba(0,0,0,.4);-webkit-backdrop-filter:blur(8px);backdrop-filter:blur(8px);display:flex;align-items:center;justify-content:center;z-index:9999;}",
-				".dbt-dialog{background:var(--dbt-dialog-bg);color:inherit;border:1px solid var(--dbt-separator);border-radius:14px;padding:16px;max-width:460px;width:90%;box-sizing:border-box;display:flex;flex-direction:column;gap:10px;font-size:13px;-webkit-backdrop-filter:blur(20px) saturate(180%);backdrop-filter:blur(20px) saturate(180%);box-shadow:var(--dbt-shadow);}",
+				".dbt-dialog{background:var(--dbt-dialog-bg);color:inherit;border:1px solid var(--dbt-separator);border-radius:var(--dbt-radius-card);padding:16px;max-width:460px;width:90%;box-sizing:border-box;display:flex;flex-direction:column;gap:10px;font-size:13px;-webkit-backdrop-filter:blur(20px) saturate(180%);backdrop-filter:blur(20px) saturate(180%);box-shadow:var(--dbt-shadow);}",
 				".dbt-dialog pre{background:var(--dbt-surface-strong);border-radius:var(--dbt-radius-pill);padding:8px;font-family:var(--dbt-mono);font-size:12px;white-space:pre-wrap;word-break:break-all;max-height:160px;overflow:auto;}",
 				".dbt-dialog .dbt-row{justify-content:flex-end;}",
 				"/* ===== 授权/连接列表：inset grouped（一张卡多行 hairline） ===== */",
@@ -377,7 +375,7 @@ window.__ModuleLoader__.load({
 				".dbt-listrow:hover{background:var(--dbt-surface-strong);}",
 				".dbt-tree{display:flex;flex-direction:column;}",
 				"/* ===== Navicat 式对象树（数据浏览） ===== */",
-				".dbt-treerow{display:flex;gap:6px;align-items:center;padding:8px 14px;font-size:14px;cursor:pointer;user-select:none;border-bottom:1px solid var(--dbt-separator);transition:background .15s var(--dbt-ease);}",
+				".dbt-treerow{display:flex;gap:6px;align-items:center;padding:10px 12px;font-size:13px;cursor:pointer;user-select:none;border-bottom:1px solid var(--dbt-separator);transition:background .15s var(--dbt-ease);}",
 				".dbt-treerow:last-child{border-bottom:none;}",
 				".dbt-treerow:hover{background:var(--dbt-surface-strong);}",
 				".dbt-treerow.active{color:var(--dbt-accent);font-weight:600;}",
@@ -385,34 +383,27 @@ window.__ModuleLoader__.load({
 				".dbt-chev.open{transform:rotate(90deg);}",
 				".dbt-chev.leaf{visibility:hidden;}",
 				".dbt-treename{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}",
-				/* ===== Navicat 式浏览弹窗 ===== */
-				".dbt-browse-dialog{position:fixed;z-index:2147483000;width:min(1100px,calc(100vw - 48px));height:min(720px,calc(100vh - 48px));min-width:min(680px,calc(100vw - 16px));min-height:min(420px,calc(100vh - 16px));background:var(--dbt-dialog-bg);color:inherit;border:1px solid var(--dbt-separator);border-radius:16px;box-shadow:0 24px 64px rgba(0,0,0,.32),0 4px 16px rgba(0,0,0,.18);-webkit-backdrop-filter:blur(20px) saturate(180%);backdrop-filter:blur(20px) saturate(180%);display:flex;flex-direction:column;overflow:hidden;box-sizing:border-box;font-size:14px;animation:dbt-in .22s var(--dbt-ease);}",
-				".dbt-browse-dialog.dragging{user-select:none;}",
-				".dbt-browse-header{flex:none;display:flex;align-items:center;gap:10px;padding:12px 16px;border-bottom:1px solid var(--dbt-separator);}",
-				".dbt-browse-title{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-weight:600;font-size:17px;}",
-				".dbt-browse-close{flex:none;width:26px;height:26px;display:flex;align-items:center;justify-content:center;border:none;background:transparent;color:var(--dbt-text-secondary);border-radius:var(--dbt-radius-pill);cursor:pointer;transition:all .18s var(--dbt-ease);}",
-				".dbt-browse-close:hover{background:var(--dbt-surface-strong);color:inherit;}",
-				".dbt-browse-close:active{transform:scale(.92);}",
-				".dbt-browse-body{flex:1;min-height:0;display:flex;}",
-				".dbt-browse-tree{flex:none;width:260px;overflow-y:auto;border-right:1px solid var(--dbt-separator);}",
-				".dbt-browse-main{flex:1;min-width:0;display:flex;flex-direction:column;}",
-				".dbt-browse-tabs{flex:none;padding:10px 14px 0;}",
-				".dbt-browse-content{flex:1;min-height:0;position:relative;display:flex;flex-direction:column;gap:10px;padding:12px 14px;overflow:hidden;}",
-				".dbt-browse-tablewrap{flex:1;min-height:0;overflow:auto;border:none;border-radius:var(--dbt-radius-card);background:var(--dbt-surface);}",
-				".dbt-browse-footer{flex:none;display:flex;align-items:center;gap:8px;padding:10px 14px;border-top:1px solid var(--dbt-separator);}",
-				".dbt-browse-empty{flex:1;display:flex;align-items:center;justify-content:center;color:var(--dbt-text-secondary);font-size:13px;}",
-				".dbt-browse-errorbox{flex:1;display:flex;flex-direction:column;gap:10px;align-items:flex-start;justify-content:center;}",
+				/* ===== Navicat 式浏览（内嵌面板，纵向流式；浮窗壳类已随 DOM 回收） ===== */
+				".dbt-browse-body{display:flex;flex-direction:column;gap:10px;min-height:0;}",
+				".dbt-browse-tree{flex:none;max-height:280px;overflow-y:auto;background:var(--dbt-surface);border-radius:var(--dbt-radius-card);}",
+				".dbt-browse-main{flex:1;min-height:0;display:flex;flex-direction:column;gap:8px;}",
+				".dbt-browse-tabs{flex:none;}",
+				".dbt-browse-content{flex:1;min-height:0;position:relative;display:flex;flex-direction:column;}",
+				".dbt-browse-tablewrap{flex:none;max-height:320px;overflow:auto;border:none;border-radius:var(--dbt-radius-card);background:var(--dbt-surface);}",
+				".dbt-browse-footer{flex:none;display:flex;align-items:center;gap:8px;padding:8px 12px;background:var(--dbt-surface);border-radius:var(--dbt-radius-ctrl);}",
+				".dbt-browse-empty{display:flex;align-items:center;justify-content:center;color:var(--dbt-text-secondary);font-size:13px;padding:24px 12px;}",
+				".dbt-browse-errorbox{display:flex;flex-direction:column;gap:8px;align-items:flex-start;}",
 				".dbt-browse-skel{display:flex;flex-direction:column;gap:8px;}",
 				".dbt-browse-skelrow{display:flex;gap:8px;}",
 				".dbt-browse-skelcell{flex:1;height:24px;background:var(--dbt-surface-strong);border-radius:var(--dbt-radius-pill);}",
-				"/* ===== 浏览弹窗：单元格查看/编辑浮层（定位锚点为 .dbt-browse-content） ===== */",
+				"/* ===== 浏览面板：单元格按钮与详情底栏（Apple 分区卡） ===== */",
 				".dbt-cellbtn{border:none;background:transparent;color:inherit;font:inherit;padding:0;margin:0;cursor:pointer;max-width:260px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block;width:100%;text-align:left;}",
 				".dbt-cellbtn:focus-visible{outline:2px solid var(--dbt-accent);outline-offset:-1px;border-radius:2px;}",
-				".dbt-cellpop{position:absolute;z-index:20;width:min(460px,100%);background:var(--dbt-dialog-bg);border:1px solid var(--dbt-separator);border-radius:12px;box-shadow:0 12px 40px rgba(0,0,0,.3);-webkit-backdrop-filter:blur(20px) saturate(180%);backdrop-filter:blur(20px) saturate(180%);padding:12px;display:flex;flex-direction:column;gap:8px;box-sizing:border-box;font-size:13px;}",
-				".dbt-cellpop-value{font-family:var(--dbt-mono);font-size:13px;white-space:pre-wrap;word-break:break-all;max-height:240px;overflow:auto;background:var(--dbt-surface-strong);border-radius:8px;padding:8px;}",
-				".dbt-cellpop-actions{display:flex;gap:8px;align-items:center;}",
+				".dbt-celldetail{margin-top:10px;padding:12px;background:var(--dbt-surface);border-radius:var(--dbt-radius-card);display:flex;flex-direction:column;gap:8px;}",
+				".dbt-celldetail-input{font-family:var(--dbt-mono);font-size:12px;min-height:72px;resize:vertical;background:var(--dbt-surface-strong);border:none;color:inherit;border-radius:var(--dbt-radius-ctrl);padding:8px;width:100%;box-sizing:border-box;}",
+				".dbt-celldetail-input:focus{outline:2px solid var(--dbt-accent);outline-offset:-1px;}",
 				".dbt-celledit{display:flex;flex-direction:column;gap:8px;}",
-				".dbt-celledit textarea{font-family:var(--dbt-mono);font-size:13px;min-height:96px;resize:vertical;background:var(--dbt-surface-strong);border:none;color:inherit;border-radius:8px;padding:8px;}",
+				".dbt-celledit textarea{font-family:var(--dbt-mono);font-size:13px;min-height:96px;resize:vertical;background:var(--dbt-surface-strong);border:none;color:inherit;border-radius:var(--dbt-radius-ctrl);padding:5px 12px;}",
 				".dbt-celledit textarea:focus{outline:2px solid var(--dbt-accent);outline-offset:-1px;}",
 				".dbt-nullchip{display:inline-flex;align-items:center;border:1px solid var(--dbt-warning);color:var(--dbt-warning);border-radius:999px;padding:1px 8px;font-size:11px;font-weight:600;}",
 				"/* ===== 视图切换入场（仅 transform/opacity；reduced-motion 全局已禁） ===== */",
@@ -420,12 +411,11 @@ window.__ModuleLoader__.load({
 				".dbt-view{display:flex;flex-direction:column;gap:10px;animation:dbt-in .22s var(--dbt-ease);}",
 				"/* ===== mini segmented（ro/rw 等切换） ===== */",
 				".dbt-seg{display:flex;gap:2px;background:var(--dbt-surface);border-radius:var(--dbt-radius-ctrl);padding:2px;}",
-				".dbt-seg button{flex:none;border:none;background:transparent;color:inherit;font-size:11px;padding:3px 10px;border-radius:var(--dbt-radius-pill);cursor:pointer;transition:all .18s var(--dbt-ease);}",
+				".dbt-seg button{flex:none;border:none;background:transparent;color:inherit;font-size:12px;padding:5px 12px;border-radius:var(--dbt-radius-pill);cursor:pointer;transition:all .18s var(--dbt-ease);}",
 				".dbt-seg button.active{background:var(--dbt-seg-active);font-weight:600;box-shadow:0 1px 3px rgba(0,0,0,.12);}",
-				".dbt-browse-root .dbt-seg button{font-size:12px;padding:4px 12px;}",
 				"/* ===== 降级：透明度减弱 / 动效减弱 ===== */",
-				"@media (prefers-reduced-transparency: reduce){.dbt-overlay{backdrop-filter:none;-webkit-backdrop-filter:none;background:rgba(0,0,0,.55);}.dbt-dialog,.dbt-browse-dialog,.dbt-cellpop{backdrop-filter:none;-webkit-backdrop-filter:none;background:#2c2c2e;}.dbt-table th{backdrop-filter:none;-webkit-backdrop-filter:none;background:#1e1e20;}.dbt-browse-root .dbt-table th{background:#1e1e20;}}",
-				"@media (prefers-color-scheme: light) and (prefers-reduced-transparency: reduce){.dbt-dialog,.dbt-browse-dialog,.dbt-cellpop{background:#f5f5f7;}.dbt-table th,.dbt-browse-root .dbt-table th{background:#f2f2f7;}}",
+				"@media (prefers-reduced-transparency: reduce){.dbt-overlay{backdrop-filter:none;-webkit-backdrop-filter:none;background:rgba(0,0,0,.55);}.dbt-dialog{backdrop-filter:none;-webkit-backdrop-filter:none;background:#2c2c2e;}.dbt-celldetail{background:#2c2c2e;}.dbt-table th{backdrop-filter:none;-webkit-backdrop-filter:none;background:#1e1e20;}.dbt-browse-root .dbt-table th{background:#1e1e20;}}",
+				"@media (prefers-color-scheme: light) and (prefers-reduced-transparency: reduce){.dbt-dialog{background:#f5f5f7;}.dbt-celldetail{background:#f2f2f7;}.dbt-table th,.dbt-browse-root .dbt-table th{background:#f2f2f7;}}",
 				"@media (prefers-reduced-motion: reduce){.dbt-panel *,.dbt-browse-root *{transition:none!important;animation:none!important;}.dbt-btn:active{transform:none;}}",
 			].join("\n");
 			document.head.appendChild(styleEl);
@@ -460,79 +450,6 @@ window.__ModuleLoader__.load({
 			);
 		}
 
-		// --- 弹窗挂载：优先 createPortal 挂 document.body（避免侧栏容器裁剪）；宿主未提供 react-dom 时回退 Panel 内 fixed overlay（DangerDialog 同模式） ---
-		// 三重降级解析（模块级缓存，全模块一次）：①模块加载时同步 require（dsh.client.inject 声明 react-dom 后应成功）
-		// ②宿主模块系统异步 import（ctx.modules，宿主 rc.8+ 提供）③均不可用则保持 Panel 内回退渲染。
-		let portalImpl = null;      // 解析成功的 createPortal（缓存，全模块一次）
-		let portalTried = false;    // 是否已尝试解析（异步 import 只发起一次）
-		let portalPending = null;   // 订阅解析成功的回调列表
-		try {
-			var rd = require("react-dom");
-			if (rd && typeof rd.createPortal === "function") { portalImpl = rd.createPortal.bind(rd); portalTried = true; }
-		} catch (e) { /* 留 null，等异步解析 */ }
-		function resolvePortalAsync(ctx) {
-			if (portalTried) return;
-			portalTried = true;
-			if (portalImpl) return;
-			var mods = ctx && ctx.modules;
-			var p = mods && typeof mods.import === "function" ? mods.import("react-dom") : null;
-			if (p && typeof p.then === "function") {
-				p.then(function (m) {
-					if (m && typeof m.createPortal === "function") {
-						portalImpl = m.createPortal.bind(m);
-						var waiters = portalPending || []; portalPending = null;
-						for (var i = 0; i < waiters.length; i++) waiters[i]();
-					}
-				}).catch(function () { /* 解析失败保持回退渲染 */ });
-			}
-		}
-		function onPortalReady(cb) {
-			if (portalImpl) { cb(); return; }
-			(portalPending = portalPending || []).push(cb);
-		}
-		function mountDialog(children) {
-			return (portalImpl && !portalDisabled) ? portalImpl(children, document.body) : children;
-		}
-		// PiP 独立窗口渲染时禁 portal：PiP root 本身就挂在 pipDoc.body 上，再 portal 回主 document 会把 DOM 拉出独立窗口
-		let portalDisabled = false;
-		// createRoot 三重解析（PiP 独立窗口需要独立 React root，结构对齐上方 portal 解析）：
-		// ①模块加载时同步 require react-dom → react-dom/client（宿主按 specifier 解析，两者是不同键）
-		// ②宿主模块系统异步 import("react-dom/client") ③均不可用则 PiP 超时降级 DOM 浮窗
-		let reactCreateRoot = null;
-		let rootTried = false;    // 异步 import 只发起一次
-		let rootPending = null;   // 订阅解析成功的回调列表
-		let rootSource = null;    // 就绪方式：sync / async / null（未就绪，诊断日志用）
-		try {
-			var rd2 = require("react-dom");
-			if (rd2 && typeof rd2.createRoot === "function") {
-				reactCreateRoot = rd2.createRoot.bind(rd2); rootTried = true; rootSource = "sync";
-			} else {
-				try { var rdc = require("react-dom/client"); if (rdc && typeof rdc.createRoot === "function") { reactCreateRoot = rdc.createRoot.bind(rdc); rootTried = true; rootSource = "sync"; } } catch (e2) { /* 保持 null */ }
-			}
-		} catch (e) { /* 保持 null，等异步解析 */ }
-		function resolveRootAsync(ctx) {
-			if (rootTried) return;
-			rootTried = true;
-			if (reactCreateRoot) return;
-			var mods = ctx && ctx.modules;
-			var p = mods && typeof mods.import === "function" ? mods.import("react-dom/client") : null;
-			if (p && typeof p.then === "function") {
-				p.then(function (m) {
-					if (m && typeof m.createRoot === "function") {
-						reactCreateRoot = m.createRoot.bind(m);
-						rootSource = "async";
-						var waiters = rootPending || []; rootPending = null;
-						for (var i = 0; i < waiters.length; i++) waiters[i]();
-					}
-				}).catch(function () { /* 解析失败，PiP 走超时降级 */ });
-			}
-		}
-		function onRootReady(cb) {
-			if (reactCreateRoot) { cb(); return; }
-			(rootPending = rootPending || []).push(cb);
-		}
-		let pipResult = "not-tried"; // 最近一次 PiP 尝试结果：opened / rejected:<err.name>（诊断日志用）
-
 		/* ---------------- 连接管理 ---------------- */
 		const EMPTY_FORM = { id: "", kind: "mysql", name: "", mode: "url", url: "", urlUser: "", urlPassword: "", host: "", port: "", user: "", password: "", database: "", ssl: false };
 
@@ -866,7 +783,7 @@ window.__ModuleLoader__.load({
 						draftTest && draftTest.ok === null ? t("testing") : t("test")),
 					React.createElement("button", { className: "dbt-btn", onClick: props.onCancel }, t("cancel")),
 					draftTest && draftTest.ok !== null
-						? React.createElement("span", { style: { color: draftTest.ok ? "var(--dbt-success, #30d158)" : "var(--dbt-danger, #ff453a)", fontSize: 12, alignSelf: "center" } }, draftTest.msg)
+						? React.createElement("span", { className: draftTest.ok ? "dbt-msg" : "dbt-err" }, draftTest.msg)
 						: null,
 				),
 			);
@@ -958,7 +875,7 @@ window.__ModuleLoader__.load({
 										{ className: "dbt-muted", style: { fontFamily: MONO_FONT, fontSize: 11, wordBreak: "break-all" } },
 										c.safeUrl || (c.host + ":" + (c.port || "")),
 									) : null,
-									testInfo[c.id] ? React.createElement("div", { style: { fontSize: 12, color: testInfo[c.id].startsWith("✓") ? "var(--dbt-success, #30d158)" : "var(--dbt-danger, #ff453a)" } }, testInfo[c.id]) : null,
+									testInfo[c.id] ? React.createElement("div", { className: testInfo[c.id].startsWith("✓") ? "dbt-msg" : "dbt-err" }, testInfo[c.id]) : null,
 								),
 								// 右列：动作按钮（次要语义，danger 仅删除）
 								React.createElement(
@@ -1038,7 +955,7 @@ window.__ModuleLoader__.load({
 		}
 
 		/* ---------------- 数据浏览 ---------------- */
-		// Navicat 式对象树：连接 ▸ 库/[schema] ▸ 表，懒加载展开（弹窗唯一实例，展开状态随弹窗生命周期）
+		// Navicat 式对象树：连接 ▸ 库/[schema] ▸ 表，懒加载展开（浏览面板唯一树实例，展开状态随面板生命周期）
 		function BrowseTree(props) {
 			const { conns, projectPath, sel, onSelect, autoExpand } = props;
 			// sel 由父组件持有（弹窗内 active 高亮与初始选中都依赖）；onSelect(选中记录, 触发元素) 上报
@@ -1186,7 +1103,7 @@ window.__ModuleLoader__.load({
 			return React.createElement(
 				"div",
 				{ style: { display: "flex", flexDirection: "column", gap: 8 } },
-				// Navicat 式对象树：点击展开连接/库，点击表上报选中（由父组件决定打开弹窗）
+				// Navicat 式对象树：点击展开连接/库，点击表上报选中（由父组件就地预览）
 				conns.length === 0 ? React.createElement("div", { className: "dbt-muted" }, t("noConns")) :
 					React.createElement("div", { className: "dbt-group" },
 						React.createElement("div", { className: "dbt-tree" }, treeRows)),
@@ -1208,9 +1125,8 @@ window.__ModuleLoader__.load({
 		};
 		function PreviewGrid(props) {
 			const { preview, schema, kind, editable, tableType, tableName, dbRef, schemaName, connId, projectPath, onSaved, askConfirm } = props;
-			const [pop, setPop] = React.useState(null); // {rowIdx, colName, cell} 单元格浮层
-			const [editing, setEditing] = React.useState(false);
-			const [text, setText] = React.useState(""); // 编辑态 textarea 值（进入浮层时就位）
+			const [sel, setSel] = React.useState(null); // {rowIdx, colName, cell} 底部详情栏当前单元格（null=收起底栏）
+			const [text, setText] = React.useState(""); // 详情栏 textarea 值（选中即就位）
 			const [editNull, setEditNull] = React.useState(false); // 「设为 NULL」勾选（null 单元格默认勾选）
 			const [cellErr, setCellErr] = React.useState("");
 			const [busy, setBusy] = React.useState(false);
@@ -1221,23 +1137,23 @@ window.__ModuleLoader__.load({
 				? schema.filter((c) => c && c.key === "PRI").map((c) => c.name)
 				: [];
 
-			// 打开浮层（查看态）：编辑态初值一并就位——textarea 空 ↔ 勾选设为 NULL
-			function openCell(rowIdx, colName, cell) {
-				setPop({ rowIdx, colName, cell });
-				setEditing(false);
+			// 点单元格开合底栏：同格再点收起；新格选中即把 textarea 初值就位——textarea 空 ↔ 勾选设为 NULL
+			function toggleCell(rowIdx, colName, cell) {
 				setCellErr("");
+				if (sel && sel.rowIdx === rowIdx && sel.colName === colName) { setSel(null); return; }
+				setSel({ rowIdx, colName, cell });
 				setEditNull(cell === null);
 				setText(cell === null ? "" : String(cell));
 			}
 			function copyCell() {
-				if (!pop) return;
-				navigator.clipboard.writeText(String(pop.cell)).then(() => {
+				if (!sel) return;
+				navigator.clipboard.writeText(String(sel.cell)).then(() => {
 					setCopied(true);
 					window.setTimeout(() => setCopied(false), 1500);
 				}, () => { /* 剪贴板不可用（无权限等）：静默，按钮文案不变 */ });
 			}
 
-			// 单元格编辑资格：返回 null=可编辑，否则为原因 i18n key（浮层 .dbt-readhint 展示）
+			// 单元格编辑资格：返回 null=可编辑，否则为原因 i18n key（底栏 .dbt-readhint 展示）
 			function cellReason(colName, shown) {
 				if (!editable || !dialectOf(kind)) return "readOnlyRo";
 				if (isMongo) return colName === "_id" ? "readOnlyRo" : null;
@@ -1252,11 +1168,11 @@ window.__ModuleLoader__.load({
 				return null;
 			}
 
-			// 保存：构造写回命令（按 kind 分派）→ 顺序执行（redis 两步）→ 全部成功关浮层并回调 onSaved
+			// 保存：构造写回命令（按 kind 分派）→ 顺序执行（redis 两步）→ 全部成功收起底栏并回调 onSaved
 			async function saveCell() {
-				if (!pop) return;
+				if (!sel) return;
 				setCellErr("");
-				const { rowIdx, colName } = pop;
+				const { rowIdx, colName } = sel;
 				const row = (preview.rows || [])[rowIdx] || [];
 				let r;
 				if (kind === "redis") {
@@ -1281,26 +1197,32 @@ window.__ModuleLoader__.load({
 							askConfirm,
 						);
 					}
-					setPop(null);
+					setSel(null);
 					if (onSaved) onSaved();
 				} catch (e) {
-					// 取消确认（e.cancelled）不算失败：浮层保持打开供重试
+					// 取消确认（e.cancelled）不算失败：底栏保持打开供重试
 					if (!e.cancelled) setCellErr(t("error") + ": " + String(e && e.message ? e.message : e));
 				} finally {
 					setBusy(false);
 				}
 			}
 
-			const popReason = pop ? cellReason(pop.colName, pop.cell === null ? "NULL" : String(pop.cell)) : null;
+			// 切表/翻页联动：预览数据引用变化即收起底栏，避免行号错位指向旧行
+			React.useEffect(() => { setSel(null); }, [preview]);
+
+			const shown = sel ? (sel.cell === null ? "NULL" : String(sel.cell)) : null;
+			const selReason = sel ? cellReason(sel.colName, shown) : null;
+			// 截断/BLOB 独立提示：命中即补显，若已作为只读原因展示过则不再重复
+			const truncHint = !sel ? null : isTruncatedCell(shown) ? "truncatedNoEdit" : isBlobCell(shown) ? "blobNoEdit" : null;
 			return React.createElement(
 				"div",
 				{ className: "dbt-browse-root", style: { display: "flex", flexDirection: "column", flex: 1, minHeight: 0 } },
-				// 顶层只读提示：授权为 ro 时整格只读，单元格仍可点击查看完整值
+				// 顶层只读提示：授权为 ro 时整格只读，单元格仍可点开底栏查看完整值
 				!editable ? React.createElement("div", { className: "dbt-readhint" }, t("readOnlyRo")) : null,
-				// relative 容器承载单元格浮层（简化定位：水平居中贴底）
+				// 预览表格区（flex:1 撑满剩余空间；底部详情栏在表格之后、面板流内）
 				React.createElement(
 					"div",
-					{ style: { position: "relative", flex: 1, minHeight: 0, display: "flex", flexDirection: "column" } },
+					{ style: { flex: 1, minHeight: 0, display: "flex", flexDirection: "column" } },
 					React.createElement(
 						"div",
 						{ className: "dbt-browse-tablewrap" },
@@ -1321,81 +1243,63 @@ window.__ModuleLoader__.load({
 											React.createElement("td", { key: j, title: row[j] === null ? "NULL" : String(row[j]) },
 												React.createElement("button", {
 													className: "dbt-cellbtn", type: "button",
-													onClick: () => openCell(i, colName, row[j]),
-												}, row[j] === null ? React.createElement("span", { className: "dbt-nullchip" }, "NULL") : String(row[j]))))),
+													onClick: () => toggleCell(i, colName, row[j]),
+												}, row[j] === null ? React.createElement("span", { className: "dbt-nullchip" }, "NULL") : String(row[j])))))),
 							),
 						),
 					),
-					pop ? React.createElement(
+				),
+				// 底部详情栏（Navicat/检查器式）：预览表格下方一栏，textarea 直接可编辑，点保存写回
+				sel ? React.createElement(
+					"div",
+					{ className: "dbt-celldetail" },
+					// 标题行：完整值 · 列名；null 单元格带 NULL 芯片；只读原因随之展示
+					React.createElement(
 						"div",
-						{ className: "dbt-cellpop", style: { position: "absolute", left: "50%", transform: "translateX(-50%)", bottom: 12 } },
-						React.createElement("strong", null, t("cellValue") + " · " + pop.colName),
-						React.createElement(
-							"div",
-							{ className: "dbt-cellpop-value" },
-							pop.cell === null ? React.createElement("span", { className: "dbt-nullchip" }, "NULL") : String(pop.cell),
-						),
-						popReason ? React.createElement("div", { className: "dbt-readhint" }, t(popReason)) : null,
-						cellErr ? React.createElement("div", { className: "dbt-err" }, cellErr) : null,
-						editing
-							? React.createElement(
-								"div",
-								{ className: "dbt-celledit" },
-								React.createElement("textarea", { value: text, onChange: (e) => setText(e.target.value) }),
-								React.createElement(
-									"label",
-									// 不用 .dbt-row：全局 input flex:1 会把 checkbox 拉伸占满、标签被推到远端（视觉审查命中）
-									{ style: { display: "flex", alignItems: "center", gap: 6, flexWrap: "nowrap", width: "fit-content" } },
-									React.createElement("input", { type: "checkbox", style: { flex: "none", minWidth: 0, width: "auto" }, checked: editNull, onChange: (e) => setEditNull(e.target.checked) }),
-									t("setNull"),
-								),
-								React.createElement(
-									"div",
-									{ className: "dbt-row" },
-									React.createElement("button", { className: "dbt-btn primary", disabled: busy, onClick: saveCell }, busy ? t("cellSaving") : t("save")),
-									React.createElement("button", { className: "dbt-btn", disabled: busy, onClick: () => setEditing(false) }, t("cancel")),
-								),
-							)
-							: React.createElement(
-								"div",
-								{ className: "dbt-cellpop-actions" },
-								React.createElement("button", { className: "dbt-btn", onClick: copyCell }, copied ? t("copied") : t("copyBtn")),
-								popReason === null ? React.createElement("button", { className: "dbt-btn primary", onClick: () => setEditing(true) }, t("editCell")) : null,
-								React.createElement("button", { className: "dbt-btn", onClick: () => setPop(null) }, t("close")),
-							),
-						) : null,
+						null,
+						React.createElement("strong", null, t("cellValue") + " · " + sel.colName),
+						sel.cell === null ? React.createElement("span", { className: "dbt-nullchip" }, "NULL") : null,
+						selReason ? React.createElement("span", { className: "dbt-readhint" }, t(selReason)) : null,
 					),
-				),
+					// 完整值编辑区：textarea 恒为编辑形态，不可编辑时只读
+					React.createElement("textarea", {
+						className: "dbt-celldetail-input",
+						value: text,
+						readOnly: selReason !== null,
+						onChange: (e) => setText(e.target.value),
+					}),
+					sel.cell === null ? React.createElement(
+						"label",
+						// 不用 .dbt-row：全局 input flex:1 会把 checkbox 拉伸占满、标签被推到远端（视觉审查命中）
+						{ style: { display: "flex", alignItems: "center", gap: 6, flexWrap: "nowrap", width: "fit-content" } },
+						React.createElement("input", { type: "checkbox", style: { flex: "none", minWidth: 0, width: "auto" }, checked: editNull, onChange: (e) => setEditNull(e.target.checked) }),
+						t("setNull"),
+					) : null,
+					truncHint && truncHint !== selReason ? React.createElement("span", { className: "dbt-readhint" }, t(truncHint)) : null,
+					cellErr ? React.createElement("span", { className: "dbt-err" }, cellErr) : null,
+					React.createElement(
+						"div",
+						{ className: "dbt-row" },
+						React.createElement("button", { className: "dbt-btn", onClick: copyCell }, copied ? t("copied") : t("copyBtn")),
+						selReason === null ? React.createElement("button", { className: "dbt-btn primary", disabled: busy, onClick: saveCell }, busy ? t("cellSaving") : t("save")) : null,
+						React.createElement("button", { className: "dbt-btn", onClick: () => setSel(null) }, t("close")),
+					),
+				) : null,
 			);
 		}
 
-		function BrowseDialog(props) {
-			const { conns, projectPath, grants, askConfirm, onClose, ctx } = props;
+		// Navicat 式浏览面板（内嵌侧边栏）：上半对象树选库-表，下半结构/数据预览，点表即看，不再弹窗
+		function BrowsePane(props) {
+			const { conns, projectPath, grants, askConfirm } = props;
 			// grants（editable 判定）与 askConfirm（单元格写回确认）下传 PreviewGrid
-			// portal 异步解析接入：portalReady 仅用于触发重渲染（mountDialog 内部读 portalImpl）。
-			// createPortal 不换组件实例——portalReady 切换前后是同一 DOM 节点，pos state 保持，居中定位不受 portal 重挂影响。
-			const [portalReady, setPortalReady] = React.useState(!!portalImpl);
-			React.useEffect(() => {
-				resolvePortalAsync(ctx);
-				resolveRootAsync(ctx);
-				onPortalReady(function () { setPortalReady(true); });
-				// 诊断：一次性输出（帮助真机排查 iframe 隔离与 portal/createRoot 解析结果、PiP 尝试结果）
-				if (!window.__dbtPortalDiag) {
-					window.__dbtPortalDiag = true;
-					console.info("[dbt] portal:", portalImpl ? "sync/async ok" : "unavailable",
-						"createRoot:", rootSource || "none", "pip:", pipResult,
-						"sameDoc:", window.top === window.self);
-				}
-			}, []);
-			const [sel, setSel] = React.useState(null); // 弹窗内当前选中（null=未选表，右栏显示引导空态）
+			const [sel, setSel] = React.useState(null); // 面板内当前选中（null=未选表，内容区显示引导空态）
 			const [view, setView] = React.useState("structure"); // structure | preview（纯视图切换，不影响数据加载）
 			const [schema, setSchema] = React.useState([]);
 			const [preview, setPreview] = React.useState(null); // QueryResult
 			const [page, setPage] = React.useState(1);
 			const [busy, setBusy] = React.useState("");
-			const [loadErr, setLoadErr] = React.useState(""); // 右栏加载失败（就地显示 + 重试）
+			const [loadErr, setLoadErr] = React.useState(""); // 内容区加载失败（就地显示 + 重试）
 			const openSeq = React.useRef(0); // 请求序号守卫
-			const closeRef = React.useRef(null);
 
 			// 请求序号守卫（沿用面板）：快速切表/翻页时丢弃晚到旧响应，防止旧数据覆盖新选中项
 			const openTable = React.useCallback((s, pg) => {
@@ -1412,59 +1316,16 @@ window.__ModuleLoader__.load({
 						if (seq !== openSeq.current) return; // 旧请求晚到，丢弃
 						setSchema(sch || []); setPreview(prev); setPage(pg || 1);
 					})
-					// 弹窗内错误就地显示（不走面板顶部错误区）
+					// 面板内错误就地显示（不走面板顶部错误区）
 					.catch((e) => { if (seq === openSeq.current) setLoadErr(String(e && e.message ? e.message : e)); })
 					.finally(() => { if (seq === openSeq.current) setBusy(""); });
 			}, [projectPath]);
 			React.useEffect(() => { if (sel) openTable(sel, 1); }, [sel]); // eslint-disable-line
 
-			// 非模态浮窗：无焦点陷阱（焦点可自由离开，主页交互不受阻）；Esc 仅在焦点位于弹窗内时
-			// 经容器 onKeyDown 触发（stopPropagation 防止宿主级快捷键同时响应）。初始焦点=关闭按钮
-			React.useEffect(() => {
-				if (closeRef.current) closeRef.current.focus();
-			}, []);
-
-			// 拖动定位：首帧给个保守值，mount 后按浮窗实测尺寸居中（坐标基准取浮窗所在 document 的视口——DOM 浮窗为主视口，PiP 独立窗口为 PiP 视口）
-			const dialogRef2 = React.useRef(null);
-			const [pos, setPos] = React.useState(() => ({ top: 72, left: 12 }));
-			React.useEffect(() => {
-				const el = dialogRef2.current;
-				if (!el) return;
-				const view = (el.ownerDocument && el.ownerDocument.defaultView) || window;
-				const w = view.innerWidth || 1200, h = view.innerHeight || 800;
-				setPos({
-					top: Math.max(0, Math.round((h - el.offsetHeight) / 2)),
-					left: Math.max(0, Math.round((w - el.offsetWidth) / 2)),
-				});
-			}, []);
-			const draggingRef = React.useRef(null); // {dx, dy}
-			const [dragging, setDragging] = React.useState(false);
-			function stopDrag() { draggingRef.current = null; setDragging(false); }
-			function onHeaderPointerDown(e) {
-				// header 内可点元素（关闭按钮）不启动拖动，否则 setPointerCapture 会把 click 重定向到 header 使按钮失效
-				if (e.target.closest && e.target.closest("button")) return;
-				draggingRef.current = { dx: e.clientX - pos.left, dy: e.clientY - pos.top };
-				e.currentTarget.setPointerCapture(e.pointerId);
-				setDragging(true);
-			}
-			function onHeaderPointerMove(e) {
-				if (!draggingRef.current) return;
-				const view = (e.currentTarget.ownerDocument && e.currentTarget.ownerDocument.defaultView) || window;
-				const h = view.innerHeight || 800, w = view.innerWidth || 1200;
-				// clamp 全部用浮窗实测尺寸：整体保持在视口内（窄视口下常量估宽会把窗拖丢）
-				const dlg = e.currentTarget.parentElement;
-				const dlgH = (dlg && dlg.offsetHeight) || 720;
-				const dlgW = (dlg && dlg.offsetWidth) || 1100;
-				setPos({
-					top: Math.min(Math.max(e.clientY - draggingRef.current.dy, 0), Math.max(0, h - dlgH)),
-					left: Math.min(Math.max(e.clientX - draggingRef.current.dx, 0), Math.max(0, w - dlgW)),
-				});
-			}
-
-			// 右栏互斥状态：未选中引导 / 加载骨架 / 错误重试 / 空态 / 表格
+			// 内容区互斥状态：未选中引导 / 加载骨架 / 错误重试 / 空态 / 表格
 			function rightPane() {
 				if (!sel && busy !== "open" && !loadErr) {
-					// 未选表：显示引导空态（浏览窗口可直接打开，不强制先选表）
+					// 未选表：显示引导空态（内嵌面板可直接浏览，不强制先选表）
 					return React.createElement("div", { className: "dbt-browse-empty" }, t("selectTableHint"));
 				}
 				if (busy === "open") {
@@ -1474,7 +1335,7 @@ window.__ModuleLoader__.load({
 							[0, 1, 2, 3, 4, 5].map((c) => React.createElement("div", { className: "dbt-browse-skelcell", key: c })))));
 				}
 				if (loadErr) {
-					// 错误就地显示 + 重试（弹窗遮罩下面板顶部错误区不可见，不走 props.onError）
+					// 错误就地显示 + 重试（内嵌面板保持就地呈现，不走 props.onError）
 					return React.createElement("div", { className: "dbt-browse-errorbox" },
 						React.createElement("div", { className: "dbt-err" }, t("error") + ": " + loadErr),
 						React.createElement("button", { className: "dbt-btn", onClick: () => openTable(sel, 1) }, t("retry")));
@@ -1506,168 +1367,49 @@ window.__ModuleLoader__.load({
 				});
 			}
 
-			// 非模态浮窗：无遮罩、fixed 定位、可拖动；portal 到 body 不受侧栏视图切换影响
-			return mountDialog(React.createElement(
+			// 内嵌面板纵向布局：上半对象树（限高滚动，容器类名留给样式层），下半预览主区 + 分页
+			return React.createElement(
 				"div",
-				{
-					className: "dbt-browse-root dbt-browse-dialog" + (dragging ? " dragging" : ""),
-					ref: dialogRef2,
-					style: { position: "fixed", top: pos.top, left: pos.left },
-					role: "dialog", "aria-labelledby": "dbt-browse-title",
-					onKeyDown: (e) => {
-						if (e.key === "Escape") { e.stopPropagation(); onClose(); }
-					},
-				},
-				// ---- header：面包屑 + 关闭（整条 header 可拖动）----
+				{ className: "dbt-view" },
 				React.createElement(
 					"div",
-					{
-						className: "dbt-browse-header",
-						style: { cursor: dragging ? "grabbing" : "grab" },
-						onPointerDown: onHeaderPointerDown,
-						onPointerMove: onHeaderPointerMove,
-						onPointerUp: stopDrag,
-						onPointerCancel: stopDrag,
-					},
-					React.createElement("div", { className: "dbt-browse-title", id: "dbt-browse-title" },
-						!sel ? t("viewBrowse") : t("browseDialogTitle", {
-							conn: (conns.find((c) => c.id === sel.connId) || {}).name || sel.connId,
-							db: sel.schemaName ? sel.db + "." + sel.schemaName : sel.db,
-							table: sel.table.name,
-						})),
-						React.createElement(
-							"button",
-							{ className: "dbt-browse-close", ref: closeRef, "aria-label": t("close"), onClick: onClose },
-							React.createElement("svg", { width: 12, height: 12, viewBox: "0 0 12 12", fill: "none", "aria-hidden": "true" },
-								React.createElement("path", { d: "M2.5 2.5 L9.5 9.5 M9.5 2.5 L2.5 9.5", stroke: "currentColor", strokeWidth: 1.4, strokeLinecap: "round" })),
-						),
-					),
-					// ---- body：左树 + 右主区 ----
+					{ style: { maxHeight: 280, overflowY: "auto" } },
+					React.createElement(BrowseTree, {
+						conns, projectPath, sel, autoExpand: true, // 内嵌后此树是唯一树实例，挂载即展开第一层级
+						onSelect: (s) => setSel(s), // 树内切表
+					}),
+				),
+				React.createElement(
+					"div",
+					{ className: "dbt-browse-main" },
+					// 结构/数据：mini segmented（复用面板同款与 i18n key）
 					React.createElement(
 						"div",
-						{ className: "dbt-browse-body" },
-						React.createElement(
-							"div",
-							{ className: "dbt-browse-tree" },
-							React.createElement(BrowseTree, {
-								conns, projectPath, sel, autoExpand: true, // 本任务后弹窗树是唯一树实例，挂载即展开第一层级
-								onSelect: (s) => setSel(s), // 弹窗内树切表
-							}),
-						),
+						{ className: "dbt-browse-tabs" },
 						React.createElement(
 							"div",
-							{ className: "dbt-browse-main" },
-							// 结构/数据：mini segmented（复用面板同款与 i18n key）
-							React.createElement(
-								"div",
-								{ className: "dbt-browse-tabs" },
-								React.createElement(
-									"div",
-									{ className: "dbt-seg" },
-									["structure", "preview"].map((v) =>
-										React.createElement("button", { key: v, className: view === v ? "active" : "", onClick: () => setView(v) },
-											v === "structure" ? t("structure") : t("preview"))),
-								),
-							),
-							React.createElement("div", { className: "dbt-browse-content" }, rightPane()),
+							{ className: "dbt-seg" },
+							["structure", "preview"].map((v) =>
+								React.createElement("button", { key: v, className: view === v ? "active" : "", onClick: () => setView(v) },
+									v === "structure" ? t("structure") : t("preview"))),
 						),
 					),
-					// ---- footer：分页条（仅已选表的数据预览视图；空选中态不显示） ----
-					sel && view === "preview" && !loadErr ? React.createElement(
-						"div",
-						{ className: "dbt-browse-footer" },
-						React.createElement("button", { className: "dbt-btn", disabled: page <= 1 || busy === "open", onClick: () => openTable(sel, page - 1) }, "‹ " + t("prevPage")),
-						React.createElement("span", { className: "dbt-muted" }, t("pageInfo", { page })),
-						React.createElement("span", { style: { flex: 1 } }),
-						preview && preview.truncated ? React.createElement("span", { className: "dbt-muted" }, t("previewTruncated")) : null,
-						React.createElement("button", { className: "dbt-btn", disabled: (preview && preview.truncated) === false || busy === "open", onClick: () => openTable(sel, page + 1) }, t("nextPage") + " ›"),
-					) : null,
+					// 限高兜底：无固定高度弹窗壳后给内容区可视上限，预览表在容器内滚动、单元格浮层贴底可见
+					React.createElement("div", { className: "dbt-browse-content", style: { maxHeight: 420 } }, rightPane()),
 				),
+				// 分页条（仅已选表的数据预览视图；空选中态不显示）
+				sel && view === "preview" && !loadErr ? React.createElement(
+					"div",
+					{ className: "dbt-browse-footer" },
+					React.createElement("button", { className: "dbt-btn", disabled: page <= 1 || busy === "open", onClick: () => openTable(sel, page - 1) }, "‹ " + t("prevPage")),
+					React.createElement("span", { className: "dbt-muted" }, t("pageInfo", { page })),
+					React.createElement("span", { style: { flex: 1 } }),
+					preview && preview.truncated ? React.createElement("span", { className: "dbt-muted" }, t("previewTruncated")) : null,
+					React.createElement("button", { className: "dbt-btn", disabled: (preview && preview.truncated) === false || busy === "open", onClick: () => openTable(sel, page + 1) }, t("nextPage") + " ›"),
+				) : null,
 			);
 		}
 
-		/* ---------------- PiP 独立窗口（Document Picture-in-Picture） ---------------- */
-		// OS 级独立窗口：可拖出桌面端主窗口、系统级置顶。内容为完整数据浏览 UI（同 JS 环境复用
-		// BrowseDialog/DangerDialog 与 mock 之外的宿主 fetch 同源）；DOM 浮窗作为不可用时的降级。
-		// 打开成功返回 pipWindow，失败返回 null（调用方降级为 DOM 浮窗）。
-		function PipBrowseApp(props) { // {ctx, conns, projectPath, grants, onClose}
-			// 危险操作确认渲染在 PiP 窗口内（Panel 的确认对话框在主窗口，PiP 用户看不见）
-			const [confirmReq, setConfirmReq] = React.useState(null);
-			const askConfirm = React.useCallback((info) => new Promise((resolve) => {
-				setConfirmReq(Object.assign({}, info, { resolve }));
-			}), []);
-			return React.createElement(
-				React.Fragment,
-				null,
-				React.createElement(BrowseDialog, {
-					ctx: props.ctx, conns: props.conns, projectPath: props.projectPath,
-					grants: props.grants, askConfirm: askConfirm, onClose: props.onClose,
-				}),
-				confirmReq ? React.createElement(DangerDialog, { challenge: confirmReq, onClose: () => setConfirmReq(null) }) : null,
-			);
-		}
-		function openBrowsePip(ctx, deps) { // deps: {conns, projectPath, grants, onClosed, onFallback} → 返回 pipWindow | null
-			try {
-				const dpip = window.documentPictureInPicture;
-				// 入口只硬性要求 dpip；createRoot/portal 未就绪不再放弃——手势内先开窗，root 异步就绪后渲染，超时由调用方降级
-				if (!dpip || typeof dpip.requestWindow !== "function") return null;
-				resolveRootAsync(ctx); // createRoot 同步未就绪时，趁 3 秒超时窗口发起宿主异步 import
-				// PiP 只能在用户手势内同步发起 requestWindow，Promise then 里再做 DOM 装配
-				const p = dpip.requestWindow({ width: 1100, height: 720 });
-				pipResult = "opened"; // requestWindow 已发起；拒绝走下方 catch
-				return p.then((w) => {
-					const doc = w.document;
-					// 相对地址基准：PiP 文档是 about:blank，fetch 的相对 API 路径须按主 origin 解析
-					const base = doc.createElement("base");
-					base.href = window.location.origin + "/";
-					doc.head.appendChild(base);
-					// 样式：整套 --dbt-* token 与规则注入 PiP 文档
-					if (styleEl) doc.head.appendChild(doc.importNode(styleEl, true));
-					doc.body.style.margin = "0";
-					// 加载占位：createRoot 异步解析期间给用户可见反馈（PiP 场景少用，不做 i18n key）
-					const ph = doc.createElement("div");
-					ph.style.cssText = "display:flex;align-items:center;justify-content:center;height:100%;font:14px sans-serif;color:#888;";
-					ph.textContent = "正在打开数据浏览…";
-					doc.body.appendChild(ph);
-					let root = null;
-					let settled = false; // root 已渲染或窗口已关闭：晚到的 onRootReady 回调与超时兜底均不再处理
-					const closePip = () => {
-						if (root) { try { root.unmount(); } catch (e) { /* 已卸载 */ } }
-						portalDisabled = false;
-						try { w.close(); } catch (e2) { /* 已关闭 */ }
-					};
-					onRootReady(() => {
-						if (settled) return;
-						settled = true;
-						portalDisabled = true; // PiP root 已在 pipDoc.body 上，禁 portal 防 DOM 被拉回主窗口
-						root = reactCreateRoot(doc.body);
-						root.render(React.createElement(PipBrowseApp, {
-							ctx, conns: deps.conns, projectPath: deps.projectPath, grants: deps.grants,
-							onClose: () => { closePip(); deps.onClosed(); },
-						}));
-						ph.remove();
-					});
-					w.addEventListener("pagehide", () => { // 用户点 PiP 窗口系统关闭钮
-						settled = true;
-						if (root) { try { root.unmount(); } catch (e) { /* 已卸载 */ } }
-						portalDisabled = false;
-						deps.onClosed();
-					});
-					// 超时兜底：3 秒内 createRoot 没就绪 → 关 PiP 清理并回调降级（调用方打开 DOM 浮窗）
-					setTimeout(() => {
-						if (settled) return;
-						settled = true;
-						closePip();
-						deps.onFallback();
-					}, 3000);
-					return w;
-				}).catch((err) => { pipResult = "rejected:" + (err && err.name || "Error"); return null; });
-			} catch (e) {
-				pipResult = "rejected:" + (e && e.name || "Error");
-				return Promise.resolve(null);
-			}
-		}
-
 		/* ---------------- SQL 控制台 ---------------- */
 		// Apple 等宽字体栈（规范 §1）：优先样式层 --dbt-mono token，fallback 内联栈
 		const MONO_FONT = "var(--dbt-mono, ui-monospace, \"SF Mono\", Menlo, Consolas, monospace)";
@@ -1794,25 +1536,6 @@ window.__ModuleLoader__.load({
 			const [error, setError] = React.useState("");
 			const [message, setMessage] = React.useState("");
 			const [confirmReq, setConfirmReq] = React.useState(null); // {statement,danger,reason,resolve}
-			// 数据浏览浮窗开关：由 Panel 层持有（不随 view 切换卸载），跨 tab 常驻
-			const [browseOpen, setBrowseOpen] = React.useState(false);
-			// PiP 独立窗口句柄：优先于 DOM 浮窗（OS 级窗口，可拖出桌面端主窗口）；存在时 DOM 浮窗不渲染
-			const [pipWin, setPipWin] = React.useState(null);
-			function openBrowse() {
-				if (pipWin) { try { pipWin.focus(); } catch (e) { /* 已关闭 */ } return; }
-				// requestWindow 必须在用户手势内同步发起（本函数仅由 onClick 直调）
-				const p = openBrowsePip(props.ctx, {
-					conns, projectPath, grants,
-					onClosed: () => setPipWin(null),
-					// PiP 超时降级（createRoot 未就绪）：清掉窗口句柄并回退 DOM 浮窗
-					onFallback: () => { setPipWin(null); setBrowseOpen(true); },
-				});
-				if (p && typeof p.then === "function") {
-					p.then((w) => { if (w) setPipWin(w); else setBrowseOpen(true); });
-				} else {
-					setBrowseOpen(true);
-				}
-			}
 
 			const askConfirm = React.useCallback((info) => new Promise((resolve) => {
 				setConfirmReq(Object.assign({}, info, { resolve }));
@@ -1867,10 +1590,9 @@ window.__ModuleLoader__.load({
 					"div",
 					{ className: "dbt-tabs" },
 					[["manage", t("viewManage")], ["grants", t("viewGrants")], ["browse", t("viewBrowse")], ["console", t("viewConsole")]].map(([v, label]) =>
-						// browse tab：切视图的同时直接打开浮窗（单击即用，不必再进树点表）
 						React.createElement("button", {
 							key: v, className: view === v ? "active" : "",
-							onClick: () => { setView(v); if (v === "browse") openBrowse(); },
+							onClick: () => setView(v),
 						}, label)),
 				),
 				(projectEdited || !projectPath)
@@ -1906,25 +1628,14 @@ window.__ModuleLoader__.load({
 				React.createElement("div", { className: "dbt-view", key: view },
 					view === "manage" ? React.createElement(ManageView, shared) : null,
 					view === "grants" ? React.createElement(GrantsView, shared) : null,
-					// browse：提示卡（浮窗由 Panel 层在下方常驻渲染，不随视图切换卸载）
-					view === "browse" ? React.createElement(
-						"div",
-						{ className: "dbt-card" },
-						// 主提示用正常文字色（dbt-muted 11px 次要色压深底对比不足，视觉审查命中）
-						React.createElement("div", { style: { fontSize: 13 } }, t("browsePanelHint")),
-						React.createElement("div", { className: "dbt-row" },
-							React.createElement("button", { className: "dbt-btn primary", onClick: openBrowse }, t("reopenBrowse"))),
-					) : null,
+					// browse：内嵌浏览面板（对象树 + 结构/数据预览，点表即看）
+					view === "browse" ? React.createElement(BrowsePane, {
+						ctx: props.ctx, conns, projectPath, grants, askConfirm,
+					}) : null,
 					view === "console" ? React.createElement(ConsoleView, Object.assign({}, shared, { askConfirm })) : null,
 				),
 				React.createElement("div", { className: "dbt-muted" }, t("footerHint")),
 				confirmReq ? React.createElement(DangerDialog, { challenge: confirmReq, onClose: () => setConfirmReq(null) }) : null,
-				// 浮窗常驻：portal 到 body 且在 dbt-view 外，切 tab 时不消失
-				browseOpen ? React.createElement(BrowseDialog, {
-					conns, projectPath, grants, askConfirm,
-					ctx: props.ctx, // 宿主 ctx 透传给浮窗，供 portal 异步解析（ctx.modules.import）
-					onClose: () => setBrowseOpen(false),
-				}) : null,
 			);
 		}
 
@@ -1947,7 +1658,7 @@ window.__ModuleLoader__.load({
 				key: "db-tool-" + String(localeKey || "zh"),
 				visible: props.visible,
 				scope: props.scope,
-				ctx: ctx, // 宿主 ctx 下传，Panel 透传给 BrowseDialog 供 portal 解析
+				ctx: ctx, // 宿主 ctx 下传，Panel 透传给 BrowsePane
 			});
 		}
 

package/dist/adapters/sql-shared/pg-like.js

@@ -1,12 +1,13 @@
 import { assertIdent, clampLimit, clampOffset, humanize, normalizeCell, quoteIdent } from './common.js';
-function poolConfig(conn) {
+function poolConfig(conn, overrideUrl) {
     const base = {
         max: 10,
         idleTimeoutMillis: 30000,
         connectionTimeoutMillis: 5000,
     };
     if (conn.url) {
-        base.connectionString = conn.url;
+        // overrideUrl：多主机探测选定台 / 剥 jdbc: 后的最终 connectionString
+        base.connectionString = overrideUrl ?? conn.url;
     }
     else if (conn.fields) {
         const f = conn.fields;
@@ -29,8 +30,122 @@ function poolConfig(conn) {
         base.ssl = { rejectUnauthorized: false };
     return base;
 }
+/**
+ * 规范化 JDBC / 多主机风格连接 URL。
+ *
+ * 背景：`jdbc:gaussdb://...` 的 `jdbc:` 是 WHATWG 非特殊 scheme，驱动内 new URL()
+ * 把 `gaussdb://...` 当不透明路径 → hostname/port 为空 → 兜底连本机；多主机
+ * authority（host:port,host:port）端口段含逗号非数字 → new URL 直接抛 Invalid URL。
+ * 故自行按文本解析 authority，不经 WHATWG 解析。
+ */
+export function normalizeUrl(url) {
+    const stripped = url.replace(/^jdbc:/i, '');
+    const schemeEnd = stripped.indexOf('://');
+    // 无 authority（非 URL 形态）：整串原样保留，交由驱动按既有逻辑处理
+    if (schemeEnd < 0)
+        return { prefix: stripped, suffix: '' };
+    const rest = stripped.slice(schemeEnd + 3);
+    const authEnd = /[/?#]/.exec(rest)?.index ?? rest.length;
+    const authority = rest.slice(0, authEnd);
+    const suffix = rest.slice(authEnd);
+    const at = authority.lastIndexOf('@');
+    const userinfo = at >= 0 ? authority.slice(0, at + 1) : '';
+    const hostPart = authority.slice(at + 1);
+    const hosts = hostPart.split(',').map((seg) => {
+        // ponytail: 按最后一个冒号拆 host/port，仅支持 IPv4/主机名（IPv6 需方括号感知，遇到再加）
+        const ci = seg.lastIndexOf(':');
+        if (ci < 0)
+            return { host: seg };
+        const port = Number.parseInt(seg.slice(ci + 1), 10);
+        return Number.isFinite(port) ? { host: seg.slice(0, ci), port } : { host: seg };
+    });
+    const prefix = `${stripped.slice(0, schemeEnd)}://${userinfo}`;
+    // 单台不设 hosts（调用方只在多台时探测）
+    if (hosts.length <= 1)
+        return { prefix: prefix + hostPart, suffix };
+    return { prefix, hosts, suffix };
+}
+/**
+ * 逐台探测可用节点（移植自用户项目 GaussDB-MCP 的 probeHosts）：返回第一台可连
+ * （masterOnly 时须为主节点，pg_is_in_recovery() 为 true 的备节点跳过）的主机；
+ * 全部失败返回 undefined（调用方回退首台，让 testConnect 报真实连接错误）。
+ */
+// ponytail: 仅适配器创建时探测一次；运行中主备切换不自动 failover，需要时在 pool error 事件里重建池再探测
+export async function pickHost(driver, base, hosts, masterOnly) {
+    if (!driver.Client)
+        return undefined;
+    for (const h of hosts) {
+        // urlUser/urlPassword 是调用方传入的内部凭据约定键，转成驱动的 user/password 后剔除
+        const { urlUser, urlPassword, ...rest } = base;
+        const cfg = { ...rest, connectionString: undefined, host: h.host };
+        if (h.port != null)
+            cfg.port = h.port;
+        // 凭据自 base.urlUser/base.urlPassword 解出；无则不设
+        if (typeof urlUser === 'string' && urlUser !== '')
+            cfg.user = urlUser;
+        if (typeof urlPassword === 'string')
+            cfg.password = urlPassword;
+        const client = new driver.Client(cfg);
+        try {
+            await client.connect();
+            if (masterOnly) {
+                const res = await client.query('SELECT pg_is_in_recovery() AS in_recovery');
+                if (res.rows[0]?.in_recovery === true) {
+                    await client.end().catch(() => { });
+                    continue; // 备节点跳过
+                }
+            }
+            await client.end().catch(() => { });
+            return h.port != null ? { host: h.host, port: h.port } : { host: h.host };
+        }
+        catch {
+            await client.end().catch(() => { });
+        }
+    }
+    return undefined;
+}
 export async function createPgLikeAdapter(kind, Driver, conn, opts) {
-    const pool = new Driver.Pool(poolConfig(conn));
+    // GaussDB JDBC 风格 URL 驱动自带的 WHATWG 解析处理不了（jdbc: 非特殊 scheme 使
+    // hostname/port 为空 → 兜底连本机；多主机 authority 端口段含逗号 → 抛 Invalid URL），
+    // 故建池前先规范化，多主机时逐台探测选可用节点；postgresql 多主机列表剥 jdbc: 后
+    // 原样透传（pg 驱动原生支持 libpq 多主机 failover），不 probe。
+    const norm = conn.url ? normalizeUrl(conn.url) : null;
+    const joinSeg = (h) => `${h.host}${h.port != null ? ':' + h.port : ''}`;
+    const cleanUrl = norm ? norm.prefix + (norm.hosts ?? []).map(joinSeg).join(',') + norm.suffix : undefined;
+    let finalUrl = cleanUrl;
+    if (kind === 'gaussdb' && norm?.hosts && norm.hosts.length > 1) {
+        const { prefix, suffix } = norm;
+        const joinHost = (h) => prefix + joinSeg(h) + suffix;
+        const firstUrl = joinHost(norm.hosts[0]);
+        // targetServerType=master（键值大小写不敏感）→ 只接受主节点
+        const qi = suffix.indexOf('?');
+        let masterOnly = false;
+        for (const [k, v] of new URLSearchParams(qi >= 0 ? suffix.slice(qi + 1) : '')) {
+            if (k.toLowerCase() === 'targetservertype' && v.toLowerCase() === 'master')
+                masterOnly = true;
+        }
+        const base = poolConfig(conn, firstUrl);
+        // 探测凭据自 prefix userinfo 解出（按最后一个 @ / 最后一个 : 分界，decode 与
+        // percent-encode 注入互逆）；仅密码无用户名时 user 不设
+        if (prefix.endsWith('@')) {
+            const body = prefix.slice(prefix.indexOf('://') + 3, -1);
+            const ci = body.lastIndexOf(':');
+            if (ci >= 0) {
+                const user = decodeURIComponent(body.slice(0, ci));
+                if (user !== '')
+                    base.urlUser = user;
+                base.urlPassword = decodeURIComponent(body.slice(ci + 1));
+            }
+            else if (body !== '') {
+                base.urlUser = decodeURIComponent(body);
+            }
+        }
+        const picked = await pickHost(Driver, base, norm.hosts, masterOnly);
+        // 全败回退首台重组值：让 testConnect 报真实连接错误
+        finalUrl = picked ? joinHost(picked) : firstUrl;
+    }
+    const cfg = poolConfig(conn, finalUrl);
+    const pool = new Driver.Pool(cfg);
     const readOnly = opts?.mode === 'ro';
     // 所有池（主池 + 跨库池）统一走此初始化。
     // pg 约定：release(err) 若无等待者会 emit pool 'error'，无监听器会崩进程——
@@ -58,10 +173,11 @@ export async function createPgLikeAdapter(kind, Driver, conn, opts) {
     const mainDb = () => {
         if (conn.fields)
             return conn.fields.database ? String(conn.fields.database) : null;
-        if (!conn.url)
+        if (!finalUrl)
             return null;
         try {
-            return decodeURIComponent(new URL(conn.url).pathname.replace(/^\//, '')) || null;
+            // 规范化后的最终 URL（单台 authority）才可被 new URL 正确解析
+            return decodeURIComponent(new URL(finalUrl).pathname.replace(/^\//, '')) || null;
         }
         catch {
             return null;
@@ -73,7 +189,8 @@ export async function createPgLikeAdapter(kind, Driver, conn, opts) {
         const cached = dbPools.get(db);
         if (cached)
             return cached;
-        const created = new Driver.Pool({ ...poolConfig(conn), database: db });
+        // 与主池同一份最终 cfg（多主机探测选定台后的 connectionString），仅覆盖库名
+        const created = new Driver.Pool({ ...cfg, database: db });
         setupPool(created); // 与主池一致：error 兜底 + ro 会话只读
         dbPools.set(db, created);
         return created;

package/dist/store/connections.js

@@ -10,11 +10,16 @@ import * as path from 'node:path';
 import { readJson, writeJsonAtomic } from './io.js';
 /** fields 中被视为机密的键，落盘前拆出到 secrets.json */
 const PASSWORD_KEY = 'password';
+/** authority 段定位：scheme:// 到首个 /?#（兼容可选 jdbc: 前缀，如 jdbc:gaussdb://），
+ *  捕获组 1 为 scheme:// 部分、组 2 为 authority（多主机逗号串整体落在该段内）。
+ *  redactUrl 与 mergeUrlCredentials 的字符串回退注入共用。 */
+const AUTHORITY_RE = /^((?:jdbc:)?[a-z][a-z0-9+.-]*:\/\/)([^/?#]*)/i;
 /** 将 URL 中的密码段替换为 ***：scheme://user:pass@host → scheme://user:***@host。
  *  密码可能包含 / ? # @ 等字符：先取 scheme:// 到首个 /?#  的 authority 段，
- *  在 authority 内以最后一个 @ 分界取 userinfo，再以最后一个 : 分界取密码。 */
+ *  在 authority 内以最后一个 @ 分界取 userinfo，再以最后一个 : 分界取密码。
+ *  scheme 兼容可选 jdbc: 前缀（jdbc:gaussdb://…），无前缀行为不变。 */
 export function redactUrl(url) {
-    const m = url.match(/^([a-z][a-z0-9+.-]*:\/\/)([^/?#]*)/i);
+    const m = url.match(AUTHORITY_RE);
     if (!m)
         return url;
     const authority = m[2] ?? '';
@@ -34,7 +39,12 @@ export function redactUrl(url) {
  *  - url 含脱敏标记 ':***@'（编辑回填值）→ 有 secretsUrl 以其为基底整体替换，否则报错；
  *  - 注入用 WHATWG URL 的 username/password setter（自动 percent-encode '@:/?# ' 等特殊字符），
  *    与适配器侧 decodeURIComponent / 驱动 RFC 3986 解码严格互逆；只填一项只覆盖一项
- *    （redis 'redis://:pass@host' 无用户名形态、oracle 必填用户名校验均兼容）。 */
+ *    （redis 'redis://:pass@host' 无用户名形态、oracle 必填用户名校验均兼容）。
+ *  - WHATWG 解析失败（如多主机逗号端口 gaussdb://h1:8000,h2:8000/…）或 setter 静默无效
+ *    （jdbc:gaussdb://… 为 opaque path、host 为空）时回退字符串注入：正则定位 authority 段
+ *    （兼容可选 jdbc: 前缀），段内以最后一个 @ 为界替换/插入 userinfo，其余部分逐字保留；
+ *    凭据按 encodeURIComponent 编码，只填一项只覆盖一项的语义与 setter 对齐；
+ *    无 scheme://authority 形态的残缺串仍报「URL 无效」。 */
 export function mergeUrlCredentials(opts) {
     const { url, urlUser, urlPassword, secretsUrl } = opts;
     if (urlUser === undefined && urlPassword === undefined)
@@ -59,7 +69,15 @@ export function mergeUrlCredentials(opts) {
         u = new URL(base);
     }
     catch {
-        throw new Error('连接 URL 无效，无法注入用户名/密码');
+        u = undefined; // WHATWG 解析失败：多主机逗号端口、残缺串等
+    }
+    const m = base.match(AUTHORITY_RE);
+    // 回退条件：解析失败；或 opaque path（host 为空、setter no-op）且 authority 非空。
+    // authority 为空（sqlite:// 等无主机形态）不回退，维持 setter no-op 的现状语义。
+    if (u === undefined || (u.host === '' && (m?.[2] ?? '') !== '')) {
+        if (m === null)
+            throw new Error('连接 URL 无效，无法注入用户名/密码');
+        return injectUserInfo(base, m, urlUser, urlPassword);
     }
     if (urlUser !== undefined && urlUser !== '')
         u.username = urlUser;
@@ -67,6 +85,35 @@ export function mergeUrlCredentials(opts) {
         u.password = urlPassword;
     return u.toString();
 }
+/** 字符串回退注入：在 authority（m[2]）内以最后一个 @ 为界替换/插入 userinfo。
+ *  与 WHATWG setter 语义对齐：只填一项只覆盖一项（另一项保留基底值）；
+ *  两者均无效时不改动原样返回。凭据按 encodeURIComponent 编码（与适配器侧
+ *  decodeURIComponent 互逆），authority 之外（path/query/fragment）逐字保留。 */
+function injectUserInfo(base, m, urlUser, urlPassword) {
+    const whole = m[0] ?? '';
+    const authority = m[2] ?? '';
+    const user = urlUser !== undefined && urlUser !== '' ? encodeURIComponent(urlUser) : undefined;
+    const pass = urlPassword !== undefined && urlPassword !== '' ? encodeURIComponent(urlPassword) : undefined;
+    if (user === undefined && pass === undefined)
+        return base;
+    const at = authority.lastIndexOf('@');
+    const oldUserinfo = at >= 0 ? authority.slice(0, at) : '';
+    const colon = oldUserinfo.lastIndexOf(':');
+    const oldUser = colon >= 0 ? oldUserinfo.slice(0, colon) : oldUserinfo;
+    const oldPass = colon >= 0 ? oldUserinfo.slice(colon + 1) : undefined;
+    let userinfo;
+    if (user !== undefined && pass !== undefined) {
+        userinfo = `${user}:${pass}`;
+    }
+    else if (user !== undefined) {
+        userinfo = oldPass !== undefined ? `${user}:${oldPass}` : user;
+    }
+    else {
+        userinfo = `${oldUser}:${pass}`;
+    }
+    const hostPart = at >= 0 ? authority.slice(at + 1) : authority;
+    return whole.slice(0, whole.length - authority.length) + userinfo + '@' + hostPart + base.slice(whole.length);
+}
 function splitPassword(fields) {
     if (!fields || typeof fields[PASSWORD_KEY] !== 'string') {
         return { clean: fields, password: undefined };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-db-tool",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "DSH community plugin: chat-operated multi-database admin tool with sidebar management, project-scoped grants, ro/rw modes and dangerous-operation confirmation",
   "type": "module",
   "license": "MIT",
@@ -38,9 +38,7 @@
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-locale",
-        "react-dom",
-        "react-dom/client"
+        "@deepseek-ai/dsh-client-locale"
       ],
       "platform": "web"
     }