Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -1,7 +1,6 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.base.ParameterHelper;
 import com.fr.data.core.db.TableProcedure;
@@ -35,17 +34,25 @@ import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ToolBarDef;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.general.sql.SqlUtils;
+import com.fr.log.FineLoggerFactory;
 import com.fr.script.Calculator;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JToolBar;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
@@ -75,7 +82,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         ParameterTableModel model = new ParameterTableModel() {
             @Override
             public UITableEditAction[] createAction() {
-				return (UITableEditAction[]) ArrayUtils.add(super.createDBTableAction(), new RefreshAction());
+                return ArrayUtils.add(super.createDBTableAction(), new RefreshAction());
             }
         };
         editorPane = new UITableEditorPane<ParameterProvider>(model);
@@ -84,6 +91,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         connectionTableProcedurePane = new ConnectionTableProcedurePane() {
             @Override
             protected void filter(Connection connection, String conName, List<String> nameList) {
+
                 connection.addConnection(nameList, conName, new Class[]{JDBCDatabaseConnection.class, JNDIDatabaseConnection.class});
             }
         };
@@ -95,19 +103,21 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
                 try {
                     document.insertString(sqlTextPane.getCaretPosition(), target.toString(), null);
                 } catch (BadLocationException e) {
-					FRContext.getLogger().error(e.getMessage(), e);
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }
                 // 这里开始作色,本来可以给sqlTextPane添加DocumentListener来实现的，
                 // 后来发现insertString的时候，锁定了JTextPane,不能调用setXXX来作色,先这样了.
-//				sqlTextPane.syntaxTexts();
+                // sqlTextPane.syntaxTexts();
                 sqlTextPane.requestFocus();
             }
         });
         sqlTextPane.addFocusListener(new FocusListener() {
+            @Override
             public void focusGained(FocusEvent e) {
-				// unsupport
+                // do nothing
             }
 
+            @Override
             public void focusLost(FocusEvent e) {
                 if (isPreviewOrRefreshButton(e)) {
                     checkParameter();
@@ -146,7 +156,10 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         sqlSplitPane.add(box, BorderLayout.CENTER);
 
 
-		box.setMinimumSize(new Dimension(310, 400));
+        box.setMinimumSize(new Dimension(300, 400));
+        // 防止数据连接名过长时影响 split pane 分割效果
+        connectionTableProcedurePane.setMinimumSize(new Dimension(250, 400));
+        connectionTableProcedurePane.setMaximumSize(new Dimension(500, 400));
         // 使用SplitPane
         JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, connectionTableProcedurePane, sqlSplitPane);
         mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor()));
@@ -160,8 +173,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
     }
 
 
