Merge pull request #215 from jumpserver/pr@dev@fix_telnet_pull_up

feat: add MariaDB and telnet settings page with configuration options

Author: Halo1236

go-client/pkg/awaken/awaken_darwin.go

@@ -59,7 +59,6 @@ func awakenSSHCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd {
 	var appLst []config.AppItem
 	switch r.Protocol {
 	case "ssh", "telnet":
-		r.Protocol = "ssh"
 		appLst = cfg.MacOS.Terminal
 	case "sftp":
 		appLst = cfg.MacOS.FileTransfer
@@ -75,6 +74,7 @@ func awakenSSHCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd {
 		return nil
 	}
 	var cmd *exec.Cmd
+	r.Protocol = "ssh"
 	connectMap := map[string]string{
 		"name":     r.getName(),
 		"protocol": r.Protocol,

go-client/pkg/awaken/awaken_linux.go

@@ -72,7 +72,6 @@ func awakenSSHCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd {
 	var appLst []config.AppItem
 	switch r.Protocol {
 	case "ssh", "telnet":
-		r.Protocol = "ssh"
 		appLst = cfg.Linux.Terminal
 	case "sftp":
 		appLst = cfg.Linux.FileTransfer
@@ -88,6 +87,7 @@ func awakenSSHCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd {
 		return nil
 	}
 	var cmd *exec.Cmd
+	r.Protocol = "ssh"
 	connectMap := map[string]string{
 		"name":     r.getName(),
 		"protocol": r.Protocol,

go-client/pkg/awaken/awaken_windows.go

@@ -188,7 +188,6 @@ func handleSSH(r *Rouse, cfg *config.AppConfig) *exec.Cmd {
 	var appLst []config.AppItem
 	switch r.Protocol {
 	case "ssh", "telnet":
-		r.Protocol = "ssh"
 		appLst = cfg.Windows.Terminal
 	case "sftp":
 		appLst = cfg.Windows.FileTransfer
@@ -210,7 +209,7 @@ func handleSSH(r *Rouse, cfg *config.AppConfig) *exec.Cmd {
 	} else {
 		appPath = appItem.Path
 	}
-
+	r.Protocol = "ssh"
 	connectMap := map[string]string{
 		"name":     r.getName(),
 		"protocol": r.Protocol,

ui/assets/images/toadOracle.png ui/assets/images/toad.pngui/assets/images/toadOracle.png renamed to ui/assets/images/toad.png

@@ -41,7 +41,7 @@ const imagesMap: Record<string, string | undefined> = {
   navicat17: getImageByName("navicat17"),
   royalts: getImageByName("royalts"),
   windows_rdm: getImageByName("windows_rdm"),
-  toad: getImageByName("toadOracle")
+  toad: getImageByName("toad")
 };
 
 

ui/components/SettingItems/settingItems.vue

@@ -85,6 +85,10 @@ const settingMenu = computed<NavigationMenuItem[]>(() => {
               label: "MySQL",
               to: localePath({ path: "/setting/mysql" })
             },
+            {
+              label: "MariaDB",
+              to: localePath({ path: "/setting/mariadb" })
+            },
             {
               label: "MongoDB",
               to: localePath({ path: "/setting/mongodb" })

ui/layouts/setting.vue

@@ -0,0 +1,42 @@
+<script setup lang="ts">
+import type { ConfigItem } from "~/types/index";
+
+definePageMeta({
+  layout: "setting"
+});
+
+const { t } = useI18n();
+const { appConfig } = useSettingManager();
+const { selectClient } = useApplicationConfig();
+
+const protocol = "mariadb";
+const category = "databases" as const;
+
+const items = computed<ConfigItem[]>(() => {
+  const list = appConfig!.value?.databases ?? [];
+  return list.filter((i) => i.protocol?.includes(protocol));
+});
+
+const isSelected = (item: ConfigItem) => item.match_first?.includes(protocol);
+const handleToggle = async (item: ConfigItem) => {
+  await selectClient(category, protocol, item.name);
+};
+</script>
+
+<template>
+  <div class="flex flex-col gap-2">
+    <template v-if="items.length">
+      <SettingItems
+        v-for="item in items"
+        :key="item.name"
+        :item="item"
+        :protocol="protocol"
+        :selected="isSelected(item)"
+        @toggle="() => handleToggle(item)"
+      />
+    </template>
+    <div v-else class="text-center text-sm text-gray-500 py-10">
+      {{ t("Common.NoData") }}
+    </div>
+  </div>
+</template>