Browse Source

Pull request #1739: 无JIRA任务 bug fix

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'c4d522da626bfac75fd9909b6621d327aeb4746a':
  bug fix
master
guy 4 years ago
parent
commit
5696b626f3
  1. 5
      src/widget/multiselect/multiselect.combo.js
  2. 2
      src/widget/multiselect/multiselect.combo.nobar.js
  3. 2
      src/widget/multiselect/multiselect.insert.combo.js
  4. 2
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  5. 2
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

5
src/widget/multiselect/multiselect.combo.js

@ -195,7 +195,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化 self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self._populate(); self._populate();
@ -290,7 +292,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
}, },
right: o.height, right: o.height,
top: 0, top: 0,
height: o.height, height: o.height
}] }]
}); });
}, },
@ -394,6 +396,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
var self = this, o = this.options; var self = this, o = this.options;
adjust(); adjust();
callback(); callback();
function adjust () { function adjust () {
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self._dataChange && self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM); self._dataChange && self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);

2
src/widget/multiselect/multiselect.combo.nobar.js

@ -188,7 +188,9 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化 self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self._populate(); self._populate();

2
src/widget/multiselect/multiselect.insert.combo.js

@ -190,7 +190,9 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化 self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self._populate(); self._populate();

2
src/widget/multiselect/multiselect.insert.combo.nobar.js

@ -185,7 +185,9 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化 self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self._populate(); self._populate();

2
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@ -177,7 +177,9 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化 self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue); this.setValue(self.storeValue);
BI.nextTick(function () { BI.nextTick(function () {
self._populate(); self._populate();

Loading…
Cancel
Save