fanruan
/
decision-webui-dcm
2
0
Fork 0
Code Issues 8 Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #6842 in DEC/decision-webui-dcm from feature/x to bugfix/11.0 

* commit '75c7e52880db67fead4324006432a35cb26795e6':
  REPORT-86413 feat: 数据连接适配平台加解密改造
  REPORT-87662 feat:tbase适配tdsql的更改
  REPORT-87662 feat:数据连接添加版本选择
  REPORT-86591 fix:tdsql数据库更名
bugfix/11.0
superman 2 years ago
parent
01338636bb 75c7e52880
commit
67b80df564
9 changed files with 114 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/modules/app.typings.d.ts
  2. 4
      src/modules/components/collapse/collapse.ts
  3. 3
      src/modules/constants/constant.ts
  4. 6
      src/modules/crud/decision.api.ts
  5. 22
      src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
  6. 14
      src/modules/pages/maintain/components/driverselector/driverselector.model.ts
  7. 11
      src/modules/pages/maintain/components/driverselector/driverselector.ts
  8. 84
      src/modules/pages/maintain/forms/components/form.jdbc.ts
  9. 1
      types/globals.d.ts

6
src/modules/app.typings.d.ts vendored
Unescape View File

@ -8,9 +8,13 @@ export interface DatabaseType {
internal: boolean; internal: boolean;
type: string; type: string;
hasSchema?: boolean; hasSchema?: boolean;
hasSchemas?: {
[key: string]: boolean;
};
kerberos?: boolean; kerberos?: boolean;
iconUrl?: string; iconUrl?: string;
versions?: string[];
urls?: { urls?: {
[key: string]: string; [key: string]: string;
} };
} }

4
src/modules/components/collapse/collapse.ts
Unescape View File

@ -64,4 +64,8 @@ export class Collapse extends BI.BasicButton {
doClick() { doClick() {
this.store.setCollapse(!this.model.isCollapse); this.store.setCollapse(!this.model.isCollapse);
} }
setCollapse(v: boolean) {
this.store.setCollapse(v);
}
} }

3
src/modules/constants/constant.ts
Unescape View File

