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

build.dev.gradle

@@ -27,8 +27,8 @@ task appletJar<<{
 			fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main")
 
 		}
-		unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}")
-		unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}")
+		unjar(src:"${libDir}/${branchName}/3rd.jar",dest:"${libDir}/tmp-${branchName}")
+		unjar(src:"${libDir}/${branchName}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}")
 		jar(jarfile:"build/libs/fr-applet-8.0.jar"){
 			fileset(dir:"build/classes"){
 				exclude(name:"*.*")

build.dev.gradle.bak

@@ -0,0 +1,86 @@
+apply plugin: "java"
+tasks.withType(JavaCompile){
+	options.encoding = "UTF-8"
+}
+
+def basicDir="../../"
+def libDir="${basicDir}/finereport-lib-stable"
+//获取什么分支名
+FileTree files =fileTree(dir:"./",include:"build.*.gradle")
+def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\"))
+def branchName=buildDir.substring(buildDir.lastIndexOf ("\\")+1)
+
+task appletJar<<{
+	
+	ant{
+		mkdir(dir:"${libDir}/tmp-${branchName}")
+		mkdir(dir:"build/classes/")
+		copy(todir:"build/classes/"){
+			fileset(dir:"${basicDir}/finereport-core-stable/${branchName}/build/classes/main")
+	
+			fileset(dir:"${basicDir}/finereport-chart-stable/${branchName}/build/classes/main")
+							
+			fileset(dir:"${basicDir}/finereport-report-stable/${branchName}/build/classes/main")		
+			
+			fileset(dir:"${basicDir}/finereport-platform-stable/${branchName}/build/classes/main")
+						
+			fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main")
+
+		}
+		unjar(src:"${libDir}/3rd.jar",dest:"${libDir}/tmp-${branchName}")
+		unjar(src:"${libDir}/servlet-api.jar",dest:"${libDir}/tmp-${branchName}")
+		jar(jarfile:"build/libs/fr-applet-8.0.jar"){
+			fileset(dir:"build/classes"){
+				exclude(name:"*.*")
+				exclude(name:"bin/*.*")
+				exclude(name:"classes/**")
+				exclude(name:"com/fr/schedule/**")
+				exclude(name:"com/fr/cell/**")
+				exclude(name:"com/fr/dialog/**")
+				exclude(name:"com/fr/view/**")
+				exclude(name:"com/fr/web/**")
+				exclude(name:"com/fr/fs/**")
+				exclude(name:"com/fr/design/**")
+				exclude(name:"com/fr/start/**")
+				exclude(name:"com/fr/process/**")
+			}
+			fileset(dir:"${libDir}/tmp-${branchName}"){
+				include(name:"javax/mail/**")
+				include(name:"javax/servlet/**")
+				include(name:"org/freehep/**")
+				include(name:"com/fr/third/JAI/**")
+				include(name:"com/fr/third/antlr/**")
+				include(name:"com/fr/third/javax/**")
+				include(name:"com/sun/xml/**")
+				include(name:"javax/xml/**")
+
+			}
+			fileset(dir:"build/classes"){
+				include(name:"com/fr/web/*.class")
+				include(name:"com/fr/web/attr/*.class")
+			}
+		}
+		delete(dir:"${libDir}/tmp-${branchName}")
+		def jdk6home=	"D:/FineReport/develop/java/jdk1.6u35"
+		def keystore="frapplet.store"
+		def keycert="fr.cert"
+		def keypassword="123456"
+		def keyalias="fr"
+		
+		exec(executable:"${jdk6home}/bin/keytool"){
+			arg(line:"-genkey -dname &quot;CN=FineReport L=NanJing C=China&quot; -keystore ${keystore} -alias ${keyalias} -validity 3650 -storepass ${keypassword}")
+		}
+		exec(executable:"${jdk6home}/bin/keytool"){
+			arg(line:"-export -keystore ${keystore} -alias ${keyalias} -file ${keycert} -storepass ${keypassword}")
+		}
+
+		exec(executable:"${jdk6home}/bin/jarsigner"){
+			arg(line:"-keystore ${keystore} -storepass ${keypassword} 'build/libs/fr-applet-8.0.jar' ${keyalias}")
+		}
+		delete(file:"${keystore}")
+		delete(file:"${keycert}")
+		delete(dir:"build/classes")
+	
+	}
+
+}

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

@@ -732,6 +732,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
             }
         } else {
             DesignerContext.getDesignerFrame().resetToolkitByPlus(JWorkBook.this);
+            EastRegionContainerPane.getInstance().removeParameterPane();
             if (delegate4ToolbarMenuAdapter() instanceof PolyDesigner) {
                 PolyDesigner polyDesigner = (PolyDesigner) delegate4ToolbarMenuAdapter();
                 if (polyDesigner.getSelectionType() == PolyDesigner.SelectionType.NONE || polyDesigner.getSelection() == null) {
@@ -752,6 +753,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
             EastRegionContainerPane.getInstance().replaceUpPane(allowAuthorityUpPane());
             EastRegionContainerPane.getInstance().replaceDownPane(RolesAlreadyEditedPane.getInstance());
         }
+
         centerPane.needToShowCoverAndHidPane();
     }
 

designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java

@@ -18,6 +18,7 @@ import com.fr.general.Inter;
 import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.stable.EncodeConstants;
+import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -99,7 +100,9 @@ public class UserInfoLabel extends UILabel{
 			}
 		});
 
