Browse Source

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

* commit 'ed176fe13586d883998a136d70610c210db66f4d':
  fix: 修改判断逻辑
  fix: DEC-10021 修改h2数据连接默认url
qufenxi
alan 5 years ago
parent
commit
8f9c94672a
  1. 2
      src/modules/constants/constant.ts
  2. 4
      src/modules/pages/connection/connection.ts

2
src/modules/constants/constant.ts

@ -275,7 +275,7 @@ export const DATA_BASE_TYPES = [
text: 'H2', text: 'H2',
databaseType: 'h2', databaseType: 'h2',
driver: 'org.h2.Driver', driver: 'org.h2.Driver',
url: 'jdbc:h2://hostname:port/../database', url: 'jdbc:h2://${ENV_HOME}/../database',
commonly: false, commonly: false,
internal: true, internal: true,
type: 'jdbc', type: 'jdbc',

4
src/modules/pages/connection/connection.ts

@ -24,10 +24,10 @@ export class Connection extends BI.Widget {
watch = { watch = {
connectionSelected:(name: string) => { connectionSelected:(name: string) => {
if (name) {
const canEdit = connectionCanEdit(this.model.connectionSelectedOne); const canEdit = connectionCanEdit(this.model.connectionSelectedOne);
this.connectionTitleWidget.setText(`${name}${this.getSelectConnectionType()}`); this.connectionTitleWidget.setText(`${name}${this.getSelectConnectionType()}`);
this.connectionEditWidget.setVisible(!!name && canEdit); this.connectionEditWidget.setVisible(canEdit);
if (name) {
const hasRegistered = this.hasRegistered(); const hasRegistered = this.hasRegistered();
this.title.setVisible(hasRegistered); this.title.setVisible(hasRegistered);
if (!hasRegistered) { if (!hasRegistered) {

Loading…
Cancel
Save