@ -704,10 +704,11 @@ export const DATA_BASE_TYPES = [
kerberos: false, kerberos: false,
}, },
{ {
text: BI.i18nText('Dec-Dcm_Connection_TDSQL'), text: 'TDSQL',
databaseType: 'tdsql', databaseType: 'tdsql',
driver: 'org.postgresql.Driver', driver: 'org.postgresql.Driver',
url: 'jdbc:postgresql://hostname:port/database', url: 'jdbc:postgresql://hostname:port/database',
versions: ['pgsql'],
commonly: false, commonly: false,
internal: true, internal: true,
type: 'jdbc', type: 'jdbc',

6
src/modules/crud/decision.api.ts
Unescape View File

@ -107,13 +107,11 @@ export class DecisionApi implements Api {
} }
getCipher(password: string) { getCipher(password: string) {
return BI.Providers.getProvider('dec.provider.cipher') return Dec.Utils['getTransCipherText'](password);
.getCipher(password);
} }
getPlain(cipher: string) { getPlain(cipher: string) {
return BI.Providers.getProvider('dec.provider.cipher') return Dec.Utils['getPlainText'](cipher);
.getPlain(cipher);
} }
getHyperlink(name: string) { getHyperlink(name: string) {

22
src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
Unescape View File

@ -52,7 +52,8 @@ export class ConnectionJdbc extends BI.Widget {
sslClientCertificate, sslClientCertificate,
} = connectionData; } = connectionData;
const databaseType = getJdbcDatabaseType(database, driver); 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; const { hgap, vgap } = CONNECTION_LAYOUT;
return { return {
@ -62,6 +63,13 @@ export class ConnectionJdbc extends BI.Widget {
items: [ items: [
{ {
type: FormItem.xtype, 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'), name: BI.i18nText('Dec-Dcm_Connection_Form_Driver'),
value: BI.isKey(driverSource) ? `${driver} (${driverSource})` : driver, value: BI.isKey(driverSource) ? `${driver} (${driverSource})` : driver,
}, },
@ -82,13 +90,13 @@ export class ConnectionJdbc extends BI.Widget {
}, },
authType authType
? { ? {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Dec-Dcm_Connection_Form_AuthType'), name: BI.i18nText('Dec-Dcm_Connection_Form_AuthType'),
value: authType, value: authType,
} }
: { : {
type: BI.Layout.xtype, type: BI.Layout.xtype,
}, },
{ {
type: FormItem.xtype, type: FormItem.xtype,
name: authType ? BI.i18nText('Dec-Dcm_Connection_Form_Principal') : BI.i18nText('Dec-Dcm_Connection_Form_UserName'), name: authType ? BI.i18nText('Dec-Dcm_Connection_Form_Principal') : BI.i18nText('Dec-Dcm_Connection_Form_UserName'),

14
src/modules/pages/maintain/components/driverselector/driverselector.model.ts
Unescape View File

@ -87,6 +87,12 @@ export class DriverSelectorModel extends Model {
changeDriverSource: driverTypeComboValue => { changeDriverSource: driverTypeComboValue => {
this.model.driverSource = driverTypeComboValue === 'default' ? '' : this.model.driverSource; 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 = () => { private resolveSelectedDriverType = () => {
@ -97,11 +103,12 @@ export class DriverSelectorModel extends Model {
return [this.options.driverSource, this.options.driver]; return [this.options.driverSource, this.options.driver];
}; };
private getDrivers = () => { private getDrivers = (version?: string) => {
const connectionData = this.options.connectionData as ConnectionJDBC; const connectionData = this.options.connectionData as ConnectionJDBC;
const connectionType = getJdbcDatabaseType(connectionData.database, connectionData.driver); const connectionType = getJdbcDatabaseType(connectionData.database, connectionData.driver);
const selectedVersion = version ?? this.options.version;
const drivers = connectionType.drivers ? const drivers = connectionType.drivers ?
connectionType.drivers.map(item => { (BI.isUndefined(connectionType.versions) ? connectionType.drivers : connectionType.drivers[selectedVersion]).map(item => {
return { return {
text: item, text: item,
value: item, value: item,
@ -111,8 +118,7 @@ export class DriverSelectorModel extends Model {
text: connectionType.driver, text: connectionType.driver,
value: connectionType.driver, value: connectionType.driver,
}]; }];
if (BI.isUndefined(connectionType.versions) && !drivers.some(item => item.text === connectionData.driver)) {
if (!drivers.some(item => item.text === connectionData.driver)) {
return [ return [
{ {
text: connectionData.driver, text: connectionData.driver,

11
src/modules/pages/maintain/components/driverselector/driverselector.ts
Unescape View File

@ -24,6 +24,7 @@ export class DriverSelector extends BI.Widget {
driver: '', driver: '',
driverSource: '', driverSource: '',
connectionData: {} as ConnectionJDBC, connectionData: {} as ConnectionJDBC,
version: '',
}; };
defaultDrivers: EditorIconCheckCombo = null; defaultDrivers: EditorIconCheckCombo = null;
@ -43,6 +44,12 @@ export class DriverSelector extends BI.Widget {
driverManageEntryVisible: b => { driverManageEntryVisible: b => {
this.driverManageEntry.setVisible(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; 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, driver: this.model.driverSource === '' ? this.model.defaultDriver.driver : this.model.customDriver.driver,
}; };
} }
setDefaultDrivers(version: string) {
this.store.setDefaultDrivers(version);
}
} }

84
src/modules/pages/maintain/forms/components/form.jdbc.ts
Unescape View File

@ -40,9 +40,11 @@ export class FormJdbc extends BI.Widget {
formKeyPath: FormItem; formKeyPath: FormItem;
formKrb5File: FormItem; formKrb5File: FormItem;
labelTips: Label; labelTips: Label;
schemaForm: FormItem;
form = { form = {
connectionName: null, connectionName: null,
version: null,
driver: null, driver: null,
database: null, database: null,
host: null, host: null,
@ -138,8 +140,8 @@ export class FormJdbc extends BI.Widget {
} = connectionPoolAttr as ConnectionPoolJDBC; } = connectionPoolAttr as ConnectionPoolJDBC;
const databaseType = getJdbcDatabaseType(database, driver); const databaseType = getJdbcDatabaseType(database, driver);
this.databaseType = databaseType; this.databaseType = databaseType;
const { host, port, databaseName, version } = resolveUrlInfo(url, database);
const { host, port, databaseName } = resolveUrlInfo(url, database); this.version = !BI.isUndefined(databaseType.versions) ? (version ?? databaseType.versions[0]) : version;
const { hgap, vgap } = CONNECTION_LAYOUT; const { hgap, vgap } = CONNECTION_LAYOUT;
const valueRangeConfig = { 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, type: FormItem.xtype,
@ -184,6 +221,7 @@ export class FormJdbc extends BI.Widget {
driver, driver,
driverSource, driverSource,
connectionData, connectionData,
version: this.version,
listeners: [ listeners: [
{ {
eventName: 'EVENT_CHANGE', eventName: 'EVENT_CHANGE',
@ -405,7 +443,7 @@ export class FormJdbc extends BI.Widget {
{ {
eventName: FileUpload.EVENT_CHECK_SUCCESS, eventName: FileUpload.EVENT_CHECK_SUCCESS,
action: (value) => { action: (value) => {
const principalsItems = BI.map(value.principals, function(index, item) { const principalsItems = BI.map(value.principals, function (index, item) {
return { return {
text: item, text: item,
value: item value: item
@ -485,7 +523,7 @@ export class FormJdbc extends BI.Widget {
action: () => { action: () => {
this.setKerberos(); this.setKerberos();
}, },
} }
] ]
} }
] ]
@ -510,7 +548,7 @@ export class FormJdbc extends BI.Widget {
// 模式 // 模式
{ {
type: FormItem.xtype, type: FormItem.xtype,
invisible: !databaseType.hasSchema, invisible: BI.isUndefined(databaseType.hasSchemas) ? !databaseType.hasSchema : !databaseType.hasSchemas[this.version],
height: 64, height: 64,
name: BI.i18nText('Dec-Dcm_Connection_Form_Pattern'), name: BI.i18nText('Dec-Dcm_Connection_Form_Pattern'),
forms: [ 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, width: 100,
name: BI.i18nText('Dec-Dcm_Connection_Setting', 'SSL'), name: BI.i18nText('Dec-Dcm_Connection_Setting', 'SSL'),
invisible: !this.getSslSetEnabled(), invisible: !this.getSslSetEnabled(),
ref: (_ref: Collapse) => {
this.sslCollapse = _ref;
},
listeners: [ listeners: [
{ {
eventName: EVENT_CHANGE, eventName: EVENT_CHANGE,
@ -1252,17 +1296,17 @@ export class FormJdbc extends BI.Widget {
const connectionType = getJdbcDatabaseType(connectionData.database, connectionData.driver); const connectionType = getJdbcDatabaseType(connectionData.database, connectionData.driver);
const drivers = connectionType.drivers const drivers = connectionType.drivers
? connectionType.drivers.map((item) => { ? connectionType.drivers.map((item) => {
return { return {
text: item, text: item,
value: item, value: item,
}; };
}) })
: [ : [
{ {
text: connectionType.driver, text: connectionType.driver,
value: connectionType.driver, value: connectionType.driver,
}, },
]; ];
if (!drivers.some((item) => item.text === connectionData.driver)) { if (!drivers.some((item) => item.text === connectionData.driver)) {
return [ return [
@ -1309,7 +1353,7 @@ export class FormJdbc extends BI.Widget {
private getSslSetEnabled(): boolean { private getSslSetEnabled(): boolean {
const { databaseType } = this.databaseType; const { databaseType } = this.databaseType;
return databaseType === 'mysql'; return databaseType === 'mysql' || this.version === 'mysql';
} }
public setSchemas(schemas: string[]) { public setSchemas(schemas: string[]) {
@ -1329,7 +1373,7 @@ export class FormJdbc extends BI.Widget {
} }
public setKerberos() { public setKerberos() {
const KerberosParams = BI.extend({},{ const KerberosParams = BI.extend({}, {
keytabPath: this.form.keyPath.getValue(), keytabPath: this.form.keyPath.getValue(),
krb5ConfPath: this.form.krb5Path.getValue(), krb5ConfPath: this.form.krb5Path.getValue(),
principal: this.form.principal.getValue()[0] principal: this.form.principal.getValue()[0]
@ -1341,7 +1385,7 @@ export class FormJdbc extends BI.Widget {
public initPrincipals(keyPath, principal) { public initPrincipals(keyPath, principal) {
let self = this; let self = this;
api.getPrincipals(keyPath).then(res => { api.getPrincipals(keyPath).then(res => {
const principalsItems = BI.map(res.data, function(index, item) { const principalsItems = BI.map(res.data, function (index, item) {
return { return {
text: item, text: item,
value: item value: item
@ -1354,12 +1398,12 @@ export class FormJdbc extends BI.Widget {
public changePrincipal() { public changePrincipal() {
let self = this; let self = this;
const KerberosParams = BI.extend({},{ const KerberosParams = BI.extend({}, {
keytabPath: this.form.keyPath.getValue(), keytabPath: this.form.keyPath.getValue(),
krb5ConfPath: this.form.krb5Path.getValue(), krb5ConfPath: this.form.krb5Path.getValue(),
principal: this.form.principal.getValue()[0] 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.keyPath.setValue(res.data.keytabPath);
self.form.krb5Path.setValue(res.data.krb5ConfPath); self.form.krb5Path.setValue(res.data.krb5ConfPath);
}); });

1
types/globals.d.ts vendored
Unescape View File

@ -13,6 +13,7 @@ declare const Dec: {
connected: boolean; connected: boolean;
}; };
system: {}; system: {};
Utils: {},
personal: { personal: {
username: string; username: string;
}; };

Write Preview
Loading…
Cancel
Save