From 12a8f10b116dbab50d509ff5439e63f167062e92 Mon Sep 17 00:00:00 2001
From: fr_shine <zheng@finereport.com>
Date: Mon, 21 Nov 2016 15:06:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=85=AC=E5=BC=8F=E6=B2=A1=E6=9C=89335$?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/formula/TinyFormulaPane.java         | 6 +++++-
 .../gui/data/report/AbstractReportDataContentPane.java     | 7 ++++++-
 .../gui/data/report/CategoryPlotReportDataContentPane.java | 5 +++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/designer_base/src/com/fr/design/formula/TinyFormulaPane.java b/designer_base/src/com/fr/design/formula/TinyFormulaPane.java
index 16c897bc12..a7ea7b6cf9 100644
--- a/designer_base/src/com/fr/design/formula/TinyFormulaPane.java
+++ b/designer_base/src/com/fr/design/formula/TinyFormulaPane.java
@@ -56,7 +56,7 @@ public class TinyFormulaPane extends BasicBeanPane<String> implements UIObserver
 					@Override
 					public void doOk() {
 						Formula fm = formulaPane.update();
-						if (fm.getContent().length() <= 1) {
+						if (dealEmpty() && fm.getContent().length() <= 1) {
 							formulaTextField.setText("$$$");
 						} else {
 							formulaTextField.setText(fm.getContent());
@@ -69,6 +69,10 @@ public class TinyFormulaPane extends BasicBeanPane<String> implements UIObserver
 		initLayout();
 	}
 
+	protected boolean dealEmpty() {
+		return true;
+	}
+
 	protected void initLayout() {
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java
index 6754ca7965..dd24b450c0 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java
@@ -3,8 +3,8 @@ package com.fr.design.mainframe.chart.gui.data.report;
 import com.fr.base.Formula;
 import com.fr.base.Utils;
 import com.fr.chart.chartattr.ChartCollection;
-import com.fr.design.constants.UIConstants;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.frpane.UICorrelationPane;
@@ -155,6 +155,11 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane<ChartC
 						seriesPane.stopCellEditing();
 						seriesPane.fireTargetChanged();
 					}
+
+					@Override
+					protected boolean dealEmpty() {
+						return false;
+					}
 				};
 				editorComponent.setBackground(UIConstants.FLESH_BLUE);
 				
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java
index 8be2536775..9672d968f8 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java
@@ -56,6 +56,11 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
                 this.add(formulaTextFieldButton, BorderLayout.EAST);
             }
 
+            @Override
+            protected boolean dealEmpty() {
+                return false;
+            }
+
             public void okEvent() {
                 checkBoxUse();
             }