Merge branch 'release/8.0'

# Conflicts:
#	designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java

build.performance.gradle

@@ -15,7 +15,6 @@ task appletJar<<{
 			fileset(dir:"${basicDir}/chart/build/classes/main")			
 			fileset(dir:"${basicDir}/report/build/classes/main")		
 			fileset(dir:"${basicDir}/platform/build/classes/main")
-			fileset(dir:"${basicDir}/performance/build/classes/main")
 		}
 		unjar(src:"${libDir}/3rd.jar",dest:"./tmp")
 		unjar(src:"${libDir}/servlet-api.jar",dest:"./tmp")

designer/src/com/fr/design/present/PresentPane.java

@@ -57,12 +57,12 @@ public class PresentPane extends UIComboBoxPane<Present> {
 	@Override
 	protected List<FurtherBasicBeanPane<? extends Present>> initPaneList() {
 		if (keys == null) {
-			keys = new ArrayList<>();
+			keys = new ArrayList<String>();
 		}
 		if (displays == null) {
-			displays = new ArrayList<>();
+			displays = new ArrayList<String>();
 		}
-		List<FurtherBasicBeanPane<? extends Present>> paneList = new ArrayList<>();
+		List<FurtherBasicBeanPane<? extends Present>> paneList = new ArrayList<FurtherBasicBeanPane<? extends Present>>();
 		FurtherBasicBeanPane<Present> none = new NonePresentPane();
 		paneList.add(none);
 		keys.add("NOPRESENT");
@@ -99,7 +99,7 @@ public class PresentPane extends UIComboBoxPane<Present> {
 
 	@Override
 	protected UIComboBox createComboBox() {
-		return new DictionaryComboBox<>(keys.toArray(new String[keys.size()]), displays.toArray(new String[displays.size()]));
+		return new DictionaryComboBox<String>(keys.toArray(new String[keys.size()]), displays.toArray(new String[displays.size()]));
 	}
 
 	@Override

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

@@ -31,7 +31,7 @@ public class ReportExportAttrPane extends BasicPane {
         wordExportPane = new WordExportPane();
         uiTabbedPane.addTab("Word", wordExportPane);
         Set<ExportAttrTabProvider> providers = ExtraDesignClassManager.getInstance().getArray(ExportAttrTabProvider.XML_TAG);
-        paneList = new ArrayList<>();
+        paneList = new ArrayList<AbstractExportPane>();
         for (ExportAttrTabProvider provider : providers) {
             uiTabbedPane.addTab(provider.title(), provider.toSwingComponent());
             paneList.add(provider.toExportPane());

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

@@ -1 +1,100 @@
-package com.fr.design.report;

import com.fr.data.Verifier;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.fun.VerifyDefineProvider;
import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.controlpane.ObjectJControlPane;
import com.fr.design.mainframe.ElementCasePane;
import com.fr.general.Inter;
import com.fr.general.NameObject;
import com.fr.report.write.ReportWriteAttr;
import com.fr.report.write.ValueVerifier;
import com.fr.report.write.WClassVerifier;
import com.fr.stable.ArrayUtils;
import com.fr.stable.Nameable;

import java.util.ArrayList;
import java.util.Set;

/**
 * 校验列表
 */
public class VerifierListPane extends ObjectJControlPane {

    public VerifierListPane(ElementCasePane ePane) {
        super(ePane);
    }

    /**
     * 创建选项
     *
     * @return 选项
     */
    public NameableCreator[] createNameableCreators() {
        NameableCreator[] creators = new NameableCreator[]{
                new NameObjectCreator(Inter.getLocText(new String[]{"BuildIn", "Verify"}),
                        "/com/fr/web/images/reportlet.png",
                        ValueVerifier.class,
                        BuildInVerifierPane.class)
        };
        Set<VerifyDefineProvider> set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING);
        for (VerifyDefineProvider provider : set) {
            creators = ArrayUtils.add(creators, new NameObjectCreator(
                    provider.nameForVerifier(),
                    provider.iconPath(),
                    provider.classForVerifier(),
                    provider.appearanceForVerifier()
            ) {
            });
        }
        creators = ArrayUtils.add(creators, new NameObjectCreator(
                Inter.getLocText(new String[]{"Custom", "Verify"}),
                "/com/fr/web/images/reportlet.png",
                WClassVerifier.class,
                CustomVerifierPane.class));
        return creators;
    }

    @Override
    protected String title4PopupWindow() {
        return "Verify Collections";
    }

    public void populate(ReportWriteAttr reportWriteAttr) {
        if (reportWriteAttr == null) {
            return;
        }

        java.util.List<NameObject> nameObjectList = new ArrayList<>();

        int verifierCount = reportWriteAttr.getVerifierCount();
        for (int i = 0; i < verifierCount; i++) {
            Verifier verifier = reportWriteAttr.getVerifier(i);
            nameObjectList.add(new NameObject(verifier.getName(), verifier));
        }

        this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()]));
    }

    public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) {
        // Nameable[]居然不能强转成NameObject[],一定要这么写...
        Nameable[] res = this.update();
        NameObject[] res_array = new NameObject[res.length];
        java.util.Arrays.asList(res).toArray(res_array);

        reportWriteAttr.clearVerifiers();

        for (int i = 0; i < res_array.length; i++) {
            NameObject nameObject = res_array[i];
            if (nameObject.getObject() instanceof Verifier) {
                Verifier verifier = (Verifier) nameObject.getObject();
                verifier.setName(nameObject.getName());
                reportWriteAttr.addVerifier(verifier);
            }
        }
    }


}
+package com.fr.design.report;
+
+import com.fr.data.Verifier;
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.fun.VerifyDefineProvider;
+import com.fr.design.gui.controlpane.NameObjectCreator;
+import com.fr.design.gui.controlpane.NameableCreator;
+import com.fr.design.gui.controlpane.ObjectJControlPane;
+import com.fr.design.mainframe.ElementCasePane;
+import com.fr.general.Inter;
+import com.fr.general.NameObject;
+import com.fr.report.write.ReportWriteAttr;
+import com.fr.report.write.ValueVerifier;
+import com.fr.report.write.WClassVerifier;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.Nameable;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+/**
+ * 校验列表
+ */
+public class VerifierListPane extends ObjectJControlPane {
+
+    public VerifierListPane(ElementCasePane ePane) {
+        super(ePane);
+    }
+
+    /**
+     * 创建选项
+     *
+     * @return 选项
+     */
+    public NameableCreator[] createNameableCreators() {
+        NameableCreator[] creators = new NameableCreator[]{
+                new NameObjectCreator(Inter.getLocText(new String[]{"BuildIn", "Verify"}),
+                        "/com/fr/web/images/reportlet.png",
+                        ValueVerifier.class,
+                        BuildInVerifierPane.class)
+        };
+        Set<VerifyDefineProvider> set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING);
+        for (VerifyDefineProvider provider : set) {
+            creators = ArrayUtils.add(creators, new NameObjectCreator(
+                    provider.nameForVerifier(),
+                    provider.iconPath(),
+                    provider.classForVerifier(),
+                    provider.appearanceForVerifier()
+            ) {
+            });
+        }
+        creators = ArrayUtils.add(creators, new NameObjectCreator(
+                Inter.getLocText(new String[]{"Custom", "Verify"}),
+                "/com/fr/web/images/reportlet.png",
+                WClassVerifier.class,
+                CustomVerifierPane.class));
+        return creators;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "Verify Collections";
+    }
+
+    public void populate(ReportWriteAttr reportWriteAttr) {
+        if (reportWriteAttr == null) {
+            return;
+        }
+
+        java.util.List<NameObject> nameObjectList = new ArrayList<NameObject>();
+
+        int verifierCount = reportWriteAttr.getVerifierCount();
+        for (int i = 0; i < verifierCount; i++) {
+            Verifier verifier = reportWriteAttr.getVerifier(i);
+            nameObjectList.add(new NameObject(verifier.getName(), verifier));
+        }
+
+        this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()]));
+    }
+
+    public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) {
+        // Nameable[]居然不能强转成NameObject[],一定要这么写...
+        Nameable[] res = this.update();
+        NameObject[] res_array = new NameObject[res.length];
+        java.util.Arrays.asList(res).toArray(res_array);
+
+        reportWriteAttr.clearVerifiers();
+
+        for (int i = 0; i < res_array.length; i++) {
+            NameObject nameObject = res_array[i];
+            if (nameObject.getObject() instanceof Verifier) {
+                Verifier verifier = (Verifier) nameObject.getObject();
+                verifier.setName(nameObject.getName());
+                reportWriteAttr.addVerifier(verifier);
+            }
+        }
+    }
+
+
+}

