Browse Source

Pull request #239033: BI-128856 fix: 【6.0.11.1final】仪表板编辑界面,复合过滤组件设置过滤不能实时生效

Merge in DEC/fineui from ~DAILER/fineui-decision:final/11.0 to final/11.0

* commit 'fdc90c7e009e4ff786d60a7a52e1f2f91da32577':
  BI-128856 fix: 【6.0.11.1final】仪表板编辑界面,复合过滤组件设置过滤不能实时生效
research/test
Dailer-刘荣歆 1 year ago
parent
commit
b091ebd101
  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