Merge pull request #5175 in DESIGN/design from feature/x to release/11.0

* commit 'da16b83633e55ea5d093b6350cf4ce39953ed5b7':
  CHART-19555 注释掉暂时不用的属性
  KERNEL-7640 填报预览新前端适配第一波代码合并
  KERNEL-7640 填报预览新前端适配第一波代码合并

designer-base/src/main/java/com/fr/design/preview/NewWritePreview.java

@@ -0,0 +1,39 @@
+package com.fr.design.preview;
+
+import com.fr.design.fun.impl.AbstractPreviewProvider;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 新前端填报预览
+ * by abel 2021/07/08
+ */
+public class NewWritePreview extends AbstractPreviewProvider {
+    @Override
+    public String nameForPopupItem() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_New_Preview");
+    }
+
+    @Override
+    public String iconPathForPopupItem() {
+        return "com/fr/design/images/buttonicon/writes.png";
+    }
+
+    @Override
+    public String iconPathForLarge() {
+        return "com/fr/design/images/buttonicon/writeb24.png";
+    }
+
+    @Override
+    public int previewTypeCode() {
+        return 99;
+    }
+
+    @Override
+    public Map<String, Object> parametersForPreview() {
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("op", "write_new");
+        return map;
+    }
+}

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/LineMapCellDataFieldsPane.java

@@ -46,7 +46,7 @@ public class LineMapCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesV
     public void populateBean(LineMapColumnFieldCollection ob) {
         areaLngLatPane.populate(ob);
 
-        populateField(lineName, ob.getLineName());
+        //populateField(lineName, ob.getLineName());
 
         populateSeriesValuePane(ob);
     }
@@ -56,7 +56,7 @@ public class LineMapCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesV
         LineMapColumnFieldCollection fieldCollection = new LineMapColumnFieldCollection();
         areaLngLatPane.update(fieldCollection);
 
-        updateField(lineName, fieldCollection.getLineName());
+        //updateField(lineName, fieldCollection.getLineName());
 
         updateSeriesValuePane(fieldCollection);
         return fieldCollection;

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/LineMapDataSetFieldsPane.java

@@ -46,7 +46,7 @@ public class LineMapDataSetFieldsPane extends MapDataSetFieldsPane<LineMapColumn
     @Override
     public void populateBean(LineMapColumnFieldCollection ob) {
         areaLngLatPane.populate(ob);
-        populateField(lineName, ob.getLineName());
+        //populateField(lineName, ob.getLineName());
         populateSeriesValuePane(ob);
     }
 
@@ -54,7 +54,7 @@ public class LineMapDataSetFieldsPane extends MapDataSetFieldsPane<LineMapColumn
     public LineMapColumnFieldCollection updateBean() {
         LineMapColumnFieldCollection columnFieldCollection = new LineMapColumnFieldCollection();
         areaLngLatPane.update(columnFieldCollection);
-        updateField(lineName, columnFieldCollection.getLineName());
+        //updateField(lineName, columnFieldCollection.getLineName());
         updateSeriesValuePane(columnFieldCollection);
         return columnFieldCollection;
     }

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -55,6 +55,7 @@ import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.parameter.ParameterDefinitePane;
 import com.fr.design.parameter.ParameterInputPane;
 import com.fr.design.preview.MobilePreview;
+import com.fr.design.preview.NewWritePreview;
 import com.fr.design.preview.PagePreview;
 import com.fr.design.preview.ViewPreview;
 import com.fr.design.preview.WritePreview;
@@ -927,7 +928,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
     public PreviewProvider[] supportPreview() {
         PreviewProvider[] templatePreviews = super.supportPreview();
         return ArrayUtils.addAll(new PreviewProvider[]{
-                new PagePreview(), new WritePreview(), new ViewPreview(), new MobilePreview()
+                new PagePreview(), new WritePreview(), new ViewPreview(), new MobilePreview(), new NewWritePreview()
         }, templatePreviews);
     }