From fa2a113f0943a4a725fff8d9503c1ff3216e3a60 Mon Sep 17 00:00:00 2001
From: dailer <Dailer@fanruan.com>
Date: Fri, 13 Aug 2021 15:35:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?DEC-20200=20fix:=20=E3=80=90=E8=BF=AD?=
 =?UTF-8?q?=E4=BB=A3=E3=80=91=E3=80=90=E9=A9=B1=E5=8A=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=91=E6=96=B0=E5=BB=BA=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E8=87=AA=E5=AE=9A=E4=B9=89=E9=A9=B1?=
 =?UTF-8?q?=E5=8A=A8=EF=BC=8C=E4=BF=9D=E5=AD=98=E5=90=8E=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=A9=B1=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/connection/connection_jdbc/connection_jdbc.ts        | 3 ++-
 src/modules/pages/maintain/forms/components/form.jdbc.ts       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
index f28f9ec..eff5383 100644
--- a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
+++ b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
@@ -23,6 +23,7 @@ export class ConnectionJdbc extends BI.Widget {
         const connectionData = this.model.connectionSelectedOne.connectionData as ConnectionJDBC;
         const {
             driver,
+            driverSource,
             database,
             user,
             originalCharsetName,
@@ -45,7 +46,7 @@ export class ConnectionJdbc extends BI.Widget {
                 {
                     type: FormItem.xtype,
                     name: BI.i18nText('Dec-Dcm_Connection_Form_Driver'),
-                    value: driver,
+                    value: BI.isKey(driverSource) ? `${driver} (${driverSource})` : driver,
                 },
                 {
                     type: FormItem.xtype,
diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts
index 5d26ad1..d9fe88c 100644
--- a/src/modules/pages/maintain/forms/components/form.jdbc.ts
+++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts
@@ -148,6 +148,7 @@ export class FormJdbc extends BI.Widget {
                                         const value = this.form.driver.getValue();
                                         const connectionData = this.options.formData.connectionData as ConnectionJDBC;
                                         const connectionType = getJdbcDatabaseType(connectionData.database, connectionData.driver);
+                                        // DEC-2020
                                         const url = (connectionType.urls && connectionType.urls[value.driver]) || connectionType.url;
                                         this.form.url.setValue(url);
                                         const urlInfo = resolveUrlInfo(url, connectionData.database);

From 4cea5f431e11a93019a06bee17e332b4f8c01eb6 Mon Sep 17 00:00:00 2001
From: dailer <Dailer@fanruan.com>
Date: Fri, 13 Aug 2021 17:21:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?DEC-20204=20fix:=20=E3=80=90=E8=BF=AD?=
 =?UTF-8?q?=E4=BB=A3=E3=80=91=E3=80=90=E9=A9=B1=E5=8A=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=91=E6=AC=A1=E7=AE=A1=E6=9D=83=E9=99=90=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E5=8F=AF=E4=BB=A5=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E9=A9=B1=E5=8A=A8=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/pages/connection/connection.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/pages/connection/connection.ts b/src/modules/pages/connection/connection.ts
index 4682418..8094b8d 100644
--- a/src/modules/pages/connection/connection.ts
+++ b/src/modules/pages/connection/connection.ts
@@ -79,6 +79,7 @@ export class Connection extends BI.Widget {
                                         right: [
                                             {
                                                 type: 'dec.connection.driver.entry',
+                                                invisible: !BI.Services.getService('dec.service.global').isAdmin(),
                                                 from: '.dec-dcm',
                                             },
                                         ],