diff --git a/README.md b/README.md old mode 100755 new mode 100644 index 0f3202e..6ea48e2 --- a/README.md +++ b/README.md @@ -1,51 +1,59 @@ -# Jumpserve Client - -JumpServer 客户端，支持本地本地客户端拉起。 -## 概览 - -![windows](static/windows.png) - -## 安装 - -### Mac - -下载Mac安装包，安装JumpServer.dmg并将JumpServer.app放入Applications中，双击打开JumpServer.app完成自定义协议。 - -### Win - -下载Win安装包，双击JumpServer安装包文件（需要等待10几秒钟）。 - -### Linux - -下载Linux安装包，双击Deb安装包文件，打开安装包管理器进行安装。或者使用命令进行安装 -``` -sudo dpkg -i -``` - - -## 卸载 - -### Windows - -控制面板直接卸载即可。 - -### Mac - -移除JumpServer.app。 - -### Linux - -点击打开软件管理器进行卸载。或者使用命令进行卸载 -``` -sudo dpkg --purge -``` - -## 打包 - -- [打包方法](https://github.com/jumpserver/apps/blob/master/README_PACK.md) - -## 参考 - -- [浏览器拉起app原理](https://juejin.cn/post/6844903989155217421) -- [Linux浏览器拉起app原理](https://medium.com/swlh/custom-protocol-handling-how-to-8ac41ff651eb) -- [刘正的JumpClient](https://github.com/liuzheng/jumpClient) +# Jumpserve Client + +JumpServer client, supports local client pull up. + +English | [中文](README_CN.md) + +## Overview + +![windows](static/windows_EN.png) + +## Install + +### Mac + +Download the Mac installation package, install JumpServer.dmg and put JumpServer.app into Applications. Double-click to open JumpServer.app to complete the custom protocol. + + +### Win + +Download the Win installation package and double-click the JumpServer installation package file (you need to wait for 10 seconds). + + +### Linux + +Download the Linux installation package, double-click the Deb installation package file, and open the installation package manager to install it. Or install it using the command + +``` + +sudo dpkg -i + +``` + + +## uninstall + +### Windows + +Just uninstall the control panel directly. + + +### Mac + +Remove JumpServer.app. + + +### Linux + +Click to open Software Manager to uninstall. Or use the command to uninstall + +``` + +sudo dpkg --purge + +``` + + +## package + +- [packaging scheme](https://github.com/jumpserver/apps/blob/master/README_PACK.md) diff --git a/README_CN.md b/README_CN.md new file mode 100755 index 0000000..6d5d0a3 --- /dev/null +++ b/README_CN.md @@ -0,0 +1,54 @@ +# Jumpserve Client + +JumpServer 客户端，支持本地本地客户端拉起。 + +中文 | [English](README.md) + +## 概览 + +![windows](static/windows_CN.png) + +## 安装 + +### Mac + +下载Mac安装包，安装JumpServer.dmg并将JumpServer.app放入Applications中，双击打开JumpServer.app完成自定义协议。 + +### Win + +下载Win安装包，双击JumpServer安装包文件（需要等待10几秒钟）。 + +### Linux + +下载Linux安装包，双击Deb安装包文件，打开安装包管理器进行安装。或者使用命令进行安装 +``` +sudo dpkg -i +``` + + +## 卸载 + +### Windows + +控制面板直接卸载即可。 + +### Mac + +移除JumpServer.app。 + +### Linux + +点击打开软件管理器进行卸载。或者使用命令进行卸载 +``` +sudo dpkg --purge +``` + +## 打包 + +- [打包方法](https://github.com/jumpserver/apps/blob/master/README_PACK.md) + +## 参考 + +- [浏览器拉起app原理](https://juejin.cn/post/6844903989155217421) +- [Linux浏览器拉起app原理](https://medium.com/swlh/custom-protocol-handling-how-to-8ac41ff651eb) +- [刘正的JumpClient](https://github.com/liuzheng/jumpClient) diff --git a/README_EN.md b/README_EN.md deleted file mode 100644 index 823acaa..0000000 --- a/README_EN.md +++ /dev/null @@ -1,58 +0,0 @@ -# Jumpserve Client - -JumpServer client, supports local client pull up. - -## Overview - -![windows](static/windows.png) - - -## Install - -### Mac - -Download the Mac installation package, install JumpServer.dmg and put JumpServer.app into Applications. Double-click to open JumpServer.app to complete the custom protocol. - - -### Win - -Download the Win installation package and double-click the JumpServer installation package file (you need to wait for 10 seconds). - - -### Linux - -Download the Linux installation package, double-click the Deb installation package file, and open the installation package manager to install it. Or install it using the command - -``` - -sudo dpkg -i - -``` - - -## uninstall - -### Windows - -Just uninstall the control panel directly. - - -### Mac - -Remove JumpServer.app. - - -### Linux - -Click to open Software Manager to uninstall. Or use the command to uninstall - -``` - -sudo dpkg --purge - -``` - - -## package - -- [packaging scheme](https://github.com/jumpserver/apps/blob/master/README_PACK.md) diff --git a/go-client/config.json b/go-client/config.json index 6a43d8b..72afe0c 100644 --- a/go-client/config.json +++ b/go-client/config.json @@ -9,8 +9,11 @@ "ssh", "telnet" ], - "comment": "PuTTY是一个Telnet、SSH、rlogin、纯TCP以及串行接口连接软件。", - "download_url": "内置", + "comment": { + "zh": "PuTTY是一个Telnet、SSH、rlogin、纯TCP以及串行接口连接软件。", + "en": "PuTTY is a Telnet, SSH, rlogin, pure TCP and serial interface connection software." + }, + "download_url": "", "type": "linux", "path": "putty.exe", "arg_format": "-{protocol} {username}@{host} -P {port} -pw {value}", @@ -26,7 +29,10 @@ "ssh", "telnet" ], - "comment": "XShell是一个强大的安全终端模拟软件，它支持SSH、TELNET协议。", + "comment": { + "zh": "XShell是一个强大的安全终端模拟软件，它支持SSH、TELNET协议。", + "en": "XShell is a powerful secure terminal simulation software that supports SSH and TELNET protocols." + }, "download_url": "https://www.xshell.com/zh/xshell-download/", "type": "linux", "path": "", @@ -43,7 +49,10 @@ "ssh", "telnet" ], - "comment": "SecureCRT是VanDyke Software所开发销售的一个SSH、Telnet客户端和虚拟终端软件。", + "comment": { + "zh": "SecureCRT是VanDyke Software所开发销售的一个SSH、Telnet客户端和虚拟终端软件。", + "en": "SecureCRT is an SSH, Telnet client and virtual terminal software developed and sold by VanDyke Software." + }, "download_url": "https://www.vandyke.com/cgi-bin/releases.php?product=securecrt", "type": "linux", "path": "", @@ -60,7 +69,10 @@ "ssh", "telnet" ], - "comment": "MobaXterm是一款功能丰富的远程计算机管理工具，其包括了SSH客户端、FTP客户端、远程桌面等。", + "comment": { + "zh": "MobaXterm是一款功能丰富的远程计算机管理工具，其包括了SSH客户端、FTP客户端、远程桌面等。", + "en": "MobaXterm is a feature-rich remote computer management tool, including SSH client, FTP client, remote desktop, etc." + }, "download_url": "https://mobaxterm.mobatek.net/download-home-edition.html", "type": "linux", "path": "", @@ -78,8 +90,11 @@ "protocol": [ "rdp" ], - "comment": "Microsoft Remote Desktop是一款强大的微软远程连接工具，可以从几乎任何地方连接到远程PC和您的工作资源。", - "download_url": "内置", + "comment": { + "zh": "Microsoft Remote Desktop是一款强大的微软远程连接工具，可以从几乎任何地方连接到远程PC和您的工作资源。", + "en": "Microsoft Remote Desktop is a powerful Microsoft remote connection tool that can connect to remote PCs and your work resources from almost anywhere." + }, + "download_url": "", "type": "windows", "path": "mstsc.exe", "arg_format": "{file}", @@ -96,7 +111,10 @@ "protocol": [ "sftp" ], - "comment": "WinSCP是一个Windows环境下使用SSH的开源图形化SFTP客户端，同时支持SCP协议。", + "comment": { + "zh": "WinSCP是一个Windows环境下使用SSH的开源图形化SFTP客户端，同时支持SCP协议。", + "en": "WinSCP is an open source graphical SFTP client that uses SSH in a Windows environment and supports the SCP protocol." + }, "download_url": "https://winscp.net/eng/index.php", "type": "linux", "path": "", @@ -112,7 +130,10 @@ "protocol": [ "sftp" ], - "comment": "FileZilla Client是一款免费、开源的 FTP 客户端。它支持FTP、SFTP。", + "comment": { + "zh": "FileZilla Client是一款免费、开源的 FTP 客户端。它支持FTP、SFTP。", + "en": "FileZilla Client is a free, open source FTP client. It supports FTP, SFTP." + }, "download_url": "https://filezilla-project.org/download.php?type=client", "type": "linux", "path": "", @@ -130,7 +151,10 @@ "protocol": [ "oracle" ], - "comment": "PL/SQL Developer是一个集成开发环境，由Allround Automations公司开发，专门面向Oracle数据库存储的程序单元的开发。", + "comment": { + "zh": "PL/SQL Developer是一个集成开发环境，由Allround Automations公司开发，专门面向Oracle数据库存储的程序单元的开发。", + "en": "PL/SQL Developer is an integrated development environment developed by Allround Automations, specifically for the development of program units stored in Oracle databases." + }, "download_url": "https://www.allroundautomations.com/registered-plsqldev/", "type": "databases", "path": "", @@ -147,9 +171,13 @@ "oracle", "mysql", "postgresql", - "mariadb" + "mariadb", + "sqlserver" ], - "comment": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。", + "comment": { + "zh": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。", + "en": "DBeaver Community is a general database management tool and SQL client that supports MySQL, PostgreSQL, Oracle and other JDBC-compatible databases." + }, "download_url": "https://dbeaver.io/download/", "type": "databases", "path": "", @@ -165,7 +193,10 @@ "protocol": [ "redis" ], - "comment": "Redis Desktop Manager 是一款能够跨平台使用的开源 Redis 可视化工具，主要针对 Redis 开发设计。", + "comment": { + "zh": "Redis Desktop Manager 是一款能够跨平台使用的开源 Redis 可视化工具，主要针对 Redis 开发设计。", + "en": "Redis Desktop Manager is an open source Redis visualization tool that can be used across platforms and is mainly designed for Redis development." + }, "download_url": "https://github.com/FuckDoctors/rdm-builder/releases/download/2022.5.1/resp-2022.5.1.exe", "type": "databases", "path": "", @@ -174,6 +205,25 @@ "is_internal": false, "is_default": false, "is_set": false + }, + { + "name": "ssms17", + "display_name": "SQL Server Management Studio 17", + "protocol": [ + "sqlserver" + ], + "comment": { + "zh": "SQL Server Management Studio (SSMS) 是一种集成环境，用于管理从 SQL Server 到 Azure SQL 数据库的任何 SQL 基础结构。", + "en": "SQL Server Management Studio (SSMS) is an integrated environment for managing any SQL infrastructure, from SQL Server to Azure SQL Database." + }, + "download_url": "https://download.microsoft.com/download/D/D/4/DD495084-ADA7-4827-ADD3-FC566EC05B90/SSMS-Setup-CHS.exe", + "type": "databases", + "path": "", + "arg_format": "-S {host},{port} -U {username} -P {value} -d {dbname}", + "match_first": [], + "is_internal": false, + "is_default": false, + "is_set": false } ] }, @@ -186,8 +236,11 @@ "ssh", "telnet" ], - "comment": "Terminal是MacOS操作系统上的虚拟终端应用软件，位于“实用工具”文件夹内。", - "download_url": "内置", + "comment": { + "zh": "Terminal是MacOS操作系统上的虚拟终端应用软件，位于“实用工具”文件夹内。", + "en": "Terminal is a virtual terminal application software on the MacOS operating system, located in the \"Utilities\" folder." + }, + "download_url": "", "type": "linux", "path": "Terminal", "arg_format": "{protocol} {username}@{host} -p {port} -P {value}", @@ -203,7 +256,10 @@ "ssh", "telnet" ], - "comment": "iTerm2是MacOS操作系统上的虚拟终端应用软件。\n\n!!!手动下载安装，点击保存启用!!!", + "comment": { + "zh": "iTerm2是MacOS操作系统上的虚拟终端应用软件。\n\n!!!手动下载安装，点击保存启用!!!", + "en": "iTerm2 is a virtual terminal application software on the MacOS operating system.\n\n\n!!!Manually download and install, click Save to activate!!!" + }, "download_url": "https://iterm2.com/downloads.html", "type": "linux", "path": "iTerm2", @@ -220,7 +276,10 @@ "ssh", "telnet" ], - "comment": "SecureCRT是VanDyke Software所开发销售的一个SSH、Telnet客户端和虚拟终端软件。\n\n!!!手动下载安装，点击保存启用!!!", + "comment": { + "zh": "SecureCRT是VanDyke Software所开发销售的一个SSH、Telnet客户端和虚拟终端软件。\n\n!!!手动下载安装，点击保存启用!!!", + "en": "SecureCRT is an SSH, Telnet client and virtual terminal software developed and sold by VanDyke Software.\n\n!!!Manually download and install, click Save to activate!!!" + }, "download_url": "https://www.vandyke.com/cgi-bin/releases.php?product=securecrt", "type": "linux", "path": "/Applications/SecureCRT.app/Contents/MacOS/SecureCRT", @@ -238,8 +297,11 @@ "protocol": [ "rdp" ], - "comment": "Microsoft Remote Desktop是一款强大的微软远程连接工具，可以从几乎任何地方连接到远程PC和您的工作资源。\n\n!!!手动下载安装，点击保存启用!!!", - "download_url": "内置", + "comment": { + "zh": "Microsoft Remote Desktop是一款强大的微软远程连接工具，可以从几乎任何地方连接到远程PC和您的工作资源。\n\n!!!手动下载安装，点击保存启用!!!", + "en": "Microsoft Remote Desktop is a powerful Microsoft remote connection tool that can connect to remote PCs and your work resources from almost anywhere.\n\n!!!Manually download and install, click Save to activate!!!" + }, + "download_url": "", "type": "windows", "path": "/Applications/Microsoft Remote Desktop.app", "arg_format": "{file}", @@ -256,7 +318,10 @@ "protocol": [ "sftp" ], - "comment": "FileZilla Client是一款免费、开源的 FTP 客户端。它支持FTP、SFTP。\n\n!!!手动下载安装，点击保存启用!!!", + "comment": { + "zh": "FileZilla Client是一款免费、开源的 FTP 客户端。它支持FTP、SFTP。\n\n!!!手动下载安装，点击保存启用!!!", + "en": "FileZilla Client is a free, open source FTP client. It supports FTP, SFTP.\n\n!!!Manually download and install, click Save to activate!!!" + }, "download_url": "https://filezilla-project.org/download.php?type=client", "type": "linux", "path": "/Applications/FileZilla.app/Contents/MacOS/filezilla", @@ -276,10 +341,14 @@ "mysql", "postgresql", "mariadb", - "redis" + "redis", + "sqlserver" ], - "comment": "Terminal是MacOS操作系统上的虚拟终端应用软件，位于“实用工具”文件夹内。", - "download_url": "内置", + "comment": { + "zh": "Terminal是MacOS操作系统上的虚拟终端应用软件，位于“实用工具”文件夹内。", + "en": "Terminal is a virtual terminal application software on the MacOS operating system, located in the \"Utilities\" folder." + }, + "download_url": "", "type": "linux", "path": "Terminal", "arg_format": "", @@ -288,7 +357,8 @@ "mysql", "postgresql", "mariadb", - "redis" + "redis", + "sqlserver" ], "is_internal": true, "is_default": false, @@ -301,9 +371,13 @@ "oracle", "mysql", "postgresql", - "mariadb" + "mariadb", + "sqlserver" ], - "comment": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。\n\n!!!手动下载安装，点击保存启用!!!", + "comment": { + "zh": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。\n\n!!!手动下载安装，点击保存启用!!!", + "en": "DBeaver Community is a general database management tool and SQL client that supports MySQL, PostgreSQL, Oracle and other JDBC-compatible databases.\n\n!!!Manually download and install, click Save to activate!!!" + }, "download_url": "https://dbeaver.io/download/", "type": "databases", "path": "/Applications/DBeaver.app/Contents/MacOS/dbeaver", @@ -324,8 +398,11 @@ "ssh", "telnet" ], - "comment": "Terminal是Linux操作系统上的虚拟终端应用软件。", - "download_url": "内置", + "comment": { + "zh": "Terminal是Linux操作系统上的虚拟终端应用软件。", + "en": "Terminal is a virtual terminal application software on the Linux operating system." + }, + "download_url": "", "type": "linux", "path": "Terminal", "arg_format": "{protocol} {username}@{host} -p {port} -P {value}", @@ -342,8 +419,11 @@ "protocol": [ "rdp" ], - "comment": "Remmina 是一个使用 GTK+ 开发的远程桌面客户端，提供了 RDP、VNC、XDMCP、SSH 等远程连接协议的支持。", - "download_url": "https://remmina.org/how-to-install-remmina/-内置", + "comment": { + "zh": "Remmina 是一个使用 GTK+ 开发的远程桌面客户端，提供了 RDP、VNC、XDMCP、SSH 等远程连接协议的支持。", + "en": "Remmina is a remote desktop client developed using GTK+, providing support for remote connection protocols such as RDP, VNC, XDMCP, and SSH." + }, + "download_url": "https://remmina.org/how-to-install-remmina/", "type": "windows", "path": "remmina", "arg_format": "{file}", @@ -358,8 +438,11 @@ "protocol": [ "rdp" ], - "comment": "FreeRDP 是远程桌面协议 (RDP) 的免费实现，在 Apache 许可证下发布。\n安装命令\nsudo apt-get install freerdp\nsudo yum install freerdp", - "download_url": "https://github.com/FreeRDP/FreeRDP-内置", + "comment": { + "zh": "FreeRDP 是远程桌面协议 (RDP) 的免费实现，在 Apache 许可证下发布。\n安装命令\nsudo apt-get install freerdp\nsudo yum install freerdp", + "en": "FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under the Apache License.\nInstallation command\nsudo apt-get install freerdp\nsudo yum install freerdp" + }, + "download_url": "https://github.com/FreeRDP/FreeRDP", "type": "windows", "path": "xfreerdp", "arg_format": "{file} /cert-ignore", @@ -379,10 +462,14 @@ "mysql", "postgresql", "mariadb", - "redis" + "redis", + "sqlserver" ], - "comment": "Terminal是Linux操作系统上的虚拟终端应用软件。", - "download_url": "内置", + "comment": { + "zh": "Terminal是Linux操作系统上的虚拟终端应用软件。", + "en": "Terminal is a virtual terminal application software on the Linux operating system." + }, + "download_url": "", "type": "linux", "path": "Terminal", "arg_format": "", @@ -404,9 +491,13 @@ "oracle", "mysql", "postgresql", - "mariadb" + "mariadb", + "sqlserver" ], - "comment": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。\n\n!!!手动下载安装，点击保存启用!!!", + "comment": { + "zh": "DBeaver Community是一个通用的数据库管理工具和SQL客户端，支持MySQL、PostgreSQL、Oracle以及其他兼容JDBC的数据库。\n\n!!!手动下载安装，点击保存启用!!!", + "en": "DBeaver Community is a general database management tool and SQL client that supports MySQL, PostgreSQL, Oracle and other JDBC-compatible databases.\n\n!!!Manually download and install, click Save to activate!!!" + }, "download_url": "https://dbeaver.io/download/", "type": "databases", "path": "", diff --git a/go-client/pkg/awaken/awaken_darwin.go b/go-client/pkg/awaken/awaken_darwin.go index 9344cda..e9900c2 100755 --- a/go-client/pkg/awaken/awaken_darwin.go +++ b/go-client/pkg/awaken/awaken_darwin.go @@ -114,6 +114,8 @@ func awakenDBCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd { argFormat = "psql 'user={username} password={value} host={host} dbname={dbname} port={port}'" case "mysql", "mariadb": argFormat = "mysql -u {username} -p{value} -h {host} -P {port} {dbname}" + case "sqlserver": + argFormat = "sqlcmd -S {host},{port} -U {username} -P {value} -d {dbname}" } commands := getCommandFromArgs(connectMap, argFormat) cmd := exec.Command( @@ -122,6 +124,9 @@ func awakenDBCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd { ) return cmd } else { + if r.Protocol == "sqlserver" { + connectMap["protocol"] = "mssql_jdbc_ms_new" + } appPath = appItem.Path commands := getCommandFromArgs(connectMap, appItem.ArgFormat) return exec.Command(appPath, strings.Split(commands, " ")...) diff --git a/go-client/pkg/awaken/awaken_linux.go b/go-client/pkg/awaken/awaken_linux.go index 38a695b..475673f 100755 --- a/go-client/pkg/awaken/awaken_linux.go +++ b/go-client/pkg/awaken/awaken_linux.go @@ -86,6 +86,9 @@ func awakenSSHCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd { global.LOG.Info(msg) } } else { + if r.Protocol == "sqlserver" { + connectMap["protocol"] = "mssql_jdbc_ms_new" + } var appPath string appPath = appItem.Path commands := getCommandFromArgs(connectMap, appItem.ArgFormat) @@ -129,6 +132,8 @@ func awakenDBCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd { argFormat = "psql 'user={username} password={value} host={host} dbname={dbname} port={port}'" case "mysql", "mariadb": argFormat = "mysql -u {username} -p{value} -h {host} -P {port} {dbname}" + case "sqlserver": + argFormat = "sqlcmd -S {host},{port} -U {username} -P {value} -d {dbname}" } commands := getCommandFromArgs(connectMap, argFormat) diff --git a/go-client/pkg/awaken/awaken_windows.go b/go-client/pkg/awaken/awaken_windows.go index 85a5b9e..b1582e9 100755 --- a/go-client/pkg/awaken/awaken_windows.go +++ b/go-client/pkg/awaken/awaken_windows.go @@ -29,7 +29,7 @@ func getCommandFromArgs(connectInfo map[string]string, argFormat string) string } func handleRDP(r *Rouse, filePath string, cfg *config.AppConfig) *exec.Cmd { - cmd := exec.Command("mstsc.exe", filePath) + cmd := exec.Command("C:\\WINDOWS\\system32\\mstsc.exe", filePath) return cmd } @@ -103,6 +103,9 @@ func handleDB(r *Rouse, cfg *config.AppConfig) *exec.Cmd { "dbname": r.DBName, } + if r.Protocol == "sqlserver" { + connectMap["protocol"] = "mssql_jdbc_ms_new" + } if r.Protocol == "redis" { var conList []map[string]string ss := make(map[string]string) diff --git a/go-client/pkg/config/config.go b/go-client/pkg/config/config.go index 16b5b95..314ace4 100644 --- a/go-client/pkg/config/config.go +++ b/go-client/pkg/config/config.go @@ -25,7 +25,6 @@ type AppItem struct { Name string `json:"name"` DisplayName string `json:"display_name"` Protocol []string `json:"protocol"` - Comment string `json:"comment"` Type string `json:"type"` MatchFirst []string `json:"match_first"` Path string `json:"path"` diff --git a/interface/package.json b/interface/package.json index 36162b3..d200613 100644 --- a/interface/package.json +++ b/interface/package.json @@ -1,7 +1,7 @@ { "name": "jumpserver-client", "author": "Fit2Cloud Technology Co., Ltd.; ", - "version": "v2.1.0", + "version": "v2.1.1", "homepage": "https://jumpserver.org", "private": true, "scripts": { diff --git a/interface/src/i18n/langs/en.json b/interface/src/i18n/langs/en.json index 9ea1b00..6006750 100644 --- a/interface/src/i18n/langs/en.json +++ b/interface/src/i18n/langs/en.json @@ -12,7 +12,8 @@ "DefaultApp": "Default Application", "Configured": "Configured", "NotConfigured": "Not Configured", - "OracleOCI": "The client needs to use OCI version 21.0 and above to connect to the Oracle." + "OracleOCI": "The client needs to use OCI version 21.0 and above to connect to the Oracle.", + "SystemComesWith": "System comes with" }, "Dialog": { "Save&Default": "Save And Default", diff --git a/interface/src/i18n/langs/zh.json b/interface/src/i18n/langs/zh.json index 783f578..d45b408 100644 --- a/interface/src/i18n/langs/zh.json +++ b/interface/src/i18n/langs/zh.json @@ -12,7 +12,8 @@ "DefaultApp": "默认应用", "Configured": "已配置", "NotConfigured": "未配置", - "OracleOCI": "本地客户端连 Oracle 数据库需要使用 21.0 及以上版本 OCI" + "OracleOCI": "本地客户端连 Oracle 数据库需要使用 21.0 及以上版本 OCI", + "SystemComesWith": "系统自带" }, "Dialog": { "Save&Default": "保存且默认", diff --git a/interface/src/renderer/assets/ssms17.png b/interface/src/renderer/assets/ssms17.png new file mode 100644 index 0000000..dfde660 Binary files /dev/null and b/interface/src/renderer/assets/ssms17.png differ diff --git a/interface/src/renderer/components/Dialog.vue b/interface/src/renderer/components/Dialog.vue index 9315bff..e6f2424 100644 --- a/interface/src/renderer/components/Dialog.vue +++ b/interface/src/renderer/components/Dialog.vue @@ -32,7 +32,7 @@ export default { }, top: { type: String, - default: '12vh' + default: '10vh' }, width: { type: String, diff --git a/interface/src/renderer/components/ListTable.vue b/interface/src/renderer/components/ListTable.vue index 8a3f080..83adbaa 100644 --- a/interface/src/renderer/components/ListTable.vue +++ b/interface/src/renderer/components/ListTable.vue @@ -6,7 +6,7 @@
{{ d.display_name }}
-
{{ d.comment }}
+
{{ d.comment[$i18n.locale] }}
{{ $t(is_set_string(d.is_set)) }} @@ -24,6 +24,9 @@