页面修改 2222

topsun-xt/src/main/webapp/biz/topsun/common/listeningFromData.js

@@ -54,6 +54,10 @@ function mapping(dataMapping, rawData) {
                 return;
             }
             let listMap = {}, ids = [], rowId = ''; //tryForEach 变量作用域注意
+            if(!entityData instanceof Array) {
+                console.error("映射配置的是 Grid， 传入数据类型是 Form。 请检查： " + beanName);
+                return;
+            }
             entityData.forEach(rowData => {
                 rowId = rowData[propertyNames.id];
                 rowData['rowIndex'] = rowId;

topsun-xt/src/main/webapp/biz/topsun/product/productDetail.js

@@ -162,7 +162,7 @@ var dataMapping = {
         "modulus" , "columnNum", "rowNum", "contactNum", "columnDoubleBlade", "rowDoubleBlade"
         , "dispatchMultiple", "sheetLength", "sheetWidth", "productSheetConf"
     ],
-    frontFace: {
+    frontFaces: {
         id: "productFaceId",
         columns: [ "productFaceId", "productImage" ]
     },
@@ -211,7 +211,7 @@ function faceGrid(elId, data) {
         checkbox: true,
         usePager: false,
         width: "98%",
-        height: "100%",
+        height: "98%",
         onBeforeEdit : function(editParm, gg) {
             console.log('original run onBeforeEdit()');
         },

topsun/src/main/java/com/huigou/topsun/product/application/impl/ProductApplicationImpl.java

@@ -105,11 +105,12 @@ public class ProductApplicationImpl implements ProductApplication {
 
         // ---------------------------------  版面查询 ---------------------------------
         if(productDetail != null) {
+            ArrayList<ProductFace> frontFaces = new ArrayList<>();
             if(productDetail.getBackProductFaceId() != null) {
                 ProductFace frontFace = faceRepository.findByProductFaceId(productDetail.getBackProductFaceId());
                 ArrayList <ProductFaceColor> fronColors =
                         (ArrayList<ProductFaceColor>) faceColorRepository.findByProductFaceId(productDetail.getBackProductFaceId());
-                assemble.put("frontFace", frontFace);
+                frontFaces.add(frontFace);
                 assemble.put("fronColors", fronColors == null ? new ArrayList<>() : fronColors);
             } else {
                 ProductFaceColor fc = new ProductFaceColor();
@@ -123,7 +124,7 @@ public class ProductApplicationImpl implements ProductApplication {
                 ProductFace backFace = faceRepository.findByProductFaceId(productDetail.getBackProductFaceId());
                 ArrayList <ProductFaceColor> backColors =
                         (ArrayList<ProductFaceColor>) faceColorRepository.findByProductFaceId(productDetail.getBackProductFaceId());
-                assemble.put("backFace", backFace);
+                frontFaces.add(backFace);
                 assemble.put("backColors", backColors == null ? new ArrayList<>() : backColors);
             } else {
                 ProductFaceColor fc = new ProductFaceColor();
@@ -133,6 +134,7 @@ public class ProductApplicationImpl implements ProductApplication {
                 fronColors.add(fc);
                 assemble.put("backColors", fronColors);
             }
+            assemble.put("frontFaces", frontFaces);
 
         }