From b35cc487c1636be5778016920a2e4ef9e3bf9651 Mon Sep 17 00:00:00 2001 From: flowerField Date: Tue, 2 Mar 2021 16:33:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E5=86=85=E9=83=A8=E7=9A=84=E8=BE=B9=E6=A1=86=E4=B8=8D=E8=BF=9B?= =?UTF-8?q?=E8=A1=8Cdraw?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/global/border.js | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/global/border.js b/src/global/border.js index c6b8589..c78b568 100644 --- a/src/global/border.js +++ b/src/global/border.js @@ -77,6 +77,14 @@ function getBorderInfoComputeRange(dataset_row_st,dataset_row_ed,dataset_col_st, borderInfoCompute[bd_r + "_" + bd_c_left].r = { "color": borderColor, "style": borderStyle }; } } + + let mc = cfg["merge"] || {}; + for (const key in mc) { + let {c,r,cs,rs} = mc[key]; + if(bd_c1 <= c + cs - 1 && bd_c1 > c && bd_r >= r && bd_r <= r + rs -1){ + borderInfoCompute[bd_r + "_" + bd_c1].l = null; + } + } } } else if(borderType == "border-right"){ @@ -107,6 +115,13 @@ function getBorderInfoComputeRange(dataset_row_st,dataset_row_ed,dataset_col_st, borderInfoCompute[bd_r + "_" + bd_c_right].l = { "color": borderColor, "style": borderStyle }; } } + let mc = cfg["merge"] || {}; + for (const key in mc) { + let {c,r,cs,rs} = mc[key]; + if(bd_c2 < c + cs - 1 && bd_c2 >= c && bd_r >= r && bd_r <= r + rs -1){ + borderInfoCompute[bd_r + "_" + bd_c2].r = null; + } + } } } else if(borderType == "border-top"){ @@ -137,6 +152,14 @@ function getBorderInfoComputeRange(dataset_row_st,dataset_row_ed,dataset_col_st, borderInfoCompute[bd_r_top + "_" + bd_c].b = { "color": borderColor, "style": borderStyle }; } } + + let mc = cfg["merge"] || {}; + for (const key in mc) { + let {c,r,cs,rs} = mc[key]; + if(bd_r1 <= r + rs - 1 && bd_r1 > r && bd_c >= c && bd_c <= c + cs -1){ + borderInfoCompute[bd_r1 + "_" + bd_c].t = null; + } + } } } else if(borderType == "border-bottom"){ @@ -167,6 +190,14 @@ function getBorderInfoComputeRange(dataset_row_st,dataset_row_ed,dataset_col_st, borderInfoCompute[bd_r_bottom + "_" + bd_c].t = { "color": borderColor, "style": borderStyle }; } } + + let mc = cfg["merge"] || {}; + for (const key in mc) { + let {c,r,cs,rs} = mc[key]; + if(bd_r2 < r + rs - 1 && bd_r2 >= r && bd_c >= c && bd_c <= c + cs -1){ + borderInfoCompute[bd_r2 + "_" + bd_c].b = null; + } + } } } else if(borderType == "border-all"){