feat: enable driver management on web version
- Extract JDBC driver/plugin logic from Tauri commands to dbx-core::jdbc - Add web API routes for JDBC drivers, JDBC plugin, Agent JAR import, system fonts - Upgrade zip crate from v2 to v4 in dbx-core - Replace http.ts stubs with real HTTP calls (support File and string paths) - Remove isWeb restrictions in DriverStoreDialog, add browser file picker support - Fix Mac traffic light inset incorrectly applied on web version - Show driver management toolbar button on web version
This commit is contained in:
1 parent
c55a31b294
commit
6e0f4e1dc3
15 files changed
+635
-374
No files matched your search
@@ -273,6 +273,34 @@ function chooseWebOfflineZip(): Promise<File | null> {
|
||||
});
|
||||
}
|
||||
|
||||
function chooseWebFiles(accept: string, multiple: boolean): Promise<File[] | null> {
|
||||
return new Promise((resolve) => {
|
||||
const input = document.createElement("input");
|
||||
input.type = "file";
|
||||
input.accept = accept;
|
||||
input.multiple = multiple;
|
||||
input.onchange = () => {
|
||||
const files = input.files;
|
||||
if (!files || files.length === 0) {
|
||||
resolve(null);
|
||||
return;
|
||||
}
|
||||
resolve(Array.from(files));
|
||||
};
|
||||
input.click();
|
||||
});
|
||||
}
|
||||
|
||||
function chooseWebFile(accept: string): Promise<File | null> {
|
||||
return new Promise((resolve) => {
|
||||
const input = document.createElement("input");
|
||||
input.type = "file";
|
||||
input.accept = accept;
|
||||
input.onchange = () => resolve(input.files?.[0] ?? null);
|
||||
input.click();
|
||||
});
|
||||
}
|
||||
|
||||
async function importOfflineZip() {
|
||||
if (importingZip.value) return;
|
||||
let selected: string | File | null = null;
|
||||
@@ -303,7 +331,19 @@ async function importOfflineZip() {
|
||||
}
|
||||
|
||||
async function importDriverJar(dbType: string) {
|
||||
if (isWeb) return;
|
||||
const label = drivers.value.find((d) => d.db_type === dbType)?.label ?? dbType;
|
||||
if (isWeb) {
|
||||
const file = await chooseWebFile(".jar");
|
||||
if (!file) return;
|
||||
try {
|
||||
await api.importAgentJar(dbType, file);
|
||||
await refreshAgents();
|
||||
toast(`${label} 驱动导入成功`);
|
||||
} catch (e: any) {
|
||||
toast(`${label} 驱动导入失败: ${e}`);
|
||||
}
|
||||
return;
|
||||
}
|
||||
const { open } = await import("@tauri-apps/plugin-dialog");
|
||||
const selected = await open({
|
||||
title: "选择驱动 JAR 文件",
|
||||
@@ -311,7 +351,6 @@ async function importDriverJar(dbType: string) {
|
||||
filters: [{ name: "JAR", extensions: ["jar"] }],
|
||||
});
|
||||
if (typeof selected !== "string") return;
|
||||
const label = drivers.value.find((d) => d.db_type === dbType)?.label ?? dbType;
|
||||
try {
|
||||
await api.importAgentJar(dbType, selected);
|
||||
await refreshAgents();
|
||||
@@ -373,7 +412,6 @@ function jreUsageLabel(key: string) {
|
||||
}
|
||||
|
||||
async function loadJdbcDrivers() {
|
||||
if (isWeb) return;
|
||||
isLoadingJdbcDrivers.value = true;
|
||||
try {
|
||||
jdbcDrivers.value = await api.listJdbcDrivers();
|
||||
@@ -394,7 +432,6 @@ async function loadDriverStoreUsage() {
|
||||
}
|
||||
|
||||
async function loadJdbcPluginStatus() {
|
||||
if (isWeb) return;
|
||||
try {
|
||||
jdbcPluginStatus.value = await api.jdbcPluginStatus();
|
||||
emitDriverUpdateCount();
|
||||
@@ -404,7 +441,7 @@ async function loadJdbcPluginStatus() {
|
||||
}
|
||||
|
||||
async function installJdbcPlugin() {
|
||||
if (isWeb || isInstallingJdbcPlugin.value) return;
|
||||
if (isInstallingJdbcPlugin.value) return;
|
||||
isInstallingJdbcPlugin.value = true;
|
||||
try {
|
||||
jdbcPluginStatus.value = await api.installJdbcPlugin();
|
||||
@@ -419,14 +456,20 @@ async function installJdbcPlugin() {
|
||||
}
|
||||
|
||||
async function installJdbcPluginLocal() {
|
||||
if (isWeb || isInstallingJdbcPlugin.value) return;
|
||||
const { open } = await import("@tauri-apps/plugin-dialog");
|
||||
const selected = await open({
|
||||
title: "选择 JDBC 插件 zip 文件",
|
||||
multiple: false,
|
||||
filters: [{ name: "ZIP", extensions: ["zip"] }],
|
||||
});
|
||||
if (typeof selected !== "string") return;
|
||||
if (isInstallingJdbcPlugin.value) return;
|
||||
let selected: string | File | null = null;
|
||||
if (isWeb) {
|
||||
selected = await chooseWebFile(".zip");
|
||||
} else {
|
||||
const { open } = await import("@tauri-apps/plugin-dialog");
|
||||
const result = await open({
|
||||
title: "选择 JDBC 插件 zip 文件",
|
||||
multiple: false,
|
||||
filters: [{ name: "ZIP", extensions: ["zip"] }],
|
||||
});
|
||||
selected = typeof result === "string" ? result : null;
|
||||
}
|
||||
if (!selected) return;
|
||||
isInstallingJdbcPlugin.value = true;
|
||||
try {
|
||||
jdbcPluginStatus.value = await api.installJdbcPluginLocal(selected);
|
||||
@@ -441,7 +484,7 @@ async function installJdbcPluginLocal() {
|
||||
}
|
||||
|
||||
async function uninstallJdbcPlugin() {
|
||||
if (isWeb || isUninstallingJdbcPlugin.value) return;
|
||||
if (isUninstallingJdbcPlugin.value) return;
|
||||
isUninstallingJdbcPlugin.value = true;
|
||||
try {
|
||||
jdbcPluginStatus.value = await api.uninstallJdbcPlugin();
|
||||
@@ -468,7 +511,18 @@ async function importJdbcDriverPaths(paths: string[]) {
|
||||
}
|
||||
|
||||
async function importJdbcDrivers() {
|
||||
if (isWeb) return;
|
||||
if (isWeb) {
|
||||
const files = await chooseWebFiles(".jar", true);
|
||||
if (!files || !files.length) return;
|
||||
try {
|
||||
jdbcDrivers.value = await api.importJdbcDrivers(files);
|
||||
void loadDriverStoreUsage();
|
||||
toast(t("settings.jdbcImportSuccess", { count: files.length }));
|
||||
} catch (e: any) {
|
||||
toast(String(e?.message || e), 5000);
|
||||
}
|
||||
return;
|
||||
}
|
||||
const { open } = await import("@tauri-apps/plugin-dialog");
|
||||
const selected = await open({
|
||||
title: t("settings.jdbcImport"),
|
||||
|
||||
@@ -82,7 +82,7 @@ function onToolbarDblClick(e: MouseEvent) {
|
||||
<template>
|
||||
<div
|
||||
class="h-10 flex items-center gap-1 px-2 border-b bg-muted/30 shrink-0"
|
||||
:class="{ 'pl-17.5': shouldReserveMacTrafficLightInset(isMac, isFullscreen) }"
|
||||
:class="{ 'pl-17.5': shouldReserveMacTrafficLightInset(isMac, isFullscreen, isDesktop) }"
|
||||
data-tauri-drag-region
|
||||
@dblclick="onToolbarDblClick"
|
||||
>
|
||||
@@ -147,7 +147,6 @@ function onToolbarDblClick(e: MouseEvent) {
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
v-if="isDesktop"
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
class="h-8 px-2 text-xs gap-1"
|
||||
|
||||
Reference in new issue
Block a user