执行时间

yzg-util-db/src/main/java/com/yanzuoguang/excel/ExcelConsole.java

@@ -340,11 +340,14 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
             String columnName = column.getName();
             String value = StringHelper.getFirst(rowHandle.get(t, columnName));
             // 列宽度
-            int columnWidth = getUnit(column.getWidth());
+            int columnWidth = getUnit(column.getWidth() - 10);
+            // 中文长度
+            int chinese = this.chinese.matcher(value).groupCount();
             // 实际内容宽度
-            int chinaWidth = (int) Math.round(value.length() * 1.5);
+            int wordLength = value.length() + chinese;
+            int cellWidth = wordLength * 256;
             // 当前单元格实际行高
-            int nowCellHeight = StringHelper.getPage(chinaWidth, columnWidth) * getUnit(this.config.getRowHeight());
+            int nowCellHeight = StringHelper.getPage(cellWidth, columnWidth) * getUnit(this.config.getRowHeight());
             // 当前行行高
             height = Math.max(nowCellHeight, height);