From a4a8d4eb17dd7a7ca8f9ce3449eed0a62bccd5b2 Mon Sep 17 00:00:00 2001
From: zheng <zheng@finereport.com>
Date: Tue, 22 Jan 2019 22:21:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?CHART-2809=20=E5=A4=A7=E5=B1=8F=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=92=AD=E6=94=BE=20design?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hyperlink/AbstractHyperLinkPane.java      | 38 ++++++++++++++++++
 .../impl/ChartHyperRelateCellLinkPane.java    | 36 +++++++++++++++--
 .../impl/ChartHyperRelateFloatLinkPane.java   | 35 ++++++++++++++--
 .../impl/FormHyperlinkNorthPane.java          |  3 +-
 .../impl/FormHyperlinkPane.java               | 40 +++++++++++++++++--
 5 files changed, 140 insertions(+), 12 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperLinkPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperLinkPane.java
index bdd46a9ec..7344288d6 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperLinkPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperLinkPane.java
@@ -4,9 +4,15 @@ import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.editor.ValueEditorPane;
 import com.fr.design.editor.ValueEditorPaneFactory;
 import com.fr.design.gui.frpane.ReportletParameterViewPane;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itableeditorpane.ParameterTableModel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.js.JavaScript;
+import com.fr.js.LinkAnimateType;
 
