From 71800927511bdbbd7d990971551e381d7243ab78 Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 3 Aug 2017 09:06:49 +0800 Subject: [PATCH] add --- bi/base.js | 4 ++-- docs/base.js | 4 ++-- src/base/table/table.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bi/base.js b/bi/base.js index 9e9bbe813..7e2f494d7 100644 --- 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); } diff --git a/docs/base.js b/docs/base.js index 9e9bbe813..7e2f494d7 100644 --- 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); } diff --git a/src/base/table/table.js b/src/base/table/table.js index d112163b8..ed638eb05 100644 --- 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); }