dsh-db-tool 1.5.6 → 1.5.8

package/client/client.js

@@ -93,8 +93,7 @@ window.__ModuleLoader__.load({
 			emptyData: "暂无数据",
 			retry: "重试",
 			selectTableHint: "在左侧选择表后查看数据",
-			// 单元格查看/编辑（Navicat 式就地写回）
-			editCell: "编辑",
+			// 单元格底部详情栏（Navicat 式就地写回）
 			cellValue: "完整值",
 			copyBtn: "复制",
 			copied: "已复制",
@@ -200,8 +199,7 @@ window.__ModuleLoader__.load({
 			emptyData: "No rows",
 			retry: "Retry",
 			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",
@@ -349,7 +347,7 @@ 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{font-size:13px;font-weight:600;}",
+				".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;}",
@@ -387,23 +385,24 @@ window.__ModuleLoader__.load({
 				".dbt-treename{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}",
 				/* ===== 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;border-bottom:1px solid var(--dbt-separator);}",
-				".dbt-browse-main{flex:1;min-height:0;display:flex;flex-direction:column;gap:10px;}",
+				".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;gap:10px;padding:12px;}",
-				".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:10px 12px;border-top:1px solid var(--dbt-separator);}",
+				".dbt-browse-content{flex:1;min-height:0;position:relative;display:flex;flex-direction:column;}",
+				".dbt-browse-tablewrap{flex:1 1 auto;min-height:120px;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:12px;white-space:pre-wrap;word-break:break-all;max-height:240px;overflow:auto;background:var(--dbt-surface-strong);border-radius:var(--dbt-radius-ctrl);padding:8px;}",
-				".dbt-cellpop-actions{display:flex;gap:8px;align-items:center;}",
+				".dbt-celldetail{flex:none;margin-top:10px;padding:12px;background:#2c2c2e;border-radius:var(--dbt-radius-card);display:flex;flex-direction:column;gap:8px;}",
+				"@media (prefers-color-scheme: light){.dbt-celldetail{background:#f5f5f7;}}",
+				".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:var(--dbt-radius-ctrl);padding:5px 12px;}",
 				".dbt-celledit textarea:focus{outline:2px solid var(--dbt-accent);outline-offset:-1px;}",
@@ -416,8 +415,8 @@ window.__ModuleLoader__.load({
 				".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);}",
 				"/* ===== 降级：透明度减弱 / 动效减弱 ===== */",
-				"@media (prefers-reduced-transparency: reduce){.dbt-overlay{backdrop-filter:none;-webkit-backdrop-filter:none;background:rgba(0,0,0,.55);}.dbt-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-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);
@@ -1127,9 +1126,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);
@@ -1140,23 +1138,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;
@@ -1171,11 +1169,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") {
@@ -1200,26 +1198,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" },
@@ -1240,51 +1244,48 @@ 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,
 			);
 		}
 

package/package.json

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