diff --git a/src/modules/crud/crud.typings.d.ts b/src/modules/crud/crud.typings.d.ts index 00c1f1e..239180e 100644 --- a/src/modules/crud/crud.typings.d.ts +++ b/src/modules/crud/crud.typings.d.ts @@ -18,6 +18,7 @@ export interface Connection { connectionId: string; connectionType: string; connectionName: string; + creator?: string; connectionData: ConnectionJDBC | ConnectionJNDI | ConnectionPlugin | string; privilegeDetailBeanList?: { privilegeType: number; diff --git a/src/modules/pages/connection/list/list.service.ts b/src/modules/pages/connection/list/list.service.ts index aa8d490..5f3b3f1 100644 --- a/src/modules/pages/connection/list/list.service.ts +++ b/src/modules/pages/connection/list/list.service.ts @@ -1,22 +1,8 @@ -import { Connection, ConnectionJDBC, ConnectionJNDI, ConnectionPlugin } from '../../../crud/crud.typings'; +import { Connection, ConnectionJDBC } from '../../../crud/crud.typings'; import { connectionType } from '@constants/env'; import { getAllDatabaseTypes, getJdbcDatabaseType } from 'src/modules/app.service'; import { DATA_BASE_TYPES_OTHER } from '@constants/constant'; -export function getCreator(connection: Connection) { - if (!connection.connectionData) { - return ''; - } - switch (connection.connectionType) { - case connectionType.JDBC: - return (connection.connectionData as ConnectionJDBC).creator; - case connectionType.JNDI: - return (connection.connectionData as ConnectionJNDI).creator; - default: - return (connection.connectionData as ConnectionPlugin).creator; - } -} - export function getDatabaseType(connection: Connection) { switch (connection.connectionType) { case connectionType.JDBC: diff --git a/src/modules/pages/connection/list/list.ts b/src/modules/pages/connection/list/list.ts index ef2d6ce..efa8dc9 100644 --- a/src/modules/pages/connection/list/list.ts +++ b/src/modules/pages/connection/list/list.ts @@ -2,7 +2,7 @@ import { shortcut, store } from '@core/core'; import { CenterAdapt, Label, Layout, Vtape, Loader, Tab } from 'ui'; import { ListItemXtype } from './list_item/list_item'; import { ConnectionListModel, ConnectionListModelXtype } from './list.model'; -import { getCreator, getDatabaseType } from './list.service'; +import { getDatabaseType } from './list.service'; export const ConnectionListXtype = 'dec.dcm.connection.list'; @shortcut(ConnectionListXtype) @store(ConnectionListModelXtype) @@ -86,7 +86,7 @@ export class ConnectionList extends BI.LoadingPane { type: ListItemXtype, name: item.connectionName, value: item.connectionName, - creator: getCreator(item), + creator: item.creator, databaseType: getDatabaseType(item), selected: this.model.connectionSelected ? this.model.connectionSelected === item.connectionName : index === 0, }; diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts index a3dfccb..3214c1e 100644 --- a/src/modules/pages/maintain/forms/form.ts +++ b/src/modules/pages/maintain/forms/form.ts @@ -30,7 +30,7 @@ export class MaintainForm extends BI.Widget { } if (this.connectionName && !this.model.isCopy) { const value = this.form.getSubmitValue(); - (value.connectionData as ConnectionJDBC).creator = BI.get(this.getFormData().connectionData, 'creator'); + (value.connectionData as ConnectionJDBC).creator = BI.get(this.getFormData(), 'creator'); this.store.updateConnection(this.connectionName, value).then(result => { if (result.errorCode) { this.showError(result);