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

* commit 'ee78c63f92afe56ea6112748becef733305a637b': (343 commits)
  国际化
  无JIRA任务，国际化翻译更新
  无JIRA任务，国际化翻译更新
  REPORT-2626 移除国际化文件中的无效key
  REPORT-2626 移除国际化文件中的无效key
  国际化修改 design部分第51-750个key的翻译修改 庄奇syoki 20170509
  Signed-off-by: unknown <李晓丽>
  国际化修改 design部分 1-50个 1901-结束部分key的翻译修改 20170508 庄奇syoki
  REPORT-2483 & REPORT-2484 国际化key转移；外文版的国际化文件和中文版不一致
  无JIRA任务  新release合并遗漏
  无任务，line separator
  REPORT-2537
  无任务，冲突调整，release到dev
  无JIRA任务，国际化，把release、master中的key合并到dev中
  无JIRA任务，解决冲突
  ct
  ct
  ct
  ct
  1
  ...

.gitignore

@@ -3,5 +3,6 @@ designer_base/bin
 designer_chart/bin
 designer_form/bin
 *.iml
+designer_base/src/com/fr/design/locale/.idea
 
 

designer/src/com/fr/aspectj/designer/TemplateProcessTracker.aj

@@ -0,0 +1,73 @@
+package com.fr.aspectj.designer;
+
+/**
+ * 记录模板过程
+ * Created by plough on 2017/3/3.
+ */
+
+import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
+import com.fr.grid.Grid;
+import org.aspectj.lang.reflect.SourceLocation;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+import java.util.Date;
+
+public aspect TemplateProcessTracker {
+    //声明一个pointcut，匹配你需要的方法
+    pointcut onMouseClicked(MouseEvent e) :
+            execution(* mouseClicked(MouseEvent)) && args(e);
+    pointcut onMousePressed(MouseEvent e) :
+            execution(* mousePressed(MouseEvent)) && args(e);
+    pointcut onMouseReleased(MouseEvent e) :
+            execution(* mouseReleased(MouseEvent)) && args(e);
+    pointcut onActionPerformed(ActionEvent e) :
+            execution(* actionPerformed(ActionEvent)) && args(e);
+    pointcut onSetValueAt(Object v, int r, int c) :
+            execution(* setValueAt(java.lang.Object, int, int)) && args(v, r, c);
+    pointcut onSetValue4EditingElement(Grid g, Object v) :
+            call(* setValue4EditingElement(java.lang.Object)) && target(g) && args(v);
+
+    //before表示之前的意思
+    //这整个表示在MouseAdapter的public void mouseXXX(MouseEvent)方法调用之前，你想要执行的代码
+    before(MouseEvent e) : onMouseClicked(e) || onMousePressed(e) || onMouseReleased(e) {
+        SourceLocation sl = thisJoinPoint.getSourceLocation();//切面对应的代码位置
+
+//        String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
+        String log = "";
+        TemplateInfoCollector.appendProcess(log);
+    }
+    //同上
+    before(ActionEvent e) : onActionPerformed(e) {
+        SourceLocation sl = thisJoinPoint.getSourceLocation();
+        // !within(LogHandlerBar) 没用, 手动过滤
+        if (e.getSource().toString().contains("javax.swing.Timer")) {
+            return;
+        }
+
+        //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
+        String log = "";
+        TemplateInfoCollector.appendProcess(log);
+
+    }
+    //同上
+    before(Object v, int r, int c) : onSetValueAt(v, r, c) {
+        SourceLocation sl = thisJoinPoint.getSourceLocation();
+
+        //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c);
+        String log = "";
+        TemplateInfoCollector.appendProcess(log);
+
+    }
+    //同上
+    before(Grid g, Object v) : onSetValue4EditingElement(g, v) {
+        SourceLocation sl = thisJoinPoint.getSourceLocation();
+
+//        String v = "test";
+        //String log = String.format("%s:\n%s\nset value: %s at %s\n\n", new Date(), sl, v, g.getEditingCellElement());
+        String log = "";
+        TemplateInfoCollector.appendProcess(log);
+    }
+
+
+}

designer/src/com/fr/design/mainframe/CellElementPropertyPane.java

@@ -108,8 +108,10 @@ public class CellElementPropertyPane extends DockingView {
     }
 
     public void reInit(ElementCasePane ePane) {
+        if (titlePane.getParent() == null) {  // 如果处于隐藏状态，则让其显示
             this.add(titlePane, BorderLayout.NORTH);
             this.add(cellElementEditPane, BorderLayout.CENTER);
+        }
         cellElementEditPane.populate(ePane);
     }
 

designer/src/com/fr/design/mainframe/InformationCollector.java

@@ -10,6 +10,7 @@ import com.fr.data.core.db.dml.Delete;
 import com.fr.data.core.db.dml.Select;
 import com.fr.data.core.db.dml.Table;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
 import com.fr.general.*;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
@@ -315,6 +316,7 @@ public class InformationCollector implements XMLReadable, XMLWriter {
 				}
                 sendFunctionsInfo();
                 sendUserInfo();
+				TemplateInfoCollector.getInstance().sendTemplateInfo();
 			}
 		});
     	sendThread.start();

designer/src/com/fr/design/mainframe/JPolyWorkBook.java

@@ -25,7 +25,6 @@ public class JPolyWorkBook extends JWorkBook {
         populateReportParameterAttr();
 	}
     
-    
     /**
 	 * 创建sheet名称tab面板
 	 * 

designer/src/com/fr/design/mainframe/JWorkBook.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe;
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.base.Parameter;
+import com.fr.base.parameter.ParameterUI;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.AllowAuthorityEditAction;
@@ -26,6 +27,8 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIModeControlContainer;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.mainframe.cell.QuickEditorRegion;
+import com.fr.design.mainframe.templateinfo.JWorkBookProcessInfo;
+import com.fr.design.mainframe.templateinfo.TemplateProcessInfo;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
 import com.fr.design.menu.*;
 import com.fr.design.module.DesignModuleFactory;
@@ -54,7 +57,10 @@ import com.fr.main.impl.WorkBook;
 import com.fr.main.parameter.ReportParameterAttr;
 import com.fr.poly.PolyDesigner;
 import com.fr.privilege.finegrain.WorkSheetPrivilegeControl;
+import com.fr.report.cellcase.CellCase;
 import com.fr.report.elementcase.TemplateElementCase;
+import com.fr.report.poly.PolyWorkSheet;
+import com.fr.report.report.Report;
 import com.fr.report.worksheet.WorkSheet;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StableUtils;
@@ -66,10 +72,7 @@ import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.FileOutputStream;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * JWorkBook used to edit WorkBook.
@@ -129,6 +132,13 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
         return centerPane;
     }
 
+    public TemplateProcessInfo getProcessInfo() {
+        if (processInfo == null) {
+            processInfo = new JWorkBookProcessInfo(template);
+        }
+        return processInfo;
+    }
+
     /**
      * 判断sheet权限
      *
@@ -463,7 +473,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
      */
     public ShortCut[] shortCuts4Authority() {
         return new ShortCut[]{
-                new NameSeparator(Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"})),
+                new NameSeparator(Inter.getLocText("FR-Designer_Permissions_Edition")),
                 BaseUtils.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this),
         };
 

designer/src/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@@ -3,7 +3,9 @@ package com.fr.design.mainframe.cell.settingpane;
 import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.util.Locale;
 
+import com.fr.base.FRContext;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.ilable.UILabel;
 
@@ -76,23 +78,23 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
         double p = TableLayout.PREFERRED;
         double[] rowSize1 = {p, p, p, p, p, p, p};
         double[] columnSize1 = {p, f};
-        UILabel autoAdjustLabel = new UILabel(Inter.getLocText("Auto_Adjust_Size") + ":", SwingConstants.RIGHT);
+        UILabel autoAdjustLabel = new UILabel(Inter.getLocText("FR-Designer_Auto_Adjust_Size") + ":", SwingConstants.RIGHT);
         autoAdjustLabel.setVerticalAlignment(UILabel.TOP);
         Component[][] components1 = new Component[][]{
                 new Component[]{autoAdjustLabel, autoshrik},
-                new Component[]{new UILabel(Inter.getLocText("Preview") + ":", SwingConstants.RIGHT), previewCellContent},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Preview") + ":", SwingConstants.RIGHT), previewCellContent},
                 new Component[]{new UILabel(Inter.getLocText("CellWrite-Print_Export") + ":", SwingConstants.RIGHT), printAndExportContent},
                 new Component[]{null, printAndExportBackground},
-                new Component[]{new UILabel(Inter.getLocText("Show_Content") + ":", SwingConstants.RIGHT), showContent},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Show_Content") + ":", SwingConstants.RIGHT), showContent},
                 new Component[]{null, fileNamePane},
-                new Component[]{new UILabel(Inter.getLocText("CellWrite-ToolTip") + ":", SwingConstants.RIGHT), tooltipTextField},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_CellWrite_ToolTip") + ":", SwingConstants.RIGHT), tooltipTextField},
         };
         JPanel northContentPane = TableLayoutHelper.createTableLayoutPane(components1, rowSize1, columnSize1);
         double[] rowSize2 = {p, p, p, p, p, p};
         double[] columnSize2 = {p, f};
         Component[][] components2 = new Component[][]{
                 new Component[]{new JSeparator(JSeparator.HORIZONTAL), null},
-                new Component[]{new UILabel(Inter.getLocText("Pagination")), null},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Pagination")), null},
                 new Component[]{pageBeforeRowCheckBox, pageAfterRowCheckBox},
                 new Component[]{pageBeforeColumnCheckBox, pageAfterColumnCheckBox},
                 new Component[]{canBreakOnPaginateCheckBox, null},
@@ -121,22 +123,28 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
 
     private JPanel createNormal() {
         String[] AjustRowTypes = new String[]{
-                Inter.getLocText("No"), Inter.getLocText("Utils-Row_Height"), Inter.getLocText("Utils-Column_Width"), Inter.getLocText("Default")};
+                Inter.getLocText("FR-Designer_No"), Inter.getLocText("Utils-Row_Height"), Inter.getLocText("Utils-Column_Width"), Inter.getLocText("FR-Designer_DEFAULT")};
         autoshrik = new UIButtonGroup(AjustRowTypes);
+        if (FRContext.getLocale().equals(Locale.US)) {
+            // 英文显示不全，故每行一个按钮
+            autoshrik.setFourLine();
+            autoshrik.setLayout(new GridLayout(4, 1, 1, 1));
+        } else {
             autoshrik.setTwoLine();
             autoshrik.setLayout(new GridLayout(2, 2, 1, 1));
+        }
 
         previewCellContent = new UICheckBox(Inter.getLocText("CellWrite-Preview_Cell_Content"));
         printAndExportContent = new UICheckBox(Inter.getLocText("CellWrite-Print_Content"));
         printAndExportBackground = new UICheckBox(Inter.getLocText("CellWrite-Print_Background"));
 
-        showContent = new UIComboBox(new String[]{Inter.getLocText("Default"), Inter.getLocText("CellWrite-Show_As_Image"), Inter.getLocText("CellWrite-Show_As_HTML"),
+        showContent = new UIComboBox(new String[]{Inter.getLocText("FR-Designer_DEFAULT"), Inter.getLocText("CellWrite-Show_As_Image"), Inter.getLocText("CellWrite-Show_As_HTML"),
-                Inter.getLocText("ShowAsDownload")});
+                Inter.getLocText("FR-Designer_Show_As_Download")});
         final CardLayout fileNameLayout = new CardLayout();
         final JPanel fileNamePane = new JPanel(fileNameLayout);
         JPanel fileNameCCPane = new JPanel(new BorderLayout(4, 0));
 
-        fileNameCCPane.add(new UILabel(Inter.getLocText("FileNameForDownload")), BorderLayout.WEST);
+        fileNameCCPane.add(new UILabel(Inter.getLocText("FR-Designer_File_Name_For_Download")), BorderLayout.WEST);
         fileNameTextField = new UITextField();
 
         tooltipTextField = new UITextField();
@@ -186,13 +194,13 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
     }
 
     private void initAllNames() {
-        autoshrik.setGlobalName(Inter.getLocText("Auto_Adjust_Size"));
+        autoshrik.setGlobalName(Inter.getLocText("FR-Designer_Auto_Adjust_Size"));
-        previewCellContent.setGlobalName(Inter.getLocText("Preview"));
+        previewCellContent.setGlobalName(Inter.getLocText("FR-Designer_Preview"));
         printAndExportContent.setGlobalName(Inter.getLocText("CellWrite-Preview_Cell_Content"));
         printAndExportBackground.setGlobalName(Inter.getLocText("CellWrite-Print_Background"));
-        showContent.setGlobalName(Inter.getLocText("Show_Content"));
+        showContent.setGlobalName(Inter.getLocText("FR-Designer_Show_Content"));
-        fileNameTextField.setGlobalName(Inter.getLocText("Show_Content"));
+        fileNameTextField.setGlobalName(Inter.getLocText("FR-Designer_Show_Content"));
-        tooltipTextField.setGlobalName(Inter.getLocText("CellWrite-ToolTip"));
+        tooltipTextField.setGlobalName(Inter.getLocText("FR-Designer_CellWrite_ToolTip"));
         pageBeforeRowCheckBox.setGlobalName(Inter.getLocText("CellWrite-Page_Before_Row"));
         pageAfterRowCheckBox.setGlobalName(Inter.getLocText("CellWrite-Page_After_Row"));
         pageBeforeColumnCheckBox.setGlobalName(Inter.getLocText("CellWrite-Page_Before_Column"));
@@ -224,10 +232,10 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
         } else if (cellGUIAttr.isShowAsHTML()) {
             showContent.setSelectedItem(Inter.getLocText("CellWrite-Show_As_HTML"));
         } else if (cellGUIAttr.isShowAsDownload()) {
-            showContent.setSelectedItem(Inter.getLocText("ShowAsDownload"));
+            showContent.setSelectedItem(Inter.getLocText("FR-Designer_Show_As_Download"));
             fileNameTextField.setText(cellGUIAttr.getFileName());
         } else {
-            showContent.setSelectedItem(Inter.getLocText("Default"));
+            showContent.setSelectedItem(Inter.getLocText("FR-Designer_DEFAULT"));
         }
         tooltipTextField.setText(cellGUIAttr.getTooltipText());
         CellPageAttr cellPageAttr = cellElement.getCellPageAttr(); // 分页
@@ -272,11 +280,11 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
             cellGUIAttr = new CellGUIAttr();
         }
 
-        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("Auto_Adjust_Size"))) {
+        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Auto_Adjust_Size"))) {
             cellGUIAttr.setAdjustMode(autoshrik.getSelectedIndex());
         }
 
-        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("Preview"))) {
+        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Preview"))) {
             cellGUIAttr.setPreviewContent(previewCellContent.isSelected());
         }
 
@@ -288,7 +296,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
             cellGUIAttr.setPrintBackground(printAndExportBackground.isSelected());
         }
 
-        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("Show_Content"))) {
+        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Show_Content"))) {
             cellGUIAttr.setShowAsDefault(showContent.getSelectedIndex() == 0);
             cellGUIAttr.setShowAsImage(showContent.getSelectedIndex() == 1);
             cellGUIAttr.setShowAsHTML(showContent.getSelectedIndex() == 2);
@@ -300,7 +308,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
             }
         }
 
