Merge branch 'release'

# Conflicts:
#	designer_base/src/com/fr/design/locale/designer.properties
#	designer_base/src/com/fr/design/locale/designer_en_US.properties
#	designer_base/src/com/fr/design/locale/designer_ja_JP.properties
#	designer_base/src/com/fr/design/locale/designer_ko_KR.properties
#	designer_base/src/com/fr/design/locale/designer_zh_CN.properties
#	designer_base/src/com/fr/design/locale/designer_zh_TW.properties
#	designer_base/src/com/fr/start/BaseDesigner.java
#	designer_chart/src/com/fr/design/mainframe/chart/ChartsConfigPane.java

designer/src/com/fr/design/report/ReportBackgroundPane.java

@@ -2,6 +2,8 @@ package com.fr.design.report;
 
 import java.awt.BorderLayout;
 
+import javax.swing.JPanel;
+
 import com.fr.page.ReportSettingsProvider;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -11,6 +13,7 @@ import com.fr.design.style.background.BackgroundPane;
 
 public class ReportBackgroundPane extends BasicPane {
 	private UICheckBox isPrintBackgroundCheckBox;
+    private UICheckBox isExportBackgroundCheckBox;
     private BackgroundPane backgroundPane;
 
     public ReportBackgroundPane() {
@@ -19,8 +22,13 @@ public class ReportBackgroundPane extends BasicPane {
         backgroundPane = new BackgroundPane();
         this.add(backgroundPane, BorderLayout.CENTER);
 
-        isPrintBackgroundCheckBox = new UICheckBox(
+        isPrintBackgroundCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Print_Background"));
-                Inter.getLocText("ReportGUI-Print_Background"));
+        isExportBackgroundCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Export_Background"));
+        JPanel sourth = new JPanel();
+        sourth.add(isExportBackgroundCheckBox);
+        sourth.add(isPrintBackgroundCheckBox);
+        this.add(sourth, BorderLayout.SOUTH);
+        
         this.add(isPrintBackgroundCheckBox, BorderLayout.SOUTH);
     }
     
@@ -35,6 +43,7 @@ public class ReportBackgroundPane extends BasicPane {
     public void populate(ReportSettingsProvider reportSettings) {
         this.backgroundPane.populate(reportSettings.getBackground());
         this.isPrintBackgroundCheckBox.setSelected(reportSettings.isPrintBackground());
+        this.isExportBackgroundCheckBox.setSelected(reportSettings.isExportBackground());
     }
 
     /**
@@ -43,5 +52,6 @@ public class ReportBackgroundPane extends BasicPane {
     public void update(ReportSettingsProvider reportSettings) {
         reportSettings.setBackground(this.backgroundPane.update());
         reportSettings.setPrintBackground(this.isPrintBackgroundCheckBox.isSelected());
+        reportSettings.setExportBackground(this.isExportBackgroundCheckBox.isSelected());
     }
 }

designer/src/com/fr/design/webattr/WriteWebSettingPane.java

@@ -56,7 +56,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
         //sheet标签页显示位置
         topRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Top"));
         bottomRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Bottom"));
-        sheetShowLocationLabel = new UILabel("sheet" + Inter.getLocText(new String[]{"Label", "Page_Number", "Display position"}) + ":", UILabel.LEFT);
+        sheetShowLocationLabel = new UILabel(Inter.getLocText("FR-Designer_Sheet_Label_Page_Display_Position"), UILabel.LEFT);
         ButtonGroup buttonGroup = new ButtonGroup();
         bottomRadioButton.setSelected(true);
         buttonGroup.add(topRadioButton);

designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java

@@ -49,7 +49,7 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
 		checkBoxDictPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 0));
 		northPane.add(checkBoxDictPane, BorderLayout.NORTH);
 		JPanel chooseAllPane = new JPanel();
-		checkbox = new UICheckBox(Inter.getLocText(new String[]{"Provide", "Choose_All"}));
+		checkbox = new UICheckBox(Inter.getLocText("FR-Designer_Provide_Choose_All"));
 		chooseAllPane.add(checkbox);
 		chooseAllPane.setLayout(new FlowLayout(FlowLayout.LEFT, 8, 0));
 		northPane.add(chooseAllPane, BorderLayout.CENTER);

designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java

@@ -166,7 +166,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("Allow_Decimals"));
         this.decimalLength = new com.fr.design.editor.editor.IntegerEditor();
         this.decimalLength.setColumns(4);
-        limitNumberPane = GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Double", "Numbers"}) + ":"), this.decimalLength},
+        limitNumberPane = GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText("FR-Designer_Decimal_Places")), this.decimalLength},
                 FlowLayout.LEFT, 4);
         getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{this.allowDecimalsCheckBox, limitNumberPane}, FlowLayout.LEFT, 4));
         this.allowDecimalsCheckBox.addActionListener(actionListener1);

designer_base/src/com/fr/design/actions/file/SwitchExistEnv.java

@@ -3,11 +3,13 @@ package com.fr.design.actions.file;
 import com.fr.base.BaseUtils;
 import com.fr.base.Env;
 import com.fr.base.FRContext;
-import com.fr.design.data.DesignTableDataManager;
+import com.fr.base.FRCoreContext;
-import com.fr.design.data.tabledata.ResponseDataSourceChange;
 import com.fr.dav.LocalEnv;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.UpdateAction;
+import com.fr.design.data.DesignTableDataManager;
+import com.fr.design.data.tabledata.ResponseDataSourceChange;
+import com.fr.design.dialog.InformationWarnPane;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
@@ -15,16 +17,14 @@ import com.fr.design.mainframe.TemplatePane;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
-import com.fr.design.dialog.InformationWarnPane;
 import com.fr.env.RemoteEnv;
 import com.fr.env.SignIn;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
-import com.fr.stable.LicUtils;
-import com.fr.stable.ProductConstants;
 import com.fr.stable.EnvChangedListener;
+import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -118,7 +118,7 @@ public class SwitchExistEnv extends MenuDef {
                     return;
                 }
                 SignIn.signIn(selectedEnv);
-                LicUtils.resetBytes();
+                resetLicenseBytes();
                 HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
                 fireDSChanged();
             } catch (Exception em) {
@@ -127,5 +127,10 @@ public class SwitchExistEnv extends MenuDef {
                 TemplatePane.getInstance().editItems();
             }
         }
+
+        private void resetLicenseBytes() {
+            FRCoreContext.retryLicLock();
         }
     }
+
+}

designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java

@@ -1,7 +1,7 @@
 package com.fr.design.editor.editor;
 
-import com.fr.design.data.DesignTableDataManager;
 import com.fr.data.SimpleDSColumn;
+import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataComboBox;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -36,8 +36,12 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
 
 			@Override
 			public void itemStateChanged(ItemEvent e) {
+				TableDataWrapper tableDataWrapper = tableDataComboBox.getSelectedItem();
+				if (tableDataWrapper == null) {
+					return;
+				}
 				//这边需要重新初始化columnNames, 否则nameList长度和columnNames长度不同导致出錯。
-                List<String> nameList = tableDataComboBox.getSelectedItem().calculateColumnNameList();
+				List<String> nameList = tableDataWrapper.calculateColumnNameList();
 				columnNames = new String[nameList.size()];
 				columnNames = tableDataComboBox.getSelectedItem().calculateColumnNameList().toArray(columnNames);
 				columnNameComboBox.removeAllItems();
@@ -64,7 +68,7 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
 		dsColumn.setDsName(tableDataWrappe.getTableDataName());
 		TableDataColumn column;
 		String columnExp = (String) this.columnNameComboBox.getSelectedItem();
-		if (StringUtils.isNotBlank(columnExp) && (columnExp.length() > 0 && columnExp.charAt(0) == '#') && !columnExp.endsWith("#")) {
+		if (StringUtils.isNotBlank(columnExp) && checkColumnExp(columnExp)) {
 			String number = columnExp.substring(1);
 			Pattern pattern = Pattern.compile("[^\\d]");
 			if (pattern.matcher(number).find()) {
@@ -80,6 +84,10 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
 		return dsColumn;
 	}
 
+	private boolean checkColumnExp (String columnExp) {
+		return (columnExp.length() > 0 && columnExp.charAt(0) == '#') && !columnExp.endsWith("#");
+	}
+
 	public String getIconName() {
 		return "ds_column";
 	}

designer_base/src/com/fr/design/gui/controlpane/AbstractNameableCreator.java

@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
+import com.fr.js.JavaScript;
 
 import javax.swing.*;
 
@@ -70,6 +71,14 @@ public abstract class AbstractNameableCreator implements NameableCreator {
 		return this.clazzOfEditor;
 	}
 
+	/**
+	 * get clazzOfObject
+	 * @return clazzOfObject
+	 */
+	public Class <? extends JavaScript> getHyperlink() {
+		return this.clazzOfObject;
+	}
+
 	/**
 	 *
 	 * @param ob

designer_base/src/com/fr/design/gui/controlpane/NameableCreator.java

@@ -2,6 +2,7 @@ package com.fr.design.gui.controlpane;
 
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ilist.ListModelElement;
+import com.fr.js.JavaScript;
 import com.fr.stable.Nameable;
 
 import javax.swing.*;
@@ -17,6 +18,8 @@ public interface NameableCreator {
 
 	public Class<? extends BasicBeanPane> getUpdatePane();
 
+	public Class <? extends JavaScript> getHyperlink();
+
 	public Object acceptObject2Populate(Object ob);
 
 	public void saveUpdatedBean(ListModelElement wrapper, Object bean);

designer_base/src/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java

@@ -237,7 +237,8 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver {
             public Dimension getPreferredSize() {
                 Dimension dimension = new Dimension();
                 dimension.height = super.getPreferredSize().height;
-                dimension.width = addButton.getWidth() - 2;
+                // 不能写死，否则出现国际化显示不全的问题
+                dimension.width = Math.max(addButton.getWidth() - 2, super.getPreferredSize().width);
                 return dimension;
             }
         };

designer_base/src/com/fr/design/locale/designer.properties

@@ -1345,6 +1345,8 @@ Remove_All_Button=Remove_All_Button
 FR-Designer_Component_Interval=Components Interval
 ReportColumns-Columns_vertically=Columns vertically
 ReportGUI-Print_Background=Print Background
+FR-Designer_Print_Background=Print Background
+FR-Designer_Export_Background=Export Background
 Export-CSV=CSV
 M_Edit-Paste=Paste
 FR-Designer-Basic_Restart_Designer=Restart designer
@@ -2003,4 +2005,7 @@ FR-Product_Demo=Demo
 FR-Designer_Tree_Data_Field=Tree Data Field
 FR-Designer_Data_Filter=Data Filter
 Default=Default
+FR-Designer_Sheet_Label_Page_Display_Position=Sheet tab display location:
+FR-Designer_Provide_Choose_All=Provide Select All
+FR-Designer_Decimal_Places=Decimal Places:
 FR-Base-Load_Resource_File=Load resource file

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -1345,6 +1345,8 @@ Remove_All_Button=Remove all buttons
 FR-Designer_Component_Interval=Component Interval
 ReportColumns-Columns_vertically=Fixed columns per line
 ReportGUI-Print_Background=Print/export background
+FR-Designer_Print_Background=Print Background
+FR-Designer_Export_Background=Export Background
 Export-CSV=CSV
 M_Edit-Paste=Paste
 FR-Designer-Basic_Restart_Designer=Restart designer
@@ -2004,4 +2006,7 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according to the pa
 FR-Product_Demo=Demo
 FR-Designer_Data_Filter=Data Filter
 Default=Default
+FR-Designer_Sheet_Label_Page_Display_Position=Sheet tab display location:
+FR-Designer_Provide_Choose_All=Provide Select All
+FR-Designer_Decimal_Places=Decimal Places:
 FR-Base-Load_Resource_File=Load Configuration File

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -1345,6 +1345,8 @@ Remove_All_Button=\u3059\u3079\u3066\u306E\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u
 FR-Designer_Component_Interval=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u9593\u9694
 ReportColumns-Columns_vertically=\u5217\u306E\u6BB5\u7D44\u307F
 ReportGUI-Print_Background=\u5E33\u7968\u80CC\u666F\u306E\u5370\u5237/\u51FA\u529B
+FR-Designer_Print_Background=\u5E33\u7968\u80CC\u666F\u306E\u5370\u5237
+FR-Designer_Export_Background=\u5E33\u7968\u80CC\u666F\u306E\u51FA\u529B
 Export-CSV=CSV(\u30AB\u30F3\u30DE\u533A\u5207\u308A)
 M_Edit-Paste=\u8CBC\u308A\u4ED8\u3051(P)
 FR-Designer-Basic_Restart_Designer=\u30C7\u30B6\u30A4\u30CA\u30FC\u518D\u8D77\u52D5
@@ -2003,5 +2005,7 @@ FR-Product_Demo=\u88FD\u54C1\u30C7\u30E2
 FR-Designer_Data_Filter=\u30C7\u30FC\u30BF\u30D5\u30A3\u30EB\u30BF
 FR-Designer_Can_not_use_FormatBursh=\u9023\u7D9A\u3057\u306A\u3044\u8907\u6570\u9818\u57DF\u3067\u306F\u66F8\u5F0F\u30B3\u30D4\u30FC\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 Default=\u65E2\u5B9A
+FR-Designer_Sheet_Label_Page_Display_Position=
+FR-Designer_Provide_Choose_All=\u63D0\u4F9B\u3059\u3079\u3066\u9078\u629E
+FR-Designer_Decimal_Places=\u5C0F\u6570\u6570\u91CF:
 FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9
-

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -1345,6 +1345,8 @@ Remove_All_Button=\uBAA8\uB4E0\uD0A4\uD074\uB9AC\uC5B4
 FR-Designer_Component_Interval=\uC5B4\uC148\uBE14\uB9AC\uAC04\uACA9
 ReportColumns-Columns_vertically=\uC5F4\uC140\uB098\uB204\uAE30
 ReportGUI-Print_Background=\uC778\uC1C4/\uB0B4\uBCF4\uB0B4\uAE30\uBB38\uC11C\uBC30\uACBD
+FR-Designer_Print_Background=\uC778\uC1C4\uBB38\uC11C\uBC30\uACBD
+FR-Designer_Export_Background=\uB0B4\uBCF4\uB0B4\uAE30\uBB38\uC11C\uBC30\uACBD
 Export-CSV=CSV\uC11C\uC2DD(\uC27C\uD45C\uAD6C\uBD84)
 M_Edit-Paste=\uBD99\uC5EC\uB123\uAE30(P)
 FR-Designer-Basic_Restart_Designer=\uC7AC\uBD80\uD305\uC124\uACC4\uAE30
@@ -2003,4 +2005,7 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\uC120\uD0DD\uD55C\uB370\uC774
 FR-Product_Demo=\uC81C\uD488\uC2DC\uC5F0
 FR-Designer_Data_Filter=\uB370\uC774\uD130\uC120\uBCC4
 Default=\uAE30\uBCF8
+FR-Designer_Sheet_Label_Page_Display_Position=
+FR-Designer_Provide_Choose_All=\uC81C\uACF5\uBAA8\uB450\uC120\uD0DD
+FR-Designer_Decimal_Places=\uC18C\uC218\uC218\uB7C9:
 FR-Base-Load_Resource_File=\uB85C\uB529\uAD6C\uC131\uD30C\uC77C

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -1345,6 +1345,8 @@ Remove_All_Button=\u6E05\u9664\u6240\u6709\u6309\u94AE
 FR-Designer_Component_Interval=\u7EC4\u4EF6\u95F4\u9694
 ReportColumns-Columns_vertically=\u5217\u5206\u680F
 ReportGUI-Print_Background=\u6253\u5370/\u5BFC\u51FA\u62A5\u8868\u80CC\u666F
+FR-Designer_Print_Background=\u6253\u5370\u62A5\u8868\u80CC\u666F
+FR-Designer_Export_Background=\u5BFC\u51FA\u62A5\u8868\u80CC\u666F
 Export-CSV=CSV\u683C\u5F0F(\u9017\u53F7\u5206\u9694)
 M_Edit-Paste=\u7C98\u8D34(P)
 FR-Designer-Basic_Restart_Designer=\u91CD\u542F\u8BBE\u8BA1\u5668
@@ -2003,5 +2005,7 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8D56\u6240\u9009\u6570
 FR-Product_Demo=\u4EA7\u54C1\u6F14\u793A
 FR-Designer_Data_Filter=\u6570\u636E\u7B5B\u9009
 Default=\u9ED8\u8BA4
+FR-Designer_Sheet_Label_Page_Display_Position=sheet\u6807\u7B7E\u9875\u663E\u793A\u4F4D\u7F6E\uFF1A
+FR-Designer_Provide_Choose_All=\u63D0\u4F9B\u5168\u9009
+FR-Designer_Decimal_Places=\u5C0F\u6570\u6570\u76EE\uFF1A
 FR-Base-Load_Resource_File=\u52A0\u8F7D\u914D\u7F6E\u6587\u4EF6
-

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -1345,6 +1345,8 @@ Remove_All_Button=\u6E05\u9664\u6240\u6709\u6309\u9215
 FR-Designer_Component_Interval=\u5143\u4EF6\u9593\u9694
 ReportColumns-Columns_vertically=\u6B04\u5206\u6B04
 ReportGUI-Print_Background=\u5217\u5370/\u532F\u51FA\u5831\u8868\u80CC\u666F
+FR-Designer_Print_Background=\u5217\u5370\u5831\u8868\u80CC\u666F
+FR-Designer_Export_Background=\u532F\u51FA\u5831\u8868\u80CC\u666F
 Export-CSV=CSV\u683C\u5F0F(\u9017\u865F\u5206\u9694)
 M_Edit-Paste=\u8CBC\u4E0A(P)
 FR-Designer-Basic_Restart_Designer=\u91CD\u555F\u8A2D\u8A08\u5668
@@ -2004,5 +2006,7 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8CF4\u6240\u9078\u8CC7
 FR-Product_Demo=\u529F\u80FD\u5C55\u793A
 FR-Designer_Data_Filter=\u8CC7\u6599\u7BE9\u9078
 Default=\u9810\u8A2D
+FR-Designer_Sheet_Label_Page_Display_Position=sheet\u6A19\u7C64\u9801\u986F\u793A\u4F4D\u7F6E\uFF1A
+FR-Designer_Provide_Choose_All=\u63D0\u4F9B\u5168\u9078
+FR-Designer_Decimal_Places=\u5C0F\u6578\u6578\u76EE\uFF1A
 FR-Base-Load_Resource_File=\u52A0\u8F09\u914D\u7F6E\u6A94\u6848
-

designer_base/src/com/fr/design/mainframe/loghandler/DesignerLogImpl.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.loghandler;
 
 import com.fr.stable.fun.impl.AbstractLogProvider;
+import com.fr.stable.web.SessionProvider;
 import com.fr.stable.xml.LogRecordTimeProvider;
 
 import java.util.ArrayList;
@@ -43,4 +44,9 @@ public class DesignerLogImpl extends AbstractLogProvider{
     public void record(LogRecordTimeProvider logRecordTime) {
         records.add(logRecordTime);
     }
+
+    @Override
+    public void record(LogRecordTimeProvider logRecordTime, SessionProvider sessionProvider) {
+
+    }
 }

designer_base/src/com/fr/design/mainframe/loghandler/LogDetailPane.java

@@ -7,6 +7,7 @@ import javax.swing.JPanel;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.Inter;
 
 public class LogDetailPane extends JPanel{
 	public LogDetailPane() {
@@ -20,7 +21,7 @@ public class LogDetailPane extends JPanel{
 		fr.setSize(600, 400);
 		GUICoreUtils.centerWindow(fr);
 		fr.setResizable(false);
-		fr.setTitle("日志");
+		fr.setTitle(Inter.getLocText("FR-Designer_Log"));
 		fr.setIconImage(BaseUtils.readImageWithCache("com/fr/design/images/buttonicon/history.png"));
 		fr.getContentPane().setLayout(new BorderLayout());
 		fr.getContentPane().add(this, BorderLayout.CENTER);

designer_base/src/com/fr/env/RemoteEnv.java

@@ -1,6 +1,14 @@
 package com.fr.env;
 
-import com.fr.base.*;
+import com.fr.base.AbstractEnv;
+import com.fr.base.EnvException;
+import com.fr.base.FRContext;
+import com.fr.base.FRCoreContext;
+import com.fr.base.ModifiedTable;
+import com.fr.base.Parameter;
+import com.fr.base.StoreProcedureParameter;
+import com.fr.base.TableData;
+import com.fr.base.Utils;
 import com.fr.base.remote.RemoteDeziConstants;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.TableProcedure;
@@ -22,7 +30,12 @@ import com.fr.file.CacheManager;
 import com.fr.file.DatasourceManager;
 import com.fr.file.DatasourceManagerProvider;
 import com.fr.file.filetree.FileNode;
-import com.fr.general.*;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.FRLogger;
+import com.fr.general.IOUtils;
+import com.fr.general.Inter;
+import com.fr.general.LogRecordTime;
+import com.fr.general.VT4FR;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONException;
@@ -32,7 +45,14 @@ import com.fr.plugin.PluginLicense;
 import com.fr.plugin.PluginLicenseManager;
 import com.fr.plugin.PluginLoader;
 import com.fr.share.ShareConstants;
-import com.fr.stable.*;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.EncodeConstants;
+import com.fr.stable.JavaCompileInfo;
+import com.fr.stable.LicUtils;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
+import com.fr.stable.SvgProvider;
 import com.fr.stable.file.XMLFileManagerProvider;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.stable.xml.XMLPrintWriter;
@@ -41,17 +61,37 @@ import com.fr.stable.xml.XMLableReader;
 import com.fr.web.ResourceConstants;
 
 import javax.swing.*;
-import javax.xml.transform.*;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import java.awt.*;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.NoRouteToHostException;
 import java.net.Socket;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Timer;
+import java.util.TimerTask;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
 
@@ -1387,13 +1427,17 @@ public class RemoteEnv extends AbstractEnv {
                     return;
                 }
                 SignIn.signIn(remoteEnv);
-                LicUtils.resetBytes();
+                resetLicenseBytes();
                 HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
             } catch (Exception em) {
                 FRContext.getLogger().error(em.getMessage(), em);
             }
         }
 
+        private void resetLicenseBytes() {
+            FRCoreContext.retryLicLock();
+        }
+
         /**
          * 停止连接
          */

designer_base/src/com/fr/start/BaseDesigner.java

@@ -16,15 +16,13 @@ import com.fr.design.fun.GlobalListenerProvider;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.TemplatePane;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
+import com.fr.design.module.DesignModule;
 import com.fr.design.utils.DesignUtils;
 import com.fr.env.SignIn;
 import com.fr.file.FILE;
 import com.fr.file.FILEFactory;
 import com.fr.file.FileFILE;
-import com.fr.general.ComparatorUtils;
+import com.fr.general.*;
-import com.fr.general.FRLogger;
-import com.fr.general.Inter;
-import com.fr.general.ModuleContext;
 import com.fr.plugin.PluginCollector;
 import com.fr.stable.*;
 
@@ -66,6 +64,10 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         //下面这两句的位置不能随便调换，因为会影响语言切换的问题
         initLanguage();
 
+        // 先加载设计器的国际化文件
+        Inter.loadLocaleFile(GeneralContext.getLocale(), DesignModule.LOCALE_FILE_PATH);
+
+
         SplashWindow splashWindow = new SplashWindow(createSplashPane());
         if (args != null) {
             for (String arg : args) {

designer_chart/src/com/fr/design/chart/ChartTypePane.java

@@ -5,8 +5,13 @@ package com.fr.design.chart;
  */
 
 import com.fr.base.FRContext;
+import com.fr.base.FRCoreContext;
 import com.fr.chart.base.ChartInternationalNameContentBean;
-import com.fr.chart.chartattr.*;
+import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartattr.ChartIcon;
+import com.fr.chart.chartattr.MapPlot;
+import com.fr.chart.chartattr.Plot;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -14,7 +19,6 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.Inter;
 import com.fr.general.RegistEditionException;
 import com.fr.general.VT4FR;
-import com.fr.stable.StableUtils;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
@@ -150,7 +154,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
         String plotID = typeName[mainTypeList.getSelectedIndex()].getPlotID();
         Chart chart = ChartTypeManager.getInstance().getChartTypes(plotID)[iconViewList.getSelectedIndex()];
         if(chart.getPlot() != null){
-            if(chart.getPlot() instanceof MapPlot && !(VT4FR.isLicAvailable(StableUtils.getBytes()) && VT4FR.CHART_MAP.support())){
+            if(chart.getPlot() instanceof MapPlot && !supportMap()){
                 JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Chart-Map_Not_Supported"));
                 throw new RegistEditionException(VT4FR.CHART_MAP);
             }
@@ -165,6 +169,11 @@ public class ChartTypePane extends ChartCommonWizardPane {
         }
     }
 
+    private boolean supportMap() {
+        byte[] bytes = FRCoreContext.getBytes();
+        return VT4FR.isLicAvailable(bytes) && VT4FR.CHART_MAP.support();
+    }
+
     public void update(ChartCollection cc) {
         if (cc == null) {
             return;

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

@@ -96,7 +96,7 @@ public class DataLabelPane extends TooltipContentsPane {
         }
         delimiterBox.setPreferredSize(new Dimension(70, 20));
         JPanel boxPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
-        boxPane.add(new UILabel(Inter.getLocText("Form-Delimiter") + ":"));
+        boxPane.add(new UILabel(Inter.getLocText("FR-Designer_Dismenber") + ":"));
         boxPane.add(delimiterBox);
         return boxPane;
     }
@@ -111,34 +111,9 @@ public class DataLabelPane extends TooltipContentsPane {
     }
 
     protected JPanel createJPanel4Position() {
-        // 标签位置:上下左右中.
+        return null;
-        bottomButton = new UIRadioButton(Inter.getLocText("StyleAlignment-Bottom"));
-        leftButton = new UIRadioButton(Inter.getLocText("StyleAlignment-Left"));
-        rigtButton = new UIRadioButton(Inter.getLocText("StyleAlignment-Right"));
-        topButton = new UIRadioButton(Inter.getLocText("StyleAlignment-Top"));
-        centerButton = new UIRadioButton(Inter.getLocText("Center"));
-
-        ButtonGroup bg = new ButtonGroup();
-        bg.add(bottomButton);
-        bg.add(leftButton);
-        bg.add(rigtButton);
-        bg.add(topButton);
-        bg.add(centerButton);
-        topButton.setSelected(true);
-        
-        JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-        buttonPane.add(new UILabel(Inter.getLocText(new String[]{"Label", "Layout"}) + ":"));
-        buttonPane.add(bottomButton);
-        buttonPane.add(leftButton);
-        buttonPane.add(rigtButton);
-        buttonPane.add(topButton);
-        buttonPane.add(centerButton);
-
-        return buttonPane;
     }
 
-   
-
     public void populate(AttrContents seriesAttrContents) {
     	super.populate(seriesAttrContents);
         String dataLabel = seriesAttrContents.getSeriesLabel();

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

@@ -17,6 +17,7 @@ import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.item.FlexibleComboBox;
 import com.fr.design.mainframe.chart.gui.item.ItemEventType;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.StringUtils;
 
@@ -238,6 +239,9 @@ public class ChartTypePane extends AbstractChartAttrPane{
 			for (int i = 0; i < this.cards.size(); i++) {
 				FurtherBasicBeanPane pane = cards.get(i);
 				if (pane.accept(ob)) {
+
+					GUICoreUtils.setEnabled(this, ob.isValidPlot());
+
 					pane.populateBean(ob);
 					Object item = pane.title4PopupWindow();
 					for (int j = 0; j < cardNames.length; j++) {

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java

@@ -5,6 +5,7 @@ import com.fr.base.Utils;
 import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartdata.NormalReportDataDefinition;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
@@ -21,6 +22,7 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -37,6 +39,10 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
 	private ArrayList<TinyFormulaPane> formualList = new ArrayList<TinyFormulaPane>();
 	private UIObserverListener uiobListener = null;
 
+	public List<TinyFormulaPane> getFormualList() {
+		return formualList;
+	}
+
 	public CategoryPlotMoreCateReportDataContentPane() {
 
 	}
@@ -105,13 +111,13 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
 			public void actionPerformed(ActionEvent e) {
 				boxPane.remove(newButtonPane);
 				formualList.remove(pane);
-				checkAddButton();
+				checkComponent();
 				relayoutPane();
 			}
 		});
 		delButton.registerChangeListener(uiobListener);
 
-		checkAddButton();
+		checkComponent();
 		relayoutPane();
 
 		return pane;
@@ -122,6 +128,10 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
 		addButton.setEnabled(size < 2);
 	}
 
+	protected void checkComponent() {
+		checkAddButton();
+	}
+
 	private void relayoutPane() {
 		this.revalidate();
 	}
@@ -168,15 +178,20 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
 		super.updateBean(collection);
 
 		TopDefinitionProvider definition = collection.getSelectedChart().getFilterDefinition();
+		Plot plot = collection.getSelectedChart().getPlot();
 		if (definition instanceof NormalReportDataDefinition) {
 			NormalReportDataDefinition reportDefinition = (NormalReportDataDefinition) definition;
 
 			reportDefinition.clearMoreCate();
+			updateMoreCate(reportDefinition, plot);
 
+		}
+	}
+
+	protected void updateMoreCate(NormalReportDataDefinition reportDefinition, Plot plot) {
 		for (int i = 0, size = formualList.size(); i < size; i++) {
 			TinyFormulaPane pane = formualList.get(i);
 			reportDefinition.addMoreCate(canBeFormula(pane.updateBean()));
 		}
 	}
 }
-}

designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java

@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartdata.NormalTableDataDefinition;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
@@ -42,6 +43,10 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
 
 	private UIObserverListener uiobListener = null;
 
+	public List<UIComboBox> getBoxList() {
+		return boxList;
+	}
+
 	public CategoryPlotMoreCateTableDataContentPane() {
 		// do nothing
 	}
@@ -87,7 +92,7 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
 				checkSeriseUse(categoryCombox.getSelectedItem() != null);
 				makeToolTipUse(categoryCombox);
 
-				checkAddButton();
+				checkComponent();
 			}
 		});
 	}
@@ -127,14 +132,14 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
 		boxPane.add(buttonPane);
 		boxList.add(combox);
 
-		 checkAddButton();
+		checkComponent();
 
 		delButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				boxPane.remove(buttonPane);
 				boxList.remove(combox);
-				checkAddButton();
+				checkComponent();
 				relayoutPane();
 			}
 		});
