Browse Source

Merge pull request #3402 in DEC/decision-webui-dcm from release/10.0 to release/11.0

* commit '7c36b0800bc66e72662059e288be481a79f87d0f':
  BI-95685 fix: 平台复制链接时需要重建 identity
  DEC-20979 feat: 【BI配合】适配doris数据库
bugfix/11.0
superman 3 years ago
parent
commit
88f312d2dc
  1. 11
      src/modules/constants/constant.ts
  2. 9
      src/modules/pages/maintain/forms/form.ts

11
src/modules/constants/constant.ts

@ -561,6 +561,17 @@ export const DATA_BASE_TYPES = [
type: 'jdbc',
hasSchema: false,
kerberos: false,
}, {
text: 'Doris',
databaseType: 'doris',
driver: 'com.mysql.jdbc.Driver',
drivers: ['com.mysql.jdbc.Driver'],
url: 'jdbc:mysql://hostname:port/database',
commonly: false,
internal: true,
type: 'jdbc',
hasSchema: false,
kerberos: false,
}, {
text: 'Presto',
databaseType: 'presto',

9
src/modules/pages/maintain/forms/form.ts

@ -139,9 +139,12 @@ export class MaintainForm extends BI.Widget {
this.isEdit = true;
this.connectionName = this.model.connectionSelectedOne.connectionName;
const connection = BI.clone(this.model.connectionSelectedOne);
const { database, driver } = connection.connectionData as ConnectionJDBC;
(connection.connectionData as ConnectionJDBC).database = getJdbcDatabaseType(database, driver).databaseType;
connectionData = connection.connectionData as ConnectionJDBC;
const { database, driver } = connectionData;
connectionData.database = getJdbcDatabaseType(database, driver).databaseType;
if (this.model.isCopy) {
connectionData.identity = BI.UUID();
}
return connection;
}

Loading…
Cancel
Save