Browse Source

Merge pull request #2543 in DEC/decision-webui-dcm from release/11.0 to feature/x

* commit 'cc341efd5e83a6cf7707ffd3976fcabd722719bd':
  DEC-19762 feat: 【FR配合】部分数据连接支持fetchsize
  DEC-19867 feat: 数据lic受限连接出错提示-前端
  DEC-19867 feat: 数据lic受限连接出错提示-前端
research/11.0
superman 3 years ago
parent
commit
57367fac9f
  1. 3
      private/i18n.ts
  2. 2
      src/modules/app.model.ts
  3. 30
      src/modules/constants/constant.ts
  4. 16
      src/modules/crud/api.ts
  5. 9
      src/modules/crud/crud.typings.d.ts
  6. 57
      src/modules/crud/decision.api.ts
  7. 9
      src/modules/crud/design.api.ts
  8. 45
      src/modules/pages/connection/connection.model.ts
  9. 24
      src/modules/pages/connection/connection.ts
  10. 19
      src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
  11. 2
      src/modules/pages/connection/connection_jndi/connection_jndi.ts
  12. 4
      src/modules/pages/connection/list/list.model.ts
  13. 6
      src/modules/pages/connection/list/list.ts
  14. 76
      src/modules/pages/connection/list/list_item/list_item.model.ts
  15. 11
      src/modules/pages/connection/list/list_item/list_item.ts
  16. 37
      src/modules/pages/connection_pool/connection_pool.ts
  17. 70
      src/modules/pages/maintain/forms/components/form.jdbc.ts

3
private/i18n.ts

@ -303,4 +303,7 @@ export default {
'Dec-Dcm_Connection_Analytic_DB': '阿里云AnalyticDB', 'Dec-Dcm_Connection_Analytic_DB': '阿里云AnalyticDB',
'Dec-Dcm_Connection_Value_Out_Range': '数值超出范围', 'Dec-Dcm_Connection_Value_Out_Range': '数值超出范围',
'Dec-Dcm_Socket_Unable_Connect_Tip': '可能出现编辑冲突', 'Dec-Dcm_Socket_Unable_Connect_Tip': '可能出现编辑冲突',
'Dec-Connection_Lic_Limit_Approach_Tip': '当前数据连接数量超过注册lic限制({}个),所有数据连接都不可用,请删除多余的数据连接',
'Dec-Connection_Lic_Limit_Approach_Prevent_Tip': '当前数据连接数量已经达到注册lic限制({}个),无法新增',
'Dec-Dcm_Connection_Check_Fetch_Size_Range': '请输入0-1000000之间的值',
}; };

2
src/modules/app.model.ts

