rlwj-lab/opsxsql
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Redis集群SCAN遍历所有master节点 + 查询结果布局调整\n\n1. ScanAllKeys(): 集群模式用ForEachMaster遍历所有master节点SCAN合并去重\n2. RedisScanKeys/KEYS命令均改用ScanAllKeys,确保集群不遗漏key\n3. QueriesPage布局: sidebar独立左侧,查询结果只在编辑器下方不被sidebar占据宽度

Browse Source
This commit is contained in:
logan committed 2026-05-30 15:28:38 +08:00
1 parent 430a667455
commit 4e6f9eb8fd
3 files changed
+97 -61
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

frontend/src/pages/QueriesPage.tsx
+39 -38
View File
@@ -431,25 +431,26 @@ export default function QueriesPage() {
</div>
)}
{/* -- 编辑器 + 侧边栏 (上半区，不随结果滚动) -- */}
<div className="shrink-0 px-5 pb-2">
<div className="flex gap-3">
{/* Schema 侧边栏 */}
{showSidebar && instanceId && (
<div className="w-[280px] shrink-0">
<SchemaSidebar instanceId={instanceId} database={database} dbType={dbType}
clusterMode={selectedInstance?.cluster_mode}
onInsert={(text) => {
const sep = dbType === 'redis' ? (sql.trim() ? '\n' : '') : (sql.trim() ? ' ' : '');
setSql(prev => prev + sep + text + (dbType === 'redis' ? '' : ' '));
}}
onDatabaseChange={setDatabase}
singleDb={!!database} />
</div>
)}
{/* -- 编辑器 + 侧边栏 + 结果 (主体区) -- */}
<div className="flex-1 min-h-0 flex gap-0 overflow-hidden">
{/* Schema 侧边栏（左侧，独立） */}
{showSidebar && instanceId && (
<div className="w-[280px] shrink-0 border-r border-[var(--dg-border)] overflow-y-auto">
<SchemaSidebar instanceId={instanceId} database={database} dbType={dbType}
clusterMode={selectedInstance?.cluster_mode}
onInsert={(text) => {
const sep = dbType === 'redis' ? (sql.trim() ? '\\n' : '') : (sql.trim() ? ' ' : '');
setSql(prev => prev + sep + text + (dbType === 'redis' ? '' : ' '));
}}
onDatabaseChange={setDatabase}
singleDb={!!database} />
</div>
)}
{/* 编辑器 + 查询结果（右侧主体，垂直排列） */}
<div className="flex-1 min-w-0 flex flex-col overflow-hidden">
{/* SQL 编辑器 */}
<div className="flex-1 min-w-0 flex flex-col">
<div className="shrink-0 p-4 pb-2">
<div className="dg-card overflow-hidden flex flex-col">
<SqlEditor value={sql} onChange={setSql} placeholder={placeholderMap[dbType]}
language={editorLang} height="200px" onExecute={handleExecute}
@@ -466,21 +467,19 @@ export default function QueriesPage() {
</div>
</div>
</div>
</div>
</div>
{/* -- 错误提示 -- */}
{error && (
<div className="shrink-0 px-5 pb-2">
<div className="flex items-center gap-2 p-3 bg-red-500/10 border border-red-500/20 rounded-lg text-sm text-red-400">
<AlertTriangle className="w-4 h-4 shrink-0" />{error}
</div>
</div>
)}
{/* -- 错误提示 -- */}
{error && (
<div className="shrink-0 px-4 pb-2">
<div className="flex items-center gap-2 p-3 bg-red-500/10 border border-red-500/20 rounded-lg text-sm text-red-400">
<AlertTriangle className="w-4 h-4 shrink-0" />{error}
</div>
</div>
)}
{/* -- 查询结果 (下半区，独立滚动) -- */}
{result && (
<div className="flex-1 min-h-0 px-5 pb-4 overflow-hidden flex flex-col">
{/* -- 查询结果 (编辑器下方，独立滚动) -- */}
{result && (
<div className="flex-1 min-h-0 px-4 pb-4 overflow-hidden flex flex-col">
<div className="dg-card overflow-hidden flex-1 flex flex-col">
{/* 结果标题栏 + 折叠按钮 */}
<div
@@ -628,14 +627,16 @@ export default function QueriesPage() {
</div>
)}
{/* -- 安全提示 -- */}
<div className="shrink-0 px-5 pb-3">
<div className="flex items-center gap-2 px-3 py-2 bg-yellow-500/5 border border-yellow-500/15 rounded-lg text-xs text-[var(--dg-text-muted)]">
<AlertTriangle className="w-3.5 h-3.5 text-yellow-400 shrink-0" />
查询结果中的敏感字段将自动脱敏。MySQL/PG 仅支持 SELECT 查询，Redis/MongoDB 支持只读命令。
</div>
</div>
</div>
{/* -- 安全提示 -- */}
<div className="shrink-0 px-4 pb-3">
<div className="flex items-center gap-2 px-3 py-2 bg-yellow-500/5 border border-yellow-500/15 rounded-lg text-xs text-[var(--dg-text-muted)]">
<AlertTriangle className="w-3.5 h-3.5 text-yellow-400 shrink-0" />
查询结果中的敏感字段将自动脱敏。MySQL/PG 仅支持 SELECT 查询，Redis/MongoDB 支持只读命令。
</div>
</div>
</div>{/* end 编辑器+结果区 */}
</div>{/* end 主体区 (sidebar + 编辑器+结果) */}
</div>{/* end 主区域 */}
{/* ====== 右侧历史抽屉 ====== */}
{showHistory && (