add function for compare adjacent border(table/pivot miniatures)

cell/view/WorkbookView.js

@@ -2911,7 +2911,35 @@
 		ctx.fillRect(x1 + startX, y1 + startY, w, h);
 		ctx.closePath();
 	};
-	
+
+	var getWinBorderColor = function(border1, border2)
+	{
+		var res;
+
+		if(border1.w > border2.w)
+		{
+			res = border1.c;
+		}
+		else if(border1.w < border2.w)
+		{
+			res = border2.c;
+		}
+		else
+		{
+			res = border1.c;
+			/*var rgb1 = border1.c.getRgb();
+			var rgb2 = border2.c.getRgb();
+
+			res = border1.c;
+			if(rgb2 > rgb1)
+			{
+				res = border2.c;
+			}*/
+		}
+
+		return res;
+	};
+
 	var bbox = new Asc.Range(0, 0, col - 1, row - 1);
 	var sheetMergedStyles = new AscCommonExcel.SheetMergedStyles();
 	var hiddenManager = new AscCommonExcel.HiddenManager(null);
@@ -2928,12 +2956,19 @@
 	{
 		style.initStyle(sheetMergedStyles, bbox, styleInfo, headerRowCount, totalsRowCount);
 	}
+
+	var compiledStylesArr = [];
 	for (var i = 0; i < row; i++)
 	{
-		for (var j = 0; j < col; j++)
-		{
-			var color = null;
+		for (var j = 0; j < col; j++) {
+			var color = null, previousStyle;
 			var curStyle = AscCommonExcel.getCompiledStyle(sheetMergedStyles, hiddenManager, i, j);
+
+			if(!compiledStylesArr[i])
+			{
+				compiledStylesArr[i] = [];
+			}
+			compiledStylesArr[i][j] = curStyle;
 			
 			//fill
 			if(curStyle && curStyle.fill && curStyle.fill.bg)
@@ -2947,6 +2982,14 @@
 			if(curStyle && curStyle.border && curStyle.border.l && curStyle.border.l.w !== 0)
 			{
 				color = curStyle.border.l.c;
+				if(j - 1 >= 0)
+				{
+					previousStyle = compiledStylesArr[i][j - 1];
+					if(previousStyle && previousStyle.border && previousStyle.border.l && previousStyle.border.l.w !== 0)
+					{
+						color = getWinBorderColor(curStyle.border.l, previousStyle.border.l);
+					}
+				}
 				calculateLineVer(color, j * lineStepX, i * stepY, (i + 1) * stepY);
 			}
 			//right
@@ -2959,6 +3002,14 @@
 			if(curStyle && curStyle.border && curStyle.border.t && curStyle.border.t.w !== 0)
 			{
 				color = curStyle.border.t.c;
+				if(i - 1 >= 0)
+				{
+					previousStyle = compiledStylesArr[i - 1][j];
+					if(previousStyle && previousStyle.border && previousStyle.border.t && previousStyle.border.t.w !== 0)
+					{
+						color = getWinBorderColor(curStyle.border.t, previousStyle.border.t);
+					}
+				}
 				calculateLineHor(color, j * stepX, i * stepY, (j + 1) * stepX);
 			}
 			//bottom
@@ -2969,7 +3020,7 @@
 			}
 			
 			//marks
-			var color = defaultColor;
+			color = defaultColor;
 			if(curStyle && curStyle.font && curStyle.font.c)
 			{
 				color = curStyle.font.c;