Browse Source

Merge pull request #1014 in DEC/decision-webui-dcm from bugfix/10.0 to feature/10.0

* commit '97a756988928761e1d39bd7bdaaecabb06436152':
  fix: DEC-16169 改用provider获取插件数据连接
research/11.0
superman 4 years ago
parent
commit
305102b98d
  1. 1
      src/modules/app.provider.ts
  2. 5
      src/modules/app.service.ts
  3. 9
      src/modules/constants/constant.ts

1
src/modules/app.provider.ts

@ -69,5 +69,6 @@ BI.provider('dec.connection.provider.datebase', function() {
this.$get = () => BI.inherit(BI.OB, {
getJdbcResolveByType: (type: string) => this.resolves[type] || jdbcResolve,
customDatabaseType: BI.Constants.getConstant(CONSTANT_PLUGIN_TYPES),
});
});

5
src/modules/app.service.ts

@ -1,11 +1,10 @@
import { DATA_BASE_TYPES, DATA_BASE_TYPES_OTHER, DESIGN_DRIVER_TYPE, OTHER_JDBC } from '@constants/constant';
import { CONSTANT_PLUGIN_TYPES } from './app.constant';
import { DatabaseType } from './app.typings';
import { Connection } from './crud/crud.typings';
export function getAllDatabaseTypes():DatabaseType[] {
return [
...DATA_BASE_TYPES,
...BI.Constants.getConstant(CONSTANT_PLUGIN_TYPES).map(item => {
...BI.Providers.getProvider('dec.connection.provider.datebase').customDatabaseType.map(item => {
return {
...item,
internal: false,
@ -15,7 +14,7 @@ export function getAllDatabaseTypes():DatabaseType[] {
];
}
function getPlugin(type: string) {
return BI.Constants.getConstant(CONSTANT_PLUGIN_TYPES).find(item => item.databaseType === type);
return BI.Providers.getProvider('dec.connection.provider.datebase').customDatabaseType.find(item => item.databaseType === type);
}
export function getPluginWidgetShow(plugin: string) {
return BI.get(getPlugin(plugin), 'show');

9
src/modules/constants/constant.ts

@ -1,5 +1,3 @@
import { CONSTANT_PLUGIN_TYPES } from '../app.constant';
export const PAGE_INDEX = {
CONNECTION: 'connection',
DATEBASE: 'datebase',
@ -619,13 +617,6 @@ export const DATA_BASE_TYPES = [
'org.sqlite.JDBC': 'jdbc:sqlite:[PATH_TO_DB_FILES]',
},
},
...BI.Constants.getConstant(CONSTANT_PLUGIN_TYPES).map(item => {
return {
...item,
internal: false,
commonly: false,
};
}),
];

Loading…
Cancel
Save