Browse Source

Merge pull request #41 in DEC/decision-webui-dcm from ~ALAN/decision-webui-dcm:feature/10.0 to feature/10.0

* commit '770f7de9a9caf4cddc5d3e99d24d7c10c71db6c1':
  fix: BI-51659 修复无法新建其他类型数据库的bug
qufenxi
alan 5 years ago
parent
commit
a8dc5fc28f
  1. 2
      src/modules/constants/constant.ts
  2. 6
      src/modules/pages/maintain/forms/form.ts

2
src/modules/constants/constant.ts

@ -530,7 +530,7 @@ export const DATA_BASE_TYPES = [
databaseType: 'other',
driver: 'org.ha.Driver',
drivers: ['org.ha.Driver', 'com.fr.third.org.hsqldb.jdbcDriver', 'org.sqlite.JDBC'],
url: 'jdbc:h2://hostname:port/../database',
url: 'jdbc:h2://hostname:port/database',
commonly: false,
internal: true,
type: 'other',

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

@ -6,7 +6,7 @@ import { FormPluginXtype } from './components/form.plugin';
import { connectionType } from '@constants/env';
import { ConnectionJDBC, Connection } from 'src/modules/crud/crud.typings';
import { TestStatusXtype, EVENT_RELOAD, EVENT_CLOSE } from 'src/modules/components/test_status/test_status';
import { DEFAULT_JNDI_DATA, DEFAULT_JDBC_POOL, DATA_BASE_DRIVER_LINK } from '@constants/constant';
import { DEFAULT_JNDI_DATA, DEFAULT_JDBC_POOL, DATA_BASE_DRIVER_LINK, DATEBASE_FILTER_TYPE } from '@constants/constant';
import { getJdbcDatabaseType } from 'src/modules/app.service';
export const MaintainFormXtype = 'dec.dcm.maintain.form';
@ -136,6 +136,8 @@ export class MaintainForm extends BI.Widget {
return FormJdbcXtype;
case connectionType.JNDI:
return FormJndiXtype;
case DATEBASE_FILTER_TYPE.OTHER:
return FormJdbcXtype;
default:
return FormPluginXtype;
}
@ -147,6 +149,8 @@ export class MaintainForm extends BI.Widget {
return this.getJdbcConnection();
case connectionType.JNDI:
return this.getJndiConnection();
case DATEBASE_FILTER_TYPE.OTHER:
return this.getJdbcConnection();
default:
return this.getPluginConnection();
}

Loading…
Cancel
Save