Merge pull request #174 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0

* commit '645159f9a34097a34281135b698c9a5201ce83ce':
  REPORT-14108 预览效果不正确

fine-itext/src/com/fr/third/v2/lowagie/text/html/simpleparser/IncTable.java

@@ -176,7 +176,8 @@ public class IncTable {
         tableProperties.setBorderStyle(borderStyle);
         String value = (String)props.get("border");
         if(value != null){
-            borderStyle.setBorderWidth(CSSUtils.parseFloat(value));
+            borderStyle.parseBorderStyle(value);
+
         }
         value = (String)props.get("border-color");
         if(value != null){

fine-itext/src/com/fr/third/v2/lowagie/text/pdf/BorderStyle.java

@@ -1,6 +1,5 @@
 package com.fr.third.v2.lowagie.text.pdf;
 
-import com.fr.third.v2.lowagie.text.DocumentException;
 import com.fr.third.v2.lowagie.text.html.CSSUtils;
 import com.fr.third.v2.lowagie.text.html.Markup;
 
@@ -10,6 +9,10 @@ public class BorderStyle {
     private float borderWidth = 0.0f;
     private Color borderColor = Color.black;
     private String borderPattern = "solid";
+    //形如 border:1px
+    private static final int BORDER_WIDTH = 1;
+    //形如 border:1px solid black
+    private static final int BORDER_PROPERTY = 3;
 
     public float getBorderWidth() {
         return borderWidth;
@@ -42,17 +45,26 @@ public class BorderStyle {
     public BorderStyle(int borderWidth, String borderPattern, Color borderColor) {
         this.borderWidth = borderWidth;
         this.borderPattern = borderPattern;
-        this.borderWidth = borderWidth;
+        this.borderColor = borderColor;
     }
 
-    public static BorderStyle parseBorderStyle(String borderString) throws DocumentException {
+    public void parseBorderStyle(String borderString) {
-        BorderStyle borderStyle = new BorderStyle();
         String[] borderPros = borderString.split(" ");
-        borderStyle.setBorderWidth(CSSUtils.parseFloat(borderPros[0]));
+        switch (borderPros.length) {
-        borderStyle.setBorderPattern(borderPros[1]);
+            case BORDER_WIDTH:
-        borderStyle.setBorderColor(Markup.decodeColor(borderPros[2]));
+                this.setBorderWidth(CSSUtils.parseFloat(borderPros[0]));
-        return borderStyle;
+                break;
+            case BORDER_PROPERTY:
+                this.setBorderWidth(CSSUtils.parseFloat(borderPros[0]));
+                this.setBorderPattern(borderPros[1]);
+                this.setBorderColor(Markup.decodeColor(borderPros[2]));
+                break;
+            default:
+                break;
+        }
+
 
     }
 
 }
+

fine-itext/src/com/fr/third/v2/lowagie/text/pdf/TableProperties.java

@@ -44,8 +44,10 @@ public class TableProperties {
 
     public String toHtmlString(){
         StringBuffer sb = new StringBuffer();
-        sb.append("cellspacing").append("=").append(cellspacing).append(" ");
+        if(!isCollapse()){
-        sb.append("cellpadding").append("=").append(cellpadding).append(" ");
+            sb.append("cellspacing").append("=").append(cellspacing).append(" ");
+            sb.append("cellpadding").append("=").append(cellpadding).append(" ");
+        }
         sb.append("border").append("=").append(borderStyle.getBorderWidth()).append(" ");
         return sb.toString();
     }