浏览代码

完善报表设计器

master
jacky6024 7 年前
父节点
当前提交
f6eb94438b
  1. 2
      ureport2-console/pom.xml
  2. 92631
      ureport2-console/src/main/resources/asserts/js/designer.bundle.js
  3. 1
      ureport2-console/src/main/resources/asserts/js/designer.bundle.js.map
  4. 677
      ureport2-console/src/main/resources/asserts/js/preview.bundle.js
  5. 1
      ureport2-console/src/main/resources/asserts/js/preview.bundle.js.map
  6. 2
      ureport2-core/pom.xml
  7. 2
      ureport2-core/src/main/java/com/bstek/ureport/definition/CellStyle.java
  8. 5
      ureport2-core/src/main/java/com/bstek/ureport/parser/impl/CellStyleParser.java

2
ureport2-console/pom.xml

@ -6,7 +6,7 @@
<parent>
<groupId>com.bstek.ureport</groupId>
<artifactId>ureport2-parent</artifactId>
<version>2.0.0</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>

92631
ureport2-console/src/main/resources/asserts/js/designer.bundle.js

文件差异因一行或多行过长而隐藏

1
ureport2-console/src/main/resources/asserts/js/designer.bundle.js.map

文件差异因一行或多行过长而隐藏

677
ureport2-console/src/main/resources/asserts/js/preview.bundle.js

文件差异因一行或多行过长而隐藏

1
ureport2-console/src/main/resources/asserts/js/preview.bundle.js.map

文件差异因一行或多行过长而隐藏

2
ureport2-core/pom.xml

@ -6,7 +6,7 @@
<parent>
<groupId>com.bstek.ureport</groupId>
<artifactId>ureport2-parent</artifactId>
<version>2.0.0</version>
<version>2.0.1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>

2
ureport2-core/src/main/java/com/bstek/ureport/definition/CellStyle.java

@ -26,7 +26,7 @@ import org.codehaus.jackson.annotate.JsonIgnore;
*/
public class CellStyle {
private String bgcolor;
private String forecolor;
private String forecolor="0,0,0";
private int fontSize=10;
private String fontFamily="宋体";
private String format;

5
ureport2-core/src/main/java/com/bstek/ureport/parser/impl/CellStyleParser.java

@ -82,7 +82,10 @@ public class CellStyleParser implements Parser<CellStyle> {
style=new CellStyle();
}
style.setBgcolor(element.attributeValue("bgcolor"));
style.setForecolor(element.attributeValue("forecolor"));
String forecolor=element.attributeValue("forecolor");
if(StringUtils.isNotBlank(forecolor)){
style.setForecolor(forecolor);
}
String fontFamily=element.attributeValue("font-family");
if(StringUtils.isNotBlank(fontFamily)){
style.setFontFamily(fontFamily);

正在加载...
取消
保存