Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -21,6 +21,7 @@ import org.apache.commons.codec.Charsets;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.poi.ss.usermodel.CellStyle;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -1857,8 +1858,13 @@ public class ExcelTabController extends BladeController {
                             CellRange cellRange = columns[i];
                             System.out.println(cellRange.getStyle().getFont().getSize());
                             if (cellRange.getStyle().getFont().getSize() >= 12) {
+                                String title = projectInfo.getProjectName();
+                                if (title.length() >= 30) {
+                                    cellRange.setRowHeight(40);
+                                    cellRange.getStyle().setWrapText(true);
+                                }
+                                cellRange.getStyle().getFont().setSize(18);
                                 cellRange.setText(projectInfo.getProjectName());
-                                cellRange.getStyle().getFont().setSize(20);
                                 break;
                             }
                         }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FirstController.java

@@ -251,8 +251,13 @@ public class FirstController extends BladeController {
                                         CellRange cellRange = columns[i];
                                         System.out.println(cellRange.getStyle().getFont().getSize());
                                         if (cellRange.getStyle().getFont().getSize() > 12 && StringUtils.isBlank(cellRange.getText())) {
+                                            String title = projectInfo.getProjectName();
+                                            if (title.length() >= 30) {
+                                                cellRange.setRowHeight(40);
+                                                cellRange.getStyle().setWrapText(true);
+                                            }
+                                            cellRange.getStyle().getFont().setSize(18);
                                             cellRange.setText(projectInfo.getProjectName());
-                                            cellRange.getStyle().getFont().setSize(14);
                                             break;
                                         }
                                     }