From 77f5cfe850dd7c02e793e63e7309fbad3536cb10 Mon Sep 17 00:00:00 2001 From: dailer Date: Tue, 22 Jun 2021 16:06:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?DEC-19271=20e2e:=20=E3=80=90=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E3=80=91=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8CJNDI=E5=92=8C=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E4=B8=AD?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=9A=84ID=E4=B8=8D=E4=B8=80=E6=A0=B7?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=94=B9=E6=88=90=E4=B8=80=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/maintain/forms/components/form.jndi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/pages/maintain/forms/components/form.jndi.ts b/src/modules/pages/maintain/forms/components/form.jndi.ts index c3ff9c3..7163302 100644 --- a/src/modules/pages/maintain/forms/components/form.jndi.ts +++ b/src/modules/pages/maintain/forms/components/form.jndi.ts @@ -193,7 +193,7 @@ export class FormJndi extends BI.Widget { nameWidth: 200, forms: [{ type: BI.TextValueCombo.xtype, - $value: 'new-charset-name', + $value: 'original-charset-name', width: 300, value: newCharsetName ? newCharsetName : '', items: CONNECT_CHARSET, From 4970ca6067e71b6fd30e74f5df26c68c72c14c20 Mon Sep 17 00:00:00 2001 From: dailer Date: Tue, 13 Jul 2021 11:18:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?DEC-19477=20fix:=20=E3=80=90=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E3=80=91=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?-sql=E9=AA=8C=E8=AF=81=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=E5=9C=A8=E5=8F=B3=E4=BE=A7=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E6=98=AF=E5=AF=86=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/connection/connection_jdbc/connection_jdbc.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts index 7d7f811..9e205aa 100644 --- a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts +++ b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts @@ -6,6 +6,10 @@ import { ConnectionJDBC } from 'src/modules/crud/crud.typings'; import { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo } from '../../../app.service'; import { CONNECTION_LAYOUT } from '@constants/constant'; import { VerticalLayout } from '@fui/core'; +import { ApiFactory } from '../../../crud/apiFactory'; + +const api = new ApiFactory().create(); + @shortcut() @store(ConnectionJdecModel) export class ConnectionJdbc extends BI.Widget { @@ -21,7 +25,7 @@ export class ConnectionJdbc extends BI.Widget { const databaseType = getJdbcDatabaseType(database, driver); const { host, port, databaseName } = resolveUrlInfo(url, database); const { hgap, vgap } = CONNECTION_LAYOUT; - + return { type: BI.VerticalLayout.xtype, hgap, @@ -132,7 +136,7 @@ export class ConnectionJdbc extends BI.Widget { { type: FormItem.xtype, name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Validation_Query'), - value: connectionPoolAttr.validationQuery, + value: api.getPlain(connectionPoolAttr.validationQuery || ''), }, { type: FormItem.xtype,