designer/src/com/fr/design/write/submit/SubmitVisitorListPane.java

@@ -68,7 +68,7 @@ public class SubmitVisitorListPane extends ObjectJControlPane {
             return;
         }
 
-        List<NameObject> nameObjectList = new ArrayList<>();
+        List<NameObject> nameObjectList = new ArrayList<NameObject>();
 
         int submiterCount = reportWriteAttr.getSubmitVisitorCount();
         for (int i = 0; i < submiterCount; i++) {
@@ -169,8 +169,8 @@ public class SubmitVisitorListPane extends ObjectJControlPane {
         public CustomPane() {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             customCardPane = FRGUIPaneFactory.createCardLayout_S_Pane();
-            customSubmitPanes = new HashMap<>();
+            customSubmitPanes = new HashMap<String, BasicBeanPane>();
-            comboItemsMap = new HashMap<>();
+            comboItemsMap = new HashMap<String, String>();
 
             Set<SubmitProvider> providers = ExtraDesignClassManager.getInstance().getArray(SubmitProvider.MARK_STRING);
             addSubmitPane(new DefaultSubmit());
@@ -178,7 +178,7 @@ public class SubmitVisitorListPane extends ObjectJControlPane {
                 addSubmitPane(provider);
             }
 
-            configTypes = new ArrayList<>();
+            configTypes = new ArrayList<String>();
             for (Map.Entry<String, BasicBeanPane> entry : customSubmitPanes.entrySet()) {
                 String key = entry.getKey();
                 configTypes.add(comboItemsMap.get(key));

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

@@ -194,7 +194,12 @@ public class IntelliElements {
                     TemplateCellElement newCellElement = new DefaultTemplateCellElement(colIndex, rowIndex);
                     applyStyle(newCellElement, sourceCellElement);//style
                     if (sourceCellElement.getValue() instanceof DSColumn) {
-                        DSColumn dsColumn = (DSColumn) sourceCellElement.getValue();
+                        DSColumn dsColumn = null;
+                        try {
+                            dsColumn = (DSColumn) ((DSColumn) sourceCellElement.getValue()).clone();
+                        } catch (CloneNotSupportedException e) {
+                            FRContext.getLogger().error(e.getMessage(), e);
+                        }
                         newCellElement.setValue(dsColumn);
                         newCellElement.setCellExpandAttr(sourceCellElement.getCellExpandAttr());
                     } else if (sourceCellElement.getValue() instanceof Number) {

designer_base/src/com/fr/design/data/DesignTableDataManager.java

@@ -36,6 +36,7 @@ import java.io.ByteArrayOutputStream;
 import java.text.Collator;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 设计器管理操作数据集的类:
@@ -54,11 +55,11 @@ public abstract class DesignTableDataManager {
      * 其实globalDsCache没有绝对的必要，只是为了操作方便。如果没有它，那么每次清空服务器数据集或者存储过程的时候，还要去遍历找一下，
      * 这个操作可能比较复杂 。 从减少代码复杂度的角度看，还是很有必要的
      */
-    private static java.util.Map<String, TableDataWrapper> globalDsCache = new java.util.HashMap<String, TableDataWrapper>();
+    private static java.util.Map<String, TableDataWrapper> globalDsCache = new ConcurrentHashMap<String, TableDataWrapper>();
-    private static java.util.Map<String, String> dsNameChangedMap = new HashMap<String, String>();
+    private static java.util.Map<String, String> dsNameChangedMap = new ConcurrentHashMap<String, String>();
 //    private static List<ChangeListener> dsListeners = new ArrayList<ChangeListener>();
 
-    private static Map<String, List<ChangeListener>> dsListenersMap = new HashMap<String, List<ChangeListener>>();
+    private static Map<String, List<ChangeListener>> dsListenersMap = new ConcurrentHashMap<String, List<ChangeListener>>();;
 
 
     public static String NO_PARAMETER = "no_paramater_pane";

designer_base/src/com/fr/design/mainframe/JTemplate.java

@@ -121,7 +121,10 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
             return;
         }
         long saveTime = System.currentTimeMillis();  // 保存模板的时间点
-        tic.collectInfo(template, this, openTime, saveTime);
+        try {
+            tic.collectInfo(template, this, openTime, saveTime);
+        } catch (Throwable th) {  // 不管收集过程中出现任何异常，都不应该影响模版保存
+        }
         openTime = saveTime;  // 更新 openTime，准备下一次计算
     }
 

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

@@ -25,8 +25,6 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 	private int SERVERNUM = 0;
 
 	private boolean isWithSerious;
-	private int i;
-	private Timer timer;
 
 	public LogHandlerBar() {
 		this(null);
@@ -87,32 +85,7 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 	}
 
 	public synchronized void timerPaint() {
-		isWithSerious = true;
+		repaint();
-		timer = new Timer(500, null);
-		ActionListener taskAction = new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				if (i < 5) {
-					isWithSerious = i % 2 == 0 ? true : false;
-					repaint();
-				} else if (i == 5) {
-					if (timer == null)
-						return;
-					timer.stop();
-					timer = null;
-					i = 0;
-					isWithSerious = true;
-					return;
-				}
-				i++;
-			}
-		};
-		if (timer != null) {
-			timer.addActionListener(taskAction);
-		}
-		// taskAction里还有可能置空timer.
-		if (timer != null) {
-			timer.start();
-		}
 	}
 
 	public int getInfo() {

designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java

@@ -203,8 +203,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
         buttonGroup.setBorder(BorderFactory.createMatteBorder(1, LEFT_GAP, 0, 0, UIConstants.LINE_COLOR));
         buttonGroup.setNeedLeftRightOutLine(false);
     }
-
+    
-
     private int getMode(){
         return isSupportFS?FS_MANAGE: REPORT_PLATEFORM_MANAGE;
     }

designer_chart/src/com/fr/design/mainframe/ChartPropertyPane.java

@@ -30,7 +30,7 @@ public class ChartPropertyPane extends MiddleChartPropertyPane{
 				return new Dimension(super.getPreferredSize().width, 18);
 			}
 		};
-        nameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 1, 0));
+		nameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 1, 0));
 		nameLabel.setHorizontalAlignment(SwingConstants.CENTER);
 	}
 

