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

* commit '8e3037c1550fae261033c6a37ac8b4eea4aedd82':
  决策报表编辑报表块报错
  QuickEditor 内存释放问题和内存激增问题
  优先处理内存释放问题
  格式化JavaScript代码+登录接口
  REPORT-5668 单元格元素与悬浮元素图表配置问题
  REPORT-5692 [9.0三轮回归] 查询按钮改名字后，不会立即在设计器改变名字

designer/src/com/fr/design/dscolumn/DSColumnBasicPane.java

@@ -14,8 +14,9 @@ import com.fr.report.cell.CellElement;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.cell.cellattr.CellExpandAttr;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -27,6 +28,29 @@ public class DSColumnBasicPane extends BasicPane {
     private ExpandDirectionPane expandDirectionPane;
     private CellElement cellElement;
 
+    private ActionListener summaryDirectionActionlistener = new ActionListener() {
+
+        public void actionPerformed(ActionEvent evt) {
+            if (expandDirectionPane != null) {
+                expandDirectionPane.setNoneRadioButtonSelected(true);
+            }
+        }
+    };
+    private ActionListener othergroupDirectionActionlistener = new ActionListener() {
+
+        public void actionPerformed(ActionEvent evt) {
+            if (expandDirectionPane != null) {
+                expandDirectionPane.setNoneRadioButtonSelected(false);
+            }
+        }
+    };
+    private ActionListener sdcupdateActionlistener = new ActionListener() {
+
+        public void actionPerformed(ActionEvent evt) {
+            selectDataColumnPane.update(cellElement);
+        }
+    };
+
     public DSColumnBasicPane() {
         this(DSColumnPane.SETTING_ALL);
     }
@@ -78,7 +102,7 @@ public class DSColumnBasicPane extends BasicPane {
 
         this.add(TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize), BorderLayout.CENTER);
 
-        this.resultSetGroupPane.addListeners(summary_direction_ActionListener, otherGroup_direction_ActionListener, sdcUpdate_ActionListener);
+        this.resultSetGroupPane.addListeners(summaryDirectionActionlistener, othergroupDirectionActionlistener, sdcupdateActionlistener);
     }
 
     @Override