-		//PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
+		if (StableUtils.getMajorJavaVersion() == 8) {
+			PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
+		}
 		QQLoginWebBridge.getHelper().setUILabelInPlugin(UserInfoLabel.this);
 
 		UserLoginContext.addLoginContextListener(new LoginContextListener() {

designer/src/com/fr/design/module/DesignerModule.java

@@ -111,17 +111,17 @@ public class DesignerModule extends DesignModule {
      */
 
     private void registerCellEditor() {
-        ActionFactory.registerCellEditor(String.class, CellStringQuickEditor.getInstance());
-        ActionFactory.registerCellEditor(Number.class, CellStringQuickEditor.getInstance());
-        ActionFactory.registerCellEditor(Formula.class, CellStringQuickEditor.getInstance());
-        ActionFactory.registerCellEditor(SubReport.class, CellSubReportEditor.getInstance());
-        ActionFactory.registerCellEditor(RichText.class, CellRichTextEditor.getInstance());
-        ActionFactory.registerCellEditor(DSColumn.class, CellDScolumnEditor.getInstance());
-        ActionFactory.registerCellEditor(Image.class, CellImageQuickEditor.getInstance());
-        ActionFactory.registerCellEditor(BiasTextPainter.class, new CellBiasTextPainterEditor());
-        ActionFactory.registerCellEditor(BufferedImage.class, CellImageQuickEditor.getInstance());
-
-        ActionFactory.registerChartCellEditorInEditor(ChartQuickEditor.getInstance());
+        ActionFactory.registerCellEditor(String.class, CellStringQuickEditor.class);
+        ActionFactory.registerCellEditor(Number.class, CellStringQuickEditor.class);
+        ActionFactory.registerCellEditor(Formula.class, CellStringQuickEditor.class);
+        ActionFactory.registerCellEditor(SubReport.class, CellSubReportEditor.class);
+        ActionFactory.registerCellEditor(RichText.class, CellRichTextEditor.class);
+        ActionFactory.registerCellEditor(DSColumn.class, CellDSColumnEditor.class);
+        ActionFactory.registerCellEditor(Image.class, CellImageQuickEditor.class);
+        ActionFactory.registerCellEditor(BiasTextPainter.class, CellBiasTextPainterEditor.class);
+        ActionFactory.registerCellEditor(BufferedImage.class, CellImageQuickEditor.class);
+
+        ActionFactory.registerChartCellEditorInEditor(ChartQuickEditor.class);
 
         Set<ElementUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ElementUIProvider.MARK_STRING);
         for (ElementUIProvider provider : providers) {
@@ -139,14 +139,13 @@ public class DesignerModule extends DesignModule {
      * kunnat: 注册悬浮选中Editor
      */
     private void registerFloatEditor() {
-        FloatStringQuickEditor floatStringQuickEditor = new FloatStringQuickEditor();
-        ActionFactory.registerFloatEditor(String.class, floatStringQuickEditor);
-        ActionFactory.registerFloatEditor(Formula.class, floatStringQuickEditor);
+        ActionFactory.registerFloatEditor(String.class, FloatStringQuickEditor.class);
+        ActionFactory.registerFloatEditor(Formula.class, FloatStringQuickEditor.class);
 
         FloatImageQuickEditor floatImageQuickEditor = new FloatImageQuickEditor();
-        ActionFactory.registerFloatEditor(Image.class, floatImageQuickEditor);
-        ActionFactory.registerFloatEditor(BufferedImage.class, floatImageQuickEditor);
-        ActionFactory.registerChartFloatEditorInEditor(ChartQuickEditor.getInstance());
+        ActionFactory.registerFloatEditor(Image.class, FloatImageQuickEditor.class);
+        ActionFactory.registerFloatEditor(BufferedImage.class, FloatImageQuickEditor.class);
+        ActionFactory.registerChartFloatEditorInEditor(ChartQuickEditor.class);
     }
 
     /**

designer/src/com/fr/design/parameter/ParameterDefinitePane.java

@@ -20,7 +20,9 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.AuthorityToolBarPane;
+import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.mainframe.JWorkBook;
+import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
 import com.fr.design.menu.*;
 import com.fr.design.module.DesignModuleFactory;
@@ -244,7 +246,7 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
         isdelayItem.setSelected(reportParameterAttr.isDelayPlaying());
         isshowWindowItem.setSelected(reportParameterAttr.isShowWindow());
         isEditing = true;
-
+        EastRegionContainerPane.getInstance().setParameterHeight(ParameterPropertyPane.getInstance().getPreferredSize().height);
         ParameterBridge bridge = paraDesignEditor.getParaComponent();
         if (parameterUI != null) {
             bridge.setDelayDisplayContent(reportParameterAttr.isDelayPlaying());

designer/src/com/fr/poly/creator/ChartBlockCreator.java

@@ -142,7 +142,7 @@ public class ChartBlockCreator extends BlockCreator<PolyChartBlock> {
 
 	@Override
 	public QuickEditor getQuickEditor(TargetComponent tc) {
-		ChartQuickEditor quitEditor = ChartQuickEditor.getInstance();
+		ChartQuickEditor quitEditor = new ChartQuickEditor();
 		quitEditor.populate(tc);
 		return quitEditor;
 	}

designer/src/com/fr/quickeditor/CellQuickEditor.java

@@ -30,7 +30,7 @@ import java.awt.event.MouseEvent;
  */
 public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
 
-	protected UITextField columnRowTextField;
+	protected  UITextField columnRowTextField;
 	protected UIButton cellElementEditButton;
 	protected TemplateCellElement cellElement;
 

designer/src/com/fr/quickeditor/ChartQuickEditor.java

@@ -16,29 +16,17 @@ import com.fr.design.selection.QuickEditor;
 import java.awt.*;
 
 public class ChartQuickEditor extends QuickEditor<TargetComponent>{
-	private static ChartQuickEditor THIS;
-
     // kunsnat: editingPropertyPane初始化  避开设计器启动, 在用到的时候再初始化.
-	private BaseChartPropertyPane editingPropertyPane = null;
-	
-	public static final ChartQuickEditor getInstance() {
-		if(THIS == null) {
-			THIS = new ChartQuickEditor();
-		}
-		return THIS;
-	}
+	//private BaseChartPropertyPane editingPropertyPane = null;
 
-	private ChartQuickEditor() {
+	public ChartQuickEditor() {
 		setLayout(new BorderLayout());
 		setBorder(null);
 	}
 
 	@Override
 	protected void refresh() {
-		if(editingPropertyPane != null) {
-			remove(editingPropertyPane);
-		}
-		
+		BaseChartPropertyPane editingPropertyPane = null;
 		BaseChartCollection collection = null;
 		if(tc instanceof PolyDesigner) {
 			ChartBlockEditor chartBlockEditor = (ChartBlockEditor)((PolyDesigner)tc).getSelection().getEditor();

designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -16,7 +16,7 @@ import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
-public class CellDScolumnEditor extends CellQuickEditor {
+public class CellDSColumnEditor extends CellQuickEditor {
     private JPanel dsColumnRegion;
     private JPanel centerPane;
     private SelectedDataColumnPane dataPane;
@@ -55,16 +55,7 @@ public class CellDScolumnEditor extends CellQuickEditor {
         }
     };
 
-    private static CellDScolumnEditor THIS;
-
-    public static final CellDScolumnEditor getInstance() {
-        if (THIS == null) {
-            THIS = new CellDScolumnEditor();
-        }
-        return THIS;
-    }
-
-    private CellDScolumnEditor() {
+    private CellDSColumnEditor() {
         super();
     }
 
@@ -107,4 +98,14 @@ public class CellDScolumnEditor extends CellQuickEditor {
         this.validate();
     }
 
+
+    /**
+     * for 关闭时候释放
+     */
+    public void release () {
+        super.release();
+        dsColumnRegion = null;
+        centerPane = null;
+    }
+
 }

designer_base/src/com/fr/design/actions/AllowAuthorityEditAction.java

@@ -1 +1 @@
-package com.fr.design.actions;

import com.fr.base.BaseUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.menu.KeySetUtils;
import com.fr.design.roleAuthority.ReportAndFSManagePane;
import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
import com.fr.design.designer.TargetComponent;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.mainframe.*;

/**
 * Author : daisy
 * Date: 13-8-30
 * Time: 上午10:12
 */
public class AllowAuthorityEditAction extends TemplateComponentAction {

    public AllowAuthorityEditAction(TargetComponent t) {
        super(t);
        this.setMenuKeySet(KeySetUtils.ALLOW_AUTHORITY_EDIT);
        this.setName(getMenuKeySet().getMenuName());
        this.setMnemonic(getMenuKeySet().getMnemonic());
        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/allow_authority_edit.png"));
    }

    /**
     * 撤销
     */
    public void prepare4Undo() {
        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().iniAuthorityUndoState();
    }

    /**
     * 执行动作
     *
     * @return 是否执行成功
     */
    public boolean executeActionReturnUndoRecordNeeded() {
        TargetComponent tc = getEditingComponent();
        if (tc == null) {
            return false;
        }

        cleanAuthorityCondition();

        //进入时是格式刷则取消格式刷
        if (DesignerContext.getFormatState() != DesignerContext.FORMAT_STATE_NULL) {
            tc.cancelFormat();
        }
        BaseUtils.setAuthorityEditing(true);
        ReportAndFSManagePane.getInstance().refreshDockingView();
        RolesAlreadyEditedPane.getInstance().refreshDockingView();
        WestRegionContainerPane.getInstance().replaceDownPane(ReportAndFSManagePane.getInstance());
        DesignerContext.getDesignerFrame().setCloseMode(UIConstants.CLOSE_OF_AUTHORITY);
        DesignerContext.getDesignerFrame().resetToolkitByPlus(tc.getToolBarMenuDockPlus());
        DesignerContext.getDesignerFrame().needToAddAuhtorityPaint();
        EastRegionContainerPane.getInstance().replaceUpPane(tc.getEastUpPane());
        DesignerContext.getDesignerFrame().refreshDottedLine();
        EastRegionContainerPane.getInstance().replaceDownPane(RolesAlreadyEditedPane.getInstance());
        //画虚线
        return true;
    }


    /**
     * 进入权限编辑之前将权限编辑界面重置一下工具栏
     */
    private void cleanAuthorityCondition() {

        java.util.List<JTemplate<?, ?>> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList();
        for (int i = 0; i < opendedTemplate.size(); i++) {
            opendedTemplate.get(i).cleanAuthorityUndo();
        }
    }

}
+package com.fr.design.actions;

import com.fr.base.BaseUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.menu.KeySetUtils;
import com.fr.design.roleAuthority.ReportAndFSManagePane;
import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
import com.fr.design.designer.TargetComponent;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.mainframe.*;

/**
 * Author : daisy
 * Date: 13-8-30
 * Time: 上午10:12
 */
public class AllowAuthorityEditAction extends TemplateComponentAction {

    public AllowAuthorityEditAction(TargetComponent t) {
        super(t);
        this.setMenuKeySet(KeySetUtils.ALLOW_AUTHORITY_EDIT);
        this.setName(getMenuKeySet().getMenuName());
        this.setMnemonic(getMenuKeySet().getMnemonic());
        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/allow_authority_edit.png"));
    }

    /**
     * 撤销
     */
    public void prepare4Undo() {
        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().iniAuthorityUndoState();
    }

    /**
     * 执行动作
     *
     * @return 是否执行成功
     */
    public boolean executeActionReturnUndoRecordNeeded() {
        TargetComponent tc = getEditingComponent();
        if (tc == null) {
            return false;
        }

        cleanAuthorityCondition();

        //进入时是格式刷则取消格式刷
        if (DesignerContext.getFormatState() != DesignerContext.FORMAT_STATE_NULL) {
            tc.cancelFormat();
        }
        BaseUtils.setAuthorityEditing(true);
        ReportAndFSManagePane.getInstance().refreshDockingView();
        RolesAlreadyEditedPane.getInstance().refreshDockingView();
        WestRegionContainerPane.getInstance().replaceDownPane(ReportAndFSManagePane.getInstance());
        DesignerContext.getDesignerFrame().setCloseMode(UIConstants.CLOSE_OF_AUTHORITY);
        DesignerContext.getDesignerFrame().resetToolkitByPlus(tc.getToolBarMenuDockPlus());
        DesignerContext.getDesignerFrame().needToAddAuhtorityPaint();
        EastRegionContainerPane.getInstance().replaceUpPane(tc.getEastUpPane());
        DesignerContext.getDesignerFrame().refreshDottedLine();
        EastRegionContainerPane.getInstance().replaceDownPane(RolesAlreadyEditedPane.getInstance());
        EastRegionContainerPane.getInstance().removeParameterPane();

        //画虚线
        return true;
    }


    /**
     * 进入权限编辑之前将权限编辑界面重置一下工具栏
     */
    private void cleanAuthorityCondition() {

        java.util.List<JTemplate<?, ?>> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList();
        for (int i = 0; i < opendedTemplate.size(); i++) {
            opendedTemplate.get(i).cleanAuthorityUndo();
        }
    }

}

designer_base/src/com/fr/design/actions/core/ActionFactory.java

@@ -10,6 +10,7 @@ import com.fr.design.selection.QuickEditor;
 import javax.swing.*;
 import java.awt.event.KeyEvent;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
 /**
@@ -22,11 +23,11 @@ public class ActionFactory {
     private ActionFactory() {
     }
 
-    private static Map<Class, QuickEditor> floatEditor = new HashMap<Class, QuickEditor>();
+    private static Map<Class, Class<? extends QuickEditor>> floatEditor = new HashMap<Class, Class<? extends QuickEditor>>();
 
     private static Class chartCollectionClass = null;
 
-    private static Map<Class, QuickEditor> cellEditor = new HashMap<Class, QuickEditor>();
+    private static Map<Class, Class<? extends QuickEditor>> cellEditor = new HashMap<Class, Class<? extends QuickEditor>>();
 
     private static UpdateAction chartPreStyleAction = null;
 
@@ -36,17 +37,18 @@ public class ActionFactory {
      * @param clazz  待说明
      * @param editor 待说明
      */
-    public static void registerCellEditor(Class clazz, QuickEditor editor) {
+    public static void registerCellEditor(Class clazz, Class<? extends QuickEditor> editor) {
         cellEditor.put(clazz, editor);
     }
 
+
     /**
      * 待说明
      *
      * @param clazz  待说明
      * @param editor 待说明
      */
-    public static void registerFloatEditor(Class clazz, QuickEditor editor) {
+    public static void registerFloatEditor(Class clazz, Class<? extends QuickEditor> editor) {
         floatEditor.put(clazz, editor);
     }
 
@@ -84,7 +86,7 @@ public class ActionFactory {
      *
      * @param editor 待说明
      */
-    public static void registerChartFloatEditorInEditor(QuickEditor editor) {
+    public static void registerChartFloatEditorInEditor(Class<? extends QuickEditor> editor) {
         if (chartCollectionClass != null) {
             floatEditor.put(chartCollectionClass, editor);
         }
@@ -95,7 +97,7 @@ public class ActionFactory {
      *
      * @param editor 待说明
      */
-    public static void registerChartCellEditorInEditor(QuickEditor editor) {
+    public static void registerChartCellEditorInEditor(Class<? extends QuickEditor> editor) {
         if (chartCollectionClass != null) {
             cellEditor.put(chartCollectionClass, editor);
         }
@@ -105,11 +107,29 @@ public class ActionFactory {
      * 返回 悬浮元素选中的Editor
      */
     public static QuickEditor getFloatEditor(Class clazz) {
-        return floatEditor.get(clazz);
+        return createEditor(clazz, floatEditor);
+    }
+
+    private static QuickEditor createEditor(Class clazz, Map<Class, Class<? extends QuickEditor>> editorMap) {
+        Class<? extends QuickEditor> c = editorMap.get(clazz);
+        try {
+            Constructor<? extends QuickEditor> constructor = c.getDeclaredConstructor();
+            constructor.setAccessible(true);
+            return constructor.newInstance();
+        } catch (NoSuchMethodException e) {
+            FRContext.getLogger().error(e.getMessage(), e);
+        } catch (IllegalAccessException e) {
+            FRContext.getLogger().error(e.getMessage(), e);
+        } catch (InstantiationException e) {
+            FRContext.getLogger().error(e.getMessage(), e);
+        } catch (InvocationTargetException e) {
+            FRContext.getLogger().error(e.getMessage(), e);
+        }
+        return null;
     }
 
     public static QuickEditor getCellEditor(Class clazz) {
-        return cellEditor.get(clazz);
+        return createEditor(clazz, cellEditor);
     }
 
     /**

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

@@ -8,13 +8,7 @@ import java.awt.BorderLayout;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Vector;
+import java.util.*;
 
 import javax.swing.JTable;
 import javax.swing.RowFilter;
@@ -31,10 +25,7 @@ import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.dialog.BasicPane;
 import com.fr.file.filetree.FileNode;
-import com.fr.general.FRLogger;
-import com.fr.general.GeneralUtils;
-import com.fr.general.IOUtils;
-import com.fr.general.Inter;
+import com.fr.general.*;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.project.ProjectConstants;
 
@@ -43,12 +34,6 @@ import com.fr.stable.project.ProjectConstants;
  * @since : 8.0
  */
 public class LocalePane extends BasicPane {
-    private static final String FR = "fr.properties";
-    private static final String US = "fr_en_US.properties";
-    private static final String CN = "fr_zh_CN.properties";
-    private static final String JP = "fr_ja_JP.properties";
-    private static final String TW = "fr_zh_TW.properties";
-    private static final String KR = "fr_ko_KR.properties";
     private static final String PREFIX = "fr_";
     private static final int LOCALE_NAME_LEN = 5;
 
@@ -124,39 +109,35 @@ public class LocalePane extends BasicPane {
     }
 
     private void initPredefinedProperties() {
-        Properties fr = loadLocaleProperties(FR);
-        Properties us = loadLocaleProperties(US);
-        Properties cn = loadLocaleProperties(CN);
-        Properties jp = loadLocaleProperties(JP);
-        Properties tw = loadLocaleProperties(TW);
-        Properties kr = loadLocaleProperties(KR);
-
-        Set<String> keys = fr.stringPropertyNames();
-        List<String> sortKeys = new ArrayList<String>(keys);
+        Map<Locale, LocalePackage> map = Inter.getPredefinedPackageMap();
+        LocalePackage chinese = map.get(Locale.SIMPLIFIED_CHINESE);
+
+        List<String> sortKeys = new ArrayList<String>();
+
+
+        Set<ResourceBundle> bundles = chinese.getKindsOfResourceBundle();
+        for (ResourceBundle bundle : bundles) {
+            sortKeys.addAll(bundle.keySet());
+        }
         Collections.sort(sortKeys);
-        Vector<String> keyVector = new Vector<String>();
-        Vector<String> valueVector = new Vector<String>();
-        Vector<String> usVector = new Vector<String>();
-        Vector<String> cnVector = new Vector<String>();
-        Vector<String> jpVector = new Vector<String>();
-        Vector<String> twVector = new Vector<String>();
-        Vector<String> krVector = new Vector<String>();
-        for (String key : sortKeys) {
-            keyVector.add(key);
-            valueVector.add(fr.getProperty(key));
-            usVector.add(us.getProperty(key));
-            cnVector.add(cn.getProperty(key));
-            jpVector.add(jp.getProperty(key));
-            twVector.add(tw.getProperty(key));
-            krVector.add(kr.getProperty(key));
+
+        Map<Locale, Vector<String>> data = new HashMap<Locale, Vector<String>>();
+        for (Map.Entry<Locale, LocalePackage> entry : map.entrySet()) {
+            Vector<String> column = new Vector<String>();
+            for (String key : sortKeys) {
+                column.add(entry.getValue().getLocText(key));
+            }
+            data.put(entry.getKey(), column);
         }
+
+        Vector<String> keyVector = new Vector<String>();
+        keyVector.addAll(sortKeys);
+
+
         predefineTableModel.addColumn(Inter.getLocText("Key"), keyVector);
-        predefineTableModel.addColumn(Inter.getLocText("Value"), valueVector);
-        predefineTableModel.addColumn("en_US", usVector);
-        predefineTableModel.addColumn("zh_CN", cnVector);
-        predefineTableModel.addColumn("ja_JP", jpVector);
-        predefineTableModel.addColumn("zh_TW", twVector);
-        predefineTableModel.addColumn("ko_KR", krVector);
+        for (Map.Entry<Locale, Vector<String>> entry : data.entrySet()) {
+            predefineTableModel.addColumn(entry.getKey().getDisplayName(), entry.getValue());
+        }
     }
 
     private void initCustomProperties() throws Exception {

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

@@ -10,6 +10,7 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.TemplatePane;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
@@ -41,12 +42,15 @@ public class SwitchExistEnv extends MenuDef {
         this.setName(getMenuKeySet().getMenuName());
         this.setHasScrollSubMenu(true);
         initMenuDef();
-        GeneralContext.addEnvWillChangedListener(new EnvChangedListener() {
-            public void envChanged() {
-                SwitchExistEnv.this.clearShortCuts();
-                initMenuDef();
-            }
-        });
+        JTemplate<?, ?> t = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        if(t != null) {
+            GeneralContext.addEnvWillChangedListener(t.getFullPathName(), new EnvChangedListener() {
+                public void envChanged() {
+                    SwitchExistEnv.this.clearShortCuts();
+                    initMenuDef();
+                }
+            });
+        }
     }
 
     private void initMenuDef() {

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

@@ -118,7 +118,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
         if (StringUtils.isBlank(tempName)) {
             nPanel.setShowText(Inter.getLocText(new String[]{"DS-TableData", "ISEMPTY", "PLEASE", "GIVE-NAME"}, new String[]{"", "，", "", "！"}));
             dg.setButtonEnabled(false);
-        } else if (!ComparatorUtils.equals(oldName, tempName) && isDsNameRepeaded(tempName, allDSNames)) {
+        } else if (!ComparatorUtils.equals(oldName, tempName) && isDsNameRepeaded(tempName)) {
             String[] waring = new String[]{"DS-TableData", "Utils-has_been_existed", "PLEASE", "Rename"};
             String[] sign = new String[]{tempName, "，", "", "！"};
             nPanel.setShowText(Inter.getLocText(waring, sign));
@@ -324,20 +324,22 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
     private String createDsName(String prefix) {
         int count = 1;
         allDSNames = DesignTableDataManager.getAllDSNames(tc.getBook());
-        while (isDsNameRepeaded(prefix + count, allDSNames)) {
+        while (isDsNameRepeaded(prefix + count)) {
             count++;
         }
         return prefix + count;
     }
 
-    private boolean isDsNameRepeaded(String name, String[] names) {
-        boolean repeat = false;
-        for (int i = 0; i < names.length; i++) {
-            if (ComparatorUtils.equals(name, names[i])) {
-                repeat = true;
+    protected boolean isDsNameRepeaded(String name) {
+        if (allDSNames == null) {
+            allDSNames = DesignTableDataManager.getAllDSNames(tc.getBook());
+        }
+        for (int i = 0; i < allDSNames.length; i++) {
+            if (ComparatorUtils.equals(name, allDSNames[i])) {
+                return true;
             }
         }
-        return repeat;
+        return false;
     }
 
     protected KeyAdapter getTableTreeNodeListener(final UpdateAction editAction, final UpdateAction previewTableDataAction, final UpdateAction removeAction, final TableDataSourceOP op, final TableDataTree dataTree) {

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

@@ -13,8 +13,10 @@ import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.data.impl.storeproc.StoreProcedureConstants;
 import com.fr.design.data.tabledata.wrapper.*;
 import com.fr.design.DesignModelAdapter;
+import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.iprogressbar.AutoProgressBar;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JTemplate;
 import com.fr.design.parameter.ParameterInputPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.file.DatasourceManager;
@@ -34,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,7 +57,10 @@ public abstract class DesignTableDataManager {
      */
     private static java.util.Map<String, TableDataWrapper> globalDsCache = new java.util.HashMap<String, TableDataWrapper>();
     private static java.util.Map<String, String> dsNameChangedMap = new HashMap<String, String>();
-    private static List<ChangeListener> dsListeners = new ArrayList<ChangeListener>();
+//    private static List<ChangeListener> dsListeners = new ArrayList<ChangeListener>();
+
+    private static  Map<String,  List<ChangeListener>> dsListenersMap = new HashMap<String,  List<ChangeListener>>();
+
 
     public static String NO_PARAMETER = "no_paramater_pane";
 
@@ -73,15 +79,31 @@ public abstract class DesignTableDataManager {
      * 响应数据集改变.
      */
     private static void fireDsChanged() {
-        for (int i = 0; i < dsListeners.size(); i++) {
-        //增强for循环用的iterator实现的, 如果中间哪个listener修改或删除了(如ChartEditPane.dsChangeListener),
-        // 由于dsListeners是arraylist, 此时会ConcurrentModifyException
+        for(Entry<String,  List<ChangeListener>> listenerEntry : dsListenersMap.entrySet()) {
+            List<ChangeListener> dsListeners = listenerEntry.getValue();
+            for (int i = 0; i < dsListeners.size(); i++) {
+                //增强for循环用的iterator实现的, 如果中间哪个listener修改或删除了(如ChartEditPane.dsChangeListener),
+                // 由于dsListeners是arraylist, 此时会ConcurrentModifyException
 //        for (ChangeListener l : dsListeners) {
-            ChangeEvent e = null;
-            dsListeners.get(i).stateChanged(e);
+                ChangeEvent e = null;
+                dsListeners.get(i).stateChanged(e);
+            }
+        }
+    }
+
+    public static void closeTemplate(JTemplate<?,?> template) {
+        if(template != null) {
+            dsListenersMap.remove(template.getFullPathName());
         }
     }
 
+    public static void envChange() {
+        dsListenersMap.clear();
+        dsNameChangedMap.clear();
+        clearGlobalDs();
+    }
+
+
     /**
      * 响应数据集改变
      *
@@ -127,6 +149,16 @@ public abstract class DesignTableDataManager {
      * @param l ChangeListener监听器
      */
     public static void addDsChangeListener(ChangeListener l) {
+        JTemplate<?, ?> template = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        String key = StringUtils.EMPTY;
+        if(template != null) {
+            key = template.getFullPathName();
+        }
+        List<ChangeListener> dsListeners = dsListenersMap.get(key);
+        if (dsListeners == null) {
+            dsListeners = new ArrayList<ChangeListener>();
+            dsListenersMap.put(key, dsListeners);
+        }
         dsListeners.add(l);
     }
 

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

@@ -146,4 +146,5 @@ public class TableDataComboBox extends UIComboBox implements Prepare4DataSourceC
             }
         });
     }
+
 }

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

@@ -276,13 +276,14 @@ public class TableDataTreePane extends BasicTableDataTreePane {
      * @param tableDataSource 数据集
      */
     public void addTableData(String srcName, TableDataSource tableDataSource) {
+        allDSNames = DesignTableDataManager.getAllDSNames(tc.getBook());
         DesignTableDataManager.setThreadLocal(DesignTableDataManager.NO_PARAMETER);
         TableDataSource tds = tc.getBook();
         Iterator tdIterator = tableDataSource.getTableDataNameIterator();
         while (tdIterator.hasNext()) {
             String tdName = (String) tdIterator.next();
             TableData td = tableDataSource.getTableData(tdName);
-            if (tds.getTableData(tdName) != null) {//如果有同名的就拼上来源名称
+            if (tds.getTableData(tdName) != null || isDsNameRepeaded(tdName)) {//如果有同名的就拼上来源名称
                 tdName = srcName + tdName;
             }
             int i = 0;

designer_base/src/com/fr/design/event/TemplateTreeDragSource.java

@@ -1,37 +0,0 @@
-package com.fr.design.event;
-
-import com.fr.design.gui.itree.filetree.TemplateFileTree;
-import com.fr.design.mainframe.dnd.ArrayTransferable;
-import com.fr.design.mainframe.dnd.SerializableTransferable;
-import com.fr.general.web.ParameterConsts;
-import com.fr.stable.StringUtils;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.dnd.DragGestureEvent;
-import java.awt.dnd.DragGestureListener;
-import java.awt.dnd.DragSource;
-import java.awt.dnd.DragSourceAdapter;
-
-/**
- * Created with IntelliJ IDEA.
- * User: richie
- * Date: 13-11-4
- * Time: 下午2:17
- */
-public class TemplateTreeDragSource extends DragSourceAdapter implements DragGestureListener {
-    private DragSource source;
-
-    public TemplateTreeDragSource(JTree tree, int actions) {
-        source = new DragSource();
-        source.createDefaultDragGestureRecognizer(tree, actions, this);
-
-    }
-    public void dragGestureRecognized(DragGestureEvent dge) {
-        Component comp = dge.getComponent();
-        if (comp instanceof TemplateFileTree) {
-            String selectedPath = ((TemplateFileTree)comp).getSelectedTemplatePath();
-            source.startDrag(dge, DragSource.DefaultLinkDrop, new SerializableTransferable(selectedPath), this);
-        }
-    }
-}

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

@@ -68,11 +68,11 @@ public class LoginWebBridge {
 
     public static com.fr.design.extra.LoginWebBridge getHelper() {
         if (helper != null) {
-                return helper;
+            return helper;
         }
         synchronized (com.fr.design.extra.LoginWebBridge.class) {
             if (helper == null) {
-                    helper = new com.fr.design.extra.LoginWebBridge();
+                helper = new com.fr.design.extra.LoginWebBridge();
             }
             return helper;
         }
@@ -118,14 +118,13 @@ public class LoginWebBridge {
         if(!StringUtils.isEmpty(this.userName)){
             updateMessageCount();
         }
-        DesignerEnvManager.getEnvManager().setBBSName(userName);
         this.userName = userName;
     }
 
     /**
      * 定时取后台论坛消息
      */
-    private void updateMessageCount(){
+    public void updateMessageCount(){
         //启动获取消息更新的线程
         //登陆状态, 根据存起来的用户名密码, 每1分钟发起一次请求, 更新消息条数.
         Thread updateMessageThread = new Thread(new Runnable() {
@@ -171,7 +170,7 @@ public class LoginWebBridge {
         }
         this.messageCount = count;
         StringBuilder sb = new StringBuilder();
-        sb.append(StringUtils.BLANK).append(this.userName)
+        sb.append(StringUtils.BLANK).append(DesignerEnvManager.getEnvManager().getBBSName())
                 .append("(").append(this.messageCount)
                 .append(")").append(StringUtils.BLANK);
         DesignerEnvManager.getEnvManager().setInShowBBsName(sb.toString());
@@ -244,7 +243,7 @@ public class LoginWebBridge {
      * @param uiLabel 两边的label显示
      * @return 登录信息标志
      */
-    private String login(String username, String password, UILabel uiLabel) {
+    public String login(String username, String password, UILabel uiLabel) {
         if (!StringUtils.isNotBlank(username) && !StringUtils.isNotBlank(password)) {
             return LOGIN_INFO_EMPTY;
         }
@@ -253,7 +252,7 @@ public class LoginWebBridge {
         }
         String loginResult = login(username, password);
         if (loginResult.equals(LOGININ)) {
-            updateUserInfo(username, password);
+            updateUserInfo(username);
             loginSuccess(username, uiLabel);
             setUserName(username, uiLabel);
         }
@@ -275,10 +274,7 @@ public class LoginWebBridge {
      * @param username 用户名
      * @param password 密码
      */
-    public void updateUserInfo(String username,String password) {
-        DesignerEnvManager.getEnvManager().setBBSName(username);
-        DesignerEnvManager.getEnvManager().setBBSPassword(password);
-        DesignerEnvManager.getEnvManager().setInShowBBsName(username);
+    public void updateUserInfo(String username) {
         this.userName = username;
     }
 
@@ -309,7 +305,7 @@ public class LoginWebBridge {
         });
     }
 
-    public String login(String username, String password) {
+    private String login(String username, String password) {
         try {
             Client uc = new Client();
             String result = uc.uc_user_login(username, password);
@@ -319,6 +315,9 @@ public class LoginWebBridge {
                 int $uid = Integer.parseInt(list.get(0));
                 if ($uid > 0) {
                     DesignerEnvManager.getEnvManager().setBbsUid($uid);
+                    DesignerEnvManager.getEnvManager().setBBSName(username);
+                    DesignerEnvManager.getEnvManager().setInShowBBsName(username);
+                    DesignerEnvManager.getEnvManager().setBBSPassword(password);
                     return LOGININ;//登录成功，0
                 } else if ($uid == -1) {
                     return USERNAME_NOT_EXSIT;//用户名不存在，-1
@@ -335,4 +334,4 @@ public class LoginWebBridge {
         }
         return UNKNOWN_ERROR;
     }
-}
+}

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

@@ -529,6 +529,17 @@ public class PluginWebBridge {
         return LoginWebBridge.getHelper().pluginManageLogin(username, password, uiLabel);
     }
 
+    /**
+     * 插件管理部分的登陆的回调处理
+     * @param username
+     * @param password
+     * @param callback
+     */
+    public void defaultLogin(String username, String password, final JSObject callback) {
+        Task<Void> task = new PluginTask<>(webEngine, callback, new PluginLoginExecutor(username, password, uiLabel));
+        new Thread(task).start();
+    }
+
     /**
      * 弹出QQ授权页面
      */
@@ -545,4 +556,4 @@ public class PluginWebBridge {
         DesignerEnvManager.getEnvManager().setInShowBBsName(StringUtils.EMPTY);
         uiLabel.setText(Inter.getLocText("FR-Base_UnSignIn"));
     }
-}
+}

designer_base/src/com/fr/design/extra/exe/PluginLoginExecutor.java

@@ -0,0 +1,49 @@
+package com.fr.design.extra.exe;
+
+import com.fr.design.extra.LoginWebBridge;
+import com.fr.design.extra.Process;
+import com.fr.design.gui.ilable.UILabel;
+
+/**
+ * Created by Slpire on 2016/11/7.
+ */
+public class PluginLoginExecutor implements Executor {
+
+    private String result = "[]";
+
+    private String username;
+    private String password;
+    private UILabel uiLabel;
+
+    public PluginLoginExecutor(String username, String password, UILabel uiLabel) {
+        this.username = username;
+        this.password = password;
+        this.uiLabel = uiLabel;
+    }
+
+    @Override
+    public String getTaskFinishMessage() {
+        return result;
+    }
+
+    @Override
+    public Command[] getCommands() {
+        return new Command[] {
+                new Command() {
+                    @Override
+                    public String getExecuteMessage() {
+                        return null;
+                    }
+
+                    @Override
+                    public void run(Process<String> process) {
+                        String loginResult = LoginWebBridge.getHelper().login(username, password, uiLabel);
+                        if (Integer.valueOf(loginResult) == 0) {
+                            LoginWebBridge.getHelper().updateMessageCount();
+                        }
+                        result = loginResult;
+                    }
+                }
+        };
+    }
+}

designer_base/src/com/fr/design/file/HistoryTemplateListPane.java

@@ -11,6 +11,7 @@ import javax.swing.*;
 
 import com.fr.design.constants.UIConstants;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.gui.ilable.UILabel;
 
 import javax.swing.event.ListSelectionEvent;
@@ -24,9 +25,11 @@ import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilist.UIList;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
+import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
 import com.fr.stable.project.ProjectConstants;
@@ -102,6 +105,9 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations {
      * @param selected 选择的
      */
     public void closeSelectedReport(JTemplate<?, ?> selected) {
+        DesignModuleFactory.clearChartPropertyPane();
+        DesignTableDataManager.closeTemplate(selected);
+        GeneralContext.removeEnvWillChangedListener(selected.getFullPathName());
         if (contains(selected) == -1) {
             return;
         }

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

@@ -13,7 +13,7 @@ public interface ElementUIProvider extends Mutable {
 
     String MARK_STRING = "ElementUIProvider";
 
-    int CURRENT_LEVEL = 1;
+    int CURRENT_LEVEL = 2;
 
     /**
      * 单元格元素编辑器
@@ -31,7 +31,7 @@ public interface ElementUIProvider extends Mutable {
      * 右侧的快速编辑器
      * @return 编辑器
      */
-    QuickEditor<?> quickEditor();
+    Class<? extends QuickEditor> quickEditor();
 
     /**
      * 插件单元格元素

designer_base/src/com/fr/design/gui/chart/BaseChartPropertyPane.java

@@ -20,6 +20,8 @@ public abstract class BaseChartPropertyPane extends DockingView {
 	public abstract void setSupportCellData(boolean supportCellData);
 	
 	public abstract void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> ePane);
-	
-	public abstract void setWidgetPropertyPane(BaseWidgetPropertyPane pane);
+
+	public abstract ChartEditPaneProvider getChartEditPane();
+
+	//public abstract void clear();
 }

designer_base/src/com/fr/design/gui/chart/ChartEditPaneProvider.java

@@ -0,0 +1,13 @@
+package com.fr.design.gui.chart;
+
+/**
+ * Created by daniel on 2016/11/2.
+ */
+public interface ChartEditPaneProvider {
+
+
+    void gotoPane(String... id);
+
+    void fire();
+
+}

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

@@ -1,40 +1,49 @@
 package com.fr.design.gui.frpane;
 
-import java.awt.BorderLayout;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-
-import com.fr.data.impl.TreeNodeWrapper;
-import com.fr.design.data.DataCreatorUI;
-import com.fr.design.gui.ilable.UILabel;
-
-import javax.swing.*;
-
-import com.fr.general.NameObject;
 import com.fr.data.impl.TableDataDictionary;
 import com.fr.data.impl.TreeAttr;
 import com.fr.data.impl.TreeNodeAttr;
+import com.fr.data.impl.TreeNodeWrapper;
+import com.fr.design.data.DataCreatorUI;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
+import com.fr.design.gui.frpane.tree.layer.config.LayerDataControlPane;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.TreeDataCardPane;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.dialog.BasicPane;
 import com.fr.form.ui.TreeComboBoxEditor;
 import com.fr.form.ui.TreeEditor;
+import com.fr.form.ui.tree.LayerConfig;
 import com.fr.general.Inter;
+import com.fr.general.NameObject;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.Arrays;
 
 public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 	private JTreeControlPane controlPane;
+
 	private JTreeAutoBuildPane autoBuildPane;
+
+	/**
+	 * 新的分层构建方式
+	 */
+	private LayerDataControlPane layerDataControlPane;
+
 	private UIComboBox buildBox;
+
 	/**
 	 *
 	 */
 	private static final long serialVersionUID = 1762889323082827111L;
 
-	private String[] buildWay = new String[] { Inter.getLocText("FR-Designer_Layer-Build"),
-		Inter.getLocText("FR-Designer_Auto-Build") };
+	private String[] buildWay = new String[]{Inter.getLocText("FR-Designer_DataTable-Build"),
+		Inter.getLocText("FR-Designer_Auto-Build"), Inter.getLocText("FR-Designer_Layer-Build")};
 
 	public TreeSettingPane(boolean isEditor) {
 		this.initComponents(isEditor);
@@ -58,14 +67,30 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 		controlPane = new JTreeControlPane(new NameableCreator[] { treeNode },
 			new TreeDataCardPane(), isEditor);
 		autoBuildPane = new JTreeAutoBuildPane();
+		layerDataControlPane = new LayerDataControlPane();
 		this.add(buildWayPanel, BorderLayout.NORTH);
 		cardChanged(0);
 	}
 
 	private void cardChanged(int index) {
+
 		this.remove(controlPane);
 		this.remove(autoBuildPane);
-		this.add(index == 0 ? controlPane : autoBuildPane, BorderLayout.CENTER);
+		this.remove(layerDataControlPane);
+		switch (index) {
+			case 0:
+				this.add(layerDataControlPane);
+				break;
+			case 1:
+				this.add(autoBuildPane);
+				break;
+			case 2:
+				this.add(controlPane);
+
+				break;
+			default:
+				break;
+		}
 		validate();
 		repaint();
 		revalidate();
@@ -101,8 +126,17 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 			buildBox.setSelectedIndex(1);
 			TableDataDictionary dictionary = treeEditor.getDictionary();
 			autoBuildPane.populate(dictionary);
-		} else {
+		} else if (treeEditor.isLayerBuild()) {
 			buildBox.setSelectedIndex(0);
+			java.util.List<LayerConfig> layerConfigList = treeEditor.getLayerConfigs();
+			LayerConfig[] layerConfigs = new LayerConfig[layerConfigList.size()];
+			int i = 0;
+			for (LayerConfig layerConfig : layerConfigList) {
+				layerConfigs[i++] = layerConfig;
+			}
+			this.layerDataControlPane.populate(new NameObject("Tree Layer Data", layerConfigs));
+		} else {
+			buildBox.setSelectedIndex(2);
 		}
 	}
 
@@ -121,10 +155,12 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 		if (buildBox.getSelectedIndex() == 1) {
 			TableDataDictionary dictionary = this.autoBuildPane.update();
 			te.setAutoBuild(true);
+			te.setLayerBuild(false);
 			te.setDictionary(dictionary);
 			te.setNodeOrDict(dictionary);
-		} else {
+		} else if (buildBox.getSelectedIndex() == 2) {
 			te.setAutoBuild(false);
+			te.setLayerBuild(false);
 			NameObject no = this.controlPane.update();
 			if (no != null) {
 				TreeEditor editor = (TreeEditor) no.getObject();
@@ -141,6 +177,11 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 				te.setNodeOrDict(editor.getTreeNodeAttr());
 				te.setPerformanceFirst(editor.isPerformanceFirst());
 			}
+		} else {
+			LayerConfig[] configs = (LayerConfig[]) layerDataControlPane.update().getObject();
+			te.setAutoBuild(false);
+			te.setLayerBuild(true);
+			te.setLayerConfigs(Arrays.asList(configs));
 		}
 		return te;
 	}
@@ -150,11 +191,14 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 	 * @return
 	 */
 	public Object updateTreeNodeAttrs() {
-		if(buildBox.getSelectedIndex() == 0) {
+
+		if (buildBox.getSelectedIndex() == 2) {
 			NameObject no = controlPane.update();
 			if (no != null) {
 				return no.getObject();
 			}
+		} else if (buildBox.getSelectedIndex() == 0) {
+			return layerDataControlPane.update();
 		} else {
 			return autoBuildPane.update();
 		}
@@ -170,15 +214,17 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 		if (buildBox.getSelectedIndex() == 1) {
 			TableDataDictionary dictionary = this.autoBuildPane.update();
 			tcb.setAutoBuild(true);
-			tcb.setDictionary(dictionary);
-			tcb.setNodeOrDict(dictionary);
-		} else {
-			tcb.setAutoBuild(false);
-			NameObject no = this.controlPane.update();
-			if (no != null) {
-				if (no.getObject() instanceof TreeComboBoxEditor) {
-					return (TreeComboBoxEditor) no.getObject();
-				}
+            tcb.setLayerBuild(false);
+            tcb.setDictionary(dictionary);
+            tcb.setNodeOrDict(dictionary);
+        } else if (buildBox.getSelectedIndex() == 2) {
+            tcb.setAutoBuild(false);
+            tcb.setLayerBuild(false);
+            NameObject no = this.controlPane.update();
+            if (no != null) {
+                if (no.getObject() instanceof TreeComboBoxEditor) {
+                    return (TreeComboBoxEditor) no.getObject();
+                }
 
 				TreeEditor editor = (TreeEditor) no.getObject();
 				tcb.setAllowBlank(editor.isAllowBlank());
@@ -194,7 +240,12 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 				tcb.setNodeOrDict(editor.getTreeNodeAttr());
 				tcb.setPerformanceFirst(editor.isPerformanceFirst());
 			}
-		}
+		}else {
+            LayerConfig[] configs = (LayerConfig[]) layerDataControlPane.update().getObject();
+            tcb.setAutoBuild(false);
+            tcb.setLayerBuild(true);
+            tcb.setLayerConfigs(Arrays.asList(configs));
+        }
 		return tcb;
 	}
 
@@ -204,12 +255,15 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 	 */
 	public void populate(Object nodeOrDict) {
 		if(nodeOrDict instanceof TreeNodeAttr[] || nodeOrDict instanceof TreeNodeWrapper) {
-			buildBox.setSelectedIndex(0);
+			buildBox.setSelectedIndex(2);
 			NameObject no = new NameObject("name", nodeOrDict);
 			controlPane.populate(no);
 		} else if(nodeOrDict instanceof TableDataDictionary) {
 			buildBox.setSelectedIndex(1);
 			autoBuildPane.populate((TableDataDictionary)nodeOrDict);
+		} else if (nodeOrDict instanceof NameObject) {
+			buildBox.setSelectedIndex(0);
+			layerDataControlPane.populate((NameObject) nodeOrDict);
 		}
 	}
 }

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

@@ -153,4 +153,7 @@ public abstract class UIComboBoxPane<T> extends BasicBeanPane<T> {
 		return this.cards;
 	}
 
+	public void clear() {
+		reset();
+	}
 }

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

@@ -29,6 +29,7 @@ public class UIResizableContainer extends JPanel {
     private VerticalToolPane verticalToolPane;
 
     private int direction;
+    private boolean hasParameterPane;
 
     private static final int MAX_WIDTH = 300;
     private static final int MIN_WIDTH = 165;
@@ -89,7 +90,6 @@ public class UIResizableContainer extends JPanel {
         add(horizontToolPane);
         add(downPane);
         add(verticalToolPane);
-        add(parameterPane);
     }
 
     public UIResizableContainer(JComponent upPane, int direction) {
@@ -102,7 +102,6 @@ public class UIResizableContainer extends JPanel {
         setLayout(containerLayout);
         add(upPane);
         add(horizontToolPane);
-        add(parameterPane);
 
     }
 
@@ -141,7 +140,7 @@ public class UIResizableContainer extends JPanel {
      * @param height
      */
     public void setParameterHeight(int height) {
-        paraHeight = height;
+        paraHeight = hasParameterPane? height : 0;
         refreshContainer();
 
     }
@@ -232,7 +231,6 @@ public class UIResizableContainer extends JPanel {
                     verticalToolPane.setBounds(0, 0, toolPaneHeight, getHeight());
                 }
             }
-
         }
 
         @Override
@@ -275,13 +273,16 @@ public class UIResizableContainer extends JPanel {
 
     public void addParameterPane(JComponent pane) {
         add(this.parameterPane = pane);
+        hasParameterPane = true;
         refreshContainer();
     }
 
     public void removeParameterPane() {
         remove(this.parameterPane);
         setParameterHeight(0);
+        hasParameterPane = false;
         refreshContainer();
+
     }
 
     /**
@@ -302,6 +303,15 @@ public class UIResizableContainer extends JPanel {
         return this.downPane;
     }
 
+    /**
+     * 得到参数面板
+     *
+     * @return
+     */
+    public JComponent getParameterPane() {
+        return this.parameterPane;
+    }
+
     /**
      * 刷新下面板
      */
@@ -343,7 +353,7 @@ public class UIResizableContainer extends JPanel {
                 public void mouseDragged(MouseEvent e) {
                     toolPaneY = e.getYOnScreen() - UIResizableContainer.this.getLocationOnScreen().y;
                     toolPaneY = toolPaneY < 0 ? 0 : toolPaneY;
-                    toolPaneY = toolPaneY > UIResizableContainer.this.getHeight() - toolPaneHeight ? UIResizableContainer.this.getHeight() - toolPaneHeight : toolPaneY;
+                    toolPaneY = toolPaneY > UIResizableContainer.this.getHeight() - toolPaneHeight ? UIResizableContainer.this.getHeight() - toolPaneHeight - getParameterPaneHeight() : toolPaneY - getParameterPaneHeight();
                     refreshContainer();
                 }
             });
@@ -366,7 +376,7 @@ public class UIResizableContainer extends JPanel {
                     if (e.getX() <= ARROW_RANGE) {
                         toolPaneY = 0;
                     } else if (e.getX() >= getWidth() - ARROW_RANGE) {
-                        toolPaneY = UIResizableContainer.this.getHeight() - toolPaneHeight;
+                        toolPaneY = UIResizableContainer.this.getHeight() - toolPaneHeight - getParameterPaneHeight();
                     } else {
                         return;
                     }

designer_base/src/com/fr/design/gui/itree/filetree/EnvFileTree.java

@@ -2,13 +2,11 @@ package com.fr.design.gui.itree.filetree;
 
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.dnd.DnDConstants;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 
 import com.fr.design.constants.UIConstants;
-import com.fr.design.event.TemplateTreeDragSource;
 import com.fr.design.gui.ilable.UILabel;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
@@ -74,7 +72,6 @@ public class EnvFileTree extends RefreshableJTree {
 		this.setRootVisible(false);
 		this.setShowsRootHandles(true);
 		this.setEditable(false);
-        new TemplateTreeDragSource(this, DnDConstants.ACTION_COPY);
 	}
 
 	// CellRenderer

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

@@ -35,10 +35,4 @@ public class HelpDialogManager {
         }
         return THIS;
     }
-
-    public void destroyDialog() {
-        if (handler != null) {
-            handler.destroyHelpDialog();
-        }
-    }
 }

designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -138,8 +138,6 @@ public abstract class ToolBarMenuDock {
         // 添加帮助菜单
         menuList.add(createHelpMenuDef());
 
-        // 添加社区菜单
-        menuList.add(createCommunityMenuDef());
         return menuList.toArray(new MenuDef[menuList.size()]);
     }
 

designer_base/src/com/fr/design/selection/QuickEditor.java

@@ -41,6 +41,14 @@ public abstract class QuickEditor<T extends TargetComponent> extends JComponent
 
 	protected abstract void refresh();
 
+
+	/**
+	 * for 关闭时候释放
+	 */
+	public void release () {
+		tc = null;
+	}
+
 	public static QuickEditor DEFAULT_EDITOR = new QuickEditor() {
 
 		@Override

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

@@ -248,7 +248,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
             });
             df.setVisible(true);
         } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage());
+            FRLogger.getLogger().error(e.getMessage(), e);
             if (!isException) {
                 showDesignerFrame(args, df, true);
             } else {

designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java

@@ -79,37 +79,43 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
 
     public static WidgetOption[] initWidgetOption(){
 
-        final ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames();
-        final ChartWidgetOption[] child = new ChartWidgetOption[typeName.length];
+        ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames();
+        ChartWidgetOption[] child = new ChartWidgetOption[typeName.length];
+        final Chart[][] allCharts = new Chart[typeName.length][];
+        for (int i = 0; i < typeName.length; i++) {
+            String plotID = typeName[i].getPlotID();
+            Chart[] rowChart = ChartTypeManager.getInstance().getChartTypes(plotID);
+            if(rowChart == null) {
+                continue;
+            }
+            String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(plotID);
+            Icon icon = IOUtils.readIcon(iconPath);
+            child[i] = new ChartWidgetOption(Inter.getLocText(typeName[i].getName()), icon, ChartEditor.class, rowChart[0]);
 
-        //异步加载
+            allCharts[i] = rowChart;
+        }
+
+        //异步加载图片
         new Thread(new Runnable() {
             @Override
             public void run() {
-                getWidgetOption(typeName, child);
+                initAllChartsDemoImage(allCharts);
             }
         }).start();
 
         return child;
     }
 
-    private static void getWidgetOption(ChartInternationalNameContentBean[] typeName, ChartWidgetOption[] child){
-        for (int i = 0; i < typeName.length; i++) {
-            String plotID = typeName[i].getPlotID();
-            Chart[] rowChart = ChartTypeManager.getInstance().getChartTypes(plotID);
+    //加载所有图表图片
+    private static void initAllChartsDemoImage(Chart[][] allCharts){
+        for (int i = 0; i < allCharts.length; i++) {
+            Chart[] rowChart = allCharts[i];
             if(rowChart == null) {
                 continue;
             }
-
             //加载初始化图表模型图片
             initChartsDemoImage(rowChart);
-
-            String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(plotID);
-            Icon icon = IOUtils.readIcon(iconPath);
-            child[i] = new ChartWidgetOption(Inter.getLocText(typeName[i].getName()), icon, ChartEditor.class, rowChart[0]);
         }
-
-        DesignModuleFactory.registerExtraWidgetOptions(child);
     }
 
     private static void initChartsDemoImage(Chart[] rowChart) {
@@ -222,16 +228,16 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
         return ChartTypeManager.getInstance().containsPlot(plotID);
     }
 
+
     /**
      * 把所有的pane加到list里
      *
      * @param paneList pane容器
      */
     public void addPlotTypePaneList(List<FurtherBasicBeanPane<? extends Chart>> paneList) {
-        Iterator iterator = chartTypeInterfaces.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry entry = (Map.Entry) iterator.next();
-            String priority = (String) entry.getKey();
+        List<Integer> priorityList = getPriorityInOrder();
+        for (int i = 0; i < priorityList.size(); i++){
+            String priority = String.valueOf(priorityList.get(i));
             Iterator chartUIIterator = chartTypeInterfaces.get(priority).entrySet().iterator();
             while (chartUIIterator.hasNext()) {
                 Map.Entry chartUIEntry = (Map.Entry) chartUIIterator.next();
@@ -276,32 +282,40 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
     }
 
     private String[] getTitle4PopupWindow(){
-        List<Integer> priorityList = new ArrayList<Integer>();
+        List<Integer> priorityList = getPriorityInOrder();
+
+        if (priorityList.size() == 0){
+            return new String[0];
+        }
+
         int size = 0;
-        if (chartTypeInterfaces != null){
+        //获取总得图表格式
+        for (int i = 0; i < priorityList.size(); i++) {
+            size += getChartSize(String.valueOf(priorityList.get(i)));
+        }
+        String[] names = new String[size];
+
+        int index = 0;
+        for (int i = 0; i < priorityList.size(); i++){
+            String priority = String.valueOf(priorityList.get(i));
+            Iterator chartUI = chartTypeInterfaces.get(priority).entrySet().iterator();
+            index = fetchNames(chartUI, names, index);
+        }
+
+        return names;
+    }
+
+    private List<Integer> getPriorityInOrder() {
+        List<Integer> priorityList = new ArrayList<Integer>();
+        if (chartTypeInterfaces != null) {
             Iterator iterator = chartTypeInterfaces.entrySet().iterator();
-            while (iterator.hasNext()){
+            while (iterator.hasNext()) {
                 Map.Entry entry = (Map.Entry) iterator.next();
                 String priority = (String) entry.getKey();
                 priorityList.add(Integer.valueOf(priority));
-                size += getChartSize(priority);
             }
-            String[] names = new String[size];
-
-            priorityList = ChartTypeManager.orderInPriority(priorityList);
-
-            int index = 0;
-
-            for (int i = 0; i < priorityList.size(); i++){
-                String priority = String.valueOf(priorityList.get(i));
-                Iterator chartUI = chartTypeInterfaces.get(priority).entrySet().iterator();
-                index = fetchNames(chartUI, names, index);
-            }
-
-            return names;
         }
-
-        return new String[0];
+        return ChartTypeManager.orderInPriority(priorityList);
     }
 
     private int fetchNames(Iterator chartUI, String[] names, int index) {

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

@@ -72,7 +72,7 @@ public class ChartPlotFactory {
                 .setAxisPaneCls(XYChartStyleAxisPane.class)
                 .setDataLabelPaneClass(XYDataLabelPane.class));
         map.put(FunnelPlot.class.getName(), new FactoryObject()
-                .setDataLabelPaneClass(PieDataLabelPane.class));
+                .setDataLabelPaneClass(FunnelDataLabelPane.class));
     }
 
     private ChartPlotFactory() {

designer_chart/src/com/fr/design/chart/gui/ChartComponent.java

@@ -315,7 +315,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
             //不直接画chartGlyph而画image的原因是表单的柱形图会溢出表单
             //其他图都ok，其实感觉应该是柱形图画的不对，应该也可以改那边
             //处理画图事件
-            Image chartImage =  chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution(), this);
+            Image chartImage =  chartGlyph.toImage(chartWidth,chartHeight,ScreenResolution.getScreenResolution(), this, null);
             g2d.drawImage(chartImage, 0, 0,  null);
         }
     }

designer_chart/src/com/fr/design/chart/gui/active/DataSeriesActiveGlyph.java

@@ -6,8 +6,8 @@ import com.fr.base.chart.Glyph;
 import com.fr.chart.chartglyph.DataSeries;
 import com.fr.chart.chartglyph.PlotGlyph;
 import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
+import com.fr.design.module.DesignModuleFactory;
 
 /**
  * Created by IntelliJ IDEA.
@@ -35,8 +35,8 @@ public class DataSeriesActiveGlyph extends ActiveGlyph {
     	if(chartComponent.getEditingChart() == null) {
     		return;
     	}
-    	
-    	ChartEditPane.getInstance().GoToPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_SERIES_TITLE);
+
+        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_SERIES_TITLE);
     }
 
 	@Override

designer_chart/src/com/fr/design/chart/gui/active/action/SetAnalysisLineStyleAction.java

@@ -3,8 +3,8 @@ package com.fr.design.chart.gui.active.action;
 import java.awt.event.ActionEvent;
 
 import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.Inter;
 
 public class SetAnalysisLineStyleAction extends ChartComponentAction{
@@ -20,7 +20,7 @@ public class SetAnalysisLineStyleAction extends ChartComponentAction{
 	}
 	
 	public void showAnalysisLineStylePane(){
-		ChartEditPane.getInstance().GoToPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_LINE_TITLE);
+		DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_LINE_TITLE);
 	}
 	
 

designer_chart/src/com/fr/design/chart/gui/active/action/SetAxisStyleAction.java

@@ -3,8 +3,8 @@ package com.fr.design.chart.gui.active.action;
 import java.awt.event.ActionEvent;
 
 import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
 
@@ -27,7 +27,7 @@ public class SetAxisStyleAction extends ChartComponentAction {
 
     public void showAxisStylePane() {
         String axisType = getActiveAxisGlyph() == null ? StringUtils.EMPTY : getActiveAxisGlyph().getAxisType();
-        
-    	ChartEditPane.getInstance().GoToPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_AXIS_TITLE, axisType);
+
+        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_AXIS_TITLE, axisType);
     }
 }

designer_chart/src/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java

@@ -3,8 +3,8 @@ package com.fr.design.chart.gui.active.action;
 import java.awt.event.ActionEvent;
 
 import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.Inter;
 
 /**
@@ -26,6 +26,6 @@ public class SetChartStyleAciton extends ChartComponentAction {
     }
 
     public void showChartStylePane() {
-    	ChartEditPane.getInstance().GoToPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_AREA_TITLE, PaneTitleConstants.CHART_STYLE_AREA_AREA_TITLE);
+        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_AREA_TITLE, PaneTitleConstants.CHART_STYLE_AREA_AREA_TITLE);
     }
 }

designer_chart/src/com/fr/design/chart/gui/active/action/SetDataLabelStyleAction.java

@@ -3,8 +3,8 @@ package com.fr.design.chart.gui.active.action;
 import java.awt.event.ActionEvent;
 
 import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.Inter;
 
 public class SetDataLabelStyleAction extends ChartComponentAction{
@@ -20,7 +20,7 @@ public class SetDataLabelStyleAction extends ChartComponentAction{
 	}
 	
 	public void showDataLabelStylePane() {
-    	ChartEditPane.getInstance().GoToPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_LABEL_TITLE);
+		DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_LABEL_TITLE);
     }
 
 }

designer_chart/src/com/fr/design/chart/gui/active/action/SetDataSeriesAttrAction.java

@@ -3,8 +3,8 @@ package com.fr.design.chart.gui.active.action;
 import java.awt.event.ActionEvent;
 
 import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.Inter;
 
 /**
@@ -21,6 +21,6 @@ public class SetDataSeriesAttrAction extends ChartComponentAction {
     }
 
     public void actionPerformed(ActionEvent e) {
-    	ChartEditPane.getInstance().GoToPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_SERIES_TITLE);
+        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_SERIES_TITLE);
     }
 }

designer_chart/src/com/fr/design/chart/gui/active/action/SetDataSheetAction.java

@@ -3,8 +3,8 @@ package com.fr.design.chart.gui.active.action;
 import java.awt.event.ActionEvent;
 
 import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.Inter;
 
 /**
@@ -28,6 +28,6 @@ public class SetDataSheetAction extends ChartComponentAction {
     }
 
     public void showDataSheetStylePane() {
-    	ChartEditPane.getInstance().GoToPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_DATA_TITLE);
+        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_DATA_TITLE);
     }
 }

designer_chart/src/com/fr/design/chart/gui/active/action/SetLegendStyleAction.java

@@ -3,8 +3,8 @@ package com.fr.design.chart.gui.active.action;
 import java.awt.event.ActionEvent;
 
 import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.Inter;
 
 /**
@@ -27,6 +27,6 @@ public class SetLegendStyleAction extends ChartComponentAction {
     }
 
     public void showLegendStylePane() {
-    	ChartEditPane.getInstance().GoToPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_LEGNED_TITLE);
+        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_LEGNED_TITLE);
     }
 }

designer_chart/src/com/fr/design/chart/gui/active/action/SetPlotStyleAction.java

@@ -3,8 +3,8 @@ package com.fr.design.chart.gui.active.action;
 import java.awt.event.ActionEvent;
 
 import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.Inter;
 
 /**
@@ -27,6 +27,6 @@ public class SetPlotStyleAction extends ChartComponentAction {
     }
 
     public void showPlotPane() {
-    	ChartEditPane.getInstance().GoToPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_AREA_TITLE, PaneTitleConstants.CHART_STYLE_AREA_PLOT_TITLE);
+        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_AREA_TITLE, PaneTitleConstants.CHART_STYLE_AREA_PLOT_TITLE);
     }
 }

designer_chart/src/com/fr/design/chart/gui/active/action/SetTitleStyleAction.java

@@ -3,8 +3,8 @@ package com.fr.design.chart.gui.active.action;
 import java.awt.event.ActionEvent;
 
 import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.Inter;
 
 /**
@@ -27,6 +27,6 @@ public class SetTitleStyleAction extends ChartComponentAction {
 	}
 
 	public void showTitlePane() {
-		ChartEditPane.getInstance().GoToPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_TITLE_TITLE);
+		DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_TITLE_TITLE);
 	}
 }

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

@@ -0,0 +1,13 @@
+package com.fr.design.chart.series.SeriesCondition.dlp;
+
+import java.awt.*;
+
+/**
+ * Created by Mitisky on 16/11/9.
+ */
+public class FunnelDataLabelPane extends DataLabelPane {
+    @Override
+    protected Component[] createComponents4ShowCategoryName() {
+        return new Component[0];
+    }
+}

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@@ -13,8 +13,8 @@ import com.fr.design.editor.ValueEditorPaneFactory;
 import com.fr.design.gui.itableeditorpane.ParameterTableModel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.mainframe.chart.ChartHyperEditPane;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
@@ -129,8 +129,8 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 	public void updateBean(ChartHyperPoplink chartHyperlink) {
 		hyperEditPane.updateHyperLink(chartHyperlink);
 		chartHyperlink.setChartCollection(chartComponent.update());
-		
-		ChartEditPane.getInstance().fire();// 响应整个图表保存事件等.
+
+		DesignModuleFactory.getChartPropertyPane().getChartEditPane().fire();// 响应整个图表保存事件等.
         if(itemNameTextField != null){
             chartHyperlink.setItemName(this.itemNameTextField.getText());
         }

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/FunnelPlotDataSeriesConditionPane.java

@@ -0,0 +1,28 @@
+package com.fr.design.chart.series.SeriesCondition.impl;
+
+import com.fr.chart.chartattr.FunnelPlot;
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.chart.series.SeriesCondition.ChartConditionPane;
+import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
+import com.fr.design.chart.series.SeriesCondition.PiePlotChartConditionPane;
+
+/**
+ * Created by Mitisky on 16/11/9.
+ */
+public class FunnelPlotDataSeriesConditionPane extends DataSeriesConditionPane {
+
+    @Override
+    protected ChartConditionPane createListConditionPane() {
+        return new PiePlotChartConditionPane();
+    }
+
+    /**
+     * 返回class对象
+     * @return class对象
+     */
+    @Override
+    public Class<? extends Plot> class4Correspond() {
+        return FunnelPlot.class;
+    }
+
+}

designer_chart/src/com/fr/design/chartinterface/FunnelIndependentChartInterface.java

@@ -3,6 +3,8 @@ package com.fr.design.chartinterface;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.fun.impl.AbstractIndependentChartUIWithAPILevel;
+import com.fr.design.chart.series.SeriesCondition.impl.FunnelPlotDataSeriesConditionPane;
+import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
@@ -34,6 +36,10 @@ public class FunnelIndependentChartInterface extends AbstractIndependentChartUIW
         return new FunnelSeriesPane(parent, plot);
     }
 
+    public ConditionAttributesPane getPlotConditionPane(Plot plot){
+        return new FunnelPlotDataSeriesConditionPane();
+    }
+
     /**
      *图标路径
      * @return 图标路径

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

@@ -1,143 +0,0 @@
-/*
- * Copyright(c) 2001-2011, FineReport Inc, All Rights Reserved.
- */
-package com.fr.design.mainframe;
-
-import java.awt.BorderLayout;
-import java.awt.Component;
-
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import com.fr.chart.chartattr.ChartCollection;
-import com.fr.design.constants.UIConstants;
-import com.fr.design.designer.TargetComponent;
-import com.fr.design.gui.ibutton.UIToggleButton;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.itabpane.TitleChangeListener;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.module.DesignModuleFactory;
-import com.fr.general.Inter;
-
-public class ChartAndWidgetPropertyPane extends MiddleChartPropertyPane {
-
-	public synchronized static ChartAndWidgetPropertyPane getInstance(BaseFormDesigner formEditor) {
-		if(singleton == null) {
-			singleton = new ChartAndWidgetPropertyPane(formEditor);
-		} 
-		
-		singleton.setWidgetPropertyPane(DesignModuleFactory.getWidgetPropertyPane(formEditor));
-		singleton.setSureProperty();
-		return singleton;
-	}
-
-	public static ChartAndWidgetPropertyPane getInstance() {
-		if(singleton == null) {
-			singleton = new ChartAndWidgetPropertyPane();
-		}
-		return singleton;
-	}
-
-	private static ChartAndWidgetPropertyPane singleton;
-
-	private BaseWidgetPropertyPane widgetpane = null;
-	
-	private UIToggleButton hisButton;
-
-	public ChartAndWidgetPropertyPane() {
-
-	}
-	
-	public ChartAndWidgetPropertyPane(BaseFormDesigner formEditor) {
-		super();
-		this.widgetpane = DesignModuleFactory.getWidgetPropertyPane(formEditor);
-	}
-	
-	public void setWidgetPropertyPane(BaseWidgetPropertyPane pane) {
-		this.widgetpane = pane;
-	}
-	
-	@Override
-	protected void createMainPane() {
-		this.add(chartEditPane, BorderLayout.CENTER);
-	}
-	
-	@Override
-	protected void createNameLabel() {
-		nameLabel = new UILabel();
-		nameLabel.setHorizontalAlignment(SwingConstants.LEFT);
-		nameLabel.setBorder(BorderFactory.createEmptyBorder(-2, 6, 2, 0));
-	}
-
-	@Override
-	protected JComponent createNorthComponent() {
-		JPanel toolPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-
-		JPanel hisPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		hisPane.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-		hisButton = new UIToggleButton(Inter.getLocText(new String[]{"Widget", "Attribute"}), UIConstants.HISTORY_ICON);
-		hisButton.setNormalPainted(false);
-		hisButton.setBorderPaintedOnlyWhenPressed(true);
-		hisPane.add(hisButton, BorderLayout.CENTER);
-
-		hisButton.addChangeListener(new ChangeListener() {
-
-			@Override
-			public void stateChanged(ChangeEvent e) {
-				cardChange();
-			}
-		});
-
-		toolPane.add(nameLabel, BorderLayout.CENTER);
-		toolPane.add(hisPane, BorderLayout.EAST);
-
-        titleListener = new TitleChangeListener() {
-
-            @Override
-            public void fireTitleChange(String addName) {
-                if(hisButton.isSelected()) {
-                    nameLabel.setText(Inter.getLocText(new String[]{"Widget", "Form-Widget_Property_Table"}));
-                }else {
-                    nameLabel.setText(Inter.getLocText("Chart-Property_Table") + '-' + addName);
-                }
-            }
-        };
-		
-		return toolPane;
-	}
-
-    /**
-     * 感觉ChartCollection加载图表属性界面.
-     * @param collection  收集图表
-     * @param ePane  面板
-     */
-    public void populateChartPropertyPane(ChartCollection collection, TargetComponent<?> ePane) {
-        super.populateChartPropertyPane(collection, ePane);
-        //表单中的图表切换界面上得更新
-        resetChartEditPane();
-    }
-
-    protected void resetChartEditPane() {
-       cardChange();
-    }
-	
-	private void cardChange() {
-		remove(chartEditPane);
-		remove((Component)widgetpane);
-		if(hisButton.isSelected()) {
-			nameLabel.setText(Inter.getLocText(new String[]{"Widget", "Form-Widget_Property_Table"}));
-			add((Component)widgetpane, BorderLayout.CENTER);
-		} else {
-			String tabname = chartEditPane.getSelectedTabName();
-			nameLabel.setText(Inter.getLocText(new String[]{"Utils-The-Chart", "Form-Widget_Property_Table"}) + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : ""));
-			add(chartEditPane, BorderLayout.CENTER);
-		}
-		validate();
-		repaint();
-		revalidate();
-	}
-}

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

@@ -29,40 +29,13 @@ public class ChartDesigner extends TargetComponent<ChartBook>  implements MouseL
 
     private ChartArea chartArea;//上层区域
     private boolean hasCalGap = false;
-    private ChartDesignerUI designerUI;
     private ArrayList<ChangeListener> changeListeners = new ArrayList<ChangeListener>();
-    private ChartToolBarPane chartToolBarPane;
-
     public ChartDesigner(ChartBook chartBook) {
         super(chartBook);
         this.addMouseListener(this);
-        designerUI = new ChartDesignerUI();
-        chartToolBarPane = new ChartToolBarPane(this){
-            public Dimension getPreferredSize() {
-                Dimension size = super.getPreferredSize();
-                return new Dimension(size.width, ChartToolBarPane.TOTAL_HEIGHT);
-            }
-        };
-        this.addMouseMotionListener(new MouseMotionAdapter() {
-            @Override
-            public void mouseMoved(MouseEvent e) {
-                if(designerUI!=null){
-                    designerUI.mouseMoved(e);
-                    ChartDesigner.this.repaint();
-                }
-            }
-        });
         updateUI();// 初始化界面设计工具的UI实例
     }
 
-    /**
-     * 设置其UI类为DesignerUI，负责渲染
-     */
-    @Override
-    public void updateUI() {
-        setUI(designerUI);
-    }
-
     /**
      * 设置上层区域
      * @param chartArea 图表区域
@@ -203,8 +176,6 @@ public class ChartDesigner extends TargetComponent<ChartBook>  implements MouseL
      * @param e 事件
      */
     public void mouseClicked(MouseEvent e) {
-        designerUI.mouseClicked(e);
-        this.chartToolBarPane.populate();
     }
 
     /**
@@ -247,18 +218,13 @@ public class ChartDesigner extends TargetComponent<ChartBook>  implements MouseL
         this.changeListeners.add(changeListener);
     }
 
-    public ChartToolBarPane getChartToolBarPane(){
-        return this.chartToolBarPane;
-    }
 
     public void populate(){
-        this.chartToolBarPane.populate();
     }
 
     /**
      * 清除工具栏上面全局风格按钮的选中
      */
     public void clearToolBarStyleChoose(){
-        chartToolBarPane.clearStyleChoose();
     }
 }

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

@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2001-2014,FineReport Inc, All Rights Reserved.
- */
-
-package com.fr.design.mainframe;
-
-import com.fr.base.chart.BaseChartCollection;
-import com.fr.chart.chartattr.ChartCollection;
-import com.fr.design.designer.TargetComponent;
-import com.fr.design.gui.chart.BaseChartPropertyPane;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.itabpane.TitleChangeListener;
-import com.fr.design.mainframe.chart.ChartDesignEditPane;
-import com.fr.design.mainframe.chart.ChartEditPane;
-import com.fr.general.Inter;
-
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-15
- * Time: 下午12:43
- */
-public class ChartDesignerPropertyPane extends BaseChartPropertyPane {
-    private static ChartDesignerPropertyPane instance;
-    private TargetComponentContainer container = new TargetComponentContainer();
-    private ChartEditPane chartEditPane;
-    private UILabel nameLabel;
-    private TitleChangeListener titleListener = new TitleChangeListener() {
-
-        @Override
-        public void fireTitleChange(String addName) {
-            nameLabel.setText(Inter.getLocText("Chart-Property_Table") + '-' + addName);
-        }
-    };
-
-    public synchronized static ChartDesignerPropertyPane getInstance() {
-        if (instance == null) {
-            instance = new ChartDesignerPropertyPane();
-        }
-        instance.setSureProperty();
-        return instance;
-    }
-
-    public ChartDesignerPropertyPane() {
-        this.setLayout(new BorderLayout());
-        this.setBorder(null);
-
-        createNameLabel();
-        this.add(nameLabel, BorderLayout.NORTH);
-        chartEditPane = ChartDesignEditPane.getInstance();
-        this.add(chartEditPane, BorderLayout.CENTER);
-    }
-
-    private void createNameLabel() {
-        nameLabel = new UILabel() {
-            @Override
-            public Dimension getPreferredSize() {
-                return new Dimension(super.getPreferredSize().width, 18);
-            }
-        };
-        nameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 1, 0));
-        nameLabel.setHorizontalAlignment(SwingConstants.CENTER);
-    }
-
-    @Override
-    public void setSureProperty() {
-        chartEditPane.setContainer(container);
-        chartEditPane.addTitleChangeListener(titleListener);
-        String tabname = chartEditPane.getSelectedTabName();
-        nameLabel.setText(Inter.getLocText("Chart-Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : ""));
-        resetChartEditPane();
-
-    }
-
-    protected void resetChartEditPane() {
-        remove(chartEditPane);
-        add(chartEditPane, BorderLayout.CENTER);
-        validate();
-        repaint();
-        revalidate();
-    }
-
-    @Override
-    public void setSupportCellData(boolean supportCellData){
-
-    }
-
-    /**
-     * 感觉ChartCollection加载图表属性界面.
-     * @param collection  收集图表
-     * @param chartDesigner  图表设计
-     */
-    public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> chartDesigner) {
-        if (collection instanceof ChartCollection) {
-            this.container.setEPane(chartDesigner);
-            chartEditPane.populate((ChartCollection) collection);
-        }
-    }
-
-    @Override
-    public void setWidgetPropertyPane(BaseWidgetPropertyPane pane) {
-
-    }
-
-    /**
-     * 刷新
-     */
-    public void refreshDockingView() {
-
-    }
-
-    @Override
-    public String getViewTitle() {
-        return null;
-    }
-
-    @Override
-    public Icon getViewIcon() {
-        return null;
-    }
-
-    /**
-     * 位置
-     * @return 位置
-     */
-    public Location preferredLocation() {
-        return null;
-    }
-}

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

@@ -17,15 +17,15 @@ public class ChartPropertyPane extends MiddleChartPropertyPane{
 	/**
 	 * 创建图表属性表实例.
 	 */
-	public synchronized static ChartPropertyPane getInstance() {
+	private synchronized static ChartPropertyPane getInstance() {
 		if(singleton == null) {
 			singleton = new ChartPropertyPane();
 		}
-		
+
 		singleton.setSureProperty();
 		return singleton;
 	}
-	
+
 	private static ChartPropertyPane singleton;
 
 	@Override
@@ -49,9 +49,8 @@ public class ChartPropertyPane extends MiddleChartPropertyPane{
 	protected JComponent createNorthComponent() {
 		return nameLabel;
 	}
-	
-	@Override
-	public void setWidgetPropertyPane(BaseWidgetPropertyPane pane) {
-		
+
+	public synchronized static void  clear() {
+		singleton =  null;
 	}
 }

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

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2001-2014,FineReport Inc, All Rights Reserved.
- */
-
-package com.fr.design.mainframe;
-
-import com.fr.form.ui.ChartBook;
-
-import java.awt.*;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-13
- * Time: 下午2:32
- */
-public class ChartUndoState extends BaseUndoState<JChart> {
-    private ChartBook chartBook;
-    private Dimension designerSize;
-    private double widthValue;
-   	private double heightValue;
-
-    public ChartUndoState(JChart t,ChartArea area) {
-        super(t);
-        try {
-            this.chartBook = (ChartBook) t.getTarget().clone();
-        } catch (CloneNotSupportedException e) {
-            throw new RuntimeException(e);
-        }
-        this.widthValue =area.getCustomWidth();
-        this.heightValue = area.getCustomHeight();
-    }
-
-
-    public ChartBook getChartBook(){
-        return this.chartBook;
-    }
-
-    /**
-     * 应用状态
-     */
-    public void applyState() {
-        this.getApplyTarget().applyUndoState(this);
-
-    }
-}

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

@@ -1,376 +0,0 @@
-/*
- * Copyright (c) 2001-2014,FineReport Inc, All Rights Reserved.
- * 图表类型文件
- */
-
-package com.fr.design.mainframe;
-
-import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
-import com.fr.file.FILEChooserPane;
-import com.fr.file.FILEChooserPane4Chart;
-import com.fr.form.ui.ChartBook;
-import com.fr.design.DesignModelAdapter;
-import com.fr.design.event.TargetModifiedEvent;
-import com.fr.design.event.TargetModifiedListener;
-import com.fr.design.gui.imenu.UIMenuItem;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.actions.ExcelExportAction4Chart;
-import com.fr.design.mainframe.actions.PDFExportAction4Chart;
-import com.fr.design.mainframe.actions.PNGExportAction4Chart;
-import com.fr.design.mainframe.form.FormECCompositeProvider;
-import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
-import com.fr.design.menu.ShortCut;
-import com.fr.design.menu.ToolBarDef;
-import com.fr.file.FILE;
-import com.fr.general.Inter;
-import com.fr.json.JSONArray;
-import com.fr.json.JSONException;
-import com.fr.json.JSONObject;
-import com.fr.stable.StringUtils;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.datatransfer.StringSelection;
-
-/**
- * 图表crt文件
- * <p/>
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-13
- * Time: 下午2:28
- */
-public class JChart extends JTemplate<ChartBook, ChartUndoState> {
-    public static final String XML_TAG = "JChart";
-    private static final String CHART_CARD = "FORM";
-    private static final String ELEMENTCASE_CARD = "ELEMENTCASE";
-
-    private static final String[] CARDNAME = new String[]{CHART_CARD, ELEMENTCASE_CARD};
-    private static final int TOOLBARPANEDIMHEIGHT_FORM = 60;
-    //图表设计器
-    ChartDesigner chartDesigner;
-
-    //中间编辑区域, carllayout布局
-    private JPanel tabCenterPane;
-    private CardLayout cardLayout;
-    //当前编辑的组件对象
-    private JComponent editingComponent;
-    private FormECCompositeProvider reportComposite;
-
-    public JChart() {
-        super(new ChartBook(), "Chart");
-    }
-
-    public JChart(ChartBook chartFile, FILE file) {
-        super(chartFile, file);
-    }
-
-    @Override
-    protected JPanel createCenterPane() {
-        tabCenterPane = FRGUIPaneFactory.createCardLayout_S_Pane();
-        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        centerPane.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 0, new Color(85, 85, 85)));
-        chartDesigner = new ChartDesigner(this.getTarget());
-        ChartArea area = new ChartArea(chartDesigner);
-        centerPane.add(area, BorderLayout.CENTER);
-        tabCenterPane.add(centerPane, CHART_CARD, 0);
-        chartDesigner.addTargetModifiedListener(new TargetModifiedListener() {
-                    public void targetModified(TargetModifiedEvent e) {
-                        JChart.this.fireTargetModified();// 调用保存*, 调用刷新界面, 刷新工具栏按钮
-                    }
-                });
-
-        this.add(tabCenterPane, BorderLayout.CENTER);
-        return tabCenterPane;
-    }
-
-    /**
-     * 移除选择
-     */
-    public void removeTemplateSelection() {
-
-    }
-
-    /**
-     * 刷新容器
-     */
-    public void refreshContainer() {
-
-    }
-
-    /**
-     * 移除参数面板选择
-     */
-    public void removeParameterPaneSelection() {
-
-    }
-
-    /**
-     * 创建设计模式
-     *
-     * @return 返回模式
-     */
-    protected DesignModelAdapter<ChartBook, ?> createDesignModel() {
-        return null;
-    }
-
-    /**
-     * 创建预览得菜单
-     *
-     * @return 菜单
-     */
-    public UIMenuItem[] createMenuItem4Preview() {
-        return new UIMenuItem[0];
-    }
-
-    /**
-     * 创建撤销状态
-     *
-     * @return 状态
-     */
-    protected ChartUndoState createUndoState() {
-        return new ChartUndoState(this,chartDesigner.getArea());
-    }
-
-    /**
-     * 应用撤销状态
-     *
-     * @param chartUndoState 撤销状态
-     */
-    protected void applyUndoState(ChartUndoState chartUndoState) {
-        try {
-            this.setTarget((ChartBook)chartUndoState.getChartBook().clone());
-            chartDesigner.setTarget(this.getTarget());
-            chartDesigner.populate();
-        }catch (CloneNotSupportedException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * 后缀
-     *
-     * @return 后缀
-     */
-    public String suffix() {
-        return ".crt";
-    }
-
-    /**
-     * 复制
-     */
-    public void copy() {
-
-    }
-
-    /**
-     * 黏贴
-     *
-     * @return 是否鸟贴成功
-     */
-    public boolean paste() {
-        return false;
-    }
-
-    /**
-     * 是否剪切
-     *
-     * @return 剪切成功
-     */
-    public boolean cut() {
-        return false;
-    }
-
-    /**
-     * 创建权限编辑面板
-     *
-     * @return 面板
-     */
-    public AuthorityEditPane createAuthorityEditPane() {
-        return null;
-    }
-
-    /**
-     * 工具栏
-     *
-     * @return 工具栏
-     */
-    public ToolBarMenuDockPlus getToolBarMenuDockPlus() {
-        return null;
-    }
-
-    /**
-     * 东上面板
-     *
-     * @return 面板
-     */
-    public JPanel getEastUpPane() {
-        return null;
-    }
-
-    /**
-     * 东下面板
-     *
-     * @return 面板
-     */
-    public JPanel getEastDownPane() {
-        return null;
-    }
-
-    /**
-     * 工具栏菜单
-     *
-     * @return 菜单
-     */
-    public ToolBarDef[] toolbars4Target() {
-        return new ToolBarDef[0];
-    }
-
-    /**
-     * 表单面板
-     *
-     * @return 面板
-     */
-    public JPanel[] toolbarPanes4Form() {
-        return new JPanel[0];
-    }
-
-    /**
-     * 模版菜单
-     *
-     * @return 模版菜单
-     */
-    public ShortCut[] shortcut4TemplateMenu() {
-        return new ShortCut[0];
-    }
-
-    /**
-     * 权限编辑菜单
-     *
-     * @return 菜单
-     */
-    public ShortCut[] shortCuts4Authority() {
-        return new ShortCut[0];
-    }
-
-    /**
-     * 工具条表单
-     *
-     * @return 表单
-     */
-    public JComponent[] toolBarButton4Form() {
-        return new JComponent[0];
-    }
-
-    /**
-     * 权限编辑工具栏,但是图表设计器里面用于正常工具栏不是全县编辑
-     *
-     * @return 工具条
-     */
-    public JComponent toolBar4Authority() {
-        return chartDesigner.getChartToolBarPane();
-    }
-
-    /**
-     * 工具条高度
-     *
-     * @return 工具条高度
-     */
-    public int getToolBarHeight() {
-        return 0;
-    }
-
-    /**
-     * 是否是报表
-     *
-     * @return 不是
-     */
-    public boolean isJWorkBook() {
-        return false;
-    }
-
-    /**
-     * 是否是图表
-     *
-     * @return 是则返回true
-     */
-    public boolean isChartBook() {
-        return true;
-    }
-
-    /**
-     * 设置权限编辑模式
-     *
-     * @param isUpMode 没有权限编辑
-     */
-    public void setAuthorityMode(boolean isUpMode) {
-
-    }
-
-    /**
-     * 刷新工具区域
-     */
-    public void refreshToolArea() {
-        DesignerContext.getDesignerFrame().resetToolkitByPlus(JChart.this);
-        chartDesigner.populate();
-        ChartDesignerPropertyPane.getInstance().populateChartPropertyPane(getTarget().getChartCollection(), chartDesigner);
-        EastRegionContainerPane.getInstance().replaceUpPane(ChartDesignerPropertyPane.getInstance());
-    }
-
-    /**
-     * 导出菜单的子菜单 ，目前用于图表设计器
-     *
-     * @return 子菜单
-     */
-    public ShortCut[] shortcut4ExportMenu() {
-        return new ShortCut[]{new PNGExportAction4Chart(this), new ExcelExportAction4Chart(this), new PDFExportAction4Chart(this)};
-    }
-
-    public Icon getIcon() {
-        return BaseUtils.readIcon("/com/fr/design/images/chart.png");
-    }
-
-    public ChartDesigner getChartDesigner(){
-        return chartDesigner;
-    }
-
-    /**
-     * 复制JS代码
-     */
-    public void copyJS(){
-        JSONObject jsonObject =this.getTarget().createExportConfig();
-        String jsonString = StringUtils.EMPTY;
-        if(jsonObject != null){
-            try{
-                if(jsonObject.has("charts")){
-                    JSONArray charts = jsonObject.getJSONArray("charts");
-                    jsonString = charts.toString(2);
-                }else{
-                    jsonString = jsonObject.toString(2);
-                }
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Chart-CopyJS_Message"), Inter.getLocText("FR-Chart-Action_Copy")+"JS", JOptionPane.INFORMATION_MESSAGE);
-            }catch (JSONException ex){
-                FRContext.getLogger().error(ex.getMessage());
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Chart-CopyJS_Failed")+"!", Inter.getLocText("Error"), JOptionPane.ERROR_MESSAGE);
-            }
-        }else{
-            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Chart-CopyJS_Failed")+"!", Inter.getLocText("Error"), JOptionPane.ERROR_MESSAGE);
-        }
-        StringSelection stringSelection = new StringSelection(jsonString);
-        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(stringSelection, null);
-    };
-
-    /**
-     * 系列风格改动
-     */
-    public void styleChange(){
-          chartDesigner.clearToolBarStyleChoose();
-    }
-
-    protected FILEChooserPane getFILEChooserPane(boolean isShowLoc){
-        return new FILEChooserPane4Chart(true, isShowLoc);
-    }
-
-}

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

@@ -13,11 +13,13 @@ import com.fr.base.chart.BaseChartCollection;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.gui.chart.BaseChartPropertyPane;
+import com.fr.design.gui.chart.ChartEditPaneProvider;
 import com.fr.design.gui.frpane.UITitlePanel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itabpane.TitleChangeListener;
 import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.general.Inter;
+import com.fr.stable.StableUtils;
 
 public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 
@@ -37,7 +39,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 		createNameLabel();
 		this.add(createNorthComponent(), BorderLayout.NORTH);
 		
-		chartEditPane = ChartEditPane.getInstance();
+		chartEditPane =  StableUtils.construct(ChartEditPane.class);
 		chartEditPane.setSupportCellData(true);
 		this.createMainPane();
 	}
@@ -48,6 +50,12 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 	
 	protected abstract void createMainPane();
 
+
+	@Override
+	public ChartEditPaneProvider getChartEditPane() {
+		return chartEditPane;
+	}
+
 	public void setSureProperty() {
 		chartEditPane.setContainer(container);
 		chartEditPane.addTitleChangeListener(titleListener);
@@ -93,6 +101,12 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 		}
 	}
 
+//	public void clear() {
+//		this.container.setEPane(null);
+//		chartEditPane.clear();
+//		getParent().remove(this);
+//	}
+
 	/**
 	 * 返回View的标题.
 	 */

designer_chart/src/com/fr/design/mainframe/actions/AbstractExportAction4JChart.java

@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2001-2014,FineReport Inc, All Rights Reserved.
- */
-
-package com.fr.design.mainframe.actions;
-
-import com.fr.base.FRContext;
-import com.fr.design.gui.iprogressbar.FRProgressBar;
-import com.fr.form.ui.ChartBook;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.DesignerFrame;
-import com.fr.design.mainframe.JChart;
-import com.fr.design.mainframe.exporter.Exporter4Chart;
-import com.fr.file.FILE;
-import com.fr.file.FILEChooserPane;
-import com.fr.file.filter.ChooseFileFilter;
-import com.fr.general.FRLogger;
-import com.fr.general.Inter;
-
-import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.io.FileOutputStream;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-15
- * Time: 上午9:48
- */
-public abstract class AbstractExportAction4JChart extends JChartAction {
-    protected AbstractExportAction4JChart(JChart chart){
-        super(chart);
-    }
-
-    private FRProgressBar progressbar;
-
-    protected ChartBook getChartBook(){
-        return this.getEditingComponent().getTarget();
-    }
-
-    /**
-     * 执行方法
-     * @param e 事件
-     */
-    public void actionPerformed(ActionEvent e) {
-        JChart chart = this.getEditingComponent();
-        FILE editingFILE = chart.getEditingFILE();
-        DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
-
-        // 弹出参数
-        final java.util.Map parameterMap = new java.util.HashMap();
-        final ChartBook chartBook = getChartBook();
-
-        // Choose a file name....
-        FILEChooserPane fileChooserPane = FILEChooserPane.getInstance(false, true);
-        fileChooserPane.setFILEFilter(this.getChooseFileFilter());
-
-        // 打开文件后输出文件名修改，eg：w.cpt.doc / w.svg.doc，去掉中间的后缀名~~ w.doc
-        String filenName = editingFILE.getName();
-        if (filenName.indexOf('.') != -1) {
-            filenName = filenName.substring(0, editingFILE.getName().lastIndexOf('.'));
-        }
-        fileChooserPane.setFileNameTextField(filenName, "." + this.getDefaultExtension());
-        int saveValue = fileChooserPane.showSaveDialog(designerFrame, "." + this.getDefaultExtension());
-        if (saveValue == FILEChooserPane.CANCEL_OPTION || saveValue == FILEChooserPane.JOPTIONPANE_CANCEL_OPTION) {
-            fileChooserPane = null;
-            return;
-        } else if (saveValue == FILEChooserPane.JOPTIONPANE_OK_OPTION || saveValue == FILEChooserPane.OK_OPTION) {
-            FILE file = fileChooserPane.getSelectedFILE();
-            try {
-                file.mkfile();
-            } catch (Exception e1) {
-                FRLogger.getLogger().error("Error In Make New File");
-            }
-            fileChooserPane = null;
-            FRContext.getLogger().info("\"" + file.getName() + "\"" + Inter.getLocText("Prepare_Export") + "!");
-
-            (progressbar = new FRProgressBar(createExportWork(file, chartBook), designerFrame,
-                    Inter.getLocText("Exporting"), "", 0, 100)).start();
-        }
-
-    }
-
-    private SwingWorker createExportWork(FILE file, final ChartBook chartBook) {
-        final String filePath = file.getPath();
-        final String fileGetName = file.getName();
-
-        SwingWorker exportWorker = new SwingWorker<Void, Void>() {
-            protected Void doInBackground() throws Exception {
-                Thread.sleep(100); //bug 10516
-                try {
-                    final FileOutputStream fileOutputStream = new FileOutputStream(filePath);
-
-                    this.setProgress(10);
-                    dealExporter(fileOutputStream,chartBook);
-                    this.setProgress(80);
-                    fileOutputStream.close();
-                    this.setProgress(100);
-
-                    FRContext.getLogger().info("\"" + fileGetName + "\"" + Inter.getLocText("Finish_Export") + "!");
-                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
-                            Inter.getLocText("Exported_successfully") + "\n" + filePath);
-                } catch (Exception exp) {
-                    this.setProgress(100);
-                    FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
-                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Export_failed") + "\n" + filePath);
-                }
-                return null;
-            }
-
-            public void done() {
-                progressbar.close();
-            }
-        };
-        return exportWorker;
-    }
-
-    private void dealExporter(FileOutputStream fileOutputStream, final ChartBook chartBook) throws Exception {
-        final Exporter4Chart exporter = AbstractExportAction4JChart.this.getExporter();
-        exporter.export(fileOutputStream,this.getEditingComponent());
-    }
-
-
-
-    protected abstract ChooseFileFilter getChooseFileFilter();
-
-    protected abstract String getDefaultExtension();
-
-    protected abstract Exporter4Chart getExporter();
-
-}

designer_chart/src/com/fr/design/mainframe/actions/ExcelExportAction4Chart.java

@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2001-2014,FineReport Inc, All Rights Reserved.
- */
-
-package com.fr.design.mainframe.actions;
-
-import com.fr.base.BaseUtils;
-import com.fr.base.ExcelUtils;
-import com.fr.design.mainframe.JChart;
-import com.fr.design.mainframe.exporter.ExcelExporter4Chart;
-import com.fr.design.mainframe.exporter.Exporter4Chart;
-import com.fr.design.menu.MenuKeySet;
-import com.fr.file.filter.ChooseFileFilter;
-import com.fr.general.Inter;
-
-import javax.swing.*;
-import java.awt.event.KeyEvent;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-15
- * Time: 上午9:52
- */
-public class ExcelExportAction4Chart extends AbstractExportAction4JChart {
-
-    private MenuKeySet excel= new MenuKeySet() {
-        @Override
-        public char getMnemonic() {
-            return 'E';
-        }
-
-        @Override
-        public String getMenuName() {
-            return Inter.getLocText("FR-Chart-Format_Excel");
-        }
-
-        @Override
-        public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_MASK);
-        }
-    };
-
-    public ExcelExportAction4Chart(JChart chart) {
-        super(chart);
-        this.setMenuKeySet(excel);
-        this.setName(getMenuKeySet().getMenuKeySetName());
-        this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/excel.png"));
-    }
-
-
-    @Override
-	protected ChooseFileFilter getChooseFileFilter() {
-    	return new ChooseFileFilter(new String[]{"xls", "xlsx"}, Inter.getLocText("Export-Excel"));
-    }
-
-    @Override
-	protected String getDefaultExtension() {
-    	return ExcelUtils.checkThirdJarSupportPOI() ? "xlsx" : "xls";
-    }
-
-    @Override
-    protected Exporter4Chart getExporter() {
-        return new ExcelExporter4Chart();
-    }
-}

designer_chart/src/com/fr/design/mainframe/actions/JChartAction.java

@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2001-2014,FineReport Inc, All Rights Reserved.
- */
-
-package com.fr.design.mainframe.actions;
-
-import com.fr.design.actions.JTemplateAction;
-import com.fr.design.mainframe.JChart;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-15
- * Time: 上午9:47
- */
-public abstract class JChartAction extends JTemplateAction<JChart> {
-    public JChartAction(JChart jChart) {
-        super(jChart);
-    }
-}

designer_chart/src/com/fr/design/mainframe/actions/NewChartAction.java

@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2001-2014,FineReport Inc, All Rights Reserved.
- */
-
-package com.fr.design.mainframe.actions;
-
-import com.fr.base.BaseUtils;
-import com.fr.design.actions.UpdateAction;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.JChart;
-import com.fr.design.menu.MenuKeySet;
-import com.fr.general.Inter;
-
-import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-13
- * Time: 下午3:22
- */
-public class NewChartAction extends UpdateAction{
-
-    public NewChartAction(){
-        this.setMenuKeySet(NEW_CHART);
-        this.setName(getMenuKeySet().getMenuKeySetName());
-        this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("com/fr/design/images/newchart_normal.png"));
-        this.setAccelerator(getMenuKeySet().getKeyStroke());
-    }
-
-
-    /**
-     * 执行事件
-     * @param e 事件
-     */
-    public void actionPerformed(ActionEvent e) {
-        DesignerContext.getDesignerFrame().addAndActivateJTemplate(new JChart());
-    }
-
-    public static final MenuKeySet NEW_CHART = new MenuKeySet() {
-        @Override
-        public char getMnemonic() {
-            return 'F';
-        }
-
-        @Override
-        public String getMenuName() {
-            return Inter.getLocText("M-New_ChartBook");
-        }
-
-        @Override
-        public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK);
-        }
-    };
-}

designer_chart/src/com/fr/design/mainframe/actions/PDFExportAction4Chart.java

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2001-2014,FineReport Inc, All Rights Reserved.
- */
-
-package com.fr.design.mainframe.actions;
-
-import com.fr.base.BaseUtils;
-import com.fr.design.mainframe.JChart;
-import com.fr.design.mainframe.exporter.Exporter4Chart;
-import com.fr.design.mainframe.exporter.PdfExporter4Chart;
-import com.fr.design.menu.MenuKeySet;
-import com.fr.file.filter.ChooseFileFilter;
-import com.fr.general.Inter;
-
-import javax.swing.*;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-15
- * Time: 上午10:16
- */
-public class PDFExportAction4Chart extends AbstractExportAction4JChart {
-
-    private MenuKeySet pdf = new MenuKeySet() {
-        @Override
-        public char getMnemonic() {
-            return 'P';
-        }
-
-        @Override
-        public String getMenuName() {
-            return Inter.getLocText("FR-Chart-Format_PDF");
-        }
-
-        @Override
-        public KeyStroke getKeyStroke() {
-            return null;
-        }
-    };
-
-    public PDFExportAction4Chart(JChart chart) {
-        super(chart);
-        this.setMenuKeySet(pdf);
-        this.setName(getMenuKeySet().getMenuKeySetName());
-        this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/pdf.png"));
-    }
-
-    @Override
-	protected ChooseFileFilter getChooseFileFilter() {
-        return new ChooseFileFilter(new String[]{"pdf"}, Inter.getLocText("Export-PDF"));
-    }
-
-    @Override
-	protected String getDefaultExtension() {
-        return "pdf";
-    }
-
-    @Override
-    protected Exporter4Chart getExporter() {
-        return new PdfExporter4Chart();
-    }
-}

designer_chart/src/com/fr/design/mainframe/actions/PNGExportAction4Chart.java

@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2001-2014,FineReport Inc, All Rights Reserved.
- */
-
-package com.fr.design.mainframe.actions;
-
-import com.fr.base.BaseUtils;
-import com.fr.design.mainframe.JChart;
-import com.fr.design.mainframe.exporter.Exporter4Chart;
-import com.fr.design.mainframe.exporter.ImageExporter4Chart;
-import com.fr.design.menu.MenuKeySet;
-import com.fr.file.filter.ChooseFileFilter;
-import com.fr.general.Inter;
-
-import javax.swing.*;
-import java.awt.event.KeyEvent;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-15
- * Time: 上午10:18
- */
-public class PNGExportAction4Chart extends AbstractExportAction4JChart {
-
-    private MenuKeySet menuSet  = new MenuKeySet() {
-        @Override
-        public char getMnemonic() {
-            return 'M';
-        }
-
-        @Override
-        public String getMenuName() {
-            return Inter.getLocText("FR-Chart-Format_Image");
-        }
-
-        @Override
-        public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_MASK);
-        }
-    };
-
-    public PNGExportAction4Chart(JChart chart) {
-        super(chart);
-        this.setMenuKeySet(menuSet);
-        this.setName(getMenuKeySet().getMenuKeySetName());
-        this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/exportimg.png"));
-    }
-
-    @Override
-    protected ChooseFileFilter getChooseFileFilter() {
-        return new ChooseFileFilter(new String[]{"png"}, Inter.getLocText("Image"));
-    }
-
-    @Override
-    protected String getDefaultExtension() {
-        return "png";
-    }
-
-    @Override
-    protected Exporter4Chart getExporter() {
-        return new ImageExporter4Chart();
-    }
-}

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

@@ -32,4 +32,5 @@ public abstract class AbstractChartAttrPane extends AbstractAttrNoScrollPane {
 	public void refreshChartDataPane(ChartCollection collection){
 
 	}
+
 }

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

@@ -9,6 +9,7 @@ import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.tabledata.Prepare4DataSourceChange;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.chart.ChartEditPaneProvider;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.gui.ibutton.UIHeadGroup;
 import com.fr.design.gui.itabpane.TitleChangeListener;
@@ -30,20 +31,13 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
-public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4DataSourceChange {
-    public synchronized static ChartEditPane getInstance() {
-        if (singleton == null) {
-            singleton = new ChartEditPane();
-        }
-        return singleton;
-    }
+public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4DataSourceChange, ChartEditPaneProvider {
 
     private final static int CHANGE_MIN_TIME = 80;
 
     protected ChartCollection collection;
     protected boolean isDefaultPane = true;//是否是默认的界面
 
-    private static ChartEditPane singleton;
     protected List<AbstractChartAttrPane> paneList;
 
     protected ChartTypePane typePane;
@@ -79,10 +73,6 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
         registerDSChangeListener();
     }
 
-    public static ChartEditPane getSingleton() {
-        return singleton;
-    }
-
     //构建主面板
     protected void createTabsPane() {
         Icon[] iconArray = new Icon[paneList.size()];
@@ -163,7 +153,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
                 paneList.add(otherPane);
                 this.isDefaultPane = true;
             }else{
-                ChartDataPane chartDataPane = ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener);
+                ChartDataPane chartDataPane = createChartDataPane(plotID);
                 paneList.add(chartDataPane);
                 AbstractChartAttrPane[] otherPaneList = ChartTypeInterfaceManager.getInstance().getAttrPaneArray(plotID, listener);
                 for(int i = 0; i < otherPaneList.length; i++){
@@ -177,6 +167,10 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
         }
     }
 
+    protected ChartDataPane createChartDataPane(String plotID) {
+        return ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener);
+    }
+
     protected void addTypePane() {
         paneList.add(typePane);
     }
@@ -295,7 +289,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
      *
      * @param id 界面的标志.id
      */
-    public void GoToPane(String... id) {
+    public void gotoPane(String... id) {
         this.setSelectedIndex(id);
         EastRegionContainerPane.getInstance().setWindow2PreferWidth();
     }

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

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

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

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

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

@@ -1,10 +1,10 @@
 package com.fr.design.mainframe.chart.gui;
 
 import com.fr.base.BaseUtils;
+import com.fr.chart.base.AttrChangeConfig;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.SwitchState;
-import com.fr.chart.base.AttrChangeConfig;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.DialogActionListener;
 import com.fr.design.dialog.UIDialog;
@@ -19,6 +19,7 @@ import com.fr.design.mainframe.chart.gui.ChartTypePane.ComboBoxPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -52,34 +53,29 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
 
     private ChartTypePane parent = null;
 
-    //记录鼠标当前是否在操作添加按钮
-    private boolean mouseOnChartTypeButtonPane = false;
-
     //配置窗口属性
     private UIMenuNameableCreator configCreator;
 
-    /**
-     * 鼠标事件是否在这个面板
-     * @return 返回是否
-     */
-    public boolean isMouseOnChartTypeButtonPane() {
-        return this.mouseOnChartTypeButtonPane;
-    }
-
-    private AWTEventListener awt = new AWTEventListener() {
-        public void eventDispatched(AWTEvent event) {
-            //没有进行鼠标点击，则返回
-            if (event instanceof MouseEvent && ((MouseEvent) event).getClickCount() > 0) {
-                if (currentEditingEditor != null && !ComparatorUtils.equals(event.getSource(), currentEditingEditor)) {
-                    stopEditing();
-                    if (event.getSource() instanceof ChartChangeButton) {
-                        ((ChartChangeButton) event.getSource()).mouseClick((MouseEvent) event);
-                    }
-                    populateBean(editingCollection);
-                }
-            }
-        }
-    };
+    //处理 编辑一个button时,选中另一个button的问题.
+    //stopEditing不能直接relayout,否则click事件不响应了.
+    //所以:stopEditing--选中其他button则响应click之后relayout;普通失焦则直接relayout.
+    private boolean pressOtherButtonWhenEditing = false;
+
+
+//    private AWTEventListener awt = new AWTEventListener() {
+//        public void eventDispatched(AWTEvent event) {
+//            //没有进行鼠标点击，则返回
+//            if (event instanceof MouseEvent && ((MouseEvent) event).getClickCount() > 0) {
+//                if (currentEditingEditor != null && !ComparatorUtils.equals(event.getSource(), currentEditingEditor)) {
+//                    stopEditing();
+//                    if (event.getSource() instanceof ChartChangeButton) {
+//                        ((ChartChangeButton) event.getSource()).mouseClick((MouseEvent) event);
+//                    }
+//                    populateBean(editingCollection);
+//                }
+//            }
+//        }
+//    };
 
     public ChartTypeButtonPane(ChartTypePane chartTypePane){
         this();
@@ -111,7 +107,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
         initConfigButton();
         initConfigCreator();
 
-        Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK);
+     //   Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK);
     }
 
     private void initConfigCreator() {
@@ -121,7 +117,6 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
     private void initAddButton() {
         addButton.setPreferredSize(new Dimension(20, 20));
         addButton.addActionListener(addListener);
-        addButton.addMouseListener(mouseListener);
     }
 
     private void initConfigButton() {
@@ -132,7 +127,6 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
     ActionListener addListener = new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
-            mouseOnChartTypeButtonPane = true;
             String name = getNewChartName();
             ChartChangeButton button = new ChartChangeButton(name);// some set selected
 
@@ -187,15 +181,6 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
             dialog.setVisible(true);
         }
     };
-    
-
-    MouseListener mouseListener = new MouseAdapter() {
-        @Override
-        public void mouseExited(MouseEvent e) {
-            super.mouseExited(e);
-            mouseOnChartTypeButtonPane = false;
-        }
-    };
 
     private String getNewChartName() {
         int count = indexList.size() + 1;
@@ -328,7 +313,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
     private void checkConfigButtonVisible() {
         addButton.setVisible(true);
         //新建一个collection
-        if(editingCollection.getState() == SwitchState.DEFAULT){
+        if(editingCollection.getState() == SwitchState.DEFAULT && editingCollection.getSelectedChart() != null){
             //Chart 不支持图表切换
             configButton.setVisible(editingCollection.getSelectedChart().supportChange());
         }
@@ -351,12 +336,19 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
         if (currentEditingEditor != null) {
             String newName = currentEditingEditor.getText();
             int selectedIndex = editingCollection.getSelectedIndex();
+            ChartChangeButton button = indexList.get(selectedIndex);
+            button.isMoveOn = false;
             if (!ComparatorUtils.equals(editingCollection.getChartName(selectedIndex), newName)) {
                 editingCollection.setChartName(selectedIndex, newName);
                 HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().fireTargetModified();
+                button.changeChartName(newName);
             }
             buttonPane.remove(currentEditingEditor);
             currentEditingEditor = null;
+
+            if(!pressOtherButtonWhenEditing) {
+                layoutPane(buttonPane);
+            }
         }
     }
 
@@ -374,11 +366,25 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
 
             buttonName = name;
             this.setToolTipText(name);
-            nameField.addActionListener(new ActionListener() {
+            nameField.addActionListener(new ActionListener() {//enter
                 @Override
                 public void actionPerformed(ActionEvent e) {
+                    pressOtherButtonWhenEditing = false;
                     stopEditing();
-                    populateBean(editingCollection);
+                }
+            });
+
+            nameField.addFocusListener(new FocusListener() {
+                @Override
+                public void focusGained(FocusEvent e) {
+
+                }
+
+                @Override
+                public void focusLost(FocusEvent e) {//编辑状态lost才走这边
+                    if (currentEditingEditor != null ) {
+                        stopEditing();
+                    }
                 }
             });
         }
@@ -387,6 +393,11 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
             return buttonName;
         }
 
+        private void changeChartName(String name) {
+            this.setText(name);
+            buttonName = name;
+        }
+
         public Dimension getPreferredSize() {
             return new Dimension(B_W, B_H);
         }
@@ -466,17 +477,20 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
                 @Override
                 public void mouseClicked(MouseEvent e) {
                     mouseClick(e);
-                    mouseOnChartTypeButtonPane = true;
+                    if(pressOtherButtonWhenEditing){
+                        relayoutPane();
+                        pressOtherButtonWhenEditing = false;
+                    }
                 }
 
                 public void mouseEntered(MouseEvent e) {
                     checkMoveOn(true);
-                    mouseOnChartTypeButtonPane = true;
+                    pressOtherButtonWhenEditing = currentEditingEditor != null;
                 }
 
                 public void mouseExited(MouseEvent e) {
                     checkMoveOn(false);
-                    mouseOnChartTypeButtonPane = false;
+                    pressOtherButtonWhenEditing = false;
                 }
             };
         }
@@ -502,9 +516,17 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
 
             if (isEnabled()) {
                 noSelected();
+                //记录改变前的plotID
+                String lastPlotID = editingCollection == null ? StringUtils.EMPTY : editingCollection.getSelectedChart().getPlot().getPlotID();
                 changeCollectionSelected(getButtonName());
                 setSelectedWithFireListener(true);
                 fireSelectedChanged();
+
+                //需要先更新，最后重构面板
+                //重构面板
+                if (parent != null ){
+                    parent.reLayoutEditPane(lastPlotID, editingCollection);
+                }
             }
         }
 

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

@@ -8,7 +8,6 @@ import com.fr.chart.chartattr.SwitchState;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.beans.FurtherBasicBeanPane;
-import com.fr.design.chart.fun.IndependentChartUIProvider;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.gui.frpane.UIComboBoxPane;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -127,7 +126,13 @@ public class ChartTypePane extends AbstractChartAttrPane{
 		protected String title4PopupWindow() {
 			return null;
 		}
-		
+
+		/**
+		 * 不同图表切换分同一个selected的不同图表切换和不同selected的不同图表切换
+		 * 如果是切换图表的某个图表发生变化，则collection的选择下标不会变
+		 * 如果是切换图表的不同图表之间切换，则collection的选择下标会改变
+		 * @param chart
+		 */
 		public void updateBean(Chart chart) {
 
 			Plot oldPlot = chart.getPlot();
@@ -258,6 +263,21 @@ public class ChartTypePane extends AbstractChartAttrPane{
 	}
 
 
+	/**
+	 * 面板重构
+	 * @param lastPlotID
+	 * @param collection
+	 */
+	public void reLayoutEditPane(String lastPlotID, ChartCollection collection){
+		Chart chart = collection.getSelectedChart();
+		String plotID = chart.getPlot().getPlotID();
+		boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID);
+		if (editPane != null && editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, plotID))){
+			editPane.reLayout(chart);
+		}
+	}
+
+
 	public void reactorChartTypePane(ChartCollection collection){
 		if (needReactor(collection)) {
 			chartTypePane.reactor(collection);
@@ -291,7 +311,6 @@ public class ChartTypePane extends AbstractChartAttrPane{
         editingCollection = collection;
 		buttonPane.update(collection);// 内部操作时 已经做过处理.
 		Chart chart = collection.getSelectedChart();
-
 		chartTypePane.updateBean(chart);
 	}
 

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

@@ -102,4 +102,5 @@ public class DatabaseTableDataPane extends BasicPane{
 			}
 		});
 	}
+
 }

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

@@ -133,4 +133,5 @@ public class NormalChartDataPane extends DataContentsPane {
 	public void setSupportCellData(boolean supportCellData) {
 		dataPane.justSupportOneSelect(supportCellData);
 	}
+
 }

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

@@ -52,7 +52,7 @@ public class ReportDataPane extends FurtherBasicBeanPane<ChartCollection>{
      * 界面重置
      */
 	public void reset() {
-		
+		clear();
 	}
 
     /**
@@ -98,4 +98,8 @@ public class ReportDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	public ChartCollection updateBean() {
 		return null;
 	}
+
+	public void clear() {
+		this.removeAll();
+	}
 }

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

@@ -49,8 +49,8 @@ public class ChartSwitchPane extends AbstractAttrNoScrollPane{
 						
 						if(currentChartEditPane != null) {
 							currentChartEditPane.populate(editingChartCollection);// 选中新Plot之后 刷新对应界面, 比如超级链接等, 然后才能update.
-							currentChartEditPane.GoToPane(PaneTitleConstants.CHART_TYPE_TITLE);
-							currentChartEditPane.GoToPane(PaneTitleConstants.CHART_OTHER_TITLE, PaneTitleConstants.CHART_OTHER_TITLE_CHANGE);
+							currentChartEditPane.gotoPane(PaneTitleConstants.CHART_TYPE_TITLE);
+							currentChartEditPane.gotoPane(PaneTitleConstants.CHART_OTHER_TITLE, PaneTitleConstants.CHART_OTHER_TITLE_CHANGE);
 							currentChartEditPane.fire();
 						}
 					}

designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java

@@ -110,8 +110,8 @@ public class LineSeriesPane extends AbstractPlotSeriesPane{
 		if(plot instanceof LinePlot) {
 			LinePlot linePlot = (LinePlot)plot;
 			linePlot.setCurve(isCurve.isSelected());
-			linePlot.setNullValueBreak(isNullValueBreak.getSelectedIndex() == 0);
 		}
+		plot.setNullValueBreak(isNullValueBreak.getSelectedIndex() == 0);
 		ConditionAttr attrList = plot.getConditionCollection().getDefaultAttr();
 		updateAttrCondition(attrList);
 	}

designer_chart/src/com/fr/design/mainframe/exporter/ExcelExporter4Chart.java

@@ -1,94 +0,0 @@
-package com.fr.design.mainframe.exporter;
-
-import com.fr.base.ExcelUtils;
-import com.fr.design.mainframe.ChartDesigner;
-import com.fr.design.mainframe.JChart;
-import com.fr.general.FRLogger;
-import com.fr.general.IOUtils;
-import com.fr.stable.CoreGraphHelper;
-import com.fr.third.v2.org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import com.fr.third.v2.org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import com.fr.third.v2.org.apache.poi.ss.usermodel.ClientAnchor;
-import com.fr.third.v2.org.apache.poi.ss.usermodel.Drawing;
-import com.fr.third.v2.org.apache.poi.ss.usermodel.Sheet;
-import com.fr.third.v2.org.apache.poi.ss.usermodel.Workbook;
-import com.fr.third.v2.org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import com.fr.third.v2.org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-22
- * Time: 上午10:47
- */
-public class ExcelExporter4Chart extends ImageExporter4Chart {
-    private static final int PICTURE_TYPE_PNG = 6 ;
-    private static final int DEFAULT_COLUMN_SPAN = 12;
-    private static final int DEFAULT_ROW_SPAN = 26;
-    private Workbook workbook;
-    private ClientAnchor anchor;
-
-
-
-    /**
-     * 导出
-     *
-     * @param out   输出流
-     * @param chart 图表文件
-     * @throws Exception 异常
-     */
-    public void export(OutputStream out, JChart chart) throws Exception {
-        try {
-            ChartDesigner designer = chart.getChartDesigner();
-            int imageWidth = designer.getArea().getCustomWidth();
-            int imageHeight = designer.getArea().getCustomHeight();
-            BufferedImage image = CoreGraphHelper.createBufferedImage(imageWidth, (int) imageHeight, BufferedImage.TYPE_INT_RGB);
-            Graphics2D g2d = image.createGraphics();
-            paintGlyph(g2d,imageWidth,imageHeight,designer);
-         	g2d.dispose();
-            if (checkExcelExportVersion()) {
-                workbook = new XSSFWorkbook();
-            }else{
-                workbook = new HSSFWorkbook();
-            }
-            Sheet sheet = workbook.createSheet();
-            if(checkExcelExportVersion()){
-                anchor = new XSSFClientAnchor(0,0,0,0,1,1,DEFAULT_COLUMN_SPAN,DEFAULT_ROW_SPAN);
-            }else{
-                anchor = new HSSFClientAnchor(0,0,0,0,(short)1,1,(short)DEFAULT_COLUMN_SPAN,DEFAULT_ROW_SPAN);
-            }
-            Drawing patriarch = sheet.createDrawingPatriarch();
-            patriarch.createPicture(anchor,loadPicture(image));
-            workbook.write(out);
-          	out.flush();
-        }catch (Exception e){
-            FRLogger.getLogger().error(e.getMessage());
-        }
-    }
-
-    private boolean checkExcelExportVersion() {
-        return ExcelUtils.checkThirdJarSupportPOI();
-    }
-    	// 加载图片.
-	private int loadPicture(BufferedImage bufferedImage)throws IOException {
-		ByteArrayOutputStream bos = null;
-		try {
-			bos = new ByteArrayOutputStream();
-			IOUtils.writeImage(bufferedImage, "png", bos);
-			//引用这个参数是jdk1.5的版本 XSSFWorkbook.PICTURE_TYPE_PNG, 在1.4下无法编译, 所有手动去掉这个参数.
-            return workbook.addPicture(bos.toByteArray(), PICTURE_TYPE_PNG);
-		} finally {
-			if (bos != null) {
-				bos.flush();
-				bos.close();
-			}
-            bufferedImage.flush();
-		}
-	}
-}

designer_chart/src/com/fr/design/mainframe/exporter/Exporter4Chart.java

@@ -1,25 +0,0 @@
-package com.fr.design.mainframe.exporter;
-import com.fr.design.mainframe.JChart;
-
-import java.io.OutputStream;
-
-/**
- * 图表设计器crt文件的导出成其他类型文件的接口
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-21
- * Time: 下午7:14
- */
-public interface Exporter4Chart {
-
-    /**
-   	 * 将结果crt导出成目标文件
-   	 *
-   	 * @param out      输出流
-   	 * @param chart    chart文件
-   	 * @throws Exception 导出失败则抛出此异常
-   	 */
-   	public void export(OutputStream out, JChart chart) throws Exception;
-
-}

designer_chart/src/com/fr/design/mainframe/exporter/ImageExporter4Chart.java

@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2001-2014,FineReport Inc, All Rights Reserved.
- */
-
-package com.fr.design.mainframe.exporter;
-
-import com.fr.base.chart.BaseChartGlyph;
-import com.fr.base.chart.chartdata.BaseTableDefinition;
-import com.fr.base.chart.chartdata.ChartData;
-import com.fr.base.chart.chartdata.TopDefinitionProvider;
-import com.fr.chart.chartattr.Chart;
-import com.fr.chart.chartattr.ChartCollection;
-import com.fr.chart.chartglyph.ChartGlyph;
-import com.fr.data.TableDataSource;
-import com.fr.design.mainframe.ChartDesigner;
-import com.fr.design.mainframe.JChart;
-import com.fr.script.Calculator;
-import com.fr.stable.Constants;
-import com.fr.stable.CoreGraphHelper;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.OutputStream;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-15
- * Time: 上午10:04
- */
-public class ImageExporter4Chart implements Exporter4Chart{
-    private int resolution = Constants.DEFAULT_WEBWRITE_AND_SCREEN_RESOLUTION;
-    protected Calculator calculator;
-
-
-    public ImageExporter4Chart() {
-
-    }
-
-    /**
-     * 导出
-     *
-     * @param out  输出流
-     * @param chart 图表文件
-     * @throws Exception 异常
-     */
-    public void export(OutputStream out, JChart chart) throws Exception {
-        ChartDesigner designer = chart.getChartDesigner();
-        int imageWidth = designer.getArea().getCustomWidth();
-        int imageHeight = designer.getArea().getCustomHeight();
-        BufferedImage image = CoreGraphHelper.createBufferedImage(imageWidth, (int) imageHeight, BufferedImage.TYPE_INT_RGB);
-        Graphics2D g2d = image.createGraphics();
-        paintGlyph(g2d,imageWidth,imageHeight,designer);
-        ImageIO.write(image, "png", out);
-    }
-
-    protected void paintGlyph(Graphics2D g2d,int imageWidth,int imageHeight,ChartDesigner designer){
-        if (imageWidth == 0 || imageHeight == 0) {
-            return;
-        }
-        this.calculator = Calculator.createCalculator();
-        this.calculator.setAttribute(TableDataSource.class, null);
-        g2d.setColor(Color.white);
-        g2d.fillRect(0, 0, imageWidth,imageHeight);
-        ChartCollection chartCollection = (ChartCollection) designer.getTarget().getChartCollection();
-        Chart editingChart = chartCollection.getSelectedChart();
-
-        TopDefinitionProvider topDefinition = editingChart.getFilterDefinition();
-        ChartData chartData4Glyph = null;
-        if (topDefinition instanceof BaseTableDefinition) {
-            chartData4Glyph = ((BaseTableDefinition) topDefinition).calcu4ChartData(calculator, editingChart.getDataProcessor());
-        }
-
-        if (chartData4Glyph == null) {
-            chartData4Glyph = editingChart.defaultChartData();
-        }
-
-        BaseChartGlyph chartGlyph = null;
-        if (editingChart != null && editingChart.getPlot() != null) {
-            chartGlyph = editingChart.createGlyph(chartData4Glyph);
-        }
-        if (chartGlyph instanceof ChartGlyph) {
-            Image glyphImage = ((ChartGlyph) chartGlyph).toImage(imageWidth, imageHeight, resolution);
-            g2d.drawImage(glyphImage, 0, 0, null);
-        }
-    }
-}

designer_chart/src/com/fr/design/mainframe/exporter/PdfExporter4Chart.java

@@ -1,382 +0,0 @@
-package com.fr.design.mainframe.exporter;
-
-import com.fr.base.FRContext;
-import com.fr.design.mainframe.ChartDesigner;
-import com.fr.design.mainframe.JChart;
-import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
-import com.fr.stable.OperatingSystem;
-import com.fr.stable.StableUtils;
-import com.fr.third.com.lowagie.text.Document;
-import com.fr.third.com.lowagie.text.ExceptionConverter;
-import com.fr.third.com.lowagie.text.Rectangle;
-import com.fr.third.com.lowagie.text.pdf.*;
-
-import java.awt.*;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Locale;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-22
- * Time: 上午10:20
- */
-public class PdfExporter4Chart extends ImageExporter4Chart {
-    protected static MyFontMapper fontMapper = null;
-
-
-    /**
-     * 将结果crt导出成目标文件
-     *
-     * @param out   输出流
-     * @param chart chart文件
-     * @throws Exception 导出失败则抛出此异常
-     */
-    public void export(OutputStream out, JChart chart) throws Exception {
-        ChartDesigner designer = chart.getChartDesigner();
-        int imageWidth = designer.getArea().getCustomWidth();
-        int imageHeight = designer.getArea().getCustomHeight();
-        Document document = null;
-        PdfWriter writer = null;
-        ByteArrayOutputStream bo = new ByteArrayOutputStream();
-
-        if (document == null) {
-            document = new Document(new Rectangle(imageWidth, imageHeight));
-            writer = PdfWriter.getInstance(document, bo);
-            document.open();
-        }
-        //将chart画到PDF上去
-        PdfContentByte cb = writer.getDirectContent();
-        Graphics2D g2d = cb.createGraphics(imageWidth, imageHeight, prepareFontMapper());
-        paintGlyph(g2d, imageWidth, imageHeight, designer);
-        g2d.dispose();
-        if (document != null) {
-            document.close();
-        }
-
-        try {
-            out.write(bo.toByteArray());
-            out.flush();
-            out.close();
-        } catch (IOException e) {
-            FRLogger.getLogger().error(e.getMessage());
-        }
-
-
-    }
-
-    private static void insertDirectory4Linux() {
-       /*
-   	 * alex:在222这台Redhat的机器上测试,发现把从windows拷来的simsun.ttc只有放在usr/share/fonts/default/Type1里面才可以用起来
-   	 * 如果是放在usr/share/fonts目录或是${env}/resources/fonts目录下面,虽然可以读到,但是awtToPdf之后返回出去却依旧无法起作用
-   	 * 中文字依然挤在一起
-   	 *
-   	 * 觉得实在很诡异,可能必须放在系统字体的文件夹下面才行吧
-   	 *
-   	 * PS:这是在用Graphics drawString的时候遇到的问题
-   	 */
-        //Linux
-        InsertDirectory(fontMapper, new File("/usr/X11R6/lib/X11/fonts"));
-        InsertDirectory(fontMapper, new File("/usr/share/fonts"));
-        String path = StableUtils.pathJoin(new String[]{FRContext.getCurrentEnv().getPath(), "fonts"});
-        //再去web-inf/fonts里面找一下, 省去客户四处找jdk安装路径的麻烦
-        InsertDirectory(fontMapper, new File(path));
-
-        //Solaris
-        InsertDirectory(fontMapper, new File("/usr/X/lib/X11/fonts/TrueType"));
-        InsertDirectory(fontMapper, new File("/usr/openwin/lib/X11/fonts/TrueType"));
-    }
-
-    private static void insertDirectory4Windows() {
-        String libraryPath = System.getProperty("java.library.path");
-        String[] libraryPathArray = StableUtils.splitString(libraryPath, ";");
-        for (int i = 0; i < libraryPathArray.length; i++) {
-            File libraryFile = new File(libraryPathArray[i]);
-            InsertDirectory(fontMapper, new File(libraryFile, "Fonts"));
-        }
-
-        InsertDirectory(fontMapper, new File("C:\\WINNT\\Fonts"));
-        InsertDirectory(fontMapper, new File("C:\\WINDOWS\\Fonts"));
-    }
-
-    //peter:循环所有的目录，遍历所有的FontMapper.
-    protected static void InsertDirectory(MyFontMapper fontMapper, File dir) {
-        if (dir == null || !dir.exists() || !dir.isDirectory()) {
-            return;
-        }
-
-        fontMapper.insertDirectory(dir.getAbsolutePath());
-
-        File[] listFiles = dir.listFiles();
-        for (int i = 0; i < listFiles.length; i++) {
-            InsertDirectory(fontMapper, listFiles[i]);
-        }
-    }
-
-
-    /**
-     * Prepares FontMapper.
-     */
-    protected static MyFontMapper prepareFontMapper() {
-        if (fontMapper != null) {
-            return fontMapper;
-        }
-
-        fontMapper = new MyFontMapper();
-        try {
-            //然后加载系统Font字体.
-            if (OperatingSystem.isWindows()) {
-                insertDirectory4Windows();
-
-            } else {
-                insertDirectory4Linux();
-
-            }
-
-            String javaHomeProp = System.getProperty("java.home");
-            if (javaHomeProp != null) {
-                File javaFontFile = new File(StableUtils.pathJoin(new String[]{
-                        javaHomeProp, "lib", "fonts"
-                }));
-                if (javaFontFile.exists() && javaFontFile.isDirectory()) {
-                    InsertDirectory(fontMapper, javaFontFile);
-                }
-            }
-
-            if (FRContext.getLocale() == Locale.CHINA || FRContext.getLocale() == Locale.CHINESE) {
-                MyFontMapper.defaultFont = BaseFont.createFont(MyFontMapper.CHINESE_SIMPLIFIED_FONT, MyFontMapper.CHINESE_SIMPLIFIED_ENCODING_H, BaseFont.NOT_EMBEDDED);
-            } else if (FRContext.getLocale() == Locale.TAIWAN || FRContext.getLocale() == Locale.TRADITIONAL_CHINESE) {
-                MyFontMapper.defaultFont = BaseFont.createFont(MyFontMapper.CHINESE_TRADITIONAL_FONT_M_SUNG, MyFontMapper.CHINESE_TRADITIONAL_ENCODING_H, BaseFont.NOT_EMBEDDED);
-            } else if (FRContext.getLocale() == Locale.JAPAN || FRContext.getLocale() == Locale.JAPANESE) {
-                MyFontMapper.defaultFont = BaseFont.createFont(MyFontMapper.JAPANESE_FONT_GO, MyFontMapper.JAPANESE_ENCODING_H, BaseFont.NOT_EMBEDDED);
-            } else if (FRContext.getLocale() == Locale.KOREA || FRContext.getLocale() == Locale.KOREAN) {
-                MyFontMapper.defaultFont = BaseFont.createFont(MyFontMapper.KOREAN_FONT_GO_THIC, MyFontMapper.KOREAN_ENCODING_H, BaseFont.NOT_EMBEDDED);
-            } else {
-                //默认也设置一个吧45422 , 不设置默认字体, linux英文环境导不出来
-                MyFontMapper.defaultFont = BaseFont.createFont(MyFontMapper.CHINESE_SIMPLIFIED_FONT, MyFontMapper.CHINESE_SIMPLIFIED_ENCODING_H, BaseFont.NOT_EMBEDDED);
-            }
-        } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
-        }
-
-        return fontMapper;
-    }
-
-    public static class MyFontMapper implements FontMapper {
-
-        public static final String CHINESE_SIMPLIFIED_FONT = "STSong-Light";
-        public static final String CHINESE_SIMPLIFIED_ENCODING_H = "UniGB-UCS2-H";
-        public static final String CHINESE_SIMPLIFIED_ENCODING_V = "UniGB-UCS2-V";
-
-        public static final String CHINESE_TRADITIONAL_FONT_M_HEI = "MHei-Medium";
-        public static final String CHINESE_TRADITIONAL_FONT_M_SUNG = "MSung-Light";
-        public static final String CHINESE_TRADITIONAL_ENCODING_H = "UniCNS-UCS2-H";
-        public static final String CHINESE_TRADITIONAL_ENCODING_V = "UniCNS-UCS2-V";
-
-        public static final String JAPANESE_FONT_GO = "HeiseiKakuGo-W5";
-        public static final String JAPANESE_FONT_MIN = "HeiseiMin-W3";
-        public static final String JAPANESE_ENCODING_H = "UniJIS-UCS2-H";
-        public static final String JAPANESE_ENCODING_V = "UniJIS-UCS2-V";
-        public static final String JAPANESE_ENCODING_HW_H = "UniJIS-UCS2-HW-H";
-        public static final String JAPANESE_ENCODING_HW_V = "UniJIS-UCS2-HW-V";
-
-        public static final String KOREAN_FONT_GO_THIC = "HYGoThic-Medium";
-        public static final String KOREAN_FONT_S_MYEONG_JO = "HYSMyeongJo-Medium";
-        public static final String KOREAN_ENCODING_H = "UniKS-UCS2-H";
-        public static final String KOREAN_ENCODING_V = "UniKS-UCS2-V";
-
-        public static BaseFont defaultFont;
-        private HashMap mapper;
-
-        public static class BaseFontParameters {
-
-            public String fontName;
-            public String encoding;
-            public boolean embedded;
-            public boolean cached;
-            public byte ttfAfm[];
-            public byte pfb[];
-
-            public BaseFontParameters(String fontName) {
-                this.fontName = fontName;
-                encoding = BaseFont.IDENTITY_H;
-                embedded = true;
-                cached = true;
-            }
-
-            /**
-             * toString方法
-             *
-             * @return 对象说明
-             */
-            public String toString() {
-                return "{fontName:" + fontName + ",encoding:" + encoding + ",embedded:" + embedded + ",cached:" + cached;
-            }
-        }
-
-        public MyFontMapper() {
-            mapper = new HashMap();
-        }
-
-        /**
-         * 转化字体
-         *
-         * @param font awt字体
-         * @return pdf字体
-         */
-        public BaseFont awtToPdf(Font font) {
-            try {
-                BaseFontParameters p = getBaseFontParameters(font.getFontName());
-
-   				/*
-   											 * alex:不明真相
-   											 * 经测试,Arial粗体在getFontName返回的是Arial Bold,可以在上面的方法中得到对应的p
-   											 * 所以getFontName是有用的
-   											 * 但是在linux上测试,宋体在getFontName返回的却是Dialog这种逻辑字体,只有getName才返回SimSun
-   											 * 所以还需要getBaseFontParameters一下
-   											 */
-                if (p == null) {
-                    p = getBaseFontParameters(font.getName());
-                }
-
-                if (p != null) {
-                    return BaseFont.createFont(p.fontName, p.encoding, p.embedded, p.cached, p.ttfAfm, p.pfb);
-                } else {
-                    //				FRContext.getLogger().info(Inter.getLocText("Utils-Font_Not_Found") + ":" + font.getFontName());
-
-                    // alex:未找到合适的字体,如果有默认字体,用之,没有的话,根据Bold & Italic设置字体
-                    if (defaultFont != null) {
-                        return defaultFont;
-                    } else {
-                        String fontKey = BaseFont.COURIER;
-                        if (font.isBold() && font.isItalic()) {
-                            fontKey = BaseFont.COURIER_BOLDOBLIQUE;
-                        } else if (font.isBold()) {
-                            fontKey = BaseFont.COURIER_BOLD;
-                        } else if (font.isItalic()) {
-                            fontKey = BaseFont.COURIER_OBLIQUE;
-                        }
-
-                        return BaseFont.createFont(fontKey, BaseFont.CP1252, BaseFont.NOT_EMBEDDED);
-                    }
-                }
-            } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
-                throw new ExceptionConverter(e);
-            }
-        }
-
-        /**
-         * 转化字体
-         *
-         * @param font pdf字体
-         * @param size 大小
-         * @return 转化后awt字体
-         */
-        public Font pdfToAwt(BaseFont font, int size) {
-            String[][] names = font.getFullFontName();
-            if (names.length == 1) {
-                return new Font(names[0][3], 0, size);
-            }
-            String name10 = null;
-            String name3x = null;
-            for (int k = 0; k < names.length; ++k) {
-                String[] name = names[k];
-                if (ComparatorUtils.equals(name[0], "1") && ComparatorUtils.equals(name[1], "0")) {
-                    name10 = name[3];
-                } else if (ComparatorUtils.equals(name[2], "1033")) {
-                    name3x = name[3];
-                    break;
-                }
-            }
-            String finalName = name3x;
-            if (finalName == null) {
-                finalName = name10;
-            }
-            if (finalName == null) {
-                finalName = names[0][3];
-            }
-            return new Font(finalName, 0, size);
-        }
-
-        private BaseFontParameters getBaseFontParameters(String name) {
-            return (BaseFontParameters) mapper.get(name);
-        }
-
-        protected void insertNames(String names[][], String path) {
-            String main = null;
-            int k = 0;
-            do {
-                if (k >= names.length) {
-                    break;
-                }
-                String[] name = names[k];
-                if (ComparatorUtils.equals(name[2], "1033")) {
-                    main = name[3];
-                    break;
-                }
-                k++;
-            } while (true);
-            if (main == null) {
-                main = names[0][3];
-            }
-            BaseFontParameters p = new BaseFontParameters(path);
-
-            // alex:不一样的名字可能对应同样的BaseFontParameters,比如simsun和宋体都对应同样的p
-            mapper.put(main, p);
-            for (k = 0; k < names.length; k++) {
-                mapper.put(names[k][3], p);
-            }
-        }
-
-        /**
-         * 插入目录里的字体
-         *
-         * @param dir 目录
-         * @return 插入数量
-         */
-        public int insertDirectory(String dir) {
-            File file = new File(dir);
-            if (!file.exists() || !file.isDirectory()) {
-                return 0;
-            }
-
-            File[] files = file.listFiles();
-            int count = 0;
-            for (int k = 0; k < files.length; k++) {
-                file = files[k];
-                String name = file.getPath().toLowerCase();
-                try {
-                    if (matchPostfix(name)) {
-                        String[][] names = BaseFont.getFullFontName(file.getPath(), BaseFont.CP1252, null);
-                        insertNames(names, file.getPath());
-                        count++;
-                    } else if (name.endsWith(".ttc")) {
-                        String[] ttcs = BaseFont.enumerateTTCNames(file.getPath());
-                        for (int j = 0; j < ttcs.length; j++) {
-                            String nt = String.valueOf(new StringBuffer(file.getPath()).append(',').append(j));
-                            String[][] names = BaseFont.getFullFontName(nt, BaseFont.CP1252, null);
-                            insertNames(names, nt);
-                        }
-
-                        count++;
-                    }
-                } catch (Exception exception) {
-                    FRContext.getLogger().error(exception.getMessage(), exception);
-                }
-            }
-
-            return count;
-        }
-
-        private boolean matchPostfix(String name) {
-            return name.endsWith(".ttf") || name.endsWith(".otf") || name.endsWith(".afm");
-        }
-    }
-}

designer_chart/src/com/fr/design/module/ChartDesignerModule.java

@@ -1 +1 @@
-package com.fr.design.module;

import com.fr.chart.base.ChartInternationalNameContentBean;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.ChartCollection;
import com.fr.chart.charttypes.ChartTypeManager;
import com.fr.design.ChartTypeInterfaceManager;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.chart.ChartDialog;
import com.fr.design.chart.gui.ChartComponent;
import com.fr.design.chart.gui.ChartWidgetOption;
import com.fr.design.gui.core.WidgetOption;
import com.fr.design.mainframe.App;
import com.fr.design.mainframe.ChartAndWidgetPropertyPane;
import com.fr.design.mainframe.ChartPropertyPane;
import com.fr.form.ui.ChartEditor;
import com.fr.general.IOUtils;
import com.fr.general.Inter;
import com.fr.stable.bridge.StableFactory;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;

import javax.swing.*;

/**
 * Created by IntelliJ IDEA.
 * Author : Richer
 * Version: 7.0.3
 * Date: 13-7-8
 * Time: 上午9:13
 */
public class ChartDesignerModule extends DesignModule {
    public void start() {
        super.start();
        dealBeforeRegister();
        register();
        registerFloatEditor();
    }

    protected void dealBeforeRegister(){
        StableFactory.registerMarkedClass(ExtraChartDesignClassManagerProvider.XML_TAG, ChartTypeInterfaceManager.class);
        StableFactory.getStaticMarkedInstanceObjectFromClass(ExtraChartDesignClassManagerProvider.XML_TAG, ExtraChartDesignClassManagerProvider.class);
    }

    private void register(){
        DesignModuleFactory.registerHyperlinkGroupType(new ChartHyperlinkGroup());

        DesignModuleFactory.registerChartEditorClass(ChartEditor.class);
        DesignModuleFactory.registerChartComponentClass(ChartComponent.class);

        DesignModuleFactory.registerChartDialogClass(ChartDialog.class);

        DesignModuleFactory.registerChartAndWidgetPropertyPane(ChartAndWidgetPropertyPane.class);
        DesignModuleFactory.registerChartPropertyPaneClass(ChartPropertyPane.class);

        ActionFactory.registerChartPreStyleAction(new ChartPreStyleAction());
    }

    protected void registerFloatEditor() {
        ActionFactory.registerChartCollection(ChartCollection.class);
    }

    /**
     * 返回设计器能打开的模板类型的一个数组列表
     *
     * @return 可以打开的模板类型的数组
     */
    public App<?>[] apps4TemplateOpener() {
        return new App[0];
    }
    protected WidgetOption[] options4Show() {
        ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames();
        ChartWidgetOption[] child = new ChartWidgetOption[typeName.length];
        for (int i = 0; i < typeName.length; i++) {
            String plotID = typeName[i].getPlotID();
            Chart[] rowChart = ChartTypeManager.getInstance().getChartTypes(plotID);
            if(rowChart == null) {
                continue;
            }
            String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(plotID);
            Icon icon = IOUtils.readIcon(iconPath);
            child[i] = new ChartWidgetOption(Inter.getLocText(typeName[i].getName()), icon, ChartEditor.class, rowChart[0]);
        }
        return child;
    }

    public String getInterNationalName() {
        return Inter.getLocText("FR-Chart-Design_ChartModule");
    }


}
+package com.fr.design.module;

import com.fr.chart.base.ChartInternationalNameContentBean;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.ChartCollection;
import com.fr.chart.charttypes.ChartTypeManager;
import com.fr.design.ChartTypeInterfaceManager;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.chart.ChartDialog;
import com.fr.design.chart.gui.ChartComponent;
import com.fr.design.chart.gui.ChartWidgetOption;
import com.fr.design.gui.core.WidgetOption;
import com.fr.design.mainframe.App;
import com.fr.design.mainframe.ChartPropertyPane;
import com.fr.form.ui.ChartEditor;
import com.fr.general.IOUtils;
import com.fr.general.Inter;
import com.fr.stable.bridge.StableFactory;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;

import javax.swing.*;

/**
 * Created by IntelliJ IDEA.
 * Author : Richer
 * Version: 7.0.3
 * Date: 13-7-8
 * Time: 上午9:13
 */
public class ChartDesignerModule extends DesignModule {
    public void start() {
        super.start();
        dealBeforeRegister();
        register();
        registerFloatEditor();
    }

    protected void dealBeforeRegister(){
        StableFactory.registerMarkedClass(ExtraChartDesignClassManagerProvider.XML_TAG, ChartTypeInterfaceManager.class);
        StableFactory.getStaticMarkedInstanceObjectFromClass(ExtraChartDesignClassManagerProvider.XML_TAG, ExtraChartDesignClassManagerProvider.class);
    }

    private void register(){
        DesignModuleFactory.registerHyperlinkGroupType(new ChartHyperlinkGroup());

        DesignModuleFactory.registerChartEditorClass(ChartEditor.class);
        DesignModuleFactory.registerChartComponentClass(ChartComponent.class);

        DesignModuleFactory.registerChartDialogClass(ChartDialog.class);

        DesignModuleFactory.registerChartPropertyPaneClass(ChartPropertyPane.class);

        ActionFactory.registerChartPreStyleAction(new ChartPreStyleAction());
    }

    protected void registerFloatEditor() {
        ActionFactory.registerChartCollection(ChartCollection.class);
    }

    /**
     * 返回设计器能打开的模板类型的一个数组列表
     *
     * @return 可以打开的模板类型的数组
     */
    public App<?>[] apps4TemplateOpener() {
        return new App[0];
    }
    protected WidgetOption[] options4Show() {
        ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames();
        ChartWidgetOption[] child = new ChartWidgetOption[typeName.length];
        for (int i = 0; i < typeName.length; i++) {
            String plotID = typeName[i].getPlotID();
            Chart[] rowChart = ChartTypeManager.getInstance().getChartTypes(plotID);
            if(rowChart == null) {
                continue;
            }
            String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(plotID);
            Icon icon = IOUtils.readIcon(iconPath);
            child[i] = new ChartWidgetOption(Inter.getLocText(typeName[i].getName()), icon, ChartEditor.class, rowChart[0]);
        }
        return child;
    }

    public String getInterNationalName() {
        return Inter.getLocText("FR-Chart-Design_ChartModule");
    }


}

designer_chart/src/com/fr/design/module/ChartStartModule.java

@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2001-2014,FineReport Inc, All Rights Reserved.
- */
-
-package com.fr.design.module;
-
-import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
-import com.fr.base.io.XMLEncryptUtils;
-import com.fr.chart.base.ChartInternationalNameContentBean;
-import com.fr.chart.chartattr.Chart;
-import com.fr.chart.charttypes.ChartTypeManager;
-import com.fr.chart.module.ChartModule;
-import com.fr.design.DesignerEnvManager;
-import com.fr.design.chart.gui.ChartWidgetOption;
-import com.fr.design.gui.core.WidgetOption;
-import com.fr.design.mainframe.*;
-import com.fr.file.FILE;
-import com.fr.form.ui.ChartBook;
-import com.fr.form.ui.ChartEditor;
-import com.fr.general.Inter;
-import com.fr.general.ModuleContext;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-13
- * Time: 下午2:56
- */
-public class ChartStartModule extends ChartDesignerModule {
-
-    protected void dealBeforeRegister(){
-        ModuleContext.startModule(ChartModule.class.getName());
-    }
-
-    protected void registerFloatEditor() {
-
-    }
-
-    protected WidgetOption[] options4Show() {
-   		ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames();
-   		ChartWidgetOption[] child = new ChartWidgetOption[typeName.length];
-   		for (int i = 0; i < typeName.length; i++) {
-   			Chart[] rowChart = ChartTypeManager.getInstance().getChartTypes(typeName[i].getPlotID());
-   			child[i] = new ChartWidgetOption(Inter.getLocText(typeName[i].getName()), BaseUtils
-   					.readIcon("com/fr/design/images/form/toolbar/" + typeName[i].getName() + ".png"),
-   					ChartEditor.class, rowChart[0]);
-   		}
-   		return child;
-   	}
-
-    /**
-     * 应用打开器
-     * @return 应用
-     */
-    public App<?>[] apps4TemplateOpener() {
-        return new App[]{new AbstractAppProvider<ChartBook>() {
-
-            @Override
-            public String[] defaultExtentions() {
-                return new String[]{"crt"};
-            }
-
-            @Override
-            public JTemplate<ChartBook, ?> openTemplate(FILE tplFile) {
-                return new JChart(asIOFile(tplFile), tplFile);
-            }
-
-            @Override
-            public ChartBook asIOFile(FILE file) {
-                if (XMLEncryptUtils.isCptEncoded() &&
-                        !XMLEncryptUtils.checkVaild(DesignerEnvManager.getEnvManager().getEncryptionKey())) {
-                    if (!new DecodeDialog(file).isPwdRight()) {
-                        FRContext.getLogger().error(Inter.getLocText("FR-Chart-Password_Error"));
-                        return new ChartBook();
-                    }
-                }
-
-
-                ChartBook tpl = new ChartBook();
-                //打开通知
-                FRContext.getLogger().info(Inter.getLocText(new String[]{"LOG-Is_Being_Openned", "LOG-Please_Wait"},
-                        new String[]{"\"" + file.getName() + "\"" + ",", "..."}));
-                try {
-                    tpl.readStream(file.asInputStream());
-                } catch (Exception exp) {
-                    FRContext.getLogger().error("Failed to generate frm from " + file, exp);
-                    return null;
-                }
-                return tpl;
-            }
-        }};
-    }
-}

designer_chart/src/com/fr/start/ChartSplashPane.java

@@ -1,18 +0,0 @@
-package com.fr.start;
-
-import java.awt.Image;
-
-import com.fr.base.BaseUtils;
-
-public class ChartSplashPane extends SplashPane{
-
-	/**
-	 * 创建启动画面的背景图片
-	 * 
-	 * @return 背景图片
-	 * 
-	 */
-	public Image createSplashBackground() {
-		return BaseUtils.readImage("/com/fr/design/images/splash4Chart.png");
-	}
-}

designer_chart/src/com/fr/start/Designer4Chart.java

@@ -1,406 +0,0 @@
-/*
- * Copyright (c) 2001-2014,FineReport Inc, All Rights Reserved.
- */
-
-package com.fr.start;
-
-import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
-import com.fr.design.DesignerEnvManager;
-import com.fr.design.actions.file.WebPreviewUtils;
-import com.fr.design.actions.help.AboutAction;
-import com.fr.design.constants.UIConstants;
-import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.file.MutilTempalteTabPane;
-import com.fr.design.file.NewTemplatePane;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.itoolbar.UILargeToolbar;
-import com.fr.design.mainframe.*;
-import com.fr.design.mainframe.actions.*;
-import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
-import com.fr.design.menu.*;
-import com.fr.design.module.ChartStartModule;
-import com.fr.general.FRFont;
-import com.fr.general.Inter;
-import com.fr.general.web.ParameterConsts;
-import com.fr.stable.Constants;
-
-import javax.swing.*;
-import javax.swing.border.MatteBorder;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : daisy
- * Version: 6.5.6
- * Date: 14-10-13
- * Time: 上午11:02
- */
-public class Designer4Chart extends BaseDesigner {
-    private static final int TOOLBAR_HEIGHT = 53;
-   	private static final int TOOLBAR_WIDTH =60+34+7+1+7 ;
-    private static final int GAP = 7;
-    private static final int EAST_WIDTH = 292;
-    private static final int MESSAGEPORT = 51460;
-    private UIButton saveButton;
-    private UIButton undo;
-    private UIButton redo;
-    private UIButton run;
-    private UIButton copy;
-
-    /**
-     * 主函数
-     *
-     * @param args 入口参数
-     */
-    public static void main(String[] args) {
-        new Designer4Chart(args);
-    }
-
-    public Designer4Chart(String[] args) {
-        super(args);
-    }
-
-    @Override
-    protected String module2Start() {
-        EastRegionContainerPane.getInstance().setDownPaneVisible(false);
-        EastRegionContainerPane.getInstance().setContainerWidth(EAST_WIDTH);
-        return ChartStartModule.class.getName();
-    }
-
-    protected void initLanguage() {
-        //这两句的位置不能随便调换，因为会影响语言切换的问题
-        FRContext.setLanguage(Constants.LANGUAGE_ENGLISH);
-    }
-
-    protected void initDefaultFont(){
-        FRContext.getDefaultValues().setFRFont(FRFont.getInstance("Meiryo", Font.PLAIN, 9));
-    }
-
-    /**
-     * build得路径
-     * @return  build得路径
-     */
-    public String buildPropertiesPath() {
-        return "/com/fr/chart/base/build.properties";
-    }
-
-    /**
-     * 创建文件菜单项
-     * @return 菜单项
-     */
-    public ShortCut[] createNewFileShortCuts() {
-        ArrayList<ShortCut> shortCuts = new ArrayList<ShortCut>();
-        shortCuts.add(new NewChartAction());
-        return shortCuts.toArray(new ShortCut[shortCuts.size()]);
-    }
-
-    /**
-     * 创建新模版
-     * @return 模版
-     */
-    public JTemplate<?, ?> createNewTemplate() {
-        return new JChart();
-    }
-
-    protected void resetToolTips(){
-        copy.setToolTipText(Inter.getLocText("FR-Chart-Action_Copy")+"JS");
-        run.setToolTipText(PREVIEW.getMenuKeySetName());
-    }
-
-    /**
-     * 创建设计器上几个比较大的图标：新建cpt，保存，前进，后退，运行。
-     *
-     * @return 返回大图标对应的工具栏
-     */
-    public UILargeToolbar createLargeToolbar() {
-
-        UILargeToolbar largeToolbar = new UILargeToolbar(FlowLayout.LEFT){
-            public Dimension getPreferredSize() {
-           		return new Dimension(TOOLBAR_WIDTH ,TOOLBAR_HEIGHT);
-           	}
-        };
-        largeToolbar.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 4));
-        largeToolbar.add(new JPanel() {
-            public Dimension getPreferredSize() {
-                Dimension dim = super.getPreferredSize();
-                dim.width = 1;
-                return dim;
-            }
-        });
-        createRunButton();
-        largeToolbar.add(run);
-        largeToolbar.add(new JPanel() {
-            public Dimension getPreferredSize() {
-                Dimension dim = super.getPreferredSize();
-                dim.width = GAP;
-                return dim;
-            }
-        });
-        largeToolbar.addSeparator(new Dimension(2, 42));
-        largeToolbar.add(new JPanel() {
-            public Dimension getPreferredSize() {
-                Dimension dim = super.getPreferredSize();
-                dim.width = GAP;
-                return dim;
-            }
-        });
-        createCopyButton();
-        largeToolbar.add(copy);
-        largeToolbar.add(new JPanel() {
-              public Dimension getPreferredSize() {
-                  Dimension dim = super.getPreferredSize();
-                  dim.width = GAP;
-                  return dim;
-              }
-          });
-        largeToolbar.addSeparator(new Dimension(2, 42));
-
-        largeToolbar.setBorder(new MatteBorder(new Insets(0, 0, 1, 0), UIConstants.LINE_COLOR));
-        return largeToolbar;
-    }
-
-    protected int getStartPort(){
-        return MESSAGEPORT;
-    }
-
-    protected DesignerFrame createDesignerFrame(){
-
-        return new DesignerFrame4Chart(this);
-    }
-
-    /**
-     * 创建上面一排的工具栏按钮
-     *
-     * @return 按钮
-     */
-    public UIButton[] createUp() {
-        return new UIButton[]{createSaveButton(), createUndoButton(), createRedoButton()};
-    }
-
-    private UIButton createRunButton() {
-        run = new UIButton(BaseUtils.readIcon("com/fr/design/images/buttonicon/pageb24.png")) {
-                    public Dimension getPreferredSize() {
-                        return new Dimension(34, 43);
-                    }
-                };
-        run.setToolTipText(PREVIEW.getMenuKeySetName());
-        run.set4ChartLargeToolButton();
-        run.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-                if (jt == null) {
-                    return;
-                }
-                onChartPreview(jt);
-            }
-        });
-        return run;
-    }
-
-    public static void onChartPreview(JTemplate<?, ?> jt) {
-        WebPreviewUtils.actionPerformed(jt, null, ParameterConsts.CHARTLET);
-    }
-
-    public static final MenuKeySet PREVIEW = new MenuKeySet() {
-        @Override
-        public char getMnemonic() {
-            return 'P';
-        }
-
-        @Override
-        public String getMenuName() {
-            return Inter.getLocText("FR-Chart-Template_Preview");
-        }
-
-        @Override
-        public KeyStroke getKeyStroke() {
-            return KeyStroke.getKeyStroke(KeyEvent.VK_P, InputEvent.CTRL_MASK);
-        }
-    };
-
-
-    private UIButton createCopyButton(){
-        copy = new UIButton(BaseUtils.readIcon("com/fr/design/images/copyjs.png")) {
-            public Dimension getPreferredSize() {
-                return new Dimension(34, 43);
-            }
-        };
-        copy.setToolTipText(Inter.getLocText("FR-Chart-Action_Copy")+"JS");
-        copy.set4ChartLargeToolButton();
-        copy.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-                if (jt == null) {
-                    return;
-                }
-                DesignerContext.getDesignerFrame().refreshToolbar();
-
-              	jt.stopEditing();
-              	if (!jt.isSaved() && !jt.saveTemplate2Env()) {
-              		return;
-              	}
-                //复制代码
-                jt.copyJS();
-            }
-        });
-        return copy;
-    }
-
-    private UIButton createSaveButton() {
-        saveButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/save.png"));
-        saveButton.setToolTipText(KeySetUtils.SAVE_TEMPLATE.getMenuKeySetName());
-        saveButton.set4ToolbarButton();
-        saveButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-                jt.stopEditing();
-                jt.saveTemplate();
-                jt.requestFocus();
-            }
-        });
-        return saveButton;
-    }
-
-    private UIButton createUndoButton() {
-        undo = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/undo.png"));
-        undo.setToolTipText(KeySetUtils.UNDO.getMenuKeySetName());
-        undo.set4ToolbarButton();
-        undo.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-                if (jt != null) {
-                    jt.undo();
-                }
-            }
-        });
-        return undo;
-    }
-
-    private UIButton createRedoButton() {
-        redo = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/redo.png"));
-        redo.setToolTipText(KeySetUtils.REDO.getMenuKeySetName());
-        redo.set4ToolbarButton();
-        redo.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-                if (jt != null) {
-                    jt.redo();
-                }
-            }
-        });
-        return redo;
-    }
-
-    /**
-     * 重置工具条
-     * @param toolbarComponent 工具栏
-     * @param plus             对象
-     * @return   工具条对象
-     */
-    public JComponent resetToolBar(JComponent toolbarComponent, ToolBarMenuDockPlus plus) {
-        return plus.toolBar4Authority();
-    }
-
-    public NewTemplatePane getNewTemplatePane(){
-       return new NewTemplatePane() {
-           @Override
-           public Icon getNew() {
-               return BaseUtils.readIcon("/com/fr/design/images/newchart_normal.png");
-           }
-
-           @Override
-           public Icon getMouseOverNew() {
-               return BaseUtils.readIcon("/com/fr/design/images/newchart_over.png");
-           }
-
-           @Override
-           public Icon getMousePressNew() {
-               return BaseUtils.readIcon("/com/fr/design/images/newchart_press.png");
-           }
-       };
-    };
-
-    @Override
-    protected void refreshLargeToolbarState() {
-        JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-        if (jt == null) {
-            return;
-        }
-        saveButton.setEnabled(!jt.isSaved());
-        MutilTempalteTabPane.getInstance().refreshOpenedTemplate(HistoryTemplateListPane.getInstance().getHistoryList());
-        MutilTempalteTabPane.getInstance().repaint();
-        if (DesignerEnvManager.getEnvManager().isSupportUndo()) {
-            undo.setEnabled(jt.canUndo());
-            redo.setEnabled(jt.canRedo());
-        } else {
-            undo.setEnabled(false);
-            redo.setEnabled(false);
-        }
-    }
-
-    protected SplashPane createSplashPane() {
-        return new ChartSplashPane();
-    }
-
-    /**
-     *更新工具栏
-     */
-    public void updateToolBarDef() {
-        refreshLargeToolbarState();
-    }
-
-    protected void addCloseCurrentTemplateAction(MenuDef menuDef) {
-
-    }
-
-    protected void addPreferenceAction(MenuDef menuDef) {
-
-    }
-
-    protected void addSwitchExistEnvAction(MenuDef menuDef) {
-
-    }
-
-    @Override
-    public MenuDef[] createTemplateShortCuts(ToolBarMenuDockPlus plus) {
-        MenuDef menuDef = new MenuDef(KeySetUtils.EXPORT_CHART.getMenuKeySetName(), KeySetUtils.EXPORT_CHART.getMnemonic());
-        menuDef.addShortCut(plus.shortcut4ExportMenu());
-        return new MenuDef[] {menuDef};
-    }
-
-    /**
-     * 创建帮助菜单得菜单项
-     * @return 菜单项
-     */
-    public ShortCut[] createHelpShortCuts() {
-        resetToolTips();
-        return new ShortCut[]{
-                new ChartWebAction(),
-                SeparatorDef.DEFAULT,
-                new ChartFeedBackAciton(),
-                SeparatorDef.DEFAULT,
-                new UpdateOnlineAction(),
-                new AboutAction()
-        };
-    }
-
-    protected ShortCut openTemplateAction(){
-        return new OpenChartAction();
-    }
-
-    protected String[] startFileSuffix(){
-        return new String[]{".crt"};
-    }
-
-}

designer_form/src/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java

@@ -308,19 +308,23 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
      * @param y 坐标y
      */
     public void fix(XCreator creator ,int x, int y) {
+		int height = creator.getHeight();
+		int width = creator.getWidth();
     	if (x < 0) {
+			width += x;
 			x = 0;
 		} else if (x + creator.getWidth() > container.getWidth()) {
-			x = container.getWidth() - creator.getWidth();
+			width = container.getWidth() - x;
 		}
 
 		if (y < 0) {
+			height += y;
 			y = 0;
 		} else if (y + creator.getHeight() > container.getHeight()) {
-			y = container.getHeight() - creator.getHeight();
+			height = container.getHeight() - y;
 		}
 
-		creator.setLocation(x, y);
+		creator.setBounds(x, y, width, height);
     }
 
     @Override

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

@@ -86,7 +86,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
                 new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
                         .getLocText("Form-Widget_Name")),
                 new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
-                        WLayoutBorderStyleEditor.class).setRendererClass(LayoutBorderStyleRenderer.class).setI18NName(
+                        WLayoutBorderStyleEditor.class).setI18NName(
                         Inter.getLocText("Chart-Style_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
                         .setPropertyChangeListener(new PropertyChangeAdapter() {
 

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

@@ -601,4 +601,20 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		}
 
 	}
+
+	/**
+	 * 按照比例调整组件的宽度
+	 * @param percent 比例
+	 */
+	public void adjustCompWidth(double percent){
+		return;
+	}
+
+	/**
+	 * 按照比例调整组件的高度
+	 * @param percent 比例
+	 */
+	public void adjustCompHeight(double percent) {
+		return;
+	}
 }

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

@@ -282,12 +282,12 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 	 * @param e 点击事件
 	 */
 	public void respondClick(EditingMouseListener editingMouseListener,MouseEvent e){
+		HelpDialogManager.getInstance().setPane(coverPanel);
 		super.respondClick(editingMouseListener, e);
 		if (this.isHelpBtnOnFocus()) {
 			coverPanel.setMsgDisplay(e);
-		}else {
-			coverPanel.destroyHelpDialog();
-			switchTab(e,editingMouseListener);
+		} else {
+			switchTab(e, editingMouseListener);
 		}
 	}
 

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

@@ -66,7 +66,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
                 new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
                         .getLocText("FR-Designer_Form-Widget_Name")),
                 new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
-                        WLayoutBorderStyleEditor.class).setRendererClass(LayoutBorderStyleRenderer.class).setI18NName(
+                        WLayoutBorderStyleEditor.class).setI18NName(
                         Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
                         .setPropertyChangeListener(new PropertyChangeAdapter() {
 
@@ -76,7 +76,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
                             }
                         }),
                 new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
-                        .setRendererClass(PaddingMarginCellRenderer.class).setI18NName(Inter.getLocText("FR-Designer_Layout-Padding"))
+                        .setI18NName(Inter.getLocText("FR-Designer_Layout-Padding"))
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                     };
 	}

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

@@ -2,9 +2,19 @@ package com.fr.design.designer.creator;
 
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRAbsoluteBodyLayoutAdapter;
+import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
+import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
+import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
+import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer;
+import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.container.WAbsoluteBodyLayout;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.Inter;
+import com.fr.stable.core.PropertyChangeAdapter;
 
 import java.awt.*;
+import java.beans.IntrospectionException;
 
 /**
  * Created by zhouping on 2016/10/14.
@@ -42,4 +52,43 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
     public void setEditable(boolean isEditable) {
         super.setEditable(true);
     }
+
+    /**
+     * 该组件是否可以拖拽(表单中绝对布局不可以拖拽)
+     *
+     * @return 是则返回true
+     */
+    @Override
+    public boolean isSupportDrag() {
+        return false;
+    }
+
+    /**
+     * 得到属性名
+     *
+     * @return 属性名
+     * @throws java.beans.IntrospectionException
+     */
+    @Override
+    public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+        return  new CRPropertyDescriptor[] {
+                new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
+                        .getLocText("FR-Designer_Form-Widget_Name")),
+                new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
+                        WLayoutBorderStyleEditor.class).setRendererClass(LayoutBorderStyleRenderer.class).setI18NName(
+                        Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
+                        .setPropertyChangeListener(new PropertyChangeAdapter() {
+
+                            @Override
+                            public void propertyChange() {
+                                initStyle();
+                            }
+                        })
+        };
+    }
+
+    @Override
+    protected void initStyle() {
+        initBorderStyle();
+    }
 }

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

