add

8 years ago · 7180092751
3 changed files with 6 additions and 6 deletions
--- a/bi/base.js
+++ b/bi/base.js
@ -31366,8 +31366,8 @@ BI.Table = BI.inherit(BI.Widget, {
                        var isNeedMergeCol = o.mergeRule(map[i][j], map[i][j - 1]);
                        if (isNeedMergeCol === true) {
                            mergeCol(i, j);
-                            preCol[j] = preRow[j - 1];
-                            preCW[j] = preRW[j - 1];
+                            preCol[j] = preRow[i];
+                            preCW[j] = preRW[i];
                        } else {
                            createOneEl(i, j);
                        }
--- a/docs/base.js
+++ b/docs/base.js
@ -31366,8 +31366,8 @@ BI.Table = BI.inherit(BI.Widget, {
                        var isNeedMergeCol = o.mergeRule(map[i][j], map[i][j - 1]);
                        if (isNeedMergeCol === true) {
                            mergeCol(i, j);
-                            preCol[j] = preRow[j - 1];
-                            preCW[j] = preRW[j - 1];
+                            preCol[j] = preRow[i];
+                            preCW[j] = preRW[i];
                        } else {
                            createOneEl(i, j);
                        }
--- a/src/base/table/table.js
+++ b/src/base/table/table.js
@ -418,8 +418,8 @@ BI.Table = BI.inherit(BI.Widget, {
                        var isNeedMergeCol = o.mergeRule(map[i][j], map[i][j - 1]);
                        if (isNeedMergeCol === true) {
                            mergeCol(i, j);
-                            preCol[j] = preRow[j - 1];
-                            preCW[j] = preRW[j - 1];
+                            preCol[j] = preRow[i];
+                            preCW[j] = preRW[i];
                        } else {
                            createOneEl(i, j);
                        }