Merge remote-tracking branch 'baidu/master'

This commit is contained in:
2betop 2020-05-27 13:58:55 +08:00
commit dbb30aab29

View File

@ -557,7 +557,7 @@ export const TableStore = iRendererStore
let value = resolveVariable(key, row.data);
for (let i = 1, len = arr.length; i < len; i++) {
const current = arr[i];
if (resolveVariable(key, current.data) == value) {
if (isEqual(resolveVariable(key, current.data), value)) {
row.rowSpans[key] += 1;
current.rowSpans[key] = 0;
} else {