diff --git a/src/app/app.model.ts b/src/app/app.model.ts index 6294f1e..8e3d4e9 100644 --- a/src/app/app.model.ts +++ b/src/app/app.model.ts @@ -7,7 +7,7 @@ const Model: ModelType = { childContext: ['tab', 'linkList', 'linkSelected', 'linkUpdate', 'moreLinkSelected', 'statusSelected', 'connectionNameErr'], state () { return { - tab: BI.i18nText('BI-Data_Connection_Management'), + tab: BI.i18nText('Dec-Dcm_Connection_Management'), linkList, linkSelected: {}, linkUpdate: {}, diff --git a/src/app/link_set/left/left.service.ts b/src/app/link_set/left/left.service.ts index 9c8350e..8f792c4 100644 --- a/src/app/link_set/left/left.service.ts +++ b/src/app/link_set/left/left.service.ts @@ -10,7 +10,7 @@ export const getLinks = (linkList: LinkType[]): any => { title: item.connectionName, id: item.connectionId, creator: item.creator, - text: item.text ? item.text : BI.i18nText('BI-Default'), + text: item.text ? item.text : BI.i18nText('Dec-Dcm_Default'), }); }); diff --git a/src/app/link_set/left/left_item/left.item.component.ts b/src/app/link_set/left/left_item/left.item.component.ts index 49fd551..2134e59 100644 --- a/src/app/link_set/left/left_item/left.item.component.ts +++ b/src/app/link_set/left/left_item/left.item.component.ts @@ -24,7 +24,7 @@ const Widget: WidgetType = { cls: 'link-font', height: 24, width: 26, - text: BI.i18nText('BI-Connections'), + text: BI.i18nText('Dec-Dcm_Connections'), title, }, { @@ -41,25 +41,25 @@ const Widget: WidgetType = { { type: ItemIcon, cls: 'link-text-font', - title: BI.i18nText('BI-Test-Connection'), + title: BI.i18nText('Dec-Dcm_Test_Connection'), id, }, { type: ItemIcon, cls: 'copy-font', - title: BI.i18nText('BI-Copy'), + title: BI.i18nText('Dec-Dcm_Copy'), id, }, { type: ItemIcon, cls: 'info-font', - title: `${BI.i18nText('BI-Type')}：${text === 'DESIGNER' ? BI.i18nText('BI-Other') : text} \r\n${BI.i18nText('BI-Creator')}：${creator}`, + title: `${BI.i18nText('Dec-Dcm_Type')}：${text === 'DESIGNER' ? BI.i18nText('Dec-Dcm_Other') : text} \r\n${BI.i18nText('Dec-Dcm_Creator')}：${creator}`, id, }, { type: ItemIcon, cls: 'delete-font', - title: BI.i18nText('BI-Delete'), + title: BI.i18nText('Dec-Dcm_Delete'), id, }, ], diff --git a/src/app/link_set/left/left_item/left.item.icon.component.ts b/src/app/link_set/left/left_item/left.item.icon.component.ts index cded2ae..f8e4300 100644 --- a/src/app/link_set/left/left_item/left.item.icon.component.ts +++ b/src/app/link_set/left/left_item/left.item.icon.component.ts @@ -10,7 +10,7 @@ const Widget: WidgetType = { const that = this; let iconContent: any = null; let combo: any = null; - if (title === BI.i18nText('BI-Delete')) { + if (title === BI.i18nText('Dec-Dcm_Delete')) { return { type: BubbleCombo, direction: 'bottom', @@ -30,7 +30,7 @@ const Widget: WidgetType = { }, popup: { type: TextBubblePopupBarView, - text: BI.i18nText('BI-Connection-Make-Sure-Delete'), + text: BI.i18nText('Dec-Dcm_Connection_Make_Sure_Delete'), listeners: [{ eventName: BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, action (type: boolean) { @@ -70,7 +70,7 @@ const Widget: WidgetType = { }, mounted() { const {title, id} = this.options; - if (title !== BI.i18nText('BI-Delete')) { + if (title !== BI.i18nText('Dec-Dcm_Delete')) { this.element.on('click', (event: any) => { event.stopPropagation(); this.store.onIconClick(title, id); diff --git a/src/app/link_set/link-set.component.ts b/src/app/link_set/link-set.component.ts index 8b89d13..c39e192 100644 --- a/src/app/link_set/link-set.component.ts +++ b/src/app/link_set/link-set.component.ts @@ -10,7 +10,7 @@ const Widget: WidgetType = { }, watch:{ tab(tab: string) { - this.setVisible(tab === BI.i18nText('BI-Data_Connection_Management')); + this.setVisible(tab === BI.i18nText('Dec-Dcm_Connection_Management')); }, }, render() { diff --git a/src/app/link_set/link-set.model.ts b/src/app/link_set/link-set.model.ts index 45e1d2a..ac0f912 100644 --- a/src/app/link_set/link-set.model.ts +++ b/src/app/link_set/link-set.model.ts @@ -33,17 +33,17 @@ const Model: ModelType = { }, onIconClick(title: string, id: string) { switch (title) { - case BI.i18nText('BI-Delete'): + case BI.i18nText('Dec-Dcm_Delete'): deleteConnection(id, () => { this.model.linkList = [...this.model.linkList.filter((item: LinkType) => item.connectionId !== id)]; this.model.linkSelected = {}; this.model.linkUpdate = {}; }); break; - case BI.i18nText('BI-Test-Connection'): + case BI.i18nText('Dec-Dcm_Test_Connection'): this._textLink(id); break; - case BI.i18nText('BI-Copy'): + case BI.i18nText('Dec-Dcm_Copy'): this.noSaveConfirm(() => { this.copyLink(id); }); @@ -53,16 +53,16 @@ const Model: ModelType = { } }, _textLink(id: string) { - const loadingId = dialog.loading(BI.i18nText('BI-Connection-Testing')); + const loadingId = dialog.loading(BI.i18nText('Dec-Dcm_Connection_Testing')); const link = this.model.linkList.find((item: LinkType) => item.connectionId === id); testConnection(link, (res: any) => { dialog.close(loadingId); if (res && res.errorCode) { - dialog.linkFail(`${link.connectionName}${BI.i18nText('BI-Connection-Test-Fail')}`, res.errorMsg, () => { + dialog.linkFail(`${link.connectionName}${BI.i18nText('Dec-Dcm_Connection_Test_Fail')}`, res.errorMsg, () => { this._textLink(id); }); } else { - dialog.success(BI.i18nText('BI-Connection-Test-Success')); + dialog.success(BI.i18nText('Dec-Dcm_Connection_Test_Success')); } }); }, @@ -125,7 +125,7 @@ const Model: ModelType = { }, setNewLink(value: string) { if (!databaseTyle.some(item => item.text === value) && !BI.Constants.getConstant(`dec.constant.database.conf.connect.form.${value.toLowerCase()}.edit`)) { - dialog.error(BI.i18nText('BI-Connection-Option-Cannot-Find')); + dialog.error(BI.i18nText('Dec-Dcm_Connection_Option_Cannot_Find')); return; } @@ -167,7 +167,7 @@ const Model: ModelType = { }, noSaveConfirm(cb: Function) { if (this.model.linkSelected && this.model.linkSelected.isSelected) { - dialog.confirm(BI.i18nText('BI-Connection-Config-No-Save'), (isConfirm: boolean) => { + dialog.confirm(BI.i18nText('Dec-Dcm_Connection_Config_No_Save'), (isConfirm: boolean) => { if (isConfirm) { this.saveLink(); } else { diff --git a/src/app/link_set/more/more.link.component.ts b/src/app/link_set/more/more.link.component.ts index 163c5e0..4cfce6b 100644 --- a/src/app/link_set/more/more.link.component.ts +++ b/src/app/link_set/more/more.link.component.ts @@ -15,7 +15,7 @@ const Widget: WidgetType = { items:[{ type: SearchEditor, width: 300, - watermark: BI.i18nText('BI-Search'), + watermark: BI.i18nText('Dec-Dcm_Search'), }], }, height: 30, diff --git a/src/app/link_set/more/more.link.service.ts b/src/app/link_set/more/more.link.service.ts index 247573d..cf2c654 100644 --- a/src/app/link_set/more/more.link.service.ts +++ b/src/app/link_set/more/more.link.service.ts @@ -7,7 +7,7 @@ export const moreLink = (onConfirm?: Function): void => { BI.Popovers.create(id, { type: 'bi.bar_popover', size: 'normal', - header: BI.i18nText('BI-Connection-More-Title'), + header: BI.i18nText('Dec-Dcm_Connection_More-Title'), width: 550, height: 500, body: { diff --git a/src/app/link_set/right/nothing.component.ts b/src/app/link_set/right/nothing.component.ts index e18db76..dd9268a 100644 --- a/src/app/link_set/right/nothing.component.ts +++ b/src/app/link_set/right/nothing.component.ts @@ -17,9 +17,9 @@ const Widget: WidgetType = { }, { type:Label, - cls: 'bi-tips', + cls: 'Dec-Dcm_Tips', height: 20, - text: BI.i18nText('BI-Connection-Plase-Add-One'), + text: BI.i18nText('Dec-Dcm_Connection_Plase_Add_One'), }, ], diff --git a/src/app/link_set/right/right_edit/right.edit.component.ts b/src/app/link_set/right/right_edit/right.edit.component.ts index 4fb5312..e7129d2 100644 --- a/src/app/link_set/right/right_edit/right.edit.component.ts +++ b/src/app/link_set/right/right_edit/right.edit.component.ts @@ -32,8 +32,8 @@ const Widget: WidgetType = { items: [ { type: FormItem, - text: BI.i18nText('BI-Connection-Form-ConnectionName'), - hint: BI.i18nText('BI-Connection-Form-ConnectionName-Change-Confirm'), + text: BI.i18nText('Dec-Dcm_Connection_Form_ConnectionName'), + hint: BI.i18nText('Dec-Dcm_Connection_Form_ConnectionName-Change-Confirm'), form:{ type: Editor, cls: 'bi-border', @@ -60,7 +60,7 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-First_Step'), + text: BI.i18nText('Dec-Dcm_First_Step'), height: 400, form:{ type: Vertical, @@ -68,7 +68,7 @@ const Widget: WidgetType = { items:[ { type: FormItem, - text: BI.i18nText('BI-Connection-Form-Driver'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Driver'), form:{ type: TextValueCombo, cls: 'bi-border', @@ -88,11 +88,11 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-URL'), + text: BI.i18nText('Dec-Dcm_Connection_Form_URL'), form:{ type: Editor, cls: 'bi-border', - watermark:BI.i18nText('BI-Connection-Form-Place-Input'), + watermark:BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'), width: 300, value: linkSelected.url, listeners: [{ @@ -108,12 +108,12 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-OriginalCharsetName'), + text: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), form:{ type: TextValueCombo, cls: 'bi-border', width: 300, - text: linkSelected.originalCharsetName === '' ? BI.i18nText('BI-Connection-Form-Auto') : linkSelected.originalCharsetName, + text: linkSelected.originalCharsetName === '' ? BI.i18nText('Dec-Dcm_Connection_Form_Auto') : linkSelected.originalCharsetName, items: BI.Constants.getConstant(charset), listeners: [{ eventName: BI.TextValueCombo.EVENT_CHANGE, @@ -128,12 +128,12 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-UserName'), + text: BI.i18nText('Dec-Dcm_Connection_Form_UserName'), form:{ type: Editor, cls: 'bi-border', allowBlank:true, - watermark:BI.i18nText('BI-Connection-Form-Place-Input'), + watermark:BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'), width: 300, value: linkSelected.user, listeners: [{ @@ -149,13 +149,13 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-Password'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Password'), form:{ type: Editor, cls: 'bi-border', inputType:'password', allowBlank:true, - watermark:BI.i18nText('BI-Connection-Form-Place-Input'), + watermark:BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'), width: 300, value: linkSelected.password, listeners: [{ @@ -171,17 +171,17 @@ const Widget: WidgetType = { }, { type: Title, - text: BI.i18nText('BI-Connection-Form-Pool-Properties'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Pool_Properties'), }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-SQL-Validation-Query'), + text: BI.i18nText('Dec-Dcm_Connection_Form_SQL_Validation_Query'), height: 100, form:{ type: TextAreaEditor, cls: 'bi-border', allowBlank:true, - watermark:BI.i18nText('BI-Connection-Form-Place-Input'), + watermark:BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'), width: 300, height:100, value: linkSelected.validationQuery, @@ -198,10 +198,10 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-Connection-Check'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Connection-Check'), form:{ type: MultiSelectItem, - text: BI.i18nText('BI-Yes'), + text: BI.i18nText('Dec-Dcm_Yes'), selected: linkSelected.testOnBorrow, width: 60, listeners: [{ @@ -217,15 +217,15 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-Connection-Max-Number'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Connection_Max_Number'), form:{ type: Editor, cls: 'bi-border', allowBlank:true, - watermark:BI.i18nText('BI-Connection-Form-Place-Input'), + watermark:BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'), width: 60, value: linkSelected.maxActive, - errorText: BI.i18nText('BI-Connection-Form-Place-Input-Number'), + errorText: BI.i18nText('Dec-Dcm_Connection_Form_Place_Input-Number'), validationChecker (v: string) { if (/^\+?[1-9][0-9]*$/.test(v)) { return true; @@ -249,19 +249,19 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Second_Step'), + text: BI.i18nText('Dec-Dcm_Second_Step'), form: { type: Button, - text: BI.i18nText('BI-Test-Connection'), + text: BI.i18nText('Dec-Dcm_Test_Connection'), level: 'ignore', }, }, { type: FormItem, - text: BI.i18nText('BI-Third_Step'), + text: BI.i18nText('Dec-Dcm_Third_Step'), form: { type: FormItem, - text: BI.i18nText('BI-Connection-Form-Pattern'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Pattern'), form: { type: Editor, cls: 'bi-border', diff --git a/src/app/link_set/right/right_edit/right.edit.mysql.component.ts b/src/app/link_set/right/right_edit/right.edit.mysql.component.ts index 2486c13..161a1f1 100644 --- a/src/app/link_set/right/right_edit/right.edit.mysql.component.ts +++ b/src/app/link_set/right/right_edit/right.edit.mysql.component.ts @@ -20,8 +20,8 @@ const Widget: WidgetType = { items: [ { type: FormItem, - text: BI.i18nText('BI-Connection-Form-ConnectionName'), - hint: BI.i18nText('BI-Connection-Form-ConnectionName-Change-Confirm'), + text: BI.i18nText('Dec-Dcm_Connection_Form_ConnectionName'), + hint: BI.i18nText('Dec-Dcm_Connection_Form_ConnectionName-Change-Confirm'), form:{ type: Editor, cls: 'bi-border', @@ -40,7 +40,7 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-Driver'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Driver'), form:{ type: TextValueCombo, cls: 'bi-border', @@ -60,11 +60,11 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-URL'), + text: BI.i18nText('Dec-Dcm_Connection_Form_URL'), form:{ type: Editor, cls: 'bi-border', - watermark:BI.i18nText('BI-Connection-Form-Place-Input'), + watermark:BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'), width: 300, value: linkSelected.url, listeners: [{ @@ -80,12 +80,12 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-OriginalCharsetName'), + text: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), form:{ type: TextValueCombo, cls: 'bi-border', width: 300, - text: linkSelected.originalCharsetName === '' ? BI.i18nText('BI-Connection-Form-Auto') : linkSelected.originalCharsetName, + text: linkSelected.originalCharsetName === '' ? BI.i18nText('Dec-Dcm_Connection_Form_Auto') : linkSelected.originalCharsetName, items: BI.Constants.getConstant(charset), listeners: [{ eventName: BI.TextValueCombo.EVENT_CHANGE, @@ -100,12 +100,12 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-UserName'), + text: BI.i18nText('Dec-Dcm_Connection_Form_UserName'), form:{ type: Editor, cls: 'bi-border', allowBlank:true, - watermark:BI.i18nText('BI-Connection-Form-Place-Input'), + watermark:BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'), width: 300, value: linkSelected.user, listeners: [{ @@ -121,13 +121,13 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-Password'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Password'), form:{ type: Editor, cls: 'bi-border', inputType:'password', allowBlank:true, - watermark:BI.i18nText('BI-Connection-Form-Place-Input'), + watermark:BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'), width: 300, value: linkSelected.password, listeners: [{ @@ -143,17 +143,17 @@ const Widget: WidgetType = { }, { type: Title, - text: BI.i18nText('BI-Connection-Form-Pool-Properties'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Pool_Properties'), }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-SQL-Validation-Query'), + text: BI.i18nText('Dec-Dcm_Connection_Form_SQL_Validation_Query'), height: 100, form:{ type: TextAreaEditor, cls: 'bi-border', allowBlank:true, - watermark:BI.i18nText('BI-Connection-Form-Place-Input'), + watermark:BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'), width: 300, height:100, value: linkSelected.validationQuery, @@ -170,10 +170,10 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-Connection-Check'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Connection-Check'), form:{ type: MultiSelectItem, - text: BI.i18nText('BI-Yes'), + text: BI.i18nText('Dec-Dcm_Yes'), selected: linkSelected.testOnBorrow, width: 60, listeners: [{ @@ -189,15 +189,15 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Connection-Form-Connection-Max-Number'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Connection_Max_Number'), form:{ type: Editor, cls: 'bi-border', allowBlank:true, - watermark:BI.i18nText('BI-Connection-Form-Place-Input'), + watermark:BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'), width: 60, value: linkSelected.maxActive, - errorText: BI.i18nText('BI-Connection-Form-Place-Input-Number'), + errorText: BI.i18nText('Dec-Dcm_Connection_Form_Place_Input-Number'), validationChecker (v: string) { if (/^\+?[1-9][0-9]*$/.test(v)) { return true; @@ -218,10 +218,10 @@ const Widget: WidgetType = { }, { type: FormItem, - text: BI.i18nText('BI-Test-Connection'), + text: BI.i18nText('Dec-Dcm_Test_Connection'), form: { type: Button, - text: BI.i18nText('BI-Test-Connection'), + text: BI.i18nText('Dec-Dcm_Test_Connection'), level: 'ignore', }, }, diff --git a/src/app/link_set/right/right_show/right.show.component.ts b/src/app/link_set/right/right_show/right.show.component.ts index ca7b736..74d293f 100644 --- a/src/app/link_set/right/right_show/right.show.component.ts +++ b/src/app/link_set/right/right_show/right.show.component.ts @@ -17,51 +17,51 @@ const Widget: WidgetType = { items: [ { type: BothSide, - leftText: BI.i18nText('BI-Connection-Form-ConnectionName'), + leftText: BI.i18nText('Dec-Dcm_Connection_Form_ConnectionName'), rightText: linkSelected.connectionName, }, { type: BothSide, - leftText: BI.i18nText('BI-Connection-Form-Driver'), + leftText: BI.i18nText('Dec-Dcm_Connection_Form_Driver'), rightText: linkSelected.driver, }, { type: BothSide, - leftText: BI.i18nText('BI-Connection-Form-URL'), + leftText: BI.i18nText('Dec-Dcm_Connection_Form_URL'), rightText: linkSelected.url, }, { type: BothSide, - leftText: BI.i18nText('BI-Connection-Form-OriginalCharsetName'), - rightText: linkSelected.originalCharsetName === '' ? BI.i18nText('BI-Connection-Form-Auto') : linkSelected.originalCharsetName, + leftText: BI.i18nText('Dec-Dcm_Connection_Form_OriginalCharsetName'), + rightText: linkSelected.originalCharsetName === '' ? BI.i18nText('Dec-Dcm_Connection_Form_Auto') : linkSelected.originalCharsetName, }, { type: BothSide, - leftText: BI.i18nText('BI-Connection-Form-UserName'), + leftText: BI.i18nText('Dec-Dcm_Connection_Form_UserName'), rightText: linkSelected.user, }, { type: BothSide, - leftText: BI.i18nText('BI-Connection-Form-Password'), + leftText: BI.i18nText('Dec-Dcm_Connection_Form_Password'), rightText: linkSelected.password, }, { type: Title, - text: BI.i18nText('BI-Connection-Form-Pool-Properties'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Pool_Properties'), }, { type: BothSide, - leftText: BI.i18nText('BI-Connection-Form-SQL-Validation-Query'), + leftText: BI.i18nText('Dec-Dcm_Connection_Form_SQL_Validation_Query'), rightText: linkSelected.validationQuery, }, { type: BothSide, - leftText: BI.i18nText('BI-Connection-Form-Connection-Check'), - rightText: linkSelected.testOnBorrow ? BI.i18nText('BI-Yes') : BI.i18nText('BI-No'), + leftText: BI.i18nText('Dec-Dcm_Connection_Form_Connection-Check'), + rightText: linkSelected.testOnBorrow ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'), }, { type: BothSide, - leftText: BI.i18nText('BI-Connection-Form-Connection-Max-Number'), + leftText: BI.i18nText('Dec-Dcm_Connection_Form_Connection_Max_Number'), rightText: linkSelected.maxActive, }, ], diff --git a/src/app/link_set/right/right_title/right.title.component.ts b/src/app/link_set/right/right_title/right.title.component.ts index 95c4ca8..cb1d547 100644 --- a/src/app/link_set/right/right_title/right.title.component.ts +++ b/src/app/link_set/right/right_title/right.title.component.ts @@ -12,7 +12,7 @@ const Widget: WidgetType = { const linkList: LinkType[] = this.model.linkList; const that = this; const {isEdit} = this.options; - const title = linkSelected.text === 'other' ? BI.i18nText('BI-Connection-Other') : linkSelected.text; + const title = linkSelected.text === 'other' ? BI.i18nText('Dec-Dcm_Connection_Other') : linkSelected.text; return { type: Left, @@ -22,13 +22,13 @@ const Widget: WidgetType = { { type: Label, cls: 'right-title-text', - text: `${BI.i18nText('BI-Data_Connections')}(${title ? title : BI.i18nText('BI-Default')})`, + text: `${BI.i18nText('Dec-Dcm_Data_Connections')}(${title ? title : BI.i18nText('Dec-Dcm_Default')})`, }, { type: Button, cls:'right-title-button', invisible: isEdit, - text: BI.i18nText('BI-Edit'), + text: BI.i18nText('Dec-Dcm_Edit'), handler() { that.store.setEdit(true); }, @@ -37,11 +37,11 @@ const Widget: WidgetType = { type: Button, cls:'right-title-button', invisible: !isEdit, - text: BI.i18nText('BI-Save'), + text: BI.i18nText('Dec-Dcm_Save'), handler() { const result = BI.find(linkList, (idx: number, value: LinkType) => that.model.linkUpdate.connectionName === value.connectionName && value.connectionId !== that.model.linkUpdate.connectionId); if (result) { - that.store.setConnectionNameErr(BI.i18nText('BI-Connection-Is-Existence')); + that.store.setConnectionNameErr(BI.i18nText('Dec-Dcm_Connection_Is_Existence')); } else { that.store.saveLink(); } diff --git a/src/app/link_set/select/select.component.ts b/src/app/link_set/select/select.component.ts index ec26689..cf3d65f 100644 --- a/src/app/link_set/select/select.component.ts +++ b/src/app/link_set/select/select.component.ts @@ -17,7 +17,7 @@ const Widget: WidgetType = { adjustYOffset: 4, el: { type: 'bi.button', - text: BI.i18nText('BI-Connection-New'), + text: BI.i18nText('Dec-Dcm_Connection_New'), height: 24, }, popup: { @@ -38,16 +38,16 @@ const Widget: WidgetType = { cls: 'link-item', height: 24, width: 152, - text: BI.i18nText('BI-Connection-More'), - title: BI.i18nText('BI-Connection-More'), + text: BI.i18nText('Dec-Dcm_Connection_More'), + title: BI.i18nText('Dec-Dcm_Connection_More'), value: 'more', }, { type: TextItem, cls: 'link-item', height: 24, width: 152, - text: BI.i18nText('BI-Connection-Other'), - title: BI.i18nText('BI-Connection-Other'), + text: BI.i18nText('Dec-Dcm_Connection_Other'), + title: BI.i18nText('Dec-Dcm_Connection_Other'), value: 'other', }], layouts: [{ diff --git a/src/app/link_set/select/select.service.ts b/src/app/link_set/select/select.service.ts index fe05085..7599ce3 100644 --- a/src/app/link_set/select/select.service.ts +++ b/src/app/link_set/select/select.service.ts @@ -266,7 +266,7 @@ export const getCnnectionName = (links: LinkType[], name: string): string => { let nameIndex = 0; const title = name.replace(/[0-9]/g, ''); const isPlugin = BI.some(plugins, (index: number, item: string) => item === title); - const startWith = isPlugin ? title : BI.i18nText('BI-Data_Connections'); + const startWith = isPlugin ? title : BI.i18nText('Dec-Dcm_Data_Connections'); links.forEach(link => { link.isSelected = false; diff --git a/src/app/link_status/left/left.service.ts b/src/app/link_status/left/left.service.ts index e1de494..2bfdf88 100644 --- a/src/app/link_status/left/left.service.ts +++ b/src/app/link_status/left/left.service.ts @@ -10,7 +10,7 @@ export const getLinks = (linkList: LinkType[], selectTitle = ''): any => { title: item.connectionName, id: item.connectionId, creator: item.creator, - text: item.text ? item.text : BI.i18nText('BI-Default'), + text: item.text ? item.text : BI.i18nText('Dec-Dcm_Default'), }); }); diff --git a/src/app/link_status/link_status.component.ts b/src/app/link_status/link_status.component.ts index bb09f96..6ff84da 100644 --- a/src/app/link_status/link_status.component.ts +++ b/src/app/link_status/link_status.component.ts @@ -10,7 +10,7 @@ const Widget: WidgetType = { }, watch:{ tab(tab: string) { - this.setVisible(tab === BI.i18nText('BI-Pool_Connection_Management')); + this.setVisible(tab === BI.i18nText('Dec-Dcm_Pool_Connection_Management')); }, }, render() { @@ -30,7 +30,7 @@ const Widget: WidgetType = { { type: Label, cls:'status-title', - text: BI.i18nText('BI-Data_Connections'), + text: BI.i18nText('Dec-Dcm_Data_Connections'), }, ], }, diff --git a/src/app/link_status/right/right.card.component.ts b/src/app/link_status/right/right.card.component.ts index ffce69a..fc73314 100644 --- a/src/app/link_status/right/right.card.component.ts +++ b/src/app/link_status/right/right.card.component.ts @@ -40,7 +40,7 @@ const Widget: WidgetType = { { type: Label, height: 20, - text: BI.i18nText('BI-Active_Connections_Number'), + text: BI.i18nText('Dec-Dcm_Active_Connections_Number'), }, ], }, @@ -79,7 +79,7 @@ const Widget: WidgetType = { { type: Label, height: 20, - text: BI.i18nText('BI-Leisure_Connections_Number'), + text: BI.i18nText('Dec-Dcm_Leisure_Connections_Number'), }, ], }, diff --git a/src/app/link_status/right/right.component.ts b/src/app/link_status/right/right.component.ts index 31b638a..c5da67c 100644 --- a/src/app/link_status/right/right.component.ts +++ b/src/app/link_status/right/right.component.ts @@ -26,7 +26,7 @@ const Widget: WidgetType = { ...res, }])); }); - Title.setText(`${BI.i18nText('BI-Data_Connections')}(${title})`); + Title.setText(`${BI.i18nText('Dec-Dcm_Data_Connections')}(${title})`); }, }, render() { @@ -41,7 +41,7 @@ const Widget: WidgetType = { items:[ { type: Label, - text:BI.i18nText('BI-Data_Connections'), + text:BI.i18nText('Dec-Dcm_Data_Connections'), }, ], ref(ref: any) { diff --git a/src/app/title/title.component.ts b/src/app/title/title.component.ts index e8dd994..0e99285 100644 --- a/src/app/title/title.component.ts +++ b/src/app/title/title.component.ts @@ -1,7 +1,7 @@ import {Left, WidgetType, IconButton} from '@ui/index'; import TitleItem from './title_item/title_item.component'; import {isDesigner, closeWindow} from '@shared/crud/crud.request'; -const tabs = ['BI-Data_Connection_Management', 'BI-Pool_Connection_Management']; +const tabs = ['Dec-Dcm_Connection_Management', 'Dec-Dcm_Pool_Connection_Management']; const className = 'fr.title'; const Widget: WidgetType = { render() { diff --git a/src/app/title/title_item/title_item.component.ts b/src/app/title/title_item/title_item.component.ts index ffba11d..056366a 100644 --- a/src/app/title/title_item/title_item.component.ts +++ b/src/app/title/title_item/title_item.component.ts @@ -26,7 +26,7 @@ const Widget = BI.inherit(BI.Widget, { }, mounted() { const {text} = this.options; - this.element.css(getSelectStyle(BI.i18nText('BI-Data_Connection_Management'), text)); + this.element.css(getSelectStyle(BI.i18nText('Dec-Dcm_Connection_Management'), text)); this.element.on('click', () => { this.store.setTab(text); }); diff --git a/src/demo/plugin.redis.edit.ts b/src/demo/plugin.redis.edit.ts index c1630dd..a785278 100644 --- a/src/demo/plugin.redis.edit.ts +++ b/src/demo/plugin.redis.edit.ts @@ -20,7 +20,7 @@ const Widget = BI.inherit(BI.Widget, { items: [ { type: 'bi.label', - text: BI.i18nText('BI-Connection-Form-Database-Addr'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Database_Addr'), height: 24, width: 115, textAlign: 'left', @@ -28,7 +28,7 @@ const Widget = BI.inherit(BI.Widget, { { type: 'bi.editor', cls: 'bi-border', - watermark: BI.i18nText('BI-Connection-Form-Database-Addr'), + watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Addr'), value:form.url, allowBlank: true, width: 300, @@ -41,7 +41,7 @@ const Widget = BI.inherit(BI.Widget, { items: [ { type: 'bi.label', - text: BI.i18nText('BI-Connection-Form-Database-Port'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Database_Port'), height: 24, width: 115, textAlign: 'left', @@ -49,12 +49,12 @@ const Widget = BI.inherit(BI.Widget, { { type: 'bi.editor', cls: 'bi-border', - watermark: BI.i18nText('BI-Connection-Form-Database-Port'), + watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Port'), allowBlank: true, width: 300, height: 24, value: form.port, - errorText: BI.i18nText('BI-Connection-Form-Place-Input-Number'), + errorText: BI.i18nText('Dec-Dcm_Connection_Form_Place_Input-Number'), validationChecker (v: string) { if (/^\+?[1-9][0-9]*$/.test(v)) { return true; @@ -70,7 +70,7 @@ const Widget = BI.inherit(BI.Widget, { items: [ { type: 'bi.label', - text: BI.i18nText('BI-Connection-Form-Password'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Password'), height: 24, width: 115, textAlign: 'left', diff --git a/src/demo/plugin.redis.preview.ts b/src/demo/plugin.redis.preview.ts index ff12daa..a3708e0 100644 --- a/src/demo/plugin.redis.preview.ts +++ b/src/demo/plugin.redis.preview.ts @@ -15,7 +15,7 @@ const Widget = BI.inherit(BI.Widget, { items: [ { type: 'bi.label', - text: BI.i18nText('BI-Connection-Form-Database-Addr'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Database_Addr'), height: 24, width: 115, textAlign: 'left', @@ -32,7 +32,7 @@ const Widget = BI.inherit(BI.Widget, { items: [ { type: 'bi.label', - text: BI.i18nText('BI-Connection-Form-Database-Port'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Database_Port'), height: 24, width: 115, textAlign: 'left', @@ -49,7 +49,7 @@ const Widget = BI.inherit(BI.Widget, { items: [ { type: 'bi.label', - text: BI.i18nText('BI-Connection-Form-Password'), + text: BI.i18nText('Dec-Dcm_Connection_Form_Password'), height: 24, width: 115, textAlign: 'left', diff --git a/src/demo/plugin.tedis.pool.ts b/src/demo/plugin.tedis.pool.ts index 50d9ffd..6469e88 100644 --- a/src/demo/plugin.tedis.pool.ts +++ b/src/demo/plugin.tedis.pool.ts @@ -40,7 +40,7 @@ const WidgetPool = BI.inherit(BI.Widget, { { type: 'bi.label', height: 20, - text: BI.i18nText('BI-Active_Connections_Number'), + text: BI.i18nText('Dec-Dcm_Active_Connections_Number'), }, ], }, diff --git a/src/lib/locale/i18n_zh_CN.js b/src/lib/locale/i18n_zh_CN.js index 601c24c..0bec5ce 100644 --- a/src/lib/locale/i18n_zh_CN.js +++ b/src/lib/locale/i18n_zh_CN.js @@ -2,60 +2,60 @@ var Store = { i18n : { 'BI-Basic_Cancel': '取消', 'BI-Basic_Sure': '确定', - 'BI-Data_Connection_Management': '数据连接管理', - 'BI-Pool_Connection_Management': '连接池管理', - 'BI-Data_Connections': '数据连接', - 'BI-Active_Connections_Number': '活动连接数', - 'BI-Leisure_Connections_Number': '空闲连接数', - 'BI-Connections': '连接', - 'BI-Default': '默认', - 'BI-Delete': '删除', - 'BI-Test-Connection': '测试连接', - 'BI-Copy': '复制', - 'BI-Edit': '编辑', - 'BI-Save': '保存', - 'BI-Yes': '是', - 'BI-No': '否', - 'BI-Search': '搜索', - 'BI-Type': '类型', - 'BI-Other': '其他', - 'BI-Tips': '提示', - 'BI-Back': '返回', - 'BI-Creator': '创建者', - 'BI-First_Step': '第一步', - 'BI-Second_Step': '第一步', - 'BI-Third_Step': '第一步', - 'BI-Connection-Detailed-Information': '详细信息', - 'BI-Connection-Handup-Information': '收起信息', - 'BI-Connection-Testing': '正在测试连接，请稍候...', - 'BI-Connection-Test-Fail': '测试连接失败', - 'BI-Connection-Test-Success': '连接成功', - 'BI-Connection-Option-Cannot-Find': '找不到该连接的配置信息', - 'BI-Connection-Config-No-Save': '当前设置尚未保存，是否保存？', - 'BI-Connection-New': '新建数据连接', - 'BI-Connection-More': '更多数据连接...', - 'BI-Connection-More-Title': '更多数据连接', - 'BI-Connection-Other': '其他', - 'BI-Connection-Plase-Add-One': '请选择左侧数据连接或点击新建数据连接', - 'BI-Connection-Is-Existence': '数据连接名已存在', - 'BI-Connection-Form-ConnectionName': '数据连接名', - 'BI-Connection-Form-ConnectionName-Change-Confirm': '*修改数据连接名会影响相关数据表和仪表板', - 'BI-Connection-Form-Driver': '驱动器', - 'BI-Connection-Form-URL': 'URL', - 'BI-Connection-Form-Place-Input': '请输入', - 'BI-Connection-Form-OriginalCharsetName': '编码', - 'BI-Connection-Form-Auto': '自动', - 'BI-Connection-Form-UserName': '用户名', - 'BI-Connection-Form-Password': '密码', - 'BI-Connection-Form-Pool-Properties': '连接池属性', - 'BI-Connection-Form-SQL-Validation-Query': 'SQL验证查询', - 'BI-Connection-Form-Connection-Check': '获取连接前校验', - 'BI-Connection-Form-Connection-Max-Number': '最大活动连接数', - 'BI-Connection-Form-Place-Input-Number': '请输入有效的正整数', - 'BI-Connection-Form-Pattern': '模式', - 'BI-Connection-Form-Database-Addr': '数据库地址', - 'BI-Connection-Form-Database-Port': '端口号', - 'BI-Connection-Make-Sure-Delete': '确定删除该数据连接？', - 'BI-Connection-ReConnect': '重新连接', + 'Dec-Dcm_Connection_Management': '数据连接管理', + 'Dec-Dcm_Pool_Connection_Management': '连接池管理', + 'Dec-Dcm_Data_Connections': '数据连接', + 'Dec-Dcm_Active_Connections_Number': '活动连接数', + 'Dec-Dcm_Leisure_Connections_Number': '空闲连接数', + 'Dec-Dcm_Connections': '连接', + 'Dec-Dcm_Default': '默认', + 'Dec-Dcm_Delete': '删除', + 'Dec-Dcm_Test_Connection': '测试连接', + 'Dec-Dcm_Copy': '复制', + 'Dec-Dcm_Edit': '编辑', + 'Dec-Dcm_Save': '保存', + 'Dec-Dcm_Yes': '是', + 'Dec-Dcm_No': '否', + 'Dec-Dcm_Search': '搜索', + 'Dec-Dcm_Type': '类型', + 'Dec-Dcm_Other': '其他', + 'Dec-Dcm_Tips': '提示', + 'Dec-Dcm_Back': '返回', + 'Dec-Dcm_Creator': '创建者', + 'Dec-Dcm_First_Step': '第一步', + 'Dec-Dcm_Second_Step': '第二步', + 'Dec-Dcm_Third_Step': '第三步', + 'Dec-Dcm_Connection_Detailed_Information': '详细信息', + 'Dec-Dcm_Connection_Handup_Information': '收起信息', + 'Dec-Dcm_Connection_Testing': '正在测试连接，请稍候...', + 'Dec-Dcm_Connection_Test_Fail': '测试连接失败', + 'Dec-Dcm_Connection_Test_Success': '连接成功', + 'Dec-Dcm_Connection_Option_Cannot_Find': '找不到该连接的配置信息', + 'Dec-Dcm_Connection_Config_No_Save': '当前设置尚未保存，是否保存？', + 'Dec-Dcm_Connection_New': '新建数据连接', + 'Dec-Dcm_Connection_More': '更多数据连接...', + 'Dec-Dcm_Connection_More-Title': '更多数据连接', + 'Dec-Dcm_Connection_Other': '其他', + 'Dec-Dcm_Connection_Plase_Add_One': '请选择左侧数据连接或点击新建数据连接', + 'Dec-Dcm_Connection_Is_Existence': '数据连接名已存在', + 'Dec-Dcm_Connection_Form_ConnectionName': '数据连接名', + 'Dec-Dcm_Connection_Form_ConnectionName-Change-Confirm': '*修改数据连接名会影响相关数据表和仪表板', + 'Dec-Dcm_Connection_Form_Driver': '驱动器', + 'Dec-Dcm_Connection_Form_URL': 'URL', + 'Dec-Dcm_Connection_Form_Place_Input': '请输入', + 'Dec-Dcm_Connection_Form_OriginalCharsetName': '编码', + 'Dec-Dcm_Connection_Form_Auto': '自动', + 'Dec-Dcm_Connection_Form_UserName': '用户名', + 'Dec-Dcm_Connection_Form_Password': '密码', + 'Dec-Dcm_Connection_Form_Pool_Properties': '连接池属性', + 'Dec-Dcm_Connection_Form_SQL_Validation_Query': 'SQL验证查询', + 'Dec-Dcm_Connection_Form_Connection-Check': '获取连接前校验', + 'Dec-Dcm_Connection_Form_Connection_Max_Number': '最大活动连接数', + 'Dec-Dcm_Connection_Form_Place_Input-Number': '请输入有效的正整数', + 'Dec-Dcm_Connection_Form_Pattern': '模式', + 'Dec-Dcm_Connection_Form_Database_Addr': '数据库地址', + 'Dec-Dcm_Connection_Form_Database_Port': '端口号', + 'Dec-Dcm_Connection_Make_Sure_Delete': '确定删除该数据连接？', + 'Dec-Dcm_Connection_ReConnect': '重新连接', }} window.Store = Store; \ No newline at end of file diff --git a/src/shared/service/dialog.service.ts b/src/shared/service/dialog.service.ts index 13e53ea..6a30e15 100644 --- a/src/shared/service/dialog.service.ts +++ b/src/shared/service/dialog.service.ts @@ -10,7 +10,7 @@ class Dialog { BI.Popovers.create(id, { type: 'bi.bar_popover', size: 'normal', - header: BI.i18nText('BI-Tips'), + header: BI.i18nText('Dec-Dcm_Tips'), width: 450, height: 220, body: { @@ -156,20 +156,20 @@ class Dialog { items:[ { type: Button, - text: BI.i18nText('BI-Connection-Detailed-Information'), + text: BI.i18nText('Dec-Dcm_Connection_Detailed_Information'), level: 'ignore', handler() { - const isHide = this.getText() === BI.i18nText('BI-Connection-Detailed-Information'); + const isHide = this.getText() === BI.i18nText('Dec-Dcm_Connection_Detailed_Information'); Popover.element.css({ height: isHide ? '290' : '220', }); More.setVisible(isHide); - this.setText(isHide ? BI.i18nText('BI-Connection-Handup-Information') : BI.i18nText('BI-Connection-Detailed-Information')); + this.setText(isHide ? BI.i18nText('Dec-Dcm_Connection_Handup_Information') : BI.i18nText('Dec-Dcm_Connection_Detailed_Information')); }, }, { type: Button, - text: BI.i18nText('BI-Back'), + text: BI.i18nText('Dec-Dcm_Back'), level: 'ignore', handler() { that.close(id); @@ -177,7 +177,7 @@ class Dialog { }, { type: Button, - text: BI.i18nText('BI-Connection-ReConnect'), + text: BI.i18nText('Dec-Dcm_Connection_ReConnect'), handler() { that.close(id); cb ? cb() : null;