weijianghai пре 1 година
родитељ
комит
a5c0094bf0

+ 2 - 7
src/main/java/com/nokia/hb/pojo/Col.java

@@ -10,11 +10,6 @@ import lombok.NoArgsConstructor;
 public class Col {
     private String field;
     private String title;
-//    private boolean sort = true;
-    private String width = "200";
-
-    public Col(String field, String title) {
-        this.field = field;
-        this.title = title;
-    }
+    private Integer width;
+    private Integer minWidth = 200;
 }

+ 14 - 1
src/main/java/com/nokia/hb/service/PmService.java

@@ -71,7 +71,11 @@ public class PmService {
         Set<String> headers = list.get(0).keySet();
         ezMap.forEach((k, v) -> {
             if (headers.contains(k)) {
-                cols.add(new Col(k, v));
+                Col col = new Col();
+                col.setField(k);
+                col.setTitle(v);
+                col.setWidth(getWidth(v));
+                cols.add(col);
             }
         });
         return R.ok(new RetData(cols, list));
@@ -92,4 +96,13 @@ public class PmService {
         indicators.forEach(t -> m.put(t.getIndicatorEn(), t.getIndicatorCn()));
         return m;
     }
+
+    /**
+     * 得到宽度
+     */
+    Integer getWidth(String s) {
+        int length = s.length();
+        int width = length * 15;
+        return Math.max(width, 200);
+    }
 }