Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPSubServiceImpl.java

@@ -71,6 +71,7 @@ public class DPSubServiceImpl {
         Long formSeq = tab.getLong("formSeq");
         Object resultConvert = JsonValueUtils.getValueByKey(tab, "dataConfig", "dataConfig.resultConvert");
         Object api = JsonValueUtils.getValueByKey(tab, "dataConfig", "dataConfig.api");
+        Object columnWidth = JsonValueUtils.getValueByKey(tab, "dataConfig", "dataConfig.columnWidth");
 
         JSONObject map = content.getJSONObject(tab.getString("key"));
         JSONObject apiResult = new JSONObject();
@@ -107,7 +108,15 @@ public class DPSubServiceImpl {
                     this.buildSubFormData(map, i, yObj, apiResult);
                 } else if("formTable".equals(yObj.get("componentKey"))){
                     map = new JSONObject();
-                    map.put("columns", JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.modelTableColumns"));
+                    JSONArray columns = (JSONArray) JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.modelTableColumns");
+                    JSONObject columnWidthMap = (JSONObject) columnWidth;
+                    columns.stream().forEach(x -> {
+                        JSONObject xObj = (JSONObject) x;
+                        if (!ValidationUtil.isEmpty(columnWidthMap.get(xObj.get("dataIndex")))){
+                            xObj.put("width", columnWidthMap.get(xObj.get("dataIndex")));
+                        }
+                    });
+                    map.put("columns", columns);
                     map.put("dataList", apiResult);
                     map.put("showPage", true);
                     map.put("api", api);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/company.json

@@ -31,6 +31,16 @@
             "size": 14,
             "USE_UNIT_CREDIT_CODE": "{useUnitCode}"
           }
+        },
+        "columnWidth": {
+          "EQU_LIST": 150,
+          "EQU_CATEGORY": 160,
+          "EQU_DEFINE": 150,
+          "PRODUCT_NAME": 180,
+          "EQU_CODE": 180,
+          "FACTORY_NUM": 180,
+          "PRODUCE_UNIT_NAME": 180,
+          "USE_UNIT_NAME": 180
         }
       }
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_1000.json

@@ -70,6 +70,9 @@
             "size": 10,
             "record": "{record}"
           }
+        },
+        "columnWidth": {
+
         }
       }
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_2000.json

@@ -70,6 +70,9 @@
             "size": 10,
             "record": "{record}"
           }
+        },
+        "columnWidth": {
+
         }
       }
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_3000.json

@@ -70,6 +70,9 @@
             "size": 10,
             "record": "{record}"
           }
+        },
+        "columnWidth": {
+
         }
       }
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_4000.json

@@ -70,6 +70,9 @@
             "size": 10,
             "record": "{record}"
           }
+        },
+        "columnWidth": {
+
         }
       }
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_5000.json

@@ -70,6 +70,9 @@
             "size": 10,
             "record": "{record}"
           }
+        },
+        "columnWidth": {
+
         }
       }
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_6000.json

@@ -70,6 +70,9 @@
             "size": 10,
             "record": "{record}"
           }
+        },
+        "columnWidth": {
+
         }
       }
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_8000.json

@@ -70,6 +70,9 @@
             "size": 10,
             "record": "{record}"
           }
+        },
+        "columnWidth": {
+
         }
       }
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_9000.json

@@ -70,6 +70,9 @@
             "size": 10,
             "record": "{record}"
           }
+        },
+        "columnWidth": {
+
         }
       }
     }