From b1416616aaa73627855a084844193372ca45eeea Mon Sep 17 00:00:00 2001 From: alan Date: Tue, 24 Sep 2019 17:16:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20DEC-9993=20=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E5=8F=96=E6=B6=88=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/connection/list/list.ts | 8 ++++++-- src/modules/pages/connection/list/list_item/list_item.ts | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/modules/pages/connection/list/list.ts b/src/modules/pages/connection/list/list.ts index 53db78d..99f7c18 100644 --- a/src/modules/pages/connection/list/list.ts +++ b/src/modules/pages/connection/list/list.ts @@ -21,7 +21,9 @@ export class ConnectionList extends BI.LoadingPane { watch = { connections: () => { - this.groupWidget.populate(this.renderList()); + const times = this.groupWidget.times; + this.groupWidget.populate(this.renderList(0, this.groupWidget.times * 50)); + this.groupWidget.times = times; }, } @@ -59,7 +61,9 @@ export class ConnectionList extends BI.LoadingPane { populate(this.renderList((options.times - 1) * 50, options.times * 50)); }, hasNext: options => options.times * 50 < BI.size(this.model.connections), - + ref: (_ref: any) => { + this.groupWidget = _ref; + }, }; } diff --git a/src/modules/pages/connection/list/list_item/list_item.ts b/src/modules/pages/connection/list/list_item/list_item.ts index 55b1fbd..5a3b6e0 100644 --- a/src/modules/pages/connection/list/list_item/list_item.ts +++ b/src/modules/pages/connection/list/list_item/list_item.ts @@ -27,6 +27,7 @@ export class ListItem extends BI.BasicButton { comboWidget: any; nameLabel: any; nameEditor: any; + downListCombo: any; testStatus: TestStatus; watch = { @@ -96,10 +97,14 @@ export class ListItem extends BI.BasicButton { cls: 'dcm-link-other-font icon-size-16', }, items: this.renderDownList(), + ref: (_ref: any) => { + this.downListCombo = _ref; + }, listeners: [{ eventName: BI.DownListCombo.EVENT_CHANGE, action: (value: string) => { this.itemActionCalculate().actionClac(value); + this.downListCombo.setValue(''); }, }], From 617d2c83a6d6ab009860c57698eb1a0eb90bb1f8 Mon Sep 17 00:00:00 2001 From: alan Date: Tue, 24 Sep 2019 17:21:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=94=B9=E5=88=B0EVENT=5FBEFORE=5FP?= =?UTF-8?q?OPUPVIEW=E4=BA=8B=E4=BB=B6=E4=B8=AD=E5=8E=BB=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/connection/list/list_item/list_item.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/pages/connection/list/list_item/list_item.ts b/src/modules/pages/connection/list/list_item/list_item.ts index 5a3b6e0..81c8b72 100644 --- a/src/modules/pages/connection/list/list_item/list_item.ts +++ b/src/modules/pages/connection/list/list_item/list_item.ts @@ -104,6 +104,10 @@ export class ListItem extends BI.BasicButton { eventName: BI.DownListCombo.EVENT_CHANGE, action: (value: string) => { this.itemActionCalculate().actionClac(value); + }, + }, { + eventName: BI.DownListCombo.EVENT_BEFORE_POPUPVIEW, + action: () => { this.downListCombo.setValue(''); }, }],