Browse Source

Merge pull request #60 in DEC/decision-webui-dcm from ~ALAN/decision-webui-dcm:feature/10.0 to feature/10.0

* commit '617d2c83a6d6ab009860c57698eb1a0eb90bb1f8':
  fix: 改到EVENT_BEFORE_POPUPVIEW事件中去做
  fix: DEC-9993 点击之后取消选中
qufenxi
alan 5 years ago
parent
commit
9e60f956f0
  1. 8
      src/modules/pages/connection/list/list.ts
  2. 9
      src/modules/pages/connection/list/list_item/list_item.ts

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

@ -21,7 +21,9 @@ export class ConnectionList extends BI.LoadingPane {
watch = { watch = {
connections: () => { 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)); populate(this.renderList((options.times - 1) * 50, options.times * 50));
}, },
hasNext: options => options.times * 50 < BI.size(this.model.connections), hasNext: options => options.times * 50 < BI.size(this.model.connections),
ref: (_ref: any) => {
this.groupWidget = _ref;
},
}; };
} }

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

@ -27,6 +27,7 @@ export class ListItem extends BI.BasicButton {
comboWidget: any; comboWidget: any;
nameLabel: any; nameLabel: any;
nameEditor: any; nameEditor: any;
downListCombo: any;
testStatus: TestStatus; testStatus: TestStatus;
watch = { watch = {
@ -96,11 +97,19 @@ export class ListItem extends BI.BasicButton {
cls: 'dcm-link-other-font icon-size-16', cls: 'dcm-link-other-font icon-size-16',
}, },
items: this.renderDownList(), items: this.renderDownList(),
ref: (_ref: any) => {
this.downListCombo = _ref;
},
listeners: [{ listeners: [{
eventName: BI.DownListCombo.EVENT_CHANGE, eventName: BI.DownListCombo.EVENT_CHANGE,
action: (value: string) => { action: (value: string) => {
this.itemActionCalculate().actionClac(value); this.itemActionCalculate().actionClac(value);
}, },
}, {
eventName: BI.DownListCombo.EVENT_BEFORE_POPUPVIEW,
action: () => {
this.downListCombo.setValue('');
},
}], }],
}, },

Loading…
Cancel
Save