Browse Source

Merge pull request #239040 in DEC/fineui from release/11.0 to bugfix/11.0

* commit '7f56c66ce403a76f03fcd010877b7ee03d5e2e8c':
  BI-128856 fix: 【6.0.11.1final】仪表板编辑界面,复合过滤组件设置过滤不能实时生效
research/test
superman 1 year ago
parent
commit
0f6181f3a9
  1. 6
      src/core/2.base.js

6
src/core/2.base.js

@ -640,15 +640,15 @@
var result = []; var result = [];
var used = []; var used = [];
for (var b in object) { for (var b in object) {
if (this.has(object, b)) { if (BI.has(object, b)) {
if (!this.isEqual(object[b], other[b])) { if (!BI.isEqual(object[b], other[b])) {
result.push(b); result.push(b);
} }
used.push(b); used.push(b);
} }
} }
for (var b in other) { for (var b in other) {
if (this.has(other, b) && !BI.contains(used, b)) { if (BI.has(other, b) && !BI.contains(used, b)) {
result.push(b); result.push(b);
} }
} }

Loading…
Cancel
Save