@@ -148,6 +153,10 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
 		addButton.setEnabled(size < 2 && categoryCombox.getSelectedItem() != null);
 	}
 
+	protected void checkComponent() {
+		checkAddButton();
+	}
+
 	private void relayoutPane() {
 		this.revalidate();
 	}
@@ -160,7 +169,7 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
 	public void checkBoxUse(boolean hasUse) {
 		super.checkBoxUse(hasUse);
 
-		checkAddButton();
+		checkComponent();
 	}
 
 	protected void refreshBoxListWithSelectTableData(List list) {
@@ -220,9 +229,15 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
 		super.updateBean(collection);
 
 		TopDefinitionProvider top = collection.getSelectedChart().getFilterDefinition();
+		Plot plot = collection.getSelectedChart().getPlot();
 		if (top instanceof NormalTableDataDefinition) {
 			NormalTableDataDefinition normal = (NormalTableDataDefinition) top;
 			normal.clearMoreCate();
+			updateMoreCate(normal, plot);
+		}
+	}
+
+	protected void updateMoreCate(NormalTableDataDefinition normal, Plot plot) {
 		for (int i = 0, size = boxList.size(); i < size; i++) {
 			UIComboBox box = boxList.get(i);
 			if (box.getSelectedItem() != null) {
@@ -230,5 +245,5 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD
 			}
 		}
 	}