@@ -444,4 +444,36 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 			}
 		}
 	}
+
+	/**
+	 * body大小手动调整的时候
+	 * 按照比例调整组件的宽度
+	 * @param percent 比例
+	 */
+	@Override
+	public void adjustCompWidth(double percent) {
+		for (int i = 0; i < getComponentCount(); i++) {
+			XCreator xCreator = (XCreator) getComponent(i);
+			Rectangle rectangle = xCreator.getBounds();
+			xCreator.setBounds((int) (rectangle.x * percent), rectangle.y, (int) (rectangle.width * percent), rectangle.height);
+			BoundsWidget widget = toData().getBoundsWidget(xCreator.toData());
+			widget.setBounds(xCreator.getBounds());
+		}
+	}
+
+	/**
+	 * body大小手动调整的时候
+	 * 按照比例调整组件的高度
+	 * @param percent 比例
+	 */
+	@Override
+	public void adjustCompHeight(double percent) {
+		for (int i = 0; i < getComponentCount(); i++) {
+			XCreator xCreator = (XCreator) getComponent(i);
+			Rectangle rectangle = xCreator.getBounds();
+			xCreator.setBounds(rectangle.x, (int) (rectangle.y * percent), rectangle.width, (int) (rectangle.height * percent));
+			BoundsWidget widget = toData().getBoundsWidget(xCreator.toData());
+			widget.setBounds(xCreator.getBounds());
+		}
+	}
 }

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