-        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("CellWrite-ToolTip"))) {
+        if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_CellWrite_ToolTip"))) {
             if (tooltipTextField.getText() == null || tooltipTextField.getText().trim().length() <= 0) {
                 cellGUIAttr.setTooltipText(fieldName);
             } else {

designer/src/com/fr/design/mainframe/templateinfo/JWorkBookProcessInfo.java

@@ -0,0 +1,74 @@
+package com.fr.design.mainframe.templateinfo;
+
+import com.fr.base.parameter.ParameterUI;
+import com.fr.main.impl.WorkBook;
+import com.fr.report.cellcase.CellCase;
+import com.fr.report.poly.PolyWorkSheet;
+import com.fr.report.worksheet.WorkSheet;
+
+import java.util.Iterator;
+
+/**
+ * Created by plough on 2017/3/17.
+ */
+public class JWorkBookProcessInfo extends TemplateProcessInfo<WorkBook> {
+
+    public JWorkBookProcessInfo(WorkBook wb) {
+        super(wb);
+    }
+
+    // 获取模板类型
+    public int getReportType() {
+        return template.isElementCaseBook() ? 0 : 1;
+    }
+
+    // 获取模板格子数
+    public int getCellCount() {
+        int cellCount = 0;
+        if (template.isElementCaseBook()) {  // 如果是普通报表
+            for (int i = 0; i < template.getReportCount(); i++) {
+                WorkSheet r = (WorkSheet) template.getReport(i);
+                CellCase cc = r.getBlock().getCellCase();
+                for (int j = 0; j < cc.getRowCount(); j++) {
+                    Iterator iter = cc.getRow(j);
+                    while (iter.hasNext()) {
+                        cellCount ++;
+                        iter.next();
+                    }
+                }
+            }
+        }
+        return cellCount;
+    }
+    // 获取模板悬浮元素个数
+    public int getFloatCount() {
+        int chartCount = 0;
+        if (template.isElementCaseBook()) {  // 如果是普通报表
+            for (int i = 0; i < template.getReportCount(); i++) {
+                WorkSheet r = (WorkSheet) template.getReport(i);
+                Iterator fiter = r.getBlock().floatIterator();
+                while (fiter.hasNext()) {
+                    chartCount ++;
+                    fiter.next();
+                }
+            }
+        }
+        return chartCount;
+    }
+    // 获取模板聚合块个数
+    public int getBlockCount() {
+        int blockCount = 0;
+        if (!template.isElementCaseBook()) {  // 如果是聚合报表
+            for (int i = 0; i < template.getReportCount(); i++) {
+                PolyWorkSheet r = (PolyWorkSheet) template.getReport(i);
+                blockCount += r.getBlockCount();
+            }
+        }
+        return blockCount;
+    }
+    // 获取模板控件数
+    public int getWidgetCount() {
+        ParameterUI pui = template.getReportParameterAttr().getParameterUI();
+        return pui == null ? 0 : (pui.getAllWidgets().length - 1);
+    }
+}

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

@@ -19,6 +19,7 @@ import javax.swing.SpinnerNumberModel;
 import javax.swing.SwingConstants;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.GraphHelper;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.border.UITitledBorder;
 import com.fr.design.dialog.BasicPane;
@@ -109,9 +110,12 @@ public class ReportColumnsPane extends BasicPane{
         onOffButtonGroup.addActionListener(onOffListener);
 
         UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer_ReportColumns-Columns"));
-        uiLabel.setFont(FRFont.getInstance(FONT_NAME, Font.PLAIN, FONT_SIZE));
+        FRFont uiLableFont = FRFont.getInstance(FONT_NAME, Font.PLAIN, FONT_SIZE);
+        uiLabel.setFont(uiLableFont);
         uiLabel.setHorizontalAlignment(SwingConstants.CENTER);
-        uiLabel.setPreferredSize(new Dimension(100,20));
+        int uiLabelWidth = GraphHelper.getLocTextWidth("FR-Designer_ReportColumns-Columns", uiLableFont);
+
+        uiLabel.setPreferredSize(new Dimension(uiLabelWidth, 20));
         north.add(uiLabel,BorderLayout.WEST);
         JPanel buttonGroupPane = new JPanel(new FlowLayout(FlowLayout.CENTER, 23,11));
         buttonGroupPane.add(onOffButtonGroup);
@@ -200,7 +204,7 @@ public class ReportColumnsPane extends BasicPane{
         JPanel sampleLablePane = new JPanel(new GridLayout(1,2));
         sampleLablePane.setPreferredSize(new Dimension(524, 130));
         JPanel rPane = new JPanel();
-        UILabel rLabel = new UILabel(BaseUtils.readIcon("/com/fr/design/images/reportcolumns/row.png"));
+        UILabel rLabel = new UILabel(BaseUtils.readIcon("/com/fr/design/images/reportcolumns/" + Inter.getLocText("FR-Designer_Row_Icon_File_Name")));
         rLabel.setBorder(BorderFactory.createEmptyBorder(5,45,0,49));
         rPane.add(rLabel);
         rowButton = new UIRadioButton(Inter.getLocText("ReportColumns-Columns_horizontally"));
@@ -260,7 +264,7 @@ public class ReportColumnsPane extends BasicPane{
         GUICoreUtils.setColumnForSpinner(maxNumberSpinner, 6);
         maxRadioButton.addActionListener(maxBtnListener);
         maxUILabel = new UILabel(COLUMN_ROW_TEXTS[rowOrColumn] );
-        JPanel maxRowRadioPane = GUICoreUtils.createFlowPane(new JComponent[]{maxRadioButton, maxNumberSpinner, maxUILabel, new UILabel(Inter.getLocText("FR-Designer_ReportColumns-Columns"))}, FlowLayout.CENTER);
+        JPanel maxRowRadioPane = GUICoreUtils.createFlowPane(new JComponent[]{maxRadioButton, maxNumberSpinner, maxUILabel, new UILabel(Inter.getLocText("FR-Designer_ReportColumns_Columns_Optional"))}, FlowLayout.CENTER);
         RowMaxOrSetPane.add(maxRowRadioPane);
         //marks:分成多少行
         toXRadioButton = new UIRadioButton(Inter.getLocText("ReportColumns-Columns_to"));
@@ -308,7 +312,7 @@ public class ReportColumnsPane extends BasicPane{
         rowPane.setBorder(explainBorder);
         rowPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5,13));
         rowPane.setPreferredSize(new Dimension(500,80));
-        rowPane.add(new UILabel(Inter.getLocText(new String[]{"ReportColumns-Columns","Data"}) + ":"));
+        rowPane.add(new UILabel(Inter.getLocText(new String[]{"FR-Designer_ReportColumns_Columns_Optional","Data"}) + ":"));
         repeatColDataTextField = new UITextField();
         repeatColDataTextField.setPreferredSize(new Dimension(107,24));
         rowPane.add(repeatColDataTextField);

designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java

@@ -6,6 +6,7 @@ import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.general.data.index.Index;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -19,7 +20,7 @@ import java.util.List;
  */
 public class MobileRadioGroupPane extends BasicBeanPane<MobileFitAttrState>{
 
-    private List<UIRadioButton> radioButtons = new ArrayList<UIRadioButton>();
+    private List<IndexRadioButton> radioButtons = new ArrayList<IndexRadioButton>();
 
     public MobileRadioGroupPane(String title) {
         initComponents(title);
@@ -30,26 +31,33 @@ public class MobileRadioGroupPane extends BasicBeanPane<MobileFitAttrState>{
         double[] rowSize = {p};
         double[] columnSize = {p, p, p, p, p, p};
 
-        UIRadioButton defaultRadio = new UIRadioButton(MobileFitAttrState.DEFAULT.description());
+        IndexRadioButton defaultRadio = new IndexRadioButton(MobileFitAttrState.DEFAULT.description(), MobileFitAttrState.DEFAULT);
         defaultRadio.setSelected(true);
-        UIRadioButton horizonRadio = new UIRadioButton(MobileFitAttrState.HORIZONTAL.description());
+        IndexRadioButton horizonRadio = new IndexRadioButton(MobileFitAttrState.HORIZONTAL.description(), MobileFitAttrState.HORIZONTAL);
-        UIRadioButton verticalRadio = new UIRadioButton(MobileFitAttrState.VERTICAL.description());
+        IndexRadioButton verticalRadio = new IndexRadioButton(MobileFitAttrState.VERTICAL.description(), MobileFitAttrState.VERTICAL);
-        UIRadioButton bidirectionalRadio = new UIRadioButton(MobileFitAttrState.BIDIRECTIONAL.description());
+        IndexRadioButton bidirectionalRadio = new IndexRadioButton(MobileFitAttrState.BIDIRECTIONAL.description(), MobileFitAttrState.BIDIRECTIONAL);
-        UIRadioButton notFitRadio = new UIRadioButton(MobileFitAttrState.NONE.description());
+        IndexRadioButton notFitRadio = new IndexRadioButton(MobileFitAttrState.NONE.description(), MobileFitAttrState.NONE);
 
         addToButtonGroup(defaultRadio, horizonRadio, verticalRadio, notFitRadio, bidirectionalRadio);
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(title), defaultRadio, horizonRadio, verticalRadio, notFitRadio, bidirectionalRadio}
+                new Component[] {
+                        new UILabel(title),
+                        defaultRadio,
+                        horizonRadio,
+                        verticalRadio,
+                        bidirectionalRadio,
+                        notFitRadio
+                }
         };
         JPanel fitOpsPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         fitOpsPane.setBorder(BorderFactory.createEmptyBorder(10, 13, 10, 10));
         this.add(fitOpsPane);
     }
 
-    private void addToButtonGroup(UIRadioButton... radios) {
+    private void addToButtonGroup(IndexRadioButton... radios) {
         ButtonGroup buttonGroup = new ButtonGroup();
-        for (UIRadioButton radio : radios) {
+        for (IndexRadioButton radio : radios) {
             radioButtons.add(radio);
             buttonGroup.add(radio);
         }
@@ -59,7 +67,7 @@ public class MobileRadioGroupPane extends BasicBeanPane<MobileFitAttrState>{
      * 设置按钮状态
      */
     public void setEnabled(boolean enabled) {
-        for (UIRadioButton radioButton : radioButtons) {
+        for (IndexRadioButton radioButton : radioButtons) {
             radioButton.setEnabled(enabled);
         }
     }
@@ -72,7 +80,7 @@ public class MobileRadioGroupPane extends BasicBeanPane<MobileFitAttrState>{
     public int getSelectRadioIndex() {
         for (int i = 0, len = radioButtons.size(); i < len; i++) {
             if (radioButtons.get(i).isSelected()) {
-                return i;
+                return radioButtons.get(i).getRadioButtonIndex();
             }
         }
 
@@ -87,15 +95,18 @@ public class MobileRadioGroupPane extends BasicBeanPane<MobileFitAttrState>{
             return;
         }
 
-        UIRadioButton button = radioButtons.get(index);
+        for (IndexRadioButton radioButton : this.radioButtons) {
-        button.setSelected(true);
+            if (radioButton.getRadioButtonIndex() == index) {
+                radioButton.setSelected(true);
+            }
+        }
     }
 
     /**
      * 给所有的按钮加上监听
      */
     public void addActionListener(ActionListener actionListener) {
-        for (UIRadioButton radioButton : radioButtons) {
+        for (IndexRadioButton radioButton : radioButtons) {
             radioButton.addActionListener(actionListener);
         }
     }
@@ -116,3 +127,24 @@ public class MobileRadioGroupPane extends BasicBeanPane<MobileFitAttrState>{
         return StringUtils.EMPTY;
     }
 }
+
+/**
+ * created by fanglei on 2017/1/16
+ * 不再用radioButtonGroup的数组下标作为index，而是给每个按钮传入MobileFitAttrState的枚举值
+ */
+class IndexRadioButton extends UIRadioButton {
+    private int index;
+
+    IndexRadioButton(String text, MobileFitAttrState mobileFitAttrState) {
+        super(text);
+        this.index = mobileFitAttrState.getState();
+    }
+
+    public int getRadioButtonIndex() {
+        return this.index;
+    }
+
+    public void setRadioButtonIndex(int index) {
+        this.index = index;
+    }
+}

designer/src/com/fr/design/report/mobile/MobileUseHtmlGroupPane.java

@@ -7,6 +7,10 @@ import com.fr.report.mobile.ElementCaseMobileAttr;
  * Created by kunsnat on 2016/8/3.
  */
 public class MobileUseHtmlGroupPane extends MobileUseHtmlGroupBeanPane<ElementCaseMobileAttr> {
+    public MobileUseHtmlGroupPane(String annotation) {
+        super(annotation);
+    }
+
     @Override
     public void populateBean(ElementCaseMobileAttr mobileAttr) {
         if(mobileAttr != null) {

designer/src/com/fr/design/report/mobile/ReportMobileAttrPane.java

@@ -34,7 +34,7 @@ public class ReportMobileAttrPane extends BasicBeanPane<ElementCaseMobileAttr>{
         appFitBrowserPane.setAppFitPreviewPane(appFitPreviewPane);
         jPanel.add(appFitBrowserPane);
 
-        jPanel.add(htmlGroupPane = new MobileUseHtmlGroupPane());
+        jPanel.add(htmlGroupPane = new MobileUseHtmlGroupPane(Inter.getLocText("FR-Designer_Mobile_Report_Analysis_Annotation")));
 
         jPanel.add(mobileToolBarPane = new MobileToolBarPane());
 

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

@@ -7,6 +7,7 @@ import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.fun.ExportToolBarProvider;
+import com.fr.design.fun.ExtraButtonToolBarProvider;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -199,7 +200,7 @@ public class EditToolBar extends BasicPane {
 				toolBarButton.setWidget(widget);
 				if (widget instanceof Button) {
 					String iconname = ((Button) widget).getIconName();
-					if (!StringUtils.isBlank(iconname)) {
+					if (StringUtils.isNotBlank(iconname)) {
 						Image iimage = WidgetManager.getProviderInstance().getIconManager().getIconImage(iconname);
 						toolBarButton.setIcon(new ImageIcon(iimage));
 					}
@@ -328,15 +329,16 @@ public class EditToolBar extends BasicPane {
 		private JavaScriptActionPane javaScriptPane;
 		private ExportToolBarProvider[] exportToolBarProviders;
 
-		private ChangeListener changeListener = new ChangeListener() {
+		private ActionListener actionListener = new ActionListener() {
-			public void stateChanged(ChangeEvent e) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
 				if (isVerify.isSelected()) {
 					failSubmit.setVisible(true);
 				} else {
 					failSubmit.setVisible(false);
+					failSubmit.setSelected(false);
 				}
 			}
-
 		};
 
 		public ButtonPane() {
@@ -386,6 +388,11 @@ public class EditToolBar extends BasicPane {
 			centerPane.add(getCpane(), "appendcount");
 			centerPane.add(getSubmitPane(), "submit");
 
+            Set<ExtraButtonToolBarProvider> extraButtonSet = ExtraDesignClassManager.getInstance().getArray(ExtraButtonToolBarProvider.XML_TAG);
+            for (ExtraButtonToolBarProvider provider : extraButtonSet) {
+                provider.updateCenterPane(centerPane);
+            }
+
 			this.add(centerPane, BorderLayout.CENTER);
 		}
 
@@ -475,11 +482,10 @@ public class EditToolBar extends BasicPane {
 			submitPane.add(isVerify);
 			submitPane.add(failSubmit);
 			submitPane.add(isCurSheet);
-			isVerify.addChangeListener(changeListener);
+			isVerify.addActionListener(actionListener);
 			return submitPane;
 		}
 
-
 		@Override
 		protected String title4PopupWindow() {
 			return "Button";
@@ -528,6 +534,11 @@ public class EditToolBar extends BasicPane {
 			} else if (widget instanceof CustomToolBarButton) {
 				populateCustomToolBarButton();
 			}
+
+            Set<ExtraButtonToolBarProvider> extraButtonSet = ExtraDesignClassManager.getInstance().getArray(ExtraButtonToolBarProvider.XML_TAG);
+            for (ExtraButtonToolBarProvider provider : extraButtonSet) {
+                provider.populate(widget, card, centerPane);
+            }
         }
 
 		private void populateAppendColumnRow(){
@@ -563,6 +574,9 @@ public class EditToolBar extends BasicPane {
 			card.show(centerPane, "submit");
 			Submit submit = ((Submit) widget);
 			this.isVerify.setSelected(submit.isVerify());
+			if (!submit.isVerify()) {
+				this.failSubmit.setVisible(false);
+			}
 			this.failSubmit.setSelected(submit.isFailVerifySubmit());
 			this.isCurSheet.setSelected(submit.isOnlySubmitSelect());
 		}
@@ -613,6 +627,12 @@ public class EditToolBar extends BasicPane {
 			if (widget instanceof Button) {
 				updateDefault();
 			}
+
+            Set<ExtraButtonToolBarProvider> extraButtonSet = ExtraDesignClassManager.getInstance().getArray(ExtraButtonToolBarProvider.XML_TAG);
+            for (ExtraButtonToolBarProvider provider : extraButtonSet) {
+                provider.update(widget);
+            }
+
 			return widget;
 		}
 

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

@@ -27,8 +27,8 @@ import java.util.List;
 
 public class PageToolBarPane extends AbstractEditToolBarPane {
 	
-	private UIRadioButton centerRadioButton = new UIRadioButton(Inter.getLocText(new String[]{"Center", "Display"}));
+	private UIRadioButton centerRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Center_Display"));
-	private UIRadioButton leftRadioButton = new UIRadioButton(Inter.getLocText(new String[]{"Left", "Display"}));
+	private UIRadioButton leftRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Left_Display"));
 	
 	private UICheckBox isUseToolBarCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Use_ToolBar"));
 	private UICheckBox isShowAsImageBox;

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

@@ -36,8 +36,8 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
 
 	@Override
 	protected JPanel createOtherSetPane() {
-		centerRadioButton = new UIRadioButton(Inter.getLocText(new String[]{"Center", "Display"}));
+		centerRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Center_Display"));
-		leftRadioButton = new UIRadioButton(Inter.getLocText(new String[]{"Left", "Display"}));
+		leftRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Left_Display"));
 		ButtonGroup buttonGroup = new ButtonGroup();
 		leftRadioButton.setSelected(true);
 		buttonGroup.add(centerRadioButton);
@@ -45,15 +45,15 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
 		JPanel buttonpane = new JPanel(FRGUIPaneFactory.createBoxFlowLayout());
 		buttonpane.add(centerRadioButton);
 		buttonpane.add(leftRadioButton);
-		isShowAsImageBox = new UICheckBox(Inter.getLocText("Is_Paint_Page"));
+		isShowAsImageBox = new UICheckBox(Inter.getLocText("FR-Designer_Is_Paint_Page"));
-		isAutoScaleBox = new UICheckBox(Inter.getLocText("IS_Auto_Scale"));
+		isAutoScaleBox = new UICheckBox(Inter.getLocText("FR-Designer_IS_Auto_Scale"));
-		isTDHeavyBox = new UICheckBox(Inter.getLocText("IS_TD_HEAVY_EXPORT"), false);
+		isTDHeavyBox = new UICheckBox(Inter.getLocText("FR-Designer_IS_TD_HEAVY_EXPORT"), false);
 		double p = TableLayout.PREFERRED;
 		double[] columnSize = { p,p,p};
 		double[] rowSize = { p, p,p,p };
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("Report_Show_Location") + ":", UILabel.RIGHT), buttonpane,null},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Report_Show_Location") + ":", UILabel.RIGHT), buttonpane,null},
-                new Component[]{new UILabel(Inter.getLocText("PageSetup-Page") + ":", UILabel.RIGHT), isShowAsImageBox, isAutoScaleBox},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_PageSetup_Page") + ":", UILabel.RIGHT), isShowAsImageBox, isAutoScaleBox},
                 new Component[]{null, isTDHeavyBox, null}
         };
 

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

@@ -78,13 +78,13 @@ public class ReportWebWidgetConstants {
     public static final WidgetOption EDIT = WidgetOptionFactory.createByWidgetClass("Edit", Edit.class);
 
     // 导出成Excel 分页导出
-    public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Excel", "Export-Excel-Page"}, new String[]{"(", ")"}),
+    public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Excel", "FR-Designer_Export_Excel_Page"}, new String[]{"(", ")"}),
             BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class);
     // 导出成Excel 原样导出
-    public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Excel", "Export-Excel-Simple"}, new String[]{"(", ")"}),
+    public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Excel", "FR-Designer_Export_Excel_Simple"}, new String[]{"(", ")"}),
             BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class);
     // 导出成Excel 分页分Sheet导出
-    public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Excel", "Export-Excel-PageToSheet"}, new String[]{"(", ")"}),
+    public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Excel", "FR-Designer_Export_Excel_PageToSheet"}, new String[]{"(", ")"}),
             BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelS.class);
 
     // 导出成Word

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

@@ -126,25 +126,9 @@ public class ToolBarDragPane extends WidgetToolBarPane {
 				}
 			}
 		});
-		layoutTable = new JTable(toolbarButtonTableModel);
+
-		layoutTable.setDefaultRenderer(Object.class, tableRenderer);
+		initLayoutTable();
-		layoutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+
-		layoutTable.setColumnSelectionAllowed(false);
-		layoutTable.setRowSelectionAllowed(false);
-		layoutTable.setBackground(Color.white);
-		layoutTable.addMouseListener(new MouseAdapter() {
-			public void mouseClicked(MouseEvent e) {
-				if (e.getClickCount() > 1 && !(SwingUtilities.isRightMouseButton(e)) && isEnabled) {
-					WidgetOption no = (WidgetOption)layoutTable.getValueAt(layoutTable.getSelectedRow(), layoutTable.getSelectedColumn());
-					Widget widget = no.createWidget();
-					ToolBarButton tb = new ToolBarButton(no.optionIcon(), widget);
-					tb.setNameOption(no);
-					northToolBar.add(tb);
-					northToolBar.validate();
-					northToolBar.repaint();
-				}
-			}
-		});
 		JPanel center = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		center.setBackground(Color.white);
 		center.add(topButton, BorderLayout.NORTH);
@@ -178,6 +162,33 @@ public class ToolBarDragPane extends WidgetToolBarPane {
 		isUseToolBarCheckBox.setSelected(true);
 	}
 
+	private void initLayoutTable() {
+		layoutTable = new JTable(toolbarButtonTableModel);
+		layoutTable.setDefaultRenderer(Object.class, tableRenderer);
+		layoutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+		layoutTable.setColumnSelectionAllowed(false);
+		layoutTable.setRowSelectionAllowed(false);
+		layoutTable.setBackground(Color.white);
+		int columnWidth = Integer.parseInt(Inter.getLocText("FR-Designer_LayoutTable_Column_Width"));
+		for (int i = 0; i < layoutTable.getColumnModel().getColumnCount(); i++) {
+			layoutTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidth);
+		}
+		layoutTable.addMouseListener(new MouseAdapter() {
+			public void mouseClicked(MouseEvent e) {
+				if (e.getClickCount() > 1 && !(SwingUtilities.isRightMouseButton(e)) && isEnabled) {
+					WidgetOption no = (WidgetOption)layoutTable.getValueAt(layoutTable.getSelectedRow(), layoutTable.getSelectedColumn());
+					Widget widget = no.createWidget();
+					ToolBarButton tb = new ToolBarButton(no.optionIcon(), widget);
+					tb.setNameOption(no);
+					northToolBar.add(tb);
+					northToolBar.validate();
+					northToolBar.repaint();
+				}
+			}
+		});
+	}
+
+
 	private boolean isSelectedtable() {
 		for (int i = 0; i < layoutTable.getColumnCount(); i++) {
 			if (layoutTable.isColumnSelected(i)) {

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

@@ -39,8 +39,8 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
     private UIRadioButton topRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Top"));
     private UIRadioButton bottomRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Bottom"));
     private UILabel sheetShowLocationLabel = new UILabel("sheet" + Inter.getLocText(new String[]{"Label", "Page_Number", "Display position"}) + ":");
-    private UIRadioButton centerRadioButton = new UIRadioButton(Inter.getLocText(new String[]{"Center", "Display"}));
+    private UIRadioButton centerRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Center_Display"));
-    private UIRadioButton leftRadioButton = new UIRadioButton(Inter.getLocText(new String[]{"Left", "Display"}));
+    private UIRadioButton leftRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Left_Display"));
     private UILabel rptShowLocationLabel = new UILabel(Inter.getLocText("FR-Designer_Report_Show_Location") + ":", UILabel.LEFT);
     private UICheckBox isUseToolBarCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Use_ToolBar"));
     private UIButton editToolBarButton = new UIButton(Inter.getLocText("FR-Designer_Edit"));
@@ -76,7 +76,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
         colorButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png"));
         northPane.add(GUICoreUtils.createFlowPane(new Component[]{colorBox, colorButton}, FlowLayout.LEFT));
 
-        unloadCheck = new UICheckBox(Inter.getLocText(new String[]{"Event-unloadcheck", "Tooltips"}));
+        unloadCheck = new UICheckBox(Inter.getLocText("FR-Designer_Unload_Check"));
         unloadCheck.setSelected(true);
 
         showWidgets = new UICheckBox(Inter.getLocText("FR-Designer_Event_ShowWidgets"));

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

@@ -42,8 +42,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
 
     @Override
     protected JPanel createOtherSetPane() {
-        colorBox = new UICheckBox(Inter.getLocText(new String[]{"Face_Write", "Current", "Edit", "Row",
+        colorBox = new UICheckBox(Inter.getLocText("FR-Designer_Set_BG_Of_Current_Row") + ":");
-                "Background", "Set"}) + ":");
         colorBox.setSelected(true);
         colorButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png"));
         colorBox.addActionListener(new ActionListener() {
@@ -66,15 +65,15 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
 
         //Sean: 报表显示位置since 706
         rptShowLocationLabel = new UILabel(Inter.getLocText("FR-Designer_Report_Show_Location") + ":", UILabel.LEFT);
-        centerRadioButton = new UIRadioButton(Inter.getLocText(new String[]{"Center", "Display"}));
+        centerRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Center_Display"));
-        leftRadioButton = new UIRadioButton(Inter.getLocText(new String[]{"Left", "Display"}));
+        leftRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Left_Display"));
         ButtonGroup rptShowButtonGroup = new ButtonGroup();
         leftRadioButton.setSelected(true);
         rptShowButtonGroup.add(centerRadioButton);
         rptShowButtonGroup.add(leftRadioButton);
         JPanel showLocPane = GUICoreUtils.createFlowPane(new Component[]{rptShowLocationLabel, centerRadioButton, leftRadioButton}, FlowLayout.LEFT);
 
-        unloadCheck = new UICheckBox(Inter.getLocText(new String[]{"Event-unloadcheck", "Tooltips"}));
+        unloadCheck = new UICheckBox(Inter.getLocText("FR-Designer_Unload_Check"));
         unloadCheck.setSelected(true);
 
         showWidgets = new UICheckBox(Inter.getLocText(new String[]{"Event-showWidgets"}));

designer/src/com/fr/design/widget/CellWidgetCardPane.java

@@ -22,22 +22,26 @@ import java.awt.*;
 public class CellWidgetCardPane extends BasicPane {
     //当前的编辑器属性定义面板
     private DataModify<? extends Widget> currentEditorDefinePane;
-
+    //属性配置切换面板
     private JTabbedPane tabbedPane;
-
     private BasicWidgetPropertySettingPane widgetPropertyPane;
-    private JPanel attriPane;
-    private JPanel cardPane;
-    private CardLayout card;
 
-    private JPanel presPane;
+    //通用属性容器
-    private JPanel cardPaneForPresent;
+    private JPanel attriTabPane;
-    private CardLayout cardForPresent;
+    private JPanel attriCardPane;
+    private CardLayout attriCardLayout;
+
+    //数字字典属性容器
+    private JPanel dictTabPane;
+    private JPanel dictCardPane;
+    private CardLayout dictCardLayout;
 
-    private JPanel cardPaneForTreeSetting;
+    //构建树属性容器
+    private JPanel treeTabPane;
 
-    private JPanel formPane;
+    //事件属性容器
-    private WidgetEventPane eventTabPane;
+    private JPanel eventTabPane;
+    private WidgetEventPane eventPane;
 
     public CellWidgetCardPane(ElementCasePane pane) {
         this.initComponents(pane);
@@ -47,26 +51,31 @@ public class CellWidgetCardPane extends BasicPane {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         tabbedPane = new UITabbedPane();
         this.add(tabbedPane, BorderLayout.CENTER);
-        attriPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        attriTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        formPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        eventTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        eventTabPane = new WidgetEventPane(pane);
+        eventPane = new WidgetEventPane(pane);
-        formPane.add(eventTabPane, BorderLayout.CENTER);
+        eventTabPane.add(eventPane, BorderLayout.CENTER);
-        tabbedPane.add(Inter.getLocText("FR-Designer_Attribute"), attriPane);
+        tabbedPane.add(Inter.getLocText("FR-Designer_Attribute"), attriTabPane);
-        tabbedPane.add(Inter.getLocText("FR-Designer_Form_Editing_Listeners"), formPane);
+        tabbedPane.add(Inter.getLocText("FR-Designer_Form_Editing_Listeners"), eventTabPane);
 
-        presPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        dictTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        cardPaneForPresent = FRGUIPaneFactory.createCardLayout_S_Pane();
+        dictCardPane = FRGUIPaneFactory.createCardLayout_S_Pane();
-        presPane.add(cardPaneForPresent, BorderLayout.CENTER);
+        dictTabPane.add(dictCardPane, BorderLayout.CENTER);
-        cardForPresent = new CardLayout();
+        dictCardLayout = new CardLayout();
-        cardPaneForPresent.setLayout(cardForPresent);
+        dictCardPane.setLayout(dictCardLayout);
 
-        cardPaneForTreeSetting = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        treeTabPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 
         widgetPropertyPane = new BasicWidgetPropertySettingPane();
-        attriPane.add(widgetPropertyPane, BorderLayout.NORTH);
+        JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        cardPane = FRGUIPaneFactory.createCardLayout_S_Pane();
+        northPane.setBorder(BorderFactory.createEmptyBorder(5, 8, 0, 8));
-        attriPane.add(cardPane, BorderLayout.CENTER);
+        JPanel basic = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Form_Basic_Properties"));
-        card = (CardLayout) cardPane.getLayout();
+        northPane.add(basic);
+        basic.add(widgetPropertyPane);
+        attriTabPane.add(northPane, BorderLayout.NORTH);
+        attriCardPane = FRGUIPaneFactory.createCardLayout_S_Pane();
+        attriTabPane.add(attriCardPane, BorderLayout.CENTER);
+        attriCardLayout = (CardLayout) attriCardPane.getLayout();
         this.setPreferredSize(new Dimension(600, 450));
     }
 
@@ -84,49 +93,44 @@ public class CellWidgetCardPane extends BasicPane {
             this.tabbedPane.setEnabled(true);
         }
 
-        attriPane.remove(widgetPropertyPane);
-        widgetPropertyPane = new BasicWidgetPropertySettingPane();
-        JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        northPane.setBorder(BorderFactory.createEmptyBorder(5, 8, 0, 8));
-        JPanel basic = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Form_Basic_Properties"));
-        northPane.add(basic);
-        basic.add(widgetPropertyPane);
-        attriPane.add(northPane, BorderLayout.NORTH);
-
         WidgetDefinePaneFactory.RN rn = WidgetDefinePaneFactory.createWidgetDefinePane(cellWidget, new Operator() {
             @Override
             public void did(DataCreatorUI ui, String cardName) {
                 if (ui == null) {
-                    addPresPane(false);
+                    removeDictAttriPane();
-                    addTreeSettingPane(false);
+                    removeTreeAttriPane();
                 }
                 if (ui instanceof DictionaryPane) {
+                    removeDictAttriPane();
+                    removeTreeAttriPane();
                     showDictPane(ui, cardName);
                 } else if (ui instanceof TreeSettingPane) {
+                    removeDictAttriPane();
+                    removeTreeAttriPane();
                     showTreePane(ui);
                 }
             }
         });
         DataModify<? extends Widget> definePane = rn.getDefinePane();
-        cardPane.add(definePane.toSwingComponent(), rn.getCardName());
+        attriCardPane.add(definePane.toSwingComponent(), rn.getCardName());
-        card.show(cardPane, rn.getCardName());
+        attriCardLayout.show(attriCardPane, rn.getCardName());
         currentEditorDefinePane = definePane;
-        eventTabPane.populate(cellWidget);
+        eventPane.populate(cellWidget);
         widgetPropertyPane.populate(cellWidget);
         tabbedPane.setSelectedIndex(0);
     }
 
     private void showDictPane(DataCreatorUI ui, String cardName) {
-        cardPaneForPresent.removeAll();
+        dictCardPane.removeAll();
-        cardPaneForPresent.add(ui.toSwingComponent(), cardName);
+        dictCardPane.add(ui.toSwingComponent(), cardName);
-        cardForPresent.show(cardPaneForPresent, cardName);
+        dictCardLayout.show(dictCardPane, cardName);
-        addPresPane(true);
+        addDictAttriPane();
     }
 
     private void showTreePane(DataCreatorUI ui) {
-        cardPaneForTreeSetting.removeAll();
+        treeTabPane.removeAll();
-        cardPaneForTreeSetting.add(ui.toSwingComponent());
+        treeTabPane.add(ui.toSwingComponent());
-        addTreeSettingPane(true);
+        addTreeAttriPane();
     }
 
     public Widget update() {
@@ -139,7 +143,7 @@ public class CellWidgetCardPane extends BasicPane {
         }
         widgetPropertyPane.update(widget);
 
-        Listener[] listener = eventTabPane == null ? new Listener[0] : eventTabPane.updateListeners();
+        Listener[] listener = eventPane == null ? new Listener[0] : eventPane.updateListeners();
         widget.clearListeners();
         for (Listener l : listener) {
             widget.addListener(l);
@@ -155,25 +159,26 @@ public class CellWidgetCardPane extends BasicPane {
      */
     public void checkValid() throws Exception {
         currentEditorDefinePane.checkValid();
-        eventTabPane.checkValid();
+        eventPane.checkValid();
     }
 
-    //:jackie  如果选择的项有形态，则将形态面板加入tab面板
+
-    private void addPresPane(boolean add) {
+    private void addDictAttriPane() {
-        if (add) {
+        tabbedPane.add(this.dictTabPane, 1);
-            tabbedPane.add(this.presPane, 1);
         tabbedPane.setTitleAt(1, Inter.getLocText("FR-Designer_DS_Dictionary"));
-        } else {
-            tabbedPane.remove(presPane);
-        }
     }
 
-    private void addTreeSettingPane(boolean add) {
+    private void addTreeAttriPane() {
-        if (add) {
+        tabbedPane.add(this.treeTabPane, 1);
-            tabbedPane.add(this.cardPaneForTreeSetting, 1);
         tabbedPane.setTitleAt(1, Inter.getLocText("FR-Designer_Create_Tree"));
-        } else {
-            tabbedPane.remove(this.cardPaneForTreeSetting);
     }
+
+    private void removeDictAttriPane() {
+        tabbedPane.remove(this.dictTabPane);
     }
+
+    private void removeTreeAttriPane() {
+        tabbedPane.remove(this.treeTabPane);
+    }
+
 }

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

@@ -1 +1 @@
-package com.fr.design.widget.ui;

import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import com.fr.general.Inter;

import javax.swing.*;
import java.awt.*;

/**
design.gui.icheckbox.UICheckBox;
design.gui.icheckbox.UICheckBox;
design.gui.icheckbox.UICheckBox;
design.gui.icheckbox.UICheckBox;
import com.fr.design.layout.FRGUIPaneFactory;
design.gui.icheckbox.UICheckBox;
import com.fr.design.utils.gui.GUICoreUtils;
design.gui.icheckbox.UICheckBox;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;

design.gui.icheckbox.UICheckBox;
import com.fr.general.Inter;

design.gui.icheckbox.UICheckBox;

design.gui.icheckbox.UICheckBox;
import javax.swing.*;
design.gui.icheckbox.UICheckBox;
import java.awt.*;

design.gui.icheckbox.UICheckBox;
/**
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.FRGUIPaneFactory;
design.gui.icheckbox.UICheckBox;
		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
		this.customDataCheckBox.setPreferredSize(new Dimension(100, 30));
		getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{this.customDataCheckBox}, FlowLayout.LEFT, 5));
		JPanel otherContentPane = this.setForthContentPane();
		if (otherContentPane != null) {
			contentPane.add(otherContentPane,BorderLayout.CENTER);
		}
		return contentPane;
	}

	protected abstract JPanel setForthContentPane();

	protected void populateSubWritableRepeatEditorBean(T e) {
		this.customDataCheckBox.setSelected(e.isCustomData());
		populateSubCustomWritableRepeatEditorBean(e);
	}

	protected abstract void populateSubCustomWritableRepeatEditorBean(T e);

	protected T updateSubWritableRepeatEditorBean() {
		T e = updateSubCustomWritableRepeatEditorBean();
		e.setCustomData(this.customDataCheckBox.isSelected());
		return e;
	}

	protected abstract T updateSubCustomWritableRepeatEditorBean();

}
+package com.fr.design.widget.ui;

import com.fr.base.GraphHelper;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import com.fr.general.Inter;
import com.fr.design.utils.gui.GUICoreUtils;
design.gui.icheckbox.UICheckBox;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.design.utils.gui.GUICoreUtils;

import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.Inter;
import com.fr.design.utils.gui.GUICoreUtils;

import com.fr.design.utils.gui.GUICoreUtils;
import javax.swing.*;
import com.fr.design.utils.gui.GUICoreUtils;
import java.awt.*;
import com.fr.design.utils.gui.GUICoreUtils;
/**
import com.fr.design.utils.gui.GUICoreUtils;
design.gui.icheckbox.UICheckBox;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
design.gui.icheckbox.UICheckBox;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
design.gui.icheckbox.UICheckBox;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import com.fr.general.Inter;

import com.fr.form.ui.CustomWriteAbleRepeatEditor;

import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import javax.swing.*;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
import java.awt.*;
import com.fr.form.ui.CustomWriteAbleRepeatEditor;
/**
import com.fr.general.Inter;
import com.fr.general.Inter;
design.gui.icheckbox.UICheckBox;
import com.fr.general.Inter;
import com.fr.design.layout.FRGUIPaneFactory;
));
		getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{this.customDataCheckBox}, FlowLayout.LEFT, 5));
		JPanel otherContentPane = this.setForthContentPane();
		if (otherContentPane != null) {
			contentPane.add(otherContentPane,BorderLayout.CENTER);
		}
		return contentPane;
	}

	protected abstract JPanel setForthContentPane();

	protected void populateSubWritableRepeatEditorBean(T e) {
		this.customDataCheckBox.setSelected(e.isCustomData());
		populateSubCustomWritableRepeatEditorBean(e);
	}

	protected abstract void populateSubCustomWritableRepeatEditorBean(T e);

	protected T updateSubWritableRepeatEditorBean() {
		T e = updateSubCustomWritableRepeatEditorBean();
		e.setCustomData(this.customDataCheckBox.isSelected());
		return e;
	}

	protected abstract T updateSubCustomWritableRepeatEditorBean();

}

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

@@ -6,6 +6,7 @@ import java.awt.event.ItemListener;
 
 import javax.swing.*;
 
+import com.fr.base.GraphHelper;
 import com.fr.design.gui.ilable.UILabel;
 
 import javax.swing.event.DocumentEvent;
@@ -19,6 +20,8 @@ import com.fr.form.ui.FieldEditor;
 import com.fr.general.Inter;
 
 public abstract class FieldEditorDefinePane<T extends FieldEditor> extends AbstractDataModify<T> {
+    private static final int ALLOW_BLANK_CHECK_BOX_WIDTH = GraphHelper.getLocTextWidth("FR-Designer_Allow_Null") + 30;
+    private static final int ALLOW_BLANK_CHECK_BOX_HEIGHT = 30;
     private UICheckBox allowBlankCheckBox;
     // richer:错误信息，是所有控件共有的属性，所以放到这里来
     private UITextField errorMsgTextField;
@@ -32,6 +35,24 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
     protected void initComponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 8));
+
+        initRegErrorMsgTextField();
+
+        //JPanel firstPanel = FRGUIPaneFactory.createBorderLayout_M_Pane();
+        allowBlankCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Allow_Null"));
+        allowBlankCheckBox.setPreferredSize(new Dimension(ALLOW_BLANK_CHECK_BOX_WIDTH, ALLOW_BLANK_CHECK_BOX_HEIGHT));
+        allowBlankCheckBox.addItemListener(new ItemListener() {
+
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                errorMsgTextField.setEnabled(!allowBlankCheckBox.isSelected());
+            }
+        });
+
+        initErrorMsgPane();
+    }
+
+    protected void initRegErrorMsgTextField() {
         regErrorMsgTextField = new UITextField(16);
         regErrorMsgTextField.getDocument().addDocumentListener(new DocumentListener() {
             public void changedUpdate(DocumentEvent e) {
@@ -46,18 +67,9 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
                 regErrorMsgTextField.setToolTipText(regErrorMsgTextField.getText());
             }
         });
-
-        //JPanel firstPanel = FRGUIPaneFactory.createBorderLayout_M_Pane();
-        allowBlankCheckBox = new UICheckBox(Inter.getLocText("Allow_Blank"));
-        allowBlankCheckBox.setPreferredSize(new Dimension(75, 30));
-        allowBlankCheckBox.addItemListener(new ItemListener() {
-
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                errorMsgTextField.setEnabled(!allowBlankCheckBox.isSelected());
     }
-        });
 
+    protected void initErrorMsgPane() {
         // 错误信息
         JPanel errorMsgPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
         errorMsgPane.add(new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"));
@@ -128,7 +140,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         JPanel firstPane = GUICoreUtils.createFlowPane(new JComponent[]{allowBlankCheckBox}, FlowLayout.LEFT, 5);
         validatePane.add(firstPane);
         JPanel secondPane = GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), errorMsgTextField}, FlowLayout.LEFT, 24);
-        secondPane.setPreferredSize(new Dimension(310, 23));
+        secondPane.setPreferredSize(new Dimension(400, 23));
         validatePane.add(secondPane);
     }
 

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

@@ -61,11 +61,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
         regPane.getRegComboBox().addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 RegExp regExp = (RegExp) regPane.getRegComboBox().getSelectedItem();
-                if (!StringUtils.isNotEmpty(regExp.toRegText())) {
+				getRegErrorMsgTextField().setEnabled(regExp.errorMessageEditable());
-                    getRegErrorMsgTextField().setEnabled(false);
-                } else {
-                    getRegErrorMsgTextField().setEnabled(true);
-                }
 
             }
         });

designer/src/com/fr/design/widget/ui/btn/ButtonSytleDefinedPane.java

@@ -1,12 +1,13 @@
 package com.fr.design.widget.ui.btn;
 
-import java.awt.BorderLayout;
+import java.awt.*;
-import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
+
+import com.fr.base.background.ColorBackground;
 import com.fr.design.gui.ilable.UILabel;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
@@ -18,7 +19,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.gui.frpane.ImgChoosePane;
+import com.fr.design.style.background.BackgroundButtonPane;
 import com.fr.form.ui.FreeButton;
 import com.fr.general.Background;
 import com.fr.general.Inter;
@@ -44,9 +45,9 @@ public class ButtonSytleDefinedPane extends BasicPane {
 
 		JPanel buttonStylePane = new JPanel();
 		buttonStylePane.setLayout(new BorderLayout());
-		initBackgroundPane = new BackgroundPane(Inter.getLocText("Background-Initial") + ":", Inter.getLocText("The_initial_background_of_the_button"));
+		initBackgroundPane = new BackgroundPane(Inter.getLocText("FR-Designer_Background-Initial") + ":", Inter.getLocText("FR-Designer_Initial_Background_Tips"));
-		overBackgroundPane = new BackgroundPane(Inter.getLocText("Background-Over") + ":", Inter.getLocText("Mouse_move-background"));
+		overBackgroundPane = new BackgroundPane(Inter.getLocText("FR-Designer_Background-Over") + ":", Inter.getLocText("FR-Designer_Mouse_Move_Tips"));
-		clickBackgroundPane = new BackgroundPane(Inter.getLocText("Background-Click") + ":",  Inter.getLocText("Mouse_move-background"));
+		clickBackgroundPane = new BackgroundPane(Inter.getLocText("FR-Designer_Background-Click") + ":",  Inter.getLocText("FR-Designer_Mouse_Click_Tips"));
 
 		JPanel table = FRGUIPaneFactory.createYBoxEmptyBorderPane();
 		table.setBorder(new TitledBorder(Inter.getLocText(new String[]{"Custom", "Form-Button", "Style"})));
@@ -84,7 +85,7 @@ public class ButtonSytleDefinedPane extends BasicPane {
 
 	class BackgroundPane extends JPanel {
 		private UIButton editButton;
-		private ImgChoosePane choosePane;
+		private BackgroundButtonPane choosePane;
 		private Background background;
 		private UILabel ImagePreviewPane;
 
@@ -101,13 +102,11 @@ public class ButtonSytleDefinedPane extends BasicPane {
 			ImagePreviewPane.setPreferredSize(new Dimension(100, 20));
 			this.add(ImagePreviewPane);
 
-			editButton = new UIButton(Inter.getLocText("Edit"));
+			editButton = new UIButton(Inter.getLocText("FR-Designer_Edit"));
 			editButton.addActionListener(new ActionListener() {
 
 				public void actionPerformed(ActionEvent e) {
-					if (choosePane == null) {
+					choosePane = new BackgroundButtonPane();
-						choosePane = new ImgChoosePane();
-					}
 					BasicDialog dlg = choosePane.showWindow(SwingUtilities
 							.getWindowAncestor(ButtonSytleDefinedPane.this));
 					dlg.addDialogActionListener(new DialogActionAdapter() {
@@ -116,7 +115,10 @@ public class ButtonSytleDefinedPane extends BasicPane {
 							populate(choosePane.update());
 						}
 					});
-					choosePane.populate((ImageBackground) BackgroundPane.this.background);
+					if(BackgroundPane.this.background == null){
+						BackgroundPane.this.background = new ColorBackground();
+					}
+					choosePane.populate((Background) BackgroundPane.this.background);
 					dlg.setVisible(true);
 				}
 			});
@@ -125,15 +127,22 @@ public class ButtonSytleDefinedPane extends BasicPane {
 		
 		public void populate(Background background) {
 			this.background = background;
+
 			if (background instanceof ImageBackground && ((ImageBackground) background).getImage() != null) {
 				ImagePreviewPane.setIcon(new ImageIcon(((ImageBackground) background).getImage()));
+			} else if(background instanceof ColorBackground && ((ColorBackground) background).getColor() != null){
+				ImagePreviewPane.setIcon(null);
+				ImagePreviewPane.setOpaque(true);
+				ImagePreviewPane.setBackground(((ColorBackground) background).getColor());
 			}else{
 				ImagePreviewPane.setIcon(null);
+				ImagePreviewPane.setOpaque(false);
+				ImagePreviewPane.setBackground(null);
 			}
 		}
 
-		public ImageBackground update() {
+		public Background update() {
-			return (ImageBackground) background;
+			return background;
 		}
 	}
 }

designer/src/com/fr/grid/Grid.java

@@ -10,6 +10,7 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.fun.GridUIProcessor;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.grid.event.CellEditorEvent;
@@ -35,6 +36,7 @@ import javax.swing.plaf.ComponentUI;
 import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
+import java.util.Date;
 import java.util.Hashtable;
 import java.util.Iterator;
 
@@ -1065,6 +1067,13 @@ public class Grid extends BaseGridComponent {
 
     }
 
+    /**
+     * @return editingCellElement 的字符串表示
+     */
+    public String getEditingCellElement() {
+        return editingCellElement.toString();
+    }
+
     /**
      * 将新值赋给editingCellElement
      *

designer/src/com/fr/poly/hanlder/BottomCornerMouseHanlder.java

@@ -161,7 +161,7 @@ public class BottomCornerMouseHanlder extends MouseInputAdapter {
 		 * @param isIntersects 是否重叠
 		 */
 		@Override
-		public void setWidgetsIntersects(boolean isIntersects) {
+		public void setWidgetsIntersected(boolean isIntersects) {
 		}
 
 		/**
@@ -170,7 +170,7 @@ public class BottomCornerMouseHanlder extends MouseInputAdapter {
 		 * @return 重叠
 		 */
 		@Override
-		public boolean getWidgetsIntersects() {
+		public boolean isWidgetsIntersected() {
 			return false;
 		}
 

designer/src/com/fr/start/ReportSplashPane.java

@@ -4,6 +4,7 @@
 package com.fr.start;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.FRContext;
 import com.fr.base.GraphHelper;
 import com.fr.design.mainframe.bbs.BBSConstants;
 import com.fr.general.GeneralContext;
@@ -18,6 +19,7 @@ import java.awt.*;
 import java.awt.font.FontRenderContext;
 import java.awt.font.LineMetrics;
 import java.awt.image.BufferedImage;
+import java.util.Locale;
 import java.util.Random;
 import java.util.TimerTask;
 
@@ -117,10 +119,23 @@ public class ReportSplashPane extends SplashPane{
         GraphHelper.drawString(splashG2d, showText, MODULE_INFO_X, y);
         
         //每次随机感谢一位论坛用户
+        if (shouldShowThanks()) {
             splashG2d.setPaint(THANK_COLOR);
             String content = Inter.getLocText("FR-Designer_Thanks-To") + GUEST;
             GraphHelper.drawString(splashG2d, content, THANK_INFO_X, y);
         }
+    }
+
+    // 是否显示鸣谢文字
+    private boolean shouldShowThanks() {
+        Locale[] hideLocales = {Locale.US, Locale.KOREA, Locale.JAPAN};
+        for (Locale loc : hideLocales) {
+            if (FRContext.getLocale().equals(loc)) {
+                return false;
+            }
+        }
+        return true;
+    }
     
     private static String getRandomUser(){
     	int num = new Random().nextInt(BBSConstants.ALL_GUEST.length);

designer_base/build.dev.gradle

@@ -1,8 +1,25 @@
-
-apply plugin: 'java'
 tasks.withType(JavaCompile){
 	options.encoding = 'UTF-8'
 }
+
+buildscript {
+    repositories {
+        maven {
+            url "http://www.eveoh.nl/files/maven2"
+        }
+    }
+
+    dependencies {
+        classpath "nl.eveoh:gradle-aspectj:1.2"
+    }
+}
+
+ext.aspectjVersion = '1.7.4'
+apply plugin: 'aspectj'
+
+repositories {
+    mavenCentral()
+}
 //指定构建的jdk版本
 sourceCompatibility=1.7
 //指定生成jar包版本

designer_base/build.dev.gradle.bak

@@ -0,0 +1,70 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+//指定构建的jdk版本
+sourceCompatibility=1.7
+//指定生成jar包版本
+version='8.0'
+//生成jar包重命名
+jar{
+	baseName='fr-designer-core'
+}
+
+
+def srcDir="."
+
+//指定源码路径
+sourceSets{
+		main{
+			java{
+				srcDirs=["${srcDir}/src"]
+			}
+		}
+}
+//获取什么分支名
+FileTree files =fileTree(dir:'./',include:'build.*.gradle')
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
+buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
+def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
+
+//声明外部依赖
+dependencies{
+
+compile fileTree(dir:"../../../finereport-lib-stable/${branchName}",include:'**/*.jar')
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")
+
+ 	testCompile 'junit:junit:4.12'
+}
+//复制非.java文件到classes文件夹下参与打包
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		from ("${srcDir}/src"){
+			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+		}
+		into 'build/classes/main'
+	}
+
+}
+
+
+//压缩项目中的js文件
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar')
+		}
+	}
+	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+		fileset (dir:"${srcDir}/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
+
+	}
+}
+jar.dependsOn compressJS
+
+
+

designer_base/build.master.gradle

@@ -1,8 +1,26 @@
 
-apply plugin: 'java'
 tasks.withType(JavaCompile){
 	options.encoding = 'UTF-8'
 }
+buildscript {
+    repositories {
+        maven {
+            url "http://www.eveoh.nl/files/maven2"
+        }
+    }
+
+    dependencies {
+        classpath "nl.eveoh:gradle-aspectj:1.2"
+    }
+}
+
+ext.aspectjVersion = '1.7.4'
+apply plugin: 'aspectj'
+
+repositories {
+    mavenCentral()
+}
+
 //指定构建的jdk版本
 sourceCompatibility=1.7
 //指定生成jar包版本

designer_base/build.master.gradle.bak

@@ -0,0 +1,89 @@
+
+apply plugin: 'java'
+tasks.withType(JavaCompile){
+	options.encoding = 'UTF-8'
+}
+buildscript {
+    repositories {
+        maven {
+            url "http://www.eveoh.nl/files/maven2"
+        }
+    }
+
+    dependencies {
+        classpath "nl.eveoh:gradle-aspectj:1.2"
+    }
+}
+
+ext.aspectjVersion = '1.7.4'
+apply plugin: 'aspectj'
+
+repositories {
+    mavenCentral()
+}
+
+//指定构建的jdk版本
+sourceCompatibility=1.7
+//指定生成jar包版本
+version='8.0'
+//生成jar包重命名
+jar{
+	baseName='fr-designer-core'
+}
+
+
+def srcDir="."
+
+//指定源码路径
+sourceSets{
+		main{
+			java{
+				srcDirs=["${srcDir}/src"]
+			}
+		}
+}
+//获取什么分支名
+FileTree files =fileTree(dir:'./',include:'build.*.gradle')
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
+buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
+def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
+
+//声明外部依赖
+dependencies{
+
+compile fileTree(dir:"../../../finereport-lib-stable/${branchName}",include:'**/*.jar')
+compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")
+
+ 	testCompile 'junit:junit:4.12'
+}
+//复制非.java文件到classes文件夹下参与打包
+task copyFile(type:Copy,dependsOn:compileJava){
+	copy{
+		from ("${srcDir}/src"){
+			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
+		}
+		into 'build/classes/main'
+	}
+
+}
+
+
+//压缩项目中的js文件
+task compressJS{
+	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
+		classpath {
+			fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar')
+		}
+	}
+	ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
+		fileset (dir:"${srcDir}/src"){
+			include (name:'**/*.js')
+			include (name:'**/*.css')
+		}
+
+	}
+}
+jar.dependsOn compressJS
+
+
+

designer_base/build.release.gradle

@@ -1,8 +1,29 @@
 
-apply plugin: 'java'
 tasks.withType(JavaCompile){
 	options.encoding = 'UTF-8'
 }
+
+buildscript {
+    repositories {
+        maven {
+            url "http://www.eveoh.nl/files/maven2"
+        }
+    }
+
+    dependencies {
+        classpath "nl.eveoh:gradle-aspectj:1.2"
+    }
+}
+
+ext.aspectjVersion = '1.7.4'
+
+apply plugin: 'aspectj'
+
+repositories {
+    mavenCentral()
+}
+
+
 //指定构建的jdk版本
 sourceCompatibility=1.8
 //指定生成jar包版本

designer_base/src/com/fr/aspectj/designerbase/TemplateProcessTracker.aj

@@ -0,0 +1,60 @@
+package com.fr.aspectj.designerbase;
+
+/**
+ * 记录模板过程
+ * Created by plough on 2017/3/3.
+ */
+
+import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
+import org.aspectj.lang.reflect.SourceLocation;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+import java.util.Date;
+
+public aspect TemplateProcessTracker {
+    //声明一个pointcut，匹配你需要的方法
+    pointcut onMouseClicked(MouseEvent e) :
+            execution(* mouseClicked(MouseEvent)) && args(e);
+    pointcut onMousePressed(MouseEvent e) :
+            execution(* mousePressed(MouseEvent)) && args(e);
+    pointcut onMouseReleased(MouseEvent e) :
+            execution(* mouseReleased(MouseEvent)) && args(e);
+    pointcut onActionPerformed(ActionEvent e) :
+            execution(* actionPerformed(ActionEvent)) && args(e);
+    pointcut onSetValueAt(Object v, int r, int c) :
+            execution(* setValueAt(java.lang.Object, int, int)) && args(v, r, c);
+
+    //before表示之前的意思
+    //这整个表示在MouseAdapter的public void mouseXXX(MouseEvent)方法调用之前，你想要执行的代码
+    before(MouseEvent e) : onMouseClicked(e) || onMousePressed(e) || onMouseReleased(e) {
+        SourceLocation sl = thisJoinPoint.getSourceLocation();//切面对应的代码位置
+
+        //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
+        String log = "";
+        TemplateInfoCollector.appendProcess(log);
+    }
+    //同上
+    before(ActionEvent e) : onActionPerformed(e) {
+        SourceLocation sl = thisJoinPoint.getSourceLocation();
+        // !within(LogHandlerBar) 没用, 手动过滤
+        if (e.getSource().toString().contains("javax.swing.Timer")) {
+            return;
+        }
+
+        //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
+        String log = "";
+        TemplateInfoCollector.appendProcess(log);
+
+    }
+    //同上
+    before(Object v, int r, int c) : onSetValueAt(v, r, c) {
+        SourceLocation sl = thisJoinPoint.getSourceLocation();
+
+        //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c);
+        String log = "";
+        TemplateInfoCollector.appendProcess(log);
+    }
+
+
+}

designer_base/src/com/fr/design/actions/community/VideoAction.java

@@ -5,6 +5,7 @@ import java.awt.event.ActionEvent;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Locale;
 
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
@@ -32,7 +33,12 @@ public class VideoAction extends UpdateAction
 	@Override
 	public void actionPerformed(ActionEvent arg0)
 	{
-		  String url = SiteCenter.getInstance().acquireUrlByKind("bbs.video");
+		String url;
+		if (FRContext.getLocale().equals(Locale.US)) {
+			url = SiteCenter.getInstance().acquireUrlByKind("bbs.video.en");
+		} else {
+	  		url = SiteCenter.getInstance().acquireUrlByKind("bbs.video");
+		}
 		if (StringUtils.isEmpty(url)) {
 			FRContext.getLogger().info("The URL is empty!");
 			return;
@@ -40,7 +46,7 @@ public class VideoAction extends UpdateAction
 		try {
 			Desktop.getDesktop().browse(new URI(url));
 		} catch (IOException exp) {
-	            JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser"));
+			JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer_Set_default_browser"));
 			FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
 		} catch (URISyntaxException exp) {
 			FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);

designer_base/src/com/fr/design/actions/edit/CopyAction.java

@@ -3,15 +3,14 @@
  */
 package com.fr.design.actions.edit;
 
-import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
-
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.TemplateComponentAction;
 import com.fr.design.designer.TargetComponent;
 import com.fr.general.Inter;
 
+import javax.swing.*;
+import java.awt.event.KeyEvent;
+
 /**
  * Copy.
  */
@@ -31,7 +30,6 @@ public class CopyAction extends TemplateComponentAction {
         if (tc != null) {
             tc.copy();
         }
-    
         return false;
     }
 }

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

@@ -27,6 +27,8 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.*;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
+import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.project.ProjectConstants;
 
 /**
@@ -51,8 +53,8 @@ public class LocalePane extends BasicPane {
         add(tabbedPane, BorderLayout.CENTER);
 
         predefineTableModel = new DefaultTableModel() {
-            public boolean isCellEditable(int col, int row) {
+            public boolean isCellEditable(int row, int column) {
-                return false;
+                return column == 0;
             }
         };
 
@@ -109,23 +111,39 @@ public class LocalePane extends BasicPane {
     }
 
     private void initPredefinedProperties() {
-        Map<Locale, LocalePackage> map = Inter.getPredefinedPackageMap();
+
-        LocalePackage chinese = map.get(Locale.SIMPLIFIED_CHINESE);
+        Map<Locale, String> supportLocaleMap = Inter.getSupportLocaleMap();
+
+        String[] localeFiles = StableFactory.getLocaleFiles();
+
+
 
         List<String> sortKeys = new ArrayList<String>();
 
 
-        Set<ResourceBundle> bundles = chinese.getKindsOfResourceBundle();
+        for (String path : localeFiles) {
-        for (ResourceBundle bundle : bundles) {
+            ResourceBundle chineseBundle = loadResourceBundle(path, Locale.SIMPLIFIED_CHINESE);
-            sortKeys.addAll(bundle.keySet());
+            sortKeys.addAll(chineseBundle.keySet());
         }
         Collections.sort(sortKeys);
 
+        Map<Locale, List<ResourceBundle>> localeResourceBundleMap = new HashMap<Locale, List<ResourceBundle>>();
+        for (Map.Entry<Locale, String> entry : supportLocaleMap.entrySet()) {
+            Locale locale = entry.getKey();
+            List<ResourceBundle> list = new ArrayList<>();
+            for (String path : localeFiles) {
+                ResourceBundle chineseBundle = loadResourceBundle(path, locale);
+                list.add(chineseBundle);
+            }
+            localeResourceBundleMap.put(locale, list);
+        }
+
         Map<Locale, Vector<String>> data = new HashMap<Locale, Vector<String>>();
-        for (Map.Entry<Locale, LocalePackage> entry : map.entrySet()) {
+        for (Map.Entry<Locale, List<ResourceBundle>> entry : localeResourceBundleMap.entrySet()) {
             Vector<String> column = new Vector<String>();
+            List<ResourceBundle> rbs = entry.getValue();
             for (String key : sortKeys) {
-                column.add(entry.getValue().getLocText(key));
+                column.add(readText(rbs, key));
             }
             data.put(entry.getKey(), column);
         }
@@ -140,6 +158,19 @@ public class LocalePane extends BasicPane {
         }
     }
 
+    private String readText(List<ResourceBundle> rbs, String key) {
+        for (ResourceBundle rb : rbs) {
+            if (rb.containsKey(key)) {
+                return rb.getString(key);
+            }
+        }
+        return null;
+    }
+
+    private ResourceBundle loadResourceBundle(String dir, Locale locale) {
+        return ResourceBundle.getBundle(dir, locale, Inter.class.getClassLoader());
+    }
+
     private void initCustomProperties() throws Exception {
         Env env = FRContext.getCurrentEnv();
         if (env == null) {
@@ -176,22 +207,9 @@ public class LocalePane extends BasicPane {
         }
     }
 
-    private Properties loadLocaleProperties(String name) {
-        Properties properties = new Properties();
-        InputStream inputStream = IOUtils.readResource("/com/fr/general/locale/" + name);
-        try {
-            properties.load(inputStream);
-        } catch (IOException e) {
-            FRLogger.getLogger().error(e.getMessage());
-        }
-        return properties;
-    }
-
     /**
 	 * 保存当前编辑的国际化
 	 * 
-	 *
-	 * @date 2014-9-30-下午3:10:30
 	 */
     public void save() {
         Env env = FRContext.getCurrentEnv();

designer_base/src/com/fr/design/actions/help/AboutPane.java

@@ -3,6 +3,7 @@
  */
 package com.fr.design.actions.help;
 
+import com.fr.base.FRContext;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.BoldFontTextLabel;
@@ -26,6 +27,7 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.net.URI;
+import java.util.Locale;
 
 public class AboutPane extends JPanel {
     private static final String FINEREPORT = "FineReport";
@@ -66,21 +68,39 @@ public class AboutPane extends JPanel {
                         Inter.getLocText("FR-Designer-Basic_Activation_Key_Copy_OK")
                 }));
 
+        if (shouldShowPhoneAndQQ()){
             if(ComparatorUtils.equals(ProductConstants.APP_NAME,FINEREPORT)){
-            boxCenterAlignmentPane = new BoxCenterAligmentPane(Inter.getLocText("Service_Phone") + ProductConstants.COMPARE_TELEPHONE);
+                boxCenterAlignmentPane = new BoxCenterAligmentPane(Inter.getLocText("FR-Designer_Service_Phone") + ProductConstants.COMPARE_TELEPHONE);
                 contentPane.add(boxCenterAlignmentPane);
             }
             boxCenterAlignmentPane = new BoxCenterAligmentPane("QQ:" + SiteCenter.getInstance().acquireUrlByKind("help.qq"));
             contentPane.add(boxCenterAlignmentPane);
+        }
 
-        BoxCenterAligmentPane actionLabel = getURLActionLabel(ProductConstants.WEBSITE_URL);
+        BoxCenterAligmentPane actionLabel = getURLActionLabel(SiteCenter.getInstance().acquireUrlByKind("website." + FRContext.getLocale(), ProductConstants.WEBSITE_URL));
-        BoxCenterAligmentPane emailLabel = getEmailActionLabel(ProductConstants.SUPPORT_EMAIL);
+        BoxCenterAligmentPane emailLabel = getEmailActionLabel(SiteCenter.getInstance().acquireUrlByKind("support.email", ProductConstants.SUPPORT_EMAIL));
         
         contentPane.add(actionLabel);
         contentPane.add(emailLabel);
-        
+        if (shouldShowThanks()) {
             addThankPane(contentPane);
         }
+    }
+
+    // 是否显示服务电话和 qq
+    private boolean shouldShowPhoneAndQQ() {
+        return !FRContext.getLocale().equals(Locale.US);
+    }
+    // 是否显示鸣谢面板
+    private boolean shouldShowThanks() {
+        Locale[] hideLocales = {Locale.US, Locale.KOREA, Locale.JAPAN};
+        for (Locale loc : hideLocales) {
+            if (FRContext.getLocale().equals(loc)) {
+                return false;
+            }
+        }
+        return true;
+    }
     
     //添加鸣谢面板
     private void addThankPane(JPanel contentPane){
@@ -103,12 +123,12 @@ public class AboutPane extends JPanel {
     }
     
     private String getCopyRight(){
-       return append(Inter.getLocText("About-CopyRight"), COPYRIGHT_LABEL, 
+       return append(Inter.getLocText("FR-Designer_About_CopyRight"), COPYRIGHT_LABEL,
-    		   ProductConstants.HISTORY, StringUtils.BLANK, ProductConstants.COMPANY_NAME);
+    		   ProductConstants.HISTORY, StringUtils.BLANK, SiteCenter.getInstance().acquireUrlByKind("company.name", ProductConstants.COMPANY_NAME));
     }
 
     private String getBuildTitle() {
-        return append(ProductConstants.APP_NAME, Inter.getLocText("About-Version"),
+        return append(ProductConstants.APP_NAME, Inter.getLocText("FR-Designer_About_Version"),
                 StringUtils.BLANK, ProductConstants.RELEASE_VERSION, BUILD_PREFIX);
     }
     

designer_base/src/com/fr/design/actions/help/TutorialAction.java

@@ -59,18 +59,20 @@ public class TutorialAction extends UpdateAction {
      * @param evt 事件
      */
     public void actionPerformed(ActionEvent evt) {
-        Locale locale = FRContext.getLocale();
+        String helpURL = SiteCenter.getInstance().acquireUrlByKind("help." + FRContext.getLocale());
-        if (ComparatorUtils.equals(locale, Locale.CHINA) || ComparatorUtils.equals(locale, Locale.TAIWAN)){
+
-            HttpClient client = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("help"));
+        if (helpURL != null) {
+            HttpClient client = new HttpClient(helpURL);
             if(client.getResponseCode() != -1) {
                 try {
-                	 Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("help")));
+                	 Desktop.getDesktop().browse(new URI(helpURL));
                     return;
                 } catch (Exception e) {
                     //出了异常的话, 依然打开本地教程
                 }
             }
         }
+
         if (OperatingSystem.isMacOS()) {
             nativeExcuteMacInstallHomePrograms("helptutorial.app");
         }

designer_base/src/com/fr/design/actions/server/ConnectionListAction.java

@@ -8,6 +8,7 @@ import com.fr.data.impl.Connection;
 import com.fr.dav.LocalEnv;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.datapane.connect.ConnectionManagerPane;
+import com.fr.design.data.datapane.connect.ConnectionShowPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
@@ -25,7 +26,6 @@ import java.util.HashMap;
  * DatasourceList Action
  */
 public class ConnectionListAction extends UpdateAction {
-    private static final int BYTENUM = 1444;
 
     public ConnectionListAction() {
         this.setMenuKeySet(DEFINE_DATA_CONNECTION);
@@ -92,7 +92,10 @@ public class ConnectionListAction extends UpdateAction {
     }
 
 
-    private void writeFile(DatasourceManagerProvider datasourceManager) {
+    /**
+     * @param datasourceManager
+     */
+    public static void writeFile(DatasourceManagerProvider datasourceManager) {
         Env currentEnv = FRContext.getCurrentEnv();
         try {
             boolean isSuccess = currentEnv.writeResource(datasourceManager);
@@ -106,15 +109,17 @@ public class ConnectionListAction extends UpdateAction {
     }
 
     /**
-     * 是否正常更新完datasourceManager
+     * 更新datasourceManager
      *
-     * @param datasourceManager
+     * @param datasourceManager  datasource管理对象
-     * @param databaseManagerPane
+     * @param backupManager      datasource管理对象备份
-     * @return
+     * @param connectionShowPane datasource面板
+     * @param databaseListDialog datasource管理对话框
+     * @return boolean 是否更新成功
      */
-    private boolean doWithDatasourceManager(DatasourceManagerProvider datasourceManager, DatasourceManager backupManager,
+    public static boolean doWithDatasourceManager(DatasourceManagerProvider datasourceManager, DatasourceManager
-                                            ConnectionManagerPane databaseManagerPane, BasicDialog databaseListDialog) {
+            backupManager, ConnectionShowPane connectionShowPane, BasicDialog databaseListDialog) {
-        databaseManagerPane.update(datasourceManager);
+        connectionShowPane.update(datasourceManager);
         HashMap<String, Connection> modifyDetails = datasourceManager.getConnectionModifyDetails();
         modifyDetails.clear();
         Env currentEnv = FRContext.getCurrentEnv();
@@ -139,7 +144,7 @@ public class ConnectionListAction extends UpdateAction {
                         localModifiedTable.removeConfilct();
                         modifyDetails.clear();
                         //更新面板
-                        databaseManagerPane.populate(datasourceManager);
+                        connectionShowPane.populate(datasourceManager);
                     } else {
                         //更新失败，继续停留页面
                         isFailed = true;
@@ -152,7 +157,7 @@ public class ConnectionListAction extends UpdateAction {
         int index = datasourceManager.isConnectionMapContainsRename();
         if (index != -1) {
             isFailed = true;
-            databaseManagerPane.setSelectedIndex(index);
+            connectionShowPane.setSelectedIndex(index);
         }
         databaseListDialog.setDoOKSucceed(!isFailed);
         //如果修改成功，则去远程端增量修改修改表

designer_base/src/com/fr/design/beans/location/MoveUtils.java

@@ -16,10 +16,9 @@ import java.util.ArrayList;
 public class MoveUtils {
 
 	public static final int SORPTION_UNIT = 5;
+    private static final int EQUIDISTANTLINE_UNIT = 4;
 
-	public static WidgetForbidWindow widgetForbidWindow = new WidgetForbidWindow();
+    private static ArrayList<EquidistantLine> equidistantLines = new ArrayList<>();
-
-	public static ArrayList<EquidistantLine> equidistantLines = new ArrayList<>();
 
 	private MoveUtils() {
 
@@ -77,13 +76,13 @@ public class MoveUtils {
 		 * 设置designer内部组件是否重叠的标志位
 		 * @param isIntersects 是否重叠
 		 */
-		void setWidgetsIntersects(boolean isIntersects);
+		void setWidgetsIntersected(boolean isIntersects);
 
 		/**
 		 * 获取designer内部组件是否重叠的标志位
 		 * @return 重叠
 		 */
-		boolean getWidgetsIntersects();
+		boolean isWidgetsIntersected();
 
 		/**
 		 * 获取designer相对屏幕的位置
@@ -258,8 +257,7 @@ public class MoveUtils {
 				equidistantLineInfo.setReference(bounds.y);
 				equidistantLineInfo.setDirection(SwingConstants.BOTTOM);
 			}
-		}
+        } else if ((leftMiddleY > bounds.getY()) && (leftMiddleY < (bounds.getY() + bounds.getHeight()))) {
-		else if ((leftMiddleY > bounds.getY()) && (leftMiddleY < (bounds.getY() + bounds.getHeight()))){
 			//当前操作rec在bounds的右侧
 			if (left > (bounds.getX() + bounds.getWidth())){
 				equidistantLineInfo.setDistance(left - (bounds.x + bounds.width));
@@ -278,13 +276,6 @@ public class MoveUtils {
 		}
 	}
 
-	public static void displayForbidWindow(int x, int y) {
-		widgetForbidWindow.showWindow(x, y);
-	}
-
-	public static void hideForbidWindow() {
-		widgetForbidWindow.hideWindow();
-	}
 
 	/**
 	 * 吸附
@@ -317,25 +308,16 @@ public class MoveUtils {
 		RectangleIterator iterator = designer.createRectangleIterator();
 
 		java.util.List<Rectangle> cacheRecs = new ArrayList<Rectangle>();
-		//是否存在控件重叠
-		boolean isWidgetsIntersects = false;
         while (iterator.hasNext()) {
             Rectangle bounds = iterator.nextRectangle();
             cacheRecs.add(bounds);
-			boolean isIntersects = operatingRectangle.intersects(bounds);
             findX(px, bounds, left, right, width);
             findY(py, bounds, top, bottom, height);
 
             if (!isParameterLayout) {
-				if(isIntersects) {
-					isWidgetsIntersects = true;
-				}
-				else{
                 findEquidistantLine(bounds, left, top, height, width);
             }
         }
-		}
-		showForbiddenWindow(designer, x, y, isWidgetsIntersects);
 
 		createXAbsorptionline(px, designer, width, cacheRecs);
 		createYAbsorptionline(py, designer, height, cacheRecs);
@@ -352,18 +334,6 @@ public class MoveUtils {
 		return sorptionPoint;
 	}
 
-	public static void showForbiddenWindow(RectangleDesigner designer, int x, int y, boolean isIntersects){
-		if (isIntersects){
-			if(designer.getDesignerLocationOnScreen() != null) {
-				displayForbidWindow(x + designer.getDesignerLocationOnScreen().x, y + designer.getDesignerLocationOnScreen().y);
-			}
-			designer.setWidgetsIntersects(true);
-		}
-		else{
-			designer.setWidgetsIntersects(false);
-			hideForbidWindow();
-		}
-	}
 
 	private static void createXAbsorptionline(PlacePointing px, RectangleDesigner designer, int width, java.util.List<Rectangle> cacheRecs) {
 		Absorptionline line = null;
@@ -479,10 +449,10 @@ public class MoveUtils {
 	}
 
 	private static void processEquidistantLinesList(PlacePointing pEquidistantX, PlacePointing pEquidistantY, Rectangle operatingRectangle){
-		EquidistantLine[] equidistantLines1 = new EquidistantLine[4];
+		EquidistantLine[] equidistantLines1 = new EquidistantLine[EQUIDISTANTLINE_UNIT];
 		//先按方向处理，只保留四个方向上距离最近
 		for(int count = 0; count < equidistantLines.size(); count++){
-			for (int direction = 0; direction < 4; direction++){
+			for (int direction = 0; direction < EQUIDISTANTLINE_UNIT; direction++){
 				if(equidistantLines.get(count).getDirection() == (direction + 1)){//direction 1,2,3,4 分别对应top,left,bottom,right
 					if(equidistantLines1[direction] != null
 							&& equidistantLines1[direction].getDistance() > equidistantLines.get(count).getDistance()

designer_base/src/com/fr/design/beans/location/WidgetForbidWindow.java

@@ -1,48 +0,0 @@
-package com.fr.design.beans.location;
-
-import com.fr.base.BaseUtils;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.icon.IconPathConstants;
-import com.fr.general.Inter;
-
-import javax.swing.*;
-
-/**
- * Created by zhouping on 2016/7/24.
- */
-public class WidgetForbidWindow extends JWindow {
-
-    private static final int WIDTH = 150;
-    private static final int HEIGHT = 20;
-
-    private UIButton promptButton = new UIButton(Inter.getLocText("FR-Designer_Forbid_Widgets_Intersects"), BaseUtils.readIcon(IconPathConstants.FORBID_ICON_PATH));
-
-    /**
-     * 构造函数
-     */
-    public WidgetForbidWindow() {
-        this.add(promptButton);
-
-        this.setSize(WIDTH, HEIGHT);
-    }
-
-    /**
-     * 在指定位置显示窗口, 默认将window的中心点放到指定位置上
-     *
-     * @param x x坐标
-     * @param y y坐标
-     *
-     */
-    public void showWindow(int x, int y){
-        this.setLocation(x - WIDTH / 2, y - HEIGHT / 2);
-        this.setVisible(true);
-    }
-
-    /**
-     * 隐藏当前窗口
-     *
-     */
-    public void hideWindow(){
-        this.setVisible(false);
-    }
-}

designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java

@@ -84,7 +84,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
         GeneralContext.addPluginReadListener(new PluginReadListener() {
             @Override
-            public void success() {
+            public void success(Status status) {
                 addMenuDef.clearShortCuts();
                 createAddMenuDef();
             }

designer_base/src/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java

@@ -1,11 +1,11 @@
 package com.fr.design.data.datapane.connect;
 
-import com.fr.base.Env;
 import com.fr.base.FRContext;
 import com.fr.data.impl.AbstractDatabaseConnection;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.NameDatabaseConnection;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.server.ConnectionListAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.file.DatasourceManager;
@@ -17,6 +17,7 @@ import javax.swing.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -31,7 +32,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
      */
     private static final long serialVersionUID = 1L;
     private Class<? extends Connection> cls; // 所取的Connection都是cls及其子类
-    private java.util.List<String> nameList = new ArrayList<String>();
+    private List<String> nameList = new ArrayList<String>();
 
     public ConnectionComboBoxPanel(Class<? extends Connection> cls) {
         super();
@@ -53,11 +54,11 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
     /*
      * 刷新ComboBox.items
      */
-    protected java.util.Iterator<String> items() {
+    protected Iterator<String> items() {
         nameList = new ArrayList<String>();
 
         DatasourceManagerProvider mgr = DatasourceManager.getProviderInstance();
-        java.util.Iterator<String> nameIt = mgr.getConnectionNameIterator();
+        Iterator<String> nameIt = mgr.getConnectionNameIterator();
         while (nameIt.hasNext()) {
             String conName = nameIt.next();
             Connection connection = mgr.getConnection(conName);
@@ -71,7 +72,6 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
         connection.addConnection(nameList, conName, new Class[]{AbstractDatabaseConnection.class});
     }
 
-
     public int getConnectionSize() {
         return nameList.size();
     }
@@ -86,25 +86,37 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
     protected void editItems() {
         final ConnectionListPane connectionListPane = new ConnectionListPane();
         final DatasourceManagerProvider datasourceManager = DatasourceManager.getProviderInstance();
+        final DatasourceManager backupManager = datasourceManager.getBackUpManager();
         connectionListPane.populate(datasourceManager);
-        BasicDialog connectionListDialog = connectionListPane.showLargeWindow(
+        final BasicDialog connectionListDialog = connectionListPane.showLargeWindow(
-                SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), new DialogActionAdapter() {
+                SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), null);
+        connectionListDialog.addDialogActionListener(new DialogActionAdapter() {
             public void doOk() {
-                connectionListPane.update(datasourceManager);
+                if (!connectionListPane.isNamePermitted()) {
+                    connectionListDialog.setDoOKSucceed(false);
+                    return;
+                }
+                if (!ConnectionListAction.doWithDatasourceManager(datasourceManager, backupManager, connectionListPane,
+                        connectionListDialog)) {
+                    //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
+                    return;
+                }
                 // marks:保存数据
-                Env currentEnv = FRContext.getCurrentEnv();
+                ConnectionListAction.writeFile(datasourceManager);
-                try {
-                    currentEnv.writeResource(datasourceManager);
-                } catch (Exception ex) {
-                    FRContext.getLogger().error(ex.getMessage(), ex);
             }
+
+            public void doCancel() {
+                datasourceManager.synchronizedWithServer();
             }
         });
         connectionListDialog.setVisible(true);
         refreshItems();
     }
 
-    public void populate(com.fr.data.impl.Connection connection) {
+    /**
+     * @param connection 数据库链接
+     */
+    public void populate(Connection connection) {
         editButton.setEnabled(FRContext.getCurrentEnv().isRoot());
         if (connection instanceof NameDatabaseConnection) {
             this.setSelectedItem(((NameDatabaseConnection) connection).getName());

designer_base/src/com/fr/design/data/datapane/connect/ConnectionListPane.java

@@ -23,7 +23,7 @@ import java.util.*;
 /**
  * Connection List Pane.
  */
-public class ConnectionListPane extends JListControlPane {
+public class ConnectionListPane extends JListControlPane implements ConnectionShowPane {
     public static final String TITLE_NAME = Inter.getLocText("Server-Define_Data_Connection");
     private boolean isNamePermitted = true;
     private HashMap<String, String> renameMap = new HashMap<String, String>();

designer_base/src/com/fr/design/data/datapane/connect/ConnectionManagerPane.java

@@ -14,7 +14,7 @@ import java.awt.*;
 import java.io.File;
 import java.util.HashMap;
 
-public class ConnectionManagerPane extends LoadingBasicPane {
+public class ConnectionManagerPane extends LoadingBasicPane implements ConnectionShowPane {
     private UITextField connectionTextField;
     private ConnectionListPane connectionListPane;
 
@@ -69,6 +69,7 @@ public class ConnectionManagerPane extends LoadingBasicPane {
 
     /**
      * 名字是否允许
+     *
      * @return 允许返回true
      */
     public boolean isNamePermitted() {

designer_base/src/com/fr/design/data/datapane/connect/ConnectionShowPane.java

@@ -0,0 +1,15 @@
+package com.fr.design.data.datapane.connect;
+
+import com.fr.file.DatasourceManagerProvider;
+
+/**
+ * Created by yaoh.wu on 2017/4/22.
+ * 数据链接显示面板
+ */
+public interface ConnectionShowPane {
+    void update(DatasourceManagerProvider datasourceManager);
+
+    void populate(DatasourceManagerProvider datasourceManager);
+
+    void setSelectedIndex(int index);
+}

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

@@ -7,6 +7,7 @@ import com.fr.base.ParameterHelper;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.data.impl.DBTableData;
 import com.fr.data.impl.NameDatabaseConnection;
+import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
@@ -17,6 +18,7 @@ import com.fr.design.data.datapane.sqlpane.SQLEditPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.fun.DBTableDataMenuHandler;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itableeditorpane.ParameterTableModel;
@@ -34,7 +36,6 @@ import com.fr.general.Inter;
 import com.fr.script.Calculator;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.ParameterProvider;
-import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -53,11 +54,13 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 	private ConnectionTableProcedurePane connectionTableProcedurePane;
 	private UITableEditorPane<ParameterProvider> editorPane;
 
+	private DBTableDataMenuHandler dbTableDataMenuHandler;
 	private SQLEditPane sqlTextPane;
 	private UICheckBox isShareCheckBox;
 	private MaxMemRowCountPanel maxPanel;
 	private String pageQuery = null;
-	private String customCountQuery = null;
+	private DBTableData dbTableData;
+
 
 
 	public DBTableDataPane() {
@@ -149,11 +152,9 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 	}
 
 	private void refresh() {
-		String[] paramTexts = new String[3];
+		String[] paramTexts = new String[2];
 		paramTexts[0] = sqlTextPane.getText();
 		paramTexts[1] = pageQuery;
-		paramTexts[2] = customCountQuery;
-
 		List<ParameterProvider> existParameterList = editorPane.update();
 		Parameter[] ps = existParameterList == null ? new Parameter[0] : existParameterList.toArray(new Parameter[existParameterList.size()]);
 
@@ -166,8 +167,11 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		toolBarDef.addShortCut(new PreviewAction());
 		toolBarDef.addShortCut(SeparatorDef.DEFAULT);
 		toolBarDef.addShortCut(new EditPageQueryAction());
+		dbTableDataMenuHandler = ExtraDesignClassManager.getInstance().getSingle(DBTableDataMenuHandler.MARK_STRING);
+		if (dbTableDataMenuHandler != null) {
 			toolBarDef.addShortCut(SeparatorDef.DEFAULT);
-		toolBarDef.addShortCut(new EditCustomCountQueryAction());
+			toolBarDef.addShortCut(dbTableDataMenuHandler.createQueryAction());
+		}
 		isShareCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Is_Share_DBTableData"));
 		maxPanel = new MaxMemRowCountPanel();
 		maxPanel.setBorder(null);
@@ -179,11 +183,9 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 	}
 
 	private void checkParameter() {
-		String[] paramTexts = new String[3];
+		String[] paramTexts = new String[2];
 		paramTexts[0] = sqlTextPane.getText();
 		paramTexts[1] = pageQuery;
-		paramTexts[2] = customCountQuery;
-
 		Parameter[] parameters = ParameterHelper.analyze4Parameters(paramTexts, false);
 
 		if (parameters.length < 1 && editorPane.update().size() < 1) {
@@ -210,6 +212,10 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 
 	@Override
 	public void populateBean(DBTableData dbtabledata) {
+		this.dbTableData = dbtabledata;
+		if (dbTableDataMenuHandler != null) {
+			dbTableDataMenuHandler.populate(dbtabledata);
+		}
 		ParameterProvider[] parameters = null;
 
 		Calculator c = Calculator.createCalculator();
@@ -227,8 +233,6 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		isShare = dbtabledata.isShare();
 		maxMemeryRow = dbtabledata.getMaxMemRowCount();
 		this.pageQuery = dbtabledata.getPageQuerySql();
-		this.customCountQuery = dbtabledata.getCustomCountQuery();
-
 		this.connectionTableProcedurePane.setSelectedDatabaseConnection(db);
 		this.sqlTextPane.setText(query);
 		this.sqlTextPane.requestFocus();
@@ -253,7 +257,6 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		List<ParameterProvider> parameterList = editorPane.update();
 		Parameter[] parameters = parameterList.toArray(new Parameter[parameterList.size()]);
 
-		DBTableData dbTableData = new DBTableData();
 		dbTableData.setDatabase(new NameDatabaseConnection(dbName));
 
 		// p:必须先设置Parameters数组，因为setQuery里面会自动设置的
@@ -264,8 +267,9 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		dbTableData.setShare(isShareCheckBox.isSelected());
 		dbTableData.setMaxMemRowCount(maxPanel.getValue());
 		dbTableData.setPageQuerySql(this.pageQuery);
-		dbTableData.setCustomCountQuery(this.customCountQuery);
+		if (dbTableDataMenuHandler != null) {
-
+			dbTableDataMenuHandler.update();
+		}
 		return dbTableData;
 	}
 
@@ -318,28 +322,6 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		}
 	}
 
-	private class EditCustomCountQueryAction extends UpdateAction {
-		public EditCustomCountQueryAction() {
-			this.setName(Inter.getLocText("FR-Designer-LayerPageReport_CustomCountQuery"));
-			this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png"));
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			final QueryPane editPane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_CustomCountQuery"));
-			editPane.populate(customCountQuery);
-			BasicDialog dialog = editPane.showWindow(DesignerContext.getDesignerFrame());
-			dialog.addDialogActionListener(new DialogActionAdapter() {
-				public void doOk() {
-					customCountQuery = editPane.update();
-					checkParameter();
-				}
-			});
-			dialog.setVisible(true);
-
-		}
-	}
-
 	private class QueryPane extends BasicPane {
 		private SQLEditPane pageQueryPane;
 		private String title;

designer_base/src/com/fr/design/dialog/BasicDialog.java

@@ -13,6 +13,7 @@ public abstract class BasicDialog extends UIDialog {
 	public static final Dimension CHART = new Dimension(760, 560);
 	public static final Dimension MAP_SIZE = new Dimension(760, 450);
 	public static final Dimension UPDATE_ONLINE_SIZE = new Dimension(600,300);
+	public static final Dimension TOOLBAR_SIZE = new Dimension(660, 327);
 
 	public BasicDialog(Frame parent) {
 		super(parent);

designer_base/src/com/fr/design/dialog/BasicPane.java

@@ -251,6 +251,30 @@ public abstract class BasicPane extends JPanel {
         return dg;
     }
 
+    /**
+     * 显示窗口
+     *
+     * @param window 窗口
+     * @param l      对话框监听器
+     * @return 对话框
+     */
+    public BasicDialog showToolBarWindow(Window window, DialogActionListener l) {
+        BasicDialog dg;
+        if (window instanceof Frame) {
+            dg = new DIALOG((Frame) window);
+        } else {
+            dg = new DIALOG((Dialog) window);
+        }
+
+        if (l != null) {
+            dg.addDialogActionListener(l);
+        }
+        dg.setBasicDialogSize(BasicDialog.TOOLBAR_SIZE);
+        GUICoreUtils.centerWindow(dg);
+        dg.setResizable(false);
+        return dg;
+    }
+
     protected abstract String title4PopupWindow();
 
     public String getTitle() {

designer_base/src/com/fr/design/dialog/mobile/MobileUseHtmlGroupBeanPane.java

@@ -23,11 +23,11 @@ public abstract class MobileUseHtmlGroupBeanPane<T> extends BasicBeanPane<T> {
 
     private List<UIRadioButton> radioButtons = new ArrayList<UIRadioButton>();
 
-    public MobileUseHtmlGroupBeanPane() {
+    public MobileUseHtmlGroupBeanPane(String annotation) {
-        initComponents();
+        initComponents(annotation);
     }
 
-    private void initComponents() {
+    private void initComponents(String annotation) {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(UITitledBorder.createBorderWithTitle(this.title4PopupWindow()));
 
@@ -43,7 +43,7 @@ public abstract class MobileUseHtmlGroupBeanPane<T> extends BasicBeanPane<T> {
 
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-mobile_analysis_style")), useApp, useHTML5},
-                new Component[]{new UILabel(Inter.getLocText("FR-mobile_analysis_annotation")), null, null}
+                new Component[]{new UILabel(annotation), null, null}
         };
         JPanel usePane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         usePane.setBorder(BorderFactory.createEmptyBorder(10, 13, 10, 10));

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

@@ -15,6 +15,7 @@ import java.awt.event.ItemListener;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 /**
  * CellEditor used to edit Date object.
@@ -59,7 +60,10 @@ public class DateEditor extends Editor<Date> {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
 		uiDatePicker = new UIDatePicker();
 		if (format) {
-			uiDatePicker.setStyle(uiDatePicker.STYLE_CN_DATE);
+			int dateStyle = (FRContext.getLocale() == Locale.ENGLISH
+					|| FRContext.getLocale() == Locale.US
+					|| FRContext.getLocale() == Locale.UK) ? uiDatePicker.STYLE_EN_DATE : uiDatePicker.STYLE_CN_DATE;
+			uiDatePicker.setStyle(dateStyle);
 			uiDatePicker.setEditable(false);
 		}
 		uiDatePicker.addItemListener(new ItemListener() {

designer_base/src/com/fr/design/extra/PluginHelper.java

@@ -7,6 +7,7 @@ import com.fr.design.extra.plugindependence.DownLoadDependenceUI;
 import com.fr.general.*;
 import com.fr.general.http.HttpClient;
 import com.fr.plugin.Plugin;
+import com.fr.plugin.PluginConfigManager;
 import com.fr.stable.plugin.PluginConstants;
 import com.fr.plugin.PluginLoader;
 import com.fr.plugin.PluginManagerHelper;
@@ -225,6 +226,8 @@ public class PluginHelper {
         }
         // 删除放解压文件的临时文件夹
         StableUtils.deleteFile(new File(TEMP_PATH));
+        PluginConfigManager.getProviderInstance().pushNewPlugin(plugin);
+        PluginConfigManager.getProviderInstance().syncPluginConfig();
         new SwingWorker<String, Void>() {
 
             @Override
@@ -256,7 +259,7 @@ public class PluginHelper {
         if (PluginLoader.getLoader().isInstalled(plugin)) {
             throw new com.fr.plugin.PluginVerifyException(Inter.getLocText("FR-Designer-Plugin_Has_Been_Installed"));
         }
-        if (plugin.isJarExpired()) {
+        if (plugin.checkIfJarExpired()) {
             String jarExpiredInfo = Inter.getLocText(new String[]{"FR-Designer-Plugin_Jar_Expired", ",", "FR-Designer-Plugin_Install_Failed", ",", "FR-Designer-Plugin_Please_Update_Jar", plugin.getRequiredJarTime()});
             FRLogger.getLogger().error(jarExpiredInfo);
             throw new com.fr.plugin.PluginVerifyException(jarExpiredInfo);
@@ -319,6 +322,8 @@ public class PluginHelper {
         if (plugin == null || env == null) {
             return ArrayUtils.EMPTY_STRING_ARRAY;
         }
+        //卸载前监听
+        plugin.preUninstall();
         PluginLoader.getLoader().deletePlugin(plugin);
         return env.deleteFileFromPluginAndLibFolder(plugin);
     }

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

@@ -22,6 +22,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.Inter;
 import com.fr.parser.FRLexer;
 import com.fr.parser.FRParser;
+import com.fr.stable.EncodeConstants;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.script.Expression;
@@ -38,8 +39,10 @@ import java.awt.event.*;
 import java.io.*;
 import java.util.Locale;
 import java.util.Set;
+
 /**
  * 公式编辑面板
+ *
  * @editor zhou
  * @since 2012-3-29下午1:50:53
  */
@@ -119,9 +122,11 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             @Override
             public void keyTyped(KeyEvent e) {
             }
+
             @Override
             public void keyReleased(KeyEvent e) {
             }
+
             @Override
             public void keyPressed(KeyEvent e) {
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
@@ -259,6 +264,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             this.formulaTextArea.setText(StringUtils.EMPTY);
         }
     }
+
     //hugh:为啥会是10呢？搞不懂~~~
     private static final int KEY_10 = 10;
     //上下左右
@@ -266,6 +272,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
     private static final int KEY_38 = 38;
     private static final int KEY_39 = 39;
     private static final int KEY_40 = 40;
+
     @Override
     public void keyReleased(KeyEvent e) {
         int key = e.getKeyCode();
@@ -719,7 +726,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                 String description = "";
                 desReader = new StringReader(description);
             } else {
-                desReader = new InputStreamReader(desInputStream);
+                desReader = new InputStreamReader(desInputStream, EncodeConstants.ENCODING_UTF_8);
             }
             BufferedReader reader = new BufferedReader(desReader);
             String lineText;

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

@@ -20,6 +20,7 @@ import com.fr.file.FunctionManagerProvider;
 import com.fr.general.Inter;
 import com.fr.general.NameObject;
 import com.fr.stable.Nameable;
+import com.fr.stable.ProductConstants;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.stable.script.FunctionDef;
 
@@ -159,10 +160,11 @@ public class FunctionManagerPane extends BasicPane {
             descriptionArea.setWrapStyleWord(true);
             descriptionArea.setLineWrap(true);
             northPane.add(descriptionArea);
-            descriptionArea.setText(Inter.getLocText(new String[]{"Function-The_class_must_inherit","Fuction-The_compiled_class_should_be_copied_to",
+
-            		"Function-J2EE_server", "Directory", "Function-Source_Code", "Example"}, 
+            String path1 = getEscapePath(File.separator + ProjectConstants.WEBINF_NAME + File.separator + ProjectConstants.CLASSES_NAME);
-            		new String[]{" \"com.fr.script.AbstractFunction\".", "\n", " \"" + File.separator + "WEB-INF" + File.separator + "classes\"",
+            String path2 = getEscapePath(FRContext.getCurrentEnv().getPath() + File.separator + ProjectConstants.CLASSES_NAME);
-            		",", ".\n", ":" + FRContext.getCurrentEnv().getPath() + File.separator + "classes"}));
+            descriptionArea.setText(Inter.getLocText("FR-Designer_Function_Description_Area_Text", path1, path2));
+
             JPanel descriptionPane = FRGUIPaneFactory.createBorderLayout_S_Pane();  //Description Pane
             this.add(descriptionPane, BorderLayout.SOUTH);
             descriptionPane.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
@@ -171,6 +173,10 @@ public class FunctionManagerPane extends BasicPane {
             descriptionPane.add(new JScrollPane(this.descriptionTextArea), BorderLayout.CENTER);
         }
 
+        private String getEscapePath(String path) {
+            return path.replace("\\", "\\\\");
+        }
+        
         private ActionListener createEditorButtonActionListener() {
         	return new ActionListener() {
                 public void actionPerformed(ActionEvent e) {

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

@@ -4,12 +4,16 @@ import com.fr.base.ConfigManager;
 import com.fr.base.Parameter;
 import com.fr.design.DesignModelAdapter;
 import com.fr.base.ConfigManagerProvider;
+import com.fr.plugin.ExtraClassManager;
 import com.fr.script.ScriptConstants;
+import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
+import com.fr.stable.fun.BuiltInParametersProvider;
 import com.fr.stable.script.CalculatorProvider;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 public abstract class VariableResolverAdapter implements VariableResolver {
 	private static final int TABLE_DATA_PARA = 0;
@@ -21,7 +25,7 @@ public abstract class VariableResolverAdapter implements VariableResolver {
      * @return 内置参数
      */
 	public String[] resolveCurReportVariables() {
-		return new String[] { ScriptConstants.SUMMARY_TAG + "page_number",
+		String [] variables =  new String[] { ScriptConstants.SUMMARY_TAG + "page_number",
 				ScriptConstants.SUMMARY_TAG + "totalPage_number",
 				// 下面是权限相关的参数
 				ScriptConstants.DETAIL_TAG + Constants.P.PRIVILEGE_USERNAME, ScriptConstants.DETAIL_TAG + Constants.P.PRIVILEGE_AUTHORITY,
@@ -32,6 +36,13 @@ public abstract class VariableResolverAdapter implements VariableResolver {
 				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
 		};
+		Set<BuiltInParametersProvider> set = ExtraClassManager.getInstance().getArray(BuiltInParametersProvider.XML_TAG);
+		for (BuiltInParametersProvider provider : set) {
+			return (String[]) ArrayUtils.addAll(variables, new String []{
+					ScriptConstants.DETAIL_TAG + provider.getParametersName()
+			});
+		}
+		return variables;
 	}
 	
 	private Parameter[] getCurrentModeParameters(int type) {

designer_base/src/com/fr/design/fun/ConnectionProvider.java

@@ -12,7 +12,8 @@ public interface ConnectionProvider extends Mutable {
 
     public static final String XML_TAG = "ConnectionProvider";
 
-    int CURRENT_LEVEL = 1;
+    // 2016-12-14 1 -> 2 , 增加connection.feature方法导致不兼容.
+    int CURRENT_LEVEL = 2;
 
     /**
      * 数据连接弹出菜单的名字

designer_base/src/com/fr/design/fun/DBTableDataMenuHandler.java

@@ -0,0 +1,22 @@
+package com.fr.design.fun;
+
+import com.fr.data.impl.DBTableData;
+import com.fr.design.actions.UpdateAction;
+import com.fr.stable.fun.mark.Immutable;
+
+/**
+ * Created by xiaxiang on 2017/1/15.
+ */
+public interface DBTableDataMenuHandler extends Immutable {
+    String MARK_STRING = "DBTableDataMenuHandler";
+
+    int CURRENT_LEVEL = 1;
+
+    UpdateAction createQueryAction();
+
+    void populate(DBTableData dbTableData);
+
+    DBTableData update();
+
+
+}

designer_base/src/com/fr/design/fun/DesignerStartOpenFileProcessor.java

@@ -0,0 +1,20 @@
+package com.fr.design.fun;
+
+import com.fr.file.FILE;
+import com.fr.stable.fun.mark.Immutable;
+
+/**
+ * 指定设计器启动时默认打开的文件
+ * Created by rinoux on 2016/12/16.
+ */
+public interface DesignerStartOpenFileProcessor extends Immutable {
+
+    int CURRENT_LEVEL = 1;
+
+    String XML_TAG = "DesignerStartOpenFileProcessor";
+
+    /**
+     * 显示需要打开的报表文件
+     */
+    FILE fileToShow();
+}

designer_base/src/com/fr/design/fun/ExtraButtonToolBarProvider.java

@@ -0,0 +1,41 @@
+package com.fr.design.fun;
+
+import com.fr.form.ui.Widget;
+import com.fr.stable.fun.mark.Mutable;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * 报表工具栏设计器端拓展，用于配置按钮额外属性
+ * Created by harry on 2016-12-23.
+ */
+public interface ExtraButtonToolBarProvider extends Mutable {
+
+    String XML_TAG = "ExtraButtonToolBarProvider";
+
+    int CURRENT_LEVEL = 1;
+
+    /**
+     * 用于添加属性面板
+     *
+     * @param centerPane 面板
+     */
+    void updateCenterPane(JPanel centerPane);
+
+    /**
+     * 更新界面
+     *
+     * @param widget     控件
+     * @param card       卡片布局
+     * @param centerPane 面板
+     */
+    void populate(Widget widget, CardLayout card, JPanel centerPane);
+
+    /**
+     * 保存界面设置
+     *
+     * @param widget 控件
+     */
+    void update(Widget widget);
+}

designer_base/src/com/fr/design/fun/impl/AbstractDBTableDataMenuHandler.java

@@ -0,0 +1,34 @@
+package com.fr.design.fun.impl;
+
+import com.fr.data.impl.DBTableData;
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.fun.DBTableDataMenuHandler;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * Created by xiaxiang on 2017/1/15.
+ */
+@API(level = DBTableDataMenuHandler.CURRENT_LEVEL)
+public abstract class AbstractDBTableDataMenuHandler implements DBTableDataMenuHandler {
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    public int layerIndex() {
+        return DEFAULT_LAYER_INDEX;
+    }
+
+    public UpdateAction createQueryAction() {
+        return null;
+    }
+
+    @Override
+    public DBTableData update() {
+        return null;
+    }
+
+    @Override
+    public void populate(DBTableData dbTableData) {
+
+    }
+}

designer_base/src/com/fr/design/fun/impl/AbstractDesignerStartOpenFileProcessor.java

@@ -0,0 +1,18 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.DesignerStartOpenFileProcessor;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * Created by rinoux on 2016/12/16.
+ */
+@API(level = DesignerStartOpenFileProcessor.CURRENT_LEVEL)
+public abstract class AbstractDesignerStartOpenFileProcessor implements DesignerStartOpenFileProcessor {
+    public int currentAPILevel() {
+        return DesignerStartOpenFileProcessor.CURRENT_LEVEL;
+    }
+
+    public int layerIndex() {
+        return DEFAULT_LAYER_INDEX;
+    }
+}

designer_base/src/com/fr/design/fun/impl/AbstractExtraButtonToolBarProvider.java

@@ -0,0 +1,19 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.ExtraButtonToolBarProvider;
+import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * Created by harry on 2016-12-23.
+ */
+@API(level = ExtraButtonToolBarProvider.CURRENT_LEVEL)
+public abstract class AbstractExtraButtonToolBarProvider extends AbstractProvider implements ExtraButtonToolBarProvider {
+    public int currentAPILevel() {
+        return ExtraButtonToolBarProvider.CURRENT_LEVEL;
+    }
+
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+}

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

@@ -109,6 +109,10 @@ public abstract class JListControlPane extends JControlPane {
 
     }
 
+    protected void doBeforePopulate(ListModelElement el, Object obj) {
+
+    }
+
     @Override
     protected ShortCut4JControlPane addItemShortCut() {
         ShortCut addItemShortCut;
@@ -832,6 +836,7 @@ public abstract class JListControlPane extends JControlPane {
                         cardPane.add(updatePanes[i], String.valueOf(i));
                     }
                     card.show(cardPane, String.valueOf(i));
+                    doBeforePopulate(el, ob2Populate);
                     updatePanes[i].populateBean(ob2Populate);
                     doWhenPopulate(updatePanes[i]);
                     break;

designer_base/src/com/fr/design/gui/date/UIDatePicker.java

@@ -31,6 +31,7 @@ public class UIDatePicker extends UIComboBox implements Serializable {
 	public static final int STYLE_CN_DATE1 = 1;
 	public static final int STYLE_CN_DATETIME = 2;
 	public static final int STYLE_CN_DATETIME1 = 3;
+	public static final int STYLE_EN_DATE = 4;
     public boolean isWillHide = false;
 	/**
 	 * 日期格式类型
@@ -113,6 +114,8 @@ public class UIDatePicker extends UIComboBox implements Serializable {
 				return new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
 			case STYLE_CN_DATETIME1:
 				return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			case STYLE_EN_DATE:
+				return new SimpleDateFormat("MM/dd/yyyy");
 			default:
 				throw new UnsupportedOperationException(
 						"invalid formatStyle parameter!");

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

@@ -13,6 +13,7 @@ import com.fr.js.JavaScript;
 import com.fr.js.NameJavaScript;
 import com.fr.js.NameJavaScriptGroup;
 import com.fr.plugin.PluginManager;
+import com.fr.stable.ListMap;
 import com.fr.stable.Nameable;
 
 import java.util.ArrayList;
@@ -34,7 +35,7 @@ public class HyperlinkGroupPane extends JListControlPane {
      * @return 返回Nameable按钮数组.
      */
     public NameableCreator[] createNameableCreators() {
-        Map<String, NameableCreator> nameCreators = new TreeMap<String, NameableCreator>();
+        Map<String, NameableCreator> nameCreators = new ListMap<>();
         NameableCreator[] creators = DesignModuleFactory.getHyperlinkGroupType().getHyperlinkCreators();
         for (NameableCreator creator : creators) {
             nameCreators.put(creator.menuName(), creator);

designer_base/src/com/fr/design/gui/ibutton/UIButtonGroup.java

@@ -28,6 +28,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 
 public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver {
 	private boolean isTwoLine = false;
+	private boolean isFourLine = false;
 	private static final long serialVersionUID = 1L;
 	protected List<UIToggleButton> labelButtonList;
 	protected int selectedIndex = -1;
@@ -176,6 +177,10 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver {
 		this.isTwoLine = true;
 	}
 
+	public void setFourLine() {
+		this.isFourLine = true;
+	}
+
 	/**
 	 * paintComponent
 	 *
@@ -201,32 +206,40 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver {
 		}
 		Graphics2D g2d = (Graphics2D) g;
 		g2d.setColor(UIConstants.LINE_COLOR);
-		if (!isTwoLine) {
+		if (isTwoLine) {
 			int width = 0;
-			for (int i = 0; i < labelButtonList.size() - 1; i++) {
+			int upCount = (labelButtonList.size() - 1) / 2 + 1;
+			for (int i = 0; i < upCount - 1; i++) {
 				width += labelButtonList.get(i).getWidth() + 1;
-				int height = labelButtonList.get(i).getHeight();
+				int height = labelButtonList.get(i).getHeight() * 2 + 1;
 				g.drawLine(width, 0, width, height);
 			}
 
-			width += labelButtonList.get(labelButtonList.size() - 1).getWidth() + 1;
+			width += labelButtonList.get(upCount).getWidth() + 1;
-
 			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 			g2d.drawRoundRect(0, 0, width, getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
+			g2d.drawLine(0, getHeight() / 2, width, getHeight() / 2);
+			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+		} else if (isFourLine) {
+			// 4 * 1
+			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+			g2d.drawRoundRect(0, 0, getWidth() - 1, getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
+			for (int i = 1; i <= 3; i++) {
+				g2d.drawLine(0, getHeight() / 4 * i, getWidth() - 1, getHeight() / 4 * i);
+			}
 			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
 		} else {
 			int width = 0;
-			int upCount = (labelButtonList.size() - 1) / 2 + 1;
+			for (int i = 0; i < labelButtonList.size() - 1; i++) {
-			for (int i = 0; i < upCount - 1; i++) {
 				width += labelButtonList.get(i).getWidth() + 1;
-				int height = labelButtonList.get(i).getHeight() * 2 + 1;
+				int height = labelButtonList.get(i).getHeight();
 				g.drawLine(width, 0, width, height);
 			}
 
-			width += labelButtonList.get(upCount).getWidth() + 1;
+			width += labelButtonList.get(labelButtonList.size() - 1).getWidth() + 1;
+
 			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 			g2d.drawRoundRect(0, 0, width, getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
-			g2d.drawLine(0, getHeight() / 2, width, getHeight() / 2);
 			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
 		}
 

designer_base/src/com/fr/design/gui/ibutton/UIColorButton.java

@@ -30,6 +30,7 @@ public class UIColorButton extends UIButton implements PopupHider, UIObserver, G
 	private static final int SIZE_2 = 2;
 	private static final int SIZE_4 = 4;
 	private static final int SIZE_6 = 6;
+	private static final int POPUP_MENU_SHIFT = -70;
 	private Color color = Color.BLACK;
 	private ColorControlWindow popupWin;
 	private EventListenerList colorChangeListenerList = new EventListenerList();
@@ -126,7 +127,7 @@ public class UIColorButton extends UIButton implements PopupHider, UIObserver, G
 
 		popupWin = this.getColorControlWindow();
 
-		GUICoreUtils.showPopupMenu(popupWin, this, 0, this.getSize().height);
+		GUICoreUtils.showPopupMenu(popupWin, this, POPUP_MENU_SHIFT, this.getSize().height);
 	}
 
 	/**

designer_base/src/com/fr/design/gui/icombobox/UIComboBox.java

@@ -160,6 +160,14 @@ public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObser
         uiObserverListener = listener;
     }
 
+    public void removeChangeListener(){
+        uiObserverListener = null;
+    }
+
+    public UIObserverListener getUiObserverListener(){
+        return uiObserverListener;
+    }
+
     /**
      * @return
      */

designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java

@@ -5,6 +5,7 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.stable.Constants;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.stable.collections.utils.MathUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -14,10 +15,12 @@ import java.awt.event.MouseMotionListener;
 
 public class UIResizableContainer extends JPanel {
     private static final long serialVersionUID = 1854340560790476907L;
+    private static final int MAX_PARA_HEIGHT = 240;
     private int containerWidth = 240;
     private int preferredWidth = 240;
     private int toolPaneY = 300;
     private int toolPaneHeight = 10;
+    private int bottomHeight = 30;
 
     private JComponent upPane;
     private JComponent downPane;
@@ -139,7 +142,7 @@ public class UIResizableContainer extends JPanel {
      * @param height
      */
     public void setParameterHeight(int height) {
-        paraHeight = hasParameterPane? height : 0;
+        paraHeight = hasParameterPane? Math.min(height, MAX_PARA_HEIGHT) : 0;
         refreshContainer();
 
     }
@@ -208,7 +211,7 @@ public class UIResizableContainer extends JPanel {
                 if(isDownPaneVisible){
                     upPane.setBounds(0, 0, containerWidth - toolPaneHeight, toolPaneY);
                     horizontToolPane.setBounds(0, toolPaneY, containerWidth - toolPaneHeight, toolPaneHeight);
-                    downPane.setBounds(0, toolPaneY + toolPaneHeight, containerWidth - toolPaneHeight, parent.getHeight() - toolPaneY - toolPaneHeight-30);
+                    downPane.setBounds(0, toolPaneY + toolPaneHeight, containerWidth - toolPaneHeight, parent.getHeight() - toolPaneY - toolPaneHeight - bottomHeight);
                     verticalToolPane.setBounds(containerWidth - toolPaneHeight, 0, toolPaneHeight, getHeight());
                 }else{
                     upPane.setBounds(0, 0, containerWidth - toolPaneHeight, getHeight());

designer_base/src/com/fr/design/gui/itable/AbstractPropertyTable.java

@@ -26,32 +26,39 @@ import com.fr.general.Inter;
  */
 public abstract class AbstractPropertyTable extends JTable {
 
-    // 属性分组
+    // // 所有数据组, 把数据分组，一个可折叠的项里面的所有行 为一组
     protected ArrayList<PropertyGroup> groups;
-    protected TableModel default_table_model;
 	// 属性表被选中的行加一个浅蓝色的背景
 	public static final Color PROPERTY_SELECTION_BACKGROUND = new Color(153, 204, 255);
 	// 属性表的行高
 	public static final int PROPERTY_TABLE_ROW_HEIGHT = 22;
+    private static final int PROPERTY_ICON_WIDTH = 10;
 
     public AbstractPropertyTable() {
-        this.setRowHeight(PROPERTY_TABLE_ROW_HEIGHT);
+        this.setTableProperties();
+        this.initPopup();
+        this.setModel(new DefaultTableModel());
+    }
+
+    private void setTableProperties() {
         JTableHeader header = getTableHeader();
         header.setReorderingAllowed(false);
         header.setPreferredSize(new Dimension(0, PROPERTY_TABLE_ROW_HEIGHT));
         header.setDefaultRenderer(new HeaderRenderer());
+        this.setRowHeight(PROPERTY_TABLE_ROW_HEIGHT);
         this.setGridColor(new Color(212, 208, 200));
         this.setSelectionBackground(PROPERTY_SELECTION_BACKGROUND);
         this.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         this.setColumnSelectionAllowed(false);
         this.setRowSelectionAllowed(true);
         this.setFillsViewportHeight(true);
-        this.initPopup();
-        default_table_model = new DefaultTableModel();
-        this.setModel(default_table_model);
         this.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
     }
 
+    /**
+     * 在这个函数里面初始化表格数据再repaint
+     * @param source
+     */
     public abstract void initPropertyGroups(Object source);
 
     public void fireValueChanged(Object old_value, boolean success, Object newValue) {
@@ -64,12 +71,15 @@ public abstract class AbstractPropertyTable extends JTable {
 
     @Override
     public TableCellRenderer getCellRenderer(int row, int column) {
+        //如果数据组不为空
         if (groups != null) {
             Point pIndex = getGroupIndex(row);
             if (pIndex == null){
                 return super.getCellRenderer(row, column);
             }
+            //拿出当前行所在的那个属性组
             PropertyGroup group = groups.get(pIndex.x);
+            //如果是标题行
             if (pIndex.y == 0) {
                 if (column == 0) {
                     return group.getFirstRenderer();
@@ -77,11 +87,13 @@ public abstract class AbstractPropertyTable extends JTable {
                     return group.getSecondRenderer();
                 }
             } else {
+                //如果是非标题行第一列，采用默认渲染器
                 if (column == 0) {
                 	return super.getCellRenderer(row, column);
 				} else {
 					TableCellRenderer renderer = group.getModel().getRenderer(pIndex.y - 1);
 					if (renderer instanceof Component) {
+                        //如果这个渲染器是继承自Component，根据当前行列是否可编辑决定该控件是否可用
 						((Component) renderer).setEnabled(isCellEditable(row, column));
 					}
 					return renderer;
@@ -115,6 +127,12 @@ public abstract class AbstractPropertyTable extends JTable {
         }
     }
 
+    /**
+     * 看懂了。。写个注释先
+     * 获取当前row行的Point(x, y), x代表当前row行是属于groups中的第x个组，y代表当前row行所在的第x组里面的第y行
+     * @param row
+     * @return
+     */
     private Point getGroupIndex(int row) {
         int count = 0;
         for (int i = 0; i < groups.size(); i++) {
@@ -135,6 +153,10 @@ public abstract class AbstractPropertyTable extends JTable {
 
         this.addMouseListener(new MouseAdapter() {
 
+            /**
+             * 如果点到标题行就要触发折叠事件
+             * @param e
+             */
             @Override
             public void mouseClicked(MouseEvent e) {
                 if (!e.isPopupTrigger() && groups != null) {
@@ -148,13 +170,18 @@ public abstract class AbstractPropertyTable extends JTable {
                 }
             }
 
+            /**
+             * 这个mousePressed和上面的mouseClicked唯一不同的地方是单双击和e.getX() < 10 的判断
+             * 这个意思应该就是说点到图标（加号减号），立即触发折叠效果，否则点其他处要双击才能触发
+             * @param e
+             */
             @Override
             public void mousePressed(MouseEvent e) {
                 if (!e.isPopupTrigger() && groups != null) {
                     int row = AbstractPropertyTable.super.rowAtPoint(e.getPoint());
                     if (row != -1) {
                         Point pIndex = getGroupIndex(row);
-                        if (pIndex.y == 0 && e.getClickCount() == 1 && e.getX() < 10) {
+                        if (pIndex.y == 0 && e.getClickCount() == 1 && e.getX() < PROPERTY_ICON_WIDTH) {
                             toggleCollapse(pIndex.x);
                         }
                     }
@@ -163,16 +190,27 @@ public abstract class AbstractPropertyTable extends JTable {
         });
     }
 
+    /**
+     * 切换属性组折叠属性true/false
+     * @param groupIndex
+     */
     private void toggleCollapse(int groupIndex) {
         PropertyGroup group = groups.get(groupIndex);
         group.setCollapsed(!group.isCollapsed());
+        //这里获取表格的父控件是为了当表格被折叠了后，装表格的父控件也要相应的重新布局一下
+        //比如折叠之后表格行数应该比原来的少，占用父容器空间应该小点，不重新布局父容器，表格大小不会改变
         Container parent = AbstractPropertyTable.this.getParent();
         if (parent != null) {
-            parent.doLayout();
+//            parent.doLayout(); // 这里还是用revalidate吧。。daLayout有时候会失效不知道为什么
+            parent.revalidate();
         }
         repaint();
     }
 
+    /**
+     * BeanTableModel类，提供表格数据
+     * 它的所有数据来源均来自PropertyGroup中的AbstractPropertyGroupModel中的descriptor
+     */
     public class BeanTableModel extends AbstractTableModel {
 
         @Override

designer_base/src/com/fr/design/gui/itable/PropertyGroup.java

@@ -4,11 +4,14 @@ import javax.swing.table.TableCellRenderer;
 
 import com.fr.design.beans.GroupModel;
 
+/**
+ * PropertyGroup类描述了属性表中一个属性分组
+ */
 public class PropertyGroup {
 
-    private GroupModel model;
+    private GroupModel model; // 描述这个属性组中的数据model
-    private String name;
+    private String name; // 这组属性的标题名称
-    private boolean collapsed;
+    private boolean collapsed; // 这组属性是否折叠
     private GroupRenderer renderer1;
     private GroupRenderer renderer2;
 
@@ -55,4 +58,5 @@ public class PropertyGroup {
     public TableCellRenderer getSecondRenderer() {
         return renderer2;
     }
+
 }

designer_base/src/com/fr/design/gui/style/BorderPane.java

@@ -51,34 +51,16 @@ public class BorderPane extends AbstractBasicStylePane {
 	}
 
 	protected void initComponents() {
-		topToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"));
+		initButtonsWithIcon();
-		leftToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"));
-		bottomToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"));
-		rightToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"));
-		horizontalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"));
-		verticalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"));
-		this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
-		this.currentLineColorPane = new NewColorSelectBox(100);
-
 		this.setLayout(new BorderLayout(0, 6));
-
+		double p = TableLayout.PREFERRED, f = TableLayout.FILL;
-		double p = TableLayout.PREFERRED;
+		double[] columnSize1 = {p, f}, rowSize1 = {p, p};
-		double f = TableLayout.FILL;
-
-		double[] columnSize1 = {p, f};
-		double[] rowSize1 = {p, p};
-
-
 		Component[][] components1 = new Component[][]{
-				new Component[]{new UILabel(Inter.getLocText("Style") + ":"), currentLineCombo},
+				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Style") + ":"), currentLineCombo},
-				new Component[]{new UILabel(Inter.getLocText("Color") + ":"), currentLineColorPane},
+				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Color") + ":"), currentLineColorPane},
 		};
-
 		JPanel northPane = TableLayoutHelper.createTableLayoutPane(components1, rowSize1, columnSize1);
-
+		double[] columnSize2 = {p, f}, rowSize2 = {p, p};
-
-		double[] columnSize2 = {p, f};
-		double[] rowSize2 = {p, p};
 		JPanel externalPane = new JPanel(new GridLayout(0, 4));
 		externalPane.add(topToggleButton);
 		externalPane.add(leftToggleButton);
@@ -87,23 +69,15 @@ public class BorderPane extends AbstractBasicStylePane {
 		JPanel insidePane = new JPanel(new GridLayout(0, 2));
 		insidePane.add(horizontalToggleButton);
 		insidePane.add(verticalToggleButton);
-
-
 		Component[][] components2 = new Component[][]{
 				new Component[]{outerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/out.png")), innerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/in.png"))},
 				new Component[]{externalPane, insidePane,}
 		};
 		JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components2, rowSize2, columnSize2);
-
 		this.setLayout(new BorderLayout(0, 6));
 		this.add(northPane, BorderLayout.NORTH);
 		this.add(centerPane, BorderLayout.CENTER);
-
-
-		this.currentLineColorPane.setSelectObject(Color.BLACK);
-
 		outerToggleButton.addChangeListener(new ChangeListener() {
-
 			@Override
 			public void stateChanged(ChangeEvent e) {
 				boolean value = outerToggleButton.isSelected();
@@ -113,9 +87,7 @@ public class BorderPane extends AbstractBasicStylePane {
 				rightToggleButton.setSelected(value);
 			}
 		});
-
 		innerToggleButton.addChangeListener(new ChangeListener() {
-
 			@Override
 			public void stateChanged(ChangeEvent e) {
 				boolean value = innerToggleButton.isSelected();
@@ -123,12 +95,22 @@ public class BorderPane extends AbstractBasicStylePane {
 				verticalToggleButton.setSelected(value);
 			}
 		});
+	}
 
+	private void initButtonsWithIcon(){
+		topToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"));
+		leftToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"));
+		bottomToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"));
+		rightToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"));
+		horizontalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"));
+		verticalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"));
+		this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
+		this.currentLineColorPane = new NewColorSelectBox(100);
 	}
 
 	@Override
 	public String title4PopupWindow() {
-		return Inter.getLocText("Border");
+		return Inter.getLocText("FR-Designer_Border");
 	}
 
 	public void populate(Style style) {

designer_base/src/com/fr/design/insert/formula/variable/cn/$$$.txt

@@ -1 +1 @@
-΅±Η°Φ΅
+当前值

designer_base/src/com/fr/design/insert/formula/variable/cn/$$page_number.txt

@@ -1 +1 @@
-当前的页数。
+当前的页数。

designer_base/src/com/fr/design/insert/formula/variable/cn/$$totalPage_number.txt

@@ -1 +1 @@
-总页数。
+总页数。

designer_base/src/com/fr/design/insert/formula/variable/cn/$fr_authority.txt

@@ -1 +1 @@
-使用权限时保存角色的参数
+使用权限时保存角色的参数

designer_base/src/com/fr/design/insert/formula/variable/cn/$fr_username.txt

@@ -1 +1 @@
-使用权限时保存用户名的参数
+使用权限时保存用户名的参数

designer_base/src/com/fr/design/insert/formula/variable/cn/$fr_userposition.txt

@@ -1,3 +1 @@
-使用权限时,$fr_userposition就是部门角色，
+使用权限时,$fr_userposition就是部门角色，格式如：{"jobTitle":"销售经理","departments":"销售"}，部门角色是以部门和职务组成的数组。
-格式如：{"departments":"销售","jobTitle":"销售经理"}，
-部门角色是以部门和职务组成的数组。

designer_base/src/com/fr/design/insert/formula/variable/cn/NOFILTER.txt

@@ -1 +1 @@
-NOFILTER是一个与任意值比较都为true的参数。
+NOFILTER是一个与任意值比较都为true的参数。

designer_base/src/com/fr/design/insert/formula/variable/cn/NULL.txt

@@ -1 +1 @@
-空值的参数。
+空值的参数。

designer_base/src/com/fr/design/insert/formula/variable/cn/contextPath.txt

@@ -1,3 +1 @@
-contextPath是指绝对路径的服务器别名，即虚拟目录.
+contextPath是指绝对路径的服务器别名，即虚拟目录.假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，contextPath是/WebReport
-假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，
-contextPath是/WebReport

designer_base/src/com/fr/design/insert/formula/variable/cn/curReport.txt

@@ -1 +1 @@
-当前报表。
+当前报表。

designer_base/src/com/fr/design/insert/formula/variable/cn/formletName.txt

@@ -1,3 +1 @@
-表单名字
+表单名字假如访问：http://localhost:8080/WebReport/ReportServer?formlet=Form1.frm，formName就是Form1.frm
-假如访问：http://localhost:8080/WebReport/ReportServer?formlet=Form1.frm，
-formName就是Form1.frm

designer_base/src/com/fr/design/insert/formula/variable/cn/fr_submitinfo.txt

@@ -1 +1 @@
-提交入库事件的返回信息。
fr_submitinfo.success记录成功与否
fr_submitinfo.failinfo简单记录出错信息
+提交入库事件的返回信息。fr_submitinfo.success记录成功与否fr_submitinfo.failinfo简单记录出错信息

designer_base/src/com/fr/design/insert/formula/variable/cn/reportName.txt

@@ -1,3 +1 @@
-报表名字
+报表名字假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，reportName就是WorkBook1.cpt
-假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，
-reportName就是WorkBook1.cpt

designer_base/src/com/fr/design/insert/formula/variable/cn/serverName.txt

@@ -1,3 +1 @@
-serverName，是指服务器地址或名称.
+serverName，是指服务器地址或名称.假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，serverName指的是：localhost，即访问机子的IP
-假如访问：http://localhost:8080/WebReport/ReportServer?reportlet=WorkBook1.cpt，
-serverName指的是：localhost，即访问机子的IP

designer_base/src/com/fr/design/insert/formula/variable/cn/serverPort.txt

@@ -1 +1 @@
-serverPort指的是访问的端口
+serverPort指的是访问的端口