REPORT-2897

右侧属性面板上的弹窗修改（参数面板和超级链接），加入rePaint参数区分菜单栏弹窗和属性面板的弹窗

designer/src/com/fr/design/actions/insert/flot/ChartFloatAction.java

@@ -36,7 +36,7 @@ public class ChartFloatAction extends ElementCaseAction {
     public ChartFloatAction(ElementCasePane t) {
         super(t);
         this.setMenuKeySet(FLOAT_INSERT_CHART);
-        this.setName(getMenuKeySet().getMenuKeySetName() + "...");
+        this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/chart.png"));
     }

designer/src/com/fr/design/actions/insert/flot/FormulaFloatAction.java

@@ -27,7 +27,7 @@ public class FormulaFloatAction extends AbstractShapeAction {
     public FormulaFloatAction(ElementCasePane t) {
         super(t);
         this.setMenuKeySet(FLOAT_INSERT_FORMULA);
-        this.setName(getMenuKeySet().getMenuKeySetName() + "...");
+        this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));
     }

designer/src/com/fr/design/actions/insert/flot/ImageFloatAction.java

@@ -34,7 +34,7 @@ public class ImageFloatAction extends ElementCaseAction {
     public ImageFloatAction(ElementCasePane t) {
         super(t);
         this.setMenuKeySet(FLOAT_INSERT_IMAGE);
-        this.setName(getMenuKeySet().getMenuKeySetName() + "...");
+        this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/image.png"));
     }

designer/src/com/fr/design/actions/insert/flot/TextBoxFloatAction.java

@@ -26,7 +26,7 @@ public class TextBoxFloatAction extends AbstractShapeAction {
     public TextBoxFloatAction(ElementCasePane t) {
         super(t);
         this.setMenuKeySet(FLOAT_INSERT_TEXT);
-        this.setName(getMenuKeySet().getMenuKeySetName() + "...");
+        this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/text.png"));
     }

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

@@ -67,7 +67,7 @@ public class ReportFloatPane extends JPanel {
     }
 
     private MenuDef createInsertToolBar() {
-        MenuDef insertFloatMenu = new MenuDef();
+        MenuDef insertFloatMenu = new MenuDef(true);
         insertFloatMenu.setName(KeySetUtils.INSERT_FLOAT.getMenuKeySetName());
         insertFloatMenu.setTooltip(Inter.getLocText("FR-Designer_T_Insert_Float"));
         insertFloatMenu.setIconPath("com/fr/design/images/control/addPopup.png");

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

@@ -11,6 +11,7 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.UICheckBoxMenuItem;
 import com.fr.design.gui.imenu.UIMenuItem;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.selection.SelectionListener;
 import com.fr.general.ComparatorUtils;
@@ -48,6 +49,11 @@ public abstract class UpdateAction extends ShortCut implements Action {
 	 */
 	private boolean enabled = true;
 
+	/**
+	 * Specifies whether action is rePaint; the default is false.
+	 */
+	private boolean rePaint = false;
+
 	/**
 	 * Contains the array of key bindings.
 	 * august:关键词key，是Action里面的final常量，如：Action.NAME、Action.SMALL_ICON等等
@@ -249,7 +255,7 @@ public abstract class UpdateAction extends ShortCut implements Action {
 
 			this.putValue(UIMenuItem.class.getName(), object);
 		}
-
+		((UIMenuItem) object).setRePaint(this.rePaint);
 		return (UIMenuItem) object;
 	}
 
@@ -317,7 +323,9 @@ public abstract class UpdateAction extends ShortCut implements Action {
 	@Override
 	public void intoJPopupMenu(JPopupMenu menu) {
 		update();
-
+		if (menu instanceof UIPopupMenu){
+			this.rePaint = ((UIPopupMenu) menu).getRePaint();
+		}
 		menu.add(this.createMenuItem());
 	}
 

designer_base/src/com/fr/design/gui/imenu/UIMenuItem.java

@@ -1,17 +1,19 @@
 package com.fr.design.gui.imenu;
 
-import java.awt.*;
-
-import javax.swing.*;
-import javax.swing.plaf.basic.BasicMenuItemUI;
-
 import com.fr.design.constants.UIConstants;
+import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
-import com.fr.design.utils.gui.GUIPaintUtils;
 import sun.swing.SwingUtilities2;
 
-public class UIMenuItem extends JMenuItem{
+import javax.swing.*;
+import javax.swing.plaf.basic.BasicMenuItemUI;
+import java.awt.*;
+
+public class UIMenuItem extends JMenuItem {
+
+    private boolean rePaint = false;
+
     public UIMenuItem() {
         this(StringUtils.BLANK);
     }
@@ -38,6 +40,10 @@ public class UIMenuItem extends JMenuItem{
 		setAction(action);
 	}
 
+	public void setRePaint(boolean rePaint){
+        this.rePaint = rePaint;
+    }
+
 	@Override
 	public String getText() {
 		return StringUtils.BLANK + super.getText();
@@ -47,21 +53,34 @@ public class UIMenuItem extends JMenuItem{
         @Override
         protected void paintBackground(Graphics g, JMenuItem menuItem,Color bgColor) {
             if(menuItem.getIcon() == null) {
+                if (!rePaint){
                     super.paintBackground(g, menuItem, bgColor);
                     return;
                 }
+            }
+            if (rePaint){
+                menuItem.setIcon(null);
+            }
             ButtonModel model = menuItem.getModel();
             Color oldColor = g.getColor();
             int menuWidth = menuItem.getWidth();
             int menuHeight = menuItem.getHeight();
-
             g.setColor(UIConstants.NORMAL_BACKGROUND);
             g.fillRect(0, 0, menuWidth, menuHeight);
-            if(menuItem.isOpaque()) {
-                if (model.isArmed()|| (menuItem instanceof JMenu && model.isSelected())) {
-                    GUIPaintUtils.fillPaint((Graphics2D)g, 30, 0, menuWidth - 30, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7);
+
+            if (menuItem.isOpaque()) {
+                if (!rePaint) {
+                    if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) {
+                        GUIPaintUtils.fillPaint((Graphics2D) g, 30, 0, menuWidth - 30, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7);
                     } else {
-                    GUIPaintUtils.fillPaint((Graphics2D)g, 30, 0, menuWidth - 30, menuHeight, true, Constants.NULL, menuItem.getBackground(), 7);
+                        GUIPaintUtils.fillPaint((Graphics2D) g, 30, 0, menuWidth - 30, menuHeight, true, Constants.NULL, menuItem.getBackground(), 7);
+                    }
+                } else {
+                    if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) {
+                        GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 0);
+                    } else {
+                        GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.TOOLBARUI_BACKGROUND, 0);
+                    }
                 }
                 g.setColor(oldColor);
             }
@@ -92,6 +111,9 @@ public class UIMenuItem extends JMenuItem{
                             -1,  textRect.x - 1, textRect.y +
                             fm.getAscent() - 1);
                 }
+            } else if (rePaint) {
+                SwingUtilities2.drawStringUnderlineCharAt(menuItem, g, text,
+                        -1, 0, textRect.y + fm.getAscent());
             } else {
                 // *** paint the text normally
                 if (model.isArmed()|| (menuItem instanceof JMenu && model.isSelected())) {
@@ -102,6 +124,6 @@ public class UIMenuItem extends JMenuItem{
             }
         }
 
-    }
 
+    }
 }

designer_base/src/com/fr/design/gui/imenu/UIPopupMenu.java

@@ -7,26 +7,47 @@ import javax.swing.JPopupMenu;
 
 import com.fr.design.constants.UIConstants;
 
-public class UIPopupMenu extends JPopupMenu{
+public class UIPopupMenu extends JPopupMenu {
     private boolean onlyText = false;
+    private boolean rePaint = false;
+
     public UIPopupMenu() {
         super();
         setBackground(UIConstants.NORMAL_BACKGROUND);
     }
 
+    public UIPopupMenu(boolean rePaint) {
+        super();
+        this.rePaint = rePaint;
+        setBackground(UIConstants.TOOLBARUI_BACKGROUND);
+    }
+
+    public boolean getRePaint() {
+        return this.rePaint;
+    }
+
     @Override
     protected void paintBorder(Graphics g) {
+        if (rePaint) {
+            g.setColor(UIConstants.POP_DIALOG_BORDER);
+            g.drawRect(0, 0, getWidth() - 1, getHeight() - 1);
+        } else {
             g.setColor(UIConstants.LINE_COLOR);
             g.drawRect(0, 0, getWidth() - 1, getHeight() - 1);
         }
+    }
 
     @Override
     public Insets getInsets() {
-		if(onlyText) {
+        if (onlyText) {
             return super.getInsets();
         }
+        if (rePaint) {
+            return new Insets(0, 1, 1, 1);
+        } else {
             return new Insets(10, 2, 10, 10);
         }
+    }
 
     public void setOnlyText(boolean onlyText) {
         this.onlyText = onlyText;

designer_base/src/com/fr/design/menu/MenuDef.java

@@ -13,7 +13,10 @@ import javax.swing.*;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ContainerListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,7 +25,10 @@ import java.util.List;
  */
 public class MenuDef extends ShortCut {
 
+    private static final int MENU_DEFAULTWDITH = 156;
     protected String name;
+    //右侧属性表弹出框重绘
+    protected Boolean rePaint = false;
     protected char mnemonic;
     protected String iconPath;
     protected String tooltip;
@@ -44,6 +50,10 @@ public class MenuDef extends ShortCut {
         this.setName(name);
     }
 
+    public MenuDef(Boolean rePaint) {
+        this.setRePaint(rePaint);
+    }
+
     public MenuDef(String name, char mnemonic) {
         this.setName(name);
         this.setMnemonic(mnemonic);
@@ -57,6 +67,14 @@ public class MenuDef extends ShortCut {
         this.name = name;
     }
 
+    public boolean getRePaint() {
+        return rePaint;
+    }
+
+    public void setRePaint(boolean rePaint) {
+        this.rePaint = rePaint;
+    }
+
     public char getMnemonic() {
         return mnemonic;
     }
@@ -99,6 +117,7 @@ public class MenuDef extends ShortCut {
 
     /**
      * 插入菜单项
+     *
      * @param index    插入的位置
      * @param shortCut 菜单信息
      */
@@ -110,6 +129,7 @@ public class MenuDef extends ShortCut {
 
     /**
      * 用可变参数，方便添加数组
+     *
      * @param shortcut 参数   存储菜单项信息
      */
     public void addShortCut(ShortCut... shortcut) {
@@ -132,6 +152,7 @@ public class MenuDef extends ShortCut {
 
     /**
      * 生成UIButton
+     *
      * @return 菜单按钮
      */
     public UIButton createUIButton() {
@@ -157,6 +178,7 @@ public class MenuDef extends ShortCut {
 
     /**
      * 生成JMenu
+     *
      * @return 菜单
      */
     public UIMenu createJMenu() {
@@ -172,7 +194,7 @@ public class MenuDef extends ShortCut {
             }
             createdJMenu.addMenuListener(menuDefListener);
             ContainerListener listener = getContainerListener();
-			if(listener != null){
+            if (listener != null) {
                 createdJMenu.getPopupMenu().addContainerListener(listener);
             }
         }
@@ -183,8 +205,10 @@ public class MenuDef extends ShortCut {
     protected ContainerListener getContainerListener() {
         return null;
     }
+
     /**
      * 生成 JPopupMenu
+     *
      * @return 弹出菜单
      */
     public JPopupMenu createJPopupMenu() {
@@ -195,6 +219,7 @@ public class MenuDef extends ShortCut {
 
     /**
      * 设置是否可用
+     *
      * @param b 布尔型
      */
     @Override
@@ -212,6 +237,7 @@ public class MenuDef extends ShortCut {
 
     /**
      * 按钮状态
+     *
      * @return 状态
      */
     @Override
@@ -235,6 +261,7 @@ public class MenuDef extends ShortCut {
 
     /**
      * 更新菜单
+     *
      * @param popupMenu 菜单
      */
     protected void updatePopupMenu(JPopupMenu popupMenu) {
@@ -263,32 +290,69 @@ public class MenuDef extends ShortCut {
             isFirstItem = false;
         }
 
-		if (createdJMenu != null && createdJMenu.getPopupMenu() != null){
+        if (createdJMenu != null && createdJMenu.getPopupMenu() != null) {
+            setEnabled(createdJMenu.getPopupMenu().getComponentCount() > 0 && enabled);
+        }
+    }
+
+    /**
+     * 更新右侧属性面板菜单
+     *
+     * @param popupMenu 菜单
+     */
+    protected void updateEastPopupMenu(JPopupMenu popupMenu) {
+        removeComponent(popupMenu);
+        this.popupMenu = popupMenu;
+        // 一开始是不能插入分隔符的
+        boolean nec_seperator = false;
+        boolean isFirstItem = true;
+        int actionCount = this.getShortCutCount();
+        for (int i = 0; i < actionCount; i++) {
+            ShortCut shortcut = this.getShortCut(i);
+
+            // 如果shortcut是SeparatorDef,先不加,先标记一下nec_seperator为true,等下一个shortcut需要加到PopupMenu时再加
+            if (shortcut instanceof SeparatorDef) {
+                nec_seperator = true;
+                continue;
+            }
+            if (nec_seperator) {
+                if (!isFirstItem) {
+                    SeparatorDef.DEFAULT.intoJPopupMenu(popupMenu);
+                }
+                nec_seperator = false;
+            }
+            shortcut.intoJPopupMenu(popupMenu);
+            isFirstItem = false;
+        }
+
+        if (createdJMenu != null && createdJMenu.getPopupMenu() != null) {
             setEnabled(createdJMenu.getPopupMenu().getComponentCount() > 0 && enabled);
         }
     }
 
     /**
      * 删除所有组件 除了滚动条
+     *
      * @param popupMenu 菜单
      */
-	public void removeComponent(JPopupMenu popupMenu){
+    public void removeComponent(JPopupMenu popupMenu) {
         UIScrollBar uiScrollBar = new UIScrollBar();
-		if(hasScrollSubMenu){
-			for(Component comp : popupMenu.getComponents()){
-				if(comp instanceof UIScrollBar){
-					uiScrollBar =(UIScrollBar) comp;
+        if (hasScrollSubMenu) {
+            for (Component comp : popupMenu.getComponents()) {
+                if (comp instanceof UIScrollBar) {
+                    uiScrollBar = (UIScrollBar) comp;
                 }
             }
         }
         popupMenu.removeAll();
-		if(hasScrollSubMenu){
+        if (hasScrollSubMenu) {
             popupMenu.add(uiScrollBar);
         }
     }
 
     /**
      * 添加菜单项
+     *
      * @param menu 菜单
      */
     @Override
@@ -300,6 +364,7 @@ public class MenuDef extends ShortCut {
 
     /**
      * 添加
+     *
      * @param toolBar 菜单条
      */
     @Override
@@ -336,13 +401,19 @@ public class MenuDef extends ShortCut {
             if (!button.isEnabled()) {
                 return;
             }
-
-			UIPopupMenu popupMenu = new UIPopupMenu();
+            if (rePaint) {
+                popupMenu = new UIPopupMenu(rePaint);
+                popupMenu.setInvoker(button);
+                MenuDef.this.updateEastPopupMenu(popupMenu);
+                popupMenu.setPopupSize(new Dimension(MENU_DEFAULTWDITH, popupMenu.getPreferredSize().height));
+                GUICoreUtils.showPopupMenu(popupMenu, button, 0, button.getSize().height);
+            } else {
+                popupMenu = new UIPopupMenu();
                 popupMenu.setInvoker(button);
                 MenuDef.this.updatePopupMenu(popupMenu);
-
                 GUICoreUtils.showPopupMenu(popupMenu, button, 0, button.getSize().height);
             }
+        }
     };