+import javax.swing.JPanel;
 import java.util.HashMap;
 
 /**
@@ -16,6 +22,7 @@ public abstract class AbstractHyperLinkPane<T> extends FurtherBasicBeanPane<T> {
     private HashMap hyperLinkEditorMap;
     private boolean needRenamePane = false;
     protected ReportletParameterViewPane parameterViewPane;
+    private UIButtonGroup<LinkAnimateType> animateTypeUIButtonGroup;
 
 
     public AbstractHyperLinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) {
@@ -41,6 +48,37 @@ public abstract class AbstractHyperLinkPane<T> extends FurtherBasicBeanPane<T> {
     public void reset() {
     }
 
+    protected boolean needAnimatePane() {
+        return false;
+    }
+
+    protected JPanel createAnimateTypeUIButtonGroup() {
+        animateTypeUIButtonGroup = new UIButtonGroup<LinkAnimateType>(
+                new String[]{LinkAnimateType.RELOAD.toLocaleString(), LinkAnimateType.INCREMENT.toLocaleString()},
+                new LinkAnimateType[]{LinkAnimateType.RELOAD, LinkAnimateType.INCREMENT});
+
+        animateTypeUIButtonGroup.setSelectedIndex(0);
+        JPanel jp = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
+
+        jp.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Link_Animate_Type")));
+        jp.add(animateTypeUIButtonGroup);
+
+        return jp;
+    }
+
+    protected void populateAnimateType(LinkAnimateType animateType) {
+        if (animateTypeUIButtonGroup != null && animateType != LinkAnimateType.NONE) {
+            animateTypeUIButtonGroup.setSelectedItem(animateType);
+        }
+    }
+
+    protected LinkAnimateType updateAnimateType() {
+        if (animateTypeUIButtonGroup != null) {
+            return animateTypeUIButtonGroup.getSelectedItem();
+        }
+        return LinkAnimateType.NONE;
+    }
+
     protected int getChartParaType() {
         return hyperLinkEditorMap != null ? ParameterTableModel.CHART_NORMAL_USE : ParameterTableModel.NO_CHART_USE;
     }
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
index 897aef8f7..c69a4660f 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
@@ -8,12 +8,12 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.hyperlink.AbstractHyperLinkPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
-
 import com.fr.stable.ColumnRow;
 import com.fr.stable.ParameterProvider;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.util.HashMap;
 import java.util.List;
 
@@ -53,6 +53,10 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
         colRowPane = new ColumnRowVerticalPane();
         centerPane.add(colRowPane, BorderLayout.NORTH);
 
+        if (needAnimatePane()) {
+            centerPane.add(createAnimateTypeUIButtonGroup(), BorderLayout.CENTER);
+        }
+
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
         parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
         parameterViewPane.setPreferredSize(new Dimension(500, 200));
@@ -74,6 +78,8 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
             colRowPane.populate(ColumnRow.valueOf("A1"));
         }
 
+        populateAnimateType(ob.getAnimateType());
+
         List parameterList = this.parameterViewPane.update();
         parameterList.clear();
 
@@ -88,6 +94,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
         if (itemNameTextField != null) {
             chartLink.setItemName(this.itemNameTextField.getText());
         }
+        chartLink.setAnimateType(updateAnimateType());
         return chartLink;
     }
 
@@ -117,9 +124,32 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
     }
 
     public static class ChartNoRename extends ChartHyperRelateCellLinkPane {
+        public ChartNoRename() {
+            super();
+        }
+
+        public ChartNoRename(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+            super(hyperLinkEditorMap, needRenamePane);
+        }
+
         protected boolean needRenamePane() {
             return false;
         }
     }
 
+    public static class ChartHasAnimateType extends ChartNoRename {
+
+        public ChartHasAnimateType() {
+            super();
+        }
+
+        public ChartHasAnimateType(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+            super(hyperLinkEditorMap, needRenamePane);
+        }
+
+        protected boolean needAnimatePane() {
+            return true;
+        }
+    }
+
 }
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
index cc26b2509..89da9e2d5 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
@@ -11,14 +11,16 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.hyperlink.AbstractHyperLinkPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
-
 import com.fr.stable.ParameterProvider;
 
-import javax.swing.*;
+import javax.swing.JPanel;
 import javax.swing.border.Border;
 import javax.swing.border.LineBorder;
 import javax.swing.border.TitledBorder;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -69,6 +71,9 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
         centerPane.setBorder(border);
 
         centerPane.add(pane, BorderLayout.NORTH);
+        if (needAnimatePane()) {
+            centerPane.add(createAnimateTypeUIButtonGroup(), BorderLayout.CENTER);
+        }
 
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
         parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
@@ -105,6 +110,8 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
             floatNameBox.setSelectedItem(ob.getRelateCCName());
         }
 
+        populateAnimateType(ob.getAnimateType());
+
         List parameterList = this.parameterViewPane.update();
         parameterList.clear();
 
@@ -119,6 +126,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
         if (itemNameTextField != null) {
             chartLink.setItemName(this.itemNameTextField.getText());
         }
+        chartLink.setAnimateType(updateAnimateType());
         return chartLink;
     }
 
@@ -148,8 +156,29 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
     }
 
     public static class ChartNoRename extends ChartHyperRelateFloatLinkPane {
+        public ChartNoRename() {
+        }
+
+        public ChartNoRename(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+            super(hyperLinkEditorMap, needRenamePane);
+        }
+
         protected boolean needRenamePane() {
             return false;
         }
     }
+
+    public static class ChartHasAnimateType extends ChartNoRename {
+        public ChartHasAnimateType() {
+        }
+
+        public ChartHasAnimateType(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+            super(hyperLinkEditorMap, needRenamePane);
+        }
+
+        @Override
+        protected boolean needAnimatePane() {
+            return true;
+        }
+    }
 }
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java
index 5159e318c..bf357f32a 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java
@@ -11,7 +11,6 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.form.ui.Widget;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.js.FormHyperlinkProvider;
 import com.fr.stable.bridge.StableFactory;
 
@@ -51,7 +50,7 @@ public class FormHyperlinkNorthPane extends BasicBeanPane<FormHyperlinkProvider>
         targetFrameComboBox = formHyperlinkEditors == null ? new UIComboBox() : new UIComboBox(getFormHyperlinkEditNames());
         targetFrameComboBox.setRenderer(new DefaultListCellRenderer());
         double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p, p};
+        double[] rowSize = {p, p};
         double[] columnSize = {p, TableLayout.FILL};
         Component[][] components;
         if (!this.needRenamePane) {
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
index a9e209fc3..f93e3c20e 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
@@ -7,13 +7,13 @@ import com.fr.design.hyperlink.AbstractHyperLinkPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.ui.ElementCaseEditorProvider;
-
 import com.fr.js.FormHyperlinkProvider;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.bridge.StableFactory;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
 import java.util.HashMap;
 
 public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvider> {
@@ -35,7 +35,15 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH));
         northPane = new FormHyperlinkNorthPane(needRenamePane());
-        this.add(northPane, BorderLayout.NORTH);
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.add(northPane, BorderLayout.NORTH);
+        if (needAnimatePane()) {
+            JPanel animatePane = createAnimateTypeUIButtonGroup();
+            animatePane.setBorder(BorderFactory.createEmptyBorder(0, 8, 10, 10));
+            panel.add(animatePane, BorderLayout.CENTER);
+        }
+
+        this.add(panel, BorderLayout.NORTH);
 
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
         this.add(parameterViewPane, BorderLayout.CENTER);
@@ -63,6 +71,7 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
 
         ParameterProvider[] parameters = formHyperlink.getParameters();
         parameterViewPane.populate(parameters);
+        populateAnimateType(formHyperlink.getAnimateType());
     }
 
     @Override
@@ -71,6 +80,8 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
         formHyperlink.setType(getHyperlinkType());
         updateBean(formHyperlink);
 
+        formHyperlink.setAnimateType(updateAnimateType());
+
         return formHyperlink;
     }
 
@@ -91,6 +102,13 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
     }
 
     public static class ChartNoRename extends FormHyperlinkPane {
+        public ChartNoRename(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+            super(hyperLinkEditorMap, needRenamePane);
+        }
+
+        public ChartNoRename() {
+        }
+
         protected boolean needRenamePane() {
             return false;
         }
@@ -99,4 +117,18 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
             return ParameterTableModel.CHART_NORMAL_USE;
         }
     }
+
+    public static class ChartHasAnimateType extends ChartNoRename {
+        public ChartHasAnimateType(HashMap hyperLinkEditorMap, boolean needRenamePane) {
+            super(hyperLinkEditorMap, needRenamePane);
+        }
+
+        public ChartHasAnimateType() {
+        }
+
+        @Override
+        protected boolean needAnimatePane() {
+            return true;
+        }
+    }
 }

From efa104c72279208002411e0ff6010d7eb5042af3 Mon Sep 17 00:00:00 2001
From: zheng <zheng@finereport.com>
Date: Thu, 24 Jan 2019 10:41:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hyperlink/AbstractHyperLinkPane.java      |  4 ---
 .../impl/ChartHyperRelateCellLinkPane.java    | 28 ++++++++++++-----
 .../impl/ChartHyperRelateFloatLinkPane.java   | 26 +++++++++++-----
 .../impl/FormHyperlinkPane.java               | 31 ++++++++++++-------
 4 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperLinkPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperLinkPane.java
index 7344288d6..757596f79 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperLinkPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperLinkPane.java
@@ -48,10 +48,6 @@ public abstract class AbstractHyperLinkPane<T> extends FurtherBasicBeanPane<T> {
     public void reset() {
     }
 
-    protected boolean needAnimatePane() {
-        return false;
-    }
-
     protected JPanel createAnimateTypeUIButtonGroup() {
         animateTypeUIButtonGroup = new UIButtonGroup<LinkAnimateType>(
                 new String[]{LinkAnimateType.RELOAD.toLocaleString(), LinkAnimateType.INCREMENT.toLocaleString()},
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
index c69a4660f..185f77615 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
@@ -53,9 +53,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
         colRowPane = new ColumnRowVerticalPane();
         centerPane.add(colRowPane, BorderLayout.NORTH);
 
-        if (needAnimatePane()) {
-            centerPane.add(createAnimateTypeUIButtonGroup(), BorderLayout.CENTER);
-        }
+        addPaneInCenter(centerPane);
 
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
         parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
@@ -63,6 +61,10 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
         this.add(parameterViewPane, BorderLayout.SOUTH);
     }
 
+    protected void addPaneInCenter(JPanel centerPane) {
+
+    }
+
     @Override
     public void populateBean(ChartHyperRelateCellLink ob) {
         if (ob == null) {
@@ -78,8 +80,6 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
             colRowPane.populate(ColumnRow.valueOf("A1"));
         }
 
-        populateAnimateType(ob.getAnimateType());
-
         List parameterList = this.parameterViewPane.update();
         parameterList.clear();
 
@@ -94,7 +94,6 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
         if (itemNameTextField != null) {
             chartLink.setItemName(this.itemNameTextField.getText());
         }
-        chartLink.setAnimateType(updateAnimateType());
         return chartLink;
     }
 
@@ -147,8 +146,21 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
             super(hyperLinkEditorMap, needRenamePane);
         }
 
-        protected boolean needAnimatePane() {
-            return true;
+        @Override
+        protected void addPaneInCenter(JPanel centerPane) {
+            centerPane.add(createAnimateTypeUIButtonGroup(), BorderLayout.CENTER);
+        }
+
+        @Override
+        public void populateBean(ChartHyperRelateCellLink ob) {
+            super.populateBean(ob);
+            populateAnimateType(ob.getAnimateType());
+        }
+
+        @Override
+        public void updateBean(ChartHyperRelateCellLink chartLink) {
+            super.updateBean(chartLink);
+            chartLink.setAnimateType(updateAnimateType());
         }
     }
 
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
index 89da9e2d5..96b157f10 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
@@ -71,9 +71,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
         centerPane.setBorder(border);
 
         centerPane.add(pane, BorderLayout.NORTH);
-        if (needAnimatePane()) {
-            centerPane.add(createAnimateTypeUIButtonGroup(), BorderLayout.CENTER);
-        }
+        addPaneInCenter(centerPane);
 
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
         parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
@@ -81,6 +79,9 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
         this.add(parameterViewPane, BorderLayout.SOUTH);
     }
 
+    protected void addPaneInCenter(JPanel centerPane) {
+    }
+
     private String[] getFloatNames() {
         DesignModelAdapter adapter = DesignModelAdapter.getCurrentModelAdapter();
         if (adapter != null) {
@@ -110,8 +111,6 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
             floatNameBox.setSelectedItem(ob.getRelateCCName());
         }
 
-        populateAnimateType(ob.getAnimateType());
-
         List parameterList = this.parameterViewPane.update();
         parameterList.clear();
 
@@ -126,7 +125,6 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
         if (itemNameTextField != null) {
             chartLink.setItemName(this.itemNameTextField.getText());
         }
-        chartLink.setAnimateType(updateAnimateType());
         return chartLink;
     }
 
@@ -177,8 +175,20 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
         }
 
         @Override
-        protected boolean needAnimatePane() {
-            return true;
+        protected void addPaneInCenter(JPanel centerPane) {
+            centerPane.add(createAnimateTypeUIButtonGroup(), BorderLayout.CENTER);
+        }
+
+        @Override
+        public void populateBean(ChartHyperRelateFloatLink ob) {
+            super.populateBean(ob);
+            populateAnimateType(ob.getAnimateType());
+        }
+
+        @Override
+        public void updateBean(ChartHyperRelateFloatLink chartLink) {
+            super.updateBean(chartLink);
+            chartLink.setAnimateType(updateAnimateType());
         }
     }
 }
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
index f93e3c20e..71f65eeb2 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
@@ -37,11 +37,7 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
         northPane = new FormHyperlinkNorthPane(needRenamePane());
         JPanel panel = new JPanel(new BorderLayout());
         panel.add(northPane, BorderLayout.NORTH);
-        if (needAnimatePane()) {
-            JPanel animatePane = createAnimateTypeUIButtonGroup();
-            animatePane.setBorder(BorderFactory.createEmptyBorder(0, 8, 10, 10));
-            panel.add(animatePane, BorderLayout.CENTER);
-        }
+        addPaneInNorth(panel);
 
         this.add(panel, BorderLayout.NORTH);
 
@@ -50,6 +46,9 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
         parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters"), null));
     }
 
+    protected void addPaneInNorth(JPanel northPane) {
+    }
+
     @Override
     public String title4PopupWindow() {
         return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Form_Link");
@@ -71,7 +70,6 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
 
         ParameterProvider[] parameters = formHyperlink.getParameters();
         parameterViewPane.populate(parameters);
-        populateAnimateType(formHyperlink.getAnimateType());
     }
 
     @Override
@@ -79,9 +77,6 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
         FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class);
         formHyperlink.setType(getHyperlinkType());
         updateBean(formHyperlink);
-
-        formHyperlink.setAnimateType(updateAnimateType());
-
         return formHyperlink;
     }
 
@@ -127,8 +122,22 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
         }
 
         @Override
-        protected boolean needAnimatePane() {
-            return true;
+        protected void addPaneInNorth(JPanel northPane) {
+            JPanel animatePane = createAnimateTypeUIButtonGroup();
+            animatePane.setBorder(BorderFactory.createEmptyBorder(0, 8, 10, 10));
+            northPane.add(animatePane, BorderLayout.CENTER);
+        }
+
+        @Override
+        public void populateBean(FormHyperlinkProvider formHyperlink) {
+            super.populateBean(formHyperlink);
+            populateAnimateType(formHyperlink.getAnimateType());
+        }
+
+        @Override
+        public void updateBean(FormHyperlinkProvider formHyperlink) {
+            super.updateBean(formHyperlink);
+            formHyperlink.setAnimateType(updateAnimateType());
         }
     }
 }

From a84074730377908b1ef6dd25bfb5154774649a49 Mon Sep 17 00:00:00 2001
From: zheng <zheng@finereport.com>
Date: Thu, 24 Jan 2019 10:47:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SeriesCondition/impl/FormHyperlinkPane.java | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
index 71f65eeb2..f815094c3 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
@@ -35,18 +35,16 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH));
         northPane = new FormHyperlinkNorthPane(needRenamePane());
-        JPanel panel = new JPanel(new BorderLayout());
-        panel.add(northPane, BorderLayout.NORTH);
-        addPaneInNorth(panel);
 
-        this.add(panel, BorderLayout.NORTH);
+        addNorthPane(northPane);
 
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
         this.add(parameterViewPane, BorderLayout.CENTER);
         parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters"), null));
     }
 
-    protected void addPaneInNorth(JPanel northPane) {
+    protected void addNorthPane(JPanel northPane) {
+        this.add(northPane, BorderLayout.NORTH);
     }
 
     @Override
@@ -122,10 +120,15 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
         }
 
         @Override
-        protected void addPaneInNorth(JPanel northPane) {
+        protected void addNorthPane(JPanel northPane) {
+            JPanel panel = new JPanel(new BorderLayout());
+            panel.add(northPane, BorderLayout.NORTH);
+
             JPanel animatePane = createAnimateTypeUIButtonGroup();
             animatePane.setBorder(BorderFactory.createEmptyBorder(0, 8, 10, 10));
-            northPane.add(animatePane, BorderLayout.CENTER);
+            panel.add(animatePane, BorderLayout.CENTER);
+
+            this.add(panel, BorderLayout.NORTH);
         }
 
         @Override