Browse Source

Merge pull request #156 in DEC/decision-webui-dcm from ~FRANK.QIU/decision-webui-dcm:release/10.0 to release/10.0

* commit 'c12a24199e9a304feab28a20e35f229acf37d3db':
  DEC-12158 fix: 国际化测试,遇到的一些界面问题
research/10.0
Frank.Qiu 5 years ago
parent
commit
e4cfc10910
  1. 2
      src/modules/constants/constant.ts
  2. 11
      src/modules/pages/database/database.ts

2
src/modules/constants/constant.ts

@ -597,7 +597,7 @@ export const DATA_BASE_TYPES = [
export const CONNECT_CHARSET = [ export const CONNECT_CHARSET = [
{ {
text: '自动', text: BI.i18nText('Dec-Dcm_Connection_Form_Auto'),
value: '', value: '',
}, },
{ {

11
src/modules/pages/database/database.ts

@ -140,19 +140,23 @@ export class Datebase extends BI.Widget {
items: [ items: [
{ {
el: { el: {
type: VerticalAdapt, type: Htape,
hgap: 20, hgap: 20,
invisible: true, invisible: true,
items: [ items: [
{ {
type: Label, type: Label,
width: 70,
textAlign: 'left',
text: BI.i18nText('Dec-Dcm_Connection_Type_Filter'), text: BI.i18nText('Dec-Dcm_Connection_Type_Filter'),
title: BI.i18nText('Dec-Dcm_Connection_Type_Filter'),
}, },
{ {
type: MultiSelectItem, type: MultiSelectItem,
width: 80, width: 80,
selected: this.model.isInternal, selected: this.model.isInternal,
text: BI.i18nText('Dec-Dcm_Connection_Support_Inner'), text: BI.i18nText('Dec-Dcm_Connection_Support_Inner'),
title: BI.i18nText('Dec-Dcm_Connection_Support_Inner'),
ref: (_ref: any) => { ref: (_ref: any) => {
this.internalWidget = _ref; this.internalWidget = _ref;
}, },
@ -165,6 +169,7 @@ export class Datebase extends BI.Widget {
width: 80, width: 80,
selected: this.model.isPlugin, selected: this.model.isPlugin,
text: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'), text: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'),
title: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'),
ref: (_ref: any) => { ref: (_ref: any) => {
this.pluginWidget = _ref; this.pluginWidget = _ref;
}, },
@ -175,14 +180,16 @@ export class Datebase extends BI.Widget {
{ {
type: Label, type: Label,
cls: 'bi-tips', cls: 'bi-tips',
textAlign: 'left',
text: BI.i18nText('Dec-Dcm_Connection_Filter_Tip'), text: BI.i18nText('Dec-Dcm_Connection_Filter_Tip'),
title: BI.i18nText('Dec-Dcm_Connection_Filter_Tip'),
}, },
], ],
ref: (_ref: any) => { ref: (_ref: any) => {
this.typeFilterWidget = _ref; this.typeFilterWidget = _ref;
}, },
}, },
height: 20, height: 24,
}, },
{ {
type: ButtonGroup, type: ButtonGroup,

Loading…
Cancel
Save