@ -31,7 +31,7 @@ export class AppModel extends Model {
setPageIndex: (index: string) => { setPageIndex: (index: string) => {
this.model.pageIndex = index; this.model.pageIndex = index;
}, },
setFilter:(filter: string) => { setFilter: (filter: string) => {
this.model.filter = filter; this.model.filter = filter;
}, },
setDatebaseTypeSelected: (datebaseTypeSelected: string) => { setDatebaseTypeSelected: (datebaseTypeSelected: string) => {

30
src/modules/constants/constant.ts

@ -19,17 +19,17 @@ export const DATEBASE_FILTER_TYPE = {
}; };
export const DATA_BASE_TYPES_OTHER = export const DATA_BASE_TYPES_OTHER =
{ {
text: OTHER_JDBC, text: OTHER_JDBC,
databaseType: OTHER_JDBC, databaseType: OTHER_JDBC,
driver: '', driver: '',
url: '', url: '',
commonly: false, commonly: false,
internal: false, internal: false,
type: 'jdbc', type: 'jdbc',
hasSchema: true, hasSchema: true,
kerberos: false, kerberos: false,
}; };
export const DATA_BASE_DRIVER_LINK = DecCst && DecCst.Hyperlink ? [ export const DATA_BASE_DRIVER_LINK = DecCst && DecCst.Hyperlink ? [
{ {
databaseType: 'ads', databaseType: 'ads',
@ -444,6 +444,7 @@ export const DATA_BASE_TYPES = [
type: 'jdbc', type: 'jdbc',
hasSchema: true, hasSchema: true,
kerberos: false, kerberos: false,
fetchSize: 50,
}, { }, {
text: 'INFORMIX', text: 'INFORMIX',
databaseType: 'informix', databaseType: 'informix',
@ -521,6 +522,7 @@ export const DATA_BASE_TYPES = [
type: 'jdbc', type: 'jdbc',
hasSchema: true, hasSchema: true,
kerberos: false, kerberos: false,
fetchSize: 128,
}, },
{ {
text: 'Pivotal Greenplum Database', text: 'Pivotal Greenplum Database',
@ -547,6 +549,7 @@ export const DATA_BASE_TYPES = [
type: 'jdbc', type: 'jdbc',
hasSchema: true, hasSchema: true,
kerberos: false, kerberos: false,
fetchSize: 10000,
}, { }, {
text: 'Presto', text: 'Presto',
databaseType: 'presto', databaseType: 'presto',
@ -648,7 +651,6 @@ export const DATA_BASE_TYPES = [
]; ];
export const CONNECT_CHARSET = [ export const CONNECT_CHARSET = [
{ {
text: BI.i18nText('Dec-Dcm_Connection_Form_Auto'), text: BI.i18nText('Dec-Dcm_Connection_Form_Auto'),
@ -740,10 +742,10 @@ export const CONNECTION_LAYOUT = {
export const JNDI_FACTORYS = [ export const JNDI_FACTORYS = [
{ {
factory:'', factory: '',
url: '', url: '',
}, { }, {
factory:'weblogic.jndi.WLInitialContextFactory', factory: 'weblogic.jndi.WLInitialContextFactory',
url: 't3://localhost:7001', url: 't3://localhost:7001',
}, { }, {
factory: 'com.ibm.websphere.naming.WsnInitialContextFactory', factory: 'com.ibm.websphere.naming.WsnInitialContextFactory',

16
src/modules/crud/api.ts

@ -1,4 +1,11 @@
import { Connection, TestRequest, ConnectionPoolType, SocketResult, ResultType } from './crud.typings'; import {
Connection,
ConnectionLicInfo,
TestRequest,
ConnectionPoolType,
SocketResult,
ResultType,
} from './crud.typings';
export interface Api { export interface Api {
/** /**
@ -9,7 +16,12 @@ export interface Api {
/** /**
* *
*/ */
getConnectionlist(): Promise<{ data?: Connection[] }>; getConnectionList(): Promise<{ data?: Connection[] }>;
/**
* lic限制信息
*/
getConnectionLicInfo(): Promise<{ data?: ConnectionLicInfo }>;
/** /**
* *

9
src/modules/crud/crud.typings.d.ts vendored

@ -25,6 +25,11 @@ export interface Connection {
}[] }[]
} }
export interface ConnectionLicInfo {
currentConnectionNum: number;
maxConnectionNum: number
}
export interface ConnectionJDBC { export interface ConnectionJDBC {
/** /**
* *
@ -103,6 +108,10 @@ export interface ConnectionJDBC {
* *
*/ */
keyPath?: string; keyPath?: string;
/**
* fetchSize
*/
fetchSize?: string;
connectionPoolAttr: ConnectionPoolJDBC; connectionPoolAttr: ConnectionPoolJDBC;
} }

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

@ -1,15 +1,19 @@
import { Api } from './api'; import { Api } from './api';
import { Connection, TestRequest, ConnectionPoolType, SocketResult } from './crud.typings'; import { Connection, TestRequest, ConnectionPoolType, SocketResult, ConnectionLicInfo } from './crud.typings';
import { requestGet, requestDelete, requestPost, requestPut } from './crud.service'; import { requestGet, requestDelete, requestPost, requestPut } from './crud.service';
import { editStatusEvent, errorCode } from '@constants/env'; import { editStatusEvent, errorCode } from '@constants/env';
export class DecisionApi implements Api { export class DecisionApi implements Api {
isDec = true; isDec = true;
getConnectionlist(): Promise<{ data?: Connection[] }> { getConnectionList(): Promise<{ data?: Connection[] }> {
return requestGet('list', {}); return requestGet('list', {});
} }
getConnectionLicInfo(): Promise<{ data?: ConnectionLicInfo }> {
return requestGet('lic/info', {});
}
deleteConnection(connectionName: string) { deleteConnection(connectionName: string) {
return requestDelete('', { return requestDelete('', {
connectionName, connectionName,
@ -49,28 +53,29 @@ export class DecisionApi implements Api {
} }
getConnectionStatus(name: string): Promise<SocketResult> { getConnectionStatus(name: string): Promise<SocketResult> {
return this.sendEditStatusEvent(name, editStatusEvent.OPEN).then(re => { return this.sendEditStatusEvent(name, editStatusEvent.OPEN)
if (re.errorCode) { .then(re => {
let errorMessage = ''; if (re.errorCode) {
switch (re.errorCode) { let errorMessage = '';
case errorCode.CONNECTION_DELETED: switch (re.errorCode) {
errorMessage = 'Dec-Dcm_Connection_Deleted'; case errorCode.CONNECTION_DELETED:
break; errorMessage = 'Dec-Dcm_Connection_Deleted';
case errorCode.CONNECTION_UNDER_EDIT: break;
errorMessage = 'Dec-Dcm_Connection_Is_Using'; case errorCode.CONNECTION_UNDER_EDIT:
break; errorMessage = 'Dec-Dcm_Connection_Is_Using';
default: break;
errorMessage = re.errorMsg; default:
break; errorMessage = re.errorMsg;
break;
}
BI.Msg.toast(BI.i18nText(errorMessage, re.errorMsg), {
level: 'error',
});
throw re;
} else {
return re;
} }
BI.Msg.toast(BI.i18nText(errorMessage, re.errorMsg), { });
level: 'error',
});
throw re;
} else {
return re;
}
});
} }
shutdownConnectionStatus(name: string): Promise<SocketResult> { shutdownConnectionStatus(name: string): Promise<SocketResult> {
@ -94,11 +99,13 @@ export class DecisionApi implements Api {
} }
getCipher(password: string) { getCipher(password: string) {
return BI.Providers.getProvider('dec.provider.cipher').getCipher(password); return BI.Providers.getProvider('dec.provider.cipher')
.getCipher(password);
} }
getPlain(cipher: string) { getPlain(cipher: string) {
return BI.Providers.getProvider('dec.provider.cipher').getPlain(cipher); return BI.Providers.getProvider('dec.provider.cipher')
.getPlain(cipher);
} }
getHyperlink(name: string) { getHyperlink(name: string) {

9
src/modules/crud/design.api.ts

@ -1,16 +1,21 @@
import { Api } from './api'; import { Api } from './api';
import { Connection, TestRequest, ConnectionPoolType, SocketResult } from './crud.typings'; import { Connection, TestRequest, ConnectionPoolType, SocketResult, ConnectionLicInfo } from './crud.typings';
import { requestGet } from './crud.service';
// TODO: 此页面的接口等待设计器提供相应的方法 // TODO: 此页面的接口等待设计器提供相应的方法
export class DesignApi implements Api { export class DesignApi implements Api {
isDec = false; isDec = false;
getConnectionlist(): Promise<{ data: Connection[] }> { getConnectionList(): Promise<{ data: Connection[] }> {
return new Promise(resolve => { return new Promise(resolve => {
resolve({ data: [] }); resolve({ data: [] });
}); });
} }
getConnectionLicInfo(): Promise<{ data?: ConnectionLicInfo }> {
return requestGet('lic/info', {});
}
deleteConnection(connectionName: string): Promise<{ data: string }> { deleteConnection(connectionName: string): Promise<{ data: string }> {
return new Promise(resolve => { return new Promise(resolve => {
resolve({ data: 'success' }); resolve({ data: 'success' });

45
src/modules/pages/connection/connection.model.ts

@ -1,24 +1,60 @@
import { model, Model } from '@core/core'; import { model, Model } from '@core/core';
import { AppModel } from '../../app.model'; import { AppModel } from '../../app.model';
import { ApiFactory } from 'src/modules/crud/apiFactory'; import { ApiFactory } from 'src/modules/crud/apiFactory';
import { PAGE_INDEX } from '@constants/constant';
const api = new ApiFactory().create(); const api = new ApiFactory().create();
@model() @model()
export class ConnectionModel extends Model<{ export class ConnectionModel extends Model<{
types : { types: {
pageIndex: AppModel['TYPE']['pageIndex']; pageIndex: AppModel['TYPE']['pageIndex'];
connections: AppModel['TYPE']['connections']; connections: AppModel['TYPE']['connections'];
connectionSelected: AppModel['TYPE']['connectionSelected']; connectionSelected: AppModel['TYPE']['connectionSelected'];
connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne']; connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne'];
datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected']; datebaseTypeSelected: AppModel['TYPE']['datebaseTypeSelected'];
}, },
childContext: ConnectionModel['childContext'];
context: ConnectionModel['context']; context: ConnectionModel['context'];
}> { }> {
static xtype = 'dec.dcm.model.connection'; static xtype = 'dec.dcm.model.connection';
state() {
return {
connectionLicInfo: {
currentConnectionNum: 0,
maxConnectionNum: 0,
},
};
}
childContext: ['connectionLicInfo'];
context = <const>['pageIndex', 'connectionSelected', 'connectionSelectedOne', 'datebaseTypeSelected']; context = <const>['pageIndex', 'connectionSelected', 'connectionSelectedOne', 'datebaseTypeSelected'];
actions = { actions = {
setPageIndex:(index: string) => { initConnectionLicInfo: (cb: Function) => {
return api.getConnectionLicInfo()
.then(res => {
this.model.connectionLicInfo = res.data;
if (res.data.currentConnectionNum > res.data.maxConnectionNum) {
BI.Services.getService('dec.service.component.icon_text.msg').alert({
text: BI.i18nText('Dec-Connection_Lic_Limit_Approach_Tip', res.data.maxConnectionNum),
});
}
cb();
});
},
createNewConnection: () => {
if (this.model.connectionLicInfo.currentConnectionNum < this.model.connectionLicInfo.maxConnectionNum) {
this.setPageIndex(PAGE_INDEX.DATEBASE);
} else {
BI.Services.getService('dec.service.component.icon_text.msg').alert({
text: BI.i18nText('Dec-Connection_Lic_Limit_Approach_Prevent_Tip', this.model.connectionLicInfo.maxConnectionNum),
});
}
},
setPageIndex: (index: string) => {
this.model.pageIndex = index; this.model.pageIndex = index;
}, },
setDatebaseTypeSelected(name: string) { setDatebaseTypeSelected(name: string) {
@ -30,5 +66,8 @@ export class ConnectionModel extends Model<{
getConnectionStatus() { getConnectionStatus() {
return api.getConnectionStatus(this.model.connectionSelected); return api.getConnectionStatus(this.model.connectionSelected);
}, },
} checkConnectionLic() {
return this.model.connectionLicInfo.currentConnectionNum > this.model.connectionLicInfo.maxConnectionNum;
},
};
} }

24
src/modules/pages/connection/connection.ts

@ -24,7 +24,7 @@ export class Connection extends BI.Widget {
title: HTapeLayout; title: HTapeLayout;
watch = { watch = {
connectionSelected:(name: string) => { connectionSelected: (name: string) => {
if (name) { if (name) {
const canEdit = connectionCanEdit(this.model.connectionSelectedOne); const canEdit = connectionCanEdit(this.model.connectionSelectedOne);
const type = this.getSelectConnectionType(); const type = this.getSelectConnectionType();
@ -43,11 +43,15 @@ export class Connection extends BI.Widget {
this.connectionEditWidget.setVisible(false); this.connectionEditWidget.setVisible(false);
} }
}, },
};
beforeRender(cb: Function) {
this.store.initConnectionLicInfo(cb);
} }
render() { render() {
this.store.setConnectionSelected(''); this.store.setConnectionSelected('');
return { return {
type: BI.HTapeLayout.xtype, type: BI.HTapeLayout.xtype,
hgap: 10, hgap: 10,
@ -66,7 +70,7 @@ export class Connection extends BI.Widget {
type: BI.Button.xtype, type: BI.Button.xtype,
text: BI.i18nText('Dec-Dcm_Connection_New'), text: BI.i18nText('Dec-Dcm_Connection_New'),
handler: () => { handler: () => {
this.store.setPageIndex(PAGE_INDEX.DATEBASE); this.store.createNewConnection();
}, },
}], }],
}, },
@ -110,11 +114,13 @@ export class Connection extends BI.Widget {
this.connectionEditWidget = _ref; this.connectionEditWidget = _ref;
}, },
handler: () => { handler: () => {
this.store.getConnectionStatus().then(re => { this.store.getConnectionStatus()
this.store.setPageIndex(PAGE_INDEX.MAINTAIN); .then(re => {
this.store.setDatebaseTypeSelected(''); this.store.setPageIndex(PAGE_INDEX.MAINTAIN);
}) this.store.setDatebaseTypeSelected('');
.catch(() => {}); })
.catch(() => {
});
}, },
}], }],
}, },
@ -209,7 +215,7 @@ export class Connection extends BI.Widget {
const connectionJDBC = this.model.connectionSelectedOne.connectionData as ConnectionJDBC; const connectionJDBC = this.model.connectionSelectedOne.connectionData as ConnectionJDBC;
databaseType = getJdbcDatabaseType(connectionJDBC.database, connectionJDBC.driver).databaseType; databaseType = getJdbcDatabaseType(connectionJDBC.database, connectionJDBC.driver).databaseType;
} }
return databaseType; return databaseType;
} }
} }

19
src/modules/pages/connection/connection_jdbc/connection_jdbc.ts

@ -19,9 +19,20 @@ export class ConnectionJdbc extends BI.Widget {
model: ConnectionJdecModel['model']; model: ConnectionJdecModel['model'];
allDatabaseTypes = getAllDatabaseTypes(); allDatabaseTypes = getAllDatabaseTypes();
render () { render() {
const connectionData = this.model.connectionSelectedOne.connectionData as ConnectionJDBC; const connectionData = this.model.connectionSelectedOne.connectionData as ConnectionJDBC;
const { driver, database, user, originalCharsetName, schema, connectionPoolAttr, authType, principal, url } = connectionData; const {
driver,
database,
user,
originalCharsetName,
schema,
connectionPoolAttr,
authType,
principal,
url,
fetchSize,
} = connectionData;
const databaseType = getJdbcDatabaseType(database, driver); const databaseType = getJdbcDatabaseType(database, driver);
const { host, port, databaseName } = resolveUrlInfo(url, database); const { host, port, databaseName } = resolveUrlInfo(url, database);
const { hgap, vgap } = CONNECTION_LAYOUT; const { hgap, vgap } = CONNECTION_LAYOUT;
@ -169,6 +180,10 @@ export class ConnectionJdbc extends BI.Widget {
name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Evictable_Idle_Time_Millis'), name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Evictable_Idle_Time_Millis'),
value: connectionPoolAttr.minEvictableIdleTimeMillis, value: connectionPoolAttr.minEvictableIdleTimeMillis,
unit: BI.i18nText('BI-Basic_Seconds'), unit: BI.i18nText('BI-Basic_Seconds'),
}, {
type: FormItem.xtype,
name: 'Fetchsize',
value: fetchSize,
}, },
], ],
}, },

2
src/modules/pages/connection/connection_jndi/connection_jndi.ts

@ -19,7 +19,7 @@ export class ConnectionJndi extends BI.Widget {
const connectionData = this.model.connectionSelectedOne.connectionData as ConnectionJNDI; const connectionData = this.model.connectionSelectedOne.connectionData as ConnectionJNDI;
const { jndiName, contextHashtable, originalCharsetName } = connectionData; const { jndiName, contextHashtable, originalCharsetName } = connectionData;
const { hgap, vgap } = CONNECTION_LAYOUT; const { hgap, vgap } = CONNECTION_LAYOUT;
return { return {
type: BI.VerticalLayout.xtype, type: BI.VerticalLayout.xtype,
$testId: 'dec-dcm-connection-jndi', $testId: 'dec-dcm-connection-jndi',

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

@ -19,7 +19,7 @@ export class ConnectionListModel extends Model<{
} }
actions = { actions = {
setConnections: ():Promise<void> => api.getConnectionlist().then(data => { setConnections: ():Promise<void> => api.getConnectionList().then(data => {
if (BI.size(data.data) > 0) { if (BI.size(data.data) > 0) {
this.model.connections = data.data; this.model.connections = data.data;
this.model.connections.forEach(item => { this.model.connections.forEach(item => {
@ -30,7 +30,7 @@ export class ConnectionListModel extends Model<{
} else { } else {
this.model.connectionSelected = ''; this.model.connectionSelected = '';
} }
return new Promise(resolve => { return new Promise(resolve => {
resolve(); resolve();
}); });

6
src/modules/pages/connection/list/list.ts

@ -6,7 +6,7 @@ import { Tab } from '@fui/core';
@shortcut() @shortcut()
@store(ConnectionListModel) @store(ConnectionListModel)
export class ConnectionList extends BI.LoadingPane { export class ConnectionList extends BI.Pane {
static xtype = 'dec.dcm.connection.list'; static xtype = 'dec.dcm.connection.list';
store: ConnectionListModel['store']; store: ConnectionListModel['store'];
@ -15,7 +15,7 @@ export class ConnectionList extends BI.LoadingPane {
groupWidget: any; groupWidget: any;
tab: Tab; tab: Tab;
beforeInit(cb: Function) { beforeRender(cb: Function) {
this.store.setConnections().then(() => { this.store.setConnections().then(() => {
cb(); cb();
}); });
@ -67,7 +67,7 @@ export class ConnectionList extends BI.LoadingPane {
], ],
}; };
} }
return { return {
type: BI.Loader.xtype, type: BI.Loader.xtype,
itemsCreator: (options: {times: number}, populate) => { itemsCreator: (options: {times: number}, populate) => {

76
src/modules/pages/connection/list/list_item/list_item.model.ts

@ -4,11 +4,13 @@ import { ApiFactory } from '../../../../crud/apiFactory';
import { ResultType } from '../../../../crud/crud.typings'; import { ResultType } from '../../../../crud/crud.typings';
import { getChartLength } from '../../../../app.service'; import { getChartLength } from '../../../../app.service';
import { NAME_MAX_LENGTH } from '../../../../app.constant'; import { NAME_MAX_LENGTH } from '../../../../app.constant';
import { PAGE_INDEX } from '@constants/constant';
const api = new ApiFactory().create(); const api = new ApiFactory().create();
@model() @model()
export class ListItemModel extends Model<{ export class ListItemModel extends Model<{
types : { types: {
connectionSelected: AppModel['TYPE']['connectionSelected']; connectionSelected: AppModel['TYPE']['connectionSelected'];
connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne']; connectionSelectedOne: AppModel['TYPE']['connectionSelectedOne'];
datebaseTypeSelectedOne: AppModel['TYPE']['datebaseTypeSelectedOne']; datebaseTypeSelectedOne: AppModel['TYPE']['datebaseTypeSelectedOne'];
@ -21,7 +23,7 @@ export class ListItemModel extends Model<{
}> { }> {
static xtype = 'dec.dcm.model.connection.list_item'; static xtype = 'dec.dcm.model.connection.list_item';
context = <const>['connectionSelected', 'connections', 'pageIndex', 'datebaseTypeSelectedOne', 'connectionSelectedOne', 'datebaseTypeSelected', 'isCopy']; context = <const>['connectionSelected', 'connections', 'pageIndex', 'datebaseTypeSelectedOne', 'connectionSelectedOne', 'datebaseTypeSelected', 'isCopy', 'connectionLicInfo'];
state() { state() {
return { return {
@ -52,10 +54,12 @@ export class ListItemModel extends Model<{
}, },
setIsEdit: (isEdit: boolean, name: string) => { setIsEdit: (isEdit: boolean, name: string) => {
if (isEdit) { if (isEdit) {
api.getConnectionStatus(name).then(re => { api.getConnectionStatus(name)
this.model.isEdit = true; .then(re => {
}) this.model.isEdit = true;
.catch(() => {}); })
.catch(() => {
});
} else { } else {
api.shutdownConnectionStatus(name); api.shutdownConnectionStatus(name);
this.model.isEdit = false; this.model.isEdit = false;
@ -69,7 +73,10 @@ export class ListItemModel extends Model<{
} }
if (getChartLength(newName) > NAME_MAX_LENGTH) { if (getChartLength(newName) > NAME_MAX_LENGTH) {
return new Promise(resolve => { return new Promise(resolve => {
resolve({ errorCode: '1', errorMsg: BI.i18nText('Dec-Dcm_Connection_Cannot_Too_Lang', NAME_MAX_LENGTH) }); resolve({
errorCode: '1',
errorMsg: BI.i18nText('Dec-Dcm_Connection_Cannot_Too_Lang', NAME_MAX_LENGTH),
});
}); });
} }
const hasNamed = this.model.connections.some(item => item.connectionName === newName); const hasNamed = this.model.connections.some(item => item.connectionName === newName);
@ -82,31 +89,50 @@ export class ListItemModel extends Model<{
connection.connectionId = oldName; connection.connectionId = oldName;
connection.connectionName = newName; connection.connectionName = newName;
return api.updateConnection(connection).then(re => { return api.updateConnection(connection)
if (!re.errorCode) { .then(re => {
this.model.connections = this.model.connections.map(item => { if (!re.errorCode) {
return { this.model.connections = this.model.connections.map(item => {
...item, return {
connectionName: item.connectionName === oldName ? newName : item.connectionName, ...item,
connectionId: item.connectionName === oldName ? newName : item.connectionName, connectionName: item.connectionName === oldName ? newName : item.connectionName,
}; connectionId: item.connectionName === oldName ? newName : item.connectionName,
}); };
if (this.model.connectionSelected === oldName) { });
this.model.connectionSelected = newName; if (this.model.connectionSelected === oldName) {
this.model.connectionSelected = newName;
}
} }
}
return re;
return re; });
}); },
copyConnection(connectionName) {
if (this.model.connectionLicInfo.currentConnectionNum >= this.model.connectionLicInfo.maxConnectionNum) {
BI.Services.getService('dec.service.component.icon_text.msg').alert({
text: BI.i18nText('Dec-Connection_Lic_Limit_Approach_Prevent_Tip', this.model.connectionLicInfo.maxConnectionNum),
});
return;
}
this.setConnectionSelected(connectionName);
this.setIsCopy(true);
this.setPageIndex(PAGE_INDEX.MAINTAIN);
}, },
setIsCopy: (isCopy: boolean) => { setIsCopy: (isCopy: boolean) => {
this.model.isCopy = isCopy; this.model.isCopy = isCopy;
}, },
isDriverError: (errorCode: string) => api.isDriverError(errorCode), isDriverError: (errorCode: string) => api.isDriverError(errorCode),
} };
removeConnection(name: string) { removeConnection(name: string) {
api.deleteConnection(name).then(re => api.getConnectionlist()) api.deleteConnection(name)
.then(re => {
this.model.connectionLicInfo.currentConnectionNum -= 1;
return api.getConnectionList();
})
.then(connections => { .then(connections => {
this.model.connections = connections.data; this.model.connections = connections.data;
this.model.connections.forEach(item => { this.model.connections.forEach(item => {

11
src/modules/pages/connection/list/list_item/list_item.ts

@ -19,7 +19,7 @@ export class ListItem extends BI.BasicButton {
height: 25, height: 25,
baseCls: 'dec-dcm-connection-list-item bi-list-item-active2', baseCls: 'dec-dcm-connection-list-item bi-list-item-active2',
$testId: 'dec-dcm-connection-list-item', $testId: 'dec-dcm-connection-list-item',
} };
store: ListItemModel['store']; store: ListItemModel['store'];
model: ListItemModel['model']; model: ListItemModel['model'];
@ -36,7 +36,7 @@ export class ListItem extends BI.BasicButton {
this.nameEditor.focus(); this.nameEditor.focus();
} }
}, },
} };
render() { render() {
const { name, databaseType } = this.options; const { name, databaseType } = this.options;
@ -220,15 +220,14 @@ export class ListItem extends BI.BasicButton {
this.store.setPageIndex(PAGE_INDEX.MAINTAIN); this.store.setPageIndex(PAGE_INDEX.MAINTAIN);
this.store.setDatebaseTypeSelected(''); this.store.setDatebaseTypeSelected('');
}) })
.catch(() => { }); .catch(() => {
});
}, },
changeName: () => { changeName: () => {
this.store.setIsEdit(true, name); this.store.setIsEdit(true, name);
}, },
copy: () => { copy: () => {
this.store.setConnectionSelected(name); this.store.copyConnection(name);
this.store.setIsCopy(true);
this.store.setPageIndex(PAGE_INDEX.MAINTAIN);
}, },
delete: () => { delete: () => {
this.store.deleteConnection(name); this.store.deleteConnection(name);

37
src/modules/pages/connection_pool/connection_pool.ts

@ -4,6 +4,7 @@ import { ListItem } from './list_item/list_item';
import { Pool } from './pool/pool'; import { Pool } from './pool/pool';
import { PAGE_SIZE } from '@constants/constant'; import { PAGE_SIZE } from '@constants/constant';
import { Label } from '@fui/core'; import { Label } from '@fui/core';
@shortcut() @shortcut()
@store(ConnectionPoolModel) @store(ConnectionPoolModel)
export class ConnectionPool extends BI.Widget { export class ConnectionPool extends BI.Widget {
@ -18,7 +19,7 @@ export class ConnectionPool extends BI.Widget {
selected: (selected: string) => { selected: (selected: string) => {
this.title.setText(selected); this.title.setText(selected);
}, },
} };
mounted() { mounted() {
const defaultSelected = this.model.connectionJDBC.length > 0 ? this.model.connectionJDBC[0].connectionName : ''; const defaultSelected = this.model.connectionJDBC.length > 0 ? this.model.connectionJDBC[0].connectionName : '';
@ -29,7 +30,7 @@ export class ConnectionPool extends BI.Widget {
if (BI.size(this.model.connectionJDBC) === 0) { if (BI.size(this.model.connectionJDBC) === 0) {
return this.renderNoConnection(); return this.renderNoConnection();
} }
return { return {
type: BI.HTapeLayout.xtype, type: BI.HTapeLayout.xtype,
items: [ items: [
@ -37,6 +38,7 @@ export class ConnectionPool extends BI.Widget {
el: { el: {
type: BI.VTapeLayout.xtype, type: BI.VTapeLayout.xtype,
cls: 'bi-border-right', cls: 'bi-border-right',
hgap: 10,
items: [ items: [
{ {
el: { el: {
@ -44,16 +46,18 @@ export class ConnectionPool extends BI.Widget {
cls: 'bi-border-bottom', cls: 'bi-border-bottom',
textAlign: 'left', textAlign: 'left',
text: BI.i18nText('Dec-Dcm_Data_Connections'), text: BI.i18nText('Dec-Dcm_Data_Connections'),
lgap: 10,
}, },
height: 40, height: 40,
}, },
{ {
type: BI.Loader.xtype, el: {
itemsCreator: (options: {times: number}, populate) => { type: BI.Loader.xtype,
populate(this.renderList((options.times - 1) * PAGE_SIZE, options.times * PAGE_SIZE)); itemsCreator: (options: { times: number }, populate) => {
populate(this.renderList((options.times - 1) * PAGE_SIZE, options.times * PAGE_SIZE));
},
hasNext: options => options.times * PAGE_SIZE < BI.size(this.model.connectionJDBC),
}, },
hasNext: options => options.times * PAGE_SIZE < BI.size(this.model.connectionJDBC), vgap: 10,
}, },
], ],
}, },
@ -116,14 +120,15 @@ export class ConnectionPool extends BI.Widget {
private renderList(start = 0, end = 0) { private renderList(start = 0, end = 0) {
const defaultSelected = this.model.connectionJDBC.length > 0 ? this.model.connectionJDBC[0].connectionName : ''; const defaultSelected = this.model.connectionJDBC.length > 0 ? this.model.connectionJDBC[0].connectionName : '';
return this.model.connectionJDBC.slice(start, end).map(item => { return this.model.connectionJDBC.slice(start, end)
return { .map(item => {
type: ListItem.xtype, return {
name: item.connectionName, type: ListItem.xtype,
value: item.connectionName, name: item.connectionName,
selected: item.connectionName === defaultSelected, value: item.connectionName,
}; selected: item.connectionName === defaultSelected,
}); };
});
} }
} }

70
src/modules/pages/maintain/forms/components/form.jdbc.ts

@ -1,12 +1,12 @@
import {shortcut} from '@core/core'; import { shortcut } from '@core/core';
import {Collapse, EVENT_CHANGE} from 'src/modules/components/collapse/collapse'; import { Collapse, EVENT_CHANGE } from 'src/modules/components/collapse/collapse';
import {FormItem} from '../../components/form_item/form_item'; import { FormItem } from '../../components/form_item/form_item';
import {Connection, ConnectionJDBC, ConnectionPoolJDBC} from 'src/modules/crud/crud.typings'; import { Connection, ConnectionJDBC, ConnectionPoolJDBC } from 'src/modules/crud/crud.typings';
import {connectionType} from '@constants/env'; import { connectionType } from '@constants/env';
import {CONNECT_CHARSET, CONNECTION_LAYOUT, INT_MAX_VALUE, INT_MIN_VALUE} from '@constants/constant'; import { CONNECT_CHARSET, CONNECTION_LAYOUT, INT_MAX_VALUE, INT_MIN_VALUE } from '@constants/constant';
import {getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo, splitUrl} from '../../../../app.service'; import { getAllDatabaseTypes, getJdbcDatabaseType, resolveUrlInfo, splitUrl } from '../../../../app.service';
import {TextChecker} from '../../../../components/text_checker/text_checker'; import { TextChecker } from '../../../../components/text_checker/text_checker';
import {ApiFactory} from 'src/modules/crud/apiFactory'; import { ApiFactory } from 'src/modules/crud/apiFactory';
import { import {
Editor, Editor,
EditorIconCheckCombo, EditorIconCheckCombo,
@ -14,7 +14,7 @@ import {
TextAreaEditor, TextAreaEditor,
TextEditor, TextEditor,
TextValueCombo, TextValueCombo,
VerticalLayout VerticalLayout,
} from '@fui/core'; } from '@fui/core';
const api = new ApiFactory().create(); const api = new ApiFactory().create();
@ -25,7 +25,7 @@ export class FormJdbc extends BI.Widget {
props = { props = {
formData: {} as Connection, formData: {} as Connection,
} };
oldPassword = ''; oldPassword = '';
allDatabaseTypes = getAllDatabaseTypes(); allDatabaseTypes = getAllDatabaseTypes();
@ -63,10 +63,11 @@ export class FormJdbc extends BI.Widget {
numTestsPerEvictionRun: null, numTestsPerEvictionRun: null,
minIdle: null, minIdle: null,
minEvictableIdleTimeMillis: null, minEvictableIdleTimeMillis: null,
fetchSize: null,
}; };
render() { render() {
const {connectionName, connectionData} = this.options.formData; const { connectionName, connectionData } = this.options.formData;
const { const {
driver, driver,
user, user,
@ -78,7 +79,8 @@ export class FormJdbc extends BI.Widget {
database, database,
authType, authType,
principal, principal,
keyPath keyPath,
fetchSize,
} = connectionData as ConnectionJDBC; } = connectionData as ConnectionJDBC;
const { const {
initialSize, initialSize,
@ -92,12 +94,12 @@ export class FormJdbc extends BI.Widget {
timeBetweenEvictionRunsMillis, timeBetweenEvictionRunsMillis,
numTestsPerEvictionRun, numTestsPerEvictionRun,
minIdle, minIdle,
minEvictableIdleTimeMillis minEvictableIdleTimeMillis,
} = connectionPoolAttr as ConnectionPoolJDBC; } = connectionPoolAttr as ConnectionPoolJDBC;
const databaseType = getJdbcDatabaseType(database, driver); const databaseType = getJdbcDatabaseType(database, driver);
this.oldPassword = password; this.oldPassword = password;
const {host, port, databaseName} = resolveUrlInfo(url, database); const { host, port, databaseName } = resolveUrlInfo(url, database);
const {hgap, vgap} = CONNECTION_LAYOUT; const { hgap, vgap } = CONNECTION_LAYOUT;
const valueRangeConfig = { const valueRangeConfig = {
errorText: BI.i18nText('Dec-Dcm_Connection_Value_Out_Range'), errorText: BI.i18nText('Dec-Dcm_Connection_Value_Out_Range'),
@ -394,7 +396,7 @@ export class FormJdbc extends BI.Widget {
vgap: 15, vgap: 15,
disabled: true, disabled: true,
value: schema, value: schema,
items: schema ? [{text: schema, value: schema}] : [], items: schema ? [{ text: schema, value: schema }] : [],
ref: (_ref: TextValueCombo) => { ref: (_ref: TextValueCombo) => {
this.form.schema = _ref; this.form.schema = _ref;
}, },
@ -702,6 +704,37 @@ export class FormJdbc extends BI.Widget {
text: BI.i18nText('BI-Basic_Seconds'), text: BI.i18nText('BI-Basic_Seconds'),
}, },
], ],
}, {
el: {
type: BI.VerticalLayout.xtype,
cls: 'bi-border-top',
invisible: BI.parseInt(fetchSize) < 0,
items: [
{
el: {
type: FormItem.xtype,
name: 'Fetchsize',
forms: [{
type: TextChecker.xtype,
$value: 'fetch-size',
width: 300,
allowBlank: true,
value: fetchSize,
watermark: 'Fetchsize',
validationChecker: [{
errorText: BI.i18nText('Dec-Dcm_Connection_Check_Fetch_Size_Range'),
checker: (value: string) => BI.isInteger(value) && BI.parseInt(value) >= 0 && BI.parseInt(value) <= 1000000,
autoFix: true,
}],
ref: (_ref: TextChecker) => {
this.form.fetchSize = _ref;
},
}],
},
vgap: 15,
},
],
},
}, },
], ],
}, },
@ -767,7 +800,7 @@ export class FormJdbc extends BI.Widget {
} }
private onHostPortChange(databaseType) { private onHostPortChange(databaseType) {
const {urls, url} = databaseType; const { urls, url } = databaseType;
const driver = this.form.driver.getValue(); const driver = this.form.driver.getValue();
const selectUrl = BI.get(urls, driver) || url; const selectUrl = BI.get(urls, driver) || url;
const host = this.form.host.getValue(); const host = this.form.host.getValue();
@ -816,6 +849,7 @@ export class FormJdbc extends BI.Widget {
creator: Dec ? Dec.personal.username : '', creator: Dec ? Dec.personal.username : '',
principal: this.form.principal.getValue(), principal: this.form.principal.getValue(),
keyPath: this.form.keyPath.getValue(), keyPath: this.form.keyPath.getValue(),
fetchSize: this.form.fetchSize.getValue(),
connectionPoolAttr: { connectionPoolAttr: {
initialSize: this.form.initialSize.getValue(), initialSize: this.form.initialSize.getValue(),
maxActive: this.form.maxActive.getValue(), maxActive: this.form.maxActive.getValue(),

Loading…
Cancel
Save