Merging in latest from upstream (BA/design:refs/heads/dev)

* commit 'd17ed6f4333040b57a44827be9336a29ed992ffb':
  超链悬浮窗图表不支持单元格数据源

designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -153,7 +153,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
                 paneList.add(otherPane);
                 this.isDefaultPane = true;
             }else{
-                ChartDataPane chartDataPane = ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener);
+                ChartDataPane chartDataPane = createChartDataPane(plotID);
                 paneList.add(chartDataPane);
                 AbstractChartAttrPane[] otherPaneList = ChartTypeInterfaceManager.getInstance().getAttrPaneArray(plotID, listener);
                 for(int i = 0; i < otherPaneList.length; i++){
@@ -167,6 +167,10 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
         }
     }
 
+    protected ChartDataPane createChartDataPane(String plotID) {
+        return ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener);
+    }
+
     protected void addTypePane() {
         paneList.add(typePane);
     }

designer_chart/src/com/fr/design/mainframe/chart/ChartHyperEditPane.java

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.chart;
 
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.web.ChartHyperPoplink;
+import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.chart.gui.ChartComponent;
 import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperPopAttrPane;
 import com.fr.design.editor.ValueEditorPane;
@@ -38,6 +39,12 @@ public class ChartHyperEditPane  extends ChartEditPane {
 		createTabsPane();
 	}
 
+	@Override
+	protected ChartDataPane createChartDataPane(String plotID) {
+		ChartDataPane dataPane = ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener);
+		dataPane.setSupportCellData(false);
+		return dataPane;
+	}
 
     protected void addTypePane() {
         paneList.add(attrPane);

designer_chart/src/com/fr/design/mainframe/chart/gui/ChartDataPane.java

@@ -1,20 +1,19 @@
 package com.fr.design.mainframe.chart.gui;
 
-import java.awt.BorderLayout;
-
-import javax.swing.JPanel;
-
-import com.fr.design.chart.report.GisMapDataPane;
-import com.fr.design.chart.report.MapDataPane;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.GisMapPlot;
 import com.fr.chart.chartattr.MapPlot;
+import com.fr.design.chart.report.GisMapDataPane;
+import com.fr.design.chart.report.MapDataPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.data.DataContentsPane;
 import com.fr.design.mainframe.chart.gui.data.NormalChartDataPane;
 
+import javax.swing.*;
+import java.awt.*;
+
 public class ChartDataPane extends AbstractChartAttrPane {
 	
 	protected DataContentsPane contentsPane;
@@ -68,12 +67,19 @@ public class ChartDataPane extends AbstractChartAttrPane {
 			contentsPane.setSupportCellData(supportCellData);
 		}
 	}
-	
+
+	public boolean isSupportCellData() {
+		return supportCellData;
+	}
+
 	/**
 	 * 设置数据界面是否支持单元格
 	 */
 	public void setSupportCellData(boolean supportCellData) {
 		this.supportCellData = supportCellData;
+		if(contentsPane != null) {
+			contentsPane.setSupportCellData(supportCellData);
+		}
 	}
 	
 	/**