Browse Source

Merge pull request #239035 in DEC/fineui from final/11.0 to release/11.0

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

6
src/core/2.base.js

@ -640,15 +640,15 @@
var result = [];
var used = [];
for (var b in object) {
if (this.has(object, b)) {
if (!this.isEqual(object[b], other[b])) {
if (BI.has(object, b)) {
if (!BI.isEqual(object[b], other[b])) {
result.push(b);
}
used.push(b);
}
}
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);
}
}

Loading…
Cancel
Save