Browse Source

Revert "BI-118262 fix: 树过滤组件搜索过滤不生效"

This reverts commit e69dffc948.
research/test
zsmj 2 years ago
parent
commit
7a2e16068e
  1. 3
      src/widget/multiselect/multiselect.combo.js
  2. 3
      src/widget/multiselect/multiselect.combo.nobar.js
  3. 3
      src/widget/multiselect/multiselect.insert.combo.js
  4. 3
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  5. 2
      src/widget/multiselect/multiselect.insert.trigger.js
  6. 3
      src/widget/multiselect/multiselect.trigger.js
  7. 3
      src/widget/multitree/multi.tree.combo.js
  8. 3
      src/widget/multitree/multi.tree.insert.combo.js
  9. 3
      src/widget/multitree/multi.tree.list.combo.js
  10. 3
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
  11. 3
      src/widget/singleselect/singleselect.combo.js
  12. 3
      src/widget/singleselect/singleselect.insert.combo.js

3
src/widget/multiselect/multiselect.combo.js

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

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

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

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

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

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

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

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

@ -15,7 +15,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-insert-trigger",
baseCls: "bi-multi-select-trigger",
itemsCreator: BI.emptyFn,
valueFormatter: BI.emptyFn,
itemHeight: 24,

3
src/widget/multiselect/multiselect.trigger.js

@ -70,8 +70,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
});
this.wrapNumberCounter = BI.createWidget({
type: "bi.layout",
cls:"wrap-number-counter",
type: "bi.layout"
});
this.wrapper = BI.createWidget({

3
src/widget/multitree/multi.tree.combo.js

@ -189,6 +189,9 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
if (isSearching()) {
return;
}
if (!this.isViewVisible()) {
self._dataChange = false; // 标记数据是否发生变化
}
if (change === true) {
self.storeValue = { value: self.combo.getValue() };
change = false;

3
src/widget/multitree/multi.tree.insert.combo.js

@ -202,6 +202,9 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
if (isSearching()) {
return;
}
if (!this.isViewVisible()) {
self._dataChange = false; // 标记数据是否发生变化
}
if (change === true) {
self.storeValue = { value: self.combo.getValue() };
change = false;

3
src/widget/multitree/multi.tree.list.combo.js

@ -219,6 +219,9 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
if (isSearching()) {
return;
}
if (!this.isViewVisible()) {
self._dataChange = false; // 标记数据是否发生变化
}
if (change === true) {
self.storeValue = { value: self.combo.getValue() };
change = false;

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

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

3
src/widget/singleselect/singleselect.combo.js

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

3
src/widget/singleselect/singleselect.insert.combo.js

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

Loading…
Cancel
Save