-	}
+
 }

designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java

@@ -12,6 +12,7 @@ import com.fr.chart.chartdata.GisMapTableDefinition;
 import com.fr.chart.web.ChartHyperPoplink;
 import com.fr.chart.web.ChartHyperRelateCellLink;
 import com.fr.chart.web.ChartHyperRelateFloatLink;
+import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.javascript.ChartEmailPane;
 import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperPoplinkPane;
@@ -21,6 +22,8 @@ import com.fr.design.chart.series.SeriesCondition.impl.FormHyperlinkPane;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
+import com.fr.design.fun.HyperlinkProvider;
+import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.frpane.UIBubbleFloatPane;
 import com.fr.design.gui.frpane.UICorrelationComboBoxPane;
 import com.fr.design.gui.ibutton.UIButton;
@@ -53,6 +56,7 @@ import java.text.DecimalFormat;
 import java.text.Format;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIObserver{
     private static final long serialVersionUID = 3477409806918835992L;
@@ -655,6 +659,13 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
     private void populateHyperlink(Plot plot) {
         HashMap paneMap = renewMapWithPlot(plot);
 
+        //安装平台内打开插件时,添加相应按钮
+        Set<HyperlinkProvider> providers = ExtraDesignClassManager.getInstance().getArray(HyperlinkProvider.XML_TAG);
+        for (HyperlinkProvider provider : providers) {
+            NameableCreator nc = provider.createHyperlinkCreator();
+            paneMap.put(nc.getHyperlink(), nc.getUpdatePane());
+        }
+
         List<UIMenuNameableCreator> list = refreshList(paneMap);
         superLink.refreshMenuAndAddMenuAction(list);
 

designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java

@@ -43,6 +43,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
     protected List<ChartImagePane> styleList;
 
     protected JPanel stylePane; //样式布局的面板
+    private JPanel typePane;
     protected abstract String[] getTypeIconPath();
     protected abstract String[] getTypeTipName();
     protected abstract String[] getTypeLayoutPath();
@@ -70,10 +71,10 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
 
         checkDemosBackground();
 
-        JPanel typePane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(4);
+        this.typePane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(4);
         for(int i = 0; i < typeDemo.size(); i++) {
             ChartImagePane tmp = typeDemo.get(i);
-            typePane.add(tmp);
+            this.typePane.add(tmp);
             tmp.setDemoGroup(typeDemo.toArray(new ChartSelectDemoPane[typeDemo.size()]));
         }
 
@@ -99,7 +100,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
             stylePane.setVisible(false);
         }
 
-        JPanel panel = TableLayoutHelper.createTableLayoutPane(getPaneComponents(typePane),rowSize,columnSize);
+        JPanel panel = TableLayoutHelper.createTableLayoutPane(getPaneComponents(this.typePane),rowSize,columnSize);
         this.setLayout(new BorderLayout());
         this.add(panel,BorderLayout.CENTER);
     }
@@ -133,7 +134,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
     }
 
     //子类覆盖
-    protected Plot getSelectedClonedPlot(){
+    protected <T extends Plot> T getSelectedClonedPlot(){
         return null;
     }
 
@@ -586,6 +587,10 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
                 && chart.getPlot().getPlotStyle() != ChartConstants.STYLE_NONE;
     }
 
+    protected JPanel getTypePane(){
+        return this.typePane;
+    }
+
     public Chart getDefaultChart() {
         return BarIndependentChart.barChartTypes[0];
     }

designer_form/src/com/fr/design/designer/creator/XCheckBoxGroup.java

@@ -50,7 +50,7 @@ public class XCheckBoxGroup extends XFieldEditor {
 				new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(Inter.getLocText("Adaptive"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class),
 				new CRPropertyDescriptor("chooseAll", this.data.getClass()).setI18NName(
-						Inter.getLocText(new String[]{"Provide", "Choose_All"})).putKeyValue(
+						Inter.getLocText("FR-Designer_Provide_Choose_All")).putKeyValue(
 						XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName(
 						Inter.getLocText("Return-String")).setEditorClass(InChangeBooleanEditor.class)