From 4865d829f7ec9fe26480a3dcc2dfe66cbc2ad67b Mon Sep 17 00:00:00 2001 From: alan Date: Wed, 25 Sep 2019 14:29:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20DEC-9989=20&&=20DEC-10011=20=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9E=E6=8E=A5=EF=BC=8C=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=97=B6=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/connection/list/list.model.ts | 13 +++++++++---- src/modules/pages/connection/list/list.ts | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/modules/pages/connection/list/list.model.ts b/src/modules/pages/connection/list/list.model.ts index b5f60cd..6699eac 100644 --- a/src/modules/pages/connection/list/list.model.ts +++ b/src/modules/pages/connection/list/list.model.ts @@ -14,11 +14,16 @@ export class ConnectionListModel extends Model<{ actions = { setConnections: ():Promise => api.getConnectionlist().then(data => { - this.model.connections = data.data; - this.model.connections.forEach(item => { + if (BI.size(data.data) > 0) { + this.model.connections = data.data; + this.model.connections.forEach(item => { // 后端传过来的是字符串，转为对象 - item.connectionData = JSON.parse(item.connectionData); - }); + item.connectionData = JSON.parse(item.connectionData); + }); + this.model.connectionSelected = data.data[0].connectionName; + } else { + this.model.connectionSelected = ''; + } return new Promise(resolve => { resolve(); diff --git a/src/modules/pages/connection/list/list.ts b/src/modules/pages/connection/list/list.ts index 99f7c18..2cf066c 100644 --- a/src/modules/pages/connection/list/list.ts +++ b/src/modules/pages/connection/list/list.ts @@ -68,13 +68,14 @@ export class ConnectionList extends BI.LoadingPane { } private renderList(start = 0, end = 0) { - return this.model.connections.slice(start, end).map((item: Connection) => { + return this.model.connections.slice(start, end).map((item: Connection, index: number) => { return { type: ListItemXtype, name: item.connectionName, value: item.connectionName, creator: getCreator(item), databaseType: getDatabaseType(item), + selected: this.model.connectionSelected ? this.model.connectionSelected === item.connectionName : index === 0, }; }); }