@@ -381,6 +381,7 @@ public class XWFitLayout extends XLayoutContainer {
 				needAddWidth = Math.max(needAddWidth, MIN_WIDTH-width);
 			}
 		}
+		creator.adjustCompWidth((double) creator.getBounds().width / rec.width);
 		toData().setBounds(creator.toData(), creator.getBounds());
 	}
 	
@@ -504,6 +505,7 @@ public class XWFitLayout extends XLayoutContainer {
 				needAddHeight = Math.max(needAddHeight, MIN_HEIGHT-h);
 			}
 		}
+		creator.adjustCompHeight((double) creator.getBounds().height / rec.height);
 		toData().setBounds(creator.toData(), creator.getBounds());
 	}
 	

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

@@ -283,7 +283,7 @@ public class XWCardLayout extends XLayoutContainer {
                     	   }
                        }),
                new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
-            		   CardTagWLayoutBorderStyleEditor.class).setRendererClass(LayoutBorderStyleRenderer.class).setI18NName(
+            		   CardTagWLayoutBorderStyleEditor.class).setI18NName(
                        Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
                        .setPropertyChangeListener(new PropertyChangeAdapter() {
 

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

@@ -64,7 +64,7 @@ public class XWTabFitLayout extends XWFitLayout {
 				new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
 					        .getLocText("FR-Designer_Form-Widget_Name")),
                 new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
-                       .setRendererClass(PaddingMarginCellRenderer.class).setI18NName(Inter.getLocText("FR-Designer_Layout-Padding"))
+                       .setI18NName(Inter.getLocText("FR-Designer_Layout-Padding"))
                        .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                     };
 	}

designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java

@@ -9,6 +9,7 @@ import com.fr.design.mainframe.widget.editors.LayoutTypeEditor;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WBodyLayoutType;
+import com.fr.general.FRLogger;
 import com.fr.general.FRScreen;
 import com.fr.general.Inter;
 
@@ -92,46 +93,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
             } else {
                 if (row == 0) {
                     if (state == WBodyLayoutType.FIT.getTypeValue()) {
-                        XWFitLayout xfl = (XWFitLayout) xwAbsoluteLayout.getBackupParent();
-                        //备份一下组件间隔
-                        int compInterval = xfl.toData().getCompInterval();
-                        Component[] components = xwAbsoluteLayout.getComponents();
-
-                        Arrays.sort(components, new ComparatorComponentLocation());
-
-                        xfl.getLayoutAdapter().removeBean(xwAbsoluteLayout, xwAbsoluteLayout.getWidth(), xwAbsoluteLayout.getHeight());
-                        xfl.remove(xwAbsoluteLayout);
-
-                        for (Component comp : components) {
-                            XCreator xCreator = (XCreator)comp;
-                            if (xCreator.shouldScaleCreator()){
-                                XLayoutContainer parentPanel = xCreator.initCreatorWrapper(xCreator.getHeight());
-                                xfl.add(parentPanel, xCreator.toData().getWidgetName());
-                                parentPanel.updateChildBound(xfl.getActualMinHeight());
-                                continue;
-                            }
-                            xfl.add(xCreator);
-                        }
-                        //这边计算的时候会先把组件间隔去掉
-                        moveComponents2FitLayout(xfl);
-                        FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-                        formDesigner.getSelectionModel().setSelectedCreator(xfl);
-
-                        for (int i = 0; i < components.length; i++) {
-                            Component comp = xfl.getComponent(i);
-                            XCreator creator = (XCreator) comp;
-                            creator.setBackupBound(components[i].getBounds());
-                        }
-
-                        //把组件间隔加上
-                        if (xfl.toData().getCompInterval() != compInterval) {
-                            xfl.moveContainerMargin();
-                            xfl.moveCompInterval(xfl.getAcualInterval());
-                            xfl.toData().setCompInterval(compInterval);
-                            xfl.addCompInterval(xfl.getAcualInterval());
-                        }
-                        xfl.toData().setLayoutType(WBodyLayoutType.FIT);
-                        return true;
+                        return switch2FitBodyLayout();
                     }
                 }
                 if (row == 1) {
@@ -166,7 +128,57 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
         return true;
     }
 
-    //把绝对布局中的元素按规则移动到自适应布局中
+    private boolean switch2FitBodyLayout() {
+        try {
+            XWFitLayout xfl = (XWFitLayout) xwAbsoluteLayout.getBackupParent();
+            //备份一下组件间隔
+            int compInterval = xfl.toData().getCompInterval();
+            Component[] components = xwAbsoluteLayout.getComponents();
+
+            Arrays.sort(components, new ComparatorComponentLocation());
+
+            xfl.getLayoutAdapter().removeBean(xwAbsoluteLayout, xwAbsoluteLayout.getWidth(), xwAbsoluteLayout.getHeight());
+            xfl.remove(xwAbsoluteLayout);
+
+            for (Component comp : components) {
+                XCreator xCreator = (XCreator) comp;
+                if (xCreator.shouldScaleCreator()) {
+                    XLayoutContainer parentPanel = xCreator.initCreatorWrapper(xCreator.getHeight());
+                    xfl.add(parentPanel, xCreator.toData().getWidgetName());
+                    parentPanel.updateChildBound(xfl.getActualMinHeight());
+                    continue;
+                }
+                xfl.add(xCreator);
+            }
+            //这边计算的时候会先把组件间隔去掉
+            moveComponents2FitLayout(xfl);
+            FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+            formDesigner.getSelectionModel().setSelectedCreator(xfl);
+
+            for (int i = 0; i < components.length; i++) {
+                Component comp = xfl.getComponent(i);
+                XCreator creator = (XCreator) comp;
+                creator.setBackupBound(components[i].getBounds());
+            }
+
+            //把组件间隔加上
+            if (xfl.toData().getCompInterval() != compInterval) {
+                xfl.moveContainerMargin();
+                xfl.moveCompInterval(xfl.getAcualInterval());
+                xfl.toData().setCompInterval(compInterval);
+                xfl.addCompInterval(xfl.getAcualInterval());
+            }
+            xfl.toData().setLayoutType(WBodyLayoutType.FIT);
+            return true;
+        }
+        catch (Exception e){
+            FRLogger.getLogger().error(e.getMessage());
+            return false;
+        }
+    }
+
+    // 把绝对布局中的元素按规则移动到自适应布局中
+    // 规则：各元素按顺序放置，其中每行最多4个元素，超出则换行，各元素均分body的高度和宽度
     private void moveComponents2FitLayout(XWFitLayout xwFitLayout) {
         int eachRowCount = 4;
         Component[] components = xwFitLayout.getComponents();

designer_form/src/com/fr/design/designer/properties/FRFitLayoutConstraints.java

@@ -1,10 +1,18 @@
 package com.fr.design.designer.properties;
 
+import com.fr.design.designer.beans.AdapterBus;
+import com.fr.design.designer.beans.adapters.layout.FRFitLayoutAdapter;
+import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor;
 import com.fr.design.mainframe.widget.editors.PropertyCellEditor;
 import com.fr.design.designer.beans.ConstraintsGroupModel;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XWFitLayout;
+import com.fr.design.utils.ComponentUtils;
+import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.general.Inter;
 
@@ -23,6 +31,7 @@ import java.awt.*;
 //控件在自适应布局中宽度、高度属性，7.1.1不可编辑
 public class FRFitLayoutConstraints implements ConstraintsGroupModel {
     private static final int MINHEIGHT = XCreator.SMALL_PREFERRED_SIZE.height;
+    private static final int MINWIDTH = XCreator.SMALL_PREFERRED_SIZE.width;
     private static final int ROWNUM = 2;
 
     private DefaultTableCellRenderer renderer;
@@ -80,12 +89,18 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel {
     public boolean setValue(Object value, int row, int column) {
         if (column == 1) {
             int v = value == null ? 0 : ((Number) value).intValue();
-            Rectangle bounds = new Rectangle(xCreator.getBounds());
+            int difference =  0;
+            Rectangle bounds = getBounds();
             switch (row) {
                 case 0:
+                    if(v < MINWIDTH){
+                        JOptionPane.showMessageDialog(null, Inter.getLocText("Min-Width") + Integer.toString(MINWIDTH));
+                        v = xCreator.getWidth();
+                    }
                     if (bounds.width == v){
                         return false;
                     }
+                    difference = bounds.width - v;
                     bounds.width = v;
                     break;
                 case 1:
@@ -96,25 +111,44 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel {
                     if (bounds.height == v){
                         return false;
                     }
+                    difference = bounds.height - v;
                     bounds.height = v;
                     break;
             }
             WFitLayout wFitLayout = parent.toData();
             wFitLayout.setBounds(xCreator.toData(),bounds);
-            xCreator.setBounds(bounds);
-
+            FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+            Rectangle backupBounds = getBounds();
+            FRFitLayoutAdapter layoutAdapter = (FRFitLayoutAdapter) AdapterBus.searchLayoutAdapter(formDesigner, xCreator);
+            if (layoutAdapter != null) {
+                layoutAdapter.calculateBounds(backupBounds, bounds, xCreator, row, difference);
+            }
             return true;
         } else {
             return false;
         }
     }
 
+    public Rectangle getBounds(){
+        Rectangle bounds = new Rectangle(xCreator.getBounds());
+        XLayoutContainer parent = XCreatorUtils.getParentXLayoutContainer(xCreator);
+        if (parent == null) {
+            return bounds;
+        }
+        Rectangle rec = ComponentUtils.getRelativeBounds(parent);
+        bounds.x += rec.x;
+        bounds.y += rec.y;
+        return bounds;
+
+    }
+
     /**
      * 该行是否可编辑
      * @param row  行
      * @return 第row行可编辑返回true，否则返回false
      */
     public boolean isEditable(int row) {
-        return false;
+        return true;
     }
+
 }

designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java

@@ -17,6 +17,7 @@ import com.fr.form.ui.container.WAbsoluteBodyLayout;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WBodyLayoutType;
 import com.fr.form.ui.container.WFitLayout;
+import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 
 import javax.swing.table.DefaultTableCellRenderer;
@@ -145,34 +146,38 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel {
 				layout.setCompState(state);
 				return true;
 			}else if (row == 0) {
-				layout.setLayoutType(WBodyLayoutType.parse(state));
-				if (state == WBodyLayoutType.ABSOLUTE.getTypeValue()) {
-					WAbsoluteBodyLayout wAbsoluteBodyLayout = new WAbsoluteBodyLayout("body");
-					wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED);
-					Component[] components = xfl.getComponents();
-					xfl.removeAll();
-					XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0,0));
-					xfl.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0);
-					for (Component component : components) {
-						XCreator xCreator = (XCreator)component;
-						//部分控件被ScaleLayout包裹着，绝对布局里面要放出来
-						if (xCreator.acceptType(XWScaleLayout.class)){
-							if (xCreator.getComponentCount() > 0 && ((XCreator)xCreator.getComponent(0)).shouldScaleCreator()) {
-								component = xCreator.getComponent(0);
-								component.setBounds(xCreator.getBounds());
+				try {
+					if (state == WBodyLayoutType.ABSOLUTE.getTypeValue()) {
+						WAbsoluteBodyLayout wAbsoluteBodyLayout = new WAbsoluteBodyLayout("body");
+						wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED);
+						Component[] components = xfl.getComponents();
+						xfl.removeAll();
+						XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0, 0));
+						xfl.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0);
+						for (Component component : components) {
+							XCreator xCreator = (XCreator) component;
+							//部分控件被ScaleLayout包裹着，绝对布局里面要放出来
+							if (xCreator.acceptType(XWScaleLayout.class)) {
+								if (xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator()) {
+									component = xCreator.getComponent(0);
+									component.setBounds(xCreator.getBounds());
+								}
 							}
+							xwAbsoluteBodyLayout.add(component);
 						}
-						xwAbsoluteBodyLayout.add(component);
+						FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+						formDesigner.getSelectionModel().setSelectedCreators(
+								FormSelectionUtils.rebuildSelection(xfl, new Widget[]{wAbsoluteBodyLayout}));
+					} else {
+						FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+						formDesigner.getSelectionModel().setSelectedCreators(
+								FormSelectionUtils.rebuildSelection(xfl, new Widget[]{xfl.toData()}));
 					}
-					FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-					formDesigner.getSelectionModel().setSelectedCreators(
-							FormSelectionUtils.rebuildSelection(xfl, new Widget[]{wAbsoluteBodyLayout}));
-				}
-				else {
-					FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-					formDesigner.getSelectionModel().setSelectedCreators(
-							FormSelectionUtils.rebuildSelection(xfl, new Widget[]{xfl.toData()}));
+				}catch (Exception e){
+					FRLogger.getLogger().error(e.getMessage());
+					return false;
 				}
+				layout.setLayoutType(WBodyLayoutType.parse(state));
 				return true;
 			}
 			return false;

designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java

@@ -21,6 +21,7 @@ import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardLayout;
+import com.fr.general.ComparatorUtils;
 
 public class WidgetPropertyTable extends AbstractPropertyTable {
 
@@ -71,7 +72,7 @@ public class WidgetPropertyTable extends AbstractPropertyTable {
 		if (size == 0 || size == 1) {
 			XCreator creator = size == 0 ? designer.getRootComponent() : designer.getSelectionModel().getSelection()
 					.getSelectedCreator();
-			if (designer.isRoot(creator)) {
+			if (ComparatorUtils.equals(creator, designer.getRootComponent())) {
 				groups = designer.getDesignerMode().createRootDesignerPropertyGroup();
 			} else {
 				groups = getCreatorPropertyGroup(designer, creator);