designer_chart/src/com/fr/design/mainframe/MiddleChartPropertyPane.java

@@ -16,6 +16,7 @@ import com.fr.design.gui.itabpane.TitleChangeListener;
 import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.general.Inter;
 import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -30,11 +31,11 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 	public MiddleChartPropertyPane() {
 		initComponenet();
 	}
-	
+
 	protected void initComponenet() {
 		this.setLayout(new BorderLayout());
 		this.setBorder(null);
-		
+
 		createNameLabel();
 		this.add(createNorthComponent(), BorderLayout.NORTH);
 		chartEditPane =  StableUtils.construct(ChartEditPane.class);
@@ -47,11 +48,11 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 		this.createMainPane();
 		setSureProperty();
 	}
-	
+
 	protected abstract void createNameLabel();
-	
+
 	protected abstract JComponent createNorthComponent();
-	
+
 	protected abstract void createMainPane();
 
 
@@ -64,10 +65,10 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 		chartEditPane.setContainer(container);
 		chartEditPane.addTitleChangeListener(titleListener);
 		String tabname = chartEditPane.getSelectedTabName();
-		nameLabel.setText(Inter.getLocText("Chart-Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : ""));
+		nameLabel.setText(Inter.getLocText("Chart-Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : StringUtils.EMPTY));
 		resetChartEditPane();
 	}
-	
+
 	protected void resetChartEditPane() {
 		remove(chartEditPane);
 		add(chartEditPane, BorderLayout.CENTER);
@@ -75,20 +76,20 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 		repaint();
 		revalidate();
 	}
-	
+
 	protected TitleChangeListener titleListener = new TitleChangeListener() {
-		
+
 		@Override
 		public void fireTitleChange(String addName) {
 			nameLabel.setText(Inter.getLocText("Chart-Property_Table") + '-' + addName);
 		}
 	};
 
-    /**
+	/**
-     * 感觉ChartCollection加载图表属性界面.
+	 * 感觉ChartCollection加载图表属性界面.
-     * @param collection  收集图表
+	 * @param collection  收集图表
-     * @param ePane  面板
+	 * @param ePane  面板
-     */
+	 */
 	public void populateChartPropertyPane(ChartCollection collection, TargetComponent<?> ePane) {
 		addChartEditPane(collection.getSelectedChart().getPlot().getPlotID());
 		setSupportCellData(true);
@@ -96,11 +97,11 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 		chartEditPane.populate(collection);
 	}
 
-    /**
+	/**
-     * 感觉ChartCollection加载图表属性界面.
+	 * 感觉ChartCollection加载图表属性界面.
-     * @param collection  收集图表
+	 * @param collection  收集图表
-     * @param ePane  面板
+	 * @param ePane  面板
-     */
+	 */
 	public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> ePane) {
 		if (collection instanceof ChartCollection) {
 			populateChartPropertyPane((ChartCollection)collection, ePane);
@@ -127,18 +128,18 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 		return BaseUtils.readIcon("/com/fr/design/images/m_report/qb.png");
 	}
 
-    /**
+	/**
-     *  预定义定位
+	 *  预定义定位
-     * @return    定位
+	 * @return    定位
-     */
+	 */
 	public Location preferredLocation() {
 		return Location.WEST_BELOW;
 	}
 
-    /**
+	/**
-     * 创建标题Panel
+	 * 创建标题Panel
-     * @return  标题panel
+	 * @return  标题panel
-     */
+	 */
 	public UITitlePanel createTitlePanel() {
 		return new UITitlePanel(this);
 	}
@@ -148,14 +149,14 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 	 */
 	public void refreshDockingView() {
 		// TODO Auto-generated method stub
-		
+
 	}
-	
+
 	/**
 	 * 设置是否支持单元格数据.
 	 */
 	public void setSupportCellData(boolean supportCellData) {
-		if(chartEditPane != null) {
+		if (chartEditPane != null) {
 			chartEditPane.setSupportCellData(supportCellData);
 		}
 	}

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

@@ -22,6 +22,7 @@ import com.fr.design.mainframe.chart.gui.ChartTypePane;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -31,7 +32,7 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
-public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4DataSourceChange, ChartEditPaneProvider {
+public class ChartEditPane extends BasicPane implements AttributeChange, Prepare4DataSourceChange, ChartEditPaneProvider {
 
     private final static int CHANGE_MIN_TIME = 80;
 
@@ -119,7 +120,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
                 } catch (CloneNotSupportedException e) {
                     FRLogger.getLogger().error("error in clone ChartEditPane");
                 }
-                if(ComparatorUtils.equals(selectedPane.title4PopupWindow(),PaneTitleConstants.CHART_STYLE_TITLE)){
+                if (ComparatorUtils.equals(selectedPane.title4PopupWindow(), PaneTitleConstants.CHART_STYLE_TITLE)) {
                     dealWithStyleChange();
                 }
 
@@ -130,10 +131,11 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
 
     /**
      * 重新构造面板
+     *
      * @param currentChart 图表
      */
-    public void reLayout(Chart currentChart){
+    public void reLayout(Chart currentChart) {
-        if(currentChart != null){
+        if (currentChart != null) {
             int chartIndex = getSelectedChartIndex(currentChart);
             this.removeAll();
             this.setLayout(new BorderLayout());
@@ -141,22 +143,22 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
             addTypePane();
 
             boolean isDefault = true;
-            String plotID = "";
+            String plotID = StringUtils.EMPTY;
-            if(currentChart.getPlot() != null){
+            if (currentChart.getPlot() != null) {
                 plotID = currentChart.getPlot().getPlotID();
                 isDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID);
             }
 
-            if(isDefault){
+            if (isDefault) {
                 paneList.add(dataPane4SupportCell);
                 paneList.add(stylePane);
                 paneList.add(otherPane);
                 this.isDefaultPane = true;
-            }else{
+            } else {
                 ChartDataPane chartDataPane = createChartDataPane(plotID);
                 paneList.add(chartDataPane);
                 AbstractChartAttrPane[] otherPaneList = ChartTypeInterfaceManager.getInstance().getAttrPaneArray(plotID, listener);
-                for(int i = 0; i < otherPaneList.length; i++){
+                for (int i = 0; i < otherPaneList.length; i++) {
                     otherPaneList[i].addAttributeChangeListener(listener);
                     paneList.add(otherPaneList[i]);
                 }
@@ -178,6 +180,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
     }
 
     protected void setSelectedTab() {
+        //doNothing
     }
 
     /**
@@ -223,7 +226,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
             return;
         }
 
-        if(checkNeedsReLayout(collection.getSelectedChart())){
+        if (isNeedsReLayout(collection.getSelectedChart())) {
             reLayout(collection.getSelectedChart());
         }
 
@@ -250,12 +253,12 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
         }
     }
 
-    public int getSelectedChartIndex(Chart chart){
+    public int getSelectedChartIndex(Chart chart) {
         int index = 0;
-        if(typePane != null){
+        if (typePane != null) {
             FurtherBasicBeanPane[] paneList = typePane.getPaneList();
-            for(; index < paneList.length; index++){
+            for (; index < paneList.length; index++) {
-                if(paneList[index].accept(chart)){
+                if (paneList[index].accept(chart)) {
                     return index;
                 }
             }
@@ -264,12 +267,12 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
     }
 
     //populate的时候看看要不要重构面板
-    private boolean checkNeedsReLayout(Chart chart){
+    private boolean isNeedsReLayout(Chart chart) {
-        if(chart != null){
+        if (chart != null) {
             int lastIndex = typePane.getSelectedIndex();
             int currentIndex = getSelectedChartIndex(chart);
             boolean currentPane = true;
-            if(chart.getPlot() != null){
+            if (chart.getPlot() != null) {
                 String plotID = chart.getPlot().getPlotID();
                 currentPane = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID);
             }
@@ -280,9 +283,10 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
 
     /**
      * 当前界面是否是默认的界面
+     *
      * @return 是否是默认的界面
      */
-    public boolean isDefaultPane(){
+    public boolean isDefaultPane() {
         return this.isDefaultPane;
     }
 
@@ -314,16 +318,17 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
         }
     }
 
-    protected void dealWithStyleChange(){
+    protected void dealWithStyleChange() {
-
+        //doNothing
     }
 
     /**
-     *主要用于图表设计器，判断样式改变是否来自工具栏的全局样式按钮
+     * 主要用于图表设计器，判断样式改变是否来自工具栏的全局样式按钮
+     *
      * @param isFromToolBar 是否来自工具栏
      */
-    public void styleChange(boolean isFromToolBar){
+    public void styleChange(boolean isFromToolBar) {
-
+        //doNothing
     }
 
     /**
@@ -342,7 +347,10 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
         DesignTableDataManager.addDsChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent e) {
                 AbstractChartAttrPane attrPane = paneList.get(tabsHeaderIconPane.getSelectedIndex());
-                attrPane.refreshChartDataPane(collection);
+                //不显示，没有处于编辑状态，没必要更新。
+                if (attrPane.isShowing()) {
+                    attrPane.refreshChartDataPane(collection);
+                }
             }
         });
     }

designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java

@@ -389,8 +389,8 @@ public class XCardSwitchButton extends XButton {
             return;
         }
         int tabLength = this.tagLayout.getComponentCount();
-        Map<Integer, Integer> cardWidth = new HashMap<>();
+        Map<Integer, Integer> cardWidth = new HashMap<Integer, Integer>();
-        Map<Integer, Integer> cardHeight = new HashMap<>();
+        Map<Integer, Integer> cardHeight = new HashMap<Integer, Integer>();
         for (int i = 0; i < tabLength; i++) {
             XCardSwitchButton temp = (XCardSwitchButton) this.tagLayout.getComponent(i);
             CardSwitchButton tempCard = (CardSwitchButton) temp.toData();

designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java

@@ -60,7 +60,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
                         .setRendererClass(BooleanRender.class)
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit"))
         };
-        List<CRPropertyDescriptor> defaultList = new ArrayList<>();
+        List<CRPropertyDescriptor> defaultList = new ArrayList<CRPropertyDescriptor>();
 
         for (CRPropertyDescriptor propertyDescriptor: propertyTableEditor) {
             defaultList.add(propertyDescriptor);

designer_form/src/com/fr/design/gui/xtable/PropertyGroupModel.java

@@ -54,7 +54,7 @@ public class PropertyGroupModel extends AbstractPropertyGroupModel {
                 creator.resetCreatorName(value.toString());
             }
             if(ComparatorUtils.equals("visible", properties[row].getName())){
-                creator.resetVisible((boolean) value);
+                creator.resetVisible((Boolean) value);
             }
             properties[row].firePropertyChanged();
             return true;

designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java

@@ -286,7 +286,9 @@ public class FormParaWidgetPane extends JPanel {
 
     private int calculateWidgetWindowRowNum() {
         //向上取整
-        int rowNum = (int) Math.ceil((double) predifinedwidgeList.size() / (double) preWidgetShowMaxNum);
+        int eastRowNum = (int) Math.ceil((double) predifinedwidgeList.size() / (double) preWidgetShowMaxNum);
+        int westRowNum = (int) Math.ceil((double) loadWidgetOptions().length / (double) commonWidgetNum);
+        int rowNum = Math.max(eastRowNum, westRowNum);
         rowNum = Math.max(rowNum, 2);
         rowNum = Math.min(rowNum, preWidgetShowMaxRow);
         return rowNum;