Merge pull request #6944 from jacekszymanski/devel

add colspan so title line is above all columns not just first

Merge pull request #6944 from jacekszymanski/devel
add colspan so title line is above all columns not just first
d844ce9c · Serge Rider · GitHub · 7ea53c89 · 05be539c · d844ce9c
隐藏空白更改
内联并排

Showing with 15 addition and 1 deletion

plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterHTML.java ...aver/tools/transfer/stream/exporter/DataExporterHTML.java +15 -1

未找到文件。
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterHTML.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterHTML.java
@@ -94,7 +94,7 @@ public class DataExporterHTML extends StreamExporterAbstract {
      out.write("<body><table>");

        out.write("<tr>");
-        writeTextCell(name, true);
+        writeTableTitle(name, columns.length);
        out.write("</tr>");
        out.write("<tr>");
        for (int i = 0, columnsSize = columns.length; i < columnsSize; i++) {
@@ -154,6 +154,20 @@ public class DataExporterHTML extends StreamExporterAbstract {
        getWriter().write("</table></body></html>");
    }

+    private void writeTableTitle(String value, int columns)
+    {
+        PrintWriter out = getWriter();
+        out.write(String.format("<th colspan=\"%d\">", columns));
+        if (value == null) {
+            out.write("&nbsp;");
+        }
+        else {
+            value = value.replace("<", "&lt;").replace(">", "&gt;").replace("&", "&amp;");
+            out.write(value);
+        }
+        out.write("</th>");
+    }
+
    private void writeTextCell(String value, boolean header)
    {
        PrintWriter out = getWriter();