Browse Source

fix: DEC-10009 改为显示数据库标题 && 修改国际化数据

qufenxi
alan 5 years ago
parent
commit
a4996d4bba
  1. 4
      i18n/zh_cn.properties
  2. 4
      private/i18n.ts
  3. 2
      src/modules/crud/decision.api.ts
  4. 5
      src/modules/pages/connection/connection.ts

4
i18n/zh_cn.properties

@ -105,7 +105,9 @@ Dec-Dcm_Socket_Unable_Connect= Socket未连接,可能存在多人同时编辑
Dec-Dcm_Connection_HW_DWS=华为云DWS
Dec-Dcm_Connection_Lack_Driver=未找到“{R1}”驱动。
Dec-Dcm_Connection_Download_Driver=下载对应驱动
Dec-Dec_Connection_Deleted=该数据连接已被删除,无法进行操作
Dec-Dcm_Connection_Deleted=该数据连接已被删除,无法进行操作
Dec-Dcm_Connection_Click_Connect_Database=点击连接数据库
Dec-Dcm_Connection_Read_Mode_List=以读取模式列表
BI-Multi_Date_Quarter_End= 季度末
BI-Multi_Date_Month_Begin= 月初

4
private/i18n.ts

@ -104,7 +104,9 @@ export default {
'Dec-Dcm_Connection_HW_DWS': '华为云DWS',
'Dec-Dcm_Connection_Lack_Driver': '未找到“{R1}”驱动。',
'Dec-Dcm_Connection_Download_Driver': '下载对应驱动',
'Dec-Dec_Connection_Deleted': '该数据连接已被删除,无法进行操作',
'Dec-Dcm_Connection_Deleted': '该数据连接已被删除,无法进行操作',
'Dec-Dcm_Connection_Click_Connect_Database': '点击连接数据库',
'Dec-Dcm_Connection_Read_Mode_List': '以读取模式列表',
'BI-Multi_Date_Quarter_End': '季度末',
'BI-Multi_Date_Month_Begin': '月初',
'BI-Multi_Date_YMD': '年月日',

2
src/modules/crud/decision.api.ts

@ -54,7 +54,7 @@ export class DecisionApi implements Api {
let errorMessage = '';
switch (re.errorCode) {
case errorCode.CONNECTION_DELETED:
errorMessage = 'Dec-Dec_Connection_Deleted';
errorMessage = 'Dec-Dcm_Connection_Deleted';
break;
case errorCode.CONNECTION_UNDER_EDIT:
errorMessage = 'Dec-Dcm_Connection_Is_Using';

5
src/modules/pages/connection/connection.ts

@ -7,7 +7,7 @@ import { ConnectionJdbcXtype } from './connection_jdbc/connection_jdbc';
import { ConnectionJndiXtype } from './connection_jndi/connection_jndi';
import { ConnectionPluginXtype } from './connection_plugin/connection_plugin';
import { connectionType } from '@constants/env';
import { getAllDatabaseTypes, connectionCanEdit, getJdbcDatabaseType } from '../../app.service';
import { getAllDatabaseTypes, connectionCanEdit, getJdbcDatabaseType, getTextByDatabaseType } from '../../app.service';
import { ConnectionJDBC } from '../../crud/crud.typings';
export const ConnectionXtype = 'dec.dcm.connection';
@ -26,7 +26,8 @@ export class Connection extends BI.Widget {
connectionSelected:(name: string) => {
if (name) {
const canEdit = connectionCanEdit(this.model.connectionSelectedOne);
this.connectionTitleWidget.setText(`${name}${this.getSelectConnectionType()}`);
const type = this.getSelectConnectionType();
this.connectionTitleWidget.setText(`${name}${getTextByDatabaseType(type)}`);
this.connectionEditWidget.setVisible(canEdit);
const hasRegistered = this.hasRegistered();
this.title.setVisible(hasRegistered);

Loading…
Cancel
Save