@@ -93,7 +117,7 @@ public class DSColumnBasicPane extends BasicPane {
 
         this.cellElement = cellElement;
 
-        selectDataColumnPane.populate(source, cellElement);
+        selectDataColumnPane.populate(source, cellElement, null);
 
         CellExpandAttr cellExpandAttr = cellElement.getCellExpandAttr();
         if (conditionParentPane != null) {
@@ -134,29 +158,6 @@ public class DSColumnBasicPane extends BasicPane {
         resultSetGroupPane.update();
     }
 
-    ActionListener summary_direction_ActionListener = new ActionListener() {
-
-        public void actionPerformed(ActionEvent evt) {
-            if (expandDirectionPane != null) {
-                expandDirectionPane.setNoneRadioButtonSelected(true);
-            }
-        }
-    };
-    ActionListener otherGroup_direction_ActionListener = new ActionListener() {
-
-        public void actionPerformed(ActionEvent evt) {
-            if (expandDirectionPane != null) {
-                expandDirectionPane.setNoneRadioButtonSelected(false);
-            }
-        }
-    };
-    ActionListener sdcUpdate_ActionListener = new ActionListener() {
-
-        public void actionPerformed(ActionEvent evt) {
-            selectDataColumnPane.update(cellElement);
-        }
-    };
-
     public void putElementcase(ElementCasePane t) {
         if (conditionParentPane != null) {
             conditionParentPane.putElementcase(t);

designer/src/com/fr/design/dscolumn/SelectedConfirmedDataColumnPane.java

@@ -6,7 +6,7 @@ import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
 import com.fr.main.impl.WorkBook;
 import com.fr.report.cell.TemplateCellElement;
 
-import java.awt.*;
+import java.awt.Dimension;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.Iterator;
@@ -32,7 +32,7 @@ public class SelectedConfirmedDataColumnPane extends SelectedDataColumnPane {
         tableNameComboBox.refresh(source);
         tableNameComboBox.setEditable(false);
         tableNameComboBox.setEnabled(false);
-        super.populate(source, cell);
+        super.populate(source, cell, null);
         try {
             Iterator it = source.getTableDataNameIterator();
             String name = (String) it.next();

designer/src/com/fr/design/dscolumn/SelectedDataColumnPane.java

@@ -26,8 +26,11 @@ import com.fr.report.cell.cellattr.core.group.DSColumn;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.DefaultComboBoxModel;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
@@ -53,19 +56,20 @@ public class SelectedDataColumnPane extends BasicPane {
     private ItemListener itemListener;
 
     private UIButton paramButton;
+    private ElementCasePane casePane;
 
     public SelectedDataColumnPane() {
-        this(true, false, null, null);
+        this(true, false, null);
     }
 
 
     public SelectedDataColumnPane(boolean showParameterButton) {
-        this(showParameterButton, false, null, null);
+        this(showParameterButton, false, null);
     }
 
-    public SelectedDataColumnPane(boolean showParameterButton, boolean verticalLayout, ElementCasePane casePane, TemplateCellElement cellElement) {
+    public SelectedDataColumnPane(boolean showParameterButton, boolean verticalLayout, TemplateCellElement cellElement) {
         if (verticalLayout) {
-            initComponentVerticalLayout(casePane, cellElement);
+            initComponentVerticalLayout(cellElement);
         } else {
             initComponent(showParameterButton);
         }
@@ -119,9 +123,9 @@ public class SelectedDataColumnPane extends BasicPane {
     /**
      * 初始化竖直布局的组件
      */
-    public void initComponentVerticalLayout(ElementCasePane casePane, TemplateCellElement cellElement) {
+    private void initComponentVerticalLayout(TemplateCellElement cellElement) {
         initTableNameComboBox();
-        initWithParameterButton(casePane, cellElement);
+        initWithParameterButton(cellElement);
         columnNameComboBox = new LazyComboBox() {
             @Override
             public Object[] load() {
@@ -149,7 +153,9 @@ public class SelectedDataColumnPane extends BasicPane {
     }
 
 
-    public void populate(TableDataSource source, TemplateCellElement cellElement) {
+    public void populate(TableDataSource source, TemplateCellElement cellElement, ElementCasePane casePane) {
+        tableNameComboBox.refresh(source);
+        this.casePane = casePane;
         if (cellElement == null) {
             return;
         }
@@ -191,6 +197,14 @@ public class SelectedDataColumnPane extends BasicPane {
         dsColumn.setParameters((ps != null && ps.length > 0) ? ps : null);
     }
 
+    /**
+     * 释放模板对象
+     */
+    public void release() {
+        this.casePane = null;
+        this.tableNameComboBox.setModel(new DefaultComboBoxModel());
+    }
+
     /**
      * 更新面板
      *
@@ -279,8 +293,7 @@ public class SelectedDataColumnPane extends BasicPane {
         });
     }
 
-    private void initWithParameterButton(final ElementCasePane casePane, final TemplateCellElement cellElement) {
+    private void initWithParameterButton(final TemplateCellElement cellElement) {
-        final SelectedDataColumnPane that = this;
         editorPane = new UITableEditorPane<ParameterProvider>(new ParameterTableModel());
         paramButton = new UIButton(Inter.getLocText("FR-Designer-Basic_Dynamic_Parameter_Injection"));
         paramButton.addActionListener(new ActionListener() {
@@ -290,7 +303,7 @@ public class SelectedDataColumnPane extends BasicPane {
                     public void doOk() {
                         List<ParameterProvider> parameterList = editorPane.update();
                         ps = parameterList.toArray(new Parameter[parameterList.size()]);
-                        that.update(cellElement);
+                        update(cellElement);
                         casePane.fireTargetModified();
                     }
                 });

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

@@ -3,7 +3,13 @@
  */
 package com.fr.design.mainframe;
 
-import com.fr.base.*;
+import com.fr.base.BaseFormula;
+import com.fr.base.BaseUtils;
+import com.fr.base.DynamicUnitList;
+import com.fr.base.FRContext;
+import com.fr.base.Formula;
+import com.fr.base.ScreenResolution;
+import com.fr.base.Style;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
@@ -12,8 +18,30 @@ import com.fr.design.actions.ExitAuthorityEditAction;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.cell.BorderAction;
 import com.fr.design.actions.cell.CleanAuthorityAction;
-import com.fr.design.actions.cell.style.*;
+import com.fr.design.actions.cell.style.AlignmentAction;
-import com.fr.design.actions.columnrow.*;
+import com.fr.design.actions.cell.style.ReportFontBoldAction;
+import com.fr.design.actions.cell.style.ReportFontForegroundAction;
+import com.fr.design.actions.cell.style.ReportFontItalicAction;
+import com.fr.design.actions.cell.style.ReportFontNameAction;
+import com.fr.design.actions.cell.style.ReportFontSizeAction;
+import com.fr.design.actions.cell.style.ReportFontUnderlineAction;
+import com.fr.design.actions.cell.style.StyleBackgroundAction;
+import com.fr.design.actions.columnrow.CancelColumnAction;
+import com.fr.design.actions.columnrow.CancelRowAction;
+import com.fr.design.actions.columnrow.ColumnHideAction;
+import com.fr.design.actions.columnrow.ColumnWidthAction;
+import com.fr.design.actions.columnrow.DeleteColumnAction;
+import com.fr.design.actions.columnrow.DeleteRowAction;
+import com.fr.design.actions.columnrow.FootColumnAction;
+import com.fr.design.actions.columnrow.FootRowAction;
+import com.fr.design.actions.columnrow.HeadColumnAction;
+import com.fr.design.actions.columnrow.HeadRowAction;
+import com.fr.design.actions.columnrow.InsertColumnAction;
+import com.fr.design.actions.columnrow.InsertRowAction;
+import com.fr.design.actions.columnrow.ResetColumnHideAction;
+import com.fr.design.actions.columnrow.ResetRowHideAction;
+import com.fr.design.actions.columnrow.RowHeightAction;
+import com.fr.design.actions.columnrow.RowHideAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.edit.CopyAction;
 import com.fr.design.actions.edit.CutAction;
@@ -24,8 +52,17 @@ import com.fr.design.cell.bar.DynamicScrollBar;
 import com.fr.design.cell.clipboard.CellElementsClip;
 import com.fr.design.cell.clipboard.ElementsTransferable;
 import com.fr.design.cell.clipboard.FloatElementsClip;
-import com.fr.design.cell.editor.*;
+import com.fr.design.cell.editor.BiasTextPainterCellEditor;
 import com.fr.design.cell.editor.CellEditor;
+import com.fr.design.cell.editor.ChartCellEditor;
+import com.fr.design.cell.editor.ChartFloatEditor;
+import com.fr.design.cell.editor.DSColumnCellEditor;
+import com.fr.design.cell.editor.FormulaCellEditor;
+import com.fr.design.cell.editor.FormulaFloatEditor;
+import com.fr.design.cell.editor.ImageCellEditor;
+import com.fr.design.cell.editor.ImageFloatEditor;
+import com.fr.design.cell.editor.RichTextCellEditor;
+import com.fr.design.cell.editor.SubReportCellEditor;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.EditingState;
 import com.fr.design.designer.TargetComponent;
@@ -35,7 +72,11 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.cell.QuickEditorRegion;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
-import com.fr.design.menu.*;
+import com.fr.design.menu.KeySetUtils;
+import com.fr.design.menu.MenuDef;
+import com.fr.design.menu.NameSeparator;
+import com.fr.design.menu.ShortCut;
+import com.fr.design.menu.ToolBarDef;
 import com.fr.design.selection.QuickEditor;
 import com.fr.design.selection.Selectedable;
 import com.fr.design.selection.SelectionEvent;
@@ -43,7 +84,11 @@ import com.fr.design.selection.SelectionListener;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
-import com.fr.grid.*;
+import com.fr.grid.Grid;
+import com.fr.grid.GridColumn;
+import com.fr.grid.GridCorner;
+import com.fr.grid.GridRow;
+import com.fr.grid.GridUtils;
 import com.fr.grid.dnd.ElementCasePaneDropTarget;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.Selection;
@@ -65,12 +110,27 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.ColumnRow;
 import com.fr.stable.unit.FU;
 
-import javax.swing.*;
+import javax.swing.AbstractAction;
-import java.awt.*;
+import javax.swing.ActionMap;
+import javax.swing.InputMap;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollBar;
+import javax.swing.KeyStroke;
+import java.awt.AWTEvent;
+import java.awt.Adjustable;
+import java.awt.Dimension;
+import java.awt.Image;
+import java.awt.Rectangle;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.lang.reflect.Constructor;
 import java.util.Set;
 
@@ -462,6 +522,13 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
      *  因为这边判断selection是一个selection，所以不会触发fireSelectionChanged
      */
     public void setSelection(Selection selection) {
+        try {
+            //旧选中内容编辑器释放模板对象
+            this.getCurrentEditor().release();
+        } catch (UnsupportedOperationException e) {
+            FRLogger.getLogger().info("Nothing to release");
+        }
+
         if (!ComparatorUtils.equals(this.selection, selection) ||
                 !ComparatorUtils.equals(EastRegionContainerPane.getInstance().getCellAttrPane(), CellElementPropertyPane.getInstance())) {
             this.selection = selection;

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

@@ -127,10 +127,9 @@ public class ReportComponentComposite extends JComponent {
                 templateStateList.add(null);
             }
             centerCardPane.editingComponet.setSelection(centerCardPane.editingComponet.getDefaultSelectElement());
-            if (jSliderContainer != null){
+            jSliderContainer=JSliderPane.getInstance();
             jSliderContainer.reset();
         }
-        }
 
         if (centerCardPane.editingComponet.elementCasePane == null) {
             centerCardPane.getPolyDezi().polyArea.addMouseWheelListener(showValSpinnerMouseWheelListener);

designer/src/com/fr/design/mainframe/cell/AbstractDSCellEditorPane.java

@@ -120,4 +120,9 @@ public abstract class AbstractDSCellEditorPane extends JPanel {
         scrollBar.setBlockIncrement(SCROLLBAR_WIDTH + CONTENT_PANE_WIDTH_GAP);
         scrollBar.setBorder(BorderFactory.createMatteBorder(0, CONTENT_PANE_WIDTH_GAP, 0, 0, this.getBackground()));
     }
+
+    /**
+     * 释放tc
+     */
+    protected abstract void release();
 }

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

@@ -140,7 +140,6 @@ public class DesignerModule extends DesignModule {
      * kunsnat:注册单元格选中Editor
      */
     private void registerCellEditor() {
-
         ActionFactory.registerCellEditor(String.class, new CellStringQuickEditor());
         ActionFactory.registerCellEditor(Number.class, new CellStringQuickEditor());
         ActionFactory.registerCellEditor(BaseFormula.class, new CellFormulaQuickEditor());
@@ -150,9 +149,8 @@ public class DesignerModule extends DesignModule {
         ActionFactory.registerCellEditor(Image.class, new CellImageQuickEditor());
         ActionFactory.registerCellEditor(BiasTextPainter.class, new CellBiasTextPainterEditor());
         ActionFactory.registerCellEditor(BufferedImage.class, new CellImageQuickEditor());
-
+        //todo 图表编辑器populate没能实现刷新面板显示
-        ActionFactory.registerChartCellEditorInEditor(new BasicChartQuickEditor());
+        ActionFactory.registerChartCellEditorInEditor(BasicChartQuickEditor.class);
-
         Set<ElementUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ElementUIProvider.MARK_STRING);
         for (ElementUIProvider provider : providers) {
             try {
@@ -178,8 +176,8 @@ public class DesignerModule extends DesignModule {
         ActionFactory.registerFloatEditor(Formula.class, new FloatStringQuickEditor());
         ActionFactory.registerFloatEditor(Image.class, new FloatImageQuickEditor());
         ActionFactory.registerFloatEditor(BufferedImage.class, new FloatImageQuickEditor());
-
+        //todo 图表编辑器populate没能实现刷新面板显示
-        ActionFactory.registerChartFloatEditorInEditor(new FloatChartQuickEditor());
+        ActionFactory.registerChartFloatEditorInEditor(FloatChartQuickEditor.class);
     }
 
     /**

designer/src/com/fr/grid/selection/CellSelection.java

@@ -49,8 +49,9 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.unit.FU;
 
-import javax.swing.*;
+import javax.swing.JOptionPane;
-import java.awt.*;
+import javax.swing.SwingUtilities;
+import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -114,6 +115,7 @@ public class CellSelection extends Selection {
 
     /**
      * 增加选中的区域
+     *
      * @param cellRectangle 区域
      */
     public void addCellRectangle(Rectangle cellRectangle) {
@@ -164,6 +166,7 @@ public class CellSelection extends Selection {
 
     /**
      * 清除区域块
+     *
      * @param i 区域块
      */
     public void clearCellRectangles(int i) {
@@ -172,6 +175,7 @@ public class CellSelection extends Selection {
 
     /**
      * 包含单元格
+     *
      * @param column 列
      * @param row    行
      * @return 若不包含返回-1
@@ -205,6 +209,7 @@ public class CellSelection extends Selection {
 
     /**
      * 转换成矩形
+     *
      * @return 矩形
      */
     public Rectangle toRectangle() {
@@ -213,6 +218,7 @@ public class CellSelection extends Selection {
 
     /**
      * 是否选择一个单元格
+     *
      * @param ePane 区域
      * @return 是则返回rue
      */
@@ -239,6 +245,7 @@ public class CellSelection extends Selection {
 
     /**
      * 作为可传输的
+     *
      * @param transferable 传输介质
      * @param ePane        区域
      */
@@ -251,12 +258,12 @@ public class CellSelection extends Selection {
             TemplateCellElement cellElement = (TemplateCellElement) cells.next();
             list.add((TemplateCellElement) cellElement.deriveCellElement(cellElement.getColumn() - column, cellElement.getRow() - row));
         }
-        FU [] columnWidth = new FU[columnSpan];
+        FU[] columnWidth = new FU[columnSpan];
-        FU [] rowHeight = new FU[rowSpan];
+        FU[] rowHeight = new FU[rowSpan];
-        for (int i = 0; i < columnSpan; i++){
+        for (int i = 0; i < columnSpan; i++) {
             columnWidth[i] = ec.getColumnWidth(this.column + i);
         }
-        for (int j = 0; j < rowSpan; j++){
+        for (int j = 0; j < rowSpan; j++) {
             rowHeight[j] = ec.getRowHeight(this.row + j);
         }
         transferable.addObject(new CellElementsClip(this.columnSpan, this.rowSpan, columnWidth, rowHeight, list.toArray(new TemplateCellElement[list.size()])));
@@ -264,6 +271,7 @@ public class CellSelection extends Selection {
 
     /**
      * 黏贴单元格
+     *
      * @param ceClip 单元格
      * @param ePane  区域
      * @return 成功返回true
@@ -281,6 +289,7 @@ public class CellSelection extends Selection {
 
     /**
      * 黏贴字符串
+     *
      * @param str   字符串
      * @param ePane 区域
      * @return 成功返回true
@@ -329,6 +338,7 @@ public class CellSelection extends Selection {
 
     /**
      * 黏贴其他
+     *
      * @param ob    要黏贴的东西
      * @param ePane 区域
      * @return 成功返回true
@@ -352,6 +362,7 @@ public class CellSelection extends Selection {
 
     /**
      * 是否能合并单元格
+     *
      * @param ePane 区域
      * @return 是则返回true
      */
@@ -363,6 +374,7 @@ public class CellSelection extends Selection {
 
     /**
      * 合并单元格
+     *
      * @param ePane 区域
      * @return 成功返回true
      */
@@ -386,6 +398,7 @@ public class CellSelection extends Selection {
 
     /**
      * 是否撤销合并单元格
+     *
      * @param ePane 区域
      * @return 是则返回true
      */
@@ -407,6 +420,7 @@ public class CellSelection extends Selection {
 
     /**
      * 撤销合并单元格
+     *
      * @param ePane 区域
      * @return 成功返回true
      */
@@ -443,6 +457,7 @@ public class CellSelection extends Selection {
 
     /**
      * 创建弹出菜单
+     *
      * @param ePane 区域
      * @return 菜单
      */
@@ -477,7 +492,7 @@ public class CellSelection extends Selection {
         popup.add(DeprecatedActionManager.getPresentMenu(ePane).createJMenu());
         popup.add(new CellAttributeAction().createMenuItem());
         JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-        if (jTemplate.isJWorkBook()){ //表单中报表块编辑屏蔽掉  控件设置
+        if (jTemplate.isJWorkBook()) { //表单中报表块编辑屏蔽掉  控件设置
             popup.add(new CellWidgetAttrAction().createMenuItem());
         }
         popup.add(new ConditionAttributesAction().createMenuItem());
@@ -497,6 +512,7 @@ public class CellSelection extends Selection {
 
     /**
      * 清除
+     *
      * @param type  要清除的类型
      * @param ePane 区域
      * @return 成功返回true
@@ -581,6 +597,7 @@ public class CellSelection extends Selection {
 
     /**
      * 向左移动
+     *
      * @param ePane 区域
      */
     public void moveLeft(ElementCasePane ePane) {
@@ -592,6 +609,7 @@ public class CellSelection extends Selection {
 
     /**
      * 向右移动
+     *
      * @param ePane 区域
      */
     public void moveRight(ElementCasePane ePane) {
@@ -600,6 +618,7 @@ public class CellSelection extends Selection {
 
     /**
      * 向上移动
+     *
      * @param ePane 区域
      */
     public void moveUp(ElementCasePane ePane) {
@@ -611,6 +630,7 @@ public class CellSelection extends Selection {
 
     /**
      * 向下移动
+     *
      * @param ePane 区域
      */
     public void moveDown(ElementCasePane ePane) {
@@ -626,6 +646,7 @@ public class CellSelection extends Selection {
 
     /**
      * 触发删除动作
+     *
      * @param ePane 区域
      * @return 成功返回true
      */
@@ -657,6 +678,7 @@ public class CellSelection extends Selection {
 
     /**
      * 包含行列
+     *
      * @param cr 行列
      * @return 包含返回true
      */
@@ -716,7 +738,7 @@ public class CellSelection extends Selection {
         CellElementPropertyPane.getInstance().reInit(ePane);
     }
 
-    public void populateWidgetPropertyPane(ElementCasePane ePane){
+    public void populateWidgetPropertyPane(ElementCasePane ePane) {
         CellWidgetPropertyPane.getInstance().reInit(ePane);
     }
 

designer/src/com/fr/grid/selection/FloatSelection.java

@@ -1,34 +1,40 @@
 package com.fr.grid.selection;
 
-import java.awt.Toolkit;
-
-import javax.swing.JPopupMenu;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.design.actions.cell.CleanAuthorityAction;
 import com.fr.design.actions.cell.FloatStyleAction;
 import com.fr.design.actions.core.ActionFactory;
-import com.fr.design.actions.edit.*;
+import com.fr.design.actions.edit.CopyAction;
+import com.fr.design.actions.edit.CutAction;
+import com.fr.design.actions.edit.DeleteAction;
+import com.fr.design.actions.edit.EditFloatElementNameAction;
+import com.fr.design.actions.edit.HyperlinkAction;
+import com.fr.design.actions.edit.PasteAction;
 import com.fr.design.actions.utils.DeprecatedActionManager;
 import com.fr.design.cell.clipboard.CellElementsClip;
 import com.fr.design.cell.clipboard.ElementsTransferable;
 import com.fr.design.cell.clipboard.FloatElementsClip;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.mainframe.CellElementPropertyPane;
-import com.fr.general.ComparatorUtils;
-import com.fr.general.Inter;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.mainframe.ElementCasePane.Clear;
+import com.fr.design.selection.QuickEditor;
+import com.fr.design.utils.DesignUtils;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.Inter;
 import com.fr.report.cell.FloatElement;
 import com.fr.report.elementcase.TemplateElementCase;
-import com.fr.design.selection.QuickEditor;
 import com.fr.stable.ColumnRow;
 import com.fr.stable.unit.FU;
 import com.fr.stable.unit.OLDPIX;
-import com.fr.design.utils.DesignUtils;
+
+import javax.swing.JPopupMenu;
+import java.awt.Toolkit;
+
 /**
  * the float selection
+ *
  * @editor zhou
  * 2012-3-22下午2:09:20
  */
@@ -209,6 +215,7 @@ public class FloatSelection extends Selection {
     public boolean isSelectedOneCell(ElementCasePane ePane) {
         return false;
     }
+
     //TODO:august 这儿不比较FloatElement会不会有问题啊
     @Override
     public boolean equals(Object obj) {
@@ -232,8 +239,8 @@ public class FloatSelection extends Selection {
         CellElementPropertyPane.getInstance().removeAll();
     }
 
-    public void populateWidgetPropertyPane(ElementCasePane ePane){
+    public void populateWidgetPropertyPane(ElementCasePane ePane) {
-        return;
+
     }
 
 }

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

@@ -1,12 +1,11 @@
 package com.fr.quickeditor;
 
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.selection.QuickEditor;
 import com.fr.grid.selection.FloatSelection;
 import com.fr.report.cell.FloatElement;
-import com.fr.design.selection.QuickEditor;
 
 /**
- * 
  * @author zhou
  * @since 2012-7-23下午5:17:23
  */
@@ -15,10 +14,19 @@ public abstract class FloatQuickEditor extends QuickEditor<ElementCasePane> {
 
     @Override
     protected void refresh() {
-		FloatSelection fs = (FloatSelection)tc.getSelection();
+        FloatSelection fs = (FloatSelection) tc.getSelection();
         floatElement = tc.getEditingElementCase().getFloatElement(fs.getSelectedFloatName());
         refreshDetails();
     }
 
+    /**
+     * 刷新详细信息
+     */
     protected abstract void refreshDetails();
+
+    @Override
+    public void release() {
+        super.release();
+        floatElement = null;
+    }
 }

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

@@ -141,17 +141,6 @@ public class CellDSColumnEditor extends CellQuickEditor {
     }
 
 
-    /**
-     * 关闭时候释放
-     */
-    @Override
-    public void release() {
-        super.release();
-        dsColumnRegion = null;
-        centerPane = null;
-    }
-
-
     /**
      * 初始化基本和高级设置切换tab
      */
@@ -187,6 +176,12 @@ public class CellDSColumnEditor extends CellQuickEditor {
         paneList.add(cellDSColumnAdvancedPane);
     }
 
+    @Override
+    public void release() {
+        super.release();
+        cellDSColumnBasicPane.release();
+        cellDSColumnAdvancedPane.release();
+    }
 
     /**
      * 单元格元素 数据列 高级设置内容面板
@@ -252,7 +247,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
         };
 
         DSColumnBasicEditorPane() {
-            dataPane = new SelectedDataColumnPane(true, true, tc, cellElement);
+            dataPane = new SelectedDataColumnPane(true, true, cellElement);
             groupPane = new ResultSetGroupDockingPane();
             dataPane.addListener(dataListener);
             groupPane.setListener(groupListener);
@@ -297,13 +292,19 @@ public class CellDSColumnEditor extends CellQuickEditor {
 
         @Override
         public void populate() {
-            dataPane.populate(null, cellElement);
+            dataPane.populate(DesignTableDataManager.getEditingTableDataSource(), cellElement, tc);
             groupPane.populate(cellElement);
             if (tc != null) {
                 condition.setEditingComponent(tc);
             }
         }
 
+        @Override
+        protected void release() {
+            condition.setEditingComponent(null);
+            dataPane.release();
+        }
+
 
         /**
          * 创建有内容的面板显示信息
@@ -434,6 +435,11 @@ public class CellDSColumnEditor extends CellQuickEditor {
             }
         }
 
+        @Override
+        protected void release() {
+
+        }
+
         /**
          * 更新单元格扩展属性
          */

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

@@ -58,4 +58,9 @@ public class CellRichTextEditor extends CellQuickEditor {
         return true;
     }
 
+    @Override
+    public void release() {
+        super.release();
+        richTextButton.setAction(null);
+    }
 }

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

@@ -3,7 +3,6 @@ package com.fr.quickeditor.cellquick;
 import com.fr.base.BaseFormula;
 import com.fr.base.Style;
 import com.fr.base.TextFormat;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextarea.UITextArea;
 import com.fr.grid.GridKeyListener;
 import com.fr.grid.selection.CellSelection;
@@ -18,7 +17,6 @@ import javax.swing.JPanel;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 

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

@@ -56,4 +56,10 @@ public class CellSubReportEditor extends CellQuickEditor {
     public boolean isScrollAll() {
         return true;
     }
+
+    @Override
+    public void release() {
+        super.release();
+        subReportButton.setAction(null);
+    }
 }

designer/src/com/fr/quickeditor/floatquick/FloatImageQuickEditor.java

@@ -12,8 +12,10 @@ import com.fr.general.Inter;
 import com.fr.quickeditor.FloatQuickEditor;
 import com.fr.report.cell.cellattr.CellImage;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -70,8 +72,6 @@ public class FloatImageQuickEditor extends FloatQuickEditor {
 
     @Override
     protected void refreshDetails() {
-        // TODO Auto-generated method stub
-
     }
 
 }

designer/src/com/fr/quickeditor/floatquick/FloatStringQuickEditor.java

@@ -12,10 +12,16 @@ import com.fr.quickeditor.FloatQuickEditor;
 import com.fr.report.ReportHelper;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -27,6 +33,25 @@ public class FloatStringQuickEditor extends FloatQuickEditor {
     private boolean reserveInResult = false;
     private boolean reserveOnWriteOrAnaly = true;
 
+    private DocumentListener documentListener = new DocumentListener() {
+
+        @Override
+        public void insertUpdate(DocumentEvent e) {
+            changeReportPaneCell(stringTextField.getText().trim());
+        }
+
+        @Override
+        public void removeUpdate(DocumentEvent e) {
+            changeReportPaneCell(stringTextField.getText().trim());
+        }
+
+        @Override
+        public void changedUpdate(DocumentEvent e) {
+            changeReportPaneCell(stringTextField.getText().trim());
+        }
+
+    };
+
     public FloatStringQuickEditor() {
         super();
         stringTextField = new JTextArea();
@@ -34,11 +59,17 @@ public class FloatStringQuickEditor extends FloatQuickEditor {
         formulaButton = new UIButton();
         formulaButton.setPreferredSize(new Dimension(25, 23));
         formulaButton.setIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));
+        ActionListener getFormulaActionListener = new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                ((ElementCasePane) HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getCurrentElementCasePane()).getGrid().startEditing();
+            }
+        };
         formulaButton.addActionListener(getFormulaActionListener);
         JPanel pane = new JPanel(new BorderLayout(5, 0));
         pane.add(stringTextField, BorderLayout.CENTER);
         pane.add(formulaButton, BorderLayout.EAST);
-        pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+        pane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
         formulaButton.setVisible(false);
         this.setLayout(new BorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
@@ -55,16 +86,10 @@ public class FloatStringQuickEditor extends FloatQuickEditor {
         stringTextField.setBackground(Color.WHITE);
     }
 
-    ActionListener getFormulaActionListener = new ActionListener() {
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            ((ElementCasePane) HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getCurrentElementCasePane()).getGrid().startEditing();
-        }
-    };
 
     @Override
     protected void refreshDetails() {
-        String str = null;
+        String str;
         Object value = floatElement.getValue();
         if (value == null) {
             str = StringUtils.EMPTY;
@@ -89,26 +114,8 @@ public class FloatStringQuickEditor extends FloatQuickEditor {
         stringTextField.getDocument().addDocumentListener(documentListener);
     }
 
-    DocumentListener documentListener = new DocumentListener() {
-
-        @Override
-        public void insertUpdate(DocumentEvent e) {
-            changeReportPaneCell(stringTextField.getText().trim());
-        }
-
-        @Override
-        public void removeUpdate(DocumentEvent e) {
-            changeReportPaneCell(stringTextField.getText().trim());
-        }
-
-        @Override
-        public void changedUpdate(DocumentEvent e) {
-            changeReportPaneCell(stringTextField.getText().trim());
-        }
 
-    };
+    private void changeReportPaneCell(String tmpText) {
-
-    protected void changeReportPaneCell(String tmpText) {
         if (tmpText != null && (tmpText.length() > 0 && tmpText.charAt(0) == '=')) {
             BaseFormula textFormula = BaseFormula.createFormulaBuilder().build(tmpText);
             textFormula.setReserveInResult(reserveInResult);
@@ -125,5 +132,4 @@ public class FloatStringQuickEditor extends FloatQuickEditor {
         fireTargetModified();
         stringTextField.requestFocus();
     }
-
 }

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

@@ -30,23 +30,47 @@ import java.util.concurrent.ConcurrentMap;
 public class ActionFactory {
     private static LinkedHashSet<Class<?>> actionClasses = new LinkedHashSet<>();
     private static LinkedHashSet<Class<?>> floatActionClasses = new LinkedHashSet<>();
+    private static Class chartCollectionClass = null;
     /**
-     * 悬浮元素编辑器
+     * 无需每次实例化的悬浮元素编辑器
      */
     private static ConcurrentMap<Class, QuickEditor> floatEditor = new ConcurrentHashMap<>();
-    private static Class chartCollectionClass = null;
     /**
-     * 单元格元素编辑器
+     * 无需每次实例化的单元格元素编辑器
      */
     private static ConcurrentMap<Class, QuickEditor> cellEditor = new ConcurrentHashMap<>();
+
+    /**
+     * 需要每次实例化的悬浮元素编辑器
+     */
+    private static ConcurrentMap<Class, Class<? extends QuickEditor>> floatEditorClass = new ConcurrentHashMap<>();
+    /**
+     * 需要每次实例化的单元格元素编辑器
+     */
+    private static ConcurrentMap<Class, Class<? extends QuickEditor>> cellEditorClass = new ConcurrentHashMap<>();
+
     private static UpdateAction chartPreStyleAction = null;
     private static UpdateAction chartMapEditorAction = null;
 
     private ActionFactory() {
     }
 
+
     /**
-     * 注册单元格编辑器
+     * 元素编辑器释放模板对象
+     */
+    public static void editorRelease() {
+        for (Map.Entry<Class, QuickEditor> entry : cellEditor.entrySet()) {
+            entry.getValue().release();
+        }
+        for (Map.Entry<Class, QuickEditor> entry : floatEditor.entrySet()) {
+            entry.getValue().release();
+        }
+    }
+
+
+    /**
+     * 注册无需每次实例化的单元格元素编辑器
      *
      * @param clazz  单元格属性类型
      * @param editor 单元格编辑器实例
@@ -57,7 +81,7 @@ public class ActionFactory {
 
 
     /**
-     * 注册悬浮元素编辑器
+     * 注册无需每次实例化的悬浮元素编辑器
      *
      * @param clazz  悬浮元素类型
      * @param editor 悬浮元素编辑器实例
@@ -66,6 +90,28 @@ public class ActionFactory {
         floatEditor.put(clazz, editor);
     }
 
+    /**
+     * 注册需要每次实例化的单元格元素编辑器
+     *
+     * @param clazz       单元格属性类型
+     * @param editorClass 单元格编辑器类
+     */
+    public static void registerCellEditorClass(Class clazz, Class<? extends QuickEditor> editorClass) {
+        cellEditorClass.put(clazz, editorClass);
+    }
+
+
+    /**
+     * 注册需要每次实例化的悬浮元素编辑器
+     *
+     * @param clazz       悬浮元素类型
+     * @param editorClass 悬浮元素编辑器类
+     */
+    public static void registerFloatEditorClass(Class clazz, Class<? extends QuickEditor> editorClass) {
+        floatEditorClass.put(clazz, editorClass);
+    }
+
+
     /**
      * kunsnat: 图表注册 悬浮元素编辑器 , 因为ChartCollecion和ChartQuickEditor一个在Chart,一个在Designer, 所以分开注册.
      *
@@ -97,22 +143,22 @@ public class ActionFactory {
     /**
      * kunsnat: 图表注册 悬浮元素编辑器 , 因为ChartCollection和ChartQuickEditor一个在Chart,一个在Designer, 所以分开注册.
      *
-     * @param editor 待说明
+     * @param editorClass 悬浮元素图表编辑器类
      */
-    public static void registerChartFloatEditorInEditor(QuickEditor editor) {
+    public static void registerChartFloatEditorInEditor(Class<? extends QuickEditor> editorClass) {
         if (chartCollectionClass != null) {
-            floatEditor.put(chartCollectionClass, editor);
+            registerFloatEditorClass(chartCollectionClass, editorClass);
         }
     }
 
     /**
-     * kunsnat: 图表注册 悬浮元素编辑器 , 因为ChartCollecion和ChartQuickEditor一个在Chart,一个在Designer, 所以分开注册.
+     * kunsnat: 图表注册 单元格元素编辑器 , 因为ChartCollecion和ChartQuickEditor一个在Chart,一个在Designer, 所以分开注册.
      *
-     * @param editor 待说明
+     * @param editorClass 单元格元素图表编辑器类
      */
-    public static void registerChartCellEditorInEditor(QuickEditor editor) {
+    public static void registerChartCellEditorInEditor(Class<? extends QuickEditor> editorClass) {
         if (chartCollectionClass != null) {
-            cellEditor.put(chartCollectionClass, editor);
+            registerCellEditorClass(chartCollectionClass, editorClass);
         }
     }
 
@@ -153,7 +199,7 @@ public class ActionFactory {
      * @return 编辑器实例
      */
     public static QuickEditor getFloatEditor(Class clazz) {
-        return createEditor(clazz, floatEditor);
+        return createEditor(clazz, floatEditor, floatEditorClass);
     }
 
     /**
@@ -163,7 +209,7 @@ public class ActionFactory {
      * @return 编辑器实例
      */
     public static QuickEditor getCellEditor(Class clazz) {
-        return createEditor(clazz, cellEditor);
+        return createEditor(clazz, cellEditor, cellEditorClass);
     }
 
     public static UpdateAction createAction(Class clazz) {
@@ -299,17 +345,40 @@ public class ActionFactory {
         return actions.toArray(new UpdateAction[actions.size()]);
     }
 
-    private static QuickEditor createEditor(Class clazz, Map<Class, QuickEditor> editorMap) {
+    private static QuickEditor createEditor(Class clazz, Map<Class, QuickEditor> editorMap, Map<Class, Class<? extends QuickEditor>> editorClassMap) {
-        QuickEditor c = findQuickEditorClass(clazz, editorMap);
+        QuickEditor c = findQuickEditor(clazz, editorMap);
         if (c == null) {
+            Class<? extends QuickEditor> cClazz = findQuickEditorClass(clazz, editorClassMap);
+            if (cClazz == null) {
                 FRLogger.getLogger().error("No Such Editor");
                 return null;
             }
+            try {
+                Constructor<? extends QuickEditor> constructor = cClazz.getDeclaredConstructor();
+                constructor.setAccessible(true);
+                return constructor.newInstance();
+            } catch (Exception e) {
+                FRContext.getLogger().error(e.getMessage(), e);
+            }
+            return null;
+        }
         return c;
     }
 
-    private static QuickEditor findQuickEditorClass(Class clazz, Map<Class, QuickEditor> editorMap) {
+    private static QuickEditor findQuickEditor(Class clazz, Map<Class, QuickEditor> editorMap) {
         QuickEditor c = editorMap.get(clazz);
+        if (c == null) {
+            Class superClazz = clazz.getSuperclass();
+            if (superClazz == null) {
+                return null;
+            }
+            return findQuickEditor(superClazz, editorMap);
+        }
+        return c;
+    }
+
+    private static Class<? extends QuickEditor> findQuickEditorClass(Class clazz, Map<Class, Class<? extends QuickEditor>> editorMap) {
+        Class<? extends QuickEditor> c = editorMap.get(clazz);
         if (c == null) {
             Class superClazz = clazz.getSuperclass();
             if (superClazz == null) {

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

@@ -3,6 +3,7 @@ package com.fr.design.file;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
+import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIScrollPopUpMenu;
@@ -19,11 +20,38 @@ import com.fr.stable.Constants;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.project.ProjectConstants;
 
-import javax.swing.*;
+import javax.swing.Action;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonModel;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
 import javax.swing.plaf.basic.BasicMenuItemUI;
-import java.awt.*;
+import java.awt.AWTEvent;
-import java.awt.event.*;
+import java.awt.BorderLayout;
-import java.awt.geom.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GradientPaint;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.Toolkit;
+import java.awt.event.AWTEventListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.geom.Arc2D;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Line2D;
+import java.awt.geom.Path2D;
+import java.awt.geom.RoundRectangle2D;
 import java.io.File;
 import java.util.logging.Level;
 
@@ -711,23 +739,12 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
             if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) {
                 specifiedTemplate.saveTemplate();
                 FRLogger.getLogger().log(Level.INFO, Inter.getLocText(new String[]{"Template", "already-saved"}, new String[]{specifiedTemplate.getEditingFILE().getName(), "."}));
-                HistoryTemplateListPane.getInstance().closeSelectedReport(specifiedTemplate);
-                activeTemplate(filename);
-            } else if (returnVal == JOptionPane.NO_OPTION) {
-                //不保存
-                HistoryTemplateListPane.getInstance().closeSelectedReport(specifiedTemplate);
-                activeTemplate(filename);
             }
-            //若是点击取消关闭，则什么都不做
+        }
-        } else {
-            //若是已经保存过了，则关闭即可
         HistoryTemplateListPane.getInstance().closeSelectedReport(specifiedTemplate);
         activeTemplate(filename);
     }
 
-
-    }
-
     /**
      * 关闭模板
      *

designer_base/src/com/fr/design/javascript/JSContentPane.java

@@ -1,17 +1,27 @@
 package com.fr.design.javascript;
 
-import com.fr.design.constants.KeyWords;
 import com.fr.design.DesignerEnvManager;
-import com.fr.design.gui.autocomplete.*;
+import com.fr.design.constants.KeyWords;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.autocomplete.AutoCompletion;
+import com.fr.design.gui.autocomplete.BasicCompletion;
+import com.fr.design.gui.autocomplete.CompletionProvider;
+import com.fr.design.gui.autocomplete.DefaultCompletionProvider;
+import com.fr.design.gui.autocomplete.ShorthandCompletion;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants;
+import com.fr.design.javascript.beautify.JavaScriptFormatHelper;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.dialog.BasicPane;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.IOUtils;
+import com.fr.general.Inter;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 
 public class JSContentPane extends BasicPane {
@@ -24,7 +34,36 @@ public class JSContentPane extends BasicPane {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         funNameLabel = new UILabel();
         this.setFunctionTitle(args);
-		this.add(funNameLabel, BorderLayout.NORTH);
+
+        UILabel label = new UILabel(Inter.getLocText("FR-Designer_Format_JavaScript"), IOUtils.readIcon("com/fr/design/images/edit/format.png"), SwingConstants.LEFT);
+        label.setCursor(new Cursor(Cursor.HAND_CURSOR));
+        label.setToolTipText(Inter.getLocText("FR-Designer_Format_JavaScript"));
+        label.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                new SwingWorker<String, Void>() {
+                    @Override
+                    protected String doInBackground() throws Exception {
+                        return JavaScriptFormatHelper.beautify(contentTextArea.getText());
+                    }
+
+                    @Override
+                    protected void done() {
+                        try {
+                            String text = get();
+                            contentTextArea.setText(text);
+                        } catch (Exception ignore) {
+
+                        }
+                    }
+                }.execute();
+            }
+        });
+
+        this.add(GUICoreUtils.createBorderLayoutPane(
+                funNameLabel, BorderLayout.WEST,
+                label, BorderLayout.EAST
+        ), BorderLayout.NORTH);
 
         contentTextArea = new RSyntaxTextArea();
         contentTextArea.setCloseCurlyBraces(true);
@@ -84,7 +123,7 @@ public class JSContentPane extends BasicPane {
             for (String s : args) {
                 list.add(s);
             }
-			titles = (String[])list.toArray(new String[list.size()]);
+            titles = (String[]) list.toArray(new String[list.size()]);
         }
         setFunctionTitle(titles);
     }

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

@@ -2148,3 +2148,4 @@ FR-Designer_Sheet_Label_Page_Display_Position=
 FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
 FR-Designer_Env_Des_Https=If HTTPS is enabled or the HTTPS configuration (certificate path, HTTPS key) is modified, you must restart the designer to take effect.
+FR-Designer_Format_JavaScript=Format Code

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

@@ -2147,3 +2147,4 @@ FR-Designer_Sheet_Label_Page_Display_Position=
 FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
 FR-Designer_Env_Des_Https=If HTTPS is enabled or the HTTPS configuration (certificate path, HTTPS key) is modified, you must restart the designer to take effect.
+FR-Designer_Format_JavaScript=Format Code

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

@@ -2148,3 +2148,4 @@ FR-Designer_Provide_Choose_All=\u5168\u9078\u629E\u53EF\u80FD
 FR-Designer_Decimal_Places=\u5C0F\u6570\u67A0\u6570:
 FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9
 FR-Designer_Env_Des_Https=
+FR-Designer_Format_JavaScript=Format Code

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

@@ -2148,3 +2148,4 @@ FR-Base-Load_Resource_File=\uB85C\uB529\uAD6C\uC131\uD30C\uC77C
 FR-Designer_Export_Background=
 FR-Designer_Print_Background=
 FR-Designer_Env_Des_Https=
+FR-Designer_Format_JavaScript=Format Code

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

@@ -2148,3 +2148,4 @@ FR-Designer_Sheet_Label_Page_Display_Position=
 FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
 FR-Designer_Env_Des_Https=\u82E5\u542F\u7528https\u6216\u4FEE\u6539https\u914D\u7F6E\uFF08\u8BC1\u4E66\u8DEF\u5F84\u3001https\u79D8\u94A5\uFF09\uFF0C\u5FC5\u987B\u91CD\u542F\u8BBE\u8BA1\u5668\u624D\u80FD\u751F\u6548\u3002
+FR-Designer_Format_JavaScript=\u683C\u5F0F\u5316\u4EE3\u7801

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

@@ -2147,3 +2147,4 @@ FR-Designer_Sheet_Label_Page_Display_Position=
 FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
 FR-Designer_Env_Des_Https=\u82E5\u555F\u7528https\u6216\u4FEE\u6539https\u914D\u7F6E\uFF08\u8B49\u66F8\u8DEF\u5F91\u3001https\u7955\u9470\uFF09\uFF0C\u5FC5\u9808\u91CD\u555F\u8A2D\u8A08\u5668\u624D\u80FD\u751F\u6548\u3002
+FR-Designer_Format_JavaScript=Format Code

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

@@ -10,6 +10,7 @@ import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataTreePane;
@@ -53,9 +54,23 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.image4j.codec.ico.ICODecoder;
 import com.fr.stable.project.ProjectConstants;
 
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JLayeredPane;
+import javax.swing.JMenuBar;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.WindowConstants;
 import javax.swing.border.MatteBorder;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.dnd.DnDConstants;
@@ -749,6 +764,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param jt 添加的模板.
      */
     public void addAndActivateJTemplate(JTemplate<?, ?> jt) {
+        //释放模板对象
+        ActionFactory.editorRelease();
         if (jt == null || jt.getEditingFILE() == null) {
             return;
         }
@@ -765,6 +782,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param jt 模板
      */
     public void activateJTemplate(JTemplate<?, ?> jt) {
+        //释放模板对象
+        ActionFactory.editorRelease();
         if (jt == null || jt.getEditingFILE() == null) {
             return;
         }

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

@@ -14,13 +14,33 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.Inter;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JFormattedTextField;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.text.DefaultFormatterFactory;
 import javax.swing.text.NumberFormatter;
-import java.awt.*;
+import java.awt.BorderLayout;
-import java.awt.event.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseEvent;
 import java.math.BigDecimal;
 
 /**
@@ -51,7 +71,6 @@ public class JFormSliderPane extends JPanel {
     private static final Color BACK_COLOR = new Color(245, 245, 247);
     public int showValue = 100;
     public double resolutionTimes = 1.0;
-    private static JFormSliderPane THIS;
     private UITextField showVal;
     private JSpinner showValSpinner;
     private UISlider slider;
@@ -62,7 +81,7 @@ public class JFormSliderPane extends JPanel {
     private UISliderButton showValButton;
     private UIRadioButton twoHundredButton;
     private UIRadioButton oneHundredButton;
-    private UIRadioButton SevenFiveButton;
+    private UIRadioButton sevenFiveButton;
     private UIRadioButton fiveTenButton;
     private UIRadioButton twoFiveButton;
     private UIRadioButton selfAdaptButton;
@@ -83,7 +102,7 @@ public class JFormSliderPane extends JPanel {
         showValSpinner.setEditor(editor);
         JFormattedTextField textField = ((JSpinner.NumberEditor) showValSpinner.getEditor()).getTextField();
         textField.setEditable(true);
-        DefaultFormatterFactory factory = (DefaultFormatterFactory) textField .getFormatterFactory();
+        DefaultFormatterFactory factory = (DefaultFormatterFactory) textField.getFormatterFactory();
         NumberFormatter formatter = (NumberFormatter) factory.getDefaultFormatter();
         formatter.setAllowsInvalid(false);
 
@@ -91,7 +110,7 @@ public class JFormSliderPane extends JPanel {
         initShowValButton();
         initUIRadioButton();
         initPane();
-        JPanel panel = new JPanel(new FlowLayout(1, 0, 0));
+        JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
         panel.add(downButton);
         panel.add(slider);
         panel.add(upButton);
@@ -100,17 +119,13 @@ public class JFormSliderPane extends JPanel {
         this.add(panel, BorderLayout.NORTH);
     }
 
-    public static final JFormSliderPane getInstance() {
+    public static JFormSliderPane getInstance() {
-//        if (THIS == null) {
+        return new JFormSliderPane();
-//            THIS = new JSliderPane();
-//        }
-        THIS = new JFormSliderPane();
-        return THIS;
     }
 
     private void initSlider() {
-        slider = new UISlider(0, HUNDRED, HALF_HUNDRED){
+        slider = new UISlider(0, HUNDRED, HALF_HUNDRED) {
-            public Point getToolTipLocation(MouseEvent event){
+            public Point getToolTipLocation(MouseEvent event) {
                 return new Point(event.getX(), event.getY() - TOOLTIP_Y);
             }
         };
@@ -123,8 +138,8 @@ public class JFormSliderPane extends JPanel {
     }
 
     private void initShowValSpinner() {
-        showValSpinner = new UIBasicSpinner(new SpinnerNumberModel(HUNDRED, 0, FOUR_HUNDRED, 1)){
+        showValSpinner = new UIBasicSpinner(new SpinnerNumberModel(HUNDRED, 0, FOUR_HUNDRED, 1)) {
-            public Point getToolTipLocation(MouseEvent event){
+            public Point getToolTipLocation(MouseEvent event) {
                 return new Point(event.getX(), event.getY() - TOOLTIP_Y);
             }
         };
@@ -134,16 +149,16 @@ public class JFormSliderPane extends JPanel {
     }
 
     private void initDownUpButton() {
-        downButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalDown20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverDown20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverDown20.png")){
+        downButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalDown20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverDown20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverDown20.png")) {
-            public Point getToolTipLocation(MouseEvent event){
+            public Point getToolTipLocation(MouseEvent event) {
                 return new Point(event.getX(), event.getY() - TOOLTIP_Y);
             }
         };
         downButton.setOpaque(false);
         downButton.setBorderPainted(false);
         downButton.setToolTipText(Inter.getLocText("FR-Designer_Scale_Down"));
-        upButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png")){
+        upButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png")) {
-            public Point getToolTipLocation(MouseEvent event){
+            public Point getToolTipLocation(MouseEvent event) {
                 return new Point(event.getX(), event.getY() - TOOLTIP_Y);
             }
         };
@@ -164,10 +179,11 @@ public class JFormSliderPane extends JPanel {
         showValButton.addActionListener(showValButtonActionListener);
         showValButton.setToolTipText(Inter.getLocText("FR-Designer_Scale_Grade"));
     }
+
     private void initUIRadioButton() {
         twoHundredButton = new UIRadioButton("200%");
         oneHundredButton = new UIRadioButton("100%");
-        SevenFiveButton = new UIRadioButton("75%");
+        sevenFiveButton = new UIRadioButton("75%");
         fiveTenButton = new UIRadioButton("50%");
         twoFiveButton = new UIRadioButton("25%");
         selfAdaptButton = new UIRadioButton(Inter.getLocText("FR-Designer_Scale_selfAdaptButton"));
@@ -176,7 +192,7 @@ public class JFormSliderPane extends JPanel {
         customButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE));
         twoHundredButton.addItemListener(radioButtonItemListener);
         oneHundredButton.addItemListener(radioButtonItemListener);
-        SevenFiveButton.addItemListener(radioButtonItemListener);
+        sevenFiveButton.addItemListener(radioButtonItemListener);
         fiveTenButton.addItemListener(radioButtonItemListener);
         twoFiveButton.addItemListener(radioButtonItemListener);
         customButton.addItemListener(new ItemListener() {
@@ -194,7 +210,7 @@ public class JFormSliderPane extends JPanel {
         ButtonGroup bg = new ButtonGroup();// 初始化按钮组
         bg.add(twoHundredButton);// 加入按钮组
         bg.add(oneHundredButton);
-        bg.add(SevenFiveButton);
+        bg.add(sevenFiveButton);
         bg.add(fiveTenButton);
         bg.add(twoFiveButton);
         bg.add(selfAdaptButton);
@@ -217,7 +233,7 @@ public class JFormSliderPane extends JPanel {
         septPane.setBackground(BACK_COLOR);
         twoHundredButton.setBackground(BACK_COLOR);
         oneHundredButton.setBackground(BACK_COLOR);
-        SevenFiveButton.setBackground(BACK_COLOR);
+        sevenFiveButton.setBackground(BACK_COLOR);
         fiveTenButton.setBackground(BACK_COLOR);
         twoFiveButton.setBackground(BACK_COLOR);
 //        selfAdaptButton.setBackground(BACK_COLOR);
@@ -227,7 +243,7 @@ public class JFormSliderPane extends JPanel {
                 new Component[]{septPane, null},
                 new Component[]{twoHundredButton, null},
                 new Component[]{oneHundredButton, null},
-                new Component[]{SevenFiveButton, null},
+                new Component[]{sevenFiveButton, null},
                 new Component[]{fiveTenButton, null},
                 new Component[]{twoFiveButton, null},
                 new Component[]{customButton, createSpinnerPanel()}
@@ -247,14 +263,14 @@ public class JFormSliderPane extends JPanel {
         return spinnerPanel;
     }
 
-    ActionListener showValButtonActionListener = new ActionListener() {
+    private ActionListener showValButtonActionListener = new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
             popupDialog();
         }
     };
 
-    ChangeListener showValSpinnerChangeListener = new ChangeListener() {
+    private ChangeListener showValSpinnerChangeListener = new ChangeListener() {
         @Override
         public void stateChanged(ChangeEvent e) {
             int val = (int) ((UIBasicSpinner) e.getSource()).getValue();
@@ -277,7 +293,7 @@ public class JFormSliderPane extends JPanel {
 
 
     //定义一个监听器，用于监听所有滑动条
-    ChangeListener listener = new ChangeListener() {
+    private ChangeListener listener = new ChangeListener() {
         public void stateChanged(ChangeEvent event) {
             //取出滑动条的值，并在文本中显示出来
             if (!isButtonOrIsTxt) {
@@ -296,7 +312,7 @@ public class JFormSliderPane extends JPanel {
         }
     };
 
-    ItemListener radioButtonItemListener = new ItemListener() {
+    private ItemListener radioButtonItemListener = new ItemListener() {
         @Override
         public void itemStateChanged(ItemEvent e) {
             JRadioButton temp = (JRadioButton) e.getSource();
@@ -312,7 +328,7 @@ public class JFormSliderPane extends JPanel {
             slider.setValue((int) (showValue + TWO_HUNDRED) / SIX);
         } else if (showValue < HUNDRED) {
             slider.setValue((int) ((showValue - TEN) / ONEPOINTEIGHT));
-        } else if (showValue == HUNDRED) {
+        } else {
             slider.setValue(HALF_HUNDRED);
         }
     }
@@ -336,7 +352,7 @@ public class JFormSliderPane extends JPanel {
         return b1.divide(b2, scale).doubleValue();
     }
 
-    ActionListener buttonActionListener = new ActionListener() {
+    private ActionListener buttonActionListener = new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
             showValue = (int) showValSpinner.getValue();

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

@@ -15,15 +15,38 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.Inter;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JFormattedTextField;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.plaf.basic.BasicSliderUI;
-import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultFormatterFactory;
 import javax.swing.text.NumberFormatter;
-import java.awt.*;
+import java.awt.BorderLayout;
-import java.awt.event.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseEvent;
 import java.math.BigDecimal;
 
 /**
@@ -55,7 +78,6 @@ public class JSliderPane extends JPanel {
     private static final Color BACK_COLOR = new Color(245, 245, 247);
     public int showValue = 100;
     public double resolutionTimes = 1.0;
-    private static JSliderPane THIS;
     private UITextField showVal;
     private JSpinner showValSpinner;
     private UISlider slider;
@@ -66,12 +88,14 @@ public class JSliderPane extends JPanel {
     private UISliderButton showValButton;
     private UIRadioButton twoHundredButton;
     private UIRadioButton oneHundredButton;
-    private UIRadioButton SevenFiveButton;
+    private UIRadioButton sevenFiveButton;
     private UIRadioButton fiveTenButton;
     private UIRadioButton twoFiveButton;
     private UIRadioButton selfAdaptButton;
     private UIRadioButton customButton;
-    //拖动条处理和button、直接输入不一样
+    /**
+     * 拖动条处理和button、直接输入不一样
+     */
     private boolean isButtonOrIsTxt = true;
     private PopupPane dialog;
     private int upButtonX;
@@ -87,7 +111,7 @@ public class JSliderPane extends JPanel {
         showValSpinner.setEditor(editor);
         JFormattedTextField textField = ((JSpinner.NumberEditor) showValSpinner.getEditor()).getTextField();
         textField.setEditable(true);
-        DefaultFormatterFactory factory = (DefaultFormatterFactory) textField .getFormatterFactory();
+        DefaultFormatterFactory factory = (DefaultFormatterFactory) textField.getFormatterFactory();
         NumberFormatter formatter = (NumberFormatter) factory.getDefaultFormatter();
         formatter.setAllowsInvalid(false);
 
@@ -95,7 +119,7 @@ public class JSliderPane extends JPanel {
         initShowValButton();
         initUIRadioButton();
         initPane();
-        JPanel panel = new JPanel(new FlowLayout(1, 0, 0));
+        JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
         panel.add(downButton);
         panel.add(slider);
         panel.add(upButton);
@@ -105,12 +129,8 @@ public class JSliderPane extends JPanel {
     }
 
 
-    public static final JSliderPane getInstance() {
+    public static JSliderPane getInstance() {
-//        if (THIS == null) {
+        return new JSliderPane();
-//            THIS = new JSliderPane();
-//        }
-        THIS = new JSliderPane();
-        return THIS;
     }
 
     private void initSlider() {
@@ -174,7 +194,7 @@ public class JSliderPane extends JPanel {
     private void initUIRadioButton() {
         twoHundredButton = new UIRadioButton("200%");
         oneHundredButton = new UIRadioButton("100%");
-        SevenFiveButton = new UIRadioButton("75%");
+        sevenFiveButton = new UIRadioButton("75%");
         fiveTenButton = new UIRadioButton("50%");
         twoFiveButton = new UIRadioButton("25%");
         selfAdaptButton = new UIRadioButton(Inter.getLocText("FR-Designer_Scale_selfAdaptButton"));
@@ -183,7 +203,7 @@ public class JSliderPane extends JPanel {
         customButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE));
         twoHundredButton.addItemListener(radioButtonItemListener);
         oneHundredButton.addItemListener(radioButtonItemListener);
-        SevenFiveButton.addItemListener(radioButtonItemListener);
+        sevenFiveButton.addItemListener(radioButtonItemListener);
         fiveTenButton.addItemListener(radioButtonItemListener);
         twoFiveButton.addItemListener(radioButtonItemListener);
         customButton.addItemListener(new ItemListener() {
@@ -201,7 +221,7 @@ public class JSliderPane extends JPanel {
         ButtonGroup bg = new ButtonGroup();// 初始化按钮组
         bg.add(twoHundredButton);// 加入按钮组
         bg.add(oneHundredButton);
-        bg.add(SevenFiveButton);
+        bg.add(sevenFiveButton);
         bg.add(fiveTenButton);
         bg.add(twoFiveButton);
         bg.add(selfAdaptButton);
@@ -224,7 +244,7 @@ public class JSliderPane extends JPanel {
         septPane.setBackground(BACK_COLOR);
         twoHundredButton.setBackground(BACK_COLOR);
         oneHundredButton.setBackground(BACK_COLOR);
-        SevenFiveButton.setBackground(BACK_COLOR);
+        sevenFiveButton.setBackground(BACK_COLOR);
         fiveTenButton.setBackground(BACK_COLOR);
         twoFiveButton.setBackground(BACK_COLOR);
         selfAdaptButton.setBackground(BACK_COLOR);
@@ -234,7 +254,7 @@ public class JSliderPane extends JPanel {
                 new Component[]{septPane, null},
                 new Component[]{twoHundredButton, null},
                 new Component[]{oneHundredButton, null},
-                new Component[]{SevenFiveButton, null},
+                new Component[]{sevenFiveButton, null},
                 new Component[]{fiveTenButton, null},
                 new Component[]{twoFiveButton, null},
                 new Component[]{selfAdaptButton, null},
@@ -255,14 +275,14 @@ public class JSliderPane extends JPanel {
         return spinnerPanel;
     }
 
-    ActionListener showValButtonActionListener = new ActionListener() {
+    private ActionListener showValButtonActionListener = new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
             popupDialog();
         }
     };
 
-    ChangeListener showValSpinnerChangeListener = new ChangeListener() {
+    private ChangeListener showValSpinnerChangeListener = new ChangeListener() {
         @Override
         public void stateChanged(ChangeEvent e) {
             int val = (int) ((UIBasicSpinner) e.getSource()).getValue();
@@ -285,7 +305,7 @@ public class JSliderPane extends JPanel {
 
 
     //定义一个监听器，用于监听所有滑动条
-    ChangeListener listener = new ChangeListener() {
+    private ChangeListener listener = new ChangeListener() {
         public void stateChanged(ChangeEvent event) {
             //取出滑动条的值，并在文本中显示出来
             if (!isButtonOrIsTxt) {
@@ -305,7 +325,7 @@ public class JSliderPane extends JPanel {
         }
     };
 
-    ItemListener radioButtonItemListener = new ItemListener() {
+    private ItemListener radioButtonItemListener = new ItemListener() {
         @Override
         public void itemStateChanged(ItemEvent e) {
             JRadioButton temp = (JRadioButton) e.getSource();
@@ -321,7 +341,7 @@ public class JSliderPane extends JPanel {
             slider.setValue((int) (showValue + TWO_HUNDRED) / SIX);
         } else if (showValue < HUNDRED) {
             slider.setValue((int) ((showValue - TEN) / ONEPOINTEIGHT));
-        } else if (showValue == HUNDRED) {
+        } else {
             slider.setValue(HALF_HUNDRED);
         }
     }
@@ -339,7 +359,7 @@ public class JSliderPane extends JPanel {
         return this.showValue;
     }
 
-    public void reset(){
+    public void reset() {
         this.showValSpinner.setValue(HUNDRED);
     }
 
@@ -349,7 +369,7 @@ public class JSliderPane extends JPanel {
         return b1.divide(b2, scale).doubleValue();
     }
 
-    ActionListener buttonActionListener = new ActionListener() {
+    private ActionListener buttonActionListener = new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
             showValue = (int) showValSpinner.getValue();
@@ -386,7 +406,7 @@ public class JSliderPane extends JPanel {
         } else if (value < HALF_HUNDRED) {
             times = (int) Math.round(ONEPOINTEIGHT * value + TEN);
         } else {
-            times = (int) (SIX * value - TWO_HUNDRED);
+            times = SIX * value - TWO_HUNDRED;
         }
     }
 
@@ -444,11 +464,9 @@ class JSliderPaneUI extends BasicSliderUI {
         super(b);
     }
 
-    /** */
     /**
      * 绘制指示物
      */
-
     public void paintThumb(Graphics g) {
         Rectangle knobBounds = thumbRect;
         int w = knobBounds.width;
@@ -460,7 +478,6 @@ class JSliderPaneUI extends BasicSliderUI {
         g2d.fillRoundRect(0, SIX, FOUR, 9, 2, 2);
     }
 
-    /** */
     /**
      * 绘制刻度轨迹
      */

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

@@ -2,7 +2,7 @@ package com.fr.design.selection;
 
 import com.fr.design.designer.TargetComponent;
 
-import javax.swing.*;
+import javax.swing.JComponent;
 
 /**
  * 快速编辑区域
@@ -39,11 +39,15 @@ public abstract class QuickEditor<T extends TargetComponent> extends JComponent
         tc.fireTargetModified();
     }
 
+    /**
+     * 刷新面板
+     */
     protected abstract void refresh();
 
 
     /**
-     * for 关闭时候释放
+     * 关闭模板时释放模板对象
+     * 所有持有tc的对象也必须置空或者丢弃对于tc的引用
      */
     public void release() {
         tc = null;
@@ -53,7 +57,6 @@ public abstract class QuickEditor<T extends TargetComponent> extends JComponent
 
         @Override
         protected void refresh() {
-
         }
 
     };

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

@@ -47,7 +47,7 @@ public class WidgetToolBarPane extends BasicPane implements DesignToolbarProvide
     }
 
     public void refreshToolbar() {
-        reset();
+        singleton.reset();
     }
 
     public static void refresh() {