Browse Source

Pull request #171: Final/10.0 >> Feature/10.0

Merge in DEC/decision-webui-dcm from final/10.0 to feature/10.0

* commit 'bd437091012044364ad36acf64e1480963b2c873':
  DEC-13302 fix:页面子tab的标题样式
  DEC-12745 fix: 连接华为fusioninsight HD
research/11.0
parent
commit
142af4b649
  1. 8
      src/modules/constants/constant.ts
  2. 9
      src/modules/title/title.ts

8
src/modules/constants/constant.ts

@ -320,7 +320,7 @@ export const DATA_BASE_TYPES = [
internal: true,
type: 'jdbc',
hasSchema: true,
kerberos: false,
kerberos: true,
},
{
text: 'FusionInsight elk',
@ -331,7 +331,7 @@ export const DATA_BASE_TYPES = [
internal: true,
type: 'jdbc',
hasSchema: true,
kerberos: false,
kerberos: true,
},
{
text: 'FusionInsight HD',
@ -342,7 +342,7 @@ export const DATA_BASE_TYPES = [
internal: true,
type: 'jdbc',
hasSchema: false,
kerberos: false,
kerberos: true,
},
{
text: 'GaussDB 200',
@ -353,7 +353,7 @@ export const DATA_BASE_TYPES = [
internal: true,
type: 'jdbc',
hasSchema: true,
kerberos: false,
kerberos: true,
}, {
text: 'Hadoop Hive',
databaseType: 'hadoop-hive',

9
src/modules/title/title.ts

@ -1,4 +1,4 @@
import { LeftRightVerticalAdapt, LinearSegment, Tab } from 'ui';
import { LeftRightVerticalAdapt, VerticalAdapt, LinearSegment, Tab } from 'ui';
import { shortcut, store } from '@core/core';
import { TitleModel, TitleModelXtype } from './title.model';
import { PAGE_INDEX } from '@constants/constant';
@ -32,9 +32,12 @@ export class Title extends BI.Widget {
left: [
{
type: LinearSegment,
cls: 'bi-font-bold',
height: 40,
hgap: 10,
width: 250,
layouts: [{
type: VerticalAdapt,
}],
ref: (_ref: any) => {
this.linearSegment = _ref;
},
@ -43,10 +46,12 @@ export class Title extends BI.Widget {
text: BI.i18nText('Dec-Dcm_Connection_Management'),
selected: true,
value: PAGE_INDEX.CONNECTION,
hgap: 15,
},
{
text: BI.i18nText('Dec-Dcm_Pool_Connection_Management'),
value: PAGE_INDEX.POOL,
hgap: 15,
},
],
listeners: [{

Loading…
Cancel
Save