-
+    private boolean isPreviewOrRefreshButton(FocusEvent e) {
-	private boolean isPreviewOrRefreshButton (FocusEvent e) {
         if (e.getOppositeComponent() != null) {
             String name = e.getOppositeComponent().getName();
             return ComparatorUtils.equals(name, PREVIEW_BUTTON) || ComparatorUtils.equals(name, REFRESH_BUTTON);
@@ -272,7 +284,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         if (StringUtils.isBlank(dbName) || StringUtils.isBlank(this.sqlTextPane.getText())) {
             try {
                 throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
-			} catch (Exception e) {
+            } catch (Exception ignore) {
                 // JOptionPane.showMessageDialog(DBTableDataPane.this,
                 // com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
             }
@@ -303,13 +315,14 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             refresh();
         }
 
         @Override
         public void checkEnabled() {
-			// unsupport
+            // do nothing
         }
     }
 
@@ -320,6 +333,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent evt) {
             checkParameter();
             PreviewTablePane.previewTableData(DBTableDataPane.this.updateBean());
@@ -333,11 +347,13 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             final QueryPane pane = new QueryPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Layer_Page_Report_Define_Page_Query_SQL"));
             pane.populate(pageQuery);
             BasicDialog dialog = pane.showWindow(DesignerContext.getDesignerFrame());
             dialog.addDialogActionListener(new DialogActionAdapter() {
+                @Override
                 public void doOk() {
                     pageQuery = pane.update();
                     checkParameter();

designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UICheckListPopup.java

@@ -0,0 +1,233 @@
+package com.fr.design.gui.icombocheckbox;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.imenu.UIPopupMenu;
+import com.fr.design.icon.IconPathConstants;
+import com.fr.design.layout.FRGUIPaneFactory;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.ArrayList;
+import java.util.List;
+
+public class UICheckListPopup extends UIPopupMenu {
+    private List<ActionListener> listeners = new ArrayList<ActionListener>();
+    private List<JCheckBox> checkBoxList = new ArrayList<JCheckBox>();
+
+    private Object[] values;
+    private JPanel checkboxPane;
+    private UIScrollPane jScrollPane;
+    private Color mouseEnteredColor = UIConstants.CHECKBOX_HOVER_SELECTED;
+    private int maxDisplayNumber = 8;
+
+    public static final String COMMIT_EVENT = "commit";
+    public static final String SELECT_ALL = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Choose_All");
+    private static final int CHECKBOX_HEIGHT = 25;
+
+    public UICheckListPopup(Object[] value) {
+        super();
+        values = value;
+        initComponent();
+    }
+
+    public void setMouseEnteredColor(Color color) {
+        this.mouseEnteredColor = color;
+    }
+
+    public void setMaxDisplayNumber(int maxDisplayNumber) {
+        this.maxDisplayNumber = maxDisplayNumber;
+        addCheckboxValues(values);
+    }
+
+    private void initComponent() {
+        checkboxPane = new JPanel();
+        checkboxPane.setLayout(new GridLayout(checkBoxList.size(), 1, 0, 0));
+        checkboxPane.setBackground(Color.WHITE);
+        jScrollPane = new UIScrollPane(checkboxPane);
+
+        this.setLayout(new BorderLayout());
+        this.add(jScrollPane, BorderLayout.CENTER);
+
+        addCheckboxValues(values);
+    }
+
+    public void addCheckboxValues(Object[] value) {
+        checkboxPane.removeAll();
+        checkBoxList.clear();
+
+        //全选加在第一个位置
+        addOneCheckValue(SELECT_ALL);
+        for (Object checkValue : value) {
+            addOneCheckValue(checkValue);
+        }
+        addSelectListener();
+
+        jScrollPane.setPreferredSize(new Dimension(200, checkBoxList.size() * CHECKBOX_HEIGHT + 10));
+        //超过1页的数量时显示滚动条
+        if (checkBoxList.size() > maxDisplayNumber) {
+            jScrollPane.setPreferredSize(new Dimension(200, maxDisplayNumber * CHECKBOX_HEIGHT));
+        }
+        checkboxPane.repaint();
+        jScrollPane.repaint();
+    }
+
+    private void addOneCheckValue(Object checkValue) {
+        JPanel checkPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        checkPane.setPreferredSize(new Dimension(185, CHECKBOX_HEIGHT));
+        final JCheckBox temp = createCheckbox();
+        final UILabel label = new UILabel(checkValue.toString());
+        label.setBackground(Color.WHITE);
+        label.setPreferredSize(new Dimension(156, 20));
+        checkPane.setBackground(Color.WHITE);
+        checkPane.add(temp);
+        checkPane.add(label);
+        addMouseListener(temp, label);
+
+        checkBoxList.add(temp);
+        checkboxPane.add(checkPane);
+    }
+
+    private JCheckBox createCheckbox() {
+        JCheckBox checkBox = new JCheckBox();
+        checkBox.setPreferredSize(new Dimension(20, 20));
+        checkBox.setBackground(Color.WHITE);
+        checkBox.setIcon(BaseUtils.readIcon(IconPathConstants.CHECKBOX_NORMAL));
+        checkBox.setSelectedIcon(BaseUtils.readIcon(IconPathConstants.CHECKBOX_SELECTED));
+
+        return checkBox;
+    }
+
+    /**
+     * 设置鼠标事件，鼠标进入时背景色变换
+     *
+     * @param checkBox
+     * @param label
+     */
+    private void addMouseListener(final JCheckBox checkBox, final UILabel label) {
+        label.addMouseListener(new MouseAdapter() {
+            public void mouseExited(MouseEvent e) {
+                label.setBackground(Color.WHITE);
+            }
+
+            public void mouseEntered(MouseEvent e) {
+                label.setOpaque(true);
+                label.setBackground(mouseEnteredColor);
+            }
+
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                checkBox.doClick();
+            }
+        });
+    }
+
+    /**
+     * 单选框选中事件
+     */
+    private void addSelectListener() {
+        for (int i = 0; i < checkBoxList.size(); i++) {
+            JCheckBox checkBox = checkBoxList.get(i);
+            if (i == 0) {
+                checkBox.addItemListener(new ItemListener() {
+                    public void itemStateChanged(ItemEvent e) {
+                        //全选checkbox事件
+                        doSelectAll(checkBoxList.get(0).isSelected());
+                    }
+                });
+            } else {
+                checkBox.addItemListener(new ItemListener() {
+                    public void itemStateChanged(ItemEvent e) {
+                        //do半选判断放在commit事件里
+                        commit();
+                    }
+                });
+            }
+        }
+    }
+
+    /**
+     * 全选
+     *
+     * @param isSelected 选中是true，未选是false
+     */
+    private void doSelectAll(boolean isSelected) {
+        for (int i = 1; i < checkBoxList.size(); i++) {
+            //全选和反全选都不考虑全选按钮本身
+            if (!SELECT_ALL.equals(checkBoxList.get(i).getText()))
+                checkBoxList.get(i).setSelected(isSelected);
+        }
+    }
+
+    /**
+     * 获取所有选中的值
+     *
+     * @return
+     */
+    public Object[] getSelectedValues() {
+        List<Object> selectedValues = new ArrayList<Object>();
+        int selectCount = 0;
+
+        for (int i = 1; i < checkBoxList.size(); i++) {
+            if (checkBoxList.get(i).isSelected()) {
+                selectedValues.add(values[i - 1]);
+                selectCount++;
+            }
+        }
+        //全选半选切换
+        switchSelectIcon(selectCount);
+
+        return selectedValues.toArray(new Object[selectedValues.size()]);
+    }
+
+
+    /**
+     * 切换全选半选图片
+     */
+    private void switchSelectIcon(int selectCount) {
+        JCheckBox checkBox = checkBoxList.get(0);
+        if (selectCount == 0) {
+            checkBox.setIcon(BaseUtils.readIcon(IconPathConstants.CHECKBOX_NORMAL));
+        } else if (selectCount < checkBoxList.size() - 1) {
+            //虽然有选中，但是要判断此时全选状态去换图标
+            if (checkBoxList.get(0).isSelected()) {
+                checkBox.setSelectedIcon(BaseUtils.readIcon(IconPathConstants.CHECKBOX_HATFSELECT));
+            } else {
+                checkBox.setIcon(BaseUtils.readIcon(IconPathConstants.CHECKBOX_HATFSELECT));
+            }
+        } else {
+            //全选了，图标要换回来
+            checkBox.setSelectedIcon(BaseUtils.readIcon(IconPathConstants.CHECKBOX_SELECTED));
+        }
+    }
+
+    public void commit() {
+        fireActionPerformed(new ActionEvent(this, 0, COMMIT_EVENT));
+    }
+
+    @Override
+    public Insets getInsets() {
+        return new Insets(0, 0, 0, 0);
+    }
+
+    public void addActionListener(ActionListener listener) {
+        if (!listeners.contains(listener))
+            listeners.add(listener);
+    }
+
+    public void removeActionListener(ActionListener listener) {
+        if (listeners.contains(listener)) {
+            listeners.remove(listener);
+        }
+    }
+
+    protected void fireActionPerformed(ActionEvent e) {
+        for (ActionListener l : listeners) {
+            l.actionPerformed(e);
+        }
+    }
+
+}

designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java

@@ -0,0 +1,330 @@
+package com.fr.design.gui.icombocheckbox;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.event.GlobalNameListener;
+import com.fr.design.event.GlobalNameObserver;
+import com.fr.design.event.UIObserver;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.icon.IconPathConstants;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.stable.StringUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 设计器下拉复选框组件
+ * 支持全选、半选
+ * 可以设置悬停颜色、一页最多显示单选框个数
+ * 可以省略显示
+ */
+public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNameObserver {
+    //下拉框的值
+    private Object[] values;
+    //已经选中的值
+    private Object[] selectedValues;
+
+    private List<ActionListener> listeners = new ArrayList<ActionListener>();
+    private UICheckListPopup popup;
+    private UITextField editor;
+    private UIButton arrowButton;
+    //选中的值之间显示的分隔符
+    private String valueSperator;
+    private static final String DEFAULT_VALUE_SPERATOR = ",";
+    private static final String OMIT_TEXT = "...";
+
+    private UIObserverListener uiObserverListener;
+    private GlobalNameListener globalNameListener = null;
+    private String multiComboName = StringUtils.EMPTY;
+    private boolean showOmitText = true;
+
+    public UIComboCheckBox(Object[] value) {
+        this(value, DEFAULT_VALUE_SPERATOR);
+    }
+
+    /**
+     * 自定义分隔符的复选框
+     *
+     * @param value
+     * @param valueSperator
+     */
+    public UIComboCheckBox(Object[] value, String valueSperator) {
+        values = value;
+        this.valueSperator = valueSperator;
+        initComponent();
+    }
+
+    /**
+     * 设置鼠标悬停的背景色
+     *
+     * @param color
+     */
+    public void setCheckboxEnteredColor(Color color) {
+        this.popup.setMouseEnteredColor(color);
+    }
+
+    /**
+     * 设置弹出框最多显示单选的个数，超过显示滚动条
+     */
+    public void setPopupMaxDisplayNumber(int maxDisplayNumber) {
+        this.popup.setMaxDisplayNumber(maxDisplayNumber);
+    }
+
+    /**
+     * 是否要超过文本框长度后显示省略号
+     *
+     * @param isShowOmitText
+     */
+    public void isShowOmitText(boolean isShowOmitText) {
+        this.showOmitText = isShowOmitText;
+    }
+
+    private void initComponent() {
+        this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        this.popup = new UICheckListPopup(values);
+        this.popup.addActionListener(new PopupAction());
+        this.editor = createEditor();
+        this.arrowButton = createArrowButton();
+        this.add(editor);
+        this.add(arrowButton);
+        setText();
+    }
+
+    private UIButton createArrowButton() {
+        final UIButton arrowBtn = new UIButton();
+        arrowBtn.setNormalPainted(false);
+        arrowBtn.setPreferredSize(new Dimension(20, 5));
+        arrowBtn.setBackground(new Color(218, 218, 218));
+        arrowBtn.setOpaque(true);
+        arrowBtn.setIcon(getIcon());
+        arrowBtn.setExtraPainted(false);
+        addPopupListener(arrowBtn);
+        arrowBtn.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseEntered(MouseEvent e) {
+                arrowBtn.setBackground(new Color(200, 200, 200));
+            }
+
+            @Override
+            public void mouseExited(MouseEvent e) {
+                arrowBtn.setBackground(new Color(218, 218, 218));
+            }
+        });
+
+        return arrowBtn;
+    }
+
+    private UITextField createEditor() {
+        UITextField editor = new UITextField();
+        editor.setEditable(false);
+        editor.setPreferredSize(new Dimension(180, 20));
+        addPopupListener(editor);
+
+        return editor;
+    }
+
+    /**
+     * 弹出框事件
+     *
+     * @param component
+     */
+    private void addPopupListener(Component component) {
+        component.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                togglePopup();
+            }
+        });
+
+    }
+
+    /**
+     * 刷新复选框的列表值
+     *
+     * @param value
+     */
+    public void refreshCombo(Object[] value) {
+        this.values = value;
+        this.popup.addCheckboxValues(value);
+    }
+
+    /**
+     * 获取复选框选中的值
+     *
+     * @return 复选框选中的值
+     */
+    public Object[] getSelectedValues() {
+        return popup.getSelectedValues();
+    }
+
+    private class PopupAction implements ActionListener {
+
+        public void actionPerformed(ActionEvent e) {
+            if (e.getActionCommand().equals(UICheckListPopup.COMMIT_EVENT)) {
+                selectedValues = popup.getSelectedValues();
+                setText();
+                //把事件继续传递出去
+                fireActionPerformed(e);
+            }
+        }
+    }
+
+    private void togglePopup() {
+        if (this.arrowButton.isEnabled()) {
+            popup.show(this, 0, getHeight());
+        }
+    }
+
+    /**
+     * 清除文本框
+     */
+    public void clearText() {
+        editor.setText(StringUtils.EMPTY);
+    }
+
+    /**
+     * 获取文本框内容
+     */
+    public String getText() {
+        return editor.getText();
+    }
+
+    /**
+     * 文本框设置显示值
+     */
+    private void setText() {
+        StringBuilder builder = new StringBuilder();
+        if (selectedValues != null) {
+            for (Object value : selectedValues) {
+                builder.append(value);
+                builder.append(valueSperator);
+            }
+        }
+        //去掉末尾多余的逗号
+        String text = builder.length() > 0 ? builder.substring(0, builder.length() - 1) : StringUtils.EMPTY;
+        //计算加省略号后的文本
+        editor.setText(this.showOmitText ? omitEditorText(editor, text) : text);
+    }
+
+    /**
+     * 根据字体大小计算得到省略后的文字
+     *
+     * @param textEditor
+     * @param text
+     * @return 省略后的文字
+     */
+    private static String omitEditorText(UITextField textEditor, String text) {
+        char[] omitChars = OMIT_TEXT.toCharArray();
+        //获取字体的大小
+        FontMetrics fontMetrics = textEditor.getFontMetrics(textEditor.getFont());
+        //计算省略号的长度
+        int omitLength = fontMetrics.charsWidth(omitChars, 0, omitChars.length);
+        String omitText = StringUtils.EMPTY;
+        char[] chars = text.toCharArray();
+
+        for (int i = 1; i <= chars.length; i++) {
+            //如果原文本+省略号长度超过文本框
+            if (fontMetrics.charsWidth(chars, 0, i) + omitLength > textEditor.getPreferredSize().getWidth()) {
+                //从第i-1的位置截断再拼上省略号
+                omitText = text.substring(0, i - 2) + OMIT_TEXT;
+                break;
+            }
+        }
+
+        return omitText == StringUtils.EMPTY ? text : omitText;
+    }
+
+    /**
+     * 给组件登记一个观察者监听事件
+     *
+     * @param listener 观察者监听事件
+     */
+    @Override
+    public void registerChangeListener(UIObserverListener listener) {
+        this.uiObserverListener = listener;
+    }
+
+
+    @Override
+    public void setGlobalName(String name) {
+        multiComboName = name;
+    }
+
+    /**
+     * 组件是否需要响应添加的观察者事件
+     *
+     * @return 如果需要响应观察者事件则返回true，否则返回false
+     */
+    @Override
+    public boolean shouldResponseChangeListener() {
+        return true;
+    }
+
+    /**
+     * 注册观察者监听事件
+     *
+     * @param listener 观察者监听事件
+     */
+    @Override
+    public void registerNameListener(GlobalNameListener listener) {
+        globalNameListener = listener;
+    }
+
+    private Icon getIcon() {
+        return BaseUtils.readIcon(IconPathConstants.ARROW_ICON_PATH);
+    }
+
+    /**
+     * 组件是否需要响应观察者事件
+     *
+     * @return 如果需要响应观察者事件则返回true，否则返回false
+     */
+    @Override
+    public boolean shouldResponseNameListener() {
+        return true;
+    }
+
+    public void addActionListener(ActionListener listener) {
+        if (!listeners.contains(listener))
+            listeners.add(listener);
+    }
+
+    public void removeActionListener(ActionListener listener) {
+        if (listeners.contains(listener))
+            listeners.remove(listener);
+    }
+
+    protected void fireActionPerformed(ActionEvent e) {
+        for (ActionListener l : listeners) {
+            l.actionPerformed(e);
+        }
+    }
+
+    /**
+     * 简单的测试demo
+     * @param args
+     */
+    public static void main(String args[]) {
+        UIComboCheckBox comboBox = new UIComboCheckBox(new Object[]
+                {"MATA", "HANA", "KAKA", "KUKA", "INFI", "LILY", "RIBO", "CUBE", "MATA", "HANA", "KAKA", "KUKA"});
+
+        comboBox.isShowOmitText(false);
+        comboBox.setPopupMaxDisplayNumber(6);
+
+        JPanel jPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        jPanel.add(comboBox);
+
+        JFrame jFrame = new JFrame();
+        jFrame.setVisible(true);
+        jFrame.setSize(600, 400);
+        jFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        jFrame.add(jPanel, BorderLayout.CENTER);
+    }
+}

designer-base/src/main/java/com/fr/design/icon/IconPathConstants.java

@@ -33,4 +33,8 @@ public class IconPathConstants {
     public static final String XMLA_ICON_PATH = "/com/fr/design/images/data/cube.png";
     public static final String FORBID_ICON_PATH = "/com/fr/web/images/form/forbid.png";
     public static final String EDIT_ICON_PATH = "/com/fr/design/images/control/newEdit.png";
+    public static final String ARROW_ICON_PATH = "com/fr/design/images/buttonicon/arrow.png";
+    public static final String CHECKBOX_NORMAL = "com/fr/design/images/buttonicon/control_checkbox_normal.png";
+    public static final String CHECKBOX_SELECTED = "com/fr/design/images/buttonicon/control_checkbox_selected.png";
+    public static final String CHECKBOX_HATFSELECT = "com/fr/design/images/buttonicon/control_checkbox_part.png";
 }

designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java

@@ -61,6 +61,7 @@ import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.injectable.PluginSingleInjection;
 import com.fr.plugin.solution.closeable.CloseableContainedMap;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.AssistUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
 import com.fr.van.chart.area.AreaIndependentVanChartInterface;
@@ -107,6 +108,8 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
     private static Map<String, String> idAndPriorityMap = new HashMap<String, String>();
 
+    public static final String TYPE_PANE_DEFAULT_TITLE = "DEFAULT_NAME";
+
     public synchronized static ChartTypeInterfaceManager getInstance() {
         
         return classManager;
@@ -260,6 +263,9 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
                 String plotID = entry.getKey();
 
                 AbstractChartTypePane pane = entry.getValue().getPlotTypePane();
+                if (AssistUtils.equals(pane.title4PopupWindow(), TYPE_PANE_DEFAULT_TITLE)) {
+                    continue;
+                }
                 pane.setPlotID(plotID);
                 paneList.add(pane);
 

designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java

@@ -1,6 +1,7 @@
 package com.fr.design.chart.fun.impl;
 
 import com.fr.chart.chartattr.Plot;
+import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.fun.IndependentChartUIProvider;
 import com.fr.design.condition.ConditionAttributesPane;
@@ -40,7 +41,12 @@ public abstract class AbstractIndependentChartsUI extends AbstractProvider imple
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new PiePlotPane();
+        return new PiePlotPane() {
+            @Override
+            public String title4PopupWindow() {
+                return ChartTypeInterfaceManager.TYPE_PANE_DEFAULT_TITLE;
+            }
+        };
     }
 
     @Override

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -152,8 +152,9 @@ public class ChartTypePane extends AbstractChartAttrPane{
 
             try{
                 Chart newDefaultChart = (Chart)((AbstractChartTypePane)getSelectedPane()).getDefaultChart().clone();
-                if(!chart.accept(newDefaultChart.getClass())){
+				if (!ComparatorUtils.equals(chart.getClass(), newDefaultChart.getClass())) {
 					//vanChart 和 chart 之间切换
+					//不同chart之间切换
                     editingCollection.removeNameObject(editingCollection.getSelectedIndex());
                     editingCollection.addChart(newDefaultChart);
                     chart = newDefaultChart;

designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPaneWithOutNum.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.range.component;
 import com.fr.chart.chartglyph.MapHotAreaColor;
 import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.ilable.BoldFontTextLabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.style.series.MapColorPickerPaneWithFormula;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
@@ -19,6 +20,10 @@ import java.awt.Dimension;
 public class SectionIntervalConfigPaneWithOutNum extends MapColorPickerPaneWithFormula {
     private BoldFontTextLabel numLabel;
 
+    public String getNameOfSubRange() {
+        return Toolkit.i18nText("Fine-Design_Chart_Range_Num");
+    }
+
     public SectionIntervalConfigPaneWithOutNum(AbstractAttrNoScrollPane container) {
         super(container);
         getDesignTypeButtonGroup().addChangeListener(new ChangeListener() {
@@ -49,12 +54,12 @@ public class SectionIntervalConfigPaneWithOutNum extends MapColorPickerPaneWithF
 
     @Override
     protected Component[][] createComponents() {
-        numLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage"));
+        numLabel = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage"));
 
         setRegionVisible(false);
 
         return new Component[][]{
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Num")), getDesignTypeButtonGroup()},
+                new Component[]{new BoldFontTextLabel(getNameOfSubRange()), getDesignTypeButtonGroup()},
                 new Component[]{numLabel, getRegionNumPane()},
         };
     }