From fcbf3329e484574ada037954fb03720792622cab Mon Sep 17 00:00:00 2001 From: alan Date: Thu, 10 Oct 2019 16:06:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?KERNEL-1473=E5=90=8E=E5=8F=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=B0=83=E6=95=B4creator?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/crud/crud.typings.d.ts | 1 + .../pages/connection/list/list.service.ts | 16 +--------------- src/modules/pages/connection/list/list.ts | 4 ++-- src/modules/pages/maintain/forms/form.ts | 2 +- 4 files changed, 5 insertions(+), 18 deletions(-) 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..87779bb 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: BI.get(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); From 734dc878cbfd86736d3b307f89c5ae25134f4f26 Mon Sep 17 00:00:00 2001 From: alan Date: Thu, 10 Oct 2019 16:11:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/connection/list/list.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/pages/connection/list/list.ts b/src/modules/pages/connection/list/list.ts index 87779bb..efa8dc9 100644 --- a/src/modules/pages/connection/list/list.ts +++ b/src/modules/pages/connection/list/list.ts @@ -86,7 +86,7 @@ export class ConnectionList extends BI.LoadingPane { type: ListItemXtype, name: item.connectionName, value: item.connectionName, - creator: BI.get(item, 'creator'), + creator: item.creator, databaseType: getDatabaseType(item), selected: this.model.connectionSelected ? this.model.connectionSelected === item.connectionName : index === 0, };