Merge pull request #1051 in BA/design from ~VITO/design:9.0 to 9.0

* commit '65c38b21d2e1e3b01ebd47f753b2724eabb7259e':
  刚发现添加了一个CellFormulaQuickEditor，这样文字和公式可以分开了
  REPORT-3564 9.0设计器单元格元素插入内容控件

designer/src/com/fr/design/actions/CellSelectionAction.java

@@ -5,6 +5,9 @@ import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.Selection;
 
 public abstract class CellSelectionAction extends ElementCaseAction {
+    protected CellSelectionAction() {
+    }
+
     protected CellSelectionAction(ElementCasePane t) {
         super(t);
     }

designer/src/com/fr/design/actions/ElementCaseAction.java

@@ -3,14 +3,12 @@ package com.fr.design.actions;
 //ElementCaseAction应该有GridSelectionChangeListener，就从悬浮元素和单元格来讲，就必须有了，用来判断这些ElementCaseAction是否可以编辑,当然还可以做些其他事情
 //
 
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.ElementCasePane;
-import com.fr.grid.selection.CellSelection;
-import com.fr.grid.selection.Selection;
-import com.fr.design.selection.SelectionEvent;
-import com.fr.design.selection.SelectionListener;
 
 public abstract class ElementCaseAction extends SelectionListenerAction {
+    protected ElementCaseAction() {
+    }
+
     protected ElementCaseAction(ElementCasePane t) {
         super(t);
         t.addSelectionChangeListener(createSelectionListener());

designer/src/com/fr/design/actions/SelectionListenerAction.java

@@ -12,6 +12,9 @@ import com.fr.grid.selection.Selection;
  */
 public abstract class SelectionListenerAction extends TemplateComponentAction<ElementCasePane> {
 
+    protected SelectionListenerAction() {
+    }
+
     protected SelectionListenerAction(ElementCasePane elementCasePane) {
         super(elementCasePane);
     }

designer/src/com/fr/design/actions/insert/cell/AbstractCellAction.java

@@ -13,6 +13,9 @@ import com.fr.report.elementcase.TemplateElementCase;
  * Cell.
  */
 public abstract class AbstractCellAction extends CellSelectionAction {
+    protected AbstractCellAction() {
+    }
+
     protected AbstractCellAction(ElementCasePane t) {
         super(t);
     }
@@ -42,6 +45,7 @@ public abstract class AbstractCellAction extends CellSelectionAction {
                 this.getCellValueClass(), false
         );
     }
+
     @Override
     public void update() {
         super.update();

designer/src/com/fr/design/actions/insert/cell/BiasCellAction.java

@@ -3,8 +3,6 @@
  */
 package com.fr.design.actions.insert.cell;
 
-import javax.swing.KeyStroke;
-
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
@@ -12,12 +10,23 @@ import com.fr.design.menu.MenuKeySet;
 import com.fr.general.Inter;
 import com.fr.report.cell.painter.BiasTextPainter;
 
+import javax.swing.KeyStroke;
+
 /**
  * Bias
  */
 public class BiasCellAction extends AbstractCellAction implements WorkBookSupportable {
+
+    public BiasCellAction() {
+        initAction();
+    }
+
     public BiasCellAction(ElementCasePane t) {
         super(t);
+        initAction();
+    }
+
+    private void initAction() {
         this.setMenuKeySet(INSERT_SLOPE_LINE);
         this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());

designer/src/com/fr/design/actions/insert/cell/ChartCellAction.java

@@ -16,8 +16,16 @@ import javax.swing.*;
  * .
  */
 public class ChartCellAction extends AbstractCellAction implements WorkBookSupportable {
+	public ChartCellAction(){
+		initAction();
+	}
+
 	public ChartCellAction(ElementCasePane t) {
 		super(t);
+		initAction();
+	}
+
+	private void initAction() {
 		this.setMenuKeySet(INSERT_CHART);
 		this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
 		this.setMnemonic(getMenuKeySet().getMnemonic());

designer/src/com/fr/design/actions/insert/cell/DSColumnCellAction.java

@@ -8,13 +8,21 @@ import com.fr.general.IOUtils;
 import com.fr.report.cell.cellattr.core.group.DSColumn;
 
 public class DSColumnCellAction extends AbstractCellAction implements WorkBookSupportable {
+    public DSColumnCellAction() {
+        initAction();
+    }
+
     public DSColumnCellAction(ElementCasePane t) {
         super(t);
+        initAction();
+        this.setSearchText(new DSColumnPane());
+    }
+
+    private void initAction() {
         this.setMenuKeySet(KeySetUtils.INSERT_DATA_COLUMN);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
         this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_insert/bindColumn.png"));
-        this.setSearchText(new DSColumnPane());
     }
 
     @Override

designer/src/com/fr/design/actions/insert/cell/FormulaCellAction.java

@@ -13,8 +13,16 @@ import com.fr.general.Inter;
 import javax.swing.*;
 
 public class FormulaCellAction extends AbstractCellAction implements WorkBookSupportable {
+    public FormulaCellAction() {
+        initAction();
+    }
+
     public FormulaCellAction(ElementCasePane t) {
         super(t);
+        initAction();
+    }
+
+    private void initAction() {
         this.setMenuKeySet(INSERT_FORMULA);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());

designer/src/com/fr/design/actions/insert/cell/GeneralCellAction.java

@@ -15,8 +15,16 @@ import javax.swing.*;
  *
  */
 public class GeneralCellAction extends AbstractCellAction implements WorkBookSupportable {
+    public GeneralCellAction() {
+        initAction();
+    }
+
     public GeneralCellAction(ElementCasePane t) {
         super(t);
+        initAction();
+    }
+
+    private void initAction() {
         this.setMenuKeySet(INSERT_TEXT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());

designer/src/com/fr/design/actions/insert/cell/ImageCellAction.java

@@ -16,8 +16,16 @@ import java.awt.*;
  * Image
  */
 public class ImageCellAction extends AbstractCellAction implements WorkBookSupportable {
+    public ImageCellAction() {
+        initAction();
+    }
+
     public ImageCellAction(ElementCasePane t) {
         super(t);
+        initAction();
+    }
+
+    private void initAction() {
         this.setMenuKeySet(INSERT_IMAGE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());

designer/src/com/fr/design/actions/insert/cell/RichTextCellAction.java

@@ -1,7 +1,5 @@
 package com.fr.design.actions.insert.cell;
 
-import javax.swing.KeyStroke;
-
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
@@ -10,10 +8,20 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.report.cell.cellattr.core.RichText;
 
+import javax.swing.KeyStroke;
+
 public class RichTextCellAction extends AbstractCellAction implements WorkBookSupportable {
 
+    public RichTextCellAction() {
+        initAction();
+    }
+
     public RichTextCellAction(ElementCasePane t) {
         super(t);
+        initAction();
+    }
+
+    private void initAction() {
         this.setMenuKeySet(INSERT_RICHTEXT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
@@ -28,6 +36,7 @@ public class RichTextCellAction extends AbstractCellAction implements WorkBookSu
 
     /**
      * equals 比较
+     *
      * @param object
      * @return true false
      */

designer/src/com/fr/design/actions/insert/cell/SubReportCellAction.java

@@ -1,7 +1,5 @@
 package com.fr.design.actions.insert.cell;
 
-import javax.swing.KeyStroke;
-
 import com.fr.base.BaseUtils;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
@@ -9,10 +7,20 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.report.cell.cellattr.core.SubReport;
 
+import javax.swing.KeyStroke;
+
 public class SubReportCellAction extends AbstractCellAction {
 
+    public SubReportCellAction() {
+        initAction();
+    }
+
     public SubReportCellAction(ElementCasePane t) {
         super(t);
+        initAction();
+    }
+
+    private void initAction() {
         this.setMenuKeySet(INSERT_SUB_REPORT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
@@ -39,6 +47,7 @@ public class SubReportCellAction extends AbstractCellAction {
 
     /**
      * equals 比较
+     *
      * @param object
      * @return true false
      */

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

@@ -1,27 +1,29 @@
 package com.fr.quickeditor;
 
-import com.fr.design.actions.utils.DeprecatedActionManager;
+import com.fr.design.actions.UpdateAction;
-import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.actions.core.ActionFactory;
+import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.menu.MenuKeySet;
+import com.fr.design.menu.ShortCut;
 import com.fr.design.selection.QuickEditor;
-import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.grid.selection.CellSelection;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.stable.ColumnRow;
 
 import javax.swing.*;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
+import java.util.ArrayList;
-import java.awt.event.MouseEvent;
 
 /**
  * @author zhou, yaoh.wu
@@ -32,6 +34,10 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
 
     protected UITextField columnRowTextField;
     protected TemplateCellElement cellElement;
+    protected UIComboBox comboBox;
+    private UpdateAction[] cellInsertActions;
+    private MenuKeySet[] cellInsertActionNames;
+    private int selectedIndex;
 
     public CellQuickEditor() {
         double p = TableLayout.PREFERRED;
@@ -58,7 +64,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
         cellLabel.setPreferredSize(new Dimension(60, 20));
         UILabel insertContentLabel = new UILabel(Inter.getLocText("HF-Insert_Content"));
         insertContentLabel.setPreferredSize(new Dimension(60, 20));
-        UIButton cellElementEditButton = initCellElementEditButton();
+        UIComboBox cellElementEditButton = initCellElementEditComboBox();
         Component[][] components = new Component[][]{
                 new Component[]{cellLabel, columnRowTextField = initColumnRowTextField()},
                 new Component[]{insertContentLabel, cellElementEditButton},
@@ -71,20 +77,57 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
 
     /**
      * 初始化添加按钮
-     * TODO 9.0 换成下拉菜单后原来的快捷键不好处理，先跳过。
      *
      * @return UIButton
      */
-    private UIButton initCellElementEditButton() {
+    private UIComboBox initCellElementEditComboBox() {
-        final UIButton cellElementEditButton = new UIButton(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
+        final String[] items = getDefaultComboBoxItems();
-        cellElementEditButton.addMouseListener(new MouseAdapter() {
+        comboBox = new UIComboBox(items);
+        final Object comboBoxSelected = getComboBoxSelected();
+        if (comboBoxSelected != null) {
+            comboBox.setSelectedItem(((ShortCut) comboBoxSelected).getMenuKeySet().getMenuKeySetName());
+        } else {
+            comboBox.setSelectedIndex(1);
+        }
+        comboBox.addPopupMenuListener(new PopupMenuListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                if (cellInsertActions == null) {
+                    cellInsertActions = ActionFactory.createCellInsertAction(ElementCasePane.class, tc);
+                }
+                // 这边重新获取是因为要根据JTemplate做一个过滤
+                ArrayList<String> arrayList = new ArrayList<String>();
+                for (UpdateAction action : cellInsertActions) {
+                    arrayList.add(action.getMenuKeySet().getMenuKeySetName());
+                }
+                comboBox.setModel(new DefaultComboBoxModel(arrayList.toArray(new String[arrayList.size()])));
+            }
 
             @Override
-            public void mousePressed(MouseEvent evt) {
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-                GUICoreUtils.showPopMenuWithParentWidth(DeprecatedActionManager.getCellMenu(tc).createJPopupMenu(), cellElementEditButton, 0, cellElementEditButton.getY() - 6);
+            }
+
+            @Override
+            public void popupMenuCanceled(PopupMenuEvent e) {
             }
         });
-        return cellElementEditButton;
+        comboBox.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                selectedIndex = comboBox.getSelectedIndex();
+                cellInsertActions[selectedIndex].actionPerformed(e);
+            }
+        });
+        return comboBox;
+    }
+
+    private String[] getDefaultComboBoxItems() {
+        cellInsertActionNames = ActionFactory.createCellInsertActionName();
+        ArrayList<String> names = new ArrayList<>();
+        for (MenuKeySet cellInsertActionName : cellInsertActionNames) {
+            names.add(cellInsertActionName.getMenuKeySetName());
+        }
+        return names.toArray(new String[names.size()]);
     }
 
     /**
@@ -130,6 +173,14 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
      */
     public abstract JComponent createCenterBody();
 
+
+    /**
+     * 初始化下拉框中的类型
+     *
+     * @return JComponent 待显示的详细信息面板
+     */
+    public abstract Object getComboBoxSelected();
+
     /**
      * 刷新
      */

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

@@ -1,5 +1,7 @@
 package com.fr.quickeditor.cellquick;
 
+import com.fr.design.actions.core.ActionFactory;
+import com.fr.design.actions.insert.cell.BiasCellAction;
 import com.fr.design.cell.editor.BiasTextPainterCellEditor.BiasTextPainterPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
@@ -36,6 +38,11 @@ public class CellBiasTextPainterEditor extends CellQuickEditor {
         return content;
     }
 
+    @Override
+    public Object getComboBoxSelected() {
+        return ActionFactory.createAction(BiasCellAction.class);
+    }
+
     private void showEditingDialog() {
         final BiasTextPainter oldbiasTextPainter = (BiasTextPainter) cellElement.getValue();
         final BiasTextPainterPane biasTextPainterPane = new BiasTextPainterPane();

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

@@ -2,6 +2,8 @@ package com.fr.quickeditor.cellquick;
 
 import com.fr.base.Formula;
 import com.fr.design.actions.columnrow.DSColumnConditionAction;
+import com.fr.design.actions.core.ActionFactory;
+import com.fr.design.actions.insert.cell.DSColumnCellAction;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dscolumn.DSColumnAdvancedPane;
@@ -981,4 +983,9 @@ public class CellDSColumnEditor extends CellQuickEditor {
             }
         }
     }
+
+    @Override
+    public Object getComboBoxSelected() {
+        return ActionFactory.createAction(DSColumnCellAction.class);
+    }
 }

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

@@ -3,6 +3,8 @@ package com.fr.quickeditor.cellquick;
 import com.fr.base.Formula;
 import com.fr.base.Style;
 import com.fr.base.TextFormat;
+import com.fr.design.actions.core.ActionFactory;
+import com.fr.design.actions.insert.cell.FormulaCellAction;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.grid.selection.CellSelection;
 import com.fr.quickeditor.CellQuickEditor;
@@ -77,6 +79,11 @@ public class CellFormulaQuickEditor extends CellQuickEditor {
         return content;
     }
 
+    @Override
+    public Object getComboBoxSelected() {
+        return ActionFactory.createAction(FormulaCellAction.class);
+    }
+
 
     private void changeReportPaneCell(String tmpText) {
         isEditing = true;

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

@@ -1,6 +1,8 @@
 package com.fr.quickeditor.cellquick;
 
 import com.fr.base.Style;
+import com.fr.design.actions.core.ActionFactory;
+import com.fr.design.actions.insert.cell.ImageCellAction;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.DesignerContext;
@@ -68,4 +70,8 @@ public class CellImageQuickEditor extends CellQuickEditor {
 
     }
 
+    @Override
+    public Object getComboBoxSelected() {
+        return ActionFactory.createAction(ImageCellAction.class);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.fr.quickeditor.cellquick;
 
+import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.insert.cell.RichTextCellAction;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.general.Inter;
@@ -32,6 +33,11 @@ public class CellRichTextEditor extends CellQuickEditor {
         return content;
     }
 
+    @Override
+    public Object getComboBoxSelected() {
+        return ActionFactory.createAction(RichTextCellAction.class);
+    }
+
     @Override
     protected void refreshDetails() {
         RichTextCellAction subReportCellAction = new RichTextCellAction(tc);

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

@@ -22,6 +22,9 @@ import java.awt.event.KeyEvent;
  *
  */
 public class CellStringQuickEditor extends CellQuickEditor {
+
+    //instance
+    private static CellStringQuickEditor THIS;
     //文本域
     //TODO 9.0 文本域要根据具体文本数量自适应大小，比较难搞，先跳过。
     private UITextField stringTextField;
@@ -148,4 +151,9 @@ public class CellStringQuickEditor extends CellQuickEditor {
         stringTextField.getDocument().addDocumentListener(documentListener);
     }
 
+    @Override
+    public Object getComboBoxSelected() {
+        return null;
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.fr.quickeditor.cellquick;
 
+import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.insert.cell.SubReportCellAction;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.general.Inter;
@@ -40,4 +41,9 @@ public class CellSubReportEditor extends CellQuickEditor {
         subReportButton.setAction(subReportCellAction);
     }
 
+    @Override
+    public Object getComboBoxSelected() {
+        return ActionFactory.createAction(SubReportCellAction.class);
+    }
+
 }

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

@@ -5,6 +5,10 @@ import com.fr.design.designer.TargetComponent;
 
 public abstract class TemplateComponentAction<T extends TargetComponent> extends UndoableAction implements TemplateComponentActionInterface<T> {
     private T t;
+
+    protected TemplateComponentAction() {
+    }
+
     protected TemplateComponentAction(T t) {
         this.t = t;
     }

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

@@ -5,6 +5,7 @@ import com.fr.base.Utils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.mainframe.JTemplate;
+import com.fr.design.menu.MenuKeySet;
 import com.fr.design.selection.QuickEditor;
 
 import javax.swing.*;
@@ -132,6 +133,17 @@ public class ActionFactory {
         return createEditor(clazz, cellEditor);
     }
 
+    public static UpdateAction createAction(Class clazz) {
+        try {
+            Constructor<? extends UpdateAction> c = clazz.getDeclaredConstructor();
+            c.setAccessible(true);
+            return c.newInstance();
+        } catch (Exception e) {
+            FRContext.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
     /**
      * peter:从Action来产生ToolTipText.
      *
@@ -200,6 +212,24 @@ public class ActionFactory {
         return actions.toArray(new UpdateAction[actions.size()]);
     }
 
+
+    public static MenuKeySet[] createCellInsertActionName() {
+        List<MenuKeySet> actionNames = new ArrayList<>();
+        for (Class<?> clazz : actionClasses) {
+            if (clazz == null) {
+                continue;
+            }
+            try {
+                Constructor<? extends UpdateAction> c = (Constructor<? extends UpdateAction>) clazz.getConstructor();
+                actionNames.add(c.newInstance().getMenuKeySet());
+
+            } catch (Exception e) {
+                FRContext.getLogger().error(e.getMessage(), e);
+            }
+        }
+        return actionNames.toArray(new MenuKeySet[actionNames.size()]);
+    }
+
     /**
      * 登记悬浮元素插入类型
      *