Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev

designer_base/src/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java

@@ -445,6 +445,14 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         return suffixList.toArray(new String[suffixList.size()]);
     }
 
+    private String getFileSuffixToString() {
+        String suffixToString = fileTypeComboBox.getSelectedItem().toString().toLowerCase();
+        if (suffixToString.equalsIgnoreCase("excel")) {
+            suffixToString = "xls";
+        }
+        return suffixToString;
+    }
+
     private ActionListener getFileTypeListener(final JPanel setPanel, final int width, final int height) {
         ActionListener fileTypeListener = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -458,7 +466,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 } else {
                     setPanel.add(textSetPanel(width,height), BorderLayout.NORTH);
                 }
-                String tipContent = Inter.getLocText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffix() + "<br>"
+                String tipContent = Inter.getLocText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffixToString() + "<br>"
                         + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp<br>" + "&nbsp</body> </html> ";
                 tips.setText(tipContent);
             }

designer_base/src/com/fr/design/formula/VariableResolverAdapter.java

@@ -29,7 +29,7 @@ public abstract class VariableResolverAdapter implements VariableResolver {
 				// 空值参数
 				"NULL", "NOFILTER",
 				// request变量
-				CalculatorProvider.REPORT_NAME, CalculatorProvider.SERVLET_URL, CalculatorProvider.SERVER_SCHEMA, CalculatorProvider.SERVER_NAME,
+				CalculatorProvider.REPORT_NAME, CalculatorProvider.FORMLET_NAME, CalculatorProvider.SERVLET_URL, CalculatorProvider.SERVER_SCHEMA, CalculatorProvider.SERVER_NAME,
 				CalculatorProvider.SERVER_PORT, CalculatorProvider.SERVER_URL, CalculatorProvider.CONTEXT_PATH, CalculatorProvider.SESSION_ID
 		};
 	}

designer_chart/src/com/fr/design/chart/series/PlotSeries/MapCustomPane.java

@@ -166,8 +166,13 @@ refreshAreaNameBox();
 		}
 		List<String> columnNameList = tableDataWrappe.calculateColumnNameList();
 
+		Object oldSelected = areaString.getSelectedItem();
 		areaString.removeAllItems();
-		areaString.setItemList(columnNameList);
+
+		for(String item : columnNameList) {
+			areaString.addItem(item);
+		}
+		areaString.getModel().setSelectedItem(oldSelected);
 	}
 
     /**

designer_chart/src/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java

@@ -1,28 +1,23 @@
 package com.fr.design.chart.series.SeriesCondition;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.text.Format;
-
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-
 import com.fr.chart.base.AttrContents;
 import com.fr.chart.base.ChartConstants;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.style.FormatPane;
 import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
-import com.fr.design.style.FormatPane;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.text.Format;
 
 /**
  * 数据点提示内容面板，包含系列值、系列百分比
@@ -58,7 +53,7 @@ public class TooltipContentsPane extends BasicPane{
 
 	protected JPanel createJPanel4Value() {
 		if (showValueCB == null) {
-			showValueCB = new UICheckBox(Inter.getLocText("Value"));
+			showValueCB = new UICheckBox(getValueString());
 		}
 		showValueCB.setSelected(true);
 
@@ -75,7 +70,9 @@ public class TooltipContentsPane extends BasicPane{
 		return valuePane;
 	}
 
-
+	protected String getValueString() {
+		return Inter.getLocText("Value");
+	}
 
 	protected Component[] createComponents4PercentValue() {
 		if (showPercent == null) {

designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java

@@ -1,12 +1,5 @@
 package com.fr.design.chart.series.SeriesCondition.dlp;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JPanel;
-
 import com.fr.base.Utils;
 import com.fr.chart.base.AttrContents;
 import com.fr.chart.base.ChartConstants;
@@ -21,6 +14,9 @@ import com.fr.general.Inter;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
+import javax.swing.*;
+import java.awt.*;
+
 /**
  * Created by IntelliJ IDEA.
  * Author : Richer
@@ -80,11 +76,14 @@ public class DataLabelPane extends TooltipContentsPane {
 
     protected Component[] createComponents4ShowCategoryName() {
         if (showCategoryNameCB == null) {
-            showCategoryNameCB = new UICheckBox(Inter.getLocText(new String[]{"StyleFormat-Category", "WF-Name"}));
+            showCategoryNameCB = new UICheckBox(getCategoryString());
         }
         return new Component[]{null, showCategoryNameCB};
     }
 
+    protected String getCategoryString(){
+        return Inter.getLocText(new String[]{"StyleFormat-Category", "WF-Name"});
+    }
    
 
     protected Component[] createComponents4ShowGuidLine() {

designer_chart/src/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java

@@ -1,6 +1,9 @@
 package com.fr.design.chart.series.SeriesCondition.dlp;
 
+import com.fr.general.Inter;
+
 import javax.swing.*;
+import java.awt.*;
 
 
 /**
@@ -13,6 +16,21 @@ import javax.swing.*;
  */
 public class MapDataLabelPane extends DataLabelPane {
 
+    @Override
+    protected Component[] createComponents4ShowSeriesName() {
+        return new Component[0];
+    }
+
+    @Override
+    protected String getCategoryString() {
+        return Inter.getLocText("FR-Chart-Area_Name");
+    }
+
+    @Override
+    protected String getValueString() {
+        return Inter.getLocText("FR-Chart-Area_Value");
+    }
+
     protected JPanel createJPanel4Position() {
         return null;
     }