From 746b4f5f89439bfdc5e569d280cd0bbc9f21f20c Mon Sep 17 00:00:00 2001 From: jacky6024 Date: Thu, 8 Jun 2017 08:58:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=A5=E8=A1=A8=E4=B8=8B?= =?UTF-8?q?=E8=BE=B9=E6=A1=86=E7=BA=BFHTML=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bstek/ureport/definition/ReportDefinition.java | 2 +- .../main/java/com/bstek/ureport/expression/model/Condition.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ureport2-core/src/main/java/com/bstek/ureport/definition/ReportDefinition.java b/ureport2-core/src/main/java/com/bstek/ureport/definition/ReportDefinition.java index 93d43ad..e24f294 100644 --- a/ureport2-core/src/main/java/com/bstek/ureport/definition/ReportDefinition.java +++ b/ureport2-core/src/main/java/com/bstek/ureport/definition/ReportDefinition.java @@ -174,7 +174,7 @@ public class ReportDefinition { if(border!=null){ sb.append("border-top:"+border.getStyle().name()+" "+border.getWidth()+"px rgb("+border.getColor()+");"); } - border=cellStyle.getLeftBorder(); + border=cellStyle.getBottomBorder(); if(border!=null){ sb.append("border-bottom:"+border.getStyle().name()+" "+border.getWidth()+"px rgb("+border.getColor()+");"); } diff --git a/ureport2-core/src/main/java/com/bstek/ureport/expression/model/Condition.java b/ureport2-core/src/main/java/com/bstek/ureport/expression/model/Condition.java index e42922d..d4d854b 100644 --- a/ureport2-core/src/main/java/com/bstek/ureport/expression/model/Condition.java +++ b/ureport2-core/src/main/java/com/bstek/ureport/expression/model/Condition.java @@ -25,6 +25,7 @@ import com.bstek.ureport.model.Cell; public interface Condition { /** * @param cell 当前Condition所在的单元格 + * @param currentCell 当前Condition正在处理的单元格 * @param obj 要判断的对象 * @param context 上下文对象 * @return 返回是否符合条件