From 08ced72db2c529473ed8e7735c2871a9130d3ef7 Mon Sep 17 00:00:00 2001 From: abel Date: Sun, 18 Jul 2021 22:21:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?KERNEL-7640=20=E5=A1=AB=E6=8A=A5=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=96=B0=E5=89=8D=E7=AB=AF=E9=80=82=E9=85=8D=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=B3=A2=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/preview/NewWritePreview.java | 39 +++++++++++++++++++ .../com/fr/design/mainframe/JWorkBook.java | 3 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 designer-base/src/main/java/com/fr/design/preview/NewWritePreview.java diff --git a/designer-base/src/main/java/com/fr/design/preview/NewWritePreview.java b/designer-base/src/main/java/com/fr/design/preview/NewWritePreview.java new file mode 100644 index 000000000..61f293a70 --- /dev/null +++ b/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 parametersForPreview() { + Map map = new HashMap(); + map.put("op", "write_new"); + return map; + } +} diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java index ecb813e09..64996c26c 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java +++ b/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.PagePlusPreview; import com.fr.design.preview.PagePreview; import com.fr.design.preview.ViewPreview; @@ -927,7 +928,7 @@ public class JWorkBook extends JTemplate { public PreviewProvider[] supportPreview() { PreviewProvider[] templatePreviews = super.supportPreview(); return ArrayUtils.addAll(new PreviewProvider[]{ - new PagePreview(), new WritePreview(), new ViewPreview(), new MobilePreview(), new PagePlusPreview() + new PagePreview(), new WritePreview(), new ViewPreview(), new MobilePreview(), new PagePlusPreview(),new NewWritePreview() }, templatePreviews); } From 5965c73d7dbdc22110f74cccb223e9d1d5b032f0 Mon Sep 17 00:00:00 2001 From: abel Date: Sun, 18 Jul 2021 22:32:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?KERNEL-7640=20=E5=A1=AB=E6=8A=A5=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=96=B0=E5=89=8D=E7=AB=AF=E9=80=82=E9=85=8D=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=B3=A2=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/preview/NewWritePreview.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/preview/NewWritePreview.java b/designer-base/src/main/java/com/fr/design/preview/NewWritePreview.java index 61f293a70..8c7e408ff 100644 --- a/designer-base/src/main/java/com/fr/design/preview/NewWritePreview.java +++ b/designer-base/src/main/java/com/fr/design/preview/NewWritePreview.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; /** - * * 填报新前端预览 + * 鏂板墠绔～鎶ラ瑙 * by abel 2021/07/08 */ public class NewWritePreview extends AbstractPreviewProvider { From 43736246f8c24f07f5421136b8e04e82718c0dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Thu, 29 Jul 2021 16:30:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=09CHART-19555=20=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=8E=89=E6=9A=82=E6=97=B6=E4=B8=8D=E7=94=A8=E7=9A=84=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/chartx/fields/diff/LineMapCellDataFieldsPane.java | 4 ++-- .../design/chartx/fields/diff/LineMapDataSetFieldsPane.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/LineMapCellDataFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/LineMapCellDataFieldsPane.java index 7a321f0be..5b800e0db 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/LineMapCellDataFieldsPane.java +++ b/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; diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/LineMapDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/LineMapDataSetFieldsPane.java index b1a058783..fe8399904 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/LineMapDataSetFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/LineMapDataSetFieldsPane.java @@ -46,7 +46,7 @@ public class LineMapDataSetFieldsPane extends MapDataSetFieldsPane