From 7f467dab3437d3a4464f5eb49c1365a1f7efb8bf Mon Sep 17 00:00:00 2001 From: "Aries.lsy" <”Aries.lsy@fanruan.com“> Date: Thu, 5 Jan 2023 19:11:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-86591=20fix:tdsql=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=9B=B4=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/constants/constant.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/constants/constant.ts b/src/modules/constants/constant.ts index 9f5f5b0..0baab99 100644 --- a/src/modules/constants/constant.ts +++ b/src/modules/constants/constant.ts @@ -704,7 +704,7 @@ export const DATA_BASE_TYPES = [ kerberos: false, }, { - text: BI.i18nText('Dec-Dcm_Connection_TDSQL'), + text: 'TDSQL', databaseType: 'tdsql', driver: 'org.postgresql.Driver', url: 'jdbc:postgresql://hostname:port/database', From 9f5eb9077d661a8c563bf262c27dfca2c3213de2 Mon Sep 17 00:00:00 2001 From: "Aries.lsy" <”Aries.lsy@fanruan.com“> Date: Fri, 6 Jan 2023 16:14:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-87662=20feat:=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC=E9=80=89?= =?UTF-8?q?=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/app.typings.d.ts | 6 +- src/modules/components/collapse/collapse.ts | 4 + .../connection_jdbc/connection_jdbc.ts | 22 +++-- .../driverselector/driverselector.model.ts | 14 +++- .../driverselector/driverselector.ts | 11 +++ .../maintain/forms/components/form.jdbc.ts | 84 ++++++++++++++----- 6 files changed, 109 insertions(+), 32 deletions(-) diff --git a/src/modules/app.typings.d.ts b/src/modules/app.typings.d.ts index 67a5665..f4d0fda 100644 --- a/src/modules/app.typings.d.ts +++ b/src/modules/app.typings.d.ts @@ -8,9 +8,13 @@ export interface DatabaseType { internal: boolean; type: string; hasSchema?: boolean; + hasSchemas?: { + [key: string]: boolean; + }; kerberos?: boolean; iconUrl?: string; + versions?: string[]; urls?: { [key: string]: string; - } + }; } diff --git a/src/modules/components/collapse/collapse.ts b/src/modules/components/collapse/collapse.ts index 58e8db1..edaa9e5 100644 --- a/src/modules/components/collapse/collapse.ts +++ b/src/modules/components/collapse/collapse.ts @@ -64,4 +64,8 @@ export class Collapse extends BI.BasicButton { doClick() { this.store.setCollapse(!this.model.isCollapse); } + + setCollapse(v: boolean) { + this.store.setCollapse(v); + } } diff --git a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts index dd6f50a..9651233 100644 --- a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts +++ b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts @@ -52,7 +52,8 @@ export class ConnectionJdbc extends BI.Widget { sslClientCertificate, } = connectionData; const databaseType = getJdbcDatabaseType(database, driver); - const { host, port, databaseName } = resolveUrlInfo(url, database); + const { host, port, databaseName, version } = resolveUrlInfo(url, database); + this.version = !BI.isUndefined(databaseType.versions) ? (version ?? databaseType.versions[0]) : version; const { hgap, vgap } = CONNECTION_LAYOUT; return { @@ -62,6 +63,13 @@ export class ConnectionJdbc extends BI.Widget { items: [ { type: FormItem.xtype, + name: BI.i18nText('Dec-Basic_Version'), + invisible: BI.isUndefined(this.version), + value: BI.i18nText('Dec-Migration_Database_Version', this.version), + }, + { + type: FormItem.xtype, + _tgap: BI.isUndefined(this.version) ? vgap : 0, name: BI.i18nText('Dec-Dcm_Connection_Form_Driver'), value: BI.isKey(driverSource) ? `${driver} (${driverSource})` : driver, }, @@ -82,13 +90,13 @@ export class ConnectionJdbc extends BI.Widget { }, authType ? { - type: FormItem.xtype, - name: BI.i18nText('Dec-Dcm_Connection_Form_AuthType'), - value: authType, - } + type: FormItem.xtype, + name: BI.i18nText('Dec-Dcm_Connection_Form_AuthType'), + value: authType, + } : { - type: BI.Layout.xtype, - }, + type: BI.Layout.xtype, + }, { type: FormItem.xtype, name: authType ? BI.i18nText('Dec-Dcm_Connection_Form_Principal') : BI.i18nText('Dec-Dcm_Connection_Form_UserName'), diff --git a/src/modules/pages/maintain/components/driverselector/driverselector.model.ts b/src/modules/pages/maintain/components/driverselector/driverselector.model.ts index 382f439..15b164e 100644 --- a/src/modules/pages/maintain/components/driverselector/driverselector.model.ts +++ b/src/modules/pages/maintain/components/driverselector/driverselector.model.ts @@ -87,6 +87,12 @@ export class DriverSelectorModel extends Model { changeDriverSource: driverTypeComboValue => { this.model.driverSource = driverTypeComboValue === 'default' ? '' : this.model.driverSource; }, + + setDefaultDrivers: version => { + const defaultDrivers = this.getDrivers(version); + this.model.defaultDrivers = defaultDrivers; + this.changeDefaultDriver(defaultDrivers[0]?.value); + } }; private resolveSelectedDriverType = () => { @@ -97,11 +103,12 @@ export class DriverSelectorModel extends Model { return [this.options.driverSource, this.options.driver]; }; - private getDrivers = () => { + private getDrivers = (version?: string) => { const connectionData = this.options.connectionData as ConnectionJDBC; const connectionType = getJdbcDatabaseType(connectionData.database, connectionData.driver); + const selectedVersion = version ?? this.options.version; const drivers = connectionType.drivers ? - connectionType.drivers.map(item => { + (BI.isUndefined(connectionType.versions) ? connectionType.drivers : connectionType.drivers[selectedVersion]).map(item => { return { text: item, value: item, @@ -111,8 +118,7 @@ export class DriverSelectorModel extends Model { text: connectionType.driver, value: connectionType.driver, }]; - - if (!drivers.some(item => item.text === connectionData.driver)) { + if (BI.isUndefined(connectionType.versions) && !drivers.some(item => item.text === connectionData.driver)) { return [ { text: connectionData.driver, diff --git a/src/modules/pages/maintain/components/driverselector/driverselector.ts b/src/modules/pages/maintain/components/driverselector/driverselector.ts index 7eac368..8408e05 100644 --- a/src/modules/pages/maintain/components/driverselector/driverselector.ts +++ b/src/modules/pages/maintain/components/driverselector/driverselector.ts @@ -24,6 +24,7 @@ export class DriverSelector extends BI.Widget { driver: '', driverSource: '', connectionData: {} as ConnectionJDBC, + version: '', }; defaultDrivers: EditorIconCheckCombo = null; @@ -43,6 +44,12 @@ export class DriverSelector extends BI.Widget { driverManageEntryVisible: b => { this.driverManageEntry.setVisible(b); }, + + defaultDrivers: items => { + this.defaultDrivers.populate(items); + this.defaultDrivers.setValue(this.model.defaultDriver.driver); + this.fireEvent('EVENT_CHANGE'); + } }; private driverManageEntry = null; @@ -182,4 +189,8 @@ export class DriverSelector extends BI.Widget { driver: this.model.driverSource === '' ? this.model.defaultDriver.driver : this.model.customDriver.driver, }; } + + setDefaultDrivers(version: string) { + this.store.setDefaultDrivers(version); + } } diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index 90ea1b2..9cf4aad 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -40,9 +40,11 @@ export class FormJdbc extends BI.Widget { formKeyPath: FormItem; formKrb5File: FormItem; labelTips: Label; + schemaForm: FormItem; form = { connectionName: null, + version: null, driver: null, database: null, host: null, @@ -138,8 +140,8 @@ export class FormJdbc extends BI.Widget { } = connectionPoolAttr as ConnectionPoolJDBC; const databaseType = getJdbcDatabaseType(database, driver); this.databaseType = databaseType; - - const { host, port, databaseName } = resolveUrlInfo(url, database); + const { host, port, databaseName, version } = resolveUrlInfo(url, database); + this.version = !BI.isUndefined(databaseType.versions) ? (version ?? databaseType.versions[0]) : version; const { hgap, vgap } = CONNECTION_LAYOUT; const valueRangeConfig = { @@ -171,6 +173,41 @@ export class FormJdbc extends BI.Widget { }, ], }, + // 版本 + { + type: FormItem.xtype, + name: BI.i18nText('Dec-Basic_Version'), + invisible: BI.isUndefined(databaseType.versions), + forms: [ + { + type: BI.TextValueCombo.xtype, + width: 300, + value: this.version, + items: () => databaseType.versions.map(item => { + return { + text: BI.i18nText('Dec-Migration_Database_Version', item), + value: item, + } + }), + ref: (_ref: TextValueCombo) => { + this.form.version = _ref; + }, + listeners: [ + { + eventName: BI.TextValueCombo.EVENT_CHANGE, + action: () => { + const version = this.form.version.getValue()[0]; + this.version = version; + this.sslCollapse.setCollapse(true); + this.sslCollapse.setVisible(this.getSslSetEnabled()); + !BI.isUndefined(databaseType.hasSchemas) && this.schemaForm.setVisible(databaseType.hasSchemas[version]); + this.form.driver.setDefaultDrivers(version); + }, + }, + ], + }, + ], + }, // 驱动 { type: FormItem.xtype, @@ -184,6 +221,7 @@ export class FormJdbc extends BI.Widget { driver, driverSource, connectionData, + version: this.version, listeners: [ { eventName: 'EVENT_CHANGE', @@ -405,7 +443,7 @@ export class FormJdbc extends BI.Widget { { eventName: FileUpload.EVENT_CHECK_SUCCESS, action: (value) => { - const principalsItems = BI.map(value.principals, function(index, item) { + const principalsItems = BI.map(value.principals, function (index, item) { return { text: item, value: item @@ -485,7 +523,7 @@ export class FormJdbc extends BI.Widget { action: () => { this.setKerberos(); }, - } + } ] } ] @@ -510,7 +548,7 @@ export class FormJdbc extends BI.Widget { // 模式 { type: FormItem.xtype, - invisible: !databaseType.hasSchema, + invisible: BI.isUndefined(databaseType.hasSchemas) ? !databaseType.hasSchema : !databaseType.hasSchemas[this.version], height: 64, name: BI.i18nText('Dec-Dcm_Connection_Form_Pattern'), forms: [ @@ -551,6 +589,9 @@ export class FormJdbc extends BI.Widget { ], }, ], + ref: (_ref: FormItem) => { + this.schemaForm = _ref; + }, }, // 分隔线 { @@ -866,6 +907,9 @@ export class FormJdbc extends BI.Widget { width: 100, name: BI.i18nText('Dec-Dcm_Connection_Setting', 'SSL'), invisible: !this.getSslSetEnabled(), + ref: (_ref: Collapse) => { + this.sslCollapse = _ref; + }, listeners: [ { eventName: EVENT_CHANGE, @@ -1252,17 +1296,17 @@ export class FormJdbc extends BI.Widget { const connectionType = getJdbcDatabaseType(connectionData.database, connectionData.driver); const drivers = connectionType.drivers ? connectionType.drivers.map((item) => { - return { - text: item, - value: item, - }; - }) + return { + text: item, + value: item, + }; + }) : [ - { - text: connectionType.driver, - value: connectionType.driver, - }, - ]; + { + text: connectionType.driver, + value: connectionType.driver, + }, + ]; if (!drivers.some((item) => item.text === connectionData.driver)) { return [ @@ -1309,7 +1353,7 @@ export class FormJdbc extends BI.Widget { private getSslSetEnabled(): boolean { const { databaseType } = this.databaseType; - return databaseType === 'mysql'; + return databaseType === 'mysql' || this.version === 'mysql'; } public setSchemas(schemas: string[]) { @@ -1329,7 +1373,7 @@ export class FormJdbc extends BI.Widget { } public setKerberos() { - const KerberosParams = BI.extend({},{ + const KerberosParams = BI.extend({}, { keytabPath: this.form.keyPath.getValue(), krb5ConfPath: this.form.krb5Path.getValue(), principal: this.form.principal.getValue()[0] @@ -1341,7 +1385,7 @@ export class FormJdbc extends BI.Widget { public initPrincipals(keyPath, principal) { let self = this; api.getPrincipals(keyPath).then(res => { - const principalsItems = BI.map(res.data, function(index, item) { + const principalsItems = BI.map(res.data, function (index, item) { return { text: item, value: item @@ -1354,12 +1398,12 @@ export class FormJdbc extends BI.Widget { public changePrincipal() { let self = this; - const KerberosParams = BI.extend({},{ + const KerberosParams = BI.extend({}, { keytabPath: this.form.keyPath.getValue(), krb5ConfPath: this.form.krb5Path.getValue(), principal: this.form.principal.getValue()[0] }); - api.changePrincipal(KerberosParams).then(res =>{ + api.changePrincipal(KerberosParams).then(res => { self.form.keyPath.setValue(res.data.keytabPath); self.form.krb5Path.setValue(res.data.krb5ConfPath); }); From 8ed653f04445209261c2d73db6b6bf400dadc442 Mon Sep 17 00:00:00 2001 From: "Aries.lsy" <”Aries.lsy@fanruan.com“> Date: Fri, 6 Jan 2023 16:15:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-87662=20feat:tbase=E9=80=82=E9=85=8D?= =?UTF-8?q?tdsql=E7=9A=84=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/constants/constant.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/constants/constant.ts b/src/modules/constants/constant.ts index 0baab99..65df36e 100644 --- a/src/modules/constants/constant.ts +++ b/src/modules/constants/constant.ts @@ -708,6 +708,7 @@ export const DATA_BASE_TYPES = [ databaseType: 'tdsql', driver: 'org.postgresql.Driver', url: 'jdbc:postgresql://hostname:port/database', + versions: ['pgsql'], commonly: false, internal: true, type: 'jdbc', From 1cfe9d2ddba0908aee62c6fa43a659068e027347 Mon Sep 17 00:00:00 2001 From: "Austin.Duan" Date: Wed, 1 Feb 2023 14:57:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-86413=20feat:=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E9=80=82=E9=85=8D=E5=B9=B3=E5=8F=B0=E5=8A=A0?= =?UTF-8?q?=E8=A7=A3=E5=AF=86=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/crud/decision.api.ts | 6 ++---- types/globals.d.ts | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/modules/crud/decision.api.ts b/src/modules/crud/decision.api.ts index 3ad6470..5249552 100644 --- a/src/modules/crud/decision.api.ts +++ b/src/modules/crud/decision.api.ts @@ -107,13 +107,11 @@ export class DecisionApi implements Api { } getCipher(password: string) { - return BI.Providers.getProvider('dec.provider.cipher') - .getCipher(password); + return Dec.Utils['getTransCipherText'](password); } getPlain(cipher: string) { - return BI.Providers.getProvider('dec.provider.cipher') - .getPlain(cipher); + return Dec.Utils['getPlainText'](cipher); } getHyperlink(name: string) { diff --git a/types/globals.d.ts b/types/globals.d.ts index 4d1c456..f936556 100644 --- a/types/globals.d.ts +++ b/types/globals.d.ts @@ -13,6 +13,7 @@ declare const Dec: { connected: boolean; }; system: {}; + Utils: {}, personal: { username: string; };