dsh-db-tool 1.5.8 → 1.5.9

package/client/client.js

@@ -532,6 +532,7 @@ window.__ModuleLoader__.load({
 			}
 			// 表全限定：pg/gauss 用 schema 前缀（库由 execute 的 database 参数路由，语句内不写库名）；
 			// mysql 带库名（adapter 无 database 路由）；oracle/dmdb 的 dbRef 即 OWNER；sqlite 仅表名
+			// execute 的 database 参数只传库名（db.schema 形态取点前段），连接目标只能是库，schema 靠语句内全限定
 			let table;
 			if (kind === "postgresql" || kind === "gaussdb") {
 				table = schemaName
@@ -560,7 +561,7 @@ window.__ModuleLoader__.load({
 				ops: [{
 					statement: "UPDATE " + table + " SET " + setSql + " WHERE " + wheres.join(" AND "),
 					params,
-					database: kind === "sqlite" ? undefined : dbRef,
+					database: kind === "sqlite" ? undefined : dbRef.split(".")[0],
 				}],
 			};
 		}
@@ -1250,6 +1251,8 @@ window.__ModuleLoader__.load({
 						),
 					),
 				),
+				// 分页条（BrowsePane 传入）在详情栏之上，详情栏钉在面板最底部
+				props.children,
 				// 底部详情栏（Navicat/检查器式）：预览表格下方一栏，textarea 直接可编辑，点保存写回
 				sel ? React.createElement(
 					"div",
@@ -1354,6 +1357,16 @@ window.__ModuleLoader__.load({
 				// Navicat 式单元格网格：kind/可编辑性由当前连接与授权决定（rw=可编辑），保存后重拉当前页
 				const conn = conns.find((c) => c.id === sel.connId);
 				const grant = (grants || []).find((g) => g.connId === sel.connId);
+				// 分页条作为 children 传入：渲染顺序 表格 → 分页 → 详情栏（详情栏钉在面板最底部）
+				const 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;
 				return React.createElement(PreviewGrid, {
 					preview, schema,
 					kind: conn ? conn.kind : undefined,
@@ -1365,13 +1378,14 @@ window.__ModuleLoader__.load({
 					connId: sel.connId, projectPath,
 					onSaved: () => openTable(sel, page),
 					askConfirm,
-				});
+				}, footer);
 			}
 
-			// 内嵌面板纵向布局：上半对象树（限高滚动，容器类名留给样式层），下半预览主区 + 分页
+			// 内嵌面板纵向布局：撑满面板高度（.dbt-panel 为 height:100% 的 flex column），
+			// 树限高 / main flex:1 内滚 / 分页与详情栏依次钉底
 			return React.createElement(
 				"div",
-				{ className: "dbt-view" },
+				{ className: "dbt-view", style: { flex: "1 1 auto", minHeight: 0 } },
 				React.createElement(
 					"div",
 					{ style: { maxHeight: 280, overflowY: "auto" } },
@@ -1395,19 +1409,9 @@ window.__ModuleLoader__.load({
 									v === "structure" ? t("structure") : t("preview"))),
 						),
 					),
-					// 限高兜底：无固定高度弹窗壳后给内容区可视上限，预览表在容器内滚动、单元格浮层贴底可见
-					React.createElement("div", { className: "dbt-browse-content", style: { maxHeight: 420 } }, rightPane()),
+					// 内容区由 flex 吃满 main 剩余高度（表格外滚），不再用固定 maxHeight 兜底
+					React.createElement("div", { className: "dbt-browse-content" }, 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,
 			);
 		}
 
@@ -1626,7 +1630,8 @@ window.__ModuleLoader__.load({
 				error ? React.createElement("div", { className: "dbt-err" }, t("error") + ": " + error) : null,
 				message ? React.createElement("div", { className: "dbt-msg" }, message) : null,
 				// 视图切换：key=view 触发 dbt-in 进入动画（opacity + 4px 上移，.22s）
-				React.createElement("div", { className: "dbt-view", key: view },
+				// browse 视图撑满面板剩余高度（BrowsePane 内详情栏才能钉在面板最底部）
+				React.createElement("div", { className: "dbt-view", key: view, style: view === "browse" ? { flex: "1 1 auto", minHeight: 0 } : undefined },
 					view === "manage" ? React.createElement(ManageView, shared) : null,
 					view === "grants" ? React.createElement(GrantsView, shared) : null,
 					// browse：内嵌浏览面板（对象树 + 结构/数据预览，点表即看）

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-db-tool",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "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",