diff --git a/src/api/backend.ts b/src/api/backend.ts index 5b95724..218d32a 100644 --- a/src/api/backend.ts +++ b/src/api/backend.ts @@ -1,29 +1,27 @@ -import { useRoute } from "vue-router" + import db from "@/database" -import { invoke } from "@tauri-apps/api/core" -const getConnectionInfo = async () => { - const route = useRoute() - const id = Number(route.query.id) - return db.connection.get(id); -} +import {invoke} from "@tauri-apps/api/core" +import {useTabStore} from "@/store/tabs.ts"; export interface ResponseBody { code: number, - data:T, + data: T, msg: string } -export const RReq = async (action:string, data: any) => { - const info = await getConnectionInfo() - return invoke>("request",{ - rid:Math.random().toString(36), - action, - data:JSON.stringify(data), - connectionInfo:info - }) +export const Req = async (action: string, data: any) => { + const tabs = useTabStore() + const id = Number(tabs.activeTab?.id || '0') + const info = await db.connection.get(id); + return invoke>("request", { + rid: Math.random().toString(36), + action, + data: JSON.stringify(data), + connectionInfo: info + }) } -export function status(data:any) { - return RReq("/status",data) +export function status(data: any) { + return Req("/status", data) } diff --git a/src/i18n/en.ts b/src/i18n/en.ts index 2b9cfe4..a2bfe53 100644 --- a/src/i18n/en.ts +++ b/src/i18n/en.ts @@ -2,11 +2,11 @@ export default { layout: { host: 'Hosts', settings: "Settings", - add:"New Host", - edit :"Edit Host", + add: "New Host", + edit: "Edit Host", hostForm: { name: "Host Name", - normal:"Normal Arguments", + normal: "Normal Arguments", submit: "Submit", save: "Save", delete: "Delete", @@ -29,6 +29,11 @@ export default { password: { placeholder: "Password" }, + }, + connection: { + host: "Host", + cluster: "Cluster Type", + close: "Close" } }, settings: { diff --git a/src/i18n/zh_cn.ts b/src/i18n/zh_cn.ts index d7c25e0..b2bbefc 100644 --- a/src/i18n/zh_cn.ts +++ b/src/i18n/zh_cn.ts @@ -29,6 +29,11 @@ export default { password: { placeholder: "密码" }, + }, + connection: { + host: "地址", + cluster: "集群模式", + close:"关闭", } }, settings: { diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue index cced00e..bf21564 100644 --- a/src/layout/Layout.vue +++ b/src/layout/Layout.vue @@ -3,14 +3,16 @@ import {getCurrent} from '@tauri-apps/api/window' import NavigatorItem from '../components/NavigatorItem.vue' import logo from '../assets/logo.png' import { ref} from 'vue' -import useTabStore from '../store/tabs' +import {useTabStore} from '../store/tabs' const tabStore = useTabStore() const min = ref(false) const ver = import.meta.env.VITE_VERSION.version const ScrollerRef = ref() tabStore.setScroller(() => { - ScrollerRef.value?.scrollTop(tabStore.list.length * 80) + if (ScrollerRef.value) { + ScrollerRef.value.scrollTop = tabStore.list.length * 80 + } }) enum BarAction { diff --git a/src/layout/TabViewLayout.vue b/src/layout/TabViewLayout.vue index 72cf12d..55000d0 100644 --- a/src/layout/TabViewLayout.vue +++ b/src/layout/TabViewLayout.vue @@ -1,8 +1,8 @@