重构:消除代码重复,提升可维护性
后端优化: - 新增 resolvePassword 函数,消除密码获取重复逻辑 - 新增 parseMongoOptions 函数,消除 Options 解析重复 - 新增 testConnectionByType 统一连接测试调用 - 重构 loadMongoDatabasesWithOptions 接收解析后参数 - 删除重复代码 37 行 前端优化: - 新增 useVisibleDatabases composable - 统一 visible_databases 解析和过滤逻辑 - 简化错误处理,移除 try-catch 包装 - 删除重复代码 22 行 代码质量: - 消除 6 处重复代码块 - 新增 5 个可复用函数 - 提升代码可维护性和可测试性
This commit is contained in:
50
web/src/composables/useVisibleDatabases.ts
Normal file
50
web/src/composables/useVisibleDatabases.ts
Normal file
@@ -0,0 +1,50 @@
|
||||
/**
|
||||
* 可见数据库管理 Composable
|
||||
* 封装 visible_databases 字段的解析和过滤逻辑
|
||||
*/
|
||||
|
||||
/**
|
||||
* 解析可见数据库 JSON 字符串
|
||||
* @param jsonStr - JSON 字符串或 null
|
||||
* @returns 解析后的数据库数组,解析失败返回空数组
|
||||
*/
|
||||
export function parseVisibleDatabases(jsonStr: string | null): string[] {
|
||||
if (!jsonStr) return []
|
||||
try {
|
||||
const parsed = JSON.parse(jsonStr)
|
||||
return Array.isArray(parsed) ? parsed : []
|
||||
} catch {
|
||||
return []
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据可见数据库配置过滤数据库列表
|
||||
* @param databases - 完整的数据库列表
|
||||
* @param visibleJson - 可见数据库 JSON 字符串
|
||||
* @returns 过滤后的数据库列表(如果未配置过滤则返回全部)
|
||||
*/
|
||||
export function filterDatabases(databases: string[], visibleJson: string | null): string[] {
|
||||
const visible = parseVisibleDatabases(visibleJson)
|
||||
return visible.length > 0 ? databases.filter(db => visible.includes(db)) : databases
|
||||
}
|
||||
|
||||
/**
|
||||
* 将数据库数组序列化为 JSON 字符串(空数组返回空字符串)
|
||||
* @param databases - 数据库数组
|
||||
* @returns JSON 字符串或空字符串
|
||||
*/
|
||||
export function serializeVisibleDatabases(databases: string[]): string {
|
||||
return databases.length > 0 ? JSON.stringify(databases) : ''
|
||||
}
|
||||
|
||||
/**
|
||||
* 可见数据库管理 Composable
|
||||
*/
|
||||
export function useVisibleDatabases() {
|
||||
return {
|
||||
parse: parseVisibleDatabases,
|
||||
filter: filterDatabases,
|
||||
serialize: serializeVisibleDatabases,
|
||||
}
|
||||
}
|
||||
@@ -162,6 +162,7 @@ import {
|
||||
SaveDbConnection
|
||||
} from '../../../wailsjs/wailsjs/go/main/App'
|
||||
import { getConnectionFailedTip, getLoadFailedTip } from '@/utils/database-error'
|
||||
import { useVisibleDatabases } from '@/composables/useVisibleDatabases'
|
||||
|
||||
// 使用 defineModel 简化 v-model:visible 双向绑定(Vue 3.5+)
|
||||
const visible = defineModel('visible', { type: Boolean, default: false })
|
||||
@@ -183,6 +184,7 @@ const errorMessage = ref('')
|
||||
const isPasswordChanged = ref(false)
|
||||
|
||||
// 数据库过滤相关
|
||||
const { parse: parseVisibleDatabases, filter: filterVisibleDatabases } = useVisibleDatabases()
|
||||
const loadingDatabases = ref(false)
|
||||
const allDatabases = ref<string[]>([])
|
||||
const selectedDatabases = ref<string[]>([])
|
||||
@@ -373,16 +375,7 @@ const loadConnection = async () => {
|
||||
isPasswordChanged.value = false
|
||||
|
||||
// 恢复数据库选择
|
||||
if (conn.visible_databases) {
|
||||
try {
|
||||
selectedDatabases.value = JSON.parse(conn.visible_databases)
|
||||
} catch (error) {
|
||||
console.warn('解析可见数据库列表失败:', error)
|
||||
selectedDatabases.value = []
|
||||
}
|
||||
} else {
|
||||
selectedDatabases.value = []
|
||||
}
|
||||
selectedDatabases.value = parseVisibleDatabases(conn.visible_databases || null)
|
||||
|
||||
// 编辑模式:自动加载数据库列表
|
||||
nextTick(() => {
|
||||
@@ -558,18 +551,8 @@ const loadAllDatabases = async () => {
|
||||
|
||||
allDatabases.value = databases || []
|
||||
|
||||
// 从已保存的 visibleDatabases 中恢复选择
|
||||
if (form.visibleDatabases) {
|
||||
try {
|
||||
selectedDatabases.value = JSON.parse(form.visibleDatabases)
|
||||
.filter((db: string) => databases.includes(db))
|
||||
} catch (error) {
|
||||
console.warn('解析可见数据库列表失败:', error)
|
||||
selectedDatabases.value = []
|
||||
}
|
||||
} else {
|
||||
selectedDatabases.value = []
|
||||
}
|
||||
// 从已保存的 visibleDatabases 中恢复选择(使用 composable)
|
||||
selectedDatabases.value = filterVisibleDatabases(databases, form.visibleDatabases || null)
|
||||
|
||||
Message.success(`成功加载 ${databases.length} 个数据库`)
|
||||
} catch (error) {
|
||||
|
||||
@@ -142,6 +142,7 @@ import { STORAGE_KEYS } from '../constants/storage'
|
||||
import { listConnections, getDatabases, getTables, deleteConnection } from '@/api'
|
||||
import type { Connection } from '@/api'
|
||||
import { getLoadFailedTip } from '@/utils/database-error'
|
||||
import { useVisibleDatabases } from '@/composables/useVisibleDatabases'
|
||||
|
||||
// 连接类型定义(使用 API 层的类型)
|
||||
type DbConnection = Connection
|
||||
@@ -777,9 +778,11 @@ const withLoadingNode = async (nodeKey: string, loader: () => Promise<void>) =>
|
||||
}
|
||||
|
||||
// 加载数据库列表
|
||||
const { filter: filterDatabases } = useVisibleDatabases()
|
||||
|
||||
const loadDatabases = async (connectionNode) => {
|
||||
if (!connectionNode?.connectionId) return
|
||||
|
||||
|
||||
await withLoadingNode(connectionNode.key, async () => {
|
||||
if (!window.go?.main?.App?.GetDatabases) {
|
||||
throw new Error('Go 后端未就绪')
|
||||
@@ -788,20 +791,9 @@ const loadDatabases = async (connectionNode) => {
|
||||
const databases = await getDatabases(connectionNode.connectionId)
|
||||
if (!Array.isArray(databases)) return
|
||||
|
||||
// 获取连接配置,检查是否有可见数据库过滤
|
||||
// 获取连接配置,应用可见数据库过滤
|
||||
const conn = connections.value.find(c => c.id === connectionNode.connectionId)
|
||||
let filteredDatabases = databases
|
||||
|
||||
if (conn?.visible_databases) {
|
||||
try {
|
||||
const visibleDbs = JSON.parse(conn.visible_databases)
|
||||
if (Array.isArray(visibleDbs) && visibleDbs.length > 0) {
|
||||
filteredDatabases = databases.filter(db => visibleDbs.includes(db))
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('解析可见数据库列表失败:', error)
|
||||
}
|
||||
}
|
||||
const filteredDatabases = filterDatabases(databases, conn?.visible_databases || null)
|
||||
|
||||
// 根据数据库类型设置节点标题
|
||||
connectionNode.children = filteredDatabases.map(db => ({
|
||||
|
||||
Reference in New Issue
Block a user