📝 docs(contributing): 补充中英文贡献指南并统一 README 入口

- 新增英文版 CONTRIBUTING.md 作为正式贡献文档
- 新增中文版 CONTRIBUTING.zh-CN.md 作为中文贡献说明
- 调整 README 和 README.zh-CN 的贡献入口指向对应语言文档

.github/release.yaml

@@ -1,26 +0,0 @@
-changelog:
-  categories:
-    - title: 新功能
-      labels:
-        - feature
-        - enhancement
-        - feat
-    - title: 问题修复
-      labels:
-        - bug
-        - fix
-    - title: 文档与流程
-      labels:
-        - docs
-        - documentation
-        - ci
-        - workflow
-        - chore
-    - title: 重构与优化
-      labels:
-        - refactor
-        - perf
-        - optimization
-    - title: 其他更新
-      labels:
-        - '*'

.github/workflows/release.yml

@@ -550,6 +550,5 @@ jobs:
           files: release-assets/*
           draft: true
           make_latest: true
-          generate_release_notes: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sync-main-to-dev.yml

@@ -1,159 +0,0 @@
-name: main 回灌 dev
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pull-requests: write
-
-concurrency:
-  group: sync-main-to-dev
-  cancel-in-progress: true
-
-jobs:
-  sync-main-to-dev:
-    name: 执行回灌同步
-    runs-on: ubuntu-latest
-    steps:
-      - name: 检出代码
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: 检查是否需要同步
-        id: diff_check
-        shell: bash
-        run: |
-          set -euo pipefail
-          echo "开始检查 main 与 dev 的分支差异..."
-          git fetch origin main dev
-          ahead_count="$(git rev-list --count origin/dev..origin/main)"
-          echo "ahead_count=${ahead_count}" >> "$GITHUB_OUTPUT"
-          if [ "${ahead_count}" -eq 0 ]; then
-            echo "无需同步，dev 已包含 main 的最新提交。"
-            echo "has_changes=false" >> "$GITHUB_OUTPUT"
-          else
-            echo "检测到 ${ahead_count} 个待同步提交，准备创建或复用同步 PR。"
-            echo "has_changes=true" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: 创建或复用同步 PR
-        id: sync_pr
-        if: steps.diff_check.outputs.has_changes == 'true'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash
-        run: |
-          set -euo pipefail
-          echo "permission_blocked=false" >> "$GITHUB_OUTPUT"
-          existing_number="$(gh pr list --base dev --head main --state open --json number --jq '.[0].number // empty')"
-
-          if [ -n "${existing_number}" ]; then
-            pr_number="${existing_number}"
-            pr_url="$(gh pr view "${pr_number}" --json url --jq '.url')"
-            echo "复用已有同步 PR：#${pr_number}"
-            echo "created=false" >> "$GITHUB_OUTPUT"
-          else
-            body_file="$(mktemp)"
-            error_file="$(mktemp)"
-            {
-              echo "## 自动回灌：\`main -> dev\`"
-              echo
-              echo "- 触发条件：\`main\` 分支出现新提交（含贡献者直接合并到 \`main\` 的 PR）"
-              echo "- 目标：让 \`dev\` 持续吸收 \`main\` 的更新，避免发布前集中冲突"
-              echo
-              echo "### 合并建议"
-              echo "- 无冲突：直接合并该 PR（建议 \`Merge commit\`）"
-              echo "- 有冲突：在该 PR 内解决冲突后再合并"
-            } > "${body_file}"
-
-            if pr_url="$(gh pr create \
-              --base dev \
-              --head main \
-              --title "🔁 chore(sync): 回灌 main 到 dev" \
-              --body-file "${body_file}" 2>"${error_file}")"; then
-              pr_number="${pr_url##*/}"
-              echo "已创建同步 PR：#${pr_number}"
-              echo "created=true" >> "$GITHUB_OUTPUT"
-            else
-              error_message="$(tr '\n' ' ' < "${error_file}")"
-              if printf '%s' "${error_message}" | grep -Fq "GitHub Actions is not permitted to create or approve pull requests"; then
-                echo "::warning::仓库未开启“Allow GitHub Actions to create and approve pull requests”，已跳过自动创建同步 PR。"
-                echo "permission_blocked=true" >> "$GITHUB_OUTPUT"
-                echo "created=false" >> "$GITHUB_OUTPUT"
-                echo "pr_number=" >> "$GITHUB_OUTPUT"
-                echo "pr_url=" >> "$GITHUB_OUTPUT"
-                exit 0
-              fi
-              echo "::error::创建同步 PR 失败：${error_message}"
-              exit 1
-            fi
-          fi
-
-          echo "pr_number=${pr_number}" >> "$GITHUB_OUTPUT"
-          echo "pr_url=${pr_url}" >> "$GITHUB_OUTPUT"
-
-      - name: 检查合并状态
-        id: merge_state
-        if: steps.diff_check.outputs.has_changes == 'true' && steps.sync_pr.outputs.permission_blocked != 'true'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash
-        run: |
-          set -euo pipefail
-          pr_number="${{ steps.sync_pr.outputs.pr_number }}"
-          mergeable="$(gh pr view "${pr_number}" --json mergeable --jq '.mergeable')"
-          merge_state_status="$(gh pr view "${pr_number}" --json mergeStateStatus --jq '.mergeStateStatus')"
-          echo "PR #${pr_number} 合并状态：mergeable=${mergeable}, mergeStateStatus=${merge_state_status}"
-          echo "mergeable=${mergeable}" >> "$GITHUB_OUTPUT"
-          echo "merge_state_status=${merge_state_status}" >> "$GITHUB_OUTPUT"
-
-      - name: 可合并时开启自动合并
-        id: auto_merge
-        if: steps.diff_check.outputs.has_changes == 'true' && steps.sync_pr.outputs.permission_blocked != 'true' && steps.merge_state.outputs.mergeable == 'MERGEABLE'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash
-        run: |
-          set -euo pipefail
-          pr_number="${{ steps.sync_pr.outputs.pr_number }}"
-          if gh pr merge "${pr_number}" --merge --auto; then
-            echo "已为 PR #${pr_number} 开启自动合并。"
-            echo "result=enabled" >> "$GITHUB_OUTPUT"
-          else
-            echo "::warning::自动合并开启失败，请手动处理并合并该 PR。"
-            echo "result=failed" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: 写入执行摘要
-        if: always()
-        shell: bash
-        run: |
-          {
-            echo "## main 回灌 dev 执行结果"
-            if [ "${{ steps.diff_check.outputs.has_changes }}" != "true" ]; then
-              echo "- 状态：无需同步（dev 已包含 main 最新提交）"
-              exit 0
-            fi
-            if [ "${{ steps.sync_pr.outputs.permission_blocked }}" = "true" ]; then
-              echo "- 状态：已跳过自动创建同步 PR"
-              echo "- 原因：仓库未开启 GitHub Actions 创建与审批 Pull Request 权限"
-              echo "- 处理：前往 Settings -> Actions -> General -> Workflow permissions，开启 Allow GitHub Actions to create and approve pull requests"
-              echo "- 兜底：由维护者手动执行 main 到 dev 合并，或开启该设置后重新运行 workflow"
-              exit 0
-            fi
-            echo "- PR：${{ steps.sync_pr.outputs.pr_url }}"
-            echo "- 可合并状态：${{ steps.merge_state.outputs.mergeable }}"
-            echo "- 合并状态详情：${{ steps.merge_state.outputs.merge_state_status }}"
-            if [ "${{ steps.merge_state.outputs.mergeable }}" = "CONFLICTING" ]; then
-              echo "- 结论：检测到冲突，需要手动处理后合并"
-            elif [ "${{ steps.auto_merge.outputs.result }}" = "enabled" ]; then
-              echo "- 结论：已启用自动合并（满足保护规则后将自动入 dev）"
-            else
-              echo "- 结论：PR 已创建/复用，请按分支策略人工合并"
-            fi
-          } >> "$GITHUB_STEP_SUMMARY"

.github/workflows/test-build-all-platforms.yml

@@ -1,342 +0,0 @@
-name: Test Build All Platforms (Manual)
-
-on:
-  workflow_dispatch:
-    inputs:
-      build_label:
-        description: "测试包标识（仅用于文件名）"
-        required: false
-        default: "test"
-
-permissions:
-  contents: read
-
-concurrency:
-  group: test-build-${{ github.ref }}
-  cancel-in-progress: false
-
-jobs:
-  build:
-    name: Build ${{ matrix.platform }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos-latest
-            platform: darwin/amd64
-            os_name: MacOS
-            arch_name: Amd64
-            build_name: gonavi-test-darwin-amd64
-            wails_tags: ""
-            artifact_suffix: ""
-            build_optional_agents: true
-            linux_webkit: ""
-          - os: macos-latest
-            platform: darwin/arm64
-            os_name: MacOS
-            arch_name: Arm64
-            build_name: gonavi-test-darwin-arm64
-            wails_tags: ""
-            artifact_suffix: ""
-            build_optional_agents: true
-            linux_webkit: ""
-          - os: windows-latest
-            platform: windows/amd64
-            os_name: Windows
-            arch_name: Amd64
-            build_name: gonavi-test-windows-amd64
-            wails_tags: ""
-            artifact_suffix: ""
-            build_optional_agents: true
-            linux_webkit: ""
-          - os: windows-latest
-            platform: windows/arm64
-            os_name: Windows
-            arch_name: Arm64
-            build_name: gonavi-test-windows-arm64
-            wails_tags: ""
-            artifact_suffix: ""
-            build_optional_agents: true
-            linux_webkit: ""
-          - os: ubuntu-22.04
-            platform: linux/amd64
-            os_name: Linux
-            arch_name: Amd64
-            build_name: gonavi-test-linux-amd64
-            wails_tags: ""
-            artifact_suffix: ""
-            build_optional_agents: true
-            linux_webkit: "4.0"
-          - os: ubuntu-24.04
-            platform: linux/amd64
-            os_name: Linux
-            arch_name: Amd64
-            build_name: gonavi-test-linux-amd64-webkit41
-            wails_tags: "webkit2_41"
-            artifact_suffix: "-WebKit41"
-            build_optional_agents: false
-            linux_webkit: "4.1"
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.24'
-          check-latest: true
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Install Linux Dependencies
-        if: contains(matrix.platform, 'linux')
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev
-
-          if [ "${{ matrix.linux_webkit }}" = "4.1" ]; then
-            sudo apt-get install -y libwebkit2gtk-4.1-dev libsoup-3.0-dev
-          else
-            sudo apt-get install -y libwebkit2gtk-4.0-dev
-          fi
-
-          sudo apt-get install -y libfuse2 || sudo apt-get install -y libfuse2t64 || true
-
-          LINUXDEPLOY_URL="https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
-          PLUGIN_URL="https://github.com/linuxdeploy/linuxdeploy-plugin-gtk/releases/download/continuous/linuxdeploy-plugin-gtk-x86_64.AppImage"
-
-          wget --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --tries=3 -O /tmp/linuxdeploy "$LINUXDEPLOY_URL" || {
-            echo "skip-appimage=true" >> "$GITHUB_ENV"
-          }
-          wget --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --tries=3 -O /tmp/linuxdeploy-plugin-gtk "$PLUGIN_URL" || {
-            echo "skip-appimage=true" >> "$GITHUB_ENV"
-          }
-
-          if [ "${skip-appimage:-false}" != "true" ]; then
-            chmod +x /tmp/linuxdeploy /tmp/linuxdeploy-plugin-gtk
-          fi
-
-      - name: Install Wails
-        run: go install github.com/wailsapp/wails/v2/cmd/wails@v2.11.0
-
-      - name: Setup MSYS2 Toolchain For DuckDB (Windows AMD64)
-        id: msys2_duckdb
-        if: ${{ matrix.build_optional_agents && matrix.platform == 'windows/amd64' }}
-        continue-on-error: true
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: UCRT64
-          update: true
-          install: >-
-            mingw-w64-ucrt-x86_64-gcc
-
-      - name: Configure DuckDB CGO Toolchain (Windows AMD64)
-        if: ${{ matrix.build_optional_agents && matrix.platform == 'windows/amd64' }}
-        shell: pwsh
-        run: |
-          function Find-MingwBin([string[]]$candidates) {
-            foreach ($bin in $candidates) {
-              if ([string]::IsNullOrWhiteSpace($bin)) {
-                continue
-              }
-              $gcc = Join-Path $bin 'gcc.exe'
-              $gxx = Join-Path $bin 'g++.exe'
-              if ((Test-Path $gcc) -and (Test-Path $gxx)) {
-                return $bin
-              }
-            }
-            return $null
-          }
-
-          $msys2Location = "${{ steps.msys2_duckdb.outputs['msys2-location'] }}"
-          $candidateBins = @()
-          if (-not [string]::IsNullOrWhiteSpace($msys2Location)) {
-            $candidateBins += Join-Path $msys2Location 'ucrt64\bin'
-          }
-          $candidateBins += @(
-            'C:\msys64\ucrt64\bin',
-            'D:\a\_temp\msys64\ucrt64\bin'
-          )
-          $candidateBins = @($candidateBins | Select-Object -Unique)
-
-          $mingwBin = Find-MingwBin $candidateBins
-          if (-not $mingwBin) {
-            Write-Error "❌ 未找到可用的 DuckDB UCRT64 编译器。"
-            exit 1
-          }
-
-          $gcc = Join-Path $mingwBin 'gcc.exe'
-          $gxx = Join-Path $mingwBin 'g++.exe'
-          "$mingwBin" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8
-          "CC=$gcc" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
-          "CXX=$gxx" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
-
-      - name: Build App
-        shell: bash
-        run: |
-          set -euo pipefail
-          BUILD_LABEL="${{ inputs.build_label }}"
-          if [ -z "$BUILD_LABEL" ]; then
-            BUILD_LABEL="test"
-          fi
-          APP_VERSION="${BUILD_LABEL}-${GITHUB_RUN_NUMBER}"
-          if [ -n "${{ matrix.wails_tags }}" ]; then
-            wails build -platform "${{ matrix.platform }}" -clean -o "${{ matrix.build_name }}" -tags "${{ matrix.wails_tags }}" -ldflags "-s -w -X GoNavi-Wails/internal/app.AppVersion=${APP_VERSION}"
-          else
-            wails build -platform "${{ matrix.platform }}" -clean -o "${{ matrix.build_name }}" -ldflags "-s -w -X GoNavi-Wails/internal/app.AppVersion=${APP_VERSION}"
-          fi
-
-      - name: Build Optional Driver Agents
-        if: ${{ matrix.build_optional_agents }}
-        shell: bash
-        run: |
-          set -euo pipefail
-          TARGET_PLATFORM="${{ matrix.platform }}"
-          GOOS="${TARGET_PLATFORM%%/*}"
-          GOARCH="${TARGET_PLATFORM##*/}"
-          DRIVERS=(mariadb doris sphinx sqlserver sqlite duckdb dameng kingbase highgo vastbase mongodb tdengine clickhouse)
-          OUTDIR="drivers/${{ matrix.os_name }}"
-          mkdir -p "$OUTDIR"
-
-          for DRIVER in "${DRIVERS[@]}"; do
-            BUILD_DRIVER="$DRIVER"
-            if [ "$DRIVER" = "doris" ]; then
-              BUILD_DRIVER="diros"
-            fi
-            if [ "$DRIVER" = "duckdb" ] && [ "$GOOS" = "windows" ] && [ "$GOARCH" != "amd64" ]; then
-              echo "跳过 DuckDB driver: ${GOOS}/${GOARCH}"
-              continue
-            fi
-            TAG="gonavi_${BUILD_DRIVER}_driver"
-            OUTPUT="${DRIVER}-driver-agent-${GOOS}-${GOARCH}"
-            if [ "$GOOS" = "windows" ]; then
-              OUTPUT="${OUTPUT}.exe"
-            fi
-            OUTPUT_PATH="${OUTDIR}/${OUTPUT}"
-            if [ "$DRIVER" = "duckdb" ]; then
-              CGO_ENABLED=1 GOOS="$GOOS" GOARCH="$GOARCH" go build -tags "$TAG" -trimpath -ldflags "-s -w" -o "$OUTPUT_PATH" ./cmd/optional-driver-agent
-            else
-              CGO_ENABLED=0 GOOS="$GOOS" GOARCH="$GOARCH" go build -tags "$TAG" -trimpath -ldflags "-s -w" -o "$OUTPUT_PATH" ./cmd/optional-driver-agent
-            fi
-          done
-
-      - name: Package macOS
-        if: contains(matrix.platform, 'darwin')
-        shell: bash
-        run: |
-          set -euo pipefail
-          brew install create-dmg
-          LABEL="${{ inputs.build_label }}"
-          if [ -z "$LABEL" ]; then
-            LABEL="test"
-          fi
-          cd build/bin
-          APP_PATH=$(find . -maxdepth 1 -name "*.app" | head -n 1)
-          if [ -z "$APP_PATH" ]; then
-            echo "未找到 .app 应用包"
-            exit 1
-          fi
-          APP_NAME=$(basename "$APP_PATH")
-          codesign --force --deep --sign - "$APP_NAME"
-          ZIP_NAME="GoNavi-${LABEL}-${{ matrix.os_name }}-${{ matrix.arch_name }}-run${GITHUB_RUN_NUMBER}.zip"
-          DMG_NAME="GoNavi-${LABEL}-${{ matrix.os_name }}-${{ matrix.arch_name }}-run${GITHUB_RUN_NUMBER}.dmg"
-          mkdir -p ../../artifacts
-          ditto -c -k --sequesterRsrc --keepParent "$APP_NAME" "../../artifacts/$ZIP_NAME"
-          create-dmg \
-            --volname "GoNavi Test Installer" \
-            --window-pos 200 120 \
-            --window-size 800 400 \
-            --icon-size 100 \
-            --icon "$APP_NAME" 200 190 \
-            --hide-extension "$APP_NAME" \
-            --app-drop-link 600 185 \
-            "$DMG_NAME" \
-            "$APP_NAME"
-          mv "$DMG_NAME" "../../artifacts/$DMG_NAME"
-          shasum -a 256 "../../artifacts/$ZIP_NAME" > "../../artifacts/$ZIP_NAME.sha256"
-          shasum -a 256 "../../artifacts/$DMG_NAME" > "../../artifacts/$DMG_NAME.sha256"
-
-      - name: Package Windows
-        if: contains(matrix.platform, 'windows')
-        shell: pwsh
-        run: |
-          $label = "${{ inputs.build_label }}"
-          if ([string]::IsNullOrWhiteSpace($label)) { $label = 'test' }
-          Set-Location build/bin
-          $target = "${{ matrix.build_name }}"
-          $finalExeName = "GoNavi-$label-${{ matrix.os_name }}-${{ matrix.arch_name }}-run$env:GITHUB_RUN_NUMBER.exe"
-          $finalZipName = "GoNavi-$label-${{ matrix.os_name }}-${{ matrix.arch_name }}-run$env:GITHUB_RUN_NUMBER.zip"
-          if (Test-Path "$target.exe") {
-            $finalExe = "$target.exe"
-          } elseif (Test-Path "$target") {
-            Rename-Item -Path "$target" -NewName "$target.exe"
-            $finalExe = "$target.exe"
-          } else {
-            Write-Error "未找到构建产物 '$target'"
-            exit 1
-          }
-          New-Item -ItemType Directory -Force -Path ..\..\artifacts | Out-Null
-          Copy-Item -LiteralPath $finalExe -Destination "..\..\artifacts\$finalExeName" -Force
-          Compress-Archive -LiteralPath $finalExe -DestinationPath "..\..\artifacts\$finalZipName" -Force
-          Get-FileHash "..\..\artifacts\$finalExeName" -Algorithm SHA256 | ForEach-Object { "{0} *{1}" -f $_.Hash.ToLower(), (Split-Path $_.Path -Leaf) } | Out-File "..\..\artifacts\$finalExeName.sha256" -Encoding ascii
-          Get-FileHash "..\..\artifacts\$finalZipName" -Algorithm SHA256 | ForEach-Object { "{0} *{1}" -f $_.Hash.ToLower(), (Split-Path $_.Path -Leaf) } | Out-File "..\..\artifacts\$finalZipName.sha256" -Encoding ascii
-
-      - name: Package Linux
-        if: contains(matrix.platform, 'linux')
-        shell: bash
-        run: |
-          set -euo pipefail
-          LABEL="${{ inputs.build_label }}"
-          if [ -z "$LABEL" ]; then
-            LABEL="test"
-          fi
-          cd build/bin
-          TARGET="${{ matrix.build_name }}"
-          TAR_NAME="GoNavi-${LABEL}-${{ matrix.os_name }}-${{ matrix.arch_name }}${{ matrix.artifact_suffix }}-run${GITHUB_RUN_NUMBER}.tar.gz"
-          APPIMAGE_NAME="GoNavi-${LABEL}-${{ matrix.os_name }}-${{ matrix.arch_name }}${{ matrix.artifact_suffix }}-run${GITHUB_RUN_NUMBER}.AppImage"
-          mkdir -p ../../artifacts
-
-          if [ ! -f "$TARGET" ]; then
-            echo "未找到构建产物 '$TARGET'"
-            exit 1
-          fi
-          chmod +x "$TARGET"
-          tar -czvf "../../artifacts/$TAR_NAME" "$TARGET"
-          sha256sum "../../artifacts/$TAR_NAME" > "../../artifacts/$TAR_NAME.sha256"
-
-          if [ "${skip-appimage:-false}" = "true" ]; then
-            echo "跳过 AppImage 打包"
-            exit 0
-          fi
-
-          mkdir -p AppDir/usr/bin AppDir/usr/share/applications AppDir/usr/share/icons/hicolor/256x256/apps
-          cp "$TARGET" AppDir/usr/bin/gonavi
-          printf '%s\n' '[Desktop Entry]' 'Name=GoNavi' 'Exec=gonavi' 'Icon=gonavi' 'Type=Application' 'Categories=Development;Database;' 'Comment=Database Management Tool' > AppDir/usr/share/applications/gonavi.desktop
-          cp AppDir/usr/share/applications/gonavi.desktop AppDir/gonavi.desktop
-          if [ -f "../../build/appicon.png" ]; then
-            cp "../../build/appicon.png" AppDir/usr/share/icons/hicolor/256x256/apps/gonavi.png
-            cp "../../build/appicon.png" AppDir/gonavi.png
-          else
-            touch AppDir/gonavi.png
-            cp AppDir/gonavi.png AppDir/usr/share/icons/hicolor/256x256/apps/gonavi.png
-          fi
-          export DEPLOY_GTK_VERSION=3
-          /tmp/linuxdeploy --appdir AppDir --plugin gtk --output appimage || exit 0
-          mv GoNavi*.AppImage "$APPIMAGE_NAME" 2>/dev/null || exit 0
-          mv "$APPIMAGE_NAME" "../../artifacts/$APPIMAGE_NAME"
-          sha256sum "../../artifacts/$APPIMAGE_NAME" > "../../artifacts/$APPIMAGE_NAME.sha256"
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-build-${{ matrix.build_name }}-run${{ github.run_number }}
-          path: |
-            artifacts/*
-            drivers/**
-          if-no-files-found: error
-          retention-days: 7

.gitignore

@@ -19,6 +19,3 @@ GoNavi-Wails.exe
 .ace-tool/
 .claude/
 tmpclaude-*
-
-CLAUDE.md
-**/CLAUDE.md

CONTRIBUTING.md

@@ -79,14 +79,7 @@ Because external pull requests are merged directly into `main`, maintainers must
 
 ### 1. Sync `main` -> `dev` (required)
 
-This repository provides automatic sync via GitHub Actions workflow:
-
-- `.github/workflows/sync-main-to-dev.yml`
-- Trigger: every push to `main`
-- Behavior: create/reuse a PR from `main` to `dev`; if mergeable, it tries to enable auto-merge
-- Prerequisite: in `Settings -> Actions -> General -> Workflow permissions`, enable `Allow GitHub Actions to create and approve pull requests`; otherwise the workflow will skip PR creation and only emit a warning summary
-
-Manual fallback (when conflicts or automation is unavailable):
+Every change merged into `main` must be synced into `dev`:
 
 ```bash
 git checkout dev
@@ -121,7 +114,7 @@ git push origin v0.6.0
 
 ### 4. Sync `main` back to `dev` after release
 
-After the release, the same automation still applies. If needed, you can run the workflow manually (`workflow_dispatch`) or execute the fallback commands:
+After the release, sync `main` back into `dev` again:
 
 ```bash
 git checkout dev

CONTRIBUTING.zh-CN.md

@@ -79,14 +79,7 @@ feature/* / fix/* -> dev -> release/* -> main -> tag(vX.Y.Z)
 
 ### 1. main → dev 同步（必做）
 
-仓库已提供 GitHub Actions 自动同步机制：
-
-- `.github/workflows/sync-main-to-dev.yml`
-- 触发时机：每次 `main` 分支有新的 push
-- 行为：自动创建或复用 `main` 到 `dev` 的同步 PR；若可合并，则尝试开启自动合并
-- 前置条件：需在 `Settings -> Actions -> General -> Workflow permissions` 中开启 `Allow GitHub Actions to create and approve pull requests`，否则 workflow 只会输出告警摘要并跳过建 PR
-
-当出现冲突，或自动化暂不可用时，使用以下手动兜底方式：
+任何合入 `main` 的变更，都必须同步到 `dev`：
 
 ```bash
 git checkout dev
@@ -121,7 +114,7 @@ git push origin v0.6.0
 
 ### 4. main 回流到 dev（发版后必做）
 
-发布完成后，仍沿用同一套自动化流程；如有需要，也可以手动触发 `workflow_dispatch`，或执行以下兜底命令，确保开发线与发布线一致：
+发布完成后，再次将 `main` 回流到 `dev`，确保开发线与发布线一致：
 
 ```bash
 git checkout dev

README.md

@@ -154,7 +154,6 @@ Artifacts are generated in `build/bin`.
 
 The repository includes a release workflow.
 Push a `v*` tag to trigger automated build and release.
-Release notes are generated automatically from merged pull requests and categorized by `.github/release.yaml`.
 
 Target artifacts include:
 - macOS (AMD64 / ARM64)

README.zh-CN.md

@@ -147,7 +147,6 @@ wails build -clean
 ### 跨平台发布（GitHub Actions）
 
 仓库内置发布流水线，推送 `v*` Tag 可自动构建并发布 Release。
-Release 更新说明会基于已合并 Pull Request 自动生成，并按 `.github/release.yaml` 分类。
 
 支持目标：
 - macOS (AMD64 / ARM64)

cmd/optional-driver-agent/provider_mongodb_v1.go

@@ -1,12 +0,0 @@
-//go:build gonavi_mongodb_driver_v1
-
-package main
-
-import "GoNavi-Wails/internal/db"
-
-func init() {
-	agentDriverType = "mongodb"
-	agentDatabaseFactory = func() db.Database {
-		return &db.MongoDBV1{}
-	}
-}

frontend/package.json.md5

@@ -1 +1 @@
-d0f9366af59a6367ad3c7e2d4185ead4
+5b8157374dae5f9340e31b2d0bd2c00e

frontend/src/App.tsx

@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from 'react';
 import { Layout, Button, ConfigProvider, theme, Dropdown, MenuProps, message, Modal, Spin, Slider, Progress, Switch, Input, InputNumber, Select } from 'antd';
 import zhCN from 'antd/locale/zh_CN';
-import { PlusOutlined, ConsoleSqlOutlined, UploadOutlined, DownloadOutlined, CloudDownloadOutlined, BugOutlined, ToolOutlined, GlobalOutlined, InfoCircleOutlined, GithubOutlined, SkinOutlined, CheckOutlined, MinusOutlined, BorderOutlined, CloseOutlined, SettingOutlined, LinkOutlined } from '@ant-design/icons';
-import { BrowserOpenURL, Environment, EventsOn, Quit, WindowFullscreen, WindowGetSize, WindowIsFullscreen, WindowIsMaximised, WindowMaximise, WindowMinimise, WindowSetSize, WindowToggleMaximise } from '../wailsjs/runtime';
+import { PlusOutlined, ConsoleSqlOutlined, UploadOutlined, DownloadOutlined, CloudDownloadOutlined, BugOutlined, ToolOutlined, GlobalOutlined, InfoCircleOutlined, GithubOutlined, SkinOutlined, CheckOutlined, MinusOutlined, BorderOutlined, CloseOutlined, SettingOutlined } from '@ant-design/icons';
+import { BrowserOpenURL, Environment, EventsOn, Quit, WindowFullscreen, WindowIsFullscreen, WindowIsMaximised, WindowMaximise, WindowMinimise, WindowToggleMaximise } from '../wailsjs/runtime';
 import Sidebar from './components/Sidebar';
 import TabManager from './components/TabManager';
 import ConnectionModal from './components/ConnectionModal';
@@ -12,17 +12,6 @@ import LogPanel from './components/LogPanel';
 import { useStore } from './store';
 import { SavedConnection } from './types';
 import { blurToFilter, normalizeBlurForPlatform, normalizeOpacityForPlatform, isWindowsPlatform } from './utils/appearance';
-import {
-  SHORTCUT_ACTION_META,
-  SHORTCUT_ACTION_ORDER,
-  ShortcutAction,
-  eventToShortcut,
-  getShortcutDisplay,
-  hasModifierKey,
-  isEditableElement,
-  isShortcutMatch,
-  normalizeShortcutCombo,
-} from './utils/shortcuts';
 import { ConfigureGlobalProxy, SetWindowTranslucency } from '../wailsjs/go/app/App';
 import './App.css';
 
@@ -64,9 +53,6 @@ function App() {
   const setStartupFullscreen = useStore(state => state.setStartupFullscreen);
   const globalProxy = useStore(state => state.globalProxy);
   const setGlobalProxy = useStore(state => state.setGlobalProxy);
-  const shortcutOptions = useStore(state => state.shortcutOptions);
-  const updateShortcut = useStore(state => state.updateShortcut);
-  const resetShortcutOptions = useStore(state => state.resetShortcutOptions);
   const darkMode = themeMode === 'dark';
   const effectiveUiScale = Math.min(MAX_UI_SCALE, Math.max(MIN_UI_SCALE, Number(uiScale) || DEFAULT_UI_SCALE));
   const effectiveFontSize = Math.min(MAX_FONT_SIZE, Math.max(MIN_FONT_SIZE, Math.round(Number(fontSize) || DEFAULT_FONT_SIZE)));
@@ -274,119 +260,6 @@ function App() {
       };
   }, []);
 
-  useEffect(() => {
-      if (!isWindowsPlatform()) {
-          return;
-      }
-
-      let cancelled = false;
-      let inFlight = false;
-      let lastRatio = Number(window.devicePixelRatio) || 1;
-      let lastFixAt = 0;
-      let activationTimer: number | null = null;
-
-      const wait = (ms: number) => new Promise<void>((resolve) => window.setTimeout(resolve, ms));
-
-      const fixWindowScaleIfNeeded = async () => {
-          if (cancelled || inFlight) return;
-          const now = Date.now();
-          if (now - lastFixAt < 700) return;
-          inFlight = true;
-          try {
-              const [isFullscreen, isMaximised] = await Promise.all([
-                  WindowIsFullscreen().catch(() => false),
-                  WindowIsMaximised().catch(() => false),
-              ]);
-
-              // 避免在全屏/最大化状态下强制改尺寸；这两种状态通常能自行保持 DPI 同步。
-              if (isFullscreen || isMaximised) {
-                  window.dispatchEvent(new Event('resize'));
-                  lastFixAt = Date.now();
-                  return;
-              }
-
-              const size = await WindowGetSize().catch(() => null);
-              const width = Math.trunc(Number(size?.w || 0));
-              const height = Math.trunc(Number(size?.h || 0));
-              if (width <= 0 || height <= 0) {
-                  window.dispatchEvent(new Event('resize'));
-                  lastFixAt = Date.now();
-                  return;
-              }
-
-              const nudgedWidth = width > 480 ? width - 1 : width + 1;
-              WindowSetSize(nudgedWidth, height);
-              await wait(28);
-              WindowSetSize(width, height);
-              window.dispatchEvent(new Event('resize'));
-              lastFixAt = Date.now();
-          } finally {
-              inFlight = false;
-          }
-      };
-
-      const checkDevicePixelRatio = () => {
-          if (cancelled) return;
-          const currentRatio = Number(window.devicePixelRatio) || 1;
-          if (Math.abs(currentRatio - lastRatio) < 0.02) {
-              return;
-          }
-          lastRatio = currentRatio;
-          void fixWindowScaleIfNeeded();
-      };
-
-      const scheduleActivationFix = () => {
-          if (cancelled) return;
-          if (activationTimer !== null) {
-              window.clearTimeout(activationTimer);
-          }
-          activationTimer = window.setTimeout(() => {
-              activationTimer = null;
-              if (cancelled) return;
-              void fixWindowScaleIfNeeded();
-          }, 80);
-      };
-
-      const handleWindowFocus = () => {
-          if (cancelled) return;
-          checkDevicePixelRatio();
-          scheduleActivationFix();
-      };
-
-      const handleVisibilityChange = () => {
-          if (cancelled) return;
-          if (document.visibilityState !== 'visible') {
-              return;
-          }
-          checkDevicePixelRatio();
-          scheduleActivationFix();
-      };
-
-      const handlePageShow = () => {
-          if (cancelled) return;
-          checkDevicePixelRatio();
-          scheduleActivationFix();
-      };
-
-      const pollTimer = window.setInterval(checkDevicePixelRatio, 900);
-      window.addEventListener('resize', checkDevicePixelRatio);
-      window.addEventListener('focus', handleWindowFocus);
-      window.addEventListener('pageshow', handlePageShow);
-      document.addEventListener('visibilitychange', handleVisibilityChange);
-
-      return () => {
-          cancelled = true;
-          if (activationTimer !== null) {
-              window.clearTimeout(activationTimer);
-          }
-          window.clearInterval(pollTimer);
-          window.removeEventListener('resize', checkDevicePixelRatio);
-          window.removeEventListener('focus', handleWindowFocus);
-          window.removeEventListener('pageshow', handlePageShow);
-          document.removeEventListener('visibilitychange', handleVisibilityChange);
-      };
-  }, []);
-
   // Background Helper
   const getBg = (darkHex: string) => {
       if (!darkMode) return `rgba(255, 255, 255, ${effectiveOpacity})`; // Light mode usually white
@@ -426,7 +299,7 @@ function App() {
   const [isAboutOpen, setIsAboutOpen] = useState(false);
   const isAboutOpenRef = React.useRef(false);
   const [aboutLoading, setAboutLoading] = useState(false);
-  const [aboutInfo, setAboutInfo] = useState<{ version: string; author: string; buildTime?: string; repoUrl?: string; issueUrl?: string; releaseUrl?: string; communityUrl?: string } | null>(null);
+  const [aboutInfo, setAboutInfo] = useState<{ version: string; author: string; buildTime?: string; repoUrl?: string; issueUrl?: string; releaseUrl?: string } | null>(null);
   const [aboutUpdateStatus, setAboutUpdateStatus] = useState<string>('');
   const [lastUpdateInfo, setLastUpdateInfo] = useState<UpdateInfo | null>(null);
   const [updateDownloadProgress, setUpdateDownloadProgress] = useState<{
@@ -793,7 +666,7 @@ function App() {
           void message.warning("没有连接可导出");
           return;
       }
-      const res = await (window as any).go.app.App.ExportData(connections, ['id','name','config','includeDatabases','includeRedisDatabases'], "connections", "json");
+      const res = await (window as any).go.app.App.ExportData(connections, [], "connections", "json");
       if (res.success) {
           void message.success("导出成功");
       } else if (res.message !== "Cancelled") {
@@ -847,18 +720,10 @@ function App() {
           label: '外观设置...',
           icon: <SettingOutlined />,
           onClick: () => setIsAppearanceModalOpen(true)
-      },
-      {
-          key: 'shortcut-settings',
-          label: '快捷键管理...',
-          icon: <LinkOutlined />,
-          onClick: () => setIsShortcutModalOpen(true)
       }
   ];
 
   const [isAppearanceModalOpen, setIsAppearanceModalOpen] = useState(false);
-  const [isShortcutModalOpen, setIsShortcutModalOpen] = useState(false);
-  const [capturingShortcutAction, setCapturingShortcutAction] = useState<ShortcutAction | null>(null);
   const [isProxyModalOpen, setIsProxyModalOpen] = useState(false);
 
 
@@ -938,7 +803,7 @@ function App() {
   };
   
   // Sidebar Resizing
-  const [sidebarWidth, setSidebarWidth] = useState(330);
+  const [sidebarWidth, setSidebarWidth] = useState(300);
   const sidebarDragRef = React.useRef<{ startX: number, startWidth: number } | null>(null);
   const rafRef = React.useRef<number | null>(null);
   const ghostRef = React.useRef<HTMLDivElement>(null);
@@ -1070,113 +935,6 @@ function App() {
       };
   }, []);
 
-  useEffect(() => {
-      const handleOpenShortcutSettingsEvent = () => {
-          setIsShortcutModalOpen(true);
-      };
-      window.addEventListener('gonavi:open-shortcut-settings', handleOpenShortcutSettingsEvent as EventListener);
-      return () => {
-          window.removeEventListener('gonavi:open-shortcut-settings', handleOpenShortcutSettingsEvent as EventListener);
-      };
-  }, []);
-
-  useEffect(() => {
-      const handleGlobalShortcut = (event: KeyboardEvent) => {
-          const matchedAction = SHORTCUT_ACTION_ORDER.find((action) => {
-              const binding = shortcutOptions[action];
-              if (!binding?.enabled) {
-                  return false;
-              }
-              if (isEditableElement(event.target) && !SHORTCUT_ACTION_META[action].allowInEditable) {
-                  return false;
-              }
-              return isShortcutMatch(event, binding.combo);
-          });
-
-          if (!matchedAction) {
-              return;
-          }
-
-          event.preventDefault();
-          event.stopPropagation();
-
-          switch (matchedAction) {
-              case 'runQuery':
-                  window.dispatchEvent(new CustomEvent('gonavi:run-active-query'));
-                  break;
-              case 'focusSidebarSearch':
-                  window.dispatchEvent(new CustomEvent('gonavi:focus-sidebar-search'));
-                  break;
-              case 'newQueryTab':
-                  handleNewQuery();
-                  break;
-              case 'toggleLogPanel':
-                  setIsLogPanelOpen((prev) => !prev);
-                  break;
-              case 'toggleTheme':
-                  setTheme(themeMode === 'dark' ? 'light' : 'dark');
-                  break;
-              case 'openShortcutManager':
-                  setIsShortcutModalOpen(true);
-                  break;
-          }
-      };
-
-      window.addEventListener('keydown', handleGlobalShortcut);
-      return () => {
-          window.removeEventListener('keydown', handleGlobalShortcut);
-      };
-  }, [handleNewQuery, shortcutOptions, themeMode, setTheme]);
-
-  useEffect(() => {
-      if (!capturingShortcutAction) {
-          return;
-      }
-
-      const handleShortcutCapture = (event: KeyboardEvent) => {
-          event.preventDefault();
-          event.stopPropagation();
-
-          if (event.key === 'Escape') {
-              setCapturingShortcutAction(null);
-              return;
-          }
-
-          const combo = eventToShortcut(event);
-          if (!combo) {
-              return;
-          }
-          if (!hasModifierKey(combo)) {
-              void message.warning('快捷键至少包含 Ctrl / Alt / Shift / Meta 之一');
-              return;
-          }
-
-          const normalizedCombo = normalizeShortcutCombo(combo);
-          const conflictAction = SHORTCUT_ACTION_ORDER.find((action) => {
-              if (action === capturingShortcutAction) {
-                  return false;
-              }
-              const binding = shortcutOptions[action];
-              if (!binding?.enabled) {
-                  return false;
-              }
-              return normalizeShortcutCombo(binding.combo) === normalizedCombo;
-          });
-          if (conflictAction) {
-              void message.warning(`与「${SHORTCUT_ACTION_META[conflictAction].label}」冲突，请换一个快捷键`);
-              return;
-          }
-
-          updateShortcut(capturingShortcutAction, { combo: normalizedCombo, enabled: true });
-          setCapturingShortcutAction(null);
-      };
-
-      window.addEventListener('keydown', handleShortcutCapture, true);
-      return () => {
-          window.removeEventListener('keydown', handleShortcutCapture, true);
-      };
-  }, [capturingShortcutAction, shortcutOptions, updateShortcut]);
-
   const linuxResizeHandleStyleBase = {
       position: 'fixed',
       zIndex: 12000,
@@ -1463,9 +1221,6 @@ function App() {
                 <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
                     <div>版本：{aboutInfo?.version || '未知'}</div>
                     <div>作者：{aboutInfo?.author || '未知'}</div>
-                    {aboutInfo?.communityUrl ? (
-                        <div>技术圈：<a onClick={(e) => { e.preventDefault(); if (aboutInfo?.communityUrl) BrowserOpenURL(aboutInfo.communityUrl); }} href={aboutInfo.communityUrl}>AI全书</a></div>
-                    ) : null}
                     <div>更新状态：{aboutUpdateStatus || '未检查'}</div>
                     <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
                         <GithubOutlined />
@@ -1596,84 +1351,6 @@ function App() {
               </div>
           </Modal>
 
-          <Modal
-              title="快捷键管理"
-              open={isShortcutModalOpen}
-              onCancel={() => {
-                  setIsShortcutModalOpen(false);
-                  setCapturingShortcutAction(null);
-              }}
-              width={720}
-              footer={[
-                  <Button
-                      key="reset"
-                      onClick={() => {
-                          resetShortcutOptions();
-                          setCapturingShortcutAction(null);
-                          void message.success('已恢复默认快捷键');
-                      }}
-                  >
-                      恢复默认
-                  </Button>,
-                  <Button
-                      key="close"
-                      type="primary"
-                      onClick={() => {
-                          setIsShortcutModalOpen(false);
-                          setCapturingShortcutAction(null);
-                      }}
-                  >
-                      关闭
-                  </Button>,
-              ]}
-          >
-              <div style={{ display: 'flex', flexDirection: 'column', gap: 12, paddingTop: 8 }}>
-                  <div style={{ fontSize: 12, color: '#8c8c8c' }}>
-                      点击“录制”后按下快捷键。按 Esc 可取消录制。建议至少包含一个修饰键（Ctrl/Alt/Shift/Meta）。
-                  </div>
-                  {SHORTCUT_ACTION_ORDER.map((action) => {
-                      const meta = SHORTCUT_ACTION_META[action];
-                      const binding = shortcutOptions[action] ?? { combo: '', enabled: false };
-                      const isCapturing = capturingShortcutAction === action;
-                      return (
-                          <div
-                              key={action}
-                              style={{
-                                  display: 'grid',
-                                  gridTemplateColumns: '1fr auto',
-                                  gap: 12,
-                                  alignItems: 'center',
-                                  padding: '10px 12px',
-                                  border: '1px solid rgba(128, 128, 128, 0.2)',
-                                  borderRadius: 8,
-                              }}
-                          >
-                              <div>
-                                  <div style={{ fontWeight: 500 }}>{meta.label}</div>
-                                  <div style={{ fontSize: 12, color: '#8c8c8c' }}>{meta.description}</div>
-                              </div>
-                              <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
-                                  <Input
-                                      readOnly
-                                      value={isCapturing ? '请按下快捷键...' : getShortcutDisplay(binding.combo)}
-                                      style={{ width: 180, fontFamily: 'Consolas, Menlo, Monaco, monospace' }}
-                                  />
-                                  <Button
-                                      size="small"
-                                      onClick={() => setCapturingShortcutAction((prev) => (prev === action ? null : action))}
-                                  >
-                                      {isCapturing ? '取消' : '录制'}
-                                  </Button>
-                                  <Switch
-                                      checked={binding.enabled}
-                                      onChange={(checked) => updateShortcut(action, { enabled: checked })}
-                                  />
-                              </div>
-                          </div>
-                      );
-                  })}
-              </div>
-          </Modal>
           <Modal
               title="全局代理设置"
               open={isProxyModalOpen}

frontend/src/components/ConnectionModal.tsx

@@ -54,26 +54,6 @@ const singleHostUriSchemesByType: Record<string, string[]> = {
   vastbase: ['vastbase'],
 };
 
-const sslSupportedTypes = new Set([
-    'mysql',
-    'mariadb',
-    'diros',
-    'sphinx',
-    'dameng',
-    'clickhouse',
-    'postgres',
-    'sqlserver',
-    'oracle',
-    'kingbase',
-    'highgo',
-    'vastbase',
-    'mongodb',
-    'redis',
-    'tdengine',
-]);
-
-const supportsSSLForType = (type: string) => sslSupportedTypes.has(String(type || '').trim().toLowerCase());
-
 const isFileDatabaseType = (type: string) => type === 'sqlite' || type === 'duckdb';
 
 type DriverStatusSnapshot = {
@@ -98,10 +78,8 @@ const ConnectionModal: React.FC<{
 }> = ({ open, onClose, initialValues, onOpenDriverManager }) => {
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
-  const [useSSL, setUseSSL] = useState(false);
   const [useSSH, setUseSSH] = useState(false);
   const [useProxy, setUseProxy] = useState(false);
-  const [useHttpTunnel, setUseHttpTunnel] = useState(false);
   const [dbType, setDbType] = useState('mysql');
   const [step, setStep] = useState(1); // 1: Select Type, 2: Configure
   const [activeGroup, setActiveGroup] = useState(0); // Active category index in step 1
@@ -129,17 +107,6 @@ const ConnectionModal: React.FC<{
   const mongoTopology = Form.useWatch('mongoTopology', form) || 'single';
   const mongoSrv = Form.useWatch('mongoSrv', form) || false;
   const redisTopology = Form.useWatch('redisTopology', form) || 'single';
-  const isMySQLLike = dbType === 'mysql' || dbType === 'mariadb' || dbType === 'diros' || dbType === 'sphinx';
-  const isSSLType = supportsSSLForType(dbType);
-  const sslHintText = isMySQLLike
-      ? '当 MySQL/MariaDB/Doris/Sphinx 开启安全传输策略时，请启用 SSL；本地自签证书场景可先用 Preferred 或 Skip Verify。'
-      : dbType === 'dameng'
-          ? '达梦驱动启用 SSL 需要客户端证书与私钥路径（sslCertPath / sslKeyPath）。'
-      : dbType === 'sqlserver'
-          ? 'SQL Server 推荐在生产环境使用 Required，并关闭 TrustServerCertificate。'
-          : dbType === 'mongodb'
-              ? 'MongoDB 可通过 TLS 保护连接，证书校验异常时可先用 Skip Verify 验证连通性。'
-              : '建议优先使用 Required；仅在测试环境或自签证书场景使用 Skip Verify。';
 
   const getSectionBg = (darkHex: string) => {
       if (!darkMode) {
@@ -397,7 +364,7 @@ const ConnectionModal: React.FC<{
       uriText: string,
       expectedSchemes: string[],
       defaultPort: number,
-  ): { host: string; port: number; username: string; password: string; database: string; params: URLSearchParams } | null => {
+  ): { host: string; port: number; username: string; password: string; database: string } | null => {
       let parsed: ReturnType<typeof parseMultiHostUri> | null = null;
       for (const scheme of expectedSchemes) {
           parsed = parseMultiHostUri(uriText, scheme);
@@ -425,7 +392,6 @@ const ConnectionModal: React.FC<{
           username: parsed.username,
           password: parsed.password,
           database: parsed.database || '',
-          params: parsed.params,
       };
   };
 
@@ -459,22 +425,12 @@ const ConnectionModal: React.FC<{
           const primary = parseHostPort(hostList[0] || `localhost:${mysqlDefaultPort}`, mysqlDefaultPort);
           const timeoutValue = Number(parsed.params.get('timeout'));
           const topology = String(parsed.params.get('topology') || '').toLowerCase();
-          const tlsValue = String(parsed.params.get('tls') || '').trim().toLowerCase();
-          const sslMode = tlsValue === 'true'
-              ? 'required'
-              : tlsValue === 'skip-verify'
-                  ? 'skip-verify'
-                  : tlsValue === 'preferred'
-                      ? 'preferred'
-                      : 'disable';
           return {
               host: primary?.host || 'localhost',
               port: primary?.port || mysqlDefaultPort,
               user: parsed.username,
               password: parsed.password,
               database: parsed.database || '',
-              useSSL: sslMode !== 'disable',
-              sslMode,
               mysqlTopology: hostList.length > 1 || topology === 'replica' ? 'replica' : 'single',
               mysqlReplicaHosts: hostList.slice(1),
               timeout: Number.isFinite(timeoutValue) && timeoutValue > 0
@@ -495,7 +451,7 @@ const ConnectionModal: React.FC<{
       }
 
       if (type === 'redis') {
-          const parsed = parseMultiHostUri(trimmedUri, 'redis') || parseMultiHostUri(trimmedUri, 'rediss');
+          const parsed = parseMultiHostUri(trimmedUri, 'redis');
           if (!parsed) {
               return null;
           }
@@ -513,15 +469,10 @@ const ConnectionModal: React.FC<{
           const topologyParam = String(parsed.params.get('topology') || '').toLowerCase();
           const dbText = String(parsed.database || '').trim().replace(/^\//, '');
           const dbIndex = Number(dbText);
-          const isRediss = trimmedUri.toLowerCase().startsWith('rediss://');
-          const skipVerifyText = String(parsed.params.get('skip_verify') || '').trim().toLowerCase();
-          const skipVerify = skipVerifyText === '1' || skipVerifyText === 'true' || skipVerifyText === 'yes' || skipVerifyText === 'on';
           return {
               host: primary?.host || 'localhost',
               port: primary?.port || 6379,
               password: parsed.password || '',
-              useSSL: isRediss,
-              sslMode: isRediss ? (skipVerify ? 'skip-verify' : 'required') : 'disable',
               redisTopology: hostList.length > 1 || topologyParam === 'cluster' ? 'cluster' : 'single',
               redisHosts: hostList.slice(1),
               redisDB: Number.isFinite(dbIndex) && dbIndex >= 0 && dbIndex <= 15 ? Math.trunc(dbIndex) : 0,
@@ -550,18 +501,12 @@ const ConnectionModal: React.FC<{
               ? { host: hostList[0] || 'localhost', port: 27017 }
               : parseHostPort(hostList[0] || 'localhost:27017', 27017);
           const timeoutMs = Number(parsed.params.get('connectTimeoutMS') || parsed.params.get('serverSelectionTimeoutMS'));
-          const tlsText = String(parsed.params.get('tls') || parsed.params.get('ssl') || '').trim().toLowerCase();
-          const tlsInsecureText = String(parsed.params.get('tlsInsecure') || parsed.params.get('sslInsecure') || '').trim().toLowerCase();
-          const tlsEnabled = tlsText === '1' || tlsText === 'true' || tlsText === 'yes' || tlsText === 'on';
-          const tlsInsecure = tlsInsecureText === '1' || tlsInsecureText === 'true' || tlsInsecureText === 'yes' || tlsInsecureText === 'on';
           return {
               host: primary?.host || 'localhost',
               port: primary?.port || 27017,
               user: parsed.username,
               password: parsed.password,
               database: parsed.database || '',
-              useSSL: tlsEnabled,
-              sslMode: tlsEnabled ? (tlsInsecure ? 'skip-verify' : 'required') : 'disable',
               mongoTopology: hostList.length > 1 || !!parsed.params.get('replicaSet') ? 'replica' : 'single',
               mongoHosts: hostList.slice(1),
               mongoSrv: isSrv,
@@ -586,94 +531,13 @@ const ConnectionModal: React.FC<{
               // Oracle 需要显式 service name，避免 URI 解析后放过必填校验。
               return null;
           }
-          const parsedValues: Record<string, any> = {
+          return {
               host: parsed.host,
               port: parsed.port,
               user: parsed.username,
               password: parsed.password,
               database: parsed.database,
           };
-
-          if (supportsSSLForType(type)) {
-              const normalizeBool = (raw: unknown) => {
-                  const text = String(raw ?? '').trim().toLowerCase();
-                  return text === '1' || text === 'true' || text === 'yes' || text === 'on';
-              };
-              if (type === 'postgres' || type === 'kingbase' || type === 'highgo' || type === 'vastbase') {
-                  const sslMode = String(parsed.params.get('sslmode') || '').trim().toLowerCase();
-                  if (sslMode) {
-                      parsedValues.useSSL = sslMode !== 'disable' && sslMode !== 'false';
-                      parsedValues.sslMode = sslMode === 'disable' || sslMode === 'false'
-                          ? 'disable'
-                          : 'required';
-                  }
-              } else if (type === 'sqlserver') {
-                  const encrypt = String(parsed.params.get('encrypt') || '').trim().toLowerCase();
-                  const trust = String(parsed.params.get('TrustServerCertificate') || parsed.params.get('trustservercertificate') || '').trim().toLowerCase();
-                  const encrypted = encrypt === 'true' || encrypt === 'mandatory' || encrypt === 'yes' || encrypt === '1' || encrypt === 'strict';
-                  if (encrypted) {
-                      parsedValues.useSSL = true;
-                      parsedValues.sslMode = trust === 'true' || trust === '1' || trust === 'yes' ? 'skip-verify' : 'required';
-                  } else if (encrypt) {
-                      parsedValues.useSSL = false;
-                      parsedValues.sslMode = 'disable';
-                  }
-              } else if (type === 'clickhouse') {
-                  const secure = String(parsed.params.get('secure') || parsed.params.get('tls') || '').trim().toLowerCase();
-                  const skipVerify = normalizeBool(parsed.params.get('skip_verify'));
-                  if (secure) {
-                      parsedValues.useSSL = normalizeBool(secure);
-                      parsedValues.sslMode = skipVerify ? 'skip-verify' : (parsedValues.useSSL ? 'required' : 'disable');
-                  }
-              } else if (type === 'dameng') {
-                  const certPath = String(
-                      parsed.params.get('SSL_CERT_PATH')
-                      || parsed.params.get('ssl_cert_path')
-                      || parsed.params.get('sslCertPath')
-                      || ''
-                  ).trim();
-                  const keyPath = String(
-                      parsed.params.get('SSL_KEY_PATH')
-                      || parsed.params.get('ssl_key_path')
-                      || parsed.params.get('sslKeyPath')
-                      || ''
-                  ).trim();
-                  parsedValues.sslCertPath = certPath;
-                  parsedValues.sslKeyPath = keyPath;
-                  if (certPath || keyPath) {
-                      parsedValues.useSSL = true;
-                      parsedValues.sslMode = 'required';
-                  }
-              } else if (type === 'oracle') {
-                  const ssl = String(parsed.params.get('SSL') || parsed.params.get('ssl') || '').trim().toLowerCase();
-                  const sslVerify = String(
-                      parsed.params.get('SSL VERIFY')
-                      || parsed.params.get('ssl verify')
-                      || parsed.params.get('SSL_VERIFY')
-                      || parsed.params.get('ssl_verify')
-                      || ''
-                  ).trim().toLowerCase();
-                  if (ssl) {
-                      parsedValues.useSSL = normalizeBool(ssl);
-                      if (!parsedValues.useSSL) {
-                          parsedValues.sslMode = 'disable';
-                      } else {
-                          parsedValues.sslMode = normalizeBool(sslVerify || 'true') ? 'required' : 'skip-verify';
-                      }
-                  }
-              } else if (type === 'tdengine') {
-                  const protocol = String(parsed.params.get('protocol') || '').trim().toLowerCase();
-                  const skipVerify = normalizeBool(parsed.params.get('skip_verify'));
-                  if (protocol === 'wss') {
-                      parsedValues.useSSL = true;
-                      parsedValues.sslMode = skipVerify ? 'skip-verify' : 'required';
-                  } else if (protocol === 'ws') {
-                      parsedValues.useSSL = false;
-                      parsedValues.sslMode = 'disable';
-                  }
-              }
-          };
-          return parsedValues;
       }
 
       return null;
@@ -745,16 +609,6 @@ const ConnectionModal: React.FC<{
           if (hosts.length > 1 || values.mysqlTopology === 'replica') {
               params.set('topology', 'replica');
           }
-          if (values.useSSL) {
-              const mode = String(values.sslMode || 'preferred').trim().toLowerCase();
-              if (mode === 'required') {
-                  params.set('tls', 'true');
-              } else if (mode === 'skip-verify') {
-                  params.set('tls', 'skip-verify');
-              } else {
-                  params.set('tls', 'preferred');
-              }
-          }
           if (Number.isFinite(timeout) && timeout > 0) {
               params.set('timeout', String(timeout));
           }
@@ -780,15 +634,8 @@ const ConnectionModal: React.FC<{
               ? Math.max(0, Math.min(15, Math.trunc(Number(values.redisDB))))
               : 0;
           const dbPath = `/${redisDB}`;
-          if (values.useSSL) {
-              const mode = String(values.sslMode || 'preferred').trim().toLowerCase();
-              if (mode === 'skip-verify' || mode === 'preferred') {
-                  params.set('skip_verify', 'true');
-              }
-          }
           const query = params.toString();
-          const scheme = values.useSSL ? 'rediss' : 'redis';
-          return `${scheme}://${redisAuth}${hosts.join(',')}${dbPath}${query ? `?${query}` : ''}`;
+          return `redis://${redisAuth}${hosts.join(',')}${dbPath}${query ? `?${query}` : ''}`;
       }
 
       if (isFileDatabaseType(type)) {
@@ -828,15 +675,6 @@ const ConnectionModal: React.FC<{
           if (authMechanism) {
               params.set('authMechanism', authMechanism);
           }
-          if (values.useSSL) {
-              const mode = String(values.sslMode || 'preferred').trim().toLowerCase();
-              params.set('tls', 'true');
-              if (mode === 'skip-verify' || mode === 'preferred') {
-                  params.set('tlsInsecure', 'true');
-              } else {
-                  params.delete('tlsInsecure');
-              }
-          }
           if (Number.isFinite(timeout) && timeout > 0) {
               params.set('connectTimeoutMS', String(timeout * 1000));
               params.set('serverSelectionTimeoutMS', String(timeout * 1000));
@@ -848,45 +686,7 @@ const ConnectionModal: React.FC<{
 
       const scheme = type === 'postgres' ? 'postgresql' : type;
       const dbPath = database ? `/${encodeURIComponent(database)}` : '';
-      const params = new URLSearchParams();
-      if (supportsSSLForType(type) && values.useSSL) {
-          const mode = String(values.sslMode || 'preferred').trim().toLowerCase();
-          if (type === 'postgres' || type === 'kingbase' || type === 'highgo' || type === 'vastbase') {
-              params.set('sslmode', 'require');
-          } else if (type === 'sqlserver') {
-              params.set('encrypt', 'true');
-              params.set('TrustServerCertificate', mode === 'skip-verify' || mode === 'preferred' ? 'true' : 'false');
-          } else if (type === 'clickhouse') {
-              params.set('secure', 'true');
-              if (mode === 'skip-verify' || mode === 'preferred') {
-                  params.set('skip_verify', 'true');
-              }
-          } else if (type === 'dameng') {
-              const certPath = String(values.sslCertPath || '').trim();
-              const keyPath = String(values.sslKeyPath || '').trim();
-              if (certPath) params.set('SSL_CERT_PATH', certPath);
-              if (keyPath) params.set('SSL_KEY_PATH', keyPath);
-          } else if (type === 'oracle') {
-              params.set('SSL', 'TRUE');
-              params.set('SSL VERIFY', mode === 'required' ? 'TRUE' : 'FALSE');
-          } else if (type === 'tdengine') {
-              params.set('protocol', 'wss');
-              if (mode === 'skip-verify' || mode === 'preferred') {
-                  params.set('skip_verify', 'true');
-              }
-          }
-      } else if (supportsSSLForType(type)) {
-          if (type === 'postgres' || type === 'kingbase' || type === 'highgo' || type === 'vastbase') {
-              params.set('sslmode', 'disable');
-          } else if (type === 'sqlserver') {
-              params.set('encrypt', 'disable');
-              params.set('TrustServerCertificate', 'true');
-          } else if (type === 'tdengine') {
-              params.set('protocol', 'ws');
-          }
-      }
-      const query = params.toString();
-      return `${scheme}://${encodedAuth}${toAddress(host, port, defaultPort)}${dbPath}${query ? `?${query}` : ''}`;
+      return `${scheme}://${encodedAuth}${toAddress(host, port, defaultPort)}${dbPath}`;
   };
 
   const handleGenerateURI = () => {
@@ -1027,8 +827,6 @@ const ConnectionModal: React.FC<{
               const mysqlIsReplica = String(config.topology || '').toLowerCase() === 'replica' || mysqlReplicaHosts.length > 0;
               const mongoIsReplica = String(config.topology || '').toLowerCase() === 'replica' || mongoHosts.length > 0 || !!config.replicaSet;
               const redisIsCluster = String(config.topology || '').toLowerCase() === 'cluster' || redisHosts.length > 0;
-              const hasHttpTunnel = !!config.useHttpTunnel;
-              const hasProxy = !hasHttpTunnel && !!config.useProxy;
               form.setFieldsValue({
                   type: configType,
                   name: initialValues.name,
@@ -1040,27 +838,18 @@ const ConnectionModal: React.FC<{
                   uri: config.uri || '',
                   includeDatabases: initialValues.includeDatabases,
                   includeRedisDatabases: initialValues.includeRedisDatabases,
-                  useSSL: !!config.useSSL,
-                  sslMode: config.sslMode || 'preferred',
-                  sslCertPath: config.sslCertPath || '',
-                  sslKeyPath: config.sslKeyPath || '',
                   useSSH: config.useSSH,
                   sshHost: config.ssh?.host,
                   sshPort: config.ssh?.port,
                   sshUser: config.ssh?.user,
                   sshPassword: config.ssh?.password,
                   sshKeyPath: config.ssh?.keyPath,
-                  useProxy: hasProxy,
+                  useProxy: config.useProxy,
                   proxyType: config.proxy?.type || 'socks5',
                   proxyHost: config.proxy?.host,
                   proxyPort: config.proxy?.port,
                   proxyUser: config.proxy?.user,
                   proxyPassword: config.proxy?.password,
-                  useHttpTunnel: hasHttpTunnel,
-                  httpTunnelHost: config.httpTunnel?.host,
-                  httpTunnelPort: config.httpTunnel?.port || 8080,
-                  httpTunnelUser: config.httpTunnel?.user,
-                  httpTunnelPassword: config.httpTunnel?.password,
                   driver: config.driver,
                   dsn: config.dsn,
                   timeout: config.timeout || 30,
@@ -1082,10 +871,8 @@ const ConnectionModal: React.FC<{
                   mongoReplicaUser: config.mongoReplicaUser || '',
                   mongoReplicaPassword: config.mongoReplicaPassword || ''
               });
-              setUseSSL(!!config.useSSL);
               setUseSSH(config.useSSH || false);
-              setUseProxy(hasProxy);
-              setUseHttpTunnel(hasHttpTunnel);
+              setUseProxy(config.useProxy || false);
               setDbType(configType);
               // 如果是 Redis 编辑模式，设置已保存的 Redis 数据库列表
               if (configType === 'redis') {
@@ -1095,10 +882,8 @@ const ConnectionModal: React.FC<{
               // Create mode: Start at step 1
               setStep(1);
               form.resetFields();
-              setUseSSL(false);
               setUseSSH(false);
               setUseProxy(false);
-              setUseHttpTunnel(false);
               setDbType('mysql');
               setActiveGroup(0);
           }
@@ -1147,10 +932,8 @@ const ConnectionModal: React.FC<{
 
       setLoading(false);
       form.resetFields();
-      setUseSSL(false);
       setUseSSH(false);
       setUseProxy(false);
-      setUseHttpTunnel(false);
       setDbType('mysql');
       setStep(1);
       onClose();
@@ -1196,24 +979,19 @@ const ConnectionModal: React.FC<{
               ? await RedisConnect(config as any)
               : await TestConnection(config as any);
 
-		  if (res.success) {
-			  setTestResult({ type: 'success', message: res.message });
-			  if (isRedisType) {
-				  setRedisDbList(Array.from({ length: 16 }, (_, i) => i));
-			  } else {
-				  // Other databases: fetch database list
-				  const dbRes = await DBGetDatabases(config as any);
-				  if (dbRes.success) {
-					  const dbRows = Array.isArray(dbRes.data) ? dbRes.data : [];
-					  const dbs = dbRows
-						  .map((row: any) => row?.Database || row?.database)
-						  .filter((name: any) => typeof name === 'string' && name.trim() !== '');
-					  setDbList(dbs);
-				  } else {
-					  setDbList([]);
-				  }
-			  }
-		  } else {
+          if (res.success) {
+              setTestResult({ type: 'success', message: res.message });
+              if (isRedisType) {
+                  setRedisDbList(Array.from({ length: 16 }, (_, i) => i));
+              } else {
+                  // Other databases: fetch database list
+                  const dbRes = await DBGetDatabases(config as any);
+                  if (dbRes.success) {
+                      const dbs = (dbRes.data as any[]).map((row: any) => row.Database || row.database);
+                      setDbList(dbs);
+                  }
+              }
+          } else {
               const failMessage = buildTestFailureMessage(
                   res?.message,
                   '连接被拒绝或参数无效，请检查后重试'
@@ -1295,21 +1073,6 @@ const ConnectionModal: React.FC<{
       const type = String(mergedValues.type || '').toLowerCase();
       const defaultPort = getDefaultPortByType(type);
       const isFileDbType = isFileDatabaseType(type);
-      const sslCapableType = supportsSSLForType(type);
-      const sslModeRaw = String(mergedValues.sslMode || 'preferred').trim().toLowerCase();
-      const sslMode: 'preferred' | 'required' | 'skip-verify' | 'disable' = sslModeRaw === 'required'
-          ? 'required'
-          : sslModeRaw === 'skip-verify'
-              ? 'skip-verify'
-              : sslModeRaw === 'disable'
-                  ? 'disable'
-                  : 'preferred';
-      const effectiveUseSSL = sslCapableType && !!mergedValues.useSSL;
-      const sslCertPath = sslCapableType ? String(mergedValues.sslCertPath || '').trim() : '';
-      const sslKeyPath = sslCapableType ? String(mergedValues.sslKeyPath || '').trim() : '';
-      if (type === 'dameng' && effectiveUseSSL && (!sslCertPath || !sslKeyPath)) {
-          throw new Error('达梦启用 SSL 时必须填写证书路径与私钥路径');
-      }
 
       let primaryHost = 'localhost';
       let primaryPort = defaultPort;
@@ -1404,8 +1167,7 @@ const ConnectionModal: React.FC<{
           password: mergedValues.sshPassword || "",
           keyPath: mergedValues.sshKeyPath || ""
       } : { host: "", port: 22, user: "", password: "", keyPath: "" };
-      const effectiveUseHttpTunnel = !isFileDbType && !!mergedValues.useHttpTunnel;
-      const effectiveUseProxy = !isFileDbType && !!mergedValues.useProxy && !effectiveUseHttpTunnel;
+      const effectiveUseProxy = !isFileDbType && !!mergedValues.useProxy;
       const proxyTypeRaw = String(mergedValues.proxyType || 'socks5').toLowerCase();
       const proxyType: 'socks5' | 'http' = proxyTypeRaw === 'http' ? 'http' : 'socks5';
       const proxyConfig: NonNullable<ConnectionConfig['proxy']> = effectiveUseProxy ? {
@@ -1421,25 +1183,6 @@ const ConnectionModal: React.FC<{
           user: '',
           password: '',
       };
-      const httpTunnelConfig: NonNullable<ConnectionConfig['httpTunnel']> = effectiveUseHttpTunnel ? {
-          host: String(mergedValues.httpTunnelHost || '').trim(),
-          port: Number(mergedValues.httpTunnelPort || 8080),
-          user: String(mergedValues.httpTunnelUser || '').trim(),
-          password: mergedValues.httpTunnelPassword || "",
-      } : {
-          host: '',
-          port: 8080,
-          user: '',
-          password: '',
-      };
-      if (effectiveUseHttpTunnel) {
-          if (!httpTunnelConfig.host) {
-              throw new Error('HTTP 隧道主机不能为空');
-          }
-          if (!Number.isFinite(httpTunnelConfig.port) || httpTunnelConfig.port <= 0 || httpTunnelConfig.port > 65535) {
-              throw new Error('HTTP 隧道端口必须在 1-65535 之间');
-          }
-      }
 
       const keepPassword = !forPersist || savePassword;
 
@@ -1451,16 +1194,10 @@ const ConnectionModal: React.FC<{
           password: keepPassword ? (mergedValues.password || "") : "",
           savePassword: savePassword,
           database: mergedValues.database || "",
-          useSSL: effectiveUseSSL,
-          sslMode: effectiveUseSSL ? sslMode : 'disable',
-          sslCertPath: sslCertPath,
-          sslKeyPath: sslKeyPath,
           useSSH: !!mergedValues.useSSH,
           ssh: sshConfig,
           useProxy: effectiveUseProxy,
           proxy: proxyConfig,
-          useHttpTunnel: effectiveUseHttpTunnel,
-          httpTunnel: httpTunnelConfig,
           driver: mergedValues.driver,
           dsn: mergedValues.dsn,
           timeout: Number(mergedValues.timeout || 30),
@@ -1496,20 +1233,14 @@ const ConnectionModal: React.FC<{
 
       const defaultPort = getDefaultPortByType(type);
       if (isFileDatabaseType(type)) {
-          setUseSSL(false);
           setUseSSH(false);
           setUseProxy(false);
-          setUseHttpTunnel(false);
           form.setFieldsValue({
               host: '',
               port: 0,
               user: '',
               password: '',
               database: '',
-              useSSL: false,
-              sslMode: 'preferred',
-              sslCertPath: '',
-              sslKeyPath: '',
               useSSH: false,
               sshHost: '',
               sshPort: 22,
@@ -1522,11 +1253,6 @@ const ConnectionModal: React.FC<{
               proxyPort: 1080,
               proxyUser: '',
               proxyPassword: '',
-              useHttpTunnel: false,
-              httpTunnelHost: '',
-              httpTunnelPort: 8080,
-              httpTunnelUser: '',
-              httpTunnelPassword: '',
               mysqlTopology: 'single',
               redisTopology: 'single',
               mongoTopology: 'single',
@@ -1547,22 +1273,10 @@ const ConnectionModal: React.FC<{
           });
       } else if (type !== 'custom') {
           const defaultUser = type === 'clickhouse' ? 'default' : 'root';
-          const sslCapableType = supportsSSLForType(type);
-          setUseSSL(false);
-          setUseHttpTunnel(false);
           form.setFieldsValue({
               user: defaultUser,
               database: '',
               port: defaultPort,
-              useSSL: sslCapableType ? false : undefined,
-              sslMode: sslCapableType ? 'preferred' : undefined,
-              sslCertPath: sslCapableType ? '' : undefined,
-              sslKeyPath: sslCapableType ? '' : undefined,
-              useHttpTunnel: false,
-              httpTunnelHost: '',
-              httpTunnelPort: 8080,
-              httpTunnelUser: '',
-              httpTunnelPassword: '',
               mysqlTopology: 'single',
               redisTopology: 'single',
               mongoTopology: 'single',
@@ -1706,17 +1420,11 @@ const ConnectionModal: React.FC<{
             port: 3306,
             database: '',
             user: 'root',
-            useSSL: false,
-            sslMode: 'preferred',
-            sslCertPath: '',
-            sslKeyPath: '',
             useSSH: false,
             sshPort: 22,
             useProxy: false,
             proxyType: 'socks5',
             proxyPort: 1080,
-            useHttpTunnel: false,
-            httpTunnelPort: 8080,
             timeout: 30,
             uri: '',
             mysqlTopology: 'single',
@@ -1743,16 +1451,8 @@ const ConnectionModal: React.FC<{
             if (changed.uri !== undefined || changed.type !== undefined) {
                 setUriFeedback(null);
             }
-            if (changed.useSSL !== undefined) setUseSSL(changed.useSSL);
             if (changed.useSSH !== undefined) setUseSSH(changed.useSSH);
-            if (changed.useProxy !== undefined) {
-                const enabledProxy = !!changed.useProxy;
-                setUseProxy(enabledProxy);
-                if (enabledProxy && form.getFieldValue('useHttpTunnel')) {
-                    form.setFieldValue('useHttpTunnel', false);
-                    setUseHttpTunnel(false);
-                }
-            }
+            if (changed.useProxy !== undefined) setUseProxy(changed.useProxy);
             if (changed.proxyType !== undefined) {
                 const nextType = String(changed.proxyType || 'socks5').toLowerCase();
                 if (nextType === 'http') {
@@ -1767,20 +1467,6 @@ const ConnectionModal: React.FC<{
                     }
                 }
             }
-            if (changed.useHttpTunnel !== undefined) {
-                const enabledHttpTunnel = !!changed.useHttpTunnel;
-                setUseHttpTunnel(enabledHttpTunnel);
-                if (enabledHttpTunnel && form.getFieldValue('useProxy')) {
-                    form.setFieldValue('useProxy', false);
-                    setUseProxy(false);
-                }
-                if (enabledHttpTunnel) {
-                    const currentPort = Number(form.getFieldValue('httpTunnelPort') || 0);
-                    if (!currentPort || currentPort <= 0) {
-                        form.setFieldValue('httpTunnelPort', 8080);
-                    }
-                }
-            }
             // Type change handled by step 1, but keep sync if select changes (hidden now)
             if (changed.type !== undefined) setDbType(changed.type);
             if (changed.redisTopology !== undefined) {
@@ -2149,56 +1835,6 @@ const ConnectionModal: React.FC<{
 
         {!isFileDb && (
         <>
-            {isSSLType && (
-                <>
-                    <Divider style={{ margin: '12px 0' }} />
-                    <Form.Item name="useSSL" valuePropName="checked" style={{ marginBottom: 0 }}>
-                        <Checkbox>使用 SSL/TLS</Checkbox>
-                    </Form.Item>
-                    {useSSL && (
-                        <div style={tunnelSectionStyle}>
-                            <Form.Item
-                                name="sslMode"
-                                label="SSL 模式"
-                                rules={[{ required: true, message: '请选择 SSL 模式' }]}
-                                style={{ marginBottom: 8 }}
-                            >
-                                <Select
-                                    options={[
-                                        { value: 'preferred', label: 'Preferred（优先 SSL，推荐）' },
-                                        { value: 'required', label: 'Required（必须 SSL，校验证书）' },
-                                        { value: 'skip-verify', label: 'Skip Verify（必须 SSL，跳过证书校验）' },
-                                    ]}
-                                />
-                            </Form.Item>
-                            {dbType === 'dameng' && (
-                                <>
-                                    <Form.Item
-                                        name="sslCertPath"
-                                        label="客户端证书路径 (SSL_CERT_PATH)"
-                                        rules={[{ required: true, message: '达梦 SSL 需要证书路径' }]}
-                                        style={{ marginBottom: 8 }}
-                                    >
-                                        <Input placeholder="例如: C:\\certs\\client-cert.pem" />
-                                    </Form.Item>
-                                    <Form.Item
-                                        name="sslKeyPath"
-                                        label="客户端私钥路径 (SSL_KEY_PATH)"
-                                        rules={[{ required: true, message: '达梦 SSL 需要私钥路径' }]}
-                                        style={{ marginBottom: 8 }}
-                                    >
-                                        <Input placeholder="例如: C:\\certs\\client-key.pem" />
-                                    </Form.Item>
-                                </>
-                            )}
-                            <Text type="secondary" style={{ fontSize: 12 }}>
-                                {sslHintText}
-                            </Text>
-                        </div>
-                    )}
-                </>
-            )}
-
             <Divider style={{ margin: '12px 0' }} />
             <Form.Item name="useSSH" valuePropName="checked" style={{ marginBottom: 0 }}>
                 <Checkbox>使用 SSH 隧道 (SSH Tunnel)</Checkbox>
@@ -2267,35 +1903,6 @@ const ConnectionModal: React.FC<{
                 </div>
             )}
 
-            <Divider style={{ margin: '12px 0' }} />
-            <Form.Item name="useHttpTunnel" valuePropName="checked" style={{ marginBottom: 0 }}>
-                <Checkbox>使用 HTTP 隧道（独立代理）</Checkbox>
-            </Form.Item>
-
-            {useHttpTunnel && (
-                <div style={tunnelSectionStyle}>
-                    <div style={{ display: 'flex', gap: 16 }}>
-                        <Form.Item name="httpTunnelHost" label="隧道主机" rules={[{ required: useHttpTunnel, message: '请输入隧道主机' }]} style={{ flex: 1 }}>
-                            <Input placeholder="例如: tunnel.company.com 或 127.0.0.1" />
-                        </Form.Item>
-                        <Form.Item name="httpTunnelPort" label="端口" rules={[{ required: useHttpTunnel, message: '请输入隧道端口' }]} style={{ width: 120 }}>
-                            <InputNumber style={{ width: '100%' }} min={1} max={65535} />
-                        </Form.Item>
-                    </div>
-                    <div style={{ display: 'flex', gap: 16 }}>
-                        <Form.Item name="httpTunnelUser" label="隧道用户名（可选）" style={{ flex: 1 }}>
-                            <Input placeholder="留空表示无认证" />
-                        </Form.Item>
-                        <Form.Item name="httpTunnelPassword" label="隧道密码（可选）" style={{ flex: 1 }}>
-                            <Input.Password placeholder="留空表示无认证" />
-                        </Form.Item>
-                    </div>
-                    <Text type="secondary" style={{ fontSize: 12 }}>
-                        与“使用代理”互斥，启用后将通过 HTTP CONNECT 建立独立隧道。
-                    </Text>
-                </div>
-            )}
-
             <Divider style={{ margin: '12px 0' }} />
             
             <Collapse 

frontend/src/components/DataGrid.tsx

@@ -142,19 +142,10 @@ const formatCellValue = (val: any) => {
     try {
         if (val === null) return <span style={{ color: '#ccc' }}>NULL</span>;
         if (typeof val === 'object') {
-            if (!Array.isArray(val) && !isPlainObject(val)) {
-                return String(val);
-            }
             const cached = objectCellPreviewCache.get(val);
             if (cached !== undefined) {
                 return cached;
             }
-            const topLevelSize = Array.isArray(val) ? val.length : Object.keys(val || {}).length;
-            if (topLevelSize > 80) {
-                const summary = Array.isArray(val) ? `[Array(${topLevelSize})]` : `{Object(${topLevelSize})}`;
-                objectCellPreviewCache.set(val, summary);
-                return summary;
-            }
             try {
                 const nextText = JSON.stringify(val);
                 const previewText = nextText.length > TABLE_CELL_PREVIEW_MAX_CHARS ? `${nextText.slice(0, TABLE_CELL_PREVIEW_MAX_CHARS)}…` : nextText;
@@ -200,26 +191,6 @@ const isCellValueEqualForDiff = (left: any, right: any): boolean => {
     return toFormText(left) === toFormText(right);
 };
 
-// 渲染阶段轻量比较：避免对象值在 shouldCellUpdate 中反复深度序列化导致卡顿。
-const isCellValueEqualForRender = (left: any, right: any): boolean => {
-    if (left === right) return true;
-    const leftNullish = left === null || left === undefined;
-    const rightNullish = right === null || right === undefined;
-    if (leftNullish || rightNullish) return leftNullish && rightNullish;
-
-    const leftType = typeof left;
-    const rightType = typeof right;
-    if (leftType === 'object' || rightType === 'object') {
-        // 对象仅按引用比较；真正的值差异在提交保存时再做严格比对。
-        return false;
-    }
-
-    if (leftType === 'string' || rightType === 'string') {
-        return normalizeDateTimeString(String(left)) === normalizeDateTimeString(String(right));
-    }
-    return left === right;
-};
-
 const INLINE_EDIT_MAX_CHARS = 2000;
 
 const shouldOpenModalEditor = (val: any): boolean => {
@@ -566,7 +537,6 @@ const ContextMenuRow = React.memo(({ children, record, ...props }: any) => {
                 { key: 'exp-xlsx', label: 'Excel', onClick: () => handleExportSelected('xlsx', record) },
                 { key: 'exp-json', label: 'JSON', onClick: () => handleExportSelected('json', record) },
                 { key: 'exp-md', label: 'Markdown', onClick: () => handleExportSelected('md', record) },
-                { key: 'exp-html', label: 'HTML', onClick: () => handleExportSelected('html', record) },
             ]
         }
     ];
@@ -607,11 +577,7 @@ interface DataGridProps {
     // Filtering
     showFilter?: boolean;
     onToggleFilter?: () => void;
-    exportSqlWithFilter?: string;
     onApplyFilter?: (conditions: GridFilterCondition[]) => void;
-    appliedFilterConditions?: FilterCondition[];
-    scrollSnapshot?: { top: number; left: number };
-    onScrollSnapshotChange?: (snapshot: { top: number; left: number }) => void;
 }
 
 type GridFilterCondition = FilterCondition & {
@@ -629,10 +595,9 @@ type ColumnMeta = {
     comment: string;
 };
 
-const DataGrid: React.FC<DataGridProps> = ({
+const DataGrid: React.FC<DataGridProps> = ({ 
     data, columnNames, loading, tableName, exportScope = 'table', resultSql, dbName, connectionId, pkColumns = [], readOnly = false,
-    onReload, onSort, onPageChange, pagination, onRequestTotalCount, onCancelTotalCount, sortInfoExternal, showFilter, onToggleFilter, exportSqlWithFilter, onApplyFilter, appliedFilterConditions,
-    scrollSnapshot, onScrollSnapshotChange
+    onReload, onSort, onPageChange, pagination, onRequestTotalCount, onCancelTotalCount, sortInfoExternal, showFilter, onToggleFilter, onApplyFilter
 }) => {
   const connections = useStore(state => state.connections);
   const addSqlLog = useStore(state => state.addSqlLog);
@@ -655,8 +620,6 @@ const DataGrid: React.FC<DataGridProps> = ({
   const isQueryResultExport = exportScope === 'queryResult';
   const canImport = exportScope === 'table' && !!tableName;
   const canExport = !!connectionId && (isQueryResultExport || !!tableName);
-  const filteredExportSql = useMemo(() => String(exportSqlWithFilter || '').trim(), [exportSqlWithFilter]);
-  const hasFilteredExportSql = exportScope === 'table' && filteredExportSql.length > 0;
 
   // Background Helper
   const getBg = (darkHex: string) => {
@@ -753,8 +716,6 @@ const DataGrid: React.FC<DataGridProps> = ({
   const lastTableScrollLeftRef = useRef(0);
   const lastExternalScrollLeftRef = useRef(0);
   const pendingScrollToBottomRef = useRef(false);
-  const lastReportedScrollRef = useRef<{ top: number; left: number }>({ top: 0, left: 0 });
-  const didRestoreScrollRef = useRef(false);
 
   // 批量编辑模式状态
   const [cellEditMode, setCellEditMode] = useState(false);
@@ -1099,40 +1060,10 @@ const DataGrid: React.FC<DataGridProps> = ({
   const [modifiedRows, setModifiedRows] = useState<Record<string, any>>({});
   const [deletedRowKeys, setDeletedRowKeys] = useState<Set<string>>(new Set());
 
-  const normalizeFilterLogic = useCallback((logic: unknown): 'AND' | 'OR' => {
-      return String(logic || '').trim().toUpperCase() === 'OR' ? 'OR' : 'AND';
-  }, []);
-
-  const normalizeGridFilterConditions = useCallback((conditions?: FilterCondition[]): GridFilterCondition[] => {
-      if (!Array.isArray(conditions)) return [];
-      return conditions.map((cond, index) => {
-          const fallbackId = index + 1;
-          const nextId = Number.isFinite(Number(cond?.id)) ? Number(cond?.id) : fallbackId;
-          const op = String(cond?.op || '=');
-          const rawColumn = String(cond?.column || '');
-          return {
-              id: nextId,
-              enabled: cond?.enabled !== false,
-              logic: normalizeFilterLogic(cond?.logic),
-              column: rawColumn || (op === 'CUSTOM' ? '' : String(columnNames[0] || '')),
-              op,
-              value: String(cond?.value ?? ''),
-              value2: String(cond?.value2 ?? ''),
-          };
-      });
-  }, [columnNames, normalizeFilterLogic]);
-
   // Filter State
   const [filterConditions, setFilterConditions] = useState<GridFilterCondition[]>([]);
   const [nextFilterId, setNextFilterId] = useState(1);
 
-  useEffect(() => {
-      const nextConditions = normalizeGridFilterConditions(appliedFilterConditions);
-      setFilterConditions(nextConditions);
-      const maxId = nextConditions.reduce((max, cond) => (cond.id > max ? cond.id : max), 0);
-      setNextFilterId(Math.max(1, maxId + 1));
-  }, [appliedFilterConditions, normalizeGridFilterConditions]);
-
   const selectedRowKeysRef = useRef(selectedRowKeys);
   const displayDataRef = useRef<any[]>([]);
 
@@ -2079,14 +2010,9 @@ const DataGrid: React.FC<DataGridProps> = ({
 
   const estimatedVisibleCellCount = mergedDisplayData.length * Math.max(columnNames.length, 1);
   const enableLargeResultOptimizedEditing =
-      viewMode === 'table' && (
-          mergedDisplayData.length >= 60 ||
-          estimatedVisibleCellCount >= 1600 ||
-          columnNames.length >= 36 ||
-          (isMacLike && columnNames.length >= 24)
-      );
+      viewMode === 'table' && (mergedDisplayData.length >= 60 || estimatedVisibleCellCount >= 4000);
   const enableVirtual = enableLargeResultOptimizedEditing;
-  const enableInlineEditableCell = canModifyData && !enableLargeResultOptimizedEditing;
+  const enableInlineEditableCell = canModifyData;
 
   const columns = useMemo(() => {
       return columnNames.map(key => ({
@@ -2106,7 +2032,7 @@ const DataGrid: React.FC<DataGridProps> = ({
           shouldCellUpdate: (record: Item, prevRecord: Item) => {
               const rowKeyChanged = record?.[GONAVI_ROW_KEY] !== prevRecord?.[GONAVI_ROW_KEY];
               if (rowKeyChanged) return true;
-              return !isCellValueEqualForRender(record?.[key], prevRecord?.[key]);
+              return !isCellValueEqualForDiff(record?.[key], prevRecord?.[key]);
           },
           onHeaderCell: (column: any) => ({
               width: column.width,
@@ -2555,23 +2481,6 @@ const DataGrid: React.FC<DataGridProps> = ({
       });
   };
 
-  const handleExportFilteredAll = async (format: string) => {
-      if (!connectionId || !tableName) return;
-      if (!filteredExportSql) {
-          message.warning('当前未应用筛选条件');
-          return;
-      }
-      if (!supportsSqlQueryExport) {
-          message.error('当前数据源不支持按筛选结果导出');
-          return;
-      }
-      if (hasChanges) {
-          message.warning("当前存在未提交修改，筛选结果导出基于数据库已提交数据。");
-      }
-
-      await exportByQuery(filteredExportSql, format, `${tableName || 'export'}_filtered`);
-  };
-
   const handleImport = async () => {
       if (!connectionId || !tableName) return;
       const config = buildConnConfig();
@@ -2617,10 +2526,6 @@ const DataGrid: React.FC<DataGridProps> = ({
       { value: 'NOT_IN', label: '不在列表' },
       { value: 'CUSTOM', label: '[自定义]' },
   ]), []);
-  const filterLogicOptions = useMemo(() => ([
-      { value: 'AND', label: '且 (AND)' },
-      { value: 'OR', label: '或 (OR)' },
-  ]), []);
 
   const isNoValueOp = useCallback((op: string) => (
       op === 'IS_NULL' || op === 'IS_NOT_NULL' || op === 'IS_EMPTY' || op === 'IS_NOT_EMPTY'
@@ -2629,18 +2534,7 @@ const DataGrid: React.FC<DataGridProps> = ({
   const isListOp = useCallback((op: string) => op === 'IN' || op === 'NOT_IN', []);
 
   const addFilter = () => {
-      setFilterConditions([
-          ...filterConditions,
-          {
-              id: nextFilterId,
-              enabled: true,
-              logic: 'AND',
-              column: columnNames[0] || '',
-              op: '=',
-              value: '',
-              value2: '',
-          }
-      ]);
+      setFilterConditions([...filterConditions, { id: nextFilterId, enabled: true, column: columnNames[0] || '', op: '=', value: '', value2: '' }]);
       setNextFilterId(nextFilterId + 1);
   };
   const updateFilter = (id: number, field: keyof GridFilterCondition, val: string | boolean) => {
@@ -2668,28 +2562,11 @@ const DataGrid: React.FC<DataGridProps> = ({
       if (onApplyFilter) onApplyFilter(filterConditions);
   };
 
-  const exportMenu: MenuProps['items'] = hasFilteredExportSql ? [
-      { type: 'group', label: '筛选结果', children: [
-          { key: 'filtered-csv', label: 'CSV', onClick: () => handleExportFilteredAll('csv') },
-          { key: 'filtered-xlsx', label: 'Excel (XLSX)', onClick: () => handleExportFilteredAll('xlsx') },
-          { key: 'filtered-json', label: 'JSON', onClick: () => handleExportFilteredAll('json') },
-          { key: 'filtered-md', label: 'Markdown', onClick: () => handleExportFilteredAll('md') },
-          { key: 'filtered-html', label: 'HTML', onClick: () => handleExportFilteredAll('html') },
-      ]},
-      { type: 'divider' },
-      { type: 'group', label: '全表', children: [
-          { key: 'table-csv', label: 'CSV', onClick: () => handleExport('csv') },
-          { key: 'table-xlsx', label: 'Excel (XLSX)', onClick: () => handleExport('xlsx') },
-          { key: 'table-json', label: 'JSON', onClick: () => handleExport('json') },
-          { key: 'table-md', label: 'Markdown', onClick: () => handleExport('md') },
-          { key: 'table-html', label: 'HTML', onClick: () => handleExport('html') },
-      ]},
-  ] : [
+  const exportMenu: MenuProps['items'] = [
       { key: 'csv', label: 'CSV', onClick: () => handleExport('csv') },
       { key: 'xlsx', label: 'Excel (XLSX)', onClick: () => handleExport('xlsx') },
       { key: 'json', label: 'JSON', onClick: () => handleExport('json') },
       { key: 'md', label: 'Markdown', onClick: () => handleExport('md') },
-      { key: 'html', label: 'HTML', onClick: () => handleExport('html') },
   ];
 
   const columnInfoSettingContent = (
@@ -2772,13 +2649,6 @@ const DataGrid: React.FC<DataGridProps> = ({
       return active ? [active] : [];
   }, []);
 
-  const pickVerticalScrollTarget = useCallback((tableContainer: HTMLElement): HTMLElement | null => {
-      const virtualHolder = tableContainer.querySelector('.ant-table-tbody-virtual-holder') as HTMLElement | null;
-      const rcVirtualHolder = tableContainer.querySelector('.rc-virtual-list-holder') as HTMLElement | null;
-      const body = tableContainer.querySelector('.ant-table-body') as HTMLElement | null;
-      return virtualHolder || rcVirtualHolder || body;
-  }, []);
-
   const syncExternalScrollFromTargets = useCallback((targets?: HTMLElement[], source?: HTMLElement | null) => {
       const externalScroll = externalHScrollRef.current;
       if (!(externalScroll instanceof HTMLDivElement) || horizontalSyncSourceRef.current === 'external') {
@@ -2835,91 +2705,29 @@ const DataGrid: React.FC<DataGridProps> = ({
       horizontalSyncSourceRef.current = '';
   }, []);
 
-  // 非虚拟模式：外部水平滚动条的 wheel 处理（通过原生事件绑定，确保 preventDefault 生效）
-  useEffect(() => {
+  const handleExternalHorizontalWheel = useCallback((event: React.WheelEvent<HTMLDivElement>) => {
       const externalScroll = externalHScrollRef.current;
-      if (!externalScroll || !horizontalScrollVisible) return;
+      if (!(externalScroll instanceof HTMLDivElement)) {
+          return;
+      }
+      const dominantDelta = Math.abs(event.deltaX) > Math.abs(event.deltaY) ? event.deltaX : event.deltaY;
+      if (!Number.isFinite(dominantDelta) || Math.abs(dominantDelta) < 0.5) {
+          return;
+      }
 
-      const handleExternalWheel = (e: WheelEvent) => {
-          // 鼠标在水平滚动条区域时，始终阻止垂直滚动冒泡
-          e.preventDefault();
-          e.stopPropagation();
+      const maxScrollLeft = Math.max(0, externalScroll.scrollWidth - externalScroll.clientWidth);
+      if (maxScrollLeft <= 0) {
+          return;
+      }
 
-          const dominantDelta = Math.abs(e.deltaX) > Math.abs(e.deltaY) ? e.deltaX : e.deltaY;
-          if (!Number.isFinite(dominantDelta) || Math.abs(dominantDelta) < 0.5) return;
+      const nextScrollLeft = Math.max(0, Math.min(maxScrollLeft, externalScroll.scrollLeft + dominantDelta));
+      if (Math.abs(nextScrollLeft - externalScroll.scrollLeft) < 0.5) {
+          return;
+      }
 
-          const maxScrollLeft = Math.max(0, externalScroll.scrollWidth - externalScroll.clientWidth);
-          if (maxScrollLeft <= 0) return;
-
-          const nextScrollLeft = Math.max(0, Math.min(maxScrollLeft, externalScroll.scrollLeft + dominantDelta));
-          externalScroll.scrollLeft = nextScrollLeft;
-      };
-
-      externalScroll.addEventListener('wheel', handleExternalWheel, { passive: false, capture: true });
-      return () => {
-          externalScroll.removeEventListener('wheel', handleExternalWheel, { capture: true } as EventListenerOptions);
-      };
-  }, [horizontalScrollVisible]);
-
-  // 非虚拟模式：支持在数据区直接使用触摸板/Shift+滚轮进行横向滚动。
-  // 某些平台在表格内容未铺满一页时，不会把水平手势正确路由到表格 body，导致只能在表头/底部滚动条区域滚动。
-  useEffect(() => {
-      if (viewMode !== 'table' || enableVirtual) return;
-      const container = tableContainerRef.current;
-      if (!(container instanceof HTMLElement)) return;
-
-      const resolveHorizontalDelta = (event: WheelEvent) => {
-          if (Math.abs(event.deltaX) > 0.5) {
-              return event.deltaX;
-          }
-          if (event.shiftKey && Math.abs(event.deltaY) > 0.5) {
-              return event.deltaY;
-          }
-          return 0;
-      };
-
-      const isTableDataAreaTarget = (target: EventTarget | null) => {
-          const element = target instanceof HTMLElement ? target : null;
-          if (!element) return false;
-          if (element.closest('.data-grid-external-hscroll')) return false;
-          return !!element.closest('.ant-table-body, .ant-table-content, .ant-table-cell, .ant-table-row, .ant-table-tbody');
-      };
-
-      const handleContainerHorizontalWheel = (event: WheelEvent) => {
-          const horizontalDelta = resolveHorizontalDelta(event);
-          if (!Number.isFinite(horizontalDelta) || Math.abs(horizontalDelta) < 0.5) return;
-          if (!isTableDataAreaTarget(event.target)) return;
-
-          const targets = pickHorizontalScrollTargets(container);
-          const activeTarget = targets.find((target) => target.scrollWidth > target.clientWidth + 1) || targets[0];
-          if (!(activeTarget instanceof HTMLElement)) return;
-
-          const maxScrollLeft = Math.max(0, activeTarget.scrollWidth - activeTarget.clientWidth);
-          if (maxScrollLeft <= 0) return;
-
-          const nextScrollLeft = Math.max(0, Math.min(maxScrollLeft, activeTarget.scrollLeft + horizontalDelta));
-          if (Math.abs(nextScrollLeft - activeTarget.scrollLeft) < 1) return;
-
-          event.preventDefault();
-          event.stopPropagation();
-
-          horizontalSyncSourceRef.current = 'table';
-          activeTarget.scrollLeft = nextScrollLeft;
-          lastTableScrollLeftRef.current = nextScrollLeft;
-
-          const externalScroll = externalHScrollRef.current;
-          if (externalScroll && Math.abs(externalScroll.scrollLeft - nextScrollLeft) > 1) {
-              externalScroll.scrollLeft = nextScrollLeft;
-              lastExternalScrollLeftRef.current = nextScrollLeft;
-          }
-          horizontalSyncSourceRef.current = '';
-      };
-
-      container.addEventListener('wheel', handleContainerHorizontalWheel, { passive: false, capture: true });
-      return () => {
-          container.removeEventListener('wheel', handleContainerHorizontalWheel, { capture: true } as EventListenerOptions);
-      };
-  }, [viewMode, enableVirtual, pickHorizontalScrollTargets]);
+      event.preventDefault();
+      externalScroll.scrollLeft = nextScrollLeft;
+  }, []);
 
   useEffect(() => {
       if (viewMode !== 'table') return;
@@ -2927,114 +2735,19 @@ const DataGrid: React.FC<DataGridProps> = ({
       return () => cancelAnimationFrame(rafId);
   }, [viewMode, totalWidth, mergedDisplayData.length, recalculateTableMetrics]);
 
-  useEffect(() => {
-      if (viewMode !== 'table' || !onScrollSnapshotChange) return;
-      const tableContainer = tableContainerRef.current;
-      if (!(tableContainer instanceof HTMLElement)) return;
-
-      let rafId: number | null = null;
-      let boundVerticalTarget: HTMLElement | null = null;
-      let boundHorizontalTargets: HTMLElement[] = [];
-      const externalScroll = externalHScrollRef.current;
-      const hasStoredScroll = !!scrollSnapshot && (Math.abs(scrollSnapshot.top) > 0.5 || Math.abs(scrollSnapshot.left) > 0.5);
-
-      const emitSnapshot = () => {
-          if (!didRestoreScrollRef.current && hasStoredScroll) {
-              return;
-          }
-          const verticalTarget = boundVerticalTarget || pickVerticalScrollTarget(tableContainer);
-          const horizontalTargets = boundHorizontalTargets.length > 0 ? boundHorizontalTargets : pickHorizontalScrollTargets(tableContainer);
-          const top = verticalTarget ? verticalTarget.scrollTop : 0;
-          const left = horizontalTargets[0]?.scrollLeft ?? externalScroll?.scrollLeft ?? 0;
-          if (Math.abs(lastReportedScrollRef.current.top - top) < 1 && Math.abs(lastReportedScrollRef.current.left - left) < 1) {
-              return;
-          }
-          lastReportedScrollRef.current = { top, left };
-          onScrollSnapshotChange({ top, left });
-      };
-
-      const bindTargets = () => {
-          if (boundVerticalTarget) {
-              boundVerticalTarget.removeEventListener('scroll', emitSnapshot);
-          }
-          boundHorizontalTargets.forEach(target => target.removeEventListener('scroll', emitSnapshot));
-          externalScroll?.removeEventListener('scroll', emitSnapshot);
-
-          boundVerticalTarget = pickVerticalScrollTarget(tableContainer);
-          boundHorizontalTargets = pickHorizontalScrollTargets(tableContainer);
-
-          boundVerticalTarget?.addEventListener('scroll', emitSnapshot, { passive: true });
-          boundHorizontalTargets.forEach(target => target.addEventListener('scroll', emitSnapshot, { passive: true }));
-          externalScroll?.addEventListener('scroll', emitSnapshot, { passive: true });
-          emitSnapshot();
-      };
-
-      rafId = requestAnimationFrame(bindTargets);
-      return () => {
-          if (rafId !== null) cancelAnimationFrame(rafId);
-          if (boundVerticalTarget) {
-              boundVerticalTarget.removeEventListener('scroll', emitSnapshot);
-          }
-          boundHorizontalTargets.forEach(target => target.removeEventListener('scroll', emitSnapshot));
-          externalScroll?.removeEventListener('scroll', emitSnapshot);
-      };
-  }, [viewMode, mergedDisplayData.length, onScrollSnapshotChange, pickHorizontalScrollTargets, pickVerticalScrollTarget, scrollSnapshot]);
-
-  useEffect(() => {
-      if (viewMode !== 'table') return;
-      if (!scrollSnapshot) return;
-      if (didRestoreScrollRef.current) return;
-      const tableContainer = tableContainerRef.current;
-      if (!(tableContainer instanceof HTMLElement)) return;
-      if (mergedDisplayData.length === 0) return;
-
-      let rafId = requestAnimationFrame(() => {
-          const verticalTarget = pickVerticalScrollTarget(tableContainer);
-          const horizontalTargets = pickHorizontalScrollTargets(tableContainer);
-          const nextTop = Math.max(0, scrollSnapshot.top);
-          const nextLeft = Math.max(0, scrollSnapshot.left);
-          if (verticalTarget && Math.abs(verticalTarget.scrollTop - scrollSnapshot.top) > 1) {
-              verticalTarget.scrollTop = nextTop;
-          }
-          if (Math.abs(nextLeft) > 0.5) {
-              horizontalTargets.forEach(target => {
-                  if (Math.abs(target.scrollLeft - nextLeft) > 1) {
-                      target.scrollLeft = nextLeft;
-                  }
-              });
-              const externalScroll = externalHScrollRef.current;
-              if (externalScroll && Math.abs(externalScroll.scrollLeft - nextLeft) > 1) {
-                  externalScroll.scrollLeft = nextLeft;
-              }
-              lastTableScrollLeftRef.current = nextLeft;
-              lastExternalScrollLeftRef.current = nextLeft;
-          }
-          lastReportedScrollRef.current = { top: nextTop, left: nextLeft };
-          didRestoreScrollRef.current = true;
-          onScrollSnapshotChange?.({ top: nextTop, left: nextLeft });
-      });
-
-      return () => cancelAnimationFrame(rafId);
-  }, [viewMode, mergedDisplayData.length, scrollSnapshot, pickHorizontalScrollTargets, pickVerticalScrollTarget, onScrollSnapshotChange]);
-
-  // 虚拟模式下，在容器级别监听 wheel 事件，当鼠标在底部水平滚动条区域时拦截并转为水平滚动
+  // 虚拟模式下，为 rc-virtual-list 的内置水平滚动条添加鼠标滚轮支持
+  // rc-virtual-list 的 ScrollBar 组件原生只支持拖拽，不支持 wheel 事件
+  // 方案：使用 MutationObserver 发现滚动条元素后直接绑定 wheel 事件
   useEffect(() => {
       if (viewMode !== 'table' || !enableVirtual) return;
       const container = tableContainerRef.current;
       if (!container) return;
 
-      // 滚动条区域高度：滚动条高度 + 间距 + 容错
-      const scrollbarZoneHeight = floatingScrollbarHeight + floatingScrollbarGap + 8;
+      let currentScrollbarEl: HTMLElement | null = null;
 
-      const handleContainerWheel = (e: WheelEvent) => {
-          // 判断鼠标是否在底部滚动条区域
-          const containerRect = container.getBoundingClientRect();
-          if (e.clientY < containerRect.bottom - scrollbarZoneHeight) return;
-
-          // 适配 antd 的虚拟列表类名
-          const holderEl = container.querySelector('.ant-table-tbody-virtual-holder') as HTMLElement | null;
-          const innerEl = holderEl?.querySelector('.ant-table-tbody-virtual-holder-inner') as HTMLElement | null;
-          
+      const handleScrollbarWheel = (e: WheelEvent) => {
+          const innerEl = container.querySelector('.rc-virtual-list-holder-inner') as HTMLElement | null;
+          const holderEl = container.querySelector('.rc-virtual-list-holder') as HTMLElement | null;
           if (!innerEl || !holderEl) return;
 
           const dominantDelta = Math.abs(e.deltaX) > Math.abs(e.deltaY) ? e.deltaX : e.deltaY;
@@ -3056,13 +2769,12 @@ const DataGrid: React.FC<DataGridProps> = ({
           innerEl.style.marginLeft = `${-newOffset}px`;
 
           // 同步 scrollbar thumb 位置
-          const scrollbarEl = container.querySelector('.ant-table-tbody-virtual-scrollbar-horizontal') as HTMLElement | null;
-          if (scrollbarEl && maxScroll > 0) {
-              const thumbEl = scrollbarEl.querySelector('[class*="scrollbar-thumb"]') as HTMLElement | null;
+          if (currentScrollbarEl && maxScroll > 0) {
+              const thumbEl = currentScrollbarEl.querySelector('[class*="scrollbar-thumb"]') as HTMLElement | null;
               if (thumbEl) {
                   const ratio = newOffset / maxScroll;
                   const thumbWidth = parseFloat(thumbEl.style.width) || thumbEl.offsetWidth;
-                  const trackWidth = scrollbarEl.clientWidth;
+                  const trackWidth = currentScrollbarEl.clientWidth;
                   const thumbMaxOffset = trackWidth - thumbWidth;
                   thumbEl.style.left = `${ratio * thumbMaxOffset}px`;
               }
@@ -3075,12 +2787,33 @@ const DataGrid: React.FC<DataGridProps> = ({
           }
       };
 
-      container.addEventListener('wheel', handleContainerWheel, { passive: false, capture: true });
+      const bindScrollbar = () => {
+          const el = container.querySelector('.ant-table-tbody-virtual-scrollbar-horizontal') as HTMLElement | null;
+          if (el && el !== currentScrollbarEl) {
+              if (currentScrollbarEl) {
+                  currentScrollbarEl.removeEventListener('wheel', handleScrollbarWheel);
+              }
+              currentScrollbarEl = el;
+              el.addEventListener('wheel', handleScrollbarWheel, { passive: false });
+          }
+      };
+
+      // 初次尝试绑定
+      bindScrollbar();
+
+      // 使用 MutationObserver 监听 DOM 变化，确保即使元素延迟渲染也能绑定
+      const observer = new MutationObserver(() => {
+          bindScrollbar();
+      });
+      observer.observe(container, { childList: true, subtree: true });
 
       return () => {
-          container.removeEventListener('wheel', handleContainerWheel, { capture: true } as EventListenerOptions);
+          observer.disconnect();
+          if (currentScrollbarEl) {
+              currentScrollbarEl.removeEventListener('wheel', handleScrollbarWheel);
+          }
       };
-  }, [viewMode, enableVirtual, tableScrollX, floatingScrollbarHeight, floatingScrollbarGap]);
+  }, [viewMode, enableVirtual, tableScrollX, mergedDisplayData.length]);
 
   useEffect(() => {
       if (viewMode !== 'table') return;
@@ -3308,7 +3041,7 @@ const DataGrid: React.FC<DataGridProps> = ({
                background: 'transparent',
                boxSizing: 'border-box',
            }}>
-               {filterConditions.map((cond, condIndex) => (
+               {filterConditions.map(cond => (
                    <div key={cond.id} style={{ display: 'flex', gap: 8, marginBottom: 8, alignItems: 'flex-start', opacity: cond.enabled === false ? 0.58 : 1 }}>
                        <Checkbox
                            checked={cond.enabled !== false}
@@ -3317,33 +3050,13 @@ const DataGrid: React.FC<DataGridProps> = ({
                        >
                            启用
                        </Checkbox>
-                       {condIndex === 0 ? (
-                           <div style={{ width: 96, marginTop: 7, textAlign: 'center', fontSize: 12, color: '#8c8c8c' }}>
-                               首条
-                           </div>
-                       ) : (
-                           <Select
-                               style={{ width: 96 }}
-                               value={cond.logic === 'OR' ? 'OR' : 'AND'}
-                               onChange={v => updateFilter(cond.id, 'logic', v)}
-                               options={filterLogicOptions as any}
-                           />
-                       )}
-                        <Select
-                            style={{ width: 180 }}
-                            value={cond.column}
-                            onChange={v => updateFilter(cond.id, 'column', v)}
-                            options={columnNames.map(c => ({ value: c, label: c }))}
-                            showSearch
-                            optionFilterProp="label"
-                            filterOption={(input, option) =>
-                                String(option?.label ?? '')
-                                    .toLowerCase()
-                                    .includes(String(input || '').trim().toLowerCase())
-                            }
-                            placeholder="搜索字段名"
-                            disabled={cond.op === 'CUSTOM'}
-                        />
+                       <Select
+                           style={{ width: 180 }}
+                           value={cond.column}
+                           onChange={v => updateFilter(cond.id, 'column', v)}
+                           options={columnNames.map(c => ({ value: c, label: c }))}
+                           disabled={cond.op === 'CUSTOM'}
+                       />
                        <Select
                            style={{ width: 140 }}
                            value={cond.op}
@@ -3594,6 +3307,7 @@ const DataGrid: React.FC<DataGridProps> = ({
                     className="data-grid-external-hscroll"
                     aria-hidden={!horizontalScrollVisible}
                     onScroll={applyExternalScrollToTableTargets}
+                    onWheel={handleExternalHorizontalWheel}
                     style={{
                         opacity: horizontalScrollVisible ? 1 : 0,
                         pointerEvents: horizontalScrollVisible ? 'auto' : 'none',
@@ -3838,21 +3552,6 @@ const DataGrid: React.FC<DataGridProps> = ({
                 >
                     导出为 JSON
                 </div>
-                <div
-                    style={{
-                        padding: '8px 12px',
-                        cursor: 'pointer',
-                        transition: 'background 0.2s',
-                    }}
-                    onMouseEnter={(e) => e.currentTarget.style.background = darkMode ? '#303030' : '#f5f5f5'}
-                    onMouseLeave={(e) => e.currentTarget.style.background = 'transparent'}
-                    onClick={() => {
-                        if (cellContextMenu.record) handleExportSelected('html', cellContextMenu.record);
-                        setCellContextMenu(prev => ({ ...prev, visible: false }));
-                    }}
-                >
-                    导出为 HTML
-                </div>
             </div>,
             document.body
         )}

frontend/src/components/DataSyncModal.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useMemo, useRef } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Modal, Form, Select, Button, message, Steps, Transfer, Card, Alert, Divider, Typography, Progress, Checkbox, Table, Drawer, Tabs } from 'antd';
 import { useStore } from '../store';
 import { DBGetDatabases, DBGetTables, DataSync, DataSyncAnalyze, DataSyncPreview } from '../../wailsjs/go/app/App';
@@ -31,118 +31,6 @@ type TableOps = {
   selectedDeletePks?: string[];
 };
 
-const quoteSqlIdent = (dbType: string, ident: string): string => {
-  const raw = String(ident || '').trim();
-  if (!raw) return raw;
-  const t = String(dbType || '').toLowerCase();
-  if (t === 'mysql' || t === 'mariadb' || t === 'diros' || t === 'sphinx' || t === 'clickhouse' || t === 'tdengine') {
-    return `\`${raw.replace(/`/g, '``')}\``;
-  }
-  if (t === 'sqlserver') {
-    return `[${raw.replace(/]/g, ']]')}]`;
-  }
-  return `"${raw.replace(/"/g, '""')}"`;
-};
-
-const quoteSqlTable = (dbType: string, tableName: string): string => {
-  const raw = String(tableName || '').trim();
-  if (!raw) return raw;
-  if (!raw.includes('.')) return quoteSqlIdent(dbType, raw);
-  return raw
-    .split('.')
-    .map((part) => quoteSqlIdent(dbType, part))
-    .join('.');
-};
-
-const toSqlLiteral = (value: any, dbType: string): string => {
-  if (value === null || value === undefined) return 'NULL';
-  if (typeof value === 'number') return Number.isFinite(value) ? String(value) : 'NULL';
-  if (typeof value === 'bigint') return value.toString();
-  if (typeof value === 'boolean') {
-    const t = String(dbType || '').toLowerCase();
-    if (t === 'sqlserver') return value ? '1' : '0';
-    return value ? 'TRUE' : 'FALSE';
-  }
-  if (value instanceof Date) {
-    return `'${value.toISOString().replace(/'/g, "''")}'`;
-  }
-  if (typeof value === 'object') {
-    try {
-      return `'${JSON.stringify(value).replace(/'/g, "''")}'`;
-    } catch {
-      return `'${String(value).replace(/'/g, "''")}'`;
-    }
-  }
-  return `'${String(value).replace(/'/g, "''")}'`;
-};
-
-const buildSqlPreview = (
-  previewData: any,
-  tableName: string,
-  dbType: string,
-  ops?: TableOps,
-): { sqlText: string; statementCount: number } => {
-  if (!previewData || !tableName) return { sqlText: '', statementCount: 0 };
-  const tableExpr = quoteSqlTable(dbType, tableName);
-  const pkCol = String(previewData.pkColumn || 'id');
-  const statements: string[] = [];
-
-  const insertRows = Array.isArray(previewData.inserts) ? previewData.inserts : [];
-  const updateRows = Array.isArray(previewData.updates) ? previewData.updates : [];
-  const deleteRows = Array.isArray(previewData.deletes) ? previewData.deletes : [];
-
-  const selectedInsert = new Set((ops?.selectedInsertPks || []).map((v) => String(v)));
-  const selectedUpdate = new Set((ops?.selectedUpdatePks || []).map((v) => String(v)));
-  const selectedDelete = new Set((ops?.selectedDeletePks || []).map((v) => String(v)));
-
-  if (ops?.insert !== false) {
-    insertRows.forEach((rowWrap: any) => {
-      const pk = String(rowWrap?.pk ?? '');
-      if (selectedInsert.size > 0 && !selectedInsert.has(pk)) return;
-      const row = rowWrap?.row || {};
-      const columns = Object.keys(row);
-      if (columns.length === 0) return;
-      const colExpr = columns.map((c) => quoteSqlIdent(dbType, c)).join(', ');
-      const valExpr = columns.map((c) => toSqlLiteral(row[c], dbType)).join(', ');
-      statements.push(`INSERT INTO ${tableExpr} (${colExpr}) VALUES (${valExpr});`);
-    });
-  }
-
-  if (ops?.update !== false) {
-    updateRows.forEach((rowWrap: any) => {
-      const pk = String(rowWrap?.pk ?? '');
-      if (selectedUpdate.size > 0 && !selectedUpdate.has(pk)) return;
-      const source = rowWrap?.source || {};
-      const changedColumns = Array.isArray(rowWrap?.changedColumns)
-        ? rowWrap.changedColumns
-        : Object.keys(source).filter((k) => k !== pkCol);
-      const setCols = changedColumns.filter((c: string) => String(c) !== pkCol);
-      if (setCols.length === 0) return;
-      const setExpr = setCols
-        .map((c: string) => `${quoteSqlIdent(dbType, c)} = ${toSqlLiteral(source[c], dbType)}`)
-        .join(', ');
-      statements.push(
-        `UPDATE ${tableExpr} SET ${setExpr} WHERE ${quoteSqlIdent(dbType, pkCol)} = ${toSqlLiteral(pk, dbType)};`,
-      );
-    });
-  }
-
-  if (ops?.delete) {
-    deleteRows.forEach((rowWrap: any) => {
-      const pk = String(rowWrap?.pk ?? '');
-      if (selectedDelete.size > 0 && !selectedDelete.has(pk)) return;
-      statements.push(
-        `DELETE FROM ${tableExpr} WHERE ${quoteSqlIdent(dbType, pkCol)} = ${toSqlLiteral(pk, dbType)};`,
-      );
-    });
-  }
-
-  return {
-    sqlText: statements.join('\n'),
-    statementCount: statements.length,
-  };
-};
-
 const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open, onClose }) => {
   const connections = useStore((state) => state.connections);
   const [currentStep, setCurrentStep] = useState(0);
@@ -264,38 +152,32 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
       setSourceConnId(connId);
       setSourceDb('');
       const conn = connections.find(c => c.id === connId);
-	  if (conn) {
-	      setLoading(true);
-	      try {
-	        const res = await DBGetDatabases(normalizeConnConfig(conn) as any);
-	        if (res.success) {
-	            const dbRows = Array.isArray(res.data) ? res.data : [];
-	            setSourceDbs(dbRows
-	                .map((r: any) => r?.Database || r?.database || r?.username)
-	                .filter((name: any) => typeof name === 'string' && name.trim() !== ''));
-	        }
-	      } catch(e) { message.error("Failed to fetch source databases"); }
-	      setLoading(false);
-	  }
+      if (conn) {
+          setLoading(true);
+          try {
+            const res = await DBGetDatabases(normalizeConnConfig(conn) as any);
+            if (res.success) {
+                setSourceDbs((res.data as any[]).map((r: any) => r.Database || r.database || r.username));
+            }
+          } catch(e) { message.error("Failed to fetch source databases"); }
+          setLoading(false);
+      }
   };
 
   const handleTargetConnChange = async (connId: string) => {
       setTargetConnId(connId);
       setTargetDb('');
       const conn = connections.find(c => c.id === connId);
-	  if (conn) {
-	      setLoading(true);
-	      try {
-	        const res = await DBGetDatabases(normalizeConnConfig(conn) as any);
-	        if (res.success) {
-	            const dbRows = Array.isArray(res.data) ? res.data : [];
-	            setTargetDbs(dbRows
-	                .map((r: any) => r?.Database || r?.database || r?.username)
-	                .filter((name: any) => typeof name === 'string' && name.trim() !== ''));
-	        }
-	      } catch(e) { message.error("Failed to fetch target databases"); }
-	      setLoading(false);
-	  }
+      if (conn) {
+          setLoading(true);
+          try {
+            const res = await DBGetDatabases(normalizeConnConfig(conn) as any);
+            if (res.success) {
+                setTargetDbs((res.data as any[]).map((r: any) => r.Database || r.database || r.username));
+            }
+          } catch(e) { message.error("Failed to fetch target databases"); }
+          setLoading(false);
+      }
   };
 
   const nextToTables = async () => {
@@ -307,17 +189,14 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
       try {
           const conn = connections.find(c => c.id === sourceConnId);
           if (conn) {
-	          const config = normalizeConnConfig(conn, sourceDb);
-	          const res = await DBGetTables(config as any, sourceDb);
-	          if (res.success) {
-	              // DBGetTables returns [{Table: "name"}, ...]
-	              const tableRows = Array.isArray(res.data) ? res.data : [];
-	              const tables = tableRows
-	                  .map((row: any) => row?.Table || row?.table || row?.TABLE_NAME || Object.values(row || {})[0])
-	                  .filter((name: any) => typeof name === 'string' && name.trim() !== '');
-	              setAllTables(tables as string[]);
-	              setCurrentStep(1);
-	          } else {
+              const config = normalizeConnConfig(conn, sourceDb);
+              const res = await DBGetTables(config as any, sourceDb);
+              if (res.success) {
+                  // DBGetTables returns [{Table: "name"}, ...]
+                  const tables = (res.data as any[]).map((row: any) => row.Table || row.table || row.TABLE_NAME || Object.values(row)[0]);
+                  setAllTables(tables as string[]);
+                  setCurrentStep(1);
+              } else {
                   message.error(res.message);
               }
           }
@@ -523,13 +402,6 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
       );
   };
 
-  const previewSql = useMemo(() => {
-      if (!previewData || !previewTable) return { sqlText: '', statementCount: 0 };
-      const targetType = String(connections.find(c => c.id === targetConnId)?.config?.type || '');
-      const ops = tableOptions[previewTable] || { insert: true, update: true, delete: false };
-      return buildSqlPreview(previewData, previewTable, targetType, ops);
-  }, [previewData, previewTable, targetConnId, connections, tableOptions]);
-
   return (
     <>
     <Modal
@@ -922,51 +794,6 @@ const DataSyncModal: React.FC<{ open: boolean; onClose: () => void }> = ({ open,
                                     />
                                 </div>
                             )
-                        },
-                        {
-                            key: 'sql',
-                            label: `SQL(${previewSql.statementCount})`,
-                            children: (
-                                <div>
-                                    <Alert
-                                        type="info"
-                                        showIcon
-                                        message="SQL 预览会按当前勾选的插入/更新/删除与行选择范围生成，用于审核确认。"
-                                    />
-                                    <div style={{ marginTop: 8, marginBottom: 8, display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
-                                        <Text type="secondary">共 {previewSql.statementCount} 条语句（预览数据最多 200 条/类型）</Text>
-                                        <Button
-                                            size="small"
-                                            disabled={!previewSql.sqlText}
-                                            onClick={async () => {
-                                                try {
-                                                    await navigator.clipboard.writeText(previewSql.sqlText || '');
-                                                    message.success('SQL 已复制');
-                                                } catch {
-                                                    message.error('复制失败，请手动复制');
-                                                }
-                                            }}
-                                        >
-                                            复制 SQL
-                                        </Button>
-                                    </div>
-                                    <pre
-                                        style={{
-                                            margin: 0,
-                                            padding: 10,
-                                            border: '1px solid #f0f0f0',
-                                            borderRadius: 6,
-                                            background: '#fafafa',
-                                            maxHeight: 420,
-                                            overflow: 'auto',
-                                            whiteSpace: 'pre-wrap',
-                                            wordBreak: 'break-word'
-                                        }}
-                                    >
-                                        {previewSql.sqlText || '-- 当前勾选范围下无 SQL 可预览'}
-                                    </pre>
-                                </div>
-                            )
                         }
                     ]}
                 />

frontend/src/components/DataViewer.tsx

@@ -1,11 +1,10 @@
-import React, { useEffect, useState, useCallback, useRef, useMemo } from 'react';
+import React, { useEffect, useState, useCallback, useRef } from 'react';
 import { message } from 'antd';
 import { TabData, ColumnDefinition } from '../types';
 import { useStore } from '../store';
 import { DBQuery, DBGetColumns } from '../../wailsjs/go/app/App';
 import DataGrid, { GONAVI_ROW_KEY } from './DataGrid';
 import { buildOrderBySQL, buildWhereSQL, quoteIdentPart, quoteQualifiedIdent, withSortBufferTuningSQL, type FilterCondition } from '../utils/sql';
-import { buildMongoCountCommand, buildMongoFilter, buildMongoFindCommand, buildMongoSort } from '../utils/mongodb';
 import { getDataSourceCapabilities } from '../utils/dataSourceCapabilities';
 
 type ViewerPaginationState = {
@@ -152,56 +151,7 @@ const reverseOrderBySQL = (orderBySQL: string): string => {
   return ` ORDER BY ${parts.join(', ')}`;
 };
 
-type ViewerFilterSnapshot = {
-  showFilter: boolean;
-  conditions: FilterCondition[];
-  currentPage: number;
-  pageSize: number;
-  sortInfo: { columnKey: string, order: string } | null;
-  scrollTop: number;
-  scrollLeft: number;
-};
-
-type ViewerScrollSnapshot = {
-  top: number;
-  left: number;
-};
-
-const viewerFilterSnapshotsByTab = new Map<string, ViewerFilterSnapshot>();
-
-const normalizeViewerFilterConditions = (conditions: FilterCondition[] | undefined): FilterCondition[] => {
-  if (!Array.isArray(conditions)) return [];
-  return conditions.map((cond) => ({
-    id: Number.isFinite(Number(cond?.id)) ? Number(cond?.id) : undefined,
-    enabled: cond?.enabled !== false,
-    logic: String(cond?.logic || '').trim().toUpperCase() === 'OR' ? 'OR' : 'AND',
-    column: String(cond?.column || ''),
-    op: String(cond?.op || '='),
-    value: String(cond?.value ?? ''),
-    value2: String(cond?.value2 ?? ''),
-  }));
-};
-
-const getViewerFilterSnapshot = (tabId: string): ViewerFilterSnapshot => {
-  const cached = viewerFilterSnapshotsByTab.get(String(tabId || '').trim());
-  if (!cached) {
-    return { showFilter: false, conditions: [], currentPage: 1, pageSize: 100, sortInfo: null, scrollTop: 0, scrollLeft: 0 };
-  }
-  return {
-    showFilter: cached.showFilter === true,
-    conditions: normalizeViewerFilterConditions(cached.conditions),
-    currentPage: Number.isFinite(Number(cached.currentPage)) && Number(cached.currentPage) > 0 ? Number(cached.currentPage) : 1,
-    pageSize: Number.isFinite(Number(cached.pageSize)) && Number(cached.pageSize) > 0 ? Number(cached.pageSize) : 100,
-    sortInfo: cached.sortInfo && cached.sortInfo.columnKey && (cached.sortInfo.order === 'ascend' || cached.sortInfo.order === 'descend')
-      ? { columnKey: String(cached.sortInfo.columnKey), order: cached.sortInfo.order }
-      : null,
-    scrollTop: Number.isFinite(Number(cached.scrollTop)) ? Number(cached.scrollTop) : 0,
-    scrollLeft: Number.isFinite(Number(cached.scrollLeft)) ? Number(cached.scrollLeft) : 0,
-  };
-};
-
 const DataViewer: React.FC<{ tab: TabData }> = ({ tab }) => {
-  const initialViewerSnapshot = useMemo(() => getViewerFilterSnapshot(tab.id), [tab.id]);
   const [data, setData] = useState<any[]>([]);
   const [columnNames, setColumnNames] = useState<string[]>([]);
   const [pkColumns, setPkColumns] = useState<string[]>([]);
@@ -222,15 +172,10 @@ const DataViewer: React.FC<{ tab: TabData }> = ({ tab }) => {
   const latestDbNameRef = useRef<string>('');
   const latestCountSqlRef = useRef<string>('');
   const latestCountKeyRef = useRef<string>('');
-  const scrollSnapshotRef = useRef<ViewerScrollSnapshot>({
-    top: initialViewerSnapshot.scrollTop,
-    left: initialViewerSnapshot.scrollLeft,
-  });
-  const initialLoadRef = useRef(false);
 
   const [pagination, setPagination] = useState<ViewerPaginationState>({
-      current: initialViewerSnapshot.currentPage,
-      pageSize: initialViewerSnapshot.pageSize,
+      current: 1,
+      pageSize: 100,
       total: 0,
       totalKnown: false,
       totalApprox: false,
@@ -238,10 +183,10 @@ const DataViewer: React.FC<{ tab: TabData }> = ({ tab }) => {
       totalCountCancelled: false,
   });
 
-  const [sortInfo, setSortInfo] = useState<{ columnKey: string, order: string } | null>(initialViewerSnapshot.sortInfo);
+  const [sortInfo, setSortInfo] = useState<{ columnKey: string, order: string } | null>(null);
   
-  const [showFilter, setShowFilter] = useState<boolean>(initialViewerSnapshot.showFilter);
-  const [filterConditions, setFilterConditions] = useState<FilterCondition[]>(initialViewerSnapshot.conditions);
+  const [showFilter, setShowFilter] = useState(false);
+  const [filterConditions, setFilterConditions] = useState<FilterCondition[]>([]);
   const duckdbSafeSelectCacheRef = useRef<Record<string, string>>({});
   const currentConnConfig = connections.find(c => c.id === tab.connectionId)?.config;
   const currentConnCaps = getDataSourceCapabilities(currentConnConfig);
@@ -249,28 +194,6 @@ const DataViewer: React.FC<{ tab: TabData }> = ({ tab }) => {
   const forceReadOnly = currentConnCaps.forceReadOnlyQueryResult;
 
   useEffect(() => {
-    const snapshot = getViewerFilterSnapshot(tab.id);
-    setShowFilter(snapshot.showFilter);
-    setFilterConditions(snapshot.conditions);
-    setSortInfo(snapshot.sortInfo);
-    scrollSnapshotRef.current = { top: snapshot.scrollTop, left: snapshot.scrollLeft };
-    initialLoadRef.current = false;
-  }, [tab.id]);
-
-  useEffect(() => {
-    viewerFilterSnapshotsByTab.set(tab.id, {
-      showFilter,
-      conditions: normalizeViewerFilterConditions(filterConditions),
-      currentPage: pagination.current,
-      pageSize: pagination.pageSize,
-      sortInfo,
-      scrollTop: scrollSnapshotRef.current.top,
-      scrollLeft: scrollSnapshotRef.current.left,
-    });
-  }, [tab.id, showFilter, filterConditions, pagination.current, pagination.pageSize, sortInfo]);
-
-  useEffect(() => {
-    const snapshot = getViewerFilterSnapshot(tab.id);
     setPkColumns([]);
     pkKeyRef.current = '';
     countKeyRef.current = '';
@@ -282,29 +205,16 @@ const DataViewer: React.FC<{ tab: TabData }> = ({ tab }) => {
     latestDbNameRef.current = '';
     latestCountSqlRef.current = '';
     latestCountKeyRef.current = '';
-    scrollSnapshotRef.current = { top: snapshot.scrollTop, left: snapshot.scrollLeft };
-    initialLoadRef.current = false;
     setPagination(prev => ({
       ...prev,
-      current: snapshot.currentPage,
-      pageSize: snapshot.pageSize,
+      current: 1,
       total: 0,
       totalKnown: false,
       totalApprox: false,
       totalCountLoading: false,
       totalCountCancelled: false,
     }));
-  }, [tab.id, tab.connectionId, tab.dbName, tab.tableName]);
-
-  const handleTableScrollSnapshotChange = useCallback((snapshot: ViewerScrollSnapshot) => {
-    scrollSnapshotRef.current = snapshot;
-    const cached = getViewerFilterSnapshot(tab.id);
-    viewerFilterSnapshotsByTab.set(tab.id, {
-      ...cached,
-      scrollTop: snapshot.top,
-      scrollLeft: snapshot.left,
-    });
-  }, [tab.id]);
+  }, [tab.connectionId, tab.dbName, tab.tableName]);
 
   const handleDuckDBManualCount = useCallback(async () => {
     if (latestDbTypeRef.current !== 'duckdb') {
@@ -405,67 +315,42 @@ const DataViewer: React.FC<{ tab: TabData }> = ({ tab }) => {
 
     const dbName = tab.dbName || '';
     const tableName = tab.tableName || '';
-    const isMongoDB = dbTypeLower === 'mongodb';
-    let mongoFilter: Record<string, unknown> | undefined;
-    if (isMongoDB) {
-        try {
-            mongoFilter = buildMongoFilter(filterConditions);
-        } catch (e: any) {
-            message.error(`Mongo 筛选条件无效：${String(e?.message || e || '解析失败')}`);
-            if (fetchSeqRef.current === seq) setLoading(false);
-            return;
-        }
-    }
 
-    const whereSQL = isMongoDB
-      ? JSON.stringify(mongoFilter || {})
-      : buildWhereSQL(dbType, filterConditions);
-    const countSql = isMongoDB
-      ? buildMongoCountCommand(tableName, mongoFilter || {})
-      : `SELECT COUNT(*) as total FROM ${quoteQualifiedIdent(dbType, tableName)} ${whereSQL}`;
-    const orderBySQL = isMongoDB ? '' : buildOrderBySQL(dbType, sortInfo, pkColumns);
+    const whereSQL = buildWhereSQL(dbType, filterConditions);
+
+    const countSql = `SELECT COUNT(*) as total FROM ${quoteQualifiedIdent(dbType, tableName)} ${whereSQL}`;
+    
+    const baseSql = `SELECT * FROM ${quoteQualifiedIdent(dbType, tableName)} ${whereSQL}`;
+    const orderBySQL = buildOrderBySQL(dbType, sortInfo, pkColumns);
+    let sql = `${baseSql}${orderBySQL}`;
     const totalRows = Number(pagination.total);
     const hasFiniteTotal = Number.isFinite(totalRows) && totalRows >= 0;
     const totalKnown = pagination.totalKnown && hasFiniteTotal;
     const totalPages = hasFiniteTotal ? Math.max(1, Math.ceil(totalRows / size)) : 0;
     const currentPage = totalPages > 0 ? Math.min(Math.max(1, page), totalPages) : Math.max(1, page);
     const offset = (currentPage - 1) * size;
-    const isClickHouse = !isMongoDB && dbTypeLower === 'clickhouse';
+    const isClickHouse = dbTypeLower === 'clickhouse';
     const reverseOrderSQL = isClickHouse ? reverseOrderBySQL(orderBySQL) : '';
     let useClickHouseReversePagination = false;
     let clickHouseReverseLimit = 0;
     let clickHouseReverseHasMore = false;
-    let sql = '';
-    if (isMongoDB) {
-        const mongoSort = buildMongoSort(sortInfo, pkColumns);
-        sql = buildMongoFindCommand({
-            collection: tableName,
-            filter: mongoFilter || {},
-            sort: mongoSort,
-            limit: size + 1,
-            skip: offset,
-        });
-    } else {
-        const baseSql = `SELECT * FROM ${quoteQualifiedIdent(dbType, tableName)} ${whereSQL}`;
-        sql = `${baseSql}${orderBySQL}`;
-        // ClickHouse 深分页在超大 OFFSET 下容易超时。对于总数已知且存在 ORDER BY 的场景，
-        // 当“尾部偏移”小于“头部偏移”时，改为反向 ORDER BY + 小 OFFSET，并在前端翻转结果。
-        if (isClickHouse && totalKnown && offset > 0 && reverseOrderSQL) {
-            const pageRowCount = Math.max(0, Math.min(size, totalRows - offset));
-            if (pageRowCount > 0) {
-                const tailOffset = Math.max(0, totalRows - (offset + pageRowCount));
-                if (tailOffset < offset) {
-                    sql = `${baseSql}${reverseOrderSQL} LIMIT ${pageRowCount} OFFSET ${tailOffset}`;
-                    useClickHouseReversePagination = true;
-                    clickHouseReverseLimit = pageRowCount;
-                    clickHouseReverseHasMore = currentPage < totalPages;
-                }
+    // ClickHouse 深分页在超大 OFFSET 下容易超时。对于总数已知且存在 ORDER BY 的场景，
+    // 当“尾部偏移”小于“头部偏移”时，改为反向 ORDER BY + 小 OFFSET，并在前端翻转结果。
+    if (isClickHouse && totalKnown && offset > 0 && reverseOrderSQL) {
+        const pageRowCount = Math.max(0, Math.min(size, totalRows - offset));
+        if (pageRowCount > 0) {
+            const tailOffset = Math.max(0, totalRows - (offset + pageRowCount));
+            if (tailOffset < offset) {
+                sql = `${baseSql}${reverseOrderSQL} LIMIT ${pageRowCount} OFFSET ${tailOffset}`;
+                useClickHouseReversePagination = true;
+                clickHouseReverseLimit = pageRowCount;
+                clickHouseReverseHasMore = currentPage < totalPages;
             }
         }
-        if (!useClickHouseReversePagination) {
-            // 大表性能：打开表不阻塞在 COUNT(*)，先通过多取 1 条判断是否还有下一页；总数在后台统计并异步回填。
-            sql += ` LIMIT ${size + 1} OFFSET ${offset}`;
-        }
+    }
+    if (!useClickHouseReversePagination) {
+        // 大表性能：打开表不阻塞在 COUNT(*)，先通过多取 1 条判断是否还有下一页；总数在后台统计并异步回填。
+        sql += ` LIMIT ${size + 1} OFFSET ${offset}`;
     }
 
     const requestStartTime = Date.now();
@@ -791,32 +676,9 @@ const DataViewer: React.FC<{ tab: TabData }> = ({ tab }) => {
   const handleToggleFilter = useCallback(() => setShowFilter(prev => !prev), []);
   const handleApplyFilter = useCallback((conditions: FilterCondition[]) => setFilterConditions(conditions), []);
 
-  const exportSqlWithFilter = useMemo(() => {
-    const tableName = String(tab.tableName || '').trim();
-    const dbType = String(currentConnConfig?.type || '').trim();
-    if (!tableName || !dbType) return '';
-
-    const whereSQL = buildWhereSQL(dbType, filterConditions);
-    if (!whereSQL) return '';
-
-    let sql = `SELECT * FROM ${quoteQualifiedIdent(dbType, tableName)} ${whereSQL}`;
-    sql += buildOrderBySQL(dbType, sortInfo, pkColumns);
-    const normalizedType = dbType.toLowerCase();
-    const hasExplicitSort = !!sortInfo?.columnKey && (sortInfo?.order === 'ascend' || sortInfo?.order === 'descend');
-    if (hasExplicitSort && (normalizedType === 'mysql' || normalizedType === 'mariadb')) {
-      sql = withSortBufferTuningSQL(normalizedType, sql, 32 * 1024 * 1024);
-    }
-    return sql;
-  }, [tab.tableName, currentConnConfig?.type, filterConditions, sortInfo, pkColumns]);
-
   useEffect(() => {
-    if (!initialLoadRef.current) {
-      initialLoadRef.current = true;
-      fetchData(pagination.current, pagination.pageSize);
-      return;
-    }
-    fetchData(1, pagination.pageSize);
-  }, [tab.id, tab.connectionId, tab.dbName, tab.tableName, sortInfo, filterConditions]); // Initial load and re-load on sort/filter
+    fetchData(1, pagination.pageSize); 
+  }, [tab, sortInfo, filterConditions]); // Initial load and re-load on sort/filter
 
   return (
     <div style={{ flex: '1 1 auto', minHeight: 0, minWidth: 0, height: '100%', width: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
@@ -838,12 +700,8 @@ const DataViewer: React.FC<{ tab: TabData }> = ({ tab }) => {
           showFilter={showFilter}
           onToggleFilter={handleToggleFilter}
           onApplyFilter={handleApplyFilter}
-          appliedFilterConditions={filterConditions}
           readOnly={forceReadOnly}
           sortInfoExternal={sortInfo}
-          exportSqlWithFilter={exportSqlWithFilter || undefined}
-          scrollSnapshot={scrollSnapshotRef.current}
-          onScrollSnapshotChange={handleTableScrollSnapshotChange}
       />
     </div>
   );

frontend/src/components/QueryEditor.tsx

@@ -1,16 +1,13 @@
 import React, { useState, useEffect, useRef, useMemo } from 'react';
 import Editor, { OnMount } from '@monaco-editor/react';
 import { Button, message, Modal, Input, Form, Dropdown, MenuProps, Tooltip, Select, Tabs } from 'antd';
-import { PlayCircleOutlined, SaveOutlined, FormatPainterOutlined, SettingOutlined, CloseOutlined, StopOutlined } from '@ant-design/icons';
+import { PlayCircleOutlined, SaveOutlined, FormatPainterOutlined, SettingOutlined, CloseOutlined } from '@ant-design/icons';
 import { format } from 'sql-formatter';
-import { v4 as uuidv4 } from 'uuid';
 import { TabData, ColumnDefinition } from '../types';
 import { useStore } from '../store';
-import { DBQuery, DBQueryWithCancel, DBGetTables, DBGetAllColumns, DBGetDatabases, DBGetColumns, CancelQuery, GenerateQueryID } from '../../wailsjs/go/app/App';
+import { DBQuery, DBGetTables, DBGetAllColumns, DBGetDatabases, DBGetColumns } from '../../wailsjs/go/app/App';
 import DataGrid, { GONAVI_ROW_KEY } from './DataGrid';
 import { getDataSourceCapabilities } from '../utils/dataSourceCapabilities';
-import { convertMongoShellToJsonCommand } from '../utils/mongodb';
-import { getShortcutDisplay, isEditableElement, isShortcutMatch } from '../utils/shortcuts';
 
 const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
   const [query, setQuery] = useState(tab.query || 'SELECT * FROM ');
@@ -33,9 +30,7 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
   const [activeResultKey, setActiveResultKey] = useState<string>('');
   
   const [loading, setLoading] = useState(false);
-  const [currentQueryId, setCurrentQueryId] = useState<string>('');
   const runSeqRef = useRef(0);
-  const currentQueryIdRef = useRef('');
   const [isSaveModalOpen, setIsSaveModalOpen] = useState(false);
   const [saveForm] = Form.useForm();
   
@@ -48,7 +43,6 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
   const [editorHeight, setEditorHeight] = useState(300);
   const editorRef = useRef<any>(null);
   const monacoRef = useRef<any>(null);
-  const lastExternalQueryRef = useRef<string>(tab.query || '');
   const dragRef = useRef<{ startY: number, startHeight: number } | null>(null);
   const tablesRef = useRef<{dbName: string, tableName: string}[]>([]); // Store tables for autocomplete (cross-db)
   const allColumnsRef = useRef<{dbName: string, tableName: string, name: string, type: string}[]>([]); // Store all columns (cross-db)
@@ -71,8 +65,6 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
   const setSqlFormatOptions = useStore(state => state.setSqlFormatOptions);
   const queryOptions = useStore(state => state.queryOptions);
   const setQueryOptions = useStore(state => state.setQueryOptions);
-  const shortcutOptions = useStore(state => state.shortcutOptions);
-  const activeTabId = useStore(state => state.activeTabId);
 
   useEffect(() => {
       currentConnectionIdRef.current = currentConnectionId;
@@ -96,30 +88,10 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
       connectionsRef.current = connections;
   }, [connections]);
 
-  const getCurrentQuery = () => {
-      const val = editorRef.current?.getValue?.();
-      if (typeof val === 'string') return val;
-      return query || '';
-  };
-
-  const syncQueryToEditor = (sql: string) => {
-      const next = sql || '';
-      setQuery(next);
-      const editor = editorRef.current;
-      if (editor && editor.getValue?.() !== next) {
-          editor.setValue(next);
-      }
-  };
-
   // If opening a saved query, load its SQL
   useEffect(() => {
-      const incoming = tab.query || '';
-      if (incoming === lastExternalQueryRef.current) {
-          return;
-      }
-      lastExternalQueryRef.current = incoming;
-      syncQueryToEditor(incoming || 'SELECT * FROM ');
-  }, [tab.id, tab.query]);
+      if (tab.query) setQuery(tab.query);
+  }, [tab.query]);
 
   // Fetch Database List
   useEffect(() => {
@@ -214,17 +186,6 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
       fetchMetadata();
   }, [currentConnectionId, connections, dbList]); // dbList 变化时触发重新加载
 
-  // Query ID management helpers
-  const setQueryId = (id: string) => {
-      currentQueryIdRef.current = id;
-      setCurrentQueryId(id);
-  };
-
-  const clearQueryId = () => {
-      currentQueryIdRef.current = '';
-      setCurrentQueryId('');
-  };
-
   // Handle Resizing
   const handleMouseDown = (e: React.MouseEvent) => {
       e.preventDefault();
@@ -293,19 +254,6 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
                   return parts[parts.length - 1] || raw;
               };
 
-              const splitSchemaAndTable = (qualified: string): { schema: string; table: string } => {
-                  const raw = normalizeQualifiedName(qualified);
-                  if (!raw) return { schema: '', table: '' };
-                  const parts = raw.split('.').filter(Boolean);
-                  if (parts.length >= 2) {
-                      return {
-                          schema: parts[parts.length - 2] || '',
-                          table: parts[parts.length - 1] || '',
-                      };
-                  }
-                  return { schema: '', table: parts[0] || '' };
-              };
-
               const buildConnConfig = () => {
                   const connId = currentConnectionIdRef.current;
                   const conn = connectionsRef.current.find(c => c.id === connId);
@@ -378,14 +326,13 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
               if (qualifierMatch) {
                   const qualifier = stripQuotes(qualifierMatch[1]);
                   const prefix = (qualifierMatch[2] || '').toLowerCase();
-                  const qualifierLower = qualifier.toLowerCase();
 
                   // 首先检查 qualifier 是否是数据库名（跨库表提示）
                   const visibleDbs = visibleDbsRef.current;
-                  if (visibleDbs.some(db => db.toLowerCase() === qualifierLower)) {
+                  if (visibleDbs.some(db => db.toLowerCase() === qualifier.toLowerCase())) {
                       // qualifier 是数据库名，提示该库的表
                       const tables = tablesRef.current.filter(t =>
-                          (t.dbName || '').toLowerCase() === qualifierLower
+                          (t.dbName || '').toLowerCase() === qualifier.toLowerCase()
                       );
                       const filtered = prefix
                           ? tables.filter(t => (t.tableName || '').toLowerCase().startsWith(prefix))
@@ -402,34 +349,6 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
                       return { suggestions };
                   }
 
-                  // qualifier 是 schema（如 dbo/public）时，仅补全表名，避免输入 dbo. 后再补成 dbo.dbo.table
-                  const schemaTables = tablesRef.current
-                      .map(t => {
-                          const parsed = splitSchemaAndTable(t.tableName || '');
-                          return {
-                              dbName: t.dbName || '',
-                              schema: parsed.schema,
-                              table: parsed.table,
-                          };
-                      })
-                      .filter(t => t.schema.toLowerCase() === qualifierLower && !!t.table);
-
-                  if (schemaTables.length > 0) {
-                      const filtered = prefix
-                          ? schemaTables.filter(t => t.table.toLowerCase().startsWith(prefix))
-                          : schemaTables;
-
-                      const suggestions = filtered.map(t => ({
-                          label: t.table,
-                          kind: monaco.languages.CompletionItemKind.Class,
-                          insertText: t.table,
-                          detail: `Table (${t.dbName}${t.schema ? '.' + t.schema : ''})`,
-                          range,
-                          sortText: '0' + t.table
-                      }));
-                      return { suggestions };
-                  }
-
                   // 否则检查是否是表别名或表名，提示列
                   const reserved = new Set([
                       'where', 'on', 'group', 'order', 'limit', 'having',
@@ -578,8 +497,8 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
 
   const handleFormat = () => {
       try {
-          const formatted = format(getCurrentQuery(), { language: 'mysql', keywordCase: sqlFormatOptions.keywordCase });
-          syncQueryToEditor(formatted);
+          const formatted = format(query, { language: 'mysql', keywordCase: sqlFormatOptions.keywordCase });
+          setQuery(formatted);
       } catch (e) {
           message.error("格式化失败: SQL 语法可能有误");
       }
@@ -598,12 +517,6 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
           icon: sqlFormatOptions.keywordCase === 'lower' ? '✓' : undefined,
           onClick: () => setSqlFormatOptions({ keywordCase: 'lower' }) 
       },
-      { type: 'divider' },
-      {
-          key: 'shortcut-settings',
-          label: '快捷键管理...',
-          onClick: () => window.dispatchEvent(new CustomEvent('gonavi:open-shortcut-settings')),
-      },
   ];
 
   const splitSQLStatements = (sql: string): string[] => {
@@ -1066,22 +979,11 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
   };
 
   const handleRun = async () => {
-    const currentQuery = getCurrentQuery();
-    if (!currentQuery.trim()) return;
+    if (!query.trim()) return;
     if (!currentDb) {
         message.error("请先选择数据库");
         return;
     }
-    // 如果已有查询在运行，先取消它
-    if (currentQueryIdRef.current) {
-        try {
-            await CancelQuery(currentQueryIdRef.current);
-        } catch (error) {
-            // 忽略取消错误，可能查询已完成
-        }
-        // 清除旧查询ID
-        clearQueryId();
-    }
     const runSeq = ++runSeqRef.current;
     setLoading(true);
     const runStartTime = Date.now();
@@ -1108,16 +1010,8 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
     };
 
     try {
-        const rawSQL = getSelectedSQL() || currentQuery;
-        const dbType = String((config as any).type || 'mysql');
-        const normalizedDbType = dbType.trim().toLowerCase();
-        const normalizedRawSQL = String(rawSQL || '').replace(/；/g, ';');
-        const splitInput = normalizedDbType === 'mongodb'
-            ? normalizedRawSQL
-                .replace(/^\s*\/\/.*$/gm, '')
-                .replace(/^\s*#.*$/gm, '')
-            : normalizedRawSQL;
-        const statements = splitSQLStatements(splitInput);
+        const rawSQL = getSelectedSQL() || query;
+        const statements = splitSQLStatements(rawSQL);
         if (statements.length === 0) {
             message.info('没有可执行的 SQL。');
             setResultSets([]);
@@ -1127,6 +1021,7 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
 
         const nextResultSets: ResultSet[] = [];
         const maxRows = Number(queryOptions?.maxRows) || 0;
+        const dbType = String((config as any).type || 'mysql');
         const forceReadOnlyResult = connCaps.forceReadOnlyQueryResult;
         const wantsLimitProbe = Number.isFinite(maxRows) && maxRows > 0;
         const probeLimit = wantsLimitProbe ? (maxRows + 1) : 0;
@@ -1140,35 +1035,9 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
 
             const limitApplied = shouldAutoLimit && wantsLimitProbe;
             const limited = limitApplied ? applyAutoLimit(rawStatement, dbType, probeLimit) : { sql: rawStatement, applied: false, maxRows: probeLimit };
-            let executedSql = limited.sql;
-            if (String(dbType || '').trim().toLowerCase() === 'mongodb') {
-                const shellConvert = convertMongoShellToJsonCommand(executedSql);
-                if (shellConvert.recognized) {
-                    if (shellConvert.error) {
-                        const prefix = statements.length > 1 ? `第 ${idx + 1} 条语句执行失败：` : '';
-                        message.error(prefix + shellConvert.error);
-                        setResultSets([]);
-                        setActiveResultKey('');
-                        return;
-                    }
-                    if (shellConvert.command) {
-                        executedSql = shellConvert.command;
-                    }
-                }
-            }
+            const executedSql = limited.sql;
             const startTime = Date.now();
-
-            // Generate query ID for cancellation using backend UUID with fallback
-            let queryId: string;
-            try {
-                queryId = await GenerateQueryID();
-            } catch (error) {
-                console.warn('GenerateQueryID failed, using local UUID fallback:', error);
-                queryId = 'query-' + uuidv4();
-            }
-            setQueryId(queryId);
-
-            const res = await DBQueryWithCancel(config as any, currentDb, executedSql, queryId);
+            const res = await DBQuery(config as any, currentDb, executedSql);
             const duration = Date.now() - startTime;
 
             addSqlLog({
@@ -1183,32 +1052,6 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
             });
 
             if (!res.success) {
-                // 检查是否为查询取消错误
-                const errorMsg = res.message.toLowerCase();
-                const isCancelledError = errorMsg.includes('context canceled') ||
-                                         errorMsg.includes('查询已取消') ||
-                                         errorMsg.includes('canceled') ||
-                                         errorMsg.includes('cancelled') ||
-                                         errorMsg.includes('statement canceled') ||
-                                         errorMsg.includes('sql: statement canceled');
-
-                // 确保不是超时错误
-                const isTimeoutError = errorMsg.includes('context deadline exceeded') ||
-                                       errorMsg.includes('timeout') ||
-                                       errorMsg.includes('超时') ||
-                                       errorMsg.includes('deadline exceeded');
-
-                if (isCancelledError && !isTimeoutError) {
-                    // 查询已被用户取消，不显示错误消息，清理状态
-                    setResultSets([]);
-                    setActiveResultKey('');
-                    // 清除查询ID，与handleCancel保持一致
-                    if (currentQueryIdRef.current) {
-                        clearQueryId();
-                    }
-                    return;
-                }
-
                 const prefix = statements.length > 1 ? `第 ${idx + 1} 条语句执行失败：` : '';
                 message.error(prefix + res.message);
                 setResultSets([]);
@@ -1314,82 +1157,16 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
         setActiveResultKey('');
     } finally {
         if (runSeqRef.current === runSeq) setLoading(false);
-        // Clear query ID after execution completes
-        clearQueryId();
     }
   };
 
-  const handleCancel = async () => {
-    if (!currentQueryIdRef.current) {
-      message.warning('没有正在运行的查询可取消');
-      return;
-    }
-    const queryIdToCancel = currentQueryIdRef.current;
-    try {
-      const res = await CancelQuery(queryIdToCancel);
-      if (res.success) {
-        message.success('查询已取消');
-        // Clear query ID after successful cancellation
-        if (currentQueryIdRef.current === queryIdToCancel) {
-          clearQueryId()
-        }
-      } else {
-        message.warning(res.message);
-      }
-    } catch (error: any) {
-      message.error('取消查询失败: ' + error.message);
-    }
-  };
-
-  useEffect(() => {
-      const binding = shortcutOptions.runQuery;
-      if (!binding?.enabled || !binding.combo) {
-          return;
-      }
-
-      const handleRunShortcut = (event: KeyboardEvent) => {
-          if (activeTabId !== tab.id) {
-              return;
-          }
-          if (!isShortcutMatch(event, binding.combo)) {
-              return;
-          }
-          const editorHasFocus = !!editorRef.current?.hasTextFocus?.();
-          if (!editorHasFocus && !isEditableElement(event.target)) {
-              return;
-          }
-          event.preventDefault();
-          event.stopPropagation();
-          void handleRun();
-      };
-
-      window.addEventListener('keydown', handleRunShortcut);
-      return () => {
-          window.removeEventListener('keydown', handleRunShortcut);
-      };
-  }, [activeTabId, tab.id, shortcutOptions.runQuery, handleRun]);
-
-  useEffect(() => {
-      const handleRunActiveQuery = () => {
-          if (activeTabId !== tab.id) {
-              return;
-          }
-          void handleRun();
-      };
-
-      window.addEventListener('gonavi:run-active-query', handleRunActiveQuery as EventListener);
-      return () => {
-          window.removeEventListener('gonavi:run-active-query', handleRunActiveQuery as EventListener);
-      };
-  }, [activeTabId, tab.id, handleRun]);
-
   const handleSave = async () => {
       try {
           const values = await saveForm.validateFields();
           saveQuery({
               id: tab.id.startsWith('saved-') ? tab.id : `saved-${Date.now()}`,
               name: values.name,
-              sql: getCurrentQuery(),
+              sql: query,
               connectionId: currentConnectionId,
               dbName: currentDb || tab.dbName || '',
               createdAt: Date.now()
@@ -1494,24 +1271,9 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
                 ]}
             />
         </Tooltip>
-        <Button.Group>
-          <Tooltip
-              title={
-                  shortcutOptions.runQuery?.enabled && shortcutOptions.runQuery?.combo
-                      ? `运行（${getShortcutDisplay(shortcutOptions.runQuery.combo)}）`
-                      : '运行'
-              }
-          >
-              <Button type="primary" icon={<PlayCircleOutlined />} onClick={handleRun} loading={loading}>
-                运行
-              </Button>
-          </Tooltip>
-          {loading && (
-            <Button type="primary" danger icon={<StopOutlined />} onClick={handleCancel}>
-              停止
-            </Button>
-          )}
-        </Button.Group>
+        <Button type="primary" icon={<PlayCircleOutlined />} onClick={handleRun} loading={loading}>
+          运行
+        </Button>
         <Button icon={<SaveOutlined />} onClick={() => {
             saveForm.setFieldsValue({ name: tab.title.replace('Query (', '').replace(')', '') });
             setIsSaveModalOpen(true);
@@ -1534,7 +1296,7 @@ const QueryEditor: React.FC<{ tab: TabData }> = ({ tab }) => {
           height="100%" 
           defaultLanguage="sql" 
           theme={darkMode ? "transparent-dark" : "transparent-light"}
-          defaultValue={query}
+          value={query} 
           onChange={(val) => setQuery(val || '')}
           onMount={handleEditorDidMount}
           options={{ 

frontend/src/components/Sidebar.tsx

@@ -1,12 +1,11 @@
 import React, { useEffect, useState, useMemo, useRef } from 'react';
-import { Tree, message, Dropdown, MenuProps, Input, Button, Modal, Form, Badge, Checkbox, Space, Select, Popover, Tooltip } from 'antd';
+import { Tree, message, Dropdown, MenuProps, Input, Button, Modal, Form, Badge, Checkbox, Space, Select } from 'antd';
 	import {
 	  DatabaseOutlined,
 	  TableOutlined,
 	  EyeOutlined,
 	  ConsoleSqlOutlined,
   HddOutlined,
-  FolderOutlined,
   FolderOpenOutlined,
   FileTextOutlined,
   CopyOutlined,
@@ -43,14 +42,13 @@ interface TreeNode {
   children?: TreeNode[];
   icon?: React.ReactNode;
   dataRef?: any;
-  type?: 'connection' | 'database' | 'table' | 'view' | 'db-trigger' | 'routine' | 'object-group' | 'queries-folder' | 'saved-query' | 'folder-columns' | 'folder-indexes' | 'folder-fks' | 'folder-triggers' | 'redis-db' | 'tag';
+  type?: 'connection' | 'database' | 'table' | 'view' | 'db-trigger' | 'routine' | 'object-group' | 'queries-folder' | 'saved-query' | 'folder-columns' | 'folder-indexes' | 'folder-fks' | 'folder-triggers' | 'redis-db';
 }
 
 type BatchTableExportMode = 'schema' | 'backup' | 'dataOnly';
 type BatchObjectType = 'table' | 'view';
 type BatchObjectFilterType = 'all' | BatchObjectType;
 type BatchSelectionScope = 'filtered' | 'all';
-type SearchScope = 'smart' | 'object' | 'database' | 'host' | 'tag';
 
 interface BatchObjectItem {
   title: string;
@@ -60,32 +58,12 @@ interface BatchObjectItem {
   dataRef: any;
 }
 
-const SEARCH_SCOPE_OPTIONS: Array<{ value: SearchScope; label: string }> = [
-  { value: 'smart', label: '智能' },
-  { value: 'object', label: '表对象' },
-  { value: 'database', label: '库' },
-  { value: 'host', label: 'Host' },
-  { value: 'tag', label: '标签' },
-];
-
-const SEARCH_SCOPE_LABEL_MAP: Record<SearchScope, string> = SEARCH_SCOPE_OPTIONS.reduce((acc, option) => {
-  acc[option.value] = option.label;
-  return acc;
-}, {} as Record<SearchScope, string>);
-
 const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }> = ({ onEditConnection }) => {
   const connections = useStore(state => state.connections);
   const savedQueries = useStore(state => state.savedQueries);
-  const addConnection = useStore(state => state.addConnection);
   const addTab = useStore(state => state.addTab);
   const setActiveContext = useStore(state => state.setActiveContext);
   const removeConnection = useStore(state => state.removeConnection);
-  const connectionTags = useStore(state => state.connectionTags);
-  const addConnectionTag = useStore(state => state.addConnectionTag);
-  const updateConnectionTag = useStore(state => state.updateConnectionTag);
-  const removeConnectionTag = useStore(state => state.removeConnectionTag);
-  const moveConnectionToTag = useStore(state => state.moveConnectionToTag);
-  const reorderTags = useStore(state => state.reorderTags);
   const closeTabsByConnection = useStore(state => state.closeTabsByConnection);
   const closeTabsByDatabase = useStore(state => state.closeTabsByDatabase);
   const theme = useStore(state => state.theme);
@@ -109,9 +87,6 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
   };
   const bgMain = getBg('#141414');
   const [searchValue, setSearchValue] = useState('');
-  const [searchScopes, setSearchScopes] = useState<SearchScope[]>(['smart']);
-  const [isSearchScopePopoverOpen, setIsSearchScopePopoverOpen] = useState(false);
-  const searchInputRef = useRef<any>(null);
   const [expandedKeys, setExpandedKeys] = useState<React.Key[]>([]);
   const [autoExpandParent, setAutoExpandParent] = useState(true);
   const [loadedKeys, setLoadedKeys] = useState<React.Key[]>([]);
@@ -134,21 +109,6 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
       resizeObserver.observe(treeContainerRef.current);
       return () => resizeObserver.disconnect();
   }, []);
-
-  useEffect(() => {
-      const handleFocusSidebarSearch = () => {
-          const inputEl = searchInputRef.current?.input as HTMLInputElement | undefined;
-          if (!inputEl) {
-              return;
-          }
-          inputEl.focus();
-          inputEl.select();
-      };
-      window.addEventListener('gonavi:focus-sidebar-search', handleFocusSidebarSearch as EventListener);
-      return () => {
-          window.removeEventListener('gonavi:focus-sidebar-search', handleFocusSidebarSearch as EventListener);
-      };
-  }, []);
   
   // Connection Status State: key -> 'success' | 'error'
   const [connectionStates, setConnectionStates] = useState<Record<string, 'success' | 'error'>>({});
@@ -167,10 +127,6 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
   const [renameViewForm] = Form.useForm();
   const [renameViewTarget, setRenameViewTarget] = useState<any>(null);
 
-  // Connection Tag Modals
-  const [isCreateTagModalOpen, setIsCreateTagModalOpen] = useState(false);
-  const [createTagForm] = Form.useForm();
-
   // Batch Operations Modal
   const [isBatchModalOpen, setIsBatchModalOpen] = useState(false);
   const [batchTables, setBatchTables] = useState<BatchObjectItem[]>([]);
@@ -252,21 +208,11 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
   useEffect(() => {
     setTreeData((prev) => {
       const prevMap = new Map<string, TreeNode>();
+      prev.forEach((node) => {
+        prevMap.set(String(node.key), node);
+      });
 
-      // We need to recursively extract connections from old tag structures
-      // so if a user expands a connection that was tagged, the state remains
-      const recurseCollect = (nodes: TreeNode[]) => {
-          nodes.forEach((node) => {
-            if (node.type === 'tag') {
-               if (node.children) recurseCollect(node.children);
-            } else if (node.type === 'connection') {
-               prevMap.set(String(node.key), node);
-            }
-          });
-      };
-      recurseCollect(prev);
-
-      const buildConnectionNode = (conn: SavedConnection): TreeNode => {
+      return connections.map((conn) => {
         const existing = prevMap.get(conn.id);
         return {
           title: conn.name,
@@ -277,157 +223,10 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
           isLeaf: false,
           children: existing?.children,
         } as TreeNode;
-      };
-
-      const taggedConnIds = new Set<string>();
-      const tagNodes: TreeNode[] = connectionTags.map((tag) => {
-        tag.connectionIds.forEach(id => taggedConnIds.add(id));
-        return {
-          title: tag.name,
-          key: `tag-${tag.id}`,
-          icon: <FolderOutlined style={{ color: '#faad14' }} />,
-          type: 'tag',
-          dataRef: tag,
-          isLeaf: false,
-          children: tag.connectionIds
-            .map(cid => connections.find(c => c.id === cid))
-            .filter(Boolean)
-            .map(conn => buildConnectionNode(conn!)),
-        } as TreeNode;
       });
-
-      const ungroupedNodes: TreeNode[] = connections
-        .filter(c => !taggedConnIds.has(c.id))
-        .map(conn => buildConnectionNode(conn));
-
-      return [...tagNodes, ...ungroupedNodes];
     });
-  }, [connections, connectionTags]);
+  }, [connections]);
 
-  const buildDuplicateConnectionName = (rawName: string): string => {
-    const baseName = String(rawName || '').trim() || '连接';
-    const suffix = ' - 副本';
-    const usedNames = new Set(connections.map(conn => String(conn.name || '').trim()));
-    let candidate = `${baseName}${suffix}`;
-    let counter = 2;
-    while (usedNames.has(candidate)) {
-      candidate = `${baseName}${suffix} ${counter}`;
-      counter += 1;
-    }
-    return candidate;
-  };
-
-  const cloneConnectionConfig = (config: SavedConnection['config']): SavedConnection['config'] => {
-    const raw: any = config || {};
-    let cloned: any = {};
-    try {
-      cloned = typeof structuredClone === 'function'
-        ? structuredClone(raw)
-        : JSON.parse(JSON.stringify(raw));
-    } catch {
-      cloned = { ...raw };
-    }
-
-    const readString = (...values: unknown[]): string => {
-      for (const value of values) {
-        if (typeof value === 'string') {
-          return value;
-        }
-      }
-      return '';
-    };
-
-    const readBool = (fallback: boolean, ...values: unknown[]): boolean => {
-      for (const value of values) {
-        if (typeof value === 'boolean') {
-          return value;
-        }
-      }
-      return fallback;
-    };
-
-    const readNumber = (fallback: number, ...values: unknown[]): number => {
-      for (const value of values) {
-        const num = Number(value);
-        if (Number.isFinite(num)) {
-          return num;
-        }
-      }
-      return fallback;
-    };
-
-    const rawSSH = (cloned.ssh ?? cloned.SSH ?? {}) as Record<string, unknown>;
-    const normalizedSSH = {
-      host: readString(rawSSH.host, rawSSH.Host, cloned.sshHost, cloned.SSHHost),
-      port: readNumber(22, rawSSH.port, rawSSH.Port, cloned.sshPort, cloned.SSHPort),
-      user: readString(rawSSH.user, rawSSH.User, cloned.sshUser, cloned.SSHUser),
-      password: readString(rawSSH.password, rawSSH.Password, cloned.sshPassword, cloned.SSHPassword),
-      keyPath: readString(rawSSH.keyPath, rawSSH.KeyPath, cloned.sshKeyPath, cloned.SSHKeyPath),
-    };
-    const hasSSHDetail = Boolean(
-      normalizedSSH.host
-      || normalizedSSH.user
-      || normalizedSSH.password
-      || normalizedSSH.keyPath
-    );
-
-    const rawProxy = (cloned.proxy ?? cloned.Proxy ?? {}) as Record<string, unknown>;
-    const proxyTypeRaw = readString(rawProxy.type, rawProxy.Type, cloned.proxyType, cloned.ProxyType).toLowerCase();
-    const proxyType: 'socks5' | 'http' = proxyTypeRaw === 'http' ? 'http' : 'socks5';
-    const normalizedProxy = {
-      type: proxyType,
-      host: readString(rawProxy.host, rawProxy.Host, cloned.proxyHost, cloned.ProxyHost),
-      port: readNumber(proxyType === 'http' ? 8080 : 1080, rawProxy.port, rawProxy.Port, cloned.proxyPort, cloned.ProxyPort),
-      user: readString(rawProxy.user, rawProxy.User, cloned.proxyUser, cloned.ProxyUser),
-      password: readString(rawProxy.password, rawProxy.Password, cloned.proxyPassword, cloned.ProxyPassword),
-    };
-    const hasProxyDetail = Boolean(normalizedProxy.host || normalizedProxy.user || normalizedProxy.password);
-    const rawHttpTunnel = (cloned.httpTunnel ?? cloned.HTTPTunnel ?? {}) as Record<string, unknown>;
-    const normalizedHttpTunnel = {
-      host: readString(rawHttpTunnel.host, rawHttpTunnel.Host, cloned.httpTunnelHost, cloned.HttpTunnelHost),
-      port: readNumber(8080, rawHttpTunnel.port, rawHttpTunnel.Port, cloned.httpTunnelPort, cloned.HttpTunnelPort),
-      user: readString(rawHttpTunnel.user, rawHttpTunnel.User, cloned.httpTunnelUser, cloned.HttpTunnelUser),
-      password: readString(rawHttpTunnel.password, rawHttpTunnel.Password, cloned.httpTunnelPassword, cloned.HttpTunnelPassword),
-    };
-    const hasHttpTunnelDetail = Boolean(normalizedHttpTunnel.host || normalizedHttpTunnel.user || normalizedHttpTunnel.password);
-    const normalizedUseHttpTunnel = readBool(hasHttpTunnelDetail, cloned.useHttpTunnel, cloned.UseHTTPTunnel);
-    const normalizedUseProxy = !normalizedUseHttpTunnel && readBool(hasProxyDetail, cloned.useProxy, cloned.UseProxy);
-
-    const rawHosts = Array.isArray(cloned.hosts)
-      ? cloned.hosts
-      : (Array.isArray(cloned.Hosts) ? cloned.Hosts : []);
-    const normalizedHosts = rawHosts
-      .map((entry: unknown) => String(entry || '').trim())
-      .filter((entry: string) => !!entry);
-
-    return {
-      ...(cloned as SavedConnection['config']),
-      useSSH: readBool(hasSSHDetail, cloned.useSSH, cloned.UseSSH),
-      ssh: normalizedSSH,
-      useProxy: normalizedUseProxy,
-      proxy: normalizedProxy,
-      useHttpTunnel: normalizedUseHttpTunnel,
-      httpTunnel: normalizedHttpTunnel,
-      hosts: normalizedHosts,
-      timeout: readNumber(30, cloned.timeout, cloned.Timeout),
-    };
-  };
-
-  const handleDuplicateConnection = (conn: SavedConnection) => {
-    if (!conn) return;
-
-    const duplicatedConnection: SavedConnection = {
-      ...conn,
-      id: `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
-      name: buildDuplicateConnectionName(conn.name),
-      config: cloneConnectionConfig(conn.config),
-      includeDatabases: conn.includeDatabases ? [...conn.includeDatabases] : undefined,
-      includeRedisDatabases: conn.includeRedisDatabases ? [...conn.includeRedisDatabases] : undefined,
-    };
-
-    addConnection(duplicatedConnection);
-    message.success(`已复制连接: ${duplicatedConnection.name}`);
-  };
   const updateTreeData = (list: TreeNode[], key: React.Key, children: TreeNode[] | undefined): TreeNode[] => {
     return list.map(node => {
       if (node.key === key) {
@@ -657,15 +456,10 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
           }
           case 'oracle':
           case 'dm':
-              return normalizeMetadataQuerySpecs([
-                  { sql: `SELECT VIEW_NAME AS view_name FROM USER_VIEWS ORDER BY VIEW_NAME` },
-                  { sql: `SELECT OWNER AS schema_name, VIEW_NAME AS view_name FROM ALL_VIEWS WHERE OWNER = USER ORDER BY VIEW_NAME` },
-                  {
-                      sql: safeDbName
-                          ? `SELECT OWNER AS schema_name, VIEW_NAME AS view_name FROM ALL_VIEWS WHERE OWNER = '${safeDbName.toUpperCase()}' ORDER BY VIEW_NAME`
-                          : '',
-                  },
-              ]);
+              if (!safeDbName) {
+                  return [{ sql: `SELECT VIEW_NAME AS view_name FROM USER_VIEWS ORDER BY VIEW_NAME` }];
+              }
+              return [{ sql: `SELECT OWNER AS schema_name, VIEW_NAME AS view_name FROM ALL_VIEWS WHERE OWNER = '${safeDbName.toUpperCase()}' ORDER BY VIEW_NAME` }];
           case 'sqlite':
               return [{ sql: `SELECT name AS view_name FROM sqlite_master WHERE type = 'view' ORDER BY name` }];
           case 'duckdb':
@@ -748,15 +542,10 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
           }
           case 'oracle':
           case 'dm':
-              return normalizeMetadataQuerySpecs([
-                  { sql: `SELECT OBJECT_NAME AS routine_name, OBJECT_TYPE AS routine_type FROM USER_OBJECTS WHERE OBJECT_TYPE IN ('FUNCTION','PROCEDURE') ORDER BY OBJECT_TYPE, OBJECT_NAME` },
-                  { sql: `SELECT OWNER AS schema_name, OBJECT_NAME AS routine_name, OBJECT_TYPE AS routine_type FROM ALL_OBJECTS WHERE OWNER = USER AND OBJECT_TYPE IN ('FUNCTION','PROCEDURE') ORDER BY OBJECT_TYPE, OBJECT_NAME` },
-                  {
-                      sql: safeDbName
-                          ? `SELECT OWNER AS schema_name, OBJECT_NAME AS routine_name, OBJECT_TYPE AS routine_type FROM ALL_OBJECTS WHERE OWNER = '${safeDbName.toUpperCase()}' AND OBJECT_TYPE IN ('FUNCTION','PROCEDURE') ORDER BY OBJECT_TYPE, OBJECT_NAME`
-                          : '',
-                  },
-              ]);
+              if (!safeDbName) {
+                  return [{ sql: `SELECT OBJECT_NAME AS routine_name, OBJECT_TYPE AS routine_type FROM USER_OBJECTS WHERE OBJECT_TYPE IN ('FUNCTION','PROCEDURE') ORDER BY OBJECT_TYPE, OBJECT_NAME` }];
+              }
+              return [{ sql: `SELECT OWNER AS schema_name, OBJECT_NAME AS routine_name, OBJECT_TYPE AS routine_type FROM ALL_OBJECTS WHERE OWNER = '${safeDbName.toUpperCase()}' AND OBJECT_TYPE IN ('FUNCTION','PROCEDURE') ORDER BY OBJECT_TYPE, OBJECT_NAME` }];
           case 'duckdb':
               return [{
                   sql: `SELECT schema_name, function_name AS routine_name, 'FUNCTION' AS routine_type FROM duckdb_functions() WHERE internal = false AND lower(function_type) = 'macro' AND COALESCE(macro_definition, '') <> '' ORDER BY schema_name, function_name`,
@@ -916,8 +705,7 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
                   const res = await (window as any).go.app.App.RedisGetDatabases(config);
                   if (res.success) {
                       setConnectionStates(prev => ({ ...prev, [conn.id]: 'success' }));
-                      const redisRows: any[] = Array.isArray(res.data) ? res.data : [];
-                      let dbs = redisRows.map((db: any) => ({
+                      let dbs = (res.data as any[]).map((db: any) => ({
                           title: `db${db.index}${db.keys > 0 ? ` (${db.keys})` : ''}`,
                           key: `${conn.id}-db${db.index}`,
                           icon: <DatabaseOutlined style={{ color: '#DC382D' }} />,
@@ -948,8 +736,7 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
 	          const res = await DBGetDatabases(config as any);
 	          if (res.success) {
 	            setConnectionStates(prev => ({ ...prev, [conn.id]: 'success' }));
-                const dbRows: any[] = Array.isArray(res.data) ? res.data : [];
-	            let dbs = dbRows.map((row: any) => ({
+	            let dbs = (res.data as any[]).map((row: any) => ({
 	              title: row.Database || row.database,
               key: `${conn.id}-${row.Database || row.database}`,
               icon: <DatabaseOutlined />,
@@ -964,13 +751,10 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
             }
 
             setTreeData(origin => updateTreeData(origin, node.key, dbs));
-	          } else {
-	            setConnectionStates(prev => ({ ...prev, [conn.id]: 'error' }));
-	            message.error({ content: res.message, key: `conn-${conn.id}-dbs` });
-	          }
-	      } catch (e: any) {
-	          setConnectionStates(prev => ({ ...prev, [conn.id]: 'error' }));
-	          message.error({ content: '连接失败: ' + (e?.message || String(e)), key: `conn-${conn.id}-dbs` });
+          } else {
+            setConnectionStates(prev => ({ ...prev, [conn.id]: 'error' }));
+            message.error({ content: res.message, key: `conn-${conn.id}-dbs` });
+          }
 	      } finally {
 	          loadingNodesRef.current.delete(loadKey);
 	      }
@@ -1015,8 +799,7 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
 	          if (res.success) {
 	            setConnectionStates(prev => ({ ...prev, [key as string]: 'success' }));
 
-                const tableRows: any[] = Array.isArray(res.data) ? res.data : [];
-	            const tableEntries = tableRows.map((row: any) => {
+	            const tableEntries = (res.data as any[]).map((row: any) => {
 	                const tableName = Object.values(row)[0] as string;
 	                const parsed = splitQualifiedName(tableName);
 	                return {
@@ -1032,11 +815,7 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
                 loadFunctions(conn, conn.dbName),
             ]);
 
-            const viewRows: string[] = Array.isArray(viewsResult.views) ? viewsResult.views : [];
-            const triggerRows: any[] = Array.isArray(triggersResult.triggers) ? triggersResult.triggers : [];
-            const routineRows: any[] = Array.isArray(routinesResult.routines) ? routinesResult.routines : [];
-
-            const viewEntries = viewRows.map((viewName: string) => {
+            const viewEntries = viewsResult.views.map((viewName) => {
                 const parsed = splitQualifiedName(viewName);
                 return {
                     viewName,
@@ -1050,7 +829,7 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
                 const triggerSeen = new Set<string>();
                 const metadataDialect = getMetadataDialect(conn as SavedConnection);
 
-                triggerRows.forEach((trigger: any) => {
+                triggersResult.triggers.forEach((trigger) => {
                     const triggerParsed = splitQualifiedName(trigger.triggerName);
                     const tableParsed = splitQualifiedName(trigger.tableName);
                     const schemaName = tableParsed.schemaName || triggerParsed.schemaName || String(conn.dbName || '').trim();
@@ -1075,7 +854,7 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
                 return deduped;
             })();
 
-            const routineEntries = routineRows.map((routine: any) => {
+            const routineEntries = routinesResult.routines.map((routine) => {
                 const parsed = splitQualifiedName(routine.routineName);
                 const typeLabel = routine.routineType === 'PROCEDURE' ? 'P' : 'F';
                 return {
@@ -1257,16 +1036,12 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
 	            setConnectionStates(prev => ({ ...prev, [key as string]: 'error' }));
 	            message.error({ content: res.message, key: `db-${key}-tables` });
           }
-	      } catch (e: any) {
-	          setConnectionStates(prev => ({ ...prev, [key as string]: 'error' }));
-	          message.error({ content: '加载表失败: ' + (e?.message || String(e)), key: `db-${key}-tables` });
 	      } finally {
 	          loadingNodesRef.current.delete(loadKey);
 	      }
   };
 
   const onLoadData = async ({ key, children, dataRef, type }: any) => {
-    if (type === 'tag') return;
     if (children) return;
 
     if (type === 'connection') {
@@ -1605,8 +1380,7 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
 
       const res = await DBGetDatabases(config as any);
       if (res.success) {
-          const dbRows: any[] = Array.isArray(res.data) ? res.data : [];
-          let dbs = dbRows.map((row: any) => {
+          let dbs = (res.data as any[]).map((row: any) => {
               const dbName = row.Database || row.database;
               return {
                   title: dbName,
@@ -1647,11 +1421,9 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
           return;
       }
 
-      const tableRows: any[] = Array.isArray(res.data) ? res.data : [];
-      const viewRows: string[] = Array.isArray(viewResult.views) ? viewResult.views : [];
-      const viewSet = new Set(viewRows.map((view: string) => view.toLowerCase()));
+      const viewSet = new Set(viewResult.views.map(view => view.toLowerCase()));
 
-      const tableObjects: BatchObjectItem[] = tableRows
+      const tableObjects: BatchObjectItem[] = (res.data as any[])
           .map((row: any) => Object.values(row)[0] as string)
           .filter((tableName: string) => !viewSet.has(tableName.toLowerCase()))
           .map((tableName: string) => ({
@@ -1662,7 +1434,7 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
               dataRef: { ...conn, tableName, dbName, objectType: 'table' },
           }));
 
-      const viewObjects: BatchObjectItem[] = viewRows.map((viewName: string) => ({
+      const viewObjects: BatchObjectItem[] = viewResult.views.map((viewName: string) => ({
           title: getSidebarTableDisplayName(conn, viewName),
           key: `${conn.id}-${dbName}-view-${viewName}`,
           objectName: viewName,
@@ -1828,8 +1600,7 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
 
       const res = await DBGetDatabases(config as any);
       if (res.success) {
-          const dbRows: any[] = Array.isArray(res.data) ? res.data : [];
-          let dbs = dbRows.map((row: any) => {
+          let dbs = (res.data as any[]).map((row: any) => {
               const dbName = row.Database || row.database;
               return {
                   title: dbName,
@@ -2416,205 +2187,28 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
     setSearchValue(value);
   };
 
-  const toggleSearchScope = (scope: SearchScope) => {
-      setSearchScopes((prev) => {
-          if (scope === 'smart') {
-              return ['smart'];
-          }
-          const withoutSmart = prev.filter((item) => item !== 'smart');
-          if (withoutSmart.includes(scope)) {
-              const next = withoutSmart.filter((item) => item !== scope);
-              return next.length > 0 ? next : ['smart'];
-          }
-          return [...withoutSmart, scope];
-      });
-  };
-
-  const setSearchScopeChecked = (scope: SearchScope, checked: boolean) => {
-      if (scope === 'smart') {
-          if (checked) {
-              setSearchScopes(['smart']);
-          } else if (searchScopes.length === 1 && searchScopes[0] === 'smart') {
-              setSearchScopes(['smart']);
-          } else {
-              setSearchScopes((prev) => {
-                  const next = prev.filter((item) => item !== 'smart');
-                  return next.length > 0 ? next : ['smart'];
-              });
-          }
-          return;
-      }
-
-      if (checked) {
-          setSearchScopes((prev) => {
-              const withoutSmart = prev.filter((item) => item !== 'smart');
-              if (withoutSmart.includes(scope)) {
-                  return withoutSmart;
-              }
-              return [...withoutSmart, scope];
-          });
-      } else {
-          setSearchScopes((prev) => {
-              const next = prev.filter((item) => item !== scope && item !== 'smart');
-              return next.length > 0 ? next : ['smart'];
-          });
-      }
-  };
-
-  const searchScopeSummary = useMemo(() => {
-      if (searchScopes.includes('smart')) {
-          return '智能';
-      }
-      return searchScopes.map((scope) => SEARCH_SCOPE_LABEL_MAP[scope]).join(' + ');
-  }, [searchScopes]);
-
-  const searchScopePopoverContent = useMemo(() => {
-      const smartSelected = searchScopes.includes('smart');
-      const scopedOptions = SEARCH_SCOPE_OPTIONS.filter((option) => option.value !== 'smart');
-      return (
-          <div style={{ minWidth: 220, display: 'flex', flexDirection: 'column', gap: 8 }}>
-              <div style={{ fontSize: 12, color: '#8c8c8c' }}>搜索范围</div>
-              <Checkbox
-                  checked={smartSelected}
-                  onChange={(e) => setSearchScopeChecked('smart', e.target.checked)}
-              >
-                  智能（推荐）
-              </Checkbox>
-              <div style={{ paddingLeft: 12, display: 'grid', gap: 6 }}>
-                  {scopedOptions.map((option) => (
-                      <Checkbox
-                          key={option.value}
-                          checked={searchScopes.includes(option.value)}
-                          onChange={(e) => setSearchScopeChecked(option.value, e.target.checked)}
-                      >
-                          {option.label}
-                      </Checkbox>
-                  ))}
-              </div>
-              <div style={{ fontSize: 12, color: '#8c8c8c' }}>
-                  智能与其他项互斥；其他项支持多选。
-              </div>
-          </div>
-      );
-  }, [searchScopes]);
-
-  const parseHostOnlyToken = (value: unknown): string[] => {
-      const raw = String(value || '').trim();
-      if (!raw) {
-          return [];
-      }
-      let text = raw.replace(/^[a-z][a-z0-9+.-]*:\/\//i, '');
-      if (text.includes('/')) {
-          text = text.split('/')[0];
-      }
-      if (text.includes('?')) {
-          text = text.split('?')[0];
-      }
-      if (text.includes('@')) {
-          text = text.split('@').pop() || '';
-      }
-      return text
-          .split(',')
-          .map((entry) => {
-              const token = entry.trim();
-              if (!token) return '';
-              if (token.startsWith('[')) {
-                  const rightBracketIndex = token.indexOf(']');
-                  if (rightBracketIndex > 0) {
-                      return token.slice(0, rightBracketIndex + 1).toLowerCase();
-                  }
-              }
-              const colonIndex = token.lastIndexOf(':');
-              if (colonIndex > 0) {
-                  return token.slice(0, colonIndex).toLowerCase();
-              }
-              return token.toLowerCase();
-          })
-          .filter(Boolean);
-  };
-
-  const getConnectionHostSearchText = (node: TreeNode): string => {
-      if (node.type !== 'connection') return '';
-      const config = node.dataRef?.config || {};
-      const hostTokens = [
-          ...parseHostOnlyToken(config.host),
-          ...(Array.isArray(config.hosts) ? config.hosts.flatMap((entry: string) => parseHostOnlyToken(entry)) : []),
-          ...parseHostOnlyToken(config.uri),
-      ];
-      const uniqueHosts = Array.from(new Set(hostTokens));
-      return uniqueHosts.join(' ');
-  };
-
-  const getConnectionNameSearchText = (node: TreeNode): string => {
-      if (node.type !== 'connection') return '';
-      const name = node.dataRef?.name ?? node.title;
-      return String(name || '').toLowerCase();
-  };
-
-  const isObjectNode = (node: TreeNode): boolean => {
-      return node.type === 'table'
-          || node.type === 'view'
-          || node.type === 'db-trigger'
-          || node.type === 'routine'
-          || node.type === 'object-group';
-  };
-
-  const matchByScopes = (node: TreeNode, keyword: string, scopes: SearchScope[]): boolean => {
-      const title = String(node.title || '').toLowerCase();
-      if (scopes.includes('database') && node.type === 'database' && title.includes(keyword)) {
-          return true;
-      }
-      if (scopes.includes('tag') && node.type === 'tag' && title.includes(keyword)) {
-          return true;
-      }
-      if (scopes.includes('host') && node.type === 'connection' && getConnectionHostSearchText(node).includes(keyword)) {
-          return true;
-      }
-      if (scopes.includes('object') && isObjectNode(node) && title.includes(keyword)) {
-          return true;
-      }
-      return false;
-  };
-
-  const loop = (data: TreeNode[], keyword: string): TreeNode[] => {
-      const isSmartMode = searchScopes.includes('smart');
+  const loop = (data: TreeNode[]): TreeNode[] => {
       const result: TreeNode[] = [];
-      data.forEach((item) => {
-          const titleMatch = String(item.title || '').toLowerCase().includes(keyword);
-          const smartMatch = item.type === 'connection'
-              ? getConnectionNameSearchText(item).includes(keyword) || getConnectionHostSearchText(item).includes(keyword)
-              : titleMatch;
-          const scopedMatch = matchByScopes(item, keyword, searchScopes);
-          const selfMatch = isSmartMode ? smartMatch : scopedMatch;
-          const filteredChildren = item.children ? loop(item.children, keyword) : [];
-
-          if (selfMatch) {
-              const shouldKeepFullSubtree = isSmartMode
-                  || item.type === 'connection'
-                  || item.type === 'database'
-                  || item.type === 'tag';
-              if (item.children && shouldKeepFullSubtree) {
-                  result.push(item);
-              } else if (item.children && filteredChildren.length > 0) {
+      data.forEach(item => {
+          const match = item.title.toLowerCase().indexOf(searchValue.toLowerCase()) > -1;
+          if (item.children) {
+              const filteredChildren = loop(item.children);
+              if (filteredChildren.length > 0 || match) {
                   result.push({ ...item, children: filteredChildren });
-              } else {
+              }
+          } else {
+              if (match) {
                   result.push(item);
               }
-              return;
-          }
-
-          if (filteredChildren.length > 0) {
-              result.push({ ...item, children: filteredChildren });
           }
       });
       return result;
   };
 
   const displayTreeData = useMemo(() => {
-      const keyword = searchValue.trim().toLowerCase();
-      if (!keyword) return treeData;
-      return loop(treeData, keyword);
-  }, [searchValue, searchScopes, treeData]);
+      if (!searchValue) return treeData;
+      return loop(treeData);
+  }, [searchValue, treeData]);
 
   const getNodeMenuItems = (node: any): MenuProps['items'] => {
     const conn = node.dataRef as SavedConnection;
@@ -2690,38 +2284,6 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
         return routineMenu;
     }
 
-    // Connection Tag Menu — must be BEFORE the connection check
-    if (node.type === 'tag') {
-        return [
-            {
-                key: 'edit-tag',
-                label: '编辑标签',
-                icon: <EditOutlined />,
-                onClick: () => {
-                    createTagForm.setFieldsValue({ name: node.title, connectionIds: node.dataRef.connectionIds });
-                    setRenameViewTarget(node);
-                    setIsCreateTagModalOpen(true);
-                }
-            },
-            { type: 'divider' },
-            {
-                key: 'delete-tag',
-                label: '删除标签',
-                icon: <DeleteOutlined />,
-                danger: true,
-                onClick: () => {
-                    Modal.confirm({
-                        title: '确认删除',
-                        content: `确定要删除标签 "${node.title}" 吗？这不会删除里面的连接。`,
-                        onOk: () => {
-                            removeConnectionTag(node.dataRef.id);
-                        }
-                    });
-                }
-            }
-        ];
-    }
-
     if (node.type === 'connection') {
         // Redis connection menu
         if (isRedis) {
@@ -2756,12 +2318,6 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
                         if (onEditConnection) onEditConnection(node.dataRef);
                     }
                 },
-                {
-                    key: 'copy-connection',
-                    label: '复制连接',
-                    icon: <CopyOutlined />,
-                    onClick: () => handleDuplicateConnection(node.dataRef as SavedConnection)
-                },
                 {
                     key: 'disconnect',
                     label: '断开连接',
@@ -2802,22 +2358,6 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
             ];
         }
 
-        // Tag submenu for connection
-        const tagSubMenuItems: MenuProps['items'] = connectionTags.map(tag => ({
-            key: `move-to-tag-${tag.id}`,
-            label: tag.name,
-            icon: <FolderOutlined />,
-            onClick: () => moveConnectionToTag(node.key, tag.id)
-        }));
-        if (connectionTags.length > 0) {
-            tagSubMenuItems.push({ type: 'divider' });
-        }
-        tagSubMenuItems.push({
-            key: 'move-to-ungrouped',
-            label: '移出标签',
-            onClick: () => moveConnectionToTag(node.key, null)
-        });
-
         // Regular database connection menu
         return [
             {
@@ -2860,30 +2400,11 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
                      if (onEditConnection) onEditConnection(node.dataRef);
                  }
              },
-             {
-                 key: 'copy-connection',
-                 label: '复制连接',
-                 icon: <CopyOutlined />,
-                 onClick: () => handleDuplicateConnection(node.dataRef as SavedConnection)
-             },
-             {
-                 key: 'move-to-tag',
-                 label: '移至标签',
-                 icon: <FolderOpenOutlined />,
-                 children: tagSubMenuItems
-             },
              {
                  key: 'disconnect',
                  label: '断开连接',
                  icon: <DisconnectOutlined />,
                  onClick: () => {
-                     const connId = String(node.key || '');
-                     // 强制清理该连接相关的 loading 标记，避免网络卡住后重连仍被短路。
-                     Array.from(loadingNodesRef.current).forEach((loadingKey) => {
-                         if (loadingKey === `dbs-${connId}` || loadingKey.startsWith(`tables-${connId}-`)) {
-                             loadingNodesRef.current.delete(loadingKey);
-                         }
-                     });
                      // Reset status recursively
                      setConnectionStates(prev => {
                          const next = { ...prev };
@@ -3005,7 +2526,6 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
                onClick: () => {
                    const dbConnId = String(node.dataRef?.id || '');
                    const dbName = String(node.dataRef?.dbName || node.title || '').trim();
-                   loadingNodesRef.current.delete(`tables-${dbConnId}-${dbName}`);
                    setConnectionStates(prev => {
                        const next = { ...prev };
                        delete next[node.key];
@@ -3187,7 +2707,6 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
                     { key: 'export-xlsx', label: '导出 Excel (XLSX)', onClick: () => handleExport(node, 'xlsx') },
                     { key: 'export-json', label: '导出 JSON', onClick: () => handleExport(node, 'json') },
                     { key: 'export-md', label: '导出 Markdown', onClick: () => handleExport(node, 'md') },
-                    { key: 'export-html', label: '导出 HTML', onClick: () => handleExport(node, 'html') },
                 ]
             }
         ];
@@ -3222,72 +2741,6 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
     return <span title={hoverTitle}>{statusBadge}{displayTitle}</span>;
   };
 
-  const handleDrop = (info: any) => {
-      const dropKey = info.node.key;
-      const dragKey = info.dragNode.key;
-      const dropPos = info.node.pos.split('-');
-      const dropPosition = info.dropPosition - Number(dropPos[dropPos.length - 1]);
-
-      const dragNode = info.dragNode;
-      const dropNode = info.node;
-
-      // Tag to Tag reordering
-      if (dragNode.type === 'tag') {
-          // You can only drop tags onto the root level (before/after other tags or connections at root)
-          if (dropNode.type === 'tag' || dropNode.type === 'connection') {
-              // Get current order
-              const currentTagOrder = connectionTags.map(t => t.id);
-              const dragTagId = dragNode.dataRef.id;
-
-              // Filter out the dragging tag
-              const newOrder = currentTagOrder.filter(id => id !== dragTagId);
-
-              let insertIndex = newOrder.length;
-              if (dropNode.type === 'tag') {
-                  const dropTagId = dropNode.dataRef.id;
-                  const dropIndex = newOrder.indexOf(dropTagId);
-
-                  if (dropPosition === -1) {
-                      insertIndex = dropIndex;
-                  } else {
-                      insertIndex = dropIndex + 1;
-                  }
-              } else {
-                  // Dropped onto a root connection, usually meaning moving to the end of tags
-                  // Since tags are always displayed before ungrouped connections, just put it at the end
-                  insertIndex = newOrder.length;
-              }
-
-              newOrder.splice(insertIndex, 0, dragTagId);
-              reorderTags(newOrder);
-          }
-          return;
-      }
-
-      // Connection moving to tag (any drop position on a tag node counts as "into")
-      if (dragNode.type === 'connection' && dropNode.type === 'tag') {
-          moveConnectionToTag(dragNode.key, dropNode.dataRef.id);
-          return;
-      }
-
-      // Connection moving to another connection inside a tag
-      if (dragNode.type === 'connection' && dropNode.type === 'connection') {
-          // Find if drop target is under a tag
-          const targetTag = connectionTags.find(t => t.connectionIds.includes(dropNode.key));
-          if (targetTag) {
-              moveConnectionToTag(dragNode.key, targetTag.id);
-              return;
-          }
-
-          // Drop target is NOT under a tag (ungrouped) -> move OUT of tag
-          const sourceTag = connectionTags.find(t => t.connectionIds.includes(dragNode.key));
-          if (sourceTag) {
-              moveConnectionToTag(dragNode.key, null);
-              return;
-          }
-      }
-  };
-
   const onRightClick = ({ event, node }: any) => {
       const items = getNodeMenuItems(node);
       if (items && items.length > 0) {
@@ -3302,49 +2755,16 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
   return (
     <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
         <div style={{ padding: '4px 8px' }}>
-            <Space.Compact block size="small">
-                <Search
-                    ref={searchInputRef}
-                    placeholder="搜索..."
-                    onChange={onSearch}
-                    size="small"
-                    style={{ width: '100%' }}
-                />
-                <Popover
-                    content={searchScopePopoverContent}
-                    trigger="click"
-                    placement="bottomRight"
-                    open={isSearchScopePopoverOpen}
-                    onOpenChange={setIsSearchScopePopoverOpen}
-                >
-                    <Tooltip title={`搜索范围：${searchScopeSummary}`}>
-                        <Button size="small" icon={<DownOutlined />} style={{ width: 86 }}>
-                            范围{searchScopes.includes('smart') ? '(智)' : `(${searchScopes.length})`}
-                        </Button>
-                    </Tooltip>
-                </Popover>
-            </Space.Compact>
+            <Search placeholder="搜索..." onChange={onSearch} size="small" />
         </div>
 
-        {/* Toolbar */}
-        <div style={{ padding: '4px 8px', borderBottom: 'none', display: 'flex', flexWrap: 'wrap', gap: 4 }}>
-            <Button
-                size="small"
-                icon={<FolderOpenOutlined />}
-                onClick={() => {
-                    setRenameViewTarget(null); // Create mode
-                    createTagForm.resetFields();
-                    setIsCreateTagModalOpen(true);
-                }}
-                style={{ flex: '1 1 auto' }}
-            >
-                新建组
-            </Button>
+        {/* Toolbar for batch operations - always visible */}
+        <div style={{ padding: '4px 8px', borderBottom: 'none', display: 'flex', gap: 4 }}>
             <Button
                 size="small"
                 icon={<CheckSquareOutlined />}
                 onClick={() => openBatchOperationModal()}
-                style={{ flex: '1 1 auto' }}
+                style={{ flex: 1 }}
             >
                 批量操作表
             </Button>
@@ -3352,7 +2772,7 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
                 size="small"
                 icon={<CheckSquareOutlined />}
                 onClick={() => openBatchDatabaseModal()}
-                style={{ flex: '1 1 auto' }}
+                style={{ flex: 1 }}
             >
                 批量操作库
             </Button>
@@ -3361,11 +2781,6 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
         <div ref={treeContainerRef} style={{ flex: 1, overflow: 'hidden', minHeight: 0 }}>
             <Tree
                 showIcon
-                draggable={{
-                    icon: false,
-                    nodeDraggable: (node: any) => node.type === 'connection' || node.type === 'tag'
-                }}
-                onDrop={handleDrop}
                 loadData={onLoadData}
                 treeData={displayTreeData}
                 onDoubleClick={onDoubleClick}
@@ -3394,60 +2809,6 @@ const Sidebar: React.FC<{ onEditConnection?: (conn: SavedConnection) => void }>
             </Dropdown>
         )}
 
-        <Modal
-            title={renameViewTarget?.type === 'tag' ? "编辑标签" : "新建组"}
-            open={isCreateTagModalOpen}
-            onOk={() => {
-                createTagForm.validateFields().then(values => {
-                    if (renameViewTarget?.type === 'tag') {
-                        // Rename
-                        updateConnectionTag({
-                            ...renameViewTarget.dataRef,
-                            name: values.name,
-                            connectionIds: values.connectionIds || []
-                        });
-                        // update cross-connections
-                        const allOtherTagsIds = connectionTags.filter(t => t.id !== renameViewTarget.dataRef.id).flatMap(t => t.connectionIds);
-                        (values.connectionIds || []).forEach((cid: string) => {
-                           if (allOtherTagsIds.includes(cid)) {
-                               moveConnectionToTag(cid, renameViewTarget.dataRef.id);
-                           }
-                        });
-                    } else {
-                        // Create
-                        const tagId = Date.now().toString();
-                        addConnectionTag({
-                            id: tagId,
-                            name: values.name,
-                            connectionIds: values.connectionIds || []
-                        });
-                        (values.connectionIds || []).forEach((cid: string) => {
-                            moveConnectionToTag(cid, tagId);
-                        });
-                    }
-                    setIsCreateTagModalOpen(false);
-                });
-            }}
-            onCancel={() => setIsCreateTagModalOpen(false)}
-        >
-            <Form form={createTagForm} layout="vertical">
-                <Form.Item name="name" label="标签名称" rules={[{ required: true, message: '请输入标签名称' }]}>
-                    <Input />
-                </Form.Item>
-                <Form.Item name="connectionIds" label="选择连接">
-                    <Checkbox.Group style={{ width: '100%' }}>
-                        <Space direction="vertical" style={{ width: '100%', maxHeight: '400px', overflowY: 'auto' }}>
-                            {connections.map(conn => (
-                                <Checkbox key={conn.id} value={conn.id}>
-                                    {conn.name} {conn.config.host ? `(${conn.config.host})` : ''}
-                                </Checkbox>
-                            ))}
-                        </Space>
-                    </Checkbox.Group>
-                </Form.Item>
-            </Form>
-        </Modal>
-
         <Modal
             title="新建数据库"
             open={isCreateDbModalOpen}

frontend/src/components/TableDesigner.tsx

@@ -261,18 +261,9 @@ const TableDesigner: React.FC<{ tab: TabData }> = ({ tab }) => {
   const darkMode = theme === 'dark';
   const resizeGuideColor = darkMode ? '#f6c453' : '#1890ff';
   const readOnly = !!tab.readOnly;
-  const panelRadius = 10;
-  const panelFrameColor = darkMode ? 'rgba(0, 0, 0, 0.18)' : 'rgba(0, 0, 0, 0.12)';
-  const panelToolbarBorder = darkMode ? 'rgba(255, 255, 255, 0.12)' : 'rgba(0, 0, 0, 0.10)';
-  const panelToolbarBg = darkMode ? 'rgba(20, 20, 20, 0.35)' : 'rgba(255, 255, 255, 0.72)';
-  const panelBodyBg = darkMode ? 'rgba(0, 0, 0, 0.24)' : 'rgba(255, 255, 255, 0.82)';
-  const focusRowBg = darkMode ? 'rgba(246, 196, 83, 0.22)' : 'rgba(24, 144, 255, 0.12)';
 
   const [tableHeight, setTableHeight] = useState(500);
   const containerRef = useRef<HTMLDivElement>(null);
-  const pendingFocusColumnKeyRef = useRef<string | null>(null);
-  const focusHighlightTimerRef = useRef<number | null>(null);
-  const [focusColumnKey, setFocusColumnKey] = useState('');
 
   const openCommentEditor = useCallback((record: EditableColumn) => {
       if (!record?._key) return;
@@ -355,61 +346,6 @@ const TableDesigner: React.FC<{ tab: TabData }> = ({ tab }) => {
       setSelectedColumnRowKeys(prev => prev.filter(key => columns.some(c => c._key === key)));
   }, [columns]);
 
-  useEffect(() => {
-      return () => {
-          if (focusHighlightTimerRef.current !== null) {
-              window.clearTimeout(focusHighlightTimerRef.current);
-          }
-      };
-  }, []);
-
-  const focusColumnRow = useCallback((targetKey: string): boolean => {
-      if (activeKey !== 'columns') return false;
-      const tableBody = containerRef.current?.querySelector('.ant-table-body') as HTMLElement | null;
-      if (!tableBody) return false;
-      const row = tableBody.querySelector(`tr[data-row-key="${targetKey}"]`) as HTMLTableRowElement | null;
-      if (!row) return false;
-
-      row.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
-      setFocusColumnKey(targetKey);
-      if (focusHighlightTimerRef.current !== null) {
-          window.clearTimeout(focusHighlightTimerRef.current);
-      }
-      focusHighlightTimerRef.current = window.setTimeout(() => {
-          setFocusColumnKey(prev => (prev === targetKey ? '' : prev));
-      }, 1600);
-
-      if (!readOnly) {
-          const firstInput = row.querySelector('input') as HTMLInputElement | null;
-          if (firstInput) {
-              firstInput.focus();
-              firstInput.select();
-          }
-      }
-      return true;
-  }, [activeKey, readOnly]);
-
-  useEffect(() => {
-      const pendingKey = pendingFocusColumnKeyRef.current;
-      if (!pendingKey || activeKey !== 'columns') return;
-
-      let cancelled = false;
-      const tryFocus = () => {
-          if (cancelled) return;
-          if (focusColumnRow(pendingKey)) {
-              pendingFocusColumnKeyRef.current = null;
-          }
-      };
-
-      const timerA = window.setTimeout(tryFocus, 0);
-      const timerB = window.setTimeout(tryFocus, 96);
-      return () => {
-          cancelled = true;
-          window.clearTimeout(timerA);
-          window.clearTimeout(timerB);
-      };
-  }, [activeKey, columns, focusColumnRow]);
-
   // Initial Columns Definition
   useEffect(() => {
       const initialCols = [
@@ -950,46 +886,21 @@ ${selectedTrigger.statement}`;
       }));
   };
 
-  const createNewColumn = useCallback((indexHint: number): EditableColumn => ({
-      name: isNewTable ? 'new_column' : `new_col_${indexHint}`,
-      type: 'varchar(255)',
-      nullable: 'YES',
-      key: '',
-      extra: '',
-      comment: '',
-      default: '',
-      _key: `new-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
-      isNew: true,
-      isAutoIncrement: false
-  }), [isNewTable]);
-
-  const handleAddColumn = useCallback((insertAfterKey?: string) => {
-      const newCol = createNewColumn(columns.length + 1);
-      setColumns(prev => {
-          const next = [...prev];
-          if (insertAfterKey) {
-              const insertIndex = next.findIndex(col => col._key === insertAfterKey);
-              if (insertIndex >= 0) {
-                  next.splice(insertIndex + 1, 0, newCol);
-                  return next;
-              }
-          }
-          next.push(newCol);
-          return next;
-      });
-      setSelectedColumnRowKeys([newCol._key]);
-      pendingFocusColumnKeyRef.current = newCol._key;
-  }, [columns.length, createNewColumn]);
-
-  const handleAddColumnAfterSelected = useCallback(() => {
-      const selectedSet = new Set(selectedColumnRowKeys);
-      const anchor = columns.find(col => selectedSet.has(col._key));
-      if (!anchor) {
-          message.warning('请先选择一个字段，再执行插入。');
-          return;
-      }
-      handleAddColumn(anchor._key);
-  }, [columns, handleAddColumn, selectedColumnRowKeys]);
+  const handleAddColumn = () => {
+      const newCol: EditableColumn = {
+          name: isNewTable ? 'new_column' : `new_col_${columns.length + 1}`,
+          type: 'varchar(255)',
+          nullable: 'YES',
+          key: '',
+          extra: '',
+          comment: '',
+          default: '',
+          _key: `new-${Date.now()}`,
+          isNew: true,
+          isAutoIncrement: false
+      };
+      setColumns([...columns, newCol]);
+  };
 
   const handleDeleteColumn = (key: string) => {
       setColumns(prev => prev.filter(c => c._key !== key));
@@ -2009,35 +1920,22 @@ END;`;
   }));
 
   const columnsTabContent = (
-      <div
-          ref={containerRef}
-          className="table-designer-wrapper"
-          style={{
-              height: '100%',
-              overflow: 'hidden',
-              position: 'relative',
-              background: panelBodyBg
-          }}
-      >
+      <div ref={containerRef} className="table-designer-wrapper" style={{ height: '100%', overflow: 'hidden', position: 'relative' }}>
         <style>{`
            .table-designer-wrapper .ant-table-body {
                max-height: ${tableHeight}px !important;
-            }
-            .table-designer-wrapper .table-designer-focus-row > .ant-table-cell {
-                background: ${focusRowBg} !important;
-            }
+           }
         `}</style>
         {readOnly ? (
         <Table 
             dataSource={columns} 
             columns={resizableColumns} 
             rowKey="_key" 
-            rowClassName={(record: EditableColumn) => record._key === focusColumnKey ? 'table-designer-focus-row' : ''}
             size="small" 
             pagination={false} 
             loading={loading}
             scroll={{ y: tableHeight }}
-            bordered={false}
+            bordered
             components={{
               header: {
                 cell: ResizableTitle,
@@ -2055,12 +1953,11 @@ END;`;
                     onChange: (nextSelectedRowKeys) => setSelectedColumnRowKeys(nextSelectedRowKeys as string[]),
                 }}
                 rowKey="_key" 
-                rowClassName={(record: EditableColumn) => record._key === focusColumnKey ? 'table-designer-focus-row' : ''}
                 size="small" 
                 pagination={false} 
                 loading={loading}
                 scroll={{ y: tableHeight }}
-                bordered={false}
+                bordered
                 components={{
                     body: { row: SortableRow },
                     header: { cell: ResizableTitle }
@@ -2088,63 +1985,8 @@ END;`;
   );
 
   return (
-    <div className="table-designer-shell" style={{ display: 'flex', flexDirection: 'column', height: '100%', minHeight: 0, padding: '6px 0' }}>
-        <style>{`
-            .table-designer-shell .ant-table,
-            .table-designer-shell .ant-table-wrapper,
-            .table-designer-shell .ant-table-container {
-                background: transparent !important;
-            }
-            .table-designer-shell .ant-table-wrapper,
-            .table-designer-shell .ant-table-container {
-                border: none !important;
-                overflow: hidden !important;
-            }
-            .table-designer-shell .ant-table-thead > tr > th {
-                background: transparent !important;
-                border-bottom: 1px solid ${darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.06)'} !important;
-                border-inline-end: 1px solid transparent !important;
-            }
-            .table-designer-shell .ant-table-tbody > tr > td,
-            .table-designer-shell .ant-table-tbody .ant-table-row > .ant-table-cell {
-                background: transparent !important;
-                border-bottom: 1px solid ${darkMode ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.05)'} !important;
-                border-inline-end: 1px solid transparent !important;
-            }
-            .table-designer-shell .ant-table-thead > tr > th::before {
-                display: none !important;
-            }
-            .table-designer-shell .ant-table-tbody > tr:hover > td,
-            .table-designer-shell .ant-table-tbody .ant-table-row:hover > .ant-table-cell {
-                background: ${darkMode ? 'rgba(255,255,255,0.06)' : 'rgba(0,0,0,0.02)'} !important;
-            }
-            .table-designer-shell .ant-tabs-nav {
-                margin-bottom: 8px !important;
-            }
-            .table-designer-shell .ant-tabs-nav::before {
-                border-bottom-color: ${darkMode ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.08)'} !important;
-            }
-            .table-designer-shell .ant-tabs-content-holder,
-            .table-designer-shell .ant-tabs-content,
-            .table-designer-shell .ant-tabs-tabpane {
-                height: 100%;
-            }
-        `}</style>
-        <div
-            style={{
-                padding: '10px 12px 8px 12px',
-                borderBottom: `1px solid ${panelToolbarBorder}`,
-                borderTopLeftRadius: panelRadius,
-                borderTopRightRadius: panelRadius,
-                borderLeft: `1px solid ${panelFrameColor}`,
-                borderRight: `1px solid ${panelFrameColor}`,
-                borderTop: `1px solid ${panelFrameColor}`,
-                background: panelToolbarBg,
-                display: 'flex',
-                gap: '8px',
-                alignItems: 'center'
-            }}
-        >
+    <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
+        <div style={{ padding: '8px', borderBottom: '1px solid #eee', display: 'flex', gap: '8px', alignItems: 'center' }}>
             {isNewTable && (
                 <>
                     <Input 
@@ -2172,25 +2014,14 @@ END;`;
                     />
                 </>
             )}
-            {!readOnly && <Button size="small" icon={<SaveOutlined />} type="primary" onClick={generateDDL}>保存</Button>}
-            {!isNewTable && <Button size="small" icon={<ReloadOutlined />} onClick={fetchData}>刷新</Button>}
+            {!readOnly && <Button icon={<SaveOutlined />} type="primary" onClick={generateDDL}>保存</Button>}
+            {!isNewTable && <Button icon={<ReloadOutlined />} onClick={fetchData}>刷新</Button>}
             {!isNewTable && !readOnly && supportsTableCommentOps() && (
-                <Button size="small" icon={<EditOutlined />} onClick={openTableCommentModal}>表备注</Button>
+                <Button icon={<EditOutlined />} onClick={openTableCommentModal}>表备注</Button>
             )}
-            {!readOnly && <Button size="small" icon={<PlusOutlined />} onClick={() => handleAddColumn()}>添加字段</Button>}
+            {!readOnly && <Button icon={<PlusOutlined />} onClick={handleAddColumn}>添加字段</Button>}
             {!readOnly && (
                 <Button
-                    size="small"
-                    icon={<PlusOutlined />}
-                    onClick={handleAddColumnAfterSelected}
-                    disabled={selectedColumnRowKeys.length === 0}
-                >
-                    在选中字段后添加
-                </Button>
-            )}
-            {!readOnly && (
-                <Button
-                    size="small"
                     icon={<CopyOutlined />}
                     onClick={openCopySelectedColumnsModal}
                     disabled={selectedColumns.length === 0}
@@ -2203,17 +2034,7 @@ END;`;
         <Tabs 
             activeKey={activeKey}
             onChange={setActiveKey}
-            style={{
-                flex: 1,
-                minHeight: 0,
-                padding: '8px 10px 10px 10px',
-                borderBottomLeftRadius: panelRadius,
-                borderBottomRightRadius: panelRadius,
-                borderLeft: `1px solid ${panelFrameColor}`,
-                borderRight: `1px solid ${panelFrameColor}`,
-                borderBottom: `1px solid ${panelFrameColor}`,
-                background: panelBodyBg
-            }}
+            style={{ flex: 1, padding: '0 10px' }}
             items={[
                 {
                     key: 'columns',
@@ -2455,7 +2276,7 @@ END;`;
                     label: 'DDL',
                     icon: <FileTextOutlined />,
                     children: (
-                        <div style={{ height: 'calc(100vh - 200px)', border: `1px solid ${panelFrameColor}`, borderRadius: panelRadius, background: panelBodyBg }}>
+                        <div style={{ height: 'calc(100vh - 200px)', border: darkMode ? '1px solid #303030' : '1px solid #d9d9d9', borderRadius: 4 }}>
                             <Editor
                                 height="100%"
                                 language="sql"
@@ -2696,7 +2517,7 @@ END;`;
                         <span><strong>时机:</strong> {selectedTrigger.timing}</span>
                         <span><strong>事件:</strong> {selectedTrigger.event}</span>
                     </div>
-                    <div style={{ border: `1px solid ${panelFrameColor}`, borderRadius: panelRadius, background: panelBodyBg }}>
+                    <div style={{ border: darkMode ? '1px solid #303030' : '1px solid #d9d9d9', borderRadius: 4 }}>
                         <Editor
                             height="350px"
                             language="sql"
@@ -2732,7 +2553,7 @@ END;`;
                     <span>修改触发器时会先删除原触发器，再创建新触发器。</span>
                 )}
             </div>
-            <div style={{ border: `1px solid ${panelFrameColor}`, borderRadius: panelRadius, background: panelBodyBg }}>
+            <div style={{ border: darkMode ? '1px solid #303030' : '1px solid #d9d9d9', borderRadius: 4 }}>
                 <Editor
                     height="350px"
                     language="sql"

frontend/src/store.ts

@@ -1,14 +1,6 @@
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
-import { ConnectionConfig, ProxyConfig, SavedConnection, TabData, SavedQuery, ConnectionTag } from './types';
-import {
-  ShortcutAction,
-  ShortcutBinding,
-  ShortcutOptions,
-  DEFAULT_SHORTCUT_OPTIONS,
-  cloneShortcutOptions,
-  sanitizeShortcutOptions,
-} from './utils/shortcuts';
+import { ConnectionConfig, ProxyConfig, SavedConnection, TabData, SavedQuery } from './types';
 
 const DEFAULT_APPEARANCE = { opacity: 1.0, blur: 0 };
 const DEFAULT_UI_SCALE = 1.0;
@@ -25,7 +17,7 @@ const MAX_HOST_ENTRY_LENGTH = 512;
 const MAX_HOST_ENTRIES = 64;
 const DEFAULT_TIMEOUT_SECONDS = 30;
 const MAX_TIMEOUT_SECONDS = 3600;
-const PERSIST_VERSION = 5;
+const PERSIST_VERSION = 4;
 const DEFAULT_CONNECTION_TYPE = 'mysql';
 const DEFAULT_GLOBAL_PROXY: GlobalProxyConfig = {
   enabled: false,
@@ -56,23 +48,6 @@ const SUPPORTED_CONNECTION_TYPES = new Set([
   'duckdb',
   'custom',
 ]);
-const SSL_SUPPORTED_CONNECTION_TYPES = new Set([
-  'mysql',
-  'mariadb',
-  'diros',
-  'sphinx',
-  'dameng',
-  'clickhouse',
-  'postgres',
-  'sqlserver',
-  'oracle',
-  'kingbase',
-  'highgo',
-  'vastbase',
-  'mongodb',
-  'redis',
-  'tdengine',
-]);
 
 const getDefaultPortByType = (type: string): number => {
   switch (type) {
@@ -202,16 +177,6 @@ const sanitizeConnectionConfig = (value: unknown): ConnectionConfig => {
   const defaultPort = getDefaultPortByType(type);
   const savePassword = typeof raw.savePassword === 'boolean' ? raw.savePassword : true;
   const mongoSrv = !!raw.mongoSrv;
-  const sslCapable = SSL_SUPPORTED_CONNECTION_TYPES.has(type);
-  const sslModeRaw = toTrimmedString(raw.sslMode, 'preferred').toLowerCase();
-  const sslMode: 'preferred' | 'required' | 'skip-verify' | 'disable' =
-    sslModeRaw === 'required'
-      ? 'required'
-      : sslModeRaw === 'skip-verify'
-        ? 'skip-verify'
-        : sslModeRaw === 'disable'
-          ? 'disable'
-          : 'preferred';
 
   const sshRaw = (raw.ssh && typeof raw.ssh === 'object') ? raw.ssh as Record<string, unknown> : {};
   const ssh = {
@@ -231,18 +196,6 @@ const sanitizeConnectionConfig = (value: unknown): ConnectionConfig => {
     user: toTrimmedString(proxyRaw.user),
     password: toTrimmedString(proxyRaw.password),
   };
-  const httpTunnelRaw = (raw.httpTunnel && typeof raw.httpTunnel === 'object')
-    ? raw.httpTunnel as Record<string, unknown>
-    : ((raw.HTTPTunnel && typeof raw.HTTPTunnel === 'object') ? raw.HTTPTunnel as Record<string, unknown> : {});
-  const httpTunnel = {
-    host: toTrimmedString(httpTunnelRaw.host ?? raw.httpTunnelHost),
-    port: normalizePort(httpTunnelRaw.port ?? raw.httpTunnelPort, 8080),
-    user: toTrimmedString(httpTunnelRaw.user ?? raw.httpTunnelUser),
-    password: toTrimmedString(httpTunnelRaw.password ?? raw.httpTunnelPassword),
-  };
-  const supportsNetworkTunnel = type !== 'sqlite' && type !== 'duckdb';
-  const useHttpTunnel = supportsNetworkTunnel && (raw.useHttpTunnel === true || raw.UseHTTPTunnel === true);
-  const useProxy = supportsNetworkTunnel && !!raw.useProxy && !useHttpTunnel;
 
   const safeConfig: ConnectionConfig & Record<string, unknown> = {
     ...raw,
@@ -253,16 +206,10 @@ const sanitizeConnectionConfig = (value: unknown): ConnectionConfig => {
     password: savePassword ? toTrimmedString(raw.password) : '',
     savePassword,
     database: toTrimmedString(raw.database),
-    useSSL: sslCapable ? !!raw.useSSL : false,
-    sslMode: sslCapable ? sslMode : 'disable',
-    sslCertPath: sslCapable ? toTrimmedString(raw.sslCertPath) : '',
-    sslKeyPath: sslCapable ? toTrimmedString(raw.sslKeyPath) : '',
     useSSH: !!raw.useSSH,
     ssh,
-    useProxy,
+    useProxy: !!raw.useProxy,
     proxy,
-    useHttpTunnel,
-    httpTunnel,
     uri: toTrimmedString(raw.uri).slice(0, MAX_URI_LENGTH),
     hosts: sanitizeAddressList(raw.hosts),
     topology: raw.topology === 'replica' ? 'replica' : (raw.topology === 'cluster' ? 'cluster' : 'single'),
@@ -346,27 +293,6 @@ const sanitizeConnections = (value: unknown): SavedConnection[] => {
   return result;
 };
 
-const sanitizeConnectionTags = (value: unknown): ConnectionTag[] => {
-  if (!Array.isArray(value)) return [];
-  const result: ConnectionTag[] = [];
-  const idSet = new Set<string>();
-
-  value.forEach((entry, index) => {
-    if (!entry || typeof entry !== 'object') return;
-    const raw = entry as Record<string, unknown>;
-    const id = toTrimmedString(raw.id, `tag-${index + 1}`) || `tag-${index + 1}`;
-    if (idSet.has(id)) return;
-    idSet.add(id);
-    
-    const name = toTrimmedString(raw.name, `标签-${index + 1}`) || `标签-${index + 1}`;
-    const connectionIds = sanitizeStringArray(raw.connectionIds, 256);
-    
-    result.push({ id, name, connectionIds });
-  });
-
-  return result;
-};
-
 const isLegacyDefaultAppearance = (appearance: Partial<{ opacity: number; blur: number }> | undefined): boolean => {
   if (!appearance) {
     return true;
@@ -399,7 +325,6 @@ export interface GlobalProxyConfig extends ProxyConfig {
 
 interface AppState {
   connections: SavedConnection[];
-  connectionTags: ConnectionTag[];
   tabs: TabData[];
   activeTabId: string | null;
   activeContext: { connectionId: string; dbName: string } | null;
@@ -412,7 +337,6 @@ interface AppState {
   globalProxy: GlobalProxyConfig;
   sqlFormatOptions: { keywordCase: 'upper' | 'lower' };
   queryOptions: QueryOptions;
-  shortcutOptions: ShortcutOptions;
   sqlLogs: SqlLog[];
   tableAccessCount: Record<string, number>;
   tableSortPreference: Record<string, 'name' | 'frequency'>;
@@ -421,12 +345,6 @@ interface AppState {
   updateConnection: (conn: SavedConnection) => void;
   removeConnection: (id: string) => void;
 
-  addConnectionTag: (tag: ConnectionTag) => void;
-  updateConnectionTag: (tag: ConnectionTag) => void;
-  removeConnectionTag: (id: string) => void;
-  moveConnectionToTag: (connectionId: string, targetTagId: string | null) => void;
-  reorderTags: (tagIds: string[]) => void;
-
   addTab: (tab: TabData) => void;
   closeTab: (id: string) => void;
   closeOtherTabs: (id: string) => void;
@@ -450,8 +368,6 @@ interface AppState {
   setGlobalProxy: (proxy: Partial<GlobalProxyConfig>) => void;
   setSqlFormatOptions: (options: { keywordCase: 'upper' | 'lower' }) => void;
   setQueryOptions: (options: Partial<QueryOptions>) => void;
-  updateShortcut: (action: ShortcutAction, binding: Partial<ShortcutBinding>) => void;
-  resetShortcutOptions: () => void;
 
   addSqlLog: (log: SqlLog) => void;
   clearSqlLogs: () => void;
@@ -580,7 +496,6 @@ export const useStore = create<AppState>()(
   persist(
     (set) => ({
       connections: [],
-      connectionTags: [],
       tabs: [],
       activeTabId: null,
       activeContext: null,
@@ -593,7 +508,6 @@ export const useStore = create<AppState>()(
       globalProxy: { ...DEFAULT_GLOBAL_PROXY },
       sqlFormatOptions: { keywordCase: 'upper' },
       queryOptions: { maxRows: 5000, showColumnComment: true, showColumnType: true },
-      shortcutOptions: cloneShortcutOptions(DEFAULT_SHORTCUT_OPTIONS),
       sqlLogs: [],
       tableAccessCount: {},
       tableSortPreference: {},
@@ -602,46 +516,7 @@ export const useStore = create<AppState>()(
       updateConnection: (conn) => set((state) => ({
           connections: state.connections.map(c => c.id === conn.id ? conn : c)
       })),
-      removeConnection: (id) => set((state) => ({ 
-          connections: state.connections.filter(c => c.id !== id),
-          connectionTags: state.connectionTags.map(tag => ({
-            ...tag,
-            connectionIds: tag.connectionIds.filter(cid => cid !== id)
-          }))
-      })),
-
-      addConnectionTag: (tag) => set((state) => ({ connectionTags: [...state.connectionTags, tag] })),
-      updateConnectionTag: (tag) => set((state) => ({
-          connectionTags: state.connectionTags.map(t => t.id === tag.id ? tag : t)
-      })),
-      removeConnectionTag: (id) => set((state) => ({ 
-          connectionTags: state.connectionTags.filter(t => t.id !== id) 
-      })),
-      moveConnectionToTag: (connectionId, targetTagId) => set((state) => {
-          const newTags = state.connectionTags.map(tag => {
-              //先从所有tag中移除该connection
-              const filteredIds = tag.connectionIds.filter(id => id !== connectionId);
-              if (tag.id === targetTagId) {
-                  return { ...tag, connectionIds: [...filteredIds, connectionId] };
-              }
-              return { ...tag, connectionIds: filteredIds };
-          });
-          return { connectionTags: newTags };
-      }),
-      reorderTags: (tagIds) => set((state) => {
-          const tagMap = new Map(state.connectionTags.map(t => [t.id, t]));
-          const newTags: ConnectionTag[] = [];
-          tagIds.forEach(id => {
-              const tag = tagMap.get(id);
-              if (tag) {
-                  newTags.push(tag);
-                  tagMap.delete(id);
-              }
-          });
-          // 追加未指定的tag（如果有的话）
-          newTags.push(...Array.from(tagMap.values()));
-          return { connectionTags: newTags };
-      }),
+      removeConnection: (id) => set((state) => ({ connections: state.connections.filter(c => c.id !== id) })),
 
       addTab: (tab) => set((state) => {
         const index = state.tabs.findIndex(t => t.id === tab.id);
@@ -765,16 +640,6 @@ export const useStore = create<AppState>()(
       setGlobalProxy: (proxy) => set((state) => ({ globalProxy: sanitizeGlobalProxy({ ...state.globalProxy, ...proxy }) })),
       setSqlFormatOptions: (options) => set({ sqlFormatOptions: options }),
       setQueryOptions: (options) => set((state) => ({ queryOptions: { ...state.queryOptions, ...options } })),
-      updateShortcut: (action, binding) => set((state) => ({
-        shortcutOptions: {
-          ...state.shortcutOptions,
-          [action]: {
-            ...state.shortcutOptions[action],
-            ...binding,
-          },
-        },
-      })),
-      resetShortcutOptions: () => set({ shortcutOptions: cloneShortcutOptions(DEFAULT_SHORTCUT_OPTIONS) }),
 
       addSqlLog: (log) => set((state) => ({ sqlLogs: [log, ...state.sqlLogs].slice(0, 1000) })), // Keep last 1000 logs
       clearSqlLogs: () => set({ sqlLogs: [] }),
@@ -807,11 +672,6 @@ export const useStore = create<AppState>()(
         const state = unwrapPersistedAppState(persistedState) as Partial<AppState>;
         const nextState: Partial<AppState> = { ...state };
         nextState.connections = sanitizeConnections(state.connections);
-        if (version < 5) {
-          nextState.connectionTags = sanitizeConnectionTags(state.connectionTags);
-        } else {
-          nextState.connectionTags = sanitizeConnectionTags(state.connectionTags);
-        }
         nextState.savedQueries = sanitizeSavedQueries(state.savedQueries);
         nextState.theme = sanitizeTheme(state.theme);
         nextState.appearance = sanitizeAppearance(state.appearance, version);
@@ -821,7 +681,6 @@ export const useStore = create<AppState>()(
         nextState.globalProxy = sanitizeGlobalProxy(state.globalProxy);
         nextState.sqlFormatOptions = sanitizeSqlFormatOptions(state.sqlFormatOptions);
         nextState.queryOptions = sanitizeQueryOptions(state.queryOptions);
-        nextState.shortcutOptions = sanitizeShortcutOptions(state.shortcutOptions);
         nextState.tableAccessCount = sanitizeTableAccessCount(state.tableAccessCount);
         nextState.tableSortPreference = sanitizeTableSortPreference(state.tableSortPreference);
         return nextState as AppState;
@@ -832,7 +691,6 @@ export const useStore = create<AppState>()(
           ...currentState,
           ...state,
           connections: sanitizeConnections(state.connections),
-          connectionTags: sanitizeConnectionTags(state.connectionTags),
           savedQueries: sanitizeSavedQueries(state.savedQueries),
           theme: sanitizeTheme(state.theme),
           appearance: sanitizeAppearance(state.appearance, PERSIST_VERSION),
@@ -842,14 +700,12 @@ export const useStore = create<AppState>()(
           globalProxy: sanitizeGlobalProxy(state.globalProxy),
           sqlFormatOptions: sanitizeSqlFormatOptions(state.sqlFormatOptions),
           queryOptions: sanitizeQueryOptions(state.queryOptions),
-          shortcutOptions: sanitizeShortcutOptions(state.shortcutOptions),
           tableAccessCount: sanitizeTableAccessCount(state.tableAccessCount),
           tableSortPreference: sanitizeTableSortPreference(state.tableSortPreference),
         };
       },
       partialize: (state) => ({
         connections: state.connections,
-        connectionTags: state.connectionTags,
         savedQueries: state.savedQueries,
         theme: state.theme,
         appearance: state.appearance,
@@ -859,7 +715,6 @@ export const useStore = create<AppState>()(
         globalProxy: state.globalProxy,
         sqlFormatOptions: state.sqlFormatOptions,
         queryOptions: state.queryOptions,
-        shortcutOptions: state.shortcutOptions,
         tableAccessCount: state.tableAccessCount,
         tableSortPreference: state.tableSortPreference
       }), // Don't persist logs

frontend/src/types.ts

@@ -14,13 +14,6 @@ export interface ProxyConfig {
   password?: string;
 }
 
-export interface HTTPTunnelConfig {
-  host: string;
-  port: number;
-  user?: string;
-  password?: string;
-}
-
 export interface ConnectionConfig {
   type: string;
   host: string;
@@ -29,16 +22,10 @@ export interface ConnectionConfig {
   password?: string;
   savePassword?: boolean;
   database?: string;
-  useSSL?: boolean;
-  sslMode?: 'preferred' | 'required' | 'skip-verify' | 'disable';
-  sslCertPath?: string;
-  sslKeyPath?: string;
   useSSH?: boolean;
   ssh?: SSHConfig;
   useProxy?: boolean;
   proxy?: ProxyConfig;
-  useHttpTunnel?: boolean;
-  httpTunnel?: HTTPTunnelConfig;
   driver?: string;
   dsn?: string;
   timeout?: number;
@@ -74,12 +61,6 @@ export interface SavedConnection {
   includeRedisDatabases?: number[]; // Redis databases to show (0-15)
 }
 
-export interface ConnectionTag {
-  id: string;
-  name: string;
-  connectionIds: string[];
-}
-
 export interface ColumnDefinition {
   name: string;
   type: string;

frontend/src/utils/shortcuts.ts

@@ -1,258 +0,0 @@
-import type { KeyboardEvent as ReactKeyboardEvent } from 'react';
-
-export type ShortcutAction =
-  | 'runQuery'
-  | 'focusSidebarSearch'
-  | 'newQueryTab'
-  | 'toggleLogPanel'
-  | 'toggleTheme'
-  | 'openShortcutManager';
-
-export interface ShortcutBinding {
-  combo: string;
-  enabled: boolean;
-}
-
-export type ShortcutOptions = Record<ShortcutAction, ShortcutBinding>;
-
-export interface ShortcutActionMeta {
-  label: string;
-  description: string;
-  allowInEditable?: boolean;
-}
-
-const MODIFIER_ORDER = ['Ctrl', 'Meta', 'Alt', 'Shift'] as const;
-const MODIFIER_SET = new Set(MODIFIER_ORDER);
-
-const KEY_ALIASES: Record<string, string> = {
-  control: 'Ctrl',
-  ctrl: 'Ctrl',
-  command: 'Meta',
-  cmd: 'Meta',
-  meta: 'Meta',
-  option: 'Alt',
-  alt: 'Alt',
-  shift: 'Shift',
-  escape: 'Esc',
-  esc: 'Esc',
-  return: 'Enter',
-  enter: 'Enter',
-  tab: 'Tab',
-  space: 'Space',
-  ' ': 'Space',
-  backspace: 'Backspace',
-  delete: 'Delete',
-  del: 'Delete',
-  arrowup: 'Up',
-  up: 'Up',
-  arrowdown: 'Down',
-  down: 'Down',
-  arrowleft: 'Left',
-  left: 'Left',
-  arrowright: 'Right',
-  right: 'Right',
-  pagedown: 'PageDown',
-  pageup: 'PageUp',
-  home: 'Home',
-  end: 'End',
-  insert: 'Insert',
-  ',': ',',
-  '.': '.',
-  '/': '/',
-  ';': ';',
-  "'": "'",
-  '[': '[',
-  ']': ']',
-  '\\': '\\',
-  '-': '-',
-  '=': '=',
-  '`': '`',
-};
-
-export const SHORTCUT_ACTION_ORDER: ShortcutAction[] = [
-  'runQuery',
-  'focusSidebarSearch',
-  'newQueryTab',
-  'toggleLogPanel',
-  'toggleTheme',
-  'openShortcutManager',
-];
-
-export const SHORTCUT_ACTION_META: Record<ShortcutAction, ShortcutActionMeta> = {
-  runQuery: {
-    label: '执行 SQL',
-    description: '在当前查询页执行 SQL',
-  },
-  focusSidebarSearch: {
-    label: '聚焦侧边栏搜索',
-    description: '定位到左侧连接树搜索框',
-    allowInEditable: true,
-  },
-  newQueryTab: {
-    label: '新建查询页',
-    description: '创建一个新的 SQL 查询标签页',
-  },
-  toggleLogPanel: {
-    label: '切换日志面板',
-    description: '打开或关闭 SQL 执行日志面板',
-  },
-  toggleTheme: {
-    label: '切换主题',
-    description: '在亮色和暗色主题之间切换',
-  },
-  openShortcutManager: {
-    label: '打开快捷键管理',
-    description: '打开快捷键设置面板',
-    allowInEditable: true,
-  },
-};
-
-export const DEFAULT_SHORTCUT_OPTIONS: ShortcutOptions = {
-  runQuery: { combo: 'Ctrl+Shift+R', enabled: true },
-  focusSidebarSearch: { combo: 'Ctrl+F', enabled: true },
-  newQueryTab: { combo: 'Ctrl+Shift+N', enabled: true },
-  toggleLogPanel: { combo: 'Ctrl+Shift+L', enabled: true },
-  toggleTheme: { combo: 'Ctrl+Shift+D', enabled: true },
-  openShortcutManager: { combo: 'Ctrl+,', enabled: true },
-};
-
-const normalizeKeyToken = (value: string): string => {
-  const token = String(value || '').trim();
-  if (!token) return '';
-  const alias = KEY_ALIASES[token.toLowerCase()];
-  if (alias) return alias;
-  if (/^f([1-9]|1[0-2])$/i.test(token)) {
-    return token.toUpperCase();
-  }
-  if (token.length === 1) {
-    return token === '+' ? '+' : token.toUpperCase();
-  }
-  return token.length > 1 ? token[0].toUpperCase() + token.slice(1).toLowerCase() : token;
-};
-
-export const normalizeShortcutCombo = (combo: string): string => {
-  const raw = String(combo || '').trim();
-  if (!raw) return '';
-
-  const pieces = raw
-    .split('+')
-    .map(part => part.trim())
-    .filter(Boolean);
-
-  const modifiers: string[] = [];
-  let key = '';
-
-  pieces.forEach((part) => {
-    const normalized = normalizeKeyToken(part);
-    if (!normalized) return;
-    if (MODIFIER_SET.has(normalized as typeof MODIFIER_ORDER[number])) {
-      if (!modifiers.includes(normalized)) {
-        modifiers.push(normalized);
-      }
-      return;
-    }
-    key = normalized;
-  });
-
-  modifiers.sort((a, b) => MODIFIER_ORDER.indexOf(a as typeof MODIFIER_ORDER[number]) - MODIFIER_ORDER.indexOf(b as typeof MODIFIER_ORDER[number]));
-  if (!key) {
-    return modifiers.join('+');
-  }
-  return [...modifiers, key].join('+');
-};
-
-const normalizeKeyboardKey = (key: string): string => {
-  const token = String(key || '').trim();
-  if (!token) return '';
-  const alias = KEY_ALIASES[token.toLowerCase()];
-  if (alias) return alias;
-  if (token.length === 1) {
-    if (token === ' ') return 'Space';
-    return token.toUpperCase();
-  }
-  if (/^f([1-9]|1[0-2])$/i.test(token)) {
-    return token.toUpperCase();
-  }
-  return token.length > 1 ? token[0].toUpperCase() + token.slice(1) : token;
-};
-
-export const eventToShortcut = (event: KeyboardEvent | ReactKeyboardEvent): string => {
-  const key = normalizeKeyboardKey(event.key);
-  if (!key || MODIFIER_SET.has(key as typeof MODIFIER_ORDER[number])) {
-    return '';
-  }
-
-  const modifiers: string[] = [];
-  if (event.ctrlKey) modifiers.push('Ctrl');
-  if (event.metaKey) modifiers.push('Meta');
-  if (event.altKey) modifiers.push('Alt');
-  if (event.shiftKey) modifiers.push('Shift');
-
-  return normalizeShortcutCombo([...modifiers, key].join('+'));
-};
-
-export const isShortcutMatch = (event: KeyboardEvent | ReactKeyboardEvent, combo: string): boolean => {
-  const expected = normalizeShortcutCombo(combo);
-  if (!expected) return false;
-  const actual = eventToShortcut(event);
-  return actual === expected;
-};
-
-export const hasModifierKey = (combo: string): boolean => {
-  const normalized = normalizeShortcutCombo(combo);
-  if (!normalized) return false;
-  return normalized.split('+').some(part => MODIFIER_SET.has(part as typeof MODIFIER_ORDER[number]));
-};
-
-export const cloneShortcutOptions = (value: ShortcutOptions): ShortcutOptions => {
-  return SHORTCUT_ACTION_ORDER.reduce((acc, action) => {
-    acc[action] = {
-      combo: normalizeShortcutCombo(value[action]?.combo || DEFAULT_SHORTCUT_OPTIONS[action].combo),
-      enabled: value[action]?.enabled !== false,
-    };
-    return acc;
-  }, {} as ShortcutOptions);
-};
-
-export const sanitizeShortcutOptions = (value: unknown): ShortcutOptions => {
-  const raw = (value && typeof value === 'object') ? value as Record<string, unknown> : {};
-  const defaults = cloneShortcutOptions(DEFAULT_SHORTCUT_OPTIONS);
-
-  SHORTCUT_ACTION_ORDER.forEach((action) => {
-    const actionRaw = raw[action];
-    if (!actionRaw || typeof actionRaw !== 'object') {
-      return;
-    }
-    const binding = actionRaw as Record<string, unknown>;
-    const combo = normalizeShortcutCombo(String(binding.combo || defaults[action].combo));
-    defaults[action] = {
-      combo: combo || defaults[action].combo,
-      enabled: binding.enabled === false ? false : true,
-    };
-  });
-
-  return defaults;
-};
-
-export const isEditableElement = (target: EventTarget | null): boolean => {
-  if (!(target instanceof HTMLElement)) {
-    return false;
-  }
-  const tag = target.tagName.toLowerCase();
-  if (target.isContentEditable) {
-    return true;
-  }
-  if (tag === 'input' || tag === 'textarea' || tag === 'select') {
-    return true;
-  }
-  if (target.closest('.monaco-editor, .monaco-inputbox, .ant-select, .ant-picker, .ant-input')) {
-    return true;
-  }
-  return false;
-};
-
-export const getShortcutDisplay = (combo: string): string => {
-  const normalized = normalizeShortcutCombo(combo);
-  return normalized || '-';
-};
-

frontend/src/utils/sql.ts

@@ -1,7 +1,6 @@
 export type FilterCondition = {
   id?: number;
   enabled?: boolean;
-  logic?: 'AND' | 'OR';
   column?: string;
   op?: string;
   value?: string;
@@ -143,12 +142,8 @@ export const parseListValues = (val: string) => {
     .filter(Boolean);
 };
 
-const normalizeConditionLogic = (logic: unknown): 'AND' | 'OR' => {
-  return String(logic || '').trim().toUpperCase() === 'OR' ? 'OR' : 'AND';
-};
-
 export const buildWhereSQL = (dbType: string, conditions: FilterCondition[]) => {
-  const whereParts: Array<{ expr: string; logic: 'AND' | 'OR' }> = [];
+  const whereParts: string[] = [];
 
   (conditions || []).forEach((cond) => {
     if (cond?.enabled === false) return;
@@ -157,17 +152,10 @@ export const buildWhereSQL = (dbType: string, conditions: FilterCondition[]) =>
     const column = (cond?.column || '').trim();
     const value = (cond?.value ?? '').toString();
     const value2 = (cond?.value2 ?? '').toString();
-    const logic = normalizeConditionLogic(cond?.logic);
-
-    const appendWherePart = (expr: string) => {
-      const normalizedExpr = String(expr || '').trim();
-      if (!normalizedExpr) return;
-      whereParts.push({ expr: normalizedExpr, logic });
-    };
 
     if (op === 'CUSTOM') {
       const expr = value.trim();
-      if (expr) appendWherePart(`(${expr})`);
+      if (expr) whereParts.push(`(${expr})`);
       return;
     }
 
@@ -177,80 +165,80 @@ export const buildWhereSQL = (dbType: string, conditions: FilterCondition[]) =>
 
     switch (op) {
       case 'IS_NULL':
-        appendWherePart(`${col} IS NULL`);
+        whereParts.push(`${col} IS NULL`);
         return;
       case 'IS_NOT_NULL':
-        appendWherePart(`${col} IS NOT NULL`);
+        whereParts.push(`${col} IS NOT NULL`);
         return;
       case 'IS_EMPTY':
         // 兼容：空值通常理解为 NULL 或空字符串
-        appendWherePart(`(${col} IS NULL OR ${col} = '')`);
+        whereParts.push(`(${col} IS NULL OR ${col} = '')`);
         return;
       case 'IS_NOT_EMPTY':
-        appendWherePart(`(${col} IS NOT NULL AND ${col} <> '')`);
+        whereParts.push(`(${col} IS NOT NULL AND ${col} <> '')`);
         return;
       case 'BETWEEN': {
         const v1 = value.trim();
         const v2 = value2.trim();
         if (!v1 || !v2) return;
-        appendWherePart(`${col} BETWEEN '${escapeLiteral(v1)}' AND '${escapeLiteral(v2)}'`);
+        whereParts.push(`${col} BETWEEN '${escapeLiteral(v1)}' AND '${escapeLiteral(v2)}'`);
         return;
       }
       case 'NOT_BETWEEN': {
         const v1 = value.trim();
         const v2 = value2.trim();
         if (!v1 || !v2) return;
-        appendWherePart(`${col} NOT BETWEEN '${escapeLiteral(v1)}' AND '${escapeLiteral(v2)}'`);
+        whereParts.push(`${col} NOT BETWEEN '${escapeLiteral(v1)}' AND '${escapeLiteral(v2)}'`);
         return;
       }
       case 'IN': {
         const items = parseListValues(value);
         if (items.length === 0) return;
         const list = items.map(v => `'${escapeLiteral(v)}'`).join(', ');
-        appendWherePart(`${col} IN (${list})`);
+        whereParts.push(`${col} IN (${list})`);
         return;
       }
       case 'NOT_IN': {
         const items = parseListValues(value);
         if (items.length === 0) return;
         const list = items.map(v => `'${escapeLiteral(v)}'`).join(', ');
-        appendWherePart(`${col} NOT IN (${list})`);
+        whereParts.push(`${col} NOT IN (${list})`);
         return;
       }
       case 'CONTAINS': {
         const v = value.trim();
         if (!v) return;
-        appendWherePart(`${col} LIKE '%${escapeLiteral(v)}%'`);
+        whereParts.push(`${col} LIKE '%${escapeLiteral(v)}%'`);
         return;
       }
       case 'NOT_CONTAINS': {
         const v = value.trim();
         if (!v) return;
-        appendWherePart(`${col} NOT LIKE '%${escapeLiteral(v)}%'`);
+        whereParts.push(`${col} NOT LIKE '%${escapeLiteral(v)}%'`);
         return;
       }
       case 'STARTS_WITH': {
         const v = value.trim();
         if (!v) return;
-        appendWherePart(`${col} LIKE '${escapeLiteral(v)}%'`);
+        whereParts.push(`${col} LIKE '${escapeLiteral(v)}%'`);
         return;
       }
       case 'NOT_STARTS_WITH': {
         const v = value.trim();
         if (!v) return;
-        appendWherePart(`${col} NOT LIKE '${escapeLiteral(v)}%'`);
+        whereParts.push(`${col} NOT LIKE '${escapeLiteral(v)}%'`);
         return;
       }
       case 'ENDS_WITH': {
         const v = value.trim();
         if (!v) return;
-        appendWherePart(`${col} LIKE '%${escapeLiteral(v)}'`);
+        whereParts.push(`${col} LIKE '%${escapeLiteral(v)}'`);
         return;
       }
       case 'NOT_ENDS_WITH': {
         const v = value.trim();
         if (!v) return;
-        appendWherePart(`${col} NOT LIKE '%${escapeLiteral(v)}'`);
+        whereParts.push(`${col} NOT LIKE '%${escapeLiteral(v)}'`);
         return;
       }
       case '=':
@@ -261,7 +249,7 @@ export const buildWhereSQL = (dbType: string, conditions: FilterCondition[]) =>
       case '>=': {
         const v = value.trim();
         if (!v) return;
-        appendWherePart(`${col} ${op} '${escapeLiteral(v)}'`);
+        whereParts.push(`${col} ${op} '${escapeLiteral(v)}'`);
         return;
       }
       default: {
@@ -269,23 +257,16 @@ export const buildWhereSQL = (dbType: string, conditions: FilterCondition[]) =>
         if (op.toUpperCase() === 'LIKE') {
           const v = value.trim();
           if (!v) return;
-          appendWherePart(`${col} LIKE '%${escapeLiteral(v)}%'`);
+          whereParts.push(`${col} LIKE '%${escapeLiteral(v)}%'`);
           return;
         }
 
         const v = value.trim();
         if (!v) return;
-        appendWherePart(`${col} ${op} '${escapeLiteral(v)}'`);
+        whereParts.push(`${col} ${op} '${escapeLiteral(v)}'`);
       }
     }
   });
 
-  if (whereParts.length === 0) return '';
-
-  let whereExpr = `(${whereParts[0].expr})`;
-  for (let i = 1; i < whereParts.length; i++) {
-    const part = whereParts[i];
-    whereExpr = `(${whereExpr} ${part.logic} (${part.expr}))`;
-  }
-  return `WHERE ${whereExpr}`;
+  return whereParts.length > 0 ? `WHERE ${whereParts.join(' AND ')}` : '';
 };

frontend/wailsjs/go/app/App.d.ts

@@ -1,20 +1,15 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 import {connection} from '../models';
-import {time} from '../models';
 import {sync} from '../models';
 import {redis} from '../models';
 
 export function ApplyChanges(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:connection.ChangeSet):Promise<connection.QueryResult>;
 
-export function CancelQuery(arg1:string):Promise<connection.QueryResult>;
-
 export function CheckDriverNetworkStatus():Promise<connection.QueryResult>;
 
 export function CheckForUpdates():Promise<connection.QueryResult>;
 
-export function CleanupStaleQueries(arg1:time.Duration):Promise<void>;
-
 export function ConfigureDriverRuntimeDirectory(arg1:string):Promise<connection.QueryResult>;
 
 export function ConfigureGlobalProxy(arg1:boolean,arg2:connection.ProxyConfig):Promise<connection.QueryResult>;
@@ -41,8 +36,6 @@ export function DBQuery(arg1:connection.ConnectionConfig,arg2:string,arg3:string
 
 export function DBQueryIsolated(arg1:connection.ConnectionConfig,arg2:string,arg3:string):Promise<connection.QueryResult>;
 
-export function DBQueryWithCancel(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:string):Promise<connection.QueryResult>;
-
 export function DBShowCreateTable(arg1:connection.ConnectionConfig,arg2:string,arg3:string):Promise<connection.QueryResult>;
 
 export function DataSync(arg1:sync.SyncConfig):Promise<sync.SyncResult>;
@@ -75,8 +68,6 @@ export function ExportTablesDataSQL(arg1:connection.ConnectionConfig,arg2:string
 
 export function ExportTablesSQL(arg1:connection.ConnectionConfig,arg2:string,arg3:Array<string>,arg4:boolean):Promise<connection.QueryResult>;
 
-export function GenerateQueryID():Promise<string>;
-
 export function GetAppInfo():Promise<connection.QueryResult>;
 
 export function GetDriverStatusList(arg1:string,arg2:string):Promise<connection.QueryResult>;

frontend/wailsjs/go/app/App.js

@@ -6,10 +6,6 @@ export function ApplyChanges(arg1, arg2, arg3, arg4) {
   return window['go']['app']['App']['ApplyChanges'](arg1, arg2, arg3, arg4);
 }
 
-export function CancelQuery(arg1) {
-  return window['go']['app']['App']['CancelQuery'](arg1);
-}
-
 export function CheckDriverNetworkStatus() {
   return window['go']['app']['App']['CheckDriverNetworkStatus']();
 }
@@ -18,10 +14,6 @@ export function CheckForUpdates() {
   return window['go']['app']['App']['CheckForUpdates']();
 }
 
-export function CleanupStaleQueries(arg1) {
-  return window['go']['app']['App']['CleanupStaleQueries'](arg1);
-}
-
 export function ConfigureDriverRuntimeDirectory(arg1) {
   return window['go']['app']['App']['ConfigureDriverRuntimeDirectory'](arg1);
 }
@@ -74,10 +66,6 @@ export function DBQueryIsolated(arg1, arg2, arg3) {
   return window['go']['app']['App']['DBQueryIsolated'](arg1, arg2, arg3);
 }
 
-export function DBQueryWithCancel(arg1, arg2, arg3, arg4) {
-  return window['go']['app']['App']['DBQueryWithCancel'](arg1, arg2, arg3, arg4);
-}
-
 export function DBShowCreateTable(arg1, arg2, arg3) {
   return window['go']['app']['App']['DBShowCreateTable'](arg1, arg2, arg3);
 }
@@ -142,10 +130,6 @@ export function ExportTablesSQL(arg1, arg2, arg3, arg4) {
   return window['go']['app']['App']['ExportTablesSQL'](arg1, arg2, arg3, arg4);
 }
 
-export function GenerateQueryID() {
-  return window['go']['app']['App']['GenerateQueryID']();
-}
-
 export function GetAppInfo() {
   return window['go']['app']['App']['GetAppInfo']();
 }

frontend/wailsjs/go/models.ts

@@ -48,24 +48,6 @@ export namespace connection {
 		    return a;
 		}
 	}
-	export class HTTPTunnelConfig {
-	    host: string;
-	    port: number;
-	    user?: string;
-	    password?: string;
-	
-	    static createFrom(source: any = {}) {
-	        return new HTTPTunnelConfig(source);
-	    }
-	
-	    constructor(source: any = {}) {
-	        if ('string' === typeof source) source = JSON.parse(source);
-	        this.host = source["host"];
-	        this.port = source["port"];
-	        this.user = source["user"];
-	        this.password = source["password"];
-	    }
-	}
 	export class ProxyConfig {
 	    type: string;
 	    host: string;
@@ -114,16 +96,10 @@ export namespace connection {
 	    password: string;
 	    savePassword?: boolean;
 	    database: string;
-	    useSSL?: boolean;
-	    sslMode?: string;
-	    sslCertPath?: string;
-	    sslKeyPath?: string;
 	    useSSH: boolean;
 	    ssh: SSHConfig;
 	    useProxy?: boolean;
 	    proxy?: ProxyConfig;
-	    useHttpTunnel?: boolean;
-	    httpTunnel?: HTTPTunnelConfig;
 	    driver?: string;
 	    dsn?: string;
 	    timeout?: number;
@@ -154,16 +130,10 @@ export namespace connection {
 	        this.password = source["password"];
 	        this.savePassword = source["savePassword"];
 	        this.database = source["database"];
-	        this.useSSL = source["useSSL"];
-	        this.sslMode = source["sslMode"];
-	        this.sslCertPath = source["sslCertPath"];
-	        this.sslKeyPath = source["sslKeyPath"];
 	        this.useSSH = source["useSSH"];
 	        this.ssh = this.convertValues(source["ssh"], SSHConfig);
 	        this.useProxy = source["useProxy"];
 	        this.proxy = this.convertValues(source["proxy"], ProxyConfig);
-	        this.useHttpTunnel = source["useHttpTunnel"];
-	        this.httpTunnel = this.convertValues(source["httpTunnel"], HTTPTunnelConfig);
 	        this.driver = source["driver"];
 	        this.dsn = source["dsn"];
 	        this.timeout = source["timeout"];
@@ -201,13 +171,11 @@ export namespace connection {
 		}
 	}
 	
-	
 	export class QueryResult {
 	    success: boolean;
 	    message: string;
 	    data: any;
 	    fields?: string[];
-	    queryId?: string;
 	
 	    static createFrom(source: any = {}) {
 	        return new QueryResult(source);
@@ -219,7 +187,6 @@ export namespace connection {
 	        this.message = source["message"];
 	        this.data = source["data"];
 	        this.fields = source["fields"];
-	        this.queryId = source["queryId"];
 	    }
 	}
 	

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.43.0
 	github.com/duckdb/duckdb-go/v2 v2.5.5
 	github.com/go-sql-driver/mysql v1.9.3
-	github.com/google/uuid v1.6.0
 	github.com/highgo/pq-sm3 v0.0.0
 	github.com/lib/pq v1.11.1
 	github.com/microsoft/go-mssqldb v1.9.6
@@ -17,7 +16,6 @@ require (
 	github.com/taosdata/driver-go/v3 v3.7.8
 	github.com/wailsapp/wails/v2 v2.11.0
 	github.com/xuri/excelize/v2 v2.10.0
-	go.mongodb.org/mongo-driver v1.17.9
 	go.mongodb.org/mongo-driver/v2 v2.5.0
 	golang.org/x/crypto v0.47.0
 	golang.org/x/mod v0.32.0
@@ -51,6 +49,7 @@ require (
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/flatbuffers v25.12.19+incompatible // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/hashicorp/go-version v1.8.0 // indirect
 	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
@@ -67,7 +66,6 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/ncruces/go-strftime v1.0.0 // indirect
 	github.com/paulmach/orb v0.12.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.25 // indirect

go.sum

@@ -156,8 +156,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
-github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
-github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
 github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
@@ -250,8 +248,6 @@ github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN
 github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs=
 github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s=
 go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g=
-go.mongodb.org/mongo-driver v1.17.9 h1:IexDdCuuNJ3BHrELgBlyaH9p60JXAvdzWR128q+U5tU=
-go.mongodb.org/mongo-driver v1.17.9/go.mod h1:LlOhpH5NUEfhxcAwG0UEkMqwYcc4JU18gtCdGudk/tQ=
 go.mongodb.org/mongo-driver/v2 v2.5.0 h1:yXUhImUjjAInNcpTcAlPHiT7bIXhshCTL3jVBkF3xaE=
 go.mongodb.org/mongo-driver/v2 v2.5.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0=
 go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=

internal/app/app.go

@@ -16,7 +16,6 @@ import (
 	"GoNavi-Wails/internal/db"
 	"GoNavi-Wails/internal/logger"
 	proxytunnel "GoNavi-Wails/internal/proxy"
-	"github.com/google/uuid"
 )
 
 const dbCachePingInterval = 30 * time.Second
@@ -26,27 +25,19 @@ type cachedDatabase struct {
 	lastPing time.Time
 }
 
-type queryContext struct {
-	cancel  context.CancelFunc
-	started time.Time
-}
-
 // App struct
 type App struct {
-	ctx            context.Context
-	dbCache        map[string]cachedDatabase // Cache for DB connections
-	mu             sync.RWMutex              // Mutex for cache access
-	updateMu       sync.Mutex
-	updateState    updateState
-	queryMu        sync.RWMutex
-	runningQueries map[string]queryContext // queryID -> cancelFunc and start time
+	ctx         context.Context
+	dbCache     map[string]cachedDatabase // Cache for DB connections
+	mu          sync.RWMutex              // Mutex for cache access
+	updateMu    sync.Mutex
+	updateState updateState
 }
 
 // NewApp creates a new App application struct
 func NewApp() *App {
 	return &App{
-		dbCache:        make(map[string]cachedDatabase),
-		runningQueries: make(map[string]queryContext),
+		dbCache: make(map[string]cachedDatabase),
 	}
 }
 
@@ -96,9 +87,6 @@ func normalizeCacheKeyConfig(config connection.ConnectionConfig) connection.Conn
 	if !normalized.UseProxy {
 		normalized.Proxy = connection.ProxyConfig{}
 	}
-	if !normalized.UseHTTPTunnel {
-		normalized.HTTPTunnel = connection.HTTPTunnelConfig{}
-	}
 
 	if isFileDatabaseType(normalized.Type) {
 		dsn := strings.TrimSpace(normalized.Host)
@@ -127,8 +115,6 @@ func normalizeCacheKeyConfig(config connection.ConnectionConfig) connection.Conn
 		normalized.MongoAuthMechanism = ""
 		normalized.MongoReplicaUser = ""
 		normalized.MongoReplicaPassword = ""
-		normalized.UseHTTPTunnel = false
-		normalized.HTTPTunnel = connection.HTTPTunnelConfig{}
 	}
 
 	return normalized
@@ -153,67 +139,6 @@ func getCacheKey(config connection.ConnectionConfig) string {
 	return hex.EncodeToString(sum[:])
 }
 
-func shortCacheKey(cacheKey string) string {
-	shortKey := cacheKey
-	if len(shortKey) > 12 {
-		shortKey = shortKey[:12]
-	}
-	return shortKey
-}
-
-func shouldRefreshCachedConnection(err error) bool {
-	if err == nil {
-		return false
-	}
-	normalized := strings.ToLower(normalizeErrorMessage(err))
-	if normalized == "" {
-		return false
-	}
-
-	patterns := []string{
-		"invalid connection",
-		"bad connection",
-		"database is closed",
-		"connection is already closed",
-		"use of closed network connection",
-		"broken pipe",
-		"connection reset by peer",
-		"server has gone away",
-		"eof",
-	}
-	for _, pattern := range patterns {
-		if strings.Contains(normalized, pattern) {
-			return true
-		}
-	}
-	return false
-}
-
-func (a *App) invalidateCachedDatabase(config connection.ConnectionConfig, reason error) bool {
-	effectiveConfig := applyGlobalProxyToConnection(config)
-	key := getCacheKey(effectiveConfig)
-	shortKey := shortCacheKey(key)
-
-	a.mu.Lock()
-	defer a.mu.Unlock()
-
-	entry, exists := a.dbCache[key]
-	if !exists || entry.inst == nil {
-		return false
-	}
-
-	if closeErr := entry.inst.Close(); closeErr != nil {
-		logger.Error(closeErr, "关闭失效缓存连接失败：缓存Key=%s", shortKey)
-	}
-	delete(a.dbCache, key)
-	if reason != nil {
-		logger.Errorf("检测到连接失效，已清理缓存连接：%s 缓存Key=%s 原因=%s", formatConnSummary(effectiveConfig), shortKey, normalizeErrorMessage(reason))
-	} else {
-		logger.Infof("已清理缓存连接：%s 缓存Key=%s", formatConnSummary(effectiveConfig), shortKey)
-	}
-	return true
-}
-
 func wrapConnectError(config connection.ConnectionConfig, err error) error {
 	if err == nil {
 		return nil
@@ -308,12 +233,6 @@ func formatConnSummary(config connection.ConnectionConfig) string {
 			b.WriteString(" 代理认证=已配置")
 		}
 	}
-	if config.UseHTTPTunnel {
-		b.WriteString(fmt.Sprintf(" HTTP隧道=%s:%d", strings.TrimSpace(config.HTTPTunnel.Host), config.HTTPTunnel.Port))
-		if strings.TrimSpace(config.HTTPTunnel.User) != "" {
-			b.WriteString(" HTTP隧道认证=已配置")
-		}
-	}
 
 	if config.Type == "custom" {
 		driver := strings.TrimSpace(config.Driver)
@@ -489,43 +408,3 @@ func (a *App) getDatabaseWithPing(config connection.ConnectionConfig, forcePing
 	logger.Infof("数据库连接成功并写入缓存：%s 缓存Key=%s", formatConnSummary(effectiveConfig), shortKey)
 	return dbInst, nil
 }
-
-// generateQueryID generates a unique ID for a query using UUID v4
-func generateQueryID() string {
-	return "query-" + uuid.New().String()
-}
-
-// CancelQuery cancels a running query by its ID
-func (a *App) CancelQuery(queryID string) connection.QueryResult {
-	a.queryMu.Lock()
-	defer a.queryMu.Unlock()
-
-	if ctx, exists := a.runningQueries[queryID]; exists {
-		ctx.cancel()
-		delete(a.runningQueries, queryID)
-		logger.Infof("查询已取消：queryID=%s", queryID)
-		return connection.QueryResult{Success: true, Message: "查询已取消"}
-	}
-	logger.Warnf("取消查询失败：queryID=%s 不存在或已完成", queryID)
-	return connection.QueryResult{Success: false, Message: "查询不存在或已完成"}
-}
-
-// CleanupStaleQueries removes queries older than maxAge
-func (a *App) CleanupStaleQueries(maxAge time.Duration) {
-	a.queryMu.Lock()
-	defer a.queryMu.Unlock()
-
-	now := time.Now()
-	for id, ctx := range a.runningQueries {
-		if now.Sub(ctx.started) > maxAge {
-			// Query likely finished or stuck, remove from tracking
-			delete(a.runningQueries, id)
-			// Query expired, silently remove
-		}
-	}
-}
-
-// GenerateQueryID generates a unique query ID for cancellation tracking
-func (a *App) GenerateQueryID() string {
-	return generateQueryID()
-}

internal/app/db_context.go

@@ -36,17 +36,6 @@ func normalizeSchemaAndTable(config connection.ConnectionConfig, dbName string,
 		return rawDB, rawTable
 	}
 
-	dbType := strings.ToLower(strings.TrimSpace(config.Type))
-	if dbType == "sqlserver" {
-		// SQL Server 的 DB 接口约定：第一个参数是数据库名，schema 由 tableName(如 dbo.users) 自行解析。
-		// 不能把 schema(dbo) 传到第一个参数，否则会拼出 dbo.sys.columns 等无效对象名。
-		targetDB := rawDB
-		if targetDB == "" {
-			targetDB = strings.TrimSpace(config.Database)
-		}
-		return targetDB, rawTable
-	}
-
 	if parts := strings.SplitN(rawTable, ".", 2); len(parts) == 2 {
 		schema := strings.TrimSpace(parts[0])
 		table := strings.TrimSpace(parts[1])
@@ -55,10 +44,13 @@ func normalizeSchemaAndTable(config connection.ConnectionConfig, dbName string,
 		}
 	}
 
-	switch dbType {
+	switch strings.ToLower(strings.TrimSpace(config.Type)) {
 	case "postgres", "kingbase", "highgo", "vastbase":
 		// PG/金仓/瀚高/海量：dbName 在 UI 里是"数据库"，schema 需从 tableName 或使用默认 public。
 		return "public", rawTable
+	case "sqlserver":
+		// SQL Server：dbName 表示数据库，schema 默认 dbo
+		return "dbo", rawTable
 	default:
 		// MySQL：dbName 表示数据库；Oracle/达梦：dbName 表示 schema/owner。
 		return rawDB, rawTable

internal/app/db_context_test.go

@@ -1,51 +0,0 @@
-package app
-
-import (
-	"testing"
-
-	"GoNavi-Wails/internal/connection"
-)
-
-func TestNormalizeSchemaAndTable_SQLServerKeepsDatabaseAndQualifiedTable(t *testing.T) {
-	t.Parallel()
-
-	schemaOrDb, table := normalizeSchemaAndTable(connection.ConnectionConfig{
-		Type:     "sqlserver",
-		Database: "master",
-	}, "biz_db", "dbo.users")
-
-	if schemaOrDb != "biz_db" {
-		t.Fatalf("expected sqlserver first return value as database name, got %q", schemaOrDb)
-	}
-	if table != "dbo.users" {
-		t.Fatalf("expected sqlserver table name keep qualified form, got %q", table)
-	}
-}
-
-func TestNormalizeSchemaAndTable_SQLServerFallbackToConfigDatabase(t *testing.T) {
-	t.Parallel()
-
-	schemaOrDb, table := normalizeSchemaAndTable(connection.ConnectionConfig{
-		Type:     "sqlserver",
-		Database: "biz_db",
-	}, "", "dbo.users")
-
-	if schemaOrDb != "biz_db" {
-		t.Fatalf("expected sqlserver fallback database from config, got %q", schemaOrDb)
-	}
-	if table != "dbo.users" {
-		t.Fatalf("expected sqlserver table name keep qualified form, got %q", table)
-	}
-}
-
-func TestNormalizeSchemaAndTable_PostgresStillSplitsQualifiedName(t *testing.T) {
-	t.Parallel()
-
-	schema, table := normalizeSchemaAndTable(connection.ConnectionConfig{
-		Type: "postgres",
-	}, "demo_db", "public.orders")
-
-	if schema != "public" || table != "orders" {
-		t.Fatalf("expected postgres qualified split to public.orders, got %q.%q", schema, table)
-	}
-}

internal/app/db_proxy.go

@@ -12,35 +12,8 @@ import (
 
 func resolveDialConfigWithProxy(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
 	config := raw
-	if config.UseHTTPTunnel {
-		if config.UseProxy {
-			return connection.ConnectionConfig{}, fmt.Errorf("HTTP 隧道与普通代理不能同时启用")
-		}
-		tunnelHost := strings.TrimSpace(config.HTTPTunnel.Host)
-		if tunnelHost == "" {
-			return connection.ConnectionConfig{}, fmt.Errorf("HTTP 隧道主机不能为空")
-		}
-		tunnelPort := config.HTTPTunnel.Port
-		if tunnelPort <= 0 {
-			tunnelPort = 8080
-		}
-		if tunnelPort > 65535 {
-			return connection.ConnectionConfig{}, fmt.Errorf("HTTP 隧道端口无效：%d", config.HTTPTunnel.Port)
-		}
-
-		config.UseProxy = true
-		config.Proxy = connection.ProxyConfig{
-			Type:     "http",
-			Host:     tunnelHost,
-			Port:     tunnelPort,
-			User:     strings.TrimSpace(config.HTTPTunnel.User),
-			Password: config.HTTPTunnel.Password,
-		}
-	}
 	if !config.UseProxy {
 		config.Proxy = connection.ProxyConfig{}
-		config.UseHTTPTunnel = false
-		config.HTTPTunnel = connection.HTTPTunnelConfig{}
 		return config, nil
 	}
 
@@ -49,8 +22,6 @@ func resolveDialConfigWithProxy(raw connection.ConnectionConfig) (connection.Con
 		return connection.ConnectionConfig{}, err
 	}
 	config.Proxy = normalizedProxy
-	config.UseHTTPTunnel = false
-	config.HTTPTunnel = connection.HTTPTunnelConfig{}
 
 	if config.UseSSH {
 		sshPort := config.SSH.Port

internal/app/global_proxy.go

@@ -110,7 +110,7 @@ func (a *App) GetGlobalProxyConfig() connection.QueryResult {
 
 func applyGlobalProxyToConnection(config connection.ConnectionConfig) connection.ConnectionConfig {
 	effective := config
-	if effective.UseProxy || effective.UseHTTPTunnel {
+	if effective.UseProxy {
 		return effective
 	}
 	if isFileDatabaseType(effective.Type) {

internal/app/methods_db.go

@@ -376,21 +376,12 @@ func (a *App) MySQLShowCreateTable(config connection.ConnectionConfig, dbName st
 }
 
 func (a *App) DBQuery(config connection.ConnectionConfig, dbName string, query string) connection.QueryResult {
-	return a.DBQueryWithCancel(config, dbName, query, "")
-}
-
-func (a *App) DBQueryWithCancel(config connection.ConnectionConfig, dbName string, query string, queryID string) connection.QueryResult {
 	runConfig := normalizeRunConfig(config, dbName)
 
-	// Generate query ID if not provided
-	if queryID == "" {
-		queryID = generateQueryID()
-	}
-
 	dbInst, err := a.getDatabase(runConfig)
 	if err != nil {
 		logger.Error(err, "DBQuery 获取连接失败：%s", formatConnSummary(runConfig))
-		return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
+		return connection.QueryResult{Success: false, Message: err.Error()}
 	}
 
 	query = sanitizeSQLForPgLike(runConfig.Type, query)
@@ -401,75 +392,41 @@ func (a *App) DBQueryWithCancel(config connection.ConnectionConfig, dbName strin
 	ctx, cancel := utils.ContextWithTimeout(time.Duration(timeoutSeconds) * time.Second)
 	defer cancel()
 
-	// Store cancel function for potential manual cancellation
-	a.queryMu.Lock()
-	a.runningQueries[queryID] = queryContext{
-		cancel:  cancel,
-		started: time.Now(),
+	lowerQuery := strings.TrimSpace(strings.ToLower(query))
+	isReadQuery := strings.HasPrefix(lowerQuery, "select") || strings.HasPrefix(lowerQuery, "show") || strings.HasPrefix(lowerQuery, "describe") || strings.HasPrefix(lowerQuery, "explain")
+	// MongoDB JSON 命令中的 find/count/aggregate 也属于读查询
+	if !isReadQuery && strings.ToLower(strings.TrimSpace(runConfig.Type)) == "mongodb" && strings.HasPrefix(strings.TrimSpace(query), "{") {
+		isReadQuery = true
 	}
-	a.queryMu.Unlock()
-
-	// Ensure query is removed from tracking when done
-	defer func() {
-		a.queryMu.Lock()
-		delete(a.runningQueries, queryID)
-		a.queryMu.Unlock()
-	}()
-
-	isReadQuery := isReadOnlySQLQuery(runConfig.Type, query)
-
-	runReadQuery := func(inst db.Database) ([]map[string]interface{}, []string, error) {
-		if q, ok := inst.(interface {
+	if isReadQuery {
+		var data []map[string]interface{}
+		var columns []string
+		if q, ok := dbInst.(interface {
 			QueryContext(context.Context, string) ([]map[string]interface{}, []string, error)
 		}); ok {
-			return q.QueryContext(ctx, query)
-		}
-		return inst.Query(query)
-	}
-
-	runExecQuery := func(inst db.Database) (int64, error) {
-		if e, ok := inst.(interface {
-			ExecContext(context.Context, string) (int64, error)
-		}); ok {
-			return e.ExecContext(ctx, query)
-		}
-		return inst.Exec(query)
-	}
-
-	if isReadQuery {
-		data, columns, err := runReadQuery(dbInst)
-		if err != nil && shouldRefreshCachedConnection(err) {
-			if a.invalidateCachedDatabase(runConfig, err) {
-				retryInst, retryErr := a.getDatabaseForcePing(runConfig)
-				if retryErr != nil {
-					logger.Error(retryErr, "DBQuery 重建连接失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
-					return connection.QueryResult{Success: false, Message: retryErr.Error()}
-				}
-				data, columns, err = runReadQuery(retryInst)
-			}
+			data, columns, err = q.QueryContext(ctx, query)
+		} else {
+			data, columns, err = dbInst.Query(query)
 		}
 		if err != nil {
 			logger.Error(err, "DBQuery 查询失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
-			return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
+			return connection.QueryResult{Success: false, Message: err.Error()}
 		}
-		return connection.QueryResult{Success: true, Data: data, Fields: columns, QueryID: queryID}
+		return connection.QueryResult{Success: true, Data: data, Fields: columns}
 	} else {
-		affected, err := runExecQuery(dbInst)
-		if err != nil && shouldRefreshCachedConnection(err) {
-			if a.invalidateCachedDatabase(runConfig, err) {
-				retryInst, retryErr := a.getDatabaseForcePing(runConfig)
-				if retryErr != nil {
-					logger.Error(retryErr, "DBQuery 重建连接失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
-					return connection.QueryResult{Success: false, Message: retryErr.Error()}
-				}
-				affected, err = runExecQuery(retryInst)
-			}
+		var affected int64
+		if e, ok := dbInst.(interface {
+			ExecContext(context.Context, string) (int64, error)
+		}); ok {
+			affected, err = e.ExecContext(ctx, query)
+		} else {
+			affected, err = dbInst.Exec(query)
 		}
 		if err != nil {
 			logger.Error(err, "DBQuery 执行失败：%s SQL片段=%q", formatConnSummary(runConfig), sqlSnippet(query))
-			return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
+			return connection.QueryResult{Success: false, Message: err.Error()}
 		}
-		return connection.QueryResult{Success: true, Data: map[string]int64{"affectedRows": affected}, QueryID: queryID}
+		return connection.QueryResult{Success: true, Data: map[string]int64{"affectedRows": affected}}
 	}
 }
 
@@ -495,7 +452,11 @@ func (a *App) DBQueryIsolated(config connection.ConnectionConfig, dbName string,
 	ctx, cancel := utils.ContextWithTimeout(time.Duration(timeoutSeconds) * time.Second)
 	defer cancel()
 
-	isReadQuery := isReadOnlySQLQuery(runConfig.Type, query)
+	lowerQuery := strings.TrimSpace(strings.ToLower(query))
+	isReadQuery := strings.HasPrefix(lowerQuery, "select") || strings.HasPrefix(lowerQuery, "show") || strings.HasPrefix(lowerQuery, "describe") || strings.HasPrefix(lowerQuery, "explain")
+	if !isReadQuery && strings.ToLower(strings.TrimSpace(runConfig.Type)) == "mongodb" && strings.HasPrefix(strings.TrimSpace(query), "{") {
+		isReadQuery = true
+	}
 
 	if isReadQuery {
 		var data []map[string]interface{}
@@ -538,38 +499,20 @@ func sqlSnippet(query string) string {
 	return q[:max] + "..."
 }
 
-func ensureNonNilSlice[T any](items []T) []T {
-	if items == nil {
-		return make([]T, 0)
-	}
-	return items
-}
-
 func (a *App) DBGetDatabases(config connection.ConnectionConfig) connection.QueryResult {
-	runConfig := normalizeRunConfig(config, "")
-	dbInst, err := a.getDatabase(runConfig)
+	dbInst, err := a.getDatabase(config)
 	if err != nil {
-		logger.Error(err, "DBGetDatabases 获取连接失败：%s", formatConnSummary(runConfig))
+		logger.Error(err, "DBGetDatabases 获取连接失败：%s", formatConnSummary(config))
 		return connection.QueryResult{Success: false, Message: err.Error()}
 	}
 
 	dbs, err := dbInst.GetDatabases()
-	if err != nil && shouldRefreshCachedConnection(err) {
-		if a.invalidateCachedDatabase(runConfig, err) {
-			retryInst, retryErr := a.getDatabaseForcePing(runConfig)
-			if retryErr != nil {
-				logger.Error(retryErr, "DBGetDatabases 重建连接失败：%s", formatConnSummary(runConfig))
-				return connection.QueryResult{Success: false, Message: retryErr.Error()}
-			}
-			dbs, err = retryInst.GetDatabases()
-		}
-	}
 	if err != nil {
-		logger.Error(err, "DBGetDatabases 获取数据库列表失败：%s", formatConnSummary(runConfig))
+		logger.Error(err, "DBGetDatabases 获取数据库列表失败：%s", formatConnSummary(config))
 		return connection.QueryResult{Success: false, Message: err.Error()}
 	}
 
-	resData := make([]map[string]string, 0, len(dbs))
+	var resData []map[string]string
 	for _, name := range dbs {
 		resData = append(resData, map[string]string{"Database": name})
 	}
@@ -587,22 +530,12 @@ func (a *App) DBGetTables(config connection.ConnectionConfig, dbName string) con
 	}
 
 	tables, err := dbInst.GetTables(dbName)
-	if err != nil && shouldRefreshCachedConnection(err) {
-		if a.invalidateCachedDatabase(runConfig, err) {
-			retryInst, retryErr := a.getDatabaseForcePing(runConfig)
-			if retryErr != nil {
-				logger.Error(retryErr, "DBGetTables 重建连接失败：%s", formatConnSummary(runConfig))
-				return connection.QueryResult{Success: false, Message: retryErr.Error()}
-			}
-			tables, err = retryInst.GetTables(dbName)
-		}
-	}
 	if err != nil {
 		logger.Error(err, "DBGetTables 获取表列表失败：%s", formatConnSummary(runConfig))
 		return connection.QueryResult{Success: false, Message: err.Error()}
 	}
 
-	resData := make([]map[string]string, 0, len(tables))
+	var resData []map[string]string
 	for _, name := range tables {
 		resData = append(resData, map[string]string{"Table": name})
 	}
@@ -784,7 +717,7 @@ func (a *App) DBGetColumns(config connection.ConnectionConfig, dbName string, ta
 		return connection.QueryResult{Success: false, Message: err.Error()}
 	}
 
-	return connection.QueryResult{Success: true, Data: ensureNonNilSlice(columns)}
+	return connection.QueryResult{Success: true, Data: columns}
 }
 
 func (a *App) DBGetIndexes(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
@@ -801,7 +734,7 @@ func (a *App) DBGetIndexes(config connection.ConnectionConfig, dbName string, ta
 		return connection.QueryResult{Success: false, Message: err.Error()}
 	}
 
-	return connection.QueryResult{Success: true, Data: ensureNonNilSlice(indexes)}
+	return connection.QueryResult{Success: true, Data: indexes}
 }
 
 func (a *App) DBGetForeignKeys(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
@@ -818,7 +751,7 @@ func (a *App) DBGetForeignKeys(config connection.ConnectionConfig, dbName string
 		return connection.QueryResult{Success: false, Message: err.Error()}
 	}
 
-	return connection.QueryResult{Success: true, Data: ensureNonNilSlice(fks)}
+	return connection.QueryResult{Success: true, Data: fks}
 }
 
 func (a *App) DBGetTriggers(config connection.ConnectionConfig, dbName string, tableName string) connection.QueryResult {
@@ -835,7 +768,7 @@ func (a *App) DBGetTriggers(config connection.ConnectionConfig, dbName string, t
 		return connection.QueryResult{Success: false, Message: err.Error()}
 	}
 
-	return connection.QueryResult{Success: true, Data: ensureNonNilSlice(triggers)}
+	return connection.QueryResult{Success: true, Data: triggers}
 }
 
 func (a *App) DropView(config connection.ConnectionConfig, dbName string, viewName string) connection.QueryResult {
@@ -973,5 +906,5 @@ func (a *App) DBGetAllColumns(config connection.ConnectionConfig, dbName string)
 		return connection.QueryResult{Success: false, Message: err.Error()}
 	}
 
-	return connection.QueryResult{Success: true, Data: ensureNonNilSlice(cols)}
+	return connection.QueryResult{Success: true, Data: cols}
 }

internal/app/methods_db_cancel_test.go

@@ -1,149 +0,0 @@
-package app
-
-import (
-	"context"
-	"strings"
-	"testing"
-	"time"
-
-	"GoNavi-Wails/internal/connection"
-)
-
-func TestGenerateQueryID(t *testing.T) {
-	app := NewApp()
-	id := app.GenerateQueryID()
-	if id == "" {
-		t.Fatal("GenerateQueryID returned empty string")
-	}
-	// Should start with "query-"
-	if !strings.HasPrefix(id, "query-") {
-		t.Fatalf("Expected query ID to start with 'query-', got: %s", id)
-	}
-	// Should be reasonably unique (not equal to another generated ID)
-	id2 := app.GenerateQueryID()
-	if id == id2 {
-		t.Fatal("Two consecutive GenerateQueryID calls returned identical IDs")
-	}
-}
-
-func TestCancelQuery_NonExistent(t *testing.T) {
-	app := NewApp()
-	res := app.CancelQuery("non-existent-query-id")
-	if res.Success {
-		t.Fatal("CancelQuery should fail for non-existent query ID")
-	}
-	if !strings.Contains(res.Message, "不存在") && !strings.Contains(res.Message, "not exist") {
-		t.Fatalf("Expected error message about query not existing, got: %s", res.Message)
-	}
-}
-
-func TestCancelQuery_ValidQuery(t *testing.T) {
-	app := NewApp()
-
-	// First, generate a query ID and simulate a running query
-	queryID := app.GenerateQueryID()
-
-	// Store a cancel function in runningQueries map
-	_, cancel := context.WithCancel(context.Background())
-	app.queryMu.Lock()
-	app.runningQueries[queryID] = queryContext{
-		cancel:  cancel,
-		started: time.Now(),
-	}
-	app.queryMu.Unlock()
-
-	// Ensure cleanup after test
-	defer func() {
-		app.queryMu.Lock()
-		delete(app.runningQueries, queryID)
-		app.queryMu.Unlock()
-	}()
-
-	// Cancel the query
-	res := app.CancelQuery(queryID)
-	if !res.Success {
-		t.Fatalf("CancelQuery should succeed for valid query ID, got: %s", res.Message)
-	}
-
-	// Verify query removed from map
-	app.queryMu.Lock()
-	_, exists := app.runningQueries[queryID]
-	app.queryMu.Unlock()
-	if exists {
-		t.Fatal("Query should be removed from runningQueries after cancellation")
-	}
-}
-
-func TestCleanupStaleQueries(t *testing.T) {
-	app := NewApp()
-
-	// Add a stale query (started 2 hours ago)
-	queryID := app.GenerateQueryID()
-	_, cancel := context.WithCancel(context.Background())
-	app.queryMu.Lock()
-	app.runningQueries[queryID] = queryContext{
-		cancel:  cancel,
-		started: time.Now().Add(-2 * time.Hour),
-	}
-	app.queryMu.Unlock()
-
-	// Cleanup queries older than 1 hour
-	app.CleanupStaleQueries(1 * time.Hour)
-
-	// Verify stale query was removed
-	app.queryMu.Lock()
-	_, exists := app.runningQueries[queryID]
-	app.queryMu.Unlock()
-	if exists {
-		t.Fatal("Stale query should be removed by CleanupStaleQueries")
-	}
-
-	// Add a fresh query (started 30 minutes ago)
-	freshID := app.GenerateQueryID()
-	_, cancel2 := context.WithCancel(context.Background())
-	app.queryMu.Lock()
-	app.runningQueries[freshID] = queryContext{
-		cancel:  cancel2,
-		started: time.Now().Add(-30 * time.Minute),
-	}
-	app.queryMu.Unlock()
-	defer cancel2()
-
-	// Cleanup queries older than 1 hour
-	app.CleanupStaleQueries(1 * time.Hour)
-
-	// Verify fresh query still exists
-	app.queryMu.Lock()
-	_, exists = app.runningQueries[freshID]
-	app.queryMu.Unlock()
-	if !exists {
-		t.Fatal("Fresh query should not be removed by CleanupStaleQueries")
-	}
-
-	// Clean up
-	app.queryMu.Lock()
-	delete(app.runningQueries, freshID)
-	app.queryMu.Unlock()
-}
-
-func TestDBQueryWithCancel_QueryIDPropagation(t *testing.T) {
-	// This test verifies that query ID is properly propagated in QueryResult
-	// Since we can't easily mock database connections, we'll test the integration
-	// by checking that DBQueryWithCancel returns a QueryResult with QueryID field
-
-	app := NewApp()
-
-	// Create a minimal config for a database type that doesn't require actual connection
-	config := connection.ConnectionConfig{
-		Type: "duckdb",
-		Host: ":memory:", // In-memory duckdb for testing
-	}
-
-	// This will fail because we can't actually connect, but we can test the error path
-	result := app.DBQueryWithCancel(config, "", "SELECT 1", "test-query-id")
-
-	// The query should fail (no actual database), but QueryID should be present
-	if result.QueryID != "test-query-id" {
-		t.Fatalf("Expected QueryID 'test-query-id' in result, got: %s", result.QueryID)
-	}
-}

internal/app/methods_driver.go

@@ -304,33 +304,13 @@ var driverGoModulePathMap = map[string]string{
 	"clickhouse": "github.com/ClickHouse/clickhouse-go/v2",
 }
 
-var driverGoModuleAliasPathMap = map[string][]string{
-	"mongodb": {
-		"go.mongodb.org/mongo-driver",
-	},
-}
-
-var driverExtraHistoryLimitMap = map[string]int{
-	"mongodb": 10,
-}
-
 var fallbackRecentDriverVersionsMap = map[string][]goModuleVersionMeta{
 	"mongodb": {
 		{Version: "2.5.0"},
-		{Version: "2.4.2"},
-		{Version: "2.4.1"},
 		{Version: "2.4.0"},
 		{Version: "2.3.1"},
-		{Version: "1.17.9"},
-		{Version: "1.17.8"},
-		{Version: "1.17.7"},
-		{Version: "1.17.6"},
-		{Version: "1.17.4"},
-		{Version: "1.17.3"},
-		{Version: "1.17.2"},
-		{Version: "1.17.1"},
-		{Version: "1.17.0"},
-		{Version: "1.16.1"},
+		{Version: "2.3.0"},
+		{Version: "2.2.3"},
 	},
 }
 
@@ -716,11 +696,11 @@ func (a *App) CheckDriverNetworkStatus() connection.QueryResult {
 	}
 
 	data := map[string]interface{}{
-		"reachable":              allReachable,
-		"summary":                summary,
-		"recommendedProxy":       !allReachable,
-		"proxyConfigured":        proxyConfigured,
-		"proxyEnv":               proxyEnv,
+		"reachable":        allReachable,
+		"summary":          summary,
+		"recommendedProxy": !allReachable,
+		"proxyConfigured":  proxyConfigured,
+		"proxyEnv":         proxyEnv,
 		"downloadChainReachable": downloadChainReachable,
 		"downloadRequiredHosts": []string{
 			"github.com",
@@ -729,8 +709,8 @@ func (a *App) CheckDriverNetworkStatus() connection.QueryResult {
 			"objects.githubusercontent.com",
 			"raw.githubusercontent.com",
 		},
-		"checkedAt": time.Now().Format(time.RFC3339),
-		"checks":    checks,
+		"checkedAt":        time.Now().Format(time.RFC3339),
+		"checks":           checks,
 	}
 	if logPath := strings.TrimSpace(logger.Path()); logPath != "" {
 		data["logPath"] = logPath
@@ -1620,57 +1600,17 @@ func resolveRecentDriverVersionMetas(driverType string, limit int) []goModuleVer
 	if normalized == "" {
 		return nil
 	}
-	modulePaths := resolveDriverGoModulePaths(normalized)
-	if len(modulePaths) > 0 {
-		result := make([]goModuleVersionMeta, 0, limit)
-		seen := make(map[string]struct{}, limit)
-		appendUnique := func(values []goModuleVersionMeta, maxAppend int) {
-			if maxAppend <= 0 {
-				return
-			}
-			appended := 0
-			for _, meta := range values {
-				version := normalizeVersion(strings.TrimSpace(meta.Version))
-				if version == "" {
-					continue
-				}
-				key := strings.ToLower(version)
-				if _, ok := seen[key]; ok {
-					continue
-				}
-				meta.Version = version
-				result = append(result, meta)
-				seen[key] = struct{}{}
-				appended++
-				if appended >= maxAppend {
-					return
-				}
+	if modulePath := strings.TrimSpace(driverGoModulePathMap[normalized]); modulePath != "" {
+		if metas := fetchGoModuleVersionMetasCached(modulePath); len(metas) > 0 {
+			if len(metas) > limit {
+				return append([]goModuleVersionMeta(nil), metas[:limit]...)
 			}
+			return append([]goModuleVersionMeta(nil), metas...)
 		}
-
-		appendUnique(fetchGoModuleVersionMetasCached(modulePaths[0]), limit)
-
-		extraLimit := resolveDriverExtraHistoryLimit(normalized)
-		for _, modulePath := range modulePaths[1:] {
-			if extraLimit <= 0 {
-				break
-			}
-			before := len(result)
-			appendUnique(fetchGoModuleVersionMetasCached(modulePath), extraLimit)
-			extraLimit -= len(result) - before
-		}
-		if len(result) > 0 {
-			return result
-		}
-	}
-
-	fallbackLimit := limit + resolveDriverExtraHistoryLimit(normalized)
-	if fallbackLimit <= 0 {
-		fallbackLimit = limit
 	}
 	if fallback := fallbackRecentDriverVersionsMap[normalized]; len(fallback) > 0 {
-		if len(fallback) > fallbackLimit {
-			return append([]goModuleVersionMeta(nil), fallback[:fallbackLimit]...)
+		if len(fallback) > limit {
+			return append([]goModuleVersionMeta(nil), fallback[:limit]...)
 		}
 		return append([]goModuleVersionMeta(nil), fallback...)
 	}
@@ -1695,13 +1635,15 @@ func triggerDriverVersionMetadataWarmup(definitions []driverDefinition) {
 		if driverType == "" || !db.IsOptionalGoDriver(driverType) {
 			continue
 		}
-		for _, modulePath := range resolveDriverGoModulePaths(driverType) {
-			if _, ok := seenModule[modulePath]; ok {
-				continue
-			}
-			seenModule[modulePath] = struct{}{}
-			modulePaths = append(modulePaths, modulePath)
+		modulePath := strings.TrimSpace(driverGoModulePathMap[driverType])
+		if modulePath == "" {
+			continue
 		}
+		if _, ok := seenModule[modulePath]; ok {
+			continue
+		}
+		seenModule[modulePath] = struct{}{}
+		modulePaths = append(modulePaths, modulePath)
 	}
 
 	if len(modulePaths) == 0 {
@@ -1721,40 +1663,6 @@ func triggerDriverVersionMetadataWarmup(definitions []driverDefinition) {
 	}(append([]string(nil), modulePaths...))
 }
 
-func resolveDriverGoModulePaths(driverType string) []string {
-	normalized := normalizeDriverType(driverType)
-	if normalized == "" {
-		return nil
-	}
-	paths := make([]string, 0, 3)
-	seen := make(map[string]struct{}, 3)
-	appendPath := func(path string) {
-		trimmed := strings.TrimSpace(path)
-		if trimmed == "" {
-			return
-		}
-		if _, ok := seen[trimmed]; ok {
-			return
-		}
-		seen[trimmed] = struct{}{}
-		paths = append(paths, trimmed)
-	}
-
-	appendPath(driverGoModulePathMap[normalized])
-	for _, alias := range driverGoModuleAliasPathMap[normalized] {
-		appendPath(alias)
-	}
-	return paths
-}
-
-func resolveDriverExtraHistoryLimit(driverType string) int {
-	limit := driverExtraHistoryLimitMap[normalizeDriverType(driverType)]
-	if limit < 0 {
-		return 0
-	}
-	return limit
-}
-
 func tryStartDriverVersionMetadataWarmup(now time.Time) bool {
 	driverVersionWarmupMu.Lock()
 	defer driverVersionWarmupMu.Unlock()
@@ -2448,23 +2356,16 @@ func hashFileSHA256(filePath string) (string, error) {
 
 func installOptionalDriverAgentPackage(a *App, definition driverDefinition, selectedVersion string, resolvedDir string, downloadURL string) (installedDriverPackage, error) {
 	driverType := normalizeDriverType(definition.Type)
-	installPath, err := db.ResolveOptionalDriverAgentExecutablePathForVersion(resolvedDir, driverType, selectedVersion)
+	executablePath, err := db.ResolveOptionalDriverAgentExecutablePath(resolvedDir, driverType)
 	if err != nil {
 		return installedDriverPackage{}, err
 	}
-	runtimePath, err := db.ResolveOptionalDriverAgentExecutablePath(resolvedDir, driverType)
+	downloadSource, hash, err := ensureOptionalDriverAgentBinary(a, definition, executablePath, downloadURL)
 	if err != nil {
 		return installedDriverPackage{}, err
 	}
-	downloadSource, hash, err := ensureOptionalDriverAgentBinary(a, definition, installPath, downloadURL, selectedVersion)
-	if err != nil {
-		return installedDriverPackage{}, err
-	}
-	if activateErr := activateOptionalDriverAgentBinary(installPath, runtimePath); activateErr != nil {
-		return installedDriverPackage{}, fmt.Errorf("activate %s driver agent failed: %w", resolveDriverDisplayName(definition), activateErr)
-	}
 	if strings.TrimSpace(hash) == "" {
-		hash, err = hashFileSHA256(installPath)
+		hash, err = hashFileSHA256(executablePath)
 		if err != nil {
 			return installedDriverPackage{}, fmt.Errorf("计算 %s 驱动代理摘要失败：%w", resolveDriverDisplayName(definition), err)
 		}
@@ -2475,9 +2376,9 @@ func installOptionalDriverAgentPackage(a *App, definition driverDefinition, sele
 	return installedDriverPackage{
 		DriverType:     driverType,
 		Version:        strings.TrimSpace(selectedVersion),
-		FilePath:       installPath,
-		FileName:       filepath.Base(installPath),
-		ExecutablePath: runtimePath,
+		FilePath:       executablePath,
+		FileName:       filepath.Base(executablePath),
+		ExecutablePath: executablePath,
 		DownloadURL:    strings.TrimSpace(downloadSource),
 		SHA256:         hash,
 		DownloadedAt:   time.Now().Format(time.RFC3339),
@@ -2536,9 +2437,6 @@ func installOptionalDriverAgentFromLocalPath(definition driverDefinition, filePa
 			return installedDriverPackage{}, fmt.Errorf("导入本地驱动代理失败：%w", copyErr)
 		}
 	}
-	if validateErr := db.ValidateOptionalDriverAgentExecutable(driverType, executablePath); validateErr != nil {
-		return installedDriverPackage{}, validateErr
-	}
 
 	hash, hashErr := hashFileSHA256(executablePath)
 	if hashErr != nil {
@@ -2788,23 +2686,17 @@ func installOptionalDriverAgentFromLocalZip(zipPath string, definition driverDef
 	return filepath.ToSlash(strings.TrimPrefix(strings.TrimSpace(entry.Name), "./")), nil
 }
 
-func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, executablePath string, downloadURL string, selectedVersion string) (string, string, error) {
+func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, executablePath string, downloadURL string) (string, string, error) {
 	driverType := normalizeDriverType(definition.Type)
 	displayName := resolveDriverDisplayName(definition)
-	forceSourceBuild := shouldForceSourceBuildForVersion(driverType, selectedVersion)
-	skipReuseCandidate := shouldSkipReusableAgentCandidate(driverType, selectedVersion)
 
 	info, err := os.Stat(executablePath)
 	if err == nil && !info.IsDir() {
-		if validateErr := db.ValidateOptionalDriverAgentExecutable(driverType, executablePath); validateErr != nil {
-			_ = os.Remove(executablePath)
-		} else {
-			hash, hashErr := hashFileSHA256(executablePath)
-			if hashErr != nil {
-				return "", "", fmt.Errorf("读取已安装 %s 驱动代理摘要失败：%w", displayName, hashErr)
-			}
-			return fmt.Sprintf("local://existing/%s-driver-agent", driverType), hash, nil
+		hash, hashErr := hashFileSHA256(executablePath)
+		if hashErr != nil {
+			return "", "", fmt.Errorf("读取已安装 %s 驱动代理摘要失败：%w", displayName, hashErr)
 		}
+		return fmt.Sprintf("local://existing/%s-driver-agent", driverType), hash, nil
 	}
 	if err == nil && info.IsDir() {
 		return "", "", fmt.Errorf("%s 驱动代理路径被目录占用：%s", displayName, executablePath)
@@ -2816,57 +2708,49 @@ func ensureOptionalDriverAgentBinary(a *App, definition driverDefinition, execut
 	if a != nil {
 		a.emitDriverDownloadProgress(driverType, "downloading", 10, 100, "检查本地驱动代理缓存")
 	}
-	if !skipReuseCandidate {
-		if sourcePath, ok := findExistingOptionalDriverAgentCandidate(definition, executablePath); ok {
-			if copyErr := copyAgentBinary(sourcePath, executablePath); copyErr != nil {
-				return "", "", fmt.Errorf("复制预置 %s 驱动代理失败：%w", displayName, copyErr)
-			}
-			if validateErr := db.ValidateOptionalDriverAgentExecutable(driverType, executablePath); validateErr != nil {
-				_ = os.Remove(executablePath)
-				return "", "", validateErr
-			}
-			hash, hashErr := hashFileSHA256(executablePath)
-			if hashErr != nil {
-				return "", "", fmt.Errorf("计算预置 %s 驱动代理摘要失败：%w", displayName, hashErr)
-			}
-			return "file://" + sourcePath, hash, nil
+	if sourcePath, ok := findExistingOptionalDriverAgentCandidate(definition, executablePath); ok {
+		if copyErr := copyAgentBinary(sourcePath, executablePath); copyErr != nil {
+			return "", "", fmt.Errorf("复制预置 %s 驱动代理失败：%w", displayName, copyErr)
 		}
+		hash, hashErr := hashFileSHA256(executablePath)
+		if hashErr != nil {
+			return "", "", fmt.Errorf("计算预置 %s 驱动代理摘要失败：%w", displayName, hashErr)
+		}
+		return "file://" + sourcePath, hash, nil
 	}
 
+	downloadURLs := resolveOptionalDriverAgentDownloadURLs(definition, downloadURL)
 	var downloadErrs []string
-	if !forceSourceBuild {
-		downloadURLs := resolveOptionalDriverAgentDownloadURLs(definition, downloadURL)
-		if len(downloadURLs) > 0 {
-			for _, candidateURL := range downloadURLs {
-				if a != nil {
-					a.emitDriverDownloadProgress(driverType, "downloading", 20, 100, fmt.Sprintf("下载预编译 %s 驱动代理", displayName))
-				}
-				hash, dlErr := downloadOptionalDriverAgentBinary(a, definition, candidateURL, executablePath)
-				if dlErr == nil {
-					return candidateURL, hash, nil
-				}
-				downloadErrs = append(downloadErrs, fmt.Sprintf("%s: %s", candidateURL, strings.TrimSpace(dlErr.Error())))
+	if len(downloadURLs) > 0 {
+		for _, candidateURL := range downloadURLs {
+			if a != nil {
+				a.emitDriverDownloadProgress(driverType, "downloading", 20, 100, fmt.Sprintf("下载预编译 %s 驱动代理", displayName))
 			}
+			hash, dlErr := downloadOptionalDriverAgentBinary(a, definition, candidateURL, executablePath)
+			if dlErr == nil {
+				return candidateURL, hash, nil
+			}
+			downloadErrs = append(downloadErrs, fmt.Sprintf("%s: %s", candidateURL, strings.TrimSpace(dlErr.Error())))
 		}
-		bundleURLs := resolveOptionalDriverBundleDownloadURLs()
-		if len(bundleURLs) > 0 {
-			for _, bundleURL := range bundleURLs {
-				if a != nil {
-					a.emitDriverDownloadProgress(driverType, "downloading", 20, 100, fmt.Sprintf("从驱动总包提取 %s 代理", displayName))
-				}
-				source, hash, bundleErr := downloadOptionalDriverAgentFromBundle(a, definition, bundleURL, executablePath)
-				if bundleErr == nil {
-					return source, hash, nil
-				}
-				downloadErrs = append(downloadErrs, fmt.Sprintf("%s: %s", bundleURL, strings.TrimSpace(bundleErr.Error())))
+	}
+	bundleURLs := resolveOptionalDriverBundleDownloadURLs()
+	if len(bundleURLs) > 0 {
+		for _, bundleURL := range bundleURLs {
+			if a != nil {
+				a.emitDriverDownloadProgress(driverType, "downloading", 20, 100, fmt.Sprintf("从驱动总包提取 %s 代理", displayName))
 			}
+			source, hash, bundleErr := downloadOptionalDriverAgentFromBundle(a, definition, bundleURL, executablePath)
+			if bundleErr == nil {
+				return source, hash, nil
+			}
+			downloadErrs = append(downloadErrs, fmt.Sprintf("%s: %s", bundleURL, strings.TrimSpace(bundleErr.Error())))
 		}
 	}
 	if a != nil {
 		a.emitDriverDownloadProgress(driverType, "downloading", 92, 100, "未命中预编译包，尝试开发态本地构建")
 	}
 
-	hash, buildErr := buildOptionalDriverAgentFromSource(definition, executablePath, selectedVersion)
+	hash, buildErr := buildOptionalDriverAgentFromSource(definition, executablePath)
 	if buildErr == nil {
 		return fmt.Sprintf("local://go-build/%s-driver-agent", driverType), hash, nil
 	}
@@ -2912,10 +2796,6 @@ func downloadOptionalDriverAgentBinary(a *App, definition driverDefinition, urlT
 	if chmodErr := os.Chmod(executablePath, 0o755); chmodErr != nil && stdRuntime.GOOS != "windows" {
 		return "", fmt.Errorf("设置代理权限失败：%w", chmodErr)
 	}
-	if validateErr := db.ValidateOptionalDriverAgentExecutable(driverType, executablePath); validateErr != nil {
-		_ = os.Remove(executablePath)
-		return "", validateErr
-	}
 	return hash, nil
 }
 
@@ -3024,10 +2904,6 @@ func downloadOptionalDriverAgentFromBundle(a *App, definition driverDefinition,
 	if chmodErr := os.Chmod(executablePath, 0o755); chmodErr != nil && stdRuntime.GOOS != "windows" {
 		return "", "", fmt.Errorf("设置驱动代理权限失败：%w", chmodErr)
 	}
-	if validateErr := db.ValidateOptionalDriverAgentExecutable(driverType, executablePath); validateErr != nil {
-		_ = os.Remove(executablePath)
-		return "", "", validateErr
-	}
 	hash, err := hashFileSHA256(executablePath)
 	if err != nil {
 		return "", "", fmt.Errorf("计算驱动代理摘要失败：%w", err)
@@ -3036,7 +2912,7 @@ func downloadOptionalDriverAgentFromBundle(a *App, definition driverDefinition,
 	return source, hash, nil
 }
 
-func buildOptionalDriverAgentFromSource(definition driverDefinition, executablePath string, selectedVersion string) (string, error) {
+func buildOptionalDriverAgentFromSource(definition driverDefinition, executablePath string) (string, error) {
 	driverType := normalizeDriverType(definition.Type)
 	displayName := resolveDriverDisplayName(definition)
 	goPath, lookErr := exec.LookPath("go")
@@ -3044,7 +2920,7 @@ func buildOptionalDriverAgentFromSource(definition driverDefinition, executableP
 		return "", fmt.Errorf("当前环境未安装 Go，且未找到可用的 %s 预编译代理包", displayName)
 	}
 
-	tagName, tagErr := optionalDriverBuildTag(driverType, selectedVersion)
+	tagName, tagErr := optionalDriverBuildTag(driverType)
 	if tagErr != nil {
 		return "", tagErr
 	}
@@ -3055,7 +2931,6 @@ func buildOptionalDriverAgentFromSource(definition driverDefinition, executableP
 	}
 	cmd := exec.Command(goPath, "build", "-tags", tagName, "-trimpath", "-ldflags", "-s -w", "-o", executablePath, "./cmd/optional-driver-agent")
 	cmd.Dir = projectRoot
-	cmd.Env = append(os.Environ(), "GOTOOLCHAIN=auto")
 	output, buildErr := cmd.CombinedOutput()
 	if buildErr != nil {
 		return "", fmt.Errorf("构建 %s 驱动代理失败：%v，输出：%s", displayName, buildErr, strings.TrimSpace(string(output)))
@@ -3070,31 +2945,7 @@ func buildOptionalDriverAgentFromSource(definition driverDefinition, executableP
 	return hash, nil
 }
 
-func resolveMongoDriverMajorFromVersion(version string) int {
-	trimmed := strings.TrimSpace(version)
-	trimmed = strings.TrimPrefix(trimmed, "v")
-	if strings.HasPrefix(trimmed, "1.") || trimmed == "1" {
-		return 1
-	}
-	return 2
-}
-
-func shouldForceSourceBuildForVersion(driverType string, selectedVersion string) bool {
-	if normalizeDriverType(driverType) != "mongodb" {
-		return false
-	}
-	return resolveMongoDriverMajorFromVersion(selectedVersion) == 1
-}
-
-func shouldSkipReusableAgentCandidate(driverType string, selectedVersion string) bool {
-	if normalizeDriverType(driverType) != "mongodb" {
-		return false
-	}
-	_ = selectedVersion
-	return true
-}
-
-func optionalDriverBuildTag(driverType string, selectedVersion string) (string, error) {
+func optionalDriverBuildTag(driverType string) (string, error) {
 	switch normalizeDriverType(driverType) {
 	case "mysql":
 		return "gonavi_mysql_driver", nil
@@ -3119,9 +2970,6 @@ func optionalDriverBuildTag(driverType string, selectedVersion string) (string,
 	case "vastbase":
 		return "gonavi_vastbase_driver", nil
 	case "mongodb":
-		if resolveMongoDriverMajorFromVersion(selectedVersion) == 1 {
-			return "gonavi_mongodb_driver_v1", nil
-		}
 		return "gonavi_mongodb_driver", nil
 	case "tdengine":
 		return "gonavi_tdengine_driver", nil
@@ -3353,7 +3201,6 @@ func resolveOptionalDriverAgentDownloadURLs(definition driverDefinition, rawURL
 }
 
 func findExistingOptionalDriverAgentCandidate(definition driverDefinition, targetPath string) (string, bool) {
-	driverType := normalizeDriverType(definition.Type)
 	targetAbs, _ := filepath.Abs(targetPath)
 	candidates := resolveOptionalDriverAgentCandidatePaths(definition)
 	for _, candidate := range candidates {
@@ -3369,13 +3216,9 @@ func findExistingOptionalDriverAgentCandidate(definition driverDefinition, targe
 			continue
 		}
 		info, statErr := os.Stat(absPath)
-		if statErr != nil || info.IsDir() {
-			continue
+		if statErr == nil && !info.IsDir() {
+			return absPath, true
 		}
-		if validateErr := db.ValidateOptionalDriverAgentExecutable(driverType, absPath); validateErr != nil {
-			continue
-		}
-		return absPath, true
 	}
 	return "", false
 }
@@ -3467,30 +3310,6 @@ func resolveDriverDisplayName(definition driverDefinition) string {
 	return "未知"
 }
 
-func activateOptionalDriverAgentBinary(installPath string, runtimePath string) error {
-	source := strings.TrimSpace(installPath)
-	target := strings.TrimSpace(runtimePath)
-	if source == "" || target == "" {
-		return fmt.Errorf("agent path is empty")
-	}
-	if source == target {
-		return nil
-	}
-
-	absSource := source
-	absTarget := target
-	if value, err := filepath.Abs(source); err == nil && strings.TrimSpace(value) != "" {
-		absSource = value
-	}
-	if value, err := filepath.Abs(target); err == nil && strings.TrimSpace(value) != "" {
-		absTarget = value
-	}
-	if strings.EqualFold(absSource, absTarget) {
-		return nil
-	}
-	return copyAgentBinary(source, target)
-}
-
 func copyAgentBinary(sourcePath, targetPath string) error {
 	src, err := os.Open(sourcePath)
 	if err != nil {

internal/app/methods_file.go

@@ -6,7 +6,6 @@ import (
 	"encoding/csv"
 	"encoding/json"
 	"fmt"
-	"html"
 	"math"
 	"os"
 	"path/filepath"
@@ -1596,26 +1595,6 @@ func writeRowsToFile(f *os.File, data []map[string]interface{}, columns []string
 		return writeRowsToXlsx(f.Name(), data, columns)
 	}
 
-	// html 使用内嵌 CSS 输出可直接浏览器预览的独立页面
-	if format == "html" {
-		return writeRowsToHTML(f, data, columns)
-	}
-
-	// 如果列名为空但数据不为空，从所有数据行提取所有键
-	if len(columns) == 0 && len(data) > 0 {
-		keySet := make(map[string]bool)
-		for _, row := range data {
-			for key := range row {
-				keySet[key] = true
-			}
-		}
-		// 排序以确保输出一致
-		for key := range keySet {
-			columns = append(columns, key)
-		}
-		sort.Strings(columns)
-	}
-
 	var csvWriter *csv.Writer
 	var jsonEncoder *json.Encoder
 	isJsonFirstRow := true
@@ -1709,188 +1688,6 @@ func writeRowsToFile(f *os.File, data []map[string]interface{}, columns []string
 	return nil
 }
 
-func formatExportHTMLCell(val interface{}) string {
-	text := formatExportCellText(val)
-	escaped := html.EscapeString(text)
-	escaped = strings.ReplaceAll(escaped, "\r\n", "\n")
-	escaped = strings.ReplaceAll(escaped, "\r", "\n")
-	return strings.ReplaceAll(escaped, "\n", "<br>")
-}
-
-func writeRowsToHTML(f *os.File, data []map[string]interface{}, columns []string) error {
-	w := bufio.NewWriterSize(f, 1024*256)
-
-	if _, err := w.WriteString(`<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>GoNavi Export</title>
-  <style>
-    :root {
-      color-scheme: light;
-      --bg: #f8f9fa;
-      --card: #ffffff;
-      --line: #dee2e6;
-      --text: #212529;
-      --muted: #6c757d;
-      --hover: #f1f3f5;
-      --zebra: #f8f9fa;
-      --head: #ffffff;
-    }
-    * { box-sizing: border-box; }
-    body {
-      margin: 0;
-      padding: 24px;
-      background: var(--bg);
-      color: var(--text);
-      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "PingFang SC", "Microsoft YaHei", sans-serif;
-      line-height: 1.6;
-    }
-    .export-wrap {
-      max-width: 100%;
-      margin: 0 auto;
-      background: var(--card);
-      border: 1px solid var(--line);
-      border-radius: 8px;
-      overflow: hidden;
-    }
-    .export-head {
-      padding: 16px 20px;
-      background: var(--head);
-      border-bottom: 2px solid var(--line);
-    }
-    .export-head h1 {
-      margin: 0;
-      font-size: 16px;
-      font-weight: 600;
-      color: var(--text);
-    }
-    .export-meta {
-      margin-top: 6px;
-      color: var(--muted);
-      font-size: 13px;
-    }
-    .table-wrap {
-      width: 100%;
-      overflow: auto;
-      padding: 16px;
-    }
-    table {
-      border-collapse: collapse;
-      width: auto;
-      font-size: 13px;
-    }
-    thead th {
-      position: sticky;
-      top: 0;
-      z-index: 2;
-      background: var(--head);
-      text-align: left;
-      font-weight: 600;
-      white-space: nowrap;
-      border-bottom: 2px solid var(--line);
-      color: var(--text);
-      padding: 12px 16px;
-    }
-    td {
-      padding: 10px 16px;
-      border-bottom: 1px solid var(--line);
-      vertical-align: top;
-      white-space: pre-wrap;
-      word-wrap: break-word;
-      overflow-wrap: anywhere;
-      max-width: 500px;
-      color: var(--text);
-    }
-    tbody tr:nth-child(even) {
-      background: var(--zebra);
-    }
-    tbody tr:hover {
-      background: var(--hover);
-    }
-    td.empty {
-      text-align: center;
-      color: var(--muted);
-      font-style: italic;
-    }
-    @media (max-width: 768px) {
-      body { padding: 16px; }
-      .export-head { padding: 12px 16px; }
-      .table-wrap { padding: 12px; }
-      th, td { padding: 8px 12px; font-size: 12px; }
-    }
-    @media print {
-      body { background: white; padding: 0; }
-      .export-wrap { border: none; }
-    }
-  </style>
-</head>
-<body>
-  <div class="export-wrap">
-    <div class="export-head">
-      <h1>GoNavi Data Export</h1>
-      <div class="export-meta">`); err != nil {
-		return err
-	}
-
-	if _, err := fmt.Fprintf(w, "Rows: %d · Columns: %d · Generated: %s", len(data), len(columns), time.Now().Format("2006-01-02 15:04:05")); err != nil {
-		return err
-	}
-
-	if _, err := w.WriteString(`</div>
-    </div>
-    <div class="table-wrap">
-      <table>
-        <thead><tr>`); err != nil {
-		return err
-	}
-
-	for _, col := range columns {
-		if _, err := fmt.Fprintf(w, "<th>%s</th>", html.EscapeString(col)); err != nil {
-			return err
-		}
-	}
-
-	if _, err := w.WriteString(`</tr></thead><tbody>`); err != nil {
-		return err
-	}
-
-	if len(data) == 0 {
-		colspan := len(columns)
-		if colspan <= 0 {
-			colspan = 1
-		}
-		if _, err := fmt.Fprintf(w, `<tr><td class="empty" colspan="%d">(0 rows)</td></tr>`, colspan); err != nil {
-			return err
-		}
-	} else {
-		for _, rowMap := range data {
-			if _, err := w.WriteString("<tr>"); err != nil {
-				return err
-			}
-			for _, col := range columns {
-				if _, err := fmt.Fprintf(w, "<td>%s</td>", formatExportHTMLCell(rowMap[col])); err != nil {
-					return err
-				}
-			}
-			if _, err := w.WriteString("</tr>"); err != nil {
-				return err
-			}
-		}
-	}
-
-	if _, err := w.WriteString(`</tbody></table>
-    </div>
-  </div>
-</body>
-</html>`); err != nil {
-		return err
-	}
-
-	return w.Flush()
-}
-
 func formatExportCellText(val interface{}) string {
 	if val == nil {
 		return "NULL"

internal/app/methods_file_export_test.go

@@ -203,73 +203,3 @@ func TestGetExportQueryTimeout_CustomClickHouseUsesLongerMinimum(t *testing.T) {
 		t.Fatalf("custom clickhouse 导出超时下限异常，want=%s got=%s", minClickHouseExportQueryTimeout, timeout)
 	}
 }
-
-func TestWriteRowsToFile_HTML_EscapeAndStyle(t *testing.T) {
-	f, err := os.CreateTemp("", "gonavi-export-*.html")
-	if err != nil {
-		t.Fatalf("创建临时文件失败: %v", err)
-	}
-	defer os.Remove(f.Name())
-	defer f.Close()
-
-	data := []map[string]interface{}{
-		{
-			"name":     "<script>alert(1)</script>",
-			"note":     "line1\nline2",
-			"nullable": nil,
-		},
-	}
-	columns := []string{"name", "note", "nullable"}
-
-	if err := writeRowsToFile(f, data, columns, "html"); err != nil {
-		t.Fatalf("写入 html 失败: %v", err)
-	}
-
-	contentBytes, err := os.ReadFile(f.Name())
-	if err != nil {
-		t.Fatalf("读取 html 失败: %v", err)
-	}
-	content := string(contentBytes)
-
-	if !strings.Contains(content, "<!DOCTYPE html>") {
-		t.Fatalf("html 导出缺少 doctype: %s", content)
-	}
-	if !strings.Contains(content, "position: sticky") {
-		t.Fatalf("html 导出缺少表头吸顶样式: %s", content)
-	}
-	if !strings.Contains(content, "tbody tr:nth-child(even)") {
-		t.Fatalf("html 导出缺少斑马纹样式: %s", content)
-	}
-	if !strings.Contains(content, "&lt;script&gt;alert(1)&lt;/script&gt;") {
-		t.Fatalf("html 导出未进行 XSS 转义: %s", content)
-	}
-	if strings.Contains(content, "<script>alert(1)</script>") {
-		t.Fatalf("html 导出包含未转义脚本: %s", content)
-	}
-	if !strings.Contains(content, "line1<br>line2") {
-		t.Fatalf("html 导出换行未转为 <br>: %s", content)
-	}
-	if !strings.Contains(content, "<td>NULL</td>") {
-		t.Fatalf("html 导出空值显示异常: %s", content)
-	}
-}
-
-func TestWriteRowsToFile_HTML_EscapeHeader(t *testing.T) {
-	f, err := os.CreateTemp("", "gonavi-export-*.html")
-	if err != nil {
-		t.Fatalf("创建临时文件失败: %v", err)
-	}
-	defer os.Remove(f.Name())
-	defer f.Close()
-
-	columnName := "<b>name</b>"
-	data := []map[string]interface{}{{columnName: "ok"}}
-	if err := writeRowsToFile(f, data, []string{columnName}, "html"); err != nil {
-		t.Fatalf("写入 html 失败: %v", err)
-	}
-	contentBytes, _ := os.ReadFile(f.Name())
-	content := string(contentBytes)
-	if !strings.Contains(content, "<th>&lt;b&gt;name&lt;/b&gt;</th>") || strings.Contains(content, "<th><b>name</b></th>") {
-		t.Fatalf("html 表头未正确转义: %s", content)
-	}
-}

internal/app/methods_redis.go

@@ -23,20 +23,12 @@ var (
 
 // getRedisClient gets or creates a Redis client from cache
 func (a *App) getRedisClient(config connection.ConnectionConfig) (redis.RedisClient, error) {
-	effectiveConfig := applyGlobalProxyToConnection(config)
-	connectConfig, proxyErr := resolveDialConfigWithProxy(effectiveConfig)
-	if proxyErr != nil {
-		wrapped := wrapConnectError(effectiveConfig, proxyErr)
-		logger.Error(wrapped, "Redis 代理准备失败：%s", formatRedisConnSummary(effectiveConfig))
-		return nil, wrapped
-	}
-
-	key := getRedisClientCacheKey(connectConfig)
+	key := getRedisClientCacheKey(config)
 	shortKey := key
 	if len(shortKey) > 12 {
 		shortKey = shortKey[:12]
 	}
-	logger.Infof("获取 Redis 连接：%s 缓存Key=%s", formatRedisConnSummary(effectiveConfig), shortKey)
+	logger.Infof("获取 Redis 连接：%s 缓存Key=%s", formatRedisConnSummary(config), shortKey)
 
 	redisCacheMu.Lock()
 	defer redisCacheMu.Unlock()
@@ -55,20 +47,21 @@ func (a *App) getRedisClient(config connection.ConnectionConfig) (redis.RedisCli
 
 	logger.Infof("创建 Redis 客户端实例：缓存Key=%s", shortKey)
 	client := redis.NewRedisClient()
-	if err := client.Connect(connectConfig); err != nil {
-		wrapped := wrapConnectError(effectiveConfig, err)
-		logger.Error(wrapped, "Redis 连接失败：%s 缓存Key=%s", formatRedisConnSummary(effectiveConfig), shortKey)
-		return nil, wrapped
+	if err := client.Connect(config); err != nil {
+		logger.Error(err, "Redis 连接失败：%s 缓存Key=%s", formatRedisConnSummary(config), shortKey)
+		return nil, err
 	}
 
 	redisCache[key] = client
-	logger.Infof("Redis 连接成功并写入缓存：%s 缓存Key=%s", formatRedisConnSummary(effectiveConfig), shortKey)
+	logger.Infof("Redis 连接成功并写入缓存：%s 缓存Key=%s", formatRedisConnSummary(config), shortKey)
 	return client, nil
 }
 
 func getRedisClientCacheKey(config connection.ConnectionConfig) string {
-	normalized := normalizeCacheKeyConfig(config)
-	b, _ := json.Marshal(normalized)
+	if !config.UseSSH {
+		config.SSH = connection.SSHConfig{}
+	}
+	b, _ := json.Marshal(config)
 	sum := sha256.Sum256(b)
 	return hex.EncodeToString(sum[:])
 }
@@ -98,26 +91,6 @@ func formatRedisConnSummary(config connection.ConnectionConfig) string {
 		b.WriteString(" 用户=")
 		b.WriteString(config.SSH.User)
 	}
-	if config.UseProxy {
-		b.WriteString(" 代理=")
-		b.WriteString(strings.ToLower(strings.TrimSpace(config.Proxy.Type)))
-		b.WriteString("://")
-		b.WriteString(config.Proxy.Host)
-		b.WriteString(":")
-		b.WriteString(strconv.Itoa(config.Proxy.Port))
-		if strings.TrimSpace(config.Proxy.User) != "" {
-			b.WriteString(" 代理认证=已配置")
-		}
-	}
-	if config.UseHTTPTunnel {
-		b.WriteString(" HTTP隧道=")
-		b.WriteString(strings.TrimSpace(config.HTTPTunnel.Host))
-		b.WriteString(":")
-		b.WriteString(strconv.Itoa(config.HTTPTunnel.Port))
-		if strings.TrimSpace(config.HTTPTunnel.User) != "" {
-			b.WriteString(" HTTP隧道认证=已配置")
-		}
-	}
 
 	return b.String()
 }

internal/app/methods_update.go

@@ -51,13 +51,12 @@ type UpdateInfo struct {
 }
 
 type AppInfo struct {
-	Version      string `json:"version"`
-	Author       string `json:"author"`
-	RepoURL      string `json:"repoUrl,omitempty"`
-	IssueURL     string `json:"issueUrl,omitempty"`
-	ReleaseURL   string `json:"releaseUrl,omitempty"`
-	CommunityURL string `json:"communityUrl,omitempty"`
-	BuildTime    string `json:"buildTime,omitempty"`
+	Version    string `json:"version"`
+	Author     string `json:"author"`
+	RepoURL    string `json:"repoUrl,omitempty"`
+	IssueURL   string `json:"issueUrl,omitempty"`
+	ReleaseURL string `json:"releaseUrl,omitempty"`
+	BuildTime  string `json:"buildTime,omitempty"`
 }
 
 type updateDownloadResult struct {
@@ -138,13 +137,12 @@ func (a *App) CheckForUpdates() connection.QueryResult {
 
 func (a *App) GetAppInfo() connection.QueryResult {
 	info := AppInfo{
-		Version:      getCurrentVersion(),
-		Author:       getCurrentAuthor(),
-		RepoURL:      "https://github.com/" + updateRepo,
-		IssueURL:     "https://github.com/" + updateRepo + "/issues",
-		ReleaseURL:   "https://github.com/" + updateRepo + "/releases",
-		CommunityURL: "https://aibook.ren",
-		BuildTime:    strings.TrimSpace(AppBuildTime),
+		Version:    getCurrentVersion(),
+		Author:     getCurrentAuthor(),
+		RepoURL:    "https://github.com/" + updateRepo,
+		IssueURL:   "https://github.com/" + updateRepo + "/issues",
+		ReleaseURL: "https://github.com/" + updateRepo + "/releases",
+		BuildTime:  strings.TrimSpace(AppBuildTime),
 	}
 	return connection.QueryResult{Success: true, Message: "OK", Data: info}
 }

internal/app/sql_sanitize.go

@@ -5,66 +5,6 @@ import (
 	"unicode"
 )
 
-func leadingSQLKeyword(query string) string {
-	text := strings.TrimSpace(query)
-	for len(text) > 0 {
-		trimmed := strings.TrimLeft(text, " \t\r\n")
-		if trimmed == "" {
-			return ""
-		}
-		text = trimmed
-
-		switch {
-		case strings.HasPrefix(text, "--"):
-			if idx := strings.IndexByte(text, '\n'); idx >= 0 {
-				text = text[idx+1:]
-				continue
-			}
-			return ""
-		case strings.HasPrefix(text, "#"):
-			if idx := strings.IndexByte(text, '\n'); idx >= 0 {
-				text = text[idx+1:]
-				continue
-			}
-			return ""
-		case strings.HasPrefix(text, "/*"):
-			if idx := strings.Index(text, "*/"); idx >= 0 {
-				text = text[idx+2:]
-				continue
-			}
-			return ""
-		}
-		break
-	}
-
-	if text == "" {
-		return ""
-	}
-	for i, r := range text {
-		if unicode.IsLetter(r) || unicode.IsDigit(r) || r == '_' {
-			continue
-		}
-		if i == 0 {
-			return ""
-		}
-		return strings.ToLower(text[:i])
-	}
-	return strings.ToLower(text)
-}
-
-func isReadOnlySQLQuery(dbType string, query string) bool {
-	if strings.ToLower(strings.TrimSpace(dbType)) == "mongodb" && strings.HasPrefix(strings.TrimSpace(query), "{") {
-		return true
-	}
-
-	switch leadingSQLKeyword(query) {
-	case "select", "with", "show", "describe", "desc", "explain", "pragma", "values":
-		return true
-	default:
-		return false
-	}
-}
-
 func sanitizeSQLForPgLike(dbType string, query string) string {
 	switch strings.ToLower(strings.TrimSpace(dbType)) {
 	case "postgres", "kingbase", "highgo", "vastbase":

internal/connection/types.go

@@ -18,49 +18,35 @@ type ProxyConfig struct {
 	Password string `json:"password,omitempty"`
 }
 
-// HTTPTunnelConfig holds independent HTTP CONNECT tunnel details
-type HTTPTunnelConfig struct {
-	Host     string `json:"host"`
-	Port     int    `json:"port"`
-	User     string `json:"user,omitempty"`
-	Password string `json:"password,omitempty"`
-}
-
 // ConnectionConfig holds database connection details including SSH
 type ConnectionConfig struct {
-	Type                 string           `json:"type"`
-	Host                 string           `json:"host"`
-	Port                 int              `json:"port"`
-	User                 string           `json:"user"`
-	Password             string           `json:"password"`
-	SavePassword         bool             `json:"savePassword,omitempty"` // Persist password in saved connection
-	Database             string           `json:"database"`
-	UseSSL               bool             `json:"useSSL,omitempty"`      // MySQL-like SSL/TLS switch
-	SSLMode              string           `json:"sslMode,omitempty"`     // preferred | required | skip-verify | disable
-	SSLCertPath          string           `json:"sslCertPath,omitempty"` // TLS client certificate path (e.g., Dameng)
-	SSLKeyPath           string           `json:"sslKeyPath,omitempty"`  // TLS client private key path (e.g., Dameng)
-	UseSSH               bool             `json:"useSSH"`
-	SSH                  SSHConfig        `json:"ssh"`
-	UseProxy             bool             `json:"useProxy,omitempty"`
-	Proxy                ProxyConfig      `json:"proxy,omitempty"`
-	UseHTTPTunnel        bool             `json:"useHttpTunnel,omitempty"`
-	HTTPTunnel           HTTPTunnelConfig `json:"httpTunnel,omitempty"`
-	Driver               string           `json:"driver,omitempty"`               // For custom connection
-	DSN                  string           `json:"dsn,omitempty"`                  // For custom connection
-	Timeout              int              `json:"timeout,omitempty"`              // Connection timeout in seconds (default: 30)
-	RedisDB              int              `json:"redisDB,omitempty"`              // Redis database index (0-15)
-	URI                  string           `json:"uri,omitempty"`                  // Connection URI for copy/paste
-	Hosts                []string         `json:"hosts,omitempty"`                // Multi-host addresses: host:port
-	Topology             string           `json:"topology,omitempty"`             // single | replica | cluster
-	MySQLReplicaUser     string           `json:"mysqlReplicaUser,omitempty"`     // MySQL replica auth user
-	MySQLReplicaPassword string           `json:"mysqlReplicaPassword,omitempty"` // MySQL replica auth password
-	ReplicaSet           string           `json:"replicaSet,omitempty"`           // MongoDB replica set name
-	AuthSource           string           `json:"authSource,omitempty"`           // MongoDB authSource
-	ReadPreference       string           `json:"readPreference,omitempty"`       // MongoDB readPreference
-	MongoSRV             bool             `json:"mongoSrv,omitempty"`             // MongoDB use mongodb+srv URI scheme
-	MongoAuthMechanism   string           `json:"mongoAuthMechanism,omitempty"`   // MongoDB authMechanism
-	MongoReplicaUser     string           `json:"mongoReplicaUser,omitempty"`     // MongoDB replica auth user
-	MongoReplicaPassword string           `json:"mongoReplicaPassword,omitempty"` // MongoDB replica auth password
+	Type                 string      `json:"type"`
+	Host                 string      `json:"host"`
+	Port                 int         `json:"port"`
+	User                 string      `json:"user"`
+	Password             string      `json:"password"`
+	SavePassword         bool        `json:"savePassword,omitempty"` // Persist password in saved connection
+	Database             string      `json:"database"`
+	UseSSH               bool        `json:"useSSH"`
+	SSH                  SSHConfig   `json:"ssh"`
+	UseProxy             bool        `json:"useProxy,omitempty"`
+	Proxy                ProxyConfig `json:"proxy,omitempty"`
+	Driver               string      `json:"driver,omitempty"`               // For custom connection
+	DSN                  string      `json:"dsn,omitempty"`                  // For custom connection
+	Timeout              int         `json:"timeout,omitempty"`              // Connection timeout in seconds (default: 30)
+	RedisDB              int         `json:"redisDB,omitempty"`              // Redis database index (0-15)
+	URI                  string      `json:"uri,omitempty"`                  // Connection URI for copy/paste
+	Hosts                []string    `json:"hosts,omitempty"`                // Multi-host addresses: host:port
+	Topology             string      `json:"topology,omitempty"`             // single | replica | cluster
+	MySQLReplicaUser     string      `json:"mysqlReplicaUser,omitempty"`     // MySQL replica auth user
+	MySQLReplicaPassword string      `json:"mysqlReplicaPassword,omitempty"` // MySQL replica auth password
+	ReplicaSet           string      `json:"replicaSet,omitempty"`           // MongoDB replica set name
+	AuthSource           string      `json:"authSource,omitempty"`           // MongoDB authSource
+	ReadPreference       string      `json:"readPreference,omitempty"`       // MongoDB readPreference
+	MongoSRV             bool        `json:"mongoSrv,omitempty"`             // MongoDB use mongodb+srv URI scheme
+	MongoAuthMechanism   string      `json:"mongoAuthMechanism,omitempty"`   // MongoDB authMechanism
+	MongoReplicaUser     string      `json:"mongoReplicaUser,omitempty"`     // MongoDB replica auth user
+	MongoReplicaPassword string      `json:"mongoReplicaPassword,omitempty"` // MongoDB replica auth password
 }
 
 // QueryResult is the standard response format for Wails methods
@@ -69,7 +55,6 @@ type QueryResult struct {
 	Message string      `json:"message"`
 	Data    interface{} `json:"data"`
 	Fields  []string    `json:"fields,omitempty"`
-	QueryID string      `json:"queryId,omitempty"` // Unique ID for query cancellation
 }
 
 // ColumnDefinition represents a table column

internal/db/clickhouse_impl.go

@@ -107,9 +107,7 @@ func (c *ClickHouseDB) buildClickHouseOptions(config connection.ConnectionConfig
 	if readTimeout < minClickHouseReadTimeout {
 		readTimeout = minClickHouseReadTimeout
 	}
-	protocol := detectClickHouseProtocol(config)
-	opts := &clickhouse.Options{
-		Protocol: protocol,
+	return &clickhouse.Options{
 		Addr: []string{
 			net.JoinHostPort(config.Host, strconv.Itoa(config.Port)),
 		},
@@ -121,50 +119,6 @@ func (c *ClickHouseDB) buildClickHouseOptions(config connection.ConnectionConfig
 		DialTimeout: connectTimeout,
 		ReadTimeout: readTimeout,
 	}
-	if tlsConfig := resolveGenericTLSConfig(config); tlsConfig != nil {
-		opts.TLS = tlsConfig
-	}
-	return opts
-}
-
-func detectClickHouseProtocol(config connection.ConnectionConfig) clickhouse.Protocol {
-	uriText := strings.ToLower(strings.TrimSpace(config.URI))
-	if strings.HasPrefix(uriText, "http://") || strings.HasPrefix(uriText, "https://") {
-		return clickhouse.HTTP
-	}
-	if config.Port == 8123 || config.Port == 8443 {
-		return clickhouse.HTTP
-	}
-	return clickhouse.Native
-}
-
-func isClickHouseProtocolMismatch(err error) bool {
-	if err == nil {
-		return false
-	}
-	text := strings.ToLower(strings.TrimSpace(err.Error()))
-	if text == "" {
-		return false
-	}
-	return strings.Contains(text, "unexpected packet [72]") ||
-		(strings.Contains(text, "unexpected packet") && strings.Contains(text, "handshake")) ||
-		strings.Contains(text, "http response to https client") ||
-		strings.Contains(text, "malformed http response")
-}
-
-func withClickHouseProtocol(config connection.ConnectionConfig, protocol clickhouse.Protocol) connection.ConnectionConfig {
-	next := config
-	switch protocol {
-	case clickhouse.HTTP:
-		if next.Port == 0 {
-			next.Port = 8123
-		}
-	default:
-		if next.Port == 0 {
-			next.Port = defaultClickHousePort
-		}
-	}
-	return next
 }
 
 func (c *ClickHouseDB) Connect(config connection.ConnectionConfig) error {
@@ -211,48 +165,13 @@ func (c *ClickHouseDB) Connect(config connection.ConnectionConfig) error {
 		logger.Infof("ClickHouse 通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
 	}
 
-	attempts := []connection.ConnectionConfig{runConfig}
-	if shouldTrySSLPreferredFallback(runConfig) {
-		attempts = append(attempts, withSSLDisabled(runConfig))
+	c.conn = clickhouse.OpenDB(c.buildClickHouseOptions(runConfig))
+
+	if err := c.Ping(); err != nil {
+		_ = c.Close()
+		return fmt.Errorf("连接建立后验证失败：%w", err)
 	}
-
-	var failures []string
-	for idx, attempt := range attempts {
-		primaryProtocol := detectClickHouseProtocol(attempt)
-		protocols := []clickhouse.Protocol{primaryProtocol}
-		if primaryProtocol == clickhouse.Native {
-			protocols = append(protocols, clickhouse.HTTP)
-		} else {
-			protocols = append(protocols, clickhouse.Native)
-		}
-
-		for pIdx, protocol := range protocols {
-			protocolConfig := withClickHouseProtocol(attempt, protocol)
-			c.conn = clickhouse.OpenDB(c.buildClickHouseOptions(protocolConfig))
-			if err := c.Ping(); err != nil {
-				failures = append(failures, fmt.Sprintf("第%d次连接验证失败(protocol=%s): %v", idx+1, protocol.String(), err))
-				if c.conn != nil {
-					_ = c.conn.Close()
-					c.conn = nil
-				}
-				if pIdx == 0 && !isClickHouseProtocolMismatch(err) {
-					// 首次连接不是协议误配特征，避免无谓重试次协议。
-					break
-				}
-				continue
-			}
-			if idx > 0 {
-				logger.Warnf("ClickHouse SSL 优先连接失败，已回退至明文连接")
-			}
-			if pIdx > 0 {
-				logger.Warnf("ClickHouse 已自动切换连接协议为 %s（常见于 8123/8443 HTTP 端口）", protocol.String())
-			}
-			return nil
-		}
-	}
-
-	_ = c.Close()
-	return fmt.Errorf("连接建立后验证失败（可检查 ClickHouse 端口与协议是否匹配：Native=9000/9440，HTTP=8123/8443）：%s", strings.Join(failures, "；"))
+	return nil
 }
 
 func (c *ClickHouseDB) Close() error {

internal/db/dameng_impl.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"net"
 	"net/url"
-	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -37,14 +36,6 @@ func (d *DamengDB) getDSN(config connection.ConnectionConfig) string {
 	if config.Database != "" {
 		q.Set("schema", config.Database)
 	}
-	if config.UseSSL {
-		if certPath := strings.TrimSpace(config.SSLCertPath); certPath != "" {
-			q.Set("SSL_CERT_PATH", certPath)
-		}
-		if keyPath := strings.TrimSpace(config.SSLKeyPath); keyPath != "" {
-			q.Set("SSL_KEY_PATH", keyPath)
-		}
-	}
 	if escapedPassword != config.Password {
 		// 达梦驱动要求：密码包含特殊字符时，password 需 PathEscape，并添加 escapeProcess=true 让驱动解码。
 		q.Set("escapeProcess", "true")
@@ -59,12 +50,8 @@ func (d *DamengDB) getDSN(config connection.ConnectionConfig) string {
 }
 
 func (d *DamengDB) Connect(config connection.ConnectionConfig) error {
-	runConfig := config
-	if runConfig.UseSSL {
-		if strings.TrimSpace(runConfig.SSLCertPath) == "" || strings.TrimSpace(runConfig.SSLKeyPath) == "" {
-			return fmt.Errorf("达梦启用 SSL 需要同时配置证书路径(sslCertPath)与私钥路径(sslKeyPath)")
-		}
-	}
+	var dsn string
+	var err error
 
 	if config.UseSSH {
 		// Create SSH tunnel with local port forwarding
@@ -93,37 +80,22 @@ func (d *DamengDB) Connect(config connection.ConnectionConfig) error {
 		localConfig.Port = port
 		localConfig.UseSSH = false
 
-		runConfig = localConfig
+		dsn = d.getDSN(localConfig)
 		logger.Infof("达梦数据库通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
+	} else {
+		dsn = d.getDSN(config)
 	}
 
-	attempts := []connection.ConnectionConfig{runConfig}
-	if shouldTrySSLPreferredFallback(runConfig) {
-		attempts = append(attempts, withSSLDisabled(runConfig))
+	db, err := sql.Open("dm", dsn)
+	if err != nil {
+		return fmt.Errorf("打开数据库连接失败：%w", err)
 	}
-
-	var failures []string
-	for idx, attempt := range attempts {
-		dsn := d.getDSN(attempt)
-		db, err := sql.Open("dm", dsn)
-		if err != nil {
-			failures = append(failures, fmt.Sprintf("第%d次连接打开失败: %v", idx+1, err))
-			continue
-		}
-		d.conn = db
-		d.pingTimeout = getConnectTimeout(attempt)
-		if err := d.Ping(); err != nil {
-			_ = db.Close()
-			d.conn = nil
-			failures = append(failures, fmt.Sprintf("第%d次连接验证失败: %v", idx+1, err))
-			continue
-		}
-		if idx > 0 {
-			logger.Warnf("达梦 SSL 优先连接失败，已回退至明文连接")
-		}
-		return nil
+	d.conn = db
+	d.pingTimeout = getConnectTimeout(config)
+	if err := d.Ping(); err != nil {
+		return fmt.Errorf("连接建立后验证失败：%w", err)
 	}
-	return fmt.Errorf("连接建立后验证失败：%s", strings.Join(failures, "；"))
+	return nil
 }
 
 func (d *DamengDB) Close() error {
@@ -205,82 +177,24 @@ func (d *DamengDB) Exec(query string) (int64, error) {
 }
 
 func (d *DamengDB) GetDatabases() ([]string, error) {
-	// 达梦将「用户/模式」作为数据库列表来源，不同权限下可见口径不同。
-	// 这里采用多查询口径聚合，避免仅依赖单一视图导致“少库”。
-	queries := []string{
-		"SELECT USERNAME AS DATABASE_NAME FROM SYS.DBA_USERS ORDER BY USERNAME",
-		"SELECT USERNAME AS DATABASE_NAME FROM DBA_USERS ORDER BY USERNAME",
-		"SELECT USERNAME AS DATABASE_NAME FROM ALL_USERS ORDER BY USERNAME",
-		"SELECT USERNAME AS DATABASE_NAME FROM USER_USERS",
-		"SELECT DISTINCT OWNER AS DATABASE_NAME FROM ALL_TABLES ORDER BY OWNER",
-	}
-
-	seen := make(map[string]struct{})
-	dbs := make([]string, 0, 64)
-	var lastErr error
-	success := false
-
-	for _, q := range queries {
-		data, _, err := d.Query(q)
+	// DM: List Users/Schemas
+	data, _, err := d.Query("SELECT username FROM dba_users")
+	if err != nil {
+		// Fallback if dba_users not accessible
+		data, _, err = d.Query("SELECT username FROM all_users")
 		if err != nil {
-			lastErr = err
-			continue
-		}
-		success = true
-		for _, row := range data {
-			name := getDamengRowString(row, "DATABASE_NAME", "USERNAME", "OWNER", "SCHEMA_NAME")
-			if name == "" {
-				// 回退到第一列，兼容驱动返回列名差异。
-				for _, v := range row {
-					text := strings.TrimSpace(fmt.Sprintf("%v", v))
-					if text == "" || strings.EqualFold(text, "<nil>") {
-						continue
-					}
-					name = text
-					break
-				}
-			}
-			if name == "" {
-				continue
-			}
-			key := strings.ToUpper(name)
-			if _, ok := seen[key]; ok {
-				continue
-			}
-			seen[key] = struct{}{}
-			dbs = append(dbs, name)
+			return nil, err
 		}
 	}
-
-	if !success && lastErr != nil {
-		return nil, lastErr
+	var dbs []string
+	for _, row := range data {
+		if val, ok := row["USERNAME"]; ok {
+			dbs = append(dbs, fmt.Sprintf("%v", val))
+		}
 	}
-
-	sort.Slice(dbs, func(i, j int) bool {
-		return strings.ToUpper(dbs[i]) < strings.ToUpper(dbs[j])
-	})
 	return dbs, nil
 }
 
-func getDamengRowString(row map[string]interface{}, keys ...string) string {
-	if len(row) == 0 {
-		return ""
-	}
-	for _, key := range keys {
-		for k, v := range row {
-			if !strings.EqualFold(strings.TrimSpace(k), strings.TrimSpace(key)) {
-				continue
-			}
-			text := strings.TrimSpace(fmt.Sprintf("%v", v))
-			if text == "" || strings.EqualFold(text, "<nil>") {
-				return ""
-			}
-			return text
-		}
-	}
-	return ""
-}
-
 func (d *DamengDB) GetTables(dbName string) ([]string, error) {
 	query := fmt.Sprintf("SELECT owner, table_name FROM all_tables WHERE owner = '%s' ORDER BY table_name", strings.ToUpper(dbName))
 	if dbName == "" {

internal/db/diros_impl.go

@@ -151,10 +151,9 @@ func (d *DirosDB) getDSN(config connection.ConnectionConfig) string {
 	}
 
 	timeout := getConnectTimeoutSeconds(config)
-	tlsMode := resolveMySQLTLSMode(config)
 
-	return fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local&timeout=%ds&tls=%s",
-		config.User, config.Password, protocol, address, database, timeout, url.QueryEscape(tlsMode))
+	return fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local&timeout=%ds",
+		config.User, config.Password, protocol, address, database, timeout)
 }
 
 func resolveDirosCredential(config connection.ConnectionConfig, addressIndex int) (string, string) {

internal/db/driver_agent_binary_check.go

@@ -1,74 +0,0 @@
-package db
-
-import (
-	"debug/pe"
-	"fmt"
-	"runtime"
-	"strings"
-)
-
-const (
-	peMachineI386  uint16 = 0x014c
-	peMachineAmd64 uint16 = 0x8664
-	peMachineArm64 uint16 = 0xaa64
-)
-
-func windowsMachineLabel(machine uint16) string {
-	switch machine {
-	case peMachineI386:
-		return "windows-386"
-	case peMachineAmd64:
-		return "windows-amd64"
-	case peMachineArm64:
-		return "windows-arm64"
-	default:
-		return fmt.Sprintf("windows-unknown(0x%04x)", machine)
-	}
-}
-
-func expectedWindowsMachineForGoArch(goarch string) (uint16, string, bool) {
-	switch strings.ToLower(strings.TrimSpace(goarch)) {
-	case "386":
-		return peMachineI386, "windows-386", true
-	case "amd64":
-		return peMachineAmd64, "windows-amd64", true
-	case "arm64":
-		return peMachineArm64, "windows-arm64", true
-	default:
-		return 0, "", false
-	}
-}
-
-func validateWindowsExecutableMachine(pathText string) error {
-	file, err := pe.Open(pathText)
-	if err != nil {
-		return fmt.Errorf("无法识别为有效的 Windows 可执行文件：%w", err)
-	}
-	defer file.Close()
-
-	expectedMachine, expectedLabel, ok := expectedWindowsMachineForGoArch(runtime.GOARCH)
-	if !ok {
-		return nil
-	}
-	actualMachine := file.FileHeader.Machine
-	if actualMachine != expectedMachine {
-		return fmt.Errorf("可执行文件架构不兼容（文件=%s，当前进程=%s）", windowsMachineLabel(actualMachine), expectedLabel)
-	}
-	return nil
-}
-
-// ValidateOptionalDriverAgentExecutable 校验可选驱动代理二进制是否可在当前进程中执行。
-// 当前主要用于 Windows 下的 PE 架构兼容性校验，避免升级后复用到错误架构的旧代理。
-func ValidateOptionalDriverAgentExecutable(driverType string, executablePath string) error {
-	pathText := strings.TrimSpace(executablePath)
-	if pathText == "" {
-		return fmt.Errorf("%s 驱动代理路径为空", driverDisplayName(driverType))
-	}
-	if runtime.GOOS != "windows" {
-		return nil
-	}
-	if err := validateWindowsExecutableMachine(pathText); err != nil {
-		return fmt.Errorf("%s 驱动代理不可用：%w", driverDisplayName(driverType), err)
-	}
-	return nil
-}

internal/db/driver_support.go

@@ -194,9 +194,6 @@ func optionalGoDriverRuntimeReady(driverType string) (bool, string) {
 	if statErr != nil || info.IsDir() {
 		return false, fmt.Sprintf("%s 驱动代理缺失，请在驱动管理中重新安装启用", driverDisplayName(normalized))
 	}
-	if validateErr := ValidateOptionalDriverAgentExecutable(normalized, executablePath); validateErr != nil {
-		return false, fmt.Sprintf("%s；请在驱动管理中重新安装启用", validateErr.Error())
-	}
 	return true, ""
 }
 

internal/db/driver_support_test.go

@@ -65,22 +65,11 @@ func TestManagedDriverRequiresInstallMarker(t *testing.T) {
 	if err != nil {
 		t.Fatalf("解析 mariadb 代理路径失败: %v", err)
 	}
+	if err := os.WriteFile(executablePath, []byte("placeholder"), 0o755); err != nil {
+		t.Fatalf("写入 mariadb 代理占位文件失败: %v", err)
+	}
 	if runtime.GOOS == "windows" {
-		selfPath, selfErr := os.Executable()
-		if selfErr != nil {
-			t.Fatalf("获取测试进程路径失败: %v", selfErr)
-		}
-		content, readErr := os.ReadFile(selfPath)
-		if readErr != nil {
-			t.Fatalf("读取测试进程失败: %v", readErr)
-		}
-		if err := os.WriteFile(executablePath, content, 0o755); err != nil {
-			t.Fatalf("写入 mariadb 代理占位可执行文件失败: %v", err)
-		}
-	} else {
-		if err := os.WriteFile(executablePath, []byte("placeholder"), 0o755); err != nil {
-			t.Fatalf("写入 mariadb 代理占位文件失败: %v", err)
-		}
+		_ = os.Chmod(executablePath, 0o644)
 	}
 
 	supported, reason := DriverRuntimeSupportStatus("mariadb")

internal/db/dsn_test.go

@@ -33,44 +33,6 @@ func TestPostgresDSN_EscapesPassword(t *testing.T) {
 	}
 }
 
-func TestPostgresDSN_SSLModeRequireWhenEnabled(t *testing.T) {
-	p := &PostgresDB{}
-	cfg := connection.ConnectionConfig{
-		Type:     "postgres",
-		Host:     "127.0.0.1",
-		Port:     5432,
-		User:     "user",
-		Password: "pass",
-		Database: "db",
-		UseSSL:   true,
-		SSLMode:  "required",
-	}
-
-	dsn := p.getDSN(cfg)
-	if !strings.Contains(dsn, "sslmode=require") {
-		t.Fatalf("dsn 缺少 sslmode=require 参数：%s", dsn)
-	}
-}
-
-func TestMySQLDSN_UsesTLSParamWhenSSLEnabled(t *testing.T) {
-	m := &MySQLDB{}
-	cfg := connection.ConnectionConfig{
-		Type:     "mysql",
-		Host:     "127.0.0.1",
-		Port:     3306,
-		User:     "root",
-		Password: "pass",
-		Database: "db",
-		UseSSL:   true,
-		SSLMode:  "required",
-	}
-
-	dsn := m.getDSN(cfg)
-	if !strings.Contains(dsn, "tls=true") {
-		t.Fatalf("dsn 缺少 tls=true 参数：%s", dsn)
-	}
-}
-
 func TestOracleDSN_EscapesUserAndPassword(t *testing.T) {
 	o := &OracleDB{}
 	cfg := connection.ConnectionConfig{
@@ -120,30 +82,6 @@ func TestDamengDSN_EscapesPasswordAndEnablesEscapeProcess(t *testing.T) {
 	}
 }
 
-func TestDamengDSN_AppendsSSLCertAndKeyParams(t *testing.T) {
-	d := &DamengDB{}
-	cfg := connection.ConnectionConfig{
-		Type:        "dameng",
-		Host:        "127.0.0.1",
-		Port:        5236,
-		User:        "SYSDBA",
-		Password:    "pass",
-		Database:    "DBName",
-		UseSSL:      true,
-		SSLMode:     "required",
-		SSLCertPath: "C:\\certs\\client-cert.pem",
-		SSLKeyPath:  "C:\\certs\\client-key.pem",
-	}
-
-	dsn := d.getDSN(cfg)
-	if !strings.Contains(dsn, "SSL_CERT_PATH=") {
-		t.Fatalf("dsn 缺少 SSL_CERT_PATH 参数：%s", dsn)
-	}
-	if !strings.Contains(dsn, "SSL_KEY_PATH=") {
-		t.Fatalf("dsn 缺少 SSL_KEY_PATH 参数：%s", dsn)
-	}
-}
-
 func TestKingbaseDSN_QuotesPasswordWithSpaces(t *testing.T) {
 	k := &KingbaseDB{}
 	cfg := connection.ConnectionConfig{
@@ -178,47 +116,6 @@ func TestTDengineDSN_UsesWebSocketFormat(t *testing.T) {
 	}
 }
 
-func TestTDengineDSN_UsesSecureWebSocketWhenSSLEnabled(t *testing.T) {
-	td := &TDengineDB{}
-	cfg := connection.ConnectionConfig{
-		Type:     "tdengine",
-		Host:     "127.0.0.1",
-		Port:     6041,
-		User:     "root",
-		Password: "taosdata",
-		Database: "power",
-		UseSSL:   true,
-		SSLMode:  "required",
-	}
-
-	dsn := td.getDSN(cfg)
-	if !strings.HasPrefix(dsn, "root:taosdata@wss(127.0.0.1:6041)/power") {
-		t.Fatalf("tdengine ssl dsn 格式不正确：%s", dsn)
-	}
-}
-
-func TestSQLServerDSN_EncryptMapping(t *testing.T) {
-	s := &SqlServerDB{}
-	cfg := connection.ConnectionConfig{
-		Type:     "sqlserver",
-		Host:     "127.0.0.1",
-		Port:     1433,
-		User:     "sa",
-		Password: "pass",
-		Database: "master",
-		UseSSL:   true,
-		SSLMode:  "required",
-	}
-
-	dsn := s.getDSN(cfg)
-	if !strings.Contains(strings.ToLower(dsn), "encrypt=true") {
-		t.Fatalf("sqlserver dsn 缺少 encrypt=true：%s", dsn)
-	}
-	if !strings.Contains(strings.ToLower(dsn), "trustservercertificate=false") {
-		t.Fatalf("sqlserver dsn 缺少 TrustServerCertificate=false：%s", dsn)
-	}
-}
-
 func TestClickHouseOptions_UsesStructuredTimeoutAndAuth(t *testing.T) {
 	c := &ClickHouseDB{}
 	cfg := normalizeClickHouseConfig(connection.ConnectionConfig{

internal/db/highgo_impl.go

@@ -42,7 +42,7 @@ func (h *HighGoDB) getDSN(config connection.ConnectionConfig) string {
 	}
 	u.User = url.UserPassword(config.User, config.Password)
 	q := url.Values{}
-	q.Set("sslmode", resolvePostgresSSLMode(config))
+	q.Set("sslmode", "disable")
 	q.Set("connect_timeout", strconv.Itoa(getConnectTimeoutSeconds(config)))
 	u.RawQuery = q.Encode()
 
@@ -50,7 +50,7 @@ func (h *HighGoDB) getDSN(config connection.ConnectionConfig) string {
 }
 
 func (h *HighGoDB) Connect(config connection.ConnectionConfig) error {
-	runConfig := config
+	var dsn string
 
 	if config.UseSSH {
 		logger.Infof("HighGo 使用 SSH 连接：地址=%s:%d 用户=%s", config.Host, config.Port, config.User)
@@ -76,37 +76,23 @@ func (h *HighGoDB) Connect(config connection.ConnectionConfig) error {
 		localConfig.Port = port
 		localConfig.UseSSH = false
 
-		runConfig = localConfig
+		dsn = h.getDSN(localConfig)
 		logger.Infof("HighGo 通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
+	} else {
+		dsn = h.getDSN(config)
 	}
 
-	attempts := []connection.ConnectionConfig{runConfig}
-	if shouldTrySSLPreferredFallback(runConfig) {
-		attempts = append(attempts, withSSLDisabled(runConfig))
+	db, err := sql.Open("highgo", dsn)
+	if err != nil {
+		return fmt.Errorf("打开数据库连接失败：%w", err)
 	}
+	h.conn = db
+	h.pingTimeout = getConnectTimeout(config)
 
-	var failures []string
-	for idx, attempt := range attempts {
-		dsn := h.getDSN(attempt)
-		db, err := sql.Open("highgo", dsn)
-		if err != nil {
-			failures = append(failures, fmt.Sprintf("第%d次连接打开失败: %v", idx+1, err))
-			continue
-		}
-		h.conn = db
-		h.pingTimeout = getConnectTimeout(attempt)
-		if err := h.Ping(); err != nil {
-			_ = db.Close()
-			h.conn = nil
-			failures = append(failures, fmt.Sprintf("第%d次连接验证失败: %v", idx+1, err))
-			continue
-		}
-		if idx > 0 {
-			logger.Warnf("HighGo SSL 优先连接失败，已回退至明文连接")
-		}
-		return nil
+	if err := h.Ping(); err != nil {
+		return fmt.Errorf("连接建立后验证失败：%w", err)
 	}
-	return fmt.Errorf("连接建立后验证失败：%s", strings.Join(failures, "；"))
+	return nil
 }
 
 func (h *HighGoDB) Close() error {

internal/db/kingbase_impl.go

@@ -65,13 +65,12 @@ func (k *KingbaseDB) getDSN(config connection.ConnectionConfig) string {
 	port := config.Port
 
 	// Construct DSN
-	dsn := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=%s connect_timeout=%d",
+	dsn := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable connect_timeout=%d",
 		quoteConnValue(address),
 		port,
 		quoteConnValue(config.User),
 		quoteConnValue(config.Password),
 		quoteConnValue(config.Database),
-		quoteConnValue(resolvePostgresSSLMode(config)),
 		getConnectTimeoutSeconds(config),
 	)
 
@@ -79,7 +78,8 @@ func (k *KingbaseDB) getDSN(config connection.ConnectionConfig) string {
 }
 
 func (k *KingbaseDB) Connect(config connection.ConnectionConfig) error {
-	runConfig := config
+	var dsn string
+	var err error
 
 	if config.UseSSH {
 		// Create SSH tunnel with local port forwarding
@@ -108,37 +108,23 @@ func (k *KingbaseDB) Connect(config connection.ConnectionConfig) error {
 		localConfig.Port = port
 		localConfig.UseSSH = false
 
-		runConfig = localConfig
+		dsn = k.getDSN(localConfig)
 		logger.Infof("人大金仓通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
+	} else {
+		dsn = k.getDSN(config)
 	}
 
-	attempts := []connection.ConnectionConfig{runConfig}
-	if shouldTrySSLPreferredFallback(runConfig) {
-		attempts = append(attempts, withSSLDisabled(runConfig))
+	// Open using "kingbase" driver
+	db, err := sql.Open("kingbase", dsn)
+	if err != nil {
+		return fmt.Errorf("打开数据库连接失败：%w", err)
 	}
-
-	var failures []string
-	for idx, attempt := range attempts {
-		dsn := k.getDSN(attempt)
-		db, err := sql.Open("kingbase", dsn)
-		if err != nil {
-			failures = append(failures, fmt.Sprintf("第%d次连接打开失败: %v", idx+1, err))
-			continue
-		}
-		k.conn = db
-		k.pingTimeout = getConnectTimeout(attempt)
-		if err := k.Ping(); err != nil {
-			_ = db.Close()
-			k.conn = nil
-			failures = append(failures, fmt.Sprintf("第%d次连接验证失败: %v", idx+1, err))
-			continue
-		}
-		if idx > 0 {
-			logger.Warnf("人大金仓 SSL 优先连接失败，已回退至明文连接")
-		}
-		return nil
+	k.conn = db
+	k.pingTimeout = getConnectTimeout(config)
+	if err := k.Ping(); err != nil {
+		return fmt.Errorf("连接建立后验证失败：%w", err)
 	}
-	return fmt.Errorf("连接建立后验证失败：%s", strings.Join(failures, "；"))
+	return nil
 }
 
 func (k *KingbaseDB) Close() error {
@@ -305,30 +291,10 @@ func (k *KingbaseDB) GetColumns(dbName, tableName string) ([]connection.ColumnDe
 		return strings.ReplaceAll(s, "'", "''")
 	}
 
-	query := fmt.Sprintf(`
-SELECT
-	a.attname AS column_name,
-	pg_catalog.format_type(a.atttypid, a.atttypmod) AS data_type,
-	CASE WHEN a.attnotnull THEN 'NO' ELSE 'YES' END AS is_nullable,
-	pg_get_expr(ad.adbin, ad.adrelid) AS column_default,
-	col_description(a.attrelid, a.attnum) AS comment,
-	CASE WHEN pk.attname IS NOT NULL THEN 'PRI' ELSE '' END AS column_key
-FROM pg_class c
-JOIN pg_namespace n ON n.oid = c.relnamespace
-JOIN pg_attribute a ON a.attrelid = c.oid
-LEFT JOIN pg_attrdef ad ON ad.adrelid = c.oid AND ad.adnum = a.attnum
-LEFT JOIN (
-	SELECT i.indrelid, a3.attname
-	FROM pg_index i
-	JOIN pg_attribute a3 ON a3.attrelid = i.indrelid AND a3.attnum = ANY(i.indkey)
-	WHERE i.indisprimary
-) pk ON pk.indrelid = c.oid AND pk.attname = a.attname
-WHERE c.relkind IN ('r', 'p')
-	AND n.nspname = '%s'
-	AND c.relname = '%s'
-	AND a.attnum > 0
-	AND NOT a.attisdropped
-ORDER BY a.attnum`, esc(schema), esc(table))
+	query := fmt.Sprintf(`SELECT column_name, data_type, is_nullable, column_default
+		FROM information_schema.columns
+		WHERE table_schema = '%s' AND table_name = '%s'
+		ORDER BY ordinal_position`, esc(schema), esc(table))
 
 	data, _, err := k.Query(query)
 	if err != nil {
@@ -341,21 +307,11 @@ ORDER BY a.attnum`, esc(schema), esc(table))
 			Name:     fmt.Sprintf("%v", row["column_name"]),
 			Type:     fmt.Sprintf("%v", row["data_type"]),
 			Nullable: fmt.Sprintf("%v", row["is_nullable"]),
-			Key:      fmt.Sprintf("%v", row["column_key"]),
-			Extra:    "",
-			Comment:  "",
 		}
 
 		if row["column_default"] != nil {
 			def := fmt.Sprintf("%v", row["column_default"])
 			col.Default = &def
-			if strings.HasPrefix(strings.ToLower(strings.TrimSpace(def)), "nextval(") {
-				col.Extra = "auto_increment"
-			}
-		}
-
-		if v, ok := row["comment"]; ok && v != nil {
-			col.Comment = fmt.Sprintf("%v", v)
 		}
 
 		columns = append(columns, col)
@@ -377,30 +333,10 @@ func (k *KingbaseDB) getColumnsWithCurrentSchema(tableName string) ([]connection
 	}
 
 	// 使用 current_schema() 获取当前schema
-	query := fmt.Sprintf(`
-SELECT
-	a.attname AS column_name,
-	pg_catalog.format_type(a.atttypid, a.atttypmod) AS data_type,
-	CASE WHEN a.attnotnull THEN 'NO' ELSE 'YES' END AS is_nullable,
-	pg_get_expr(ad.adbin, ad.adrelid) AS column_default,
-	col_description(a.attrelid, a.attnum) AS comment,
-	CASE WHEN pk.attname IS NOT NULL THEN 'PRI' ELSE '' END AS column_key
-FROM pg_class c
-JOIN pg_namespace n ON n.oid = c.relnamespace
-JOIN pg_attribute a ON a.attrelid = c.oid
-LEFT JOIN pg_attrdef ad ON ad.adrelid = c.oid AND ad.adnum = a.attnum
-LEFT JOIN (
-	SELECT i.indrelid, a3.attname
-	FROM pg_index i
-	JOIN pg_attribute a3 ON a3.attrelid = i.indrelid AND a3.attnum = ANY(i.indkey)
-	WHERE i.indisprimary
-) pk ON pk.indrelid = c.oid AND pk.attname = a.attname
-WHERE c.relkind IN ('r', 'p')
-	AND n.nspname = current_schema()
-	AND c.relname = '%s'
-	AND a.attnum > 0
-	AND NOT a.attisdropped
-ORDER BY a.attnum`, esc(table))
+	query := fmt.Sprintf(`SELECT column_name, data_type, is_nullable, column_default
+		FROM information_schema.columns
+		WHERE table_schema = current_schema() AND table_name = '%s'
+		ORDER BY ordinal_position`, esc(table))
 
 	data, _, err := k.Query(query)
 	if err != nil {
@@ -413,21 +349,11 @@ ORDER BY a.attnum`, esc(table))
 			Name:     fmt.Sprintf("%v", row["column_name"]),
 			Type:     fmt.Sprintf("%v", row["data_type"]),
 			Nullable: fmt.Sprintf("%v", row["is_nullable"]),
-			Key:      fmt.Sprintf("%v", row["column_key"]),
-			Extra:    "",
-			Comment:  "",
 		}
 
 		if row["column_default"] != nil {
 			def := fmt.Sprintf("%v", row["column_default"])
 			col.Default = &def
-			if strings.HasPrefix(strings.ToLower(strings.TrimSpace(def)), "nextval(") {
-				col.Extra = "auto_increment"
-			}
-		}
-
-		if v, ok := row["comment"]; ok && v != nil {
-			col.Comment = fmt.Sprintf("%v", v)
 		}
 
 		columns = append(columns, col)
@@ -683,16 +609,28 @@ func (k *KingbaseDB) ApplyChanges(tableName string, changes connection.ChangeSet
 	}
 	defer tx.Rollback()
 
-	schema, table := splitKingbaseQualifiedTable(tableName)
-	if table == "" {
-		return fmt.Errorf("table name required")
+	quoteIdent := func(name string) string {
+		n := strings.TrimSpace(name)
+		n = strings.Trim(n, "\"")
+		n = strings.ReplaceAll(n, "\"", "\"\"")
+		if n == "" {
+			return "\"\""
+		}
+		return `"` + n + `"`
+	}
+
+	schema := ""
+	table := strings.TrimSpace(tableName)
+	if parts := strings.SplitN(table, ".", 2); len(parts) == 2 {
+		schema = strings.TrimSpace(parts[0])
+		table = strings.TrimSpace(parts[1])
 	}
 
 	qualifiedTable := ""
 	if schema != "" {
-		qualifiedTable = fmt.Sprintf("%s.%s", quoteKingbaseIdent(schema), quoteKingbaseIdent(table))
+		qualifiedTable = fmt.Sprintf("%s.%s", quoteIdent(schema), quoteIdent(table))
 	} else {
-		qualifiedTable = quoteKingbaseIdent(table)
+		qualifiedTable = quoteIdent(table)
 	}
 
 	// 1. Deletes
@@ -702,7 +640,7 @@ func (k *KingbaseDB) ApplyChanges(tableName string, changes connection.ChangeSet
 		idx := 0
 		for k, v := range pk {
 			idx++
-			wheres = append(wheres, fmt.Sprintf("%s = $%d", quoteKingbaseIdent(k), idx))
+			wheres = append(wheres, fmt.Sprintf("%s = $%d", quoteIdent(k), idx))
 			args = append(args, v)
 		}
 		if len(wheres) == 0 {
@@ -710,7 +648,7 @@ func (k *KingbaseDB) ApplyChanges(tableName string, changes connection.ChangeSet
 		}
 		query := fmt.Sprintf("DELETE FROM %s WHERE %s", qualifiedTable, strings.Join(wheres, " AND "))
 		if _, err := tx.Exec(query, args...); err != nil {
-			return fmt.Errorf("delete error: %v; sql=%s", err, query)
+			return fmt.Errorf("delete error: %v", err)
 		}
 	}
 
@@ -722,7 +660,7 @@ func (k *KingbaseDB) ApplyChanges(tableName string, changes connection.ChangeSet
 
 		for k, v := range update.Values {
 			idx++
-			sets = append(sets, fmt.Sprintf("%s = $%d", quoteKingbaseIdent(k), idx))
+			sets = append(sets, fmt.Sprintf("%s = $%d", quoteIdent(k), idx))
 			args = append(args, v)
 		}
 
@@ -733,7 +671,7 @@ func (k *KingbaseDB) ApplyChanges(tableName string, changes connection.ChangeSet
 		var wheres []string
 		for k, v := range update.Keys {
 			idx++
-			wheres = append(wheres, fmt.Sprintf("%s = $%d", quoteKingbaseIdent(k), idx))
+			wheres = append(wheres, fmt.Sprintf("%s = $%d", quoteIdent(k), idx))
 			args = append(args, v)
 		}
 
@@ -743,7 +681,7 @@ func (k *KingbaseDB) ApplyChanges(tableName string, changes connection.ChangeSet
 
 		query := fmt.Sprintf("UPDATE %s SET %s WHERE %s", qualifiedTable, strings.Join(sets, ", "), strings.Join(wheres, " AND "))
 		if _, err := tx.Exec(query, args...); err != nil {
-			return fmt.Errorf("update error: %v; sql=%s", err, query)
+			return fmt.Errorf("update error: %v", err)
 		}
 	}
 
@@ -756,7 +694,7 @@ func (k *KingbaseDB) ApplyChanges(tableName string, changes connection.ChangeSet
 
 		for k, v := range row {
 			idx++
-			cols = append(cols, quoteKingbaseIdent(k))
+			cols = append(cols, quoteIdent(k))
 			placeholders = append(placeholders, fmt.Sprintf("$%d", idx))
 			args = append(args, v)
 		}
@@ -767,74 +705,13 @@ func (k *KingbaseDB) ApplyChanges(tableName string, changes connection.ChangeSet
 
 		query := fmt.Sprintf("INSERT INTO %s (%s) VALUES (%s)", qualifiedTable, strings.Join(cols, ", "), strings.Join(placeholders, ", "))
 		if _, err := tx.Exec(query, args...); err != nil {
-			return fmt.Errorf("insert error: %v; sql=%s", err, query)
+			return fmt.Errorf("insert error: %v", err)
 		}
 	}
 
 	return tx.Commit()
 }
 
-func normalizeKingbaseIdentifier(raw string) string {
-	value := strings.TrimSpace(raw)
-	if value == "" {
-		return ""
-	}
-
-	// 兼容 JSON/字符串转义后传入的标识符：\"schema\" -> "schema"
-	value = strings.ReplaceAll(value, `\"`, `"`)
-	value = strings.TrimSpace(value)
-
-	// 兼容异常多重包裹引号（例如 ""schema""、""""schema""""）。
-	// strings.Trim 会移除两端连续引号，迭代后可收敛到纯标识符。
-	for i := 0; i < 4; i++ {
-		next := strings.TrimSpace(strings.Trim(value, `"`))
-		if next == value {
-			break
-		}
-		value = next
-	}
-
-	// 兼容其他方言可能残留的引用形式
-	if len(value) >= 2 && strings.HasPrefix(value, "`") && strings.HasSuffix(value, "`") {
-		value = strings.TrimSpace(strings.Trim(value, "`"))
-	}
-	if len(value) >= 2 && strings.HasPrefix(value, "[") && strings.HasSuffix(value, "]") {
-		value = strings.TrimSpace(value[1 : len(value)-1])
-	}
-
-	return value
-}
-
-func quoteKingbaseIdent(name string) string {
-	n := normalizeKingbaseIdentifier(name)
-	n = strings.ReplaceAll(n, `"`, `""`)
-	if n == "" {
-		return "\"\""
-	}
-	return `"` + n + `"`
-}
-
-func splitKingbaseQualifiedTable(tableName string) (schema string, table string) {
-	raw := strings.TrimSpace(tableName)
-	if raw == "" {
-		return "", ""
-	}
-
-	if parts := strings.SplitN(raw, ".", 2); len(parts) == 2 {
-		schema = normalizeKingbaseIdentifier(parts[0])
-		table = normalizeKingbaseIdentifier(parts[1])
-		if table == "" {
-			return "", normalizeKingbaseIdentifier(raw)
-		}
-		if schema == "" {
-			return "", table
-		}
-		return schema, table
-	}
-
-	return "", normalizeKingbaseIdentifier(raw)
-}
-
 func (k *KingbaseDB) GetAllColumns(dbName string) ([]connection.ColumnDefinitionWithTable, error) {
 	// dbName 在本项目语义里是“数据库”，schema 由 table_schema 决定；这里返回全部用户 schema 的列用于查询提示。
 	query := `

internal/db/kingbase_impl_test.go

@@ -1,74 +0,0 @@
-//go:build gonavi_full_drivers || gonavi_kingbase_driver
-
-package db
-
-import "testing"
-
-func TestNormalizeKingbaseIdentifier(t *testing.T) {
-	tests := []struct {
-		name string
-		in   string
-		want string
-	}{
-		{name: "plain", in: "ldf_server", want: "ldf_server"},
-		{name: "quoted", in: `"ldf_server"`, want: "ldf_server"},
-		{name: "double quoted", in: `""ldf_server""`, want: "ldf_server"},
-		{name: "quad quoted", in: `""""ldf_server""""`, want: "ldf_server"},
-		{name: "escaped quoted", in: `\"ldf_server\"`, want: "ldf_server"},
-		{name: "backtick quoted", in: "`ldf_server`", want: "ldf_server"},
-		{name: "bracket quoted", in: "[ldf_server]", want: "ldf_server"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := normalizeKingbaseIdentifier(tt.in); got != tt.want {
-				t.Fatalf("normalizeKingbaseIdentifier(%q) = %q, want %q", tt.in, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestQuoteKingbaseIdent(t *testing.T) {
-	tests := []struct {
-		name string
-		in   string
-		want string
-	}{
-		{name: "plain", in: "ldf_server", want: `"ldf_server"`},
-		{name: "double quoted", in: `""ldf_server""`, want: `"ldf_server"`},
-		{name: "escaped quoted", in: `\"ldf_server\"`, want: `"ldf_server"`},
-		{name: "with embedded quote", in: `ab"cd`, want: `"ab""cd"`},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := quoteKingbaseIdent(tt.in); got != tt.want {
-				t.Fatalf("quoteKingbaseIdent(%q) = %q, want %q", tt.in, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestSplitKingbaseQualifiedTable(t *testing.T) {
-	tests := []struct {
-		name       string
-		in         string
-		wantSchema string
-		wantTable  string
-	}{
-		{name: "plain qualified", in: "ldf_server.t_user", wantSchema: "ldf_server", wantTable: "t_user"},
-		{name: "double quoted qualified", in: `""ldf_server"".""t_user""`, wantSchema: "ldf_server", wantTable: "t_user"},
-		{name: "escaped qualified", in: `\"ldf_server\".\"t_user\"`, wantSchema: "ldf_server", wantTable: "t_user"},
-		{name: "bracket qualified", in: "[ldf_server].[t_user]", wantSchema: "ldf_server", wantTable: "t_user"},
-		{name: "table only", in: `""t_user""`, wantSchema: "", wantTable: "t_user"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			gotSchema, gotTable := splitKingbaseQualifiedTable(tt.in)
-			if gotSchema != tt.wantSchema || gotTable != tt.wantTable {
-				t.Fatalf("splitKingbaseQualifiedTable(%q) = (%q, %q), want (%q, %q)", tt.in, gotSchema, gotTable, tt.wantSchema, tt.wantTable)
-			}
-		})
-	}
-}

internal/db/mariadb_impl.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"net/url"
 	"strings"
 	"time"
 
@@ -41,10 +40,9 @@ func (m *MariaDB) getDSN(config connection.ConnectionConfig) string {
 	}
 
 	timeout := getConnectTimeoutSeconds(config)
-	tlsMode := resolveMySQLTLSMode(config)
 
-	return fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local&timeout=%ds&tls=%s",
-		config.User, config.Password, protocol, address, database, timeout, url.QueryEscape(tlsMode))
+	return fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local&timeout=%ds",
+		config.User, config.Password, protocol, address, database, timeout)
 }
 
 func (m *MariaDB) Connect(config connection.ConnectionConfig) error {

internal/db/mongodb_impl.go

@@ -4,7 +4,6 @@ package db
 
 import (
 	"context"
-	"crypto/tls"
 	"fmt"
 	"net"
 	"net/url"
@@ -328,60 +327,35 @@ func (m *MongoDB) Connect(config connection.ConnectionConfig) error {
 		m.database = "admin"
 	}
 
-	sslAttempts := []connection.ConnectionConfig{connectConfig}
-	if shouldTrySSLPreferredFallback(connectConfig) {
-		sslAttempts = append(sslAttempts, withSSLDisabled(connectConfig))
-	}
-
+	attemptConfigs := buildMongoAuthAttempts(connectConfig)
 	var errorDetails []string
-	for sslIndex, sslConfig := range sslAttempts {
-		sslLabel := "SSL"
-		if sslIndex > 0 {
-			sslLabel = "明文回退"
+	for index, attemptConfig := range attemptConfigs {
+		authLabel := "主库凭据"
+		if index > 0 {
+			authLabel = "从库凭据"
 		}
 
-		attemptConfigs := buildMongoAuthAttempts(sslConfig)
-		for index, attemptConfig := range attemptConfigs {
-			authLabel := "主库凭据"
-			if index > 0 {
-				authLabel = "从库凭据"
-			}
-
-			if sslIndex > 0 {
-				attemptConfig.URI = ""
-			}
-			uri := m.getURI(attemptConfig)
-			clientOpts := options.Client().ApplyURI(uri)
-			tlsEnabled, tlsInsecure := resolveMongoTLSSettings(attemptConfig)
-			if tlsEnabled {
-				clientOpts.SetTLSConfig(&tls.Config{
-					MinVersion:         tls.VersionTLS12,
-					InsecureSkipVerify: tlsInsecure,
-				})
-			}
-			if attemptConfig.UseProxy {
-				clientOpts.SetDialer(&mongoProxyDialer{proxyConfig: attemptConfig.Proxy})
-			}
-			client, err := mongo.Connect(clientOpts)
-			if err != nil {
-				errorDetails = append(errorDetails, fmt.Sprintf("%s %s连接失败: %v", sslLabel, authLabel, err))
-				continue
-			}
-
-			m.client = client
-			if err := m.Ping(); err != nil {
-				ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-				_ = client.Disconnect(ctx)
-				cancel()
-				m.client = nil
-				errorDetails = append(errorDetails, fmt.Sprintf("%s %s验证失败: %v", sslLabel, authLabel, err))
-				continue
-			}
-			if sslIndex > 0 {
-				logger.Warnf("MongoDB SSL 优先连接失败，已回退至明文连接")
-			}
-			return nil
+		uri := m.getURI(attemptConfig)
+		clientOpts := options.Client().ApplyURI(uri)
+		if attemptConfig.UseProxy {
+			clientOpts.SetDialer(&mongoProxyDialer{proxyConfig: attemptConfig.Proxy})
 		}
+		client, err := mongo.Connect(clientOpts)
+		if err != nil {
+			errorDetails = append(errorDetails, fmt.Sprintf("%s连接失败: %v", authLabel, err))
+			continue
+		}
+
+		m.client = client
+		if err := m.Ping(); err != nil {
+			ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+			_ = client.Disconnect(ctx)
+			cancel()
+			m.client = nil
+			errorDetails = append(errorDetails, fmt.Sprintf("%s验证失败: %v", authLabel, err))
+			continue
+		}
+		return nil
 	}
 
 	if len(errorDetails) > 0 {

internal/db/mysql_agent_path.go

@@ -35,32 +35,6 @@ func ResolveOptionalDriverAgentExecutablePath(downloadDir string, driverType str
 	return filepath.Join(root, normalized, optionalDriverAgentExecutableName(normalized)), nil
 }
 
-func ResolveOptionalDriverAgentExecutablePathForVersion(downloadDir string, driverType string, version string) (string, error) {
-	normalized := normalizeRuntimeDriverType(driverType)
-	if strings.TrimSpace(normalized) == "" {
-		return "", fmt.Errorf("驱动类型为空")
-	}
-	root, err := resolveExternalDriverRoot(downloadDir)
-	if err != nil {
-		return "", err
-	}
-
-	if normalized != "mongodb" {
-		return filepath.Join(root, normalized, optionalDriverAgentExecutableName(normalized)), nil
-	}
-
-	baseName := optionalDriverAgentExecutableName(normalized)
-	ext := filepath.Ext(baseName)
-	stem := strings.TrimSuffix(baseName, ext)
-	major := 2
-	trimmed := strings.TrimSpace(version)
-	trimmed = strings.TrimPrefix(trimmed, "v")
-	if strings.HasPrefix(trimmed, "1.") || trimmed == "1" {
-		major = 1
-	}
-	versionedName := fmt.Sprintf("%s-v%d%s", stem, major, ext)
-	return filepath.Join(root, normalized, versionedName), nil
-}
 func ResolveMySQLAgentExecutablePath(downloadDir string) (string, error) {
 	return ResolveOptionalDriverAgentExecutablePath(downloadDir, "mysql")
 }

internal/db/mysql_impl.go

@@ -184,10 +184,9 @@ func (m *MySQLDB) getDSN(config connection.ConnectionConfig) string {
 	}
 
 	timeout := getConnectTimeoutSeconds(config)
-	tlsMode := resolveMySQLTLSMode(config)
 
-	return fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local&timeout=%ds&tls=%s",
-		config.User, config.Password, protocol, address, database, timeout, url.QueryEscape(tlsMode))
+	return fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local&timeout=%ds",
+		config.User, config.Password, protocol, address, database, timeout)
 }
 
 func resolveMySQLCredential(config connection.ConnectionConfig, addressIndex int) (string, string) {

internal/db/optional_driver_agent_impl.go

@@ -9,10 +9,8 @@ import (
 	"io"
 	"os"
 	"os/exec"
-	"runtime"
 	"strings"
 	"sync"
-	"syscall"
 	"time"
 
 	"GoNavi-Wails/internal/connection"
@@ -96,9 +94,6 @@ func newOptionalDriverAgentClient(driverType string, executablePath string) (*op
 		return nil, fmt.Errorf("创建 %s 驱动代理 stderr 失败：%w", driverDisplayName(driverType), err)
 	}
 	if err := cmd.Start(); err != nil {
-		if isWindowsExecutableMachineMismatch(err) {
-			return nil, fmt.Errorf("启动 %s 驱动代理失败：%w（检测到驱动代理与当前系统架构不兼容，请在驱动管理中重新安装启用）", driverDisplayName(driverType), err)
-		}
 		return nil, fmt.Errorf("启动 %s 驱动代理失败：%w", driverDisplayName(driverType), err)
 	}
 
@@ -112,30 +107,6 @@ func newOptionalDriverAgentClient(driverType string, executablePath string) (*op
 	return client, nil
 }
 
-func isWindowsExecutableMachineMismatch(err error) bool {
-	if err == nil || runtime.GOOS != "windows" {
-		return false
-	}
-	var errno syscall.Errno
-	if errors.As(err, &errno) && errno == syscall.Errno(216) {
-		return true
-	}
-	text := strings.ToLower(strings.TrimSpace(err.Error()))
-	if text == "" {
-		return false
-	}
-	if strings.Contains(text, "not compatible with the version of windows") {
-		return true
-	}
-	if strings.Contains(text, "win32") && strings.Contains(text, "compatible") {
-		return true
-	}
-	if strings.Contains(text, "不是有效的win32应用程序") || strings.Contains(text, "无法在win32模式下运行") {
-		return true
-	}
-	return false
-}
-
 func (c *optionalDriverAgentClient) captureStderr(stderr io.Reader) {
 	scanner := bufio.NewScanner(stderr)
 	buffer := make([]byte, 0, 8<<10)

internal/db/oracle_impl.go

@@ -35,23 +35,12 @@ func (o *OracleDB) getDSN(config connection.ConnectionConfig) string {
 	}
 	u.User = url.UserPassword(config.User, config.Password)
 	u.RawPath = "/" + url.PathEscape(database)
-	q := url.Values{}
-	switch normalizedSSLMode(config) {
-	case sslModeRequired:
-		q.Set("SSL", "TRUE")
-		q.Set("SSL VERIFY", "TRUE")
-	case sslModeSkipVerify, sslModePreferred:
-		q.Set("SSL", "TRUE")
-		q.Set("SSL VERIFY", "FALSE")
-	}
-	if encoded := q.Encode(); encoded != "" {
-		u.RawQuery = encoded
-	}
 	return u.String()
 }
 
 func (o *OracleDB) Connect(config connection.ConnectionConfig) error {
-	runConfig := config
+	var dsn string
+	var err error
 	serviceName := strings.TrimSpace(config.Database)
 	if serviceName == "" {
 		return fmt.Errorf("Oracle 连接缺少服务名（Service Name），请在连接配置中填写，例如 ORCLPDB1")
@@ -84,37 +73,22 @@ func (o *OracleDB) Connect(config connection.ConnectionConfig) error {
 		localConfig.Port = port
 		localConfig.UseSSH = false
 
-		runConfig = localConfig
+		dsn = o.getDSN(localConfig)
 		logger.Infof("Oracle 通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
+	} else {
+		dsn = o.getDSN(config)
 	}
 
-	attempts := []connection.ConnectionConfig{runConfig}
-	if shouldTrySSLPreferredFallback(runConfig) {
-		attempts = append(attempts, withSSLDisabled(runConfig))
+	db, err := sql.Open("oracle", dsn)
+	if err != nil {
+		return fmt.Errorf("打开数据库连接失败：%w", err)
 	}
-
-	var failures []string
-	for idx, attempt := range attempts {
-		dsn := o.getDSN(attempt)
-		db, err := sql.Open("oracle", dsn)
-		if err != nil {
-			failures = append(failures, fmt.Sprintf("第%d次连接打开失败: %v", idx+1, err))
-			continue
-		}
-		o.conn = db
-		o.pingTimeout = getConnectTimeout(attempt)
-		if err := o.Ping(); err != nil {
-			_ = db.Close()
-			o.conn = nil
-			failures = append(failures, fmt.Sprintf("第%d次连接验证失败: %v", idx+1, err))
-			continue
-		}
-		if idx > 0 {
-			logger.Warnf("Oracle SSL 优先连接失败，已回退至明文连接")
-		}
-		return nil
+	o.conn = db
+	o.pingTimeout = getConnectTimeout(config)
+	if err := o.Ping(); err != nil {
+		return fmt.Errorf("连接建立后验证失败：%w", err)
 	}
-	return fmt.Errorf("连接建立后验证失败：%s", strings.Join(failures, "；"))
+	return nil
 }
 
 func (o *OracleDB) Close() error {

internal/db/postgres_impl.go

@@ -62,7 +62,7 @@ func (p *PostgresDB) getDSN(config connection.ConnectionConfig) string {
 	}
 	u.User = url.UserPassword(config.User, config.Password)
 	q := url.Values{}
-	q.Set("sslmode", resolvePostgresSSLMode(config))
+	q.Set("sslmode", "disable")
 	q.Set("connect_timeout", strconv.Itoa(getConnectTimeoutSeconds(config)))
 	u.RawQuery = q.Encode()
 
@@ -126,49 +126,34 @@ func (p *PostgresDB) Connect(config connection.ConnectionConfig) error {
 		logger.Infof("PostgreSQL 通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
 	}
 
-	sslAttempts := []connection.ConnectionConfig{runConfig}
-	if shouldTrySSLPreferredFallback(runConfig) {
-		sslAttempts = append(sslAttempts, withSSLDisabled(runConfig))
-	}
-
+	attemptDBs := resolvePostgresConnectDatabases(runConfig)
 	var failures []string
-	for sslIndex, sslConfig := range sslAttempts {
-		sslLabel := "SSL"
-		if sslIndex > 0 {
-			sslLabel = "明文回退"
+	for _, dbName := range attemptDBs {
+		attemptConfig := runConfig
+		attemptConfig.Database = dbName
+		dsn := p.getDSN(attemptConfig)
+
+		dbConn, err := sql.Open("postgres", dsn)
+		if err != nil {
+			failures = append(failures, fmt.Sprintf("数据库=%s 打开连接失败: %v", dbName, err))
+			continue
+		}
+		p.conn = dbConn
+
+		// Force verification
+		if err := p.Ping(); err != nil {
+			failures = append(failures, fmt.Sprintf("数据库=%s 验证失败: %v", dbName, err))
+			_ = dbConn.Close()
+			p.conn = nil
+			continue
 		}
 
-		attemptDBs := resolvePostgresConnectDatabases(sslConfig)
-		for _, dbName := range attemptDBs {
-			attemptConfig := sslConfig
-			attemptConfig.Database = dbName
-			dsn := p.getDSN(attemptConfig)
-
-			dbConn, err := sql.Open("postgres", dsn)
-			if err != nil {
-				failures = append(failures, fmt.Sprintf("%s 数据库=%s 打开连接失败: %v", sslLabel, dbName, err))
-				continue
-			}
-			p.conn = dbConn
-
-			// Force verification
-			if err := p.Ping(); err != nil {
-				failures = append(failures, fmt.Sprintf("%s 数据库=%s 验证失败: %v", sslLabel, dbName, err))
-				_ = dbConn.Close()
-				p.conn = nil
-				continue
-			}
-
-			if sslIndex > 0 {
-				logger.Warnf("PostgreSQL SSL 优先连接失败，已回退至明文连接")
-			}
-			if strings.TrimSpace(config.Database) == "" && !strings.EqualFold(dbName, "postgres") {
-				logger.Infof("PostgreSQL 自动选择连接数据库：%s", dbName)
-			}
-
-			cleanupOnFailure = false
-			return nil
+		if strings.TrimSpace(config.Database) == "" && !strings.EqualFold(dbName, "postgres") {
+			logger.Infof("PostgreSQL 自动选择连接数据库：%s", dbName)
 		}
+
+		cleanupOnFailure = false
+		return nil
 	}
 
 	if len(failures) == 0 {

internal/db/query_value.go

@@ -1,4 +1,4 @@
-package db
+package db
 
 import (
 	"encoding/hex"
@@ -8,7 +8,6 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
-	"time"
 	"unicode"
 	"unicode/utf8"
 )
@@ -31,44 +30,12 @@ func normalizeQueryValue(v interface{}) interface{} {
 }
 
 func normalizeQueryValueWithDBType(v interface{}, databaseTypeName string) interface{} {
-	if tm, ok := v.(time.Time); ok {
-		return normalizeTemporalValueForDisplay(tm, databaseTypeName)
-	}
 	if b, ok := v.([]byte); ok {
 		return bytesToDisplayValue(b, databaseTypeName)
 	}
 	return normalizeCompositeQueryValue(v)
 }
 
-func normalizeTemporalValueForDisplay(value time.Time, databaseTypeName string) interface{} {
-	if value.IsZero() {
-		if zeroValue, ok := zeroTemporalDisplayValue(databaseTypeName); ok {
-			return zeroValue
-		}
-	}
-	return value.Format(time.RFC3339Nano)
-}
-
-func zeroTemporalDisplayValue(databaseTypeName string) (string, bool) {
-	typeName := strings.ToUpper(strings.TrimSpace(databaseTypeName))
-	if typeName == "" {
-		return "0000-00-00 00:00:00", true
-	}
-
-	switch {
-	case strings.Contains(typeName, "TIMESTAMP") || strings.Contains(typeName, "DATETIME"):
-		return "0000-00-00 00:00:00", true
-	case typeName == "DATE" || typeName == "NEWDATE":
-		return "0000-00-00", true
-	case strings.Contains(typeName, "TIME"):
-		return "00:00:00", true
-	case strings.Contains(typeName, "YEAR"):
-		return "0000", true
-	default:
-		return "", false
-	}
-}
-
 func normalizeCompositeQueryValue(v interface{}) interface{} {
 	if v == nil {
 		return nil
@@ -119,16 +86,6 @@ func normalizeCompositeQueryValue(v interface{}) interface{} {
 			items[i] = normalizeQueryValue(rv.Index(i).Interface())
 		}
 		return items
-	case reflect.Struct:
-		// 部分驱动（如 Kingbase）会返回复杂结构体值，直接透传会导致前端渲染和比较开销激增。
-		// 统一降级为可读字符串，避免对象深层序列化触发 UI 卡顿。
-		if tm, ok := v.(time.Time); ok {
-			return normalizeTemporalValueForDisplay(tm, "")
-		}
-		if stringer, ok := v.(fmt.Stringer); ok {
-			return stringer.String()
-		}
-		return fmt.Sprintf("%v", v)
 	default:
 		return normalizeUnsafeIntegerForJS(rv, v)
 	}

internal/db/query_value_test.go

@@ -2,9 +2,7 @@ package db
 
 import (
 	"encoding/json"
-	"fmt"
 	"testing"
-	"time"
 )
 
 type duckMapLike map[any]any
@@ -167,61 +165,3 @@ func TestNormalizeQueryValueWithDBType_JSONNumber(t *testing.T) {
 		})
 	}
 }
-
-type customStructValue struct {
-	Name string
-	Age  int
-}
-
-func (v customStructValue) String() string {
-	return fmt.Sprintf("%s-%d", v.Name, v.Age)
-}
-
-func TestNormalizeQueryValueWithDBType_StructToString(t *testing.T) {
-	got := normalizeQueryValueWithDBType(customStructValue{Name: "alice", Age: 18}, "")
-	if got != "alice-18" {
-		t.Fatalf("结构体应降级为可读字符串，实际=%v(%T)", got, got)
-	}
-}
-
-func TestNormalizeQueryValueWithDBType_TimeStructToRFC3339(t *testing.T) {
-	input := time.Date(2026, 3, 5, 18, 30, 15, 123456789, time.UTC)
-	got := normalizeQueryValueWithDBType(input, "")
-	text, ok := got.(string)
-	if !ok {
-		t.Fatalf("time.Time 应转为字符串，实际=%v(%T)", got, got)
-	}
-	if text != "2026-03-05T18:30:15.123456789Z" {
-		t.Fatalf("time.Time 规整值异常，实际=%s", text)
-	}
-}
-
-func TestNormalizeQueryValueWithDBType_ZeroTemporalValues(t *testing.T) {
-	zero := time.Time{}
-	cases := []struct {
-		name     string
-		dbType   string
-		wantText string
-	}{
-		{name: "date", dbType: "DATE", wantText: "0000-00-00"},
-		{name: "newdate", dbType: "NEWDATE", wantText: "0000-00-00"},
-		{name: "datetime", dbType: "DATETIME", wantText: "0000-00-00 00:00:00"},
-		{name: "timestamp", dbType: "TIMESTAMP", wantText: "0000-00-00 00:00:00"},
-		{name: "time", dbType: "TIME", wantText: "00:00:00"},
-		{name: "year", dbType: "YEAR", wantText: "0000"},
-		{name: "unknown", dbType: "", wantText: "0000-00-00 00:00:00"},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			got := normalizeQueryValueWithDBType(zero, tc.dbType)
-			text, ok := got.(string)
-			if !ok {
-				t.Fatalf("期望 string，实际=%v(%T)", got, got)
-			}
-			if text != tc.wantText {
-				t.Fatalf("dbType=%s 期望=%s，实际=%s", tc.dbType, tc.wantText, text)
-			}
-		})
-	}
-}

internal/db/sqlserver_impl.go

@@ -47,9 +47,8 @@ func (s *SqlServerDB) getDSN(config connection.ConnectionConfig) string {
 	q := url.Values{}
 	q.Set("database", dbname)
 	q.Set("connection timeout", strconv.Itoa(getConnectTimeoutSeconds(config)))
-	encrypt, trustServerCertificate := resolveSQLServerTLSSettings(config)
-	q.Set("encrypt", encrypt)
-	q.Set("TrustServerCertificate", trustServerCertificate)
+	q.Set("encrypt", "disable")
+	q.Set("TrustServerCertificate", "true")
 	u.RawQuery = q.Encode()
 
 	return u.String()

internal/db/ssl_mode.go

@@ -1,122 +0,0 @@
-package db
-
-import (
-	"crypto/tls"
-	"strings"
-
-	"GoNavi-Wails/internal/connection"
-)
-
-const (
-	sslModeDisable    = "disable"
-	sslModePreferred  = "preferred"
-	sslModeRequired   = "required"
-	sslModeSkipVerify = "skip-verify"
-)
-
-func normalizeSSLModeValue(raw string) string {
-	mode := strings.ToLower(strings.TrimSpace(raw))
-	switch mode {
-	case "", sslModePreferred, "prefer":
-		return sslModePreferred
-	case sslModeRequired, "require", "on", "true", "mandatory", "strict":
-		return sslModeRequired
-	case sslModeSkipVerify, "insecure", "skipverify", "skip_verify", "insecure-skip-verify":
-		return sslModeSkipVerify
-	case sslModeDisable, "disabled", "off", "false", "none":
-		return sslModeDisable
-	default:
-		return sslModePreferred
-	}
-}
-
-func normalizedSSLMode(config connection.ConnectionConfig) string {
-	if !config.UseSSL {
-		return sslModeDisable
-	}
-	return normalizeSSLModeValue(config.SSLMode)
-}
-
-func shouldTrySSLPreferredFallback(config connection.ConnectionConfig) bool {
-	return config.UseSSL && normalizeSSLModeValue(config.SSLMode) == sslModePreferred
-}
-
-func withSSLDisabled(config connection.ConnectionConfig) connection.ConnectionConfig {
-	next := config
-	next.UseSSL = false
-	next.SSLMode = sslModeDisable
-	return next
-}
-
-func resolveMySQLTLSMode(config connection.ConnectionConfig) string {
-	switch normalizedSSLMode(config) {
-	case sslModeDisable:
-		return "false"
-	case sslModeRequired:
-		return "true"
-	case sslModeSkipVerify:
-		return "skip-verify"
-	default:
-		return "preferred"
-	}
-}
-
-func resolvePostgresSSLMode(config connection.ConnectionConfig) string {
-	switch normalizedSSLMode(config) {
-	case sslModeDisable:
-		return "disable"
-	case sslModeRequired:
-		return "require"
-	case sslModeSkipVerify:
-		return "require"
-	default:
-		return "require"
-	}
-}
-
-func resolveSQLServerTLSSettings(config connection.ConnectionConfig) (encrypt string, trustServerCertificate string) {
-	switch normalizedSSLMode(config) {
-	case sslModeDisable:
-		return "disable", "true"
-	case sslModeRequired:
-		return "true", "false"
-	case sslModeSkipVerify:
-		return "true", "true"
-	default:
-		return "false", "true"
-	}
-}
-
-func resolveGenericTLSConfig(config connection.ConnectionConfig) *tls.Config {
-	switch normalizedSSLMode(config) {
-	case sslModeDisable:
-		return nil
-	case sslModeRequired:
-		return &tls.Config{MinVersion: tls.VersionTLS12}
-	case sslModeSkipVerify:
-		return &tls.Config{MinVersion: tls.VersionTLS12, InsecureSkipVerify: true}
-	default:
-		// Preferred: 先尝试 TLS（为提升兼容性默认跳过证书校验），失败时由调用方按需回退明文。
-		return &tls.Config{MinVersion: tls.VersionTLS12, InsecureSkipVerify: true}
-	}
-}
-
-func resolveMongoTLSSettings(config connection.ConnectionConfig) (enabled bool, insecure bool) {
-	switch normalizedSSLMode(config) {
-	case sslModeDisable:
-		return false, false
-	case sslModeRequired:
-		return true, false
-	case sslModeSkipVerify:
-		return true, true
-	default:
-		return true, true
-	}
-}
-
-func resolveTDengineNet(config connection.ConnectionConfig) string {
-	if normalizedSSLMode(config) == sslModeDisable {
-		return "ws"
-	}
-	return "wss"
-}

internal/db/tdengine_impl.go

@@ -40,12 +40,11 @@ func (t *TDengineDB) getDSN(config connection.ConnectionConfig) string {
 		path = "/" + dbName
 	}
 
-	netType := resolveTDengineNet(config)
-	return fmt.Sprintf("%s:%s@%s(%s)%s", user, pass, netType, net.JoinHostPort(config.Host, strconv.Itoa(config.Port)), path)
+	return fmt.Sprintf("%s:%s@ws(%s)%s", user, pass, net.JoinHostPort(config.Host, strconv.Itoa(config.Port)), path)
 }
 
 func (t *TDengineDB) Connect(config connection.ConnectionConfig) error {
-	runConfig := config
+	var dsn string
 
 	if config.UseSSH {
 		logger.Infof("TDengine 使用 SSH 连接：地址=%s:%d 用户=%s", config.Host, config.Port, config.User)
@@ -69,38 +68,23 @@ func (t *TDengineDB) Connect(config connection.ConnectionConfig) error {
 		localConfig.Host = host
 		localConfig.Port = port
 		localConfig.UseSSH = false
-		runConfig = localConfig
+		dsn = t.getDSN(localConfig)
 		logger.Infof("TDengine 通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
+	} else {
+		dsn = t.getDSN(config)
 	}
 
-	attempts := []connection.ConnectionConfig{runConfig}
-	if shouldTrySSLPreferredFallback(runConfig) {
-		attempts = append(attempts, withSSLDisabled(runConfig))
+	db, err := sql.Open("taosWS", dsn)
+	if err != nil {
+		return fmt.Errorf("打开数据库连接失败：%w", err)
 	}
+	t.conn = db
+	t.pingTimeout = getConnectTimeout(config)
 
-	var failures []string
-	for idx, attempt := range attempts {
-		dsn := t.getDSN(attempt)
-		db, err := sql.Open("taosWS", dsn)
-		if err != nil {
-			failures = append(failures, fmt.Sprintf("第%d次连接打开失败: %v", idx+1, err))
-			continue
-		}
-		t.conn = db
-		t.pingTimeout = getConnectTimeout(attempt)
-
-		if err := t.Ping(); err != nil {
-			_ = db.Close()
-			t.conn = nil
-			failures = append(failures, fmt.Sprintf("第%d次连接验证失败: %v", idx+1, err))
-			continue
-		}
-		if idx > 0 {
-			logger.Warnf("TDengine SSL 优先连接失败，已回退至明文连接")
-		}
-		return nil
+	if err := t.Ping(); err != nil {
+		return fmt.Errorf("连接建立后验证失败：%w", err)
 	}
-	return fmt.Errorf("连接建立后验证失败：%s", strings.Join(failures, "；"))
+	return nil
 }
 
 func (t *TDengineDB) Close() error {

internal/db/vastbase_impl.go

@@ -41,7 +41,7 @@ func (v *VastbaseDB) getDSN(config connection.ConnectionConfig) string {
 	}
 	u.User = url.UserPassword(config.User, config.Password)
 	q := url.Values{}
-	q.Set("sslmode", resolvePostgresSSLMode(config))
+	q.Set("sslmode", "disable")
 	q.Set("connect_timeout", strconv.Itoa(getConnectTimeoutSeconds(config)))
 	u.RawQuery = q.Encode()
 
@@ -49,7 +49,7 @@ func (v *VastbaseDB) getDSN(config connection.ConnectionConfig) string {
 }
 
 func (v *VastbaseDB) Connect(config connection.ConnectionConfig) error {
-	runConfig := config
+	var dsn string
 
 	if config.UseSSH {
 		logger.Infof("Vastbase 使用 SSH 连接：地址=%s:%d 用户=%s", config.Host, config.Port, config.User)
@@ -75,37 +75,23 @@ func (v *VastbaseDB) Connect(config connection.ConnectionConfig) error {
 		localConfig.Port = port
 		localConfig.UseSSH = false
 
-		runConfig = localConfig
+		dsn = v.getDSN(localConfig)
 		logger.Infof("Vastbase 通过本地端口转发连接：%s -> %s:%d", forwarder.LocalAddr, config.Host, config.Port)
+	} else {
+		dsn = v.getDSN(config)
 	}
 
-	attempts := []connection.ConnectionConfig{runConfig}
-	if shouldTrySSLPreferredFallback(runConfig) {
-		attempts = append(attempts, withSSLDisabled(runConfig))
+	db, err := sql.Open("postgres", dsn)
+	if err != nil {
+		return fmt.Errorf("打开数据库连接失败：%w", err)
 	}
+	v.conn = db
+	v.pingTimeout = getConnectTimeout(config)
 
-	var failures []string
-	for idx, attempt := range attempts {
-		dsn := v.getDSN(attempt)
-		db, err := sql.Open("postgres", dsn)
-		if err != nil {
-			failures = append(failures, fmt.Sprintf("第%d次连接打开失败: %v", idx+1, err))
-			continue
-		}
-		v.conn = db
-		v.pingTimeout = getConnectTimeout(attempt)
-		if err := v.Ping(); err != nil {
-			_ = db.Close()
-			v.conn = nil
-			failures = append(failures, fmt.Sprintf("第%d次连接验证失败: %v", idx+1, err))
-			continue
-		}
-		if idx > 0 {
-			logger.Warnf("Vastbase SSL 优先连接失败，已回退至明文连接")
-		}
-		return nil
+	if err := v.Ping(); err != nil {
+		return fmt.Errorf("连接建立后验证失败：%w", err)
 	}
-	return fmt.Errorf("连接建立后验证失败：%s", strings.Join(failures, "；"))
+	return nil
 }
 
 func (v *VastbaseDB) Close() error {

internal/redis/redis_impl.go

@@ -2,7 +2,6 @@ package redis
 
 import (
 	"context"
-	"crypto/tls"
 	"fmt"
 	"net"
 	"strconv"
@@ -202,48 +201,25 @@ func (r *RedisClientImpl) Connect(config connection.ConnectionConfig) error {
 
 	timeout := normalizeRedisTimeout(config.Timeout)
 	if r.isCluster {
-		attempts := []connection.ConnectionConfig{config}
-		if shouldTryRedisSSLPreferredFallback(config) {
-			attempts = append(attempts, withRedisSSLDisabled(config))
+		opts := &redis.ClusterOptions{
+			Addrs:        seedAddrs,
+			Username:     strings.TrimSpace(config.User),
+			Password:     config.Password,
+			DialTimeout:  timeout,
+			ReadTimeout:  timeout,
+			WriteTimeout: timeout,
 		}
-
-		var failures []string
-		for idx, attempt := range attempts {
-			var tlsConfig *tls.Config
-			if cfg := resolveRedisTLSConfig(attempt); cfg != nil {
-				if host, _, err := net.SplitHostPort(seedAddrs[0]); err == nil && host != "" {
-					cfg.ServerName = host
-				}
-				tlsConfig = cfg
-			}
-			opts := &redis.ClusterOptions{
-				Addrs:        seedAddrs,
-				Username:     strings.TrimSpace(attempt.User),
-				Password:     attempt.Password,
-				DialTimeout:  timeout,
-				ReadTimeout:  timeout,
-				WriteTimeout: timeout,
-				TLSConfig:    tlsConfig,
-			}
-			clusterClient := redis.NewClusterClient(opts)
-			ctx, cancel := context.WithTimeout(context.Background(), timeout)
-			pingErr := clusterClient.Ping(ctx).Err()
-			cancel()
-			if pingErr != nil {
-				clusterClient.Close()
-				failures = append(failures, fmt.Sprintf("第%d次连接失败: %v", idx+1, pingErr))
-				continue
-			}
-			r.client = clusterClient
-			r.clusterClient = clusterClient
-			r.config = attempt
-			if idx > 0 {
-				logger.Warnf("Redis 集群 SSL 优先连接失败，已回退至明文连接")
-			}
-			logger.Infof("Redis 集群连接成功: seeds=%s 逻辑库=db%d", strings.Join(seedAddrs, ","), r.currentDB)
-			return nil
+		clusterClient := redis.NewClusterClient(opts)
+		ctx, cancel := context.WithTimeout(context.Background(), timeout)
+		defer cancel()
+		if err := clusterClient.Ping(ctx).Err(); err != nil {
+			clusterClient.Close()
+			return fmt.Errorf("Redis 集群连接失败: %w", err)
 		}
-		return fmt.Errorf("Redis 集群连接失败: %s", strings.Join(failures, "；"))
+		r.client = clusterClient
+		r.clusterClient = clusterClient
+		logger.Infof("Redis 集群连接成功: seeds=%s 逻辑库=db%d", strings.Join(seedAddrs, ","), r.currentDB)
+		return nil
 	}
 
 	addr := seedAddrs[0]
@@ -257,53 +233,29 @@ func (r *RedisClientImpl) Connect(config connection.ConnectionConfig) error {
 		logger.Infof("Redis 通过 SSH 隧道连接: %s -> %s:%d", addr, config.Host, config.Port)
 	}
 
-	attempts := []connection.ConnectionConfig{config}
-	if shouldTryRedisSSLPreferredFallback(config) {
-		attempts = append(attempts, withRedisSSLDisabled(config))
+	opts := &redis.Options{
+		Addr:         addr,
+		Username:     strings.TrimSpace(config.User),
+		Password:     config.Password,
+		DB:           r.currentDB,
+		DialTimeout:  timeout,
+		ReadTimeout:  timeout,
+		WriteTimeout: timeout,
 	}
 
-	var failures []string
-	for idx, attempt := range attempts {
-		var tlsConfig *tls.Config
-		if cfg := resolveRedisTLSConfig(attempt); cfg != nil {
-			if host, _, err := net.SplitHostPort(addr); err == nil && host != "" {
-				cfg.ServerName = host
-			}
-			tlsConfig = cfg
-		}
+	singleClient := redis.NewClient(opts)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
 
-		opts := &redis.Options{
-			Addr:         addr,
-			Username:     strings.TrimSpace(attempt.User),
-			Password:     attempt.Password,
-			DB:           r.currentDB,
-			DialTimeout:  timeout,
-			ReadTimeout:  timeout,
-			WriteTimeout: timeout,
-			TLSConfig:    tlsConfig,
-		}
-
-		singleClient := redis.NewClient(opts)
-		ctx, cancel := context.WithTimeout(context.Background(), timeout)
-		pingErr := singleClient.Ping(ctx).Err()
-		cancel()
-		if pingErr != nil {
-			singleClient.Close()
-			failures = append(failures, fmt.Sprintf("第%d次连接失败: %v", idx+1, pingErr))
-			continue
-		}
-
-		r.client = singleClient
-		r.singleClient = singleClient
-		r.config = attempt
-		if idx > 0 {
-			logger.Warnf("Redis SSL 优先连接失败，已回退至明文连接")
-		}
-		logger.Infof("Redis 连接成功: %s DB=%d", addr, r.currentDB)
-		return nil
+	if err := singleClient.Ping(ctx).Err(); err != nil {
+		singleClient.Close()
+		return fmt.Errorf("Redis 连接失败: %w", err)
 	}
 
-	return fmt.Errorf("Redis 连接失败: %s", strings.Join(failures, "；"))
+	r.client = singleClient
+	r.singleClient = singleClient
+	logger.Infof("Redis 连接成功: %s DB=%d", addr, r.currentDB)
+	return nil
 }
 
 // Close closes the Redis connection

internal/redis/ssl_mode.go

@@ -1,55 +0,0 @@
-package redis
-
-import (
-	"crypto/tls"
-	"strings"
-
-	"GoNavi-Wails/internal/connection"
-)
-
-func normalizeRedisSSLMode(raw string) string {
-	mode := strings.ToLower(strings.TrimSpace(raw))
-	switch mode {
-	case "", "preferred", "prefer":
-		return "preferred"
-	case "required", "require", "on", "true", "mandatory", "strict":
-		return "required"
-	case "skip-verify", "insecure", "skipverify", "skip_verify", "insecure-skip-verify":
-		return "skip-verify"
-	case "disable", "disabled", "off", "false", "none":
-		return "disable"
-	default:
-		return "preferred"
-	}
-}
-
-func redisSSLMode(config connection.ConnectionConfig) string {
-	if !config.UseSSL {
-		return "disable"
-	}
-	return normalizeRedisSSLMode(config.SSLMode)
-}
-
-func shouldTryRedisSSLPreferredFallback(config connection.ConnectionConfig) bool {
-	return config.UseSSL && normalizeRedisSSLMode(config.SSLMode) == "preferred"
-}
-
-func withRedisSSLDisabled(config connection.ConnectionConfig) connection.ConnectionConfig {
-	next := config
-	next.UseSSL = false
-	next.SSLMode = "disable"
-	return next
-}
-
-func resolveRedisTLSConfig(config connection.ConnectionConfig) *tls.Config {
-	switch redisSSLMode(config) {
-	case "disable":
-		return nil
-	case "required":
-		return &tls.Config{MinVersion: tls.VersionTLS12}
-	case "skip-verify":
-		return &tls.Config{MinVersion: tls.VersionTLS12, InsecureSkipVerify: true}
-	default:
-		return &tls.Config{MinVersion: tls.VersionTLS12, InsecureSkipVerify: true}
-	}
-}