Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into release/9.0

designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java

@@ -159,7 +159,7 @@ public class ErrorInfoUploader {
         try {
             success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
         } catch (Exception ex) {
-            success = false;
+            success = true;
         }
         return success;
     }

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

@@ -22,7 +22,7 @@ public class OpenTemplateAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.OPEN_TEMPLATE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/open.png"));
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/open.png"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }
 

designer_base/src/com/fr/design/constants/UIConstants.java

@@ -106,6 +106,11 @@ public interface UIConstants {
     public static final Color TITLED_BORDER_COLOR = new Color(0xededee);
     public static final Color POP_DIALOG_BORDER = new Color(218, 218, 221);
     public static final Color PROPERTY_DIALOG_BORDER = new Color(0xc9c9cd);
+    public static final Color TAB_BUTTON_HOVER = new Color(231, 230, 235);
+    public static final Color TAB_BUTTON_HOVER_SELECTED = new Color(239, 238, 243);
+    public static final Color TAB_BUTTON_PRESS = new Color(228, 227, 232);
+    public static final Color TAB_BUTTON_PRESS_SELECTED = new Color(236, 236, 238);
+
 
 
     public static final BufferedImage DRAG_BAR = BaseUtils.readImage("com/fr/design/images/control/bar.png");

designer_base/src/com/fr/design/gui/controlpane/JListControlPane.java

@@ -360,7 +360,7 @@ public abstract class JListControlPane extends JControlPane {
             this.creator = creators[0];
             this.setName(Inter.getLocText("FR-Action_Add"));
             this.setMnemonic('A');
-            this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png"));
+            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
         }
 
         @Override

designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

@@ -447,7 +447,7 @@ public abstract class UIListControlPane extends UIControlPane {
             this.creator = creators[0];
             this.setName(Inter.getLocText("FR-Action_Add"));
             this.setMnemonic('A');
-            this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png"));
+            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
         }
 
         /**

designer_base/src/com/fr/design/gui/ibutton/UIButtonUI.java

@@ -42,19 +42,23 @@ public class UIButtonUI extends BasicButtonUI {
 
         ((Graphics2D) g).setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         if (b.isExtraPainted()) {
-            if (isPressed(b) && b.isPressedPainted()) {
+            doExtraPainting(b, g2d, w, h, selectedRoles);
-                GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles));
-            } else if (isRollOver(b)) {
-                GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted());
-            } else if (b.isNormalPainted()) {
-                GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted());
-            }
         }
         ((Graphics2D) g).setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
 
         paintContent(g, b, text);
     }
 
+    protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) {
+        if (isPressed(b) && b.isPressedPainted()) {
+            GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles));
+        } else if (isRollOver(b)) {
+            GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted());
+        } else if (b.isNormalPainted()) {
+            GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted());
+        }
+    }
+
     protected boolean isRollOver(AbstractButton b) {
         ButtonModel model = b.getModel();
         return model.isRollover() && !b.isSelected();

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

@@ -36,13 +36,11 @@ public class UIScrollPaneUI extends MetalScrollPaneUI implements PropertyChangeL
         // Note: It never happened before Java 1.5 that scrollbar is null
         JScrollBar sb = scrollpane.getHorizontalScrollBar();
         if (sb != null) {
-            sb.setBackground(Color.red);
             sb.putClientProperty(MetalScrollBarUI.FREE_STANDING_PROP, Boolean.FALSE);
         }
 
         sb = scrollpane.getVerticalScrollBar();
         if (sb != null) {
-            sb.setBackground(Color.red);
             sb.putClientProperty(MetalScrollBarUI.FREE_STANDING_PROP, Boolean.FALSE);
         }
     }

designer_base/src/com/fr/design/gui/style/BackgroundPane.java

@@ -33,6 +33,10 @@ public class BackgroundPane extends AbstractBasicStylePane {
 
     protected BackgroundQuickPane[] paneList;
 
+    //获取当前面板
+    protected JPanel currentPane = null;
+
+
     public BackgroundPane() {
         this.initComponents();
     }
@@ -141,6 +145,7 @@ public class BackgroundPane extends AbstractBasicStylePane {
             if (pane.accept(background)) {
                 pane.populateBean(background);
                 typeComboBox.setSelectedIndex(i);
+                currentPane = paneList[i];
                 return;
             }
         }

designer_base/src/com/fr/design/gui/style/BorderPane.java

@@ -16,6 +16,7 @@ import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane;
 import com.fr.design.style.color.NewColorSelectBox;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
@@ -202,12 +203,24 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
 
         CellBorderStyle cellBorderStyle = this.update();
         HashSet<String> borderSet = new HashSet<String>(Arrays.asList(BORDERARRAY));
-        if (borderSet.contains(globalNameListener.getGlobalName())) {
+        if (backgroundPane.currentPane != backgroundPane.paneList[1]){
-            style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(),
+            if (borderSet.contains(globalNameListener.getGlobalName())) {
-                    cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
+                style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(),
-        } else {
+                        cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
-            style = style.deriveBackground(backgroundPane.update());
+                style = style.deriveBackground(backgroundPane.update());
+            } else {
+                style = style.deriveBackground(backgroundPane.update());
+            }
+        }else {
+            if (borderSet.contains(globalNameListener.getGlobalName()) && !((ColorBackgroundQuickPane) backgroundPane.currentPane).isBackGroundColor()){
+                style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(),
+                        cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
+                style = style.deriveBackground(backgroundPane.update());
+            } else {
+                style = style.deriveBackground(backgroundPane.update());
+            }
         }
+
         return style;
     }
 

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

@@ -171,7 +171,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
         public OpenReportAction() {
             this.setName(KeySetUtils.OPEN_TEMPLATE.getMenuKeySetName());
-            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/open.png"));
+            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/open.png"));
         }
 
         @Override

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

@@ -4,10 +4,12 @@ import com.fr.base.BaseUtils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIButtonUI;
 import com.fr.design.gui.icontainer.UIEastResizableContainer;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.VerticalFlowLayout;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
 import com.fr.general.Inter;
@@ -38,7 +40,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     private static final int ARROW_RANGE_START = CONTENT_WIDTH - 30;
     // 弹出对话框高度
     private static final int POPUP_MIN_HEIGHT = 145;
-    private static final int POPUP_MAX_HEIGHT = 480;
     private static final int POPUP_DEFAULT_HEIGHT = 356;
     public static final String KEY_CELL_ELEMENT = "cellElement";
     public static final String KEY_CELL_ATTR = "cellAttr";
@@ -521,6 +522,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             }
         }
 
+        public void reAddContentArea() {
+            propertyPanel.add(contentArea, BorderLayout.CENTER);
+        }
+
         public boolean isVisible() {
             return isVisible;
         }
@@ -578,7 +583,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 popupDialog.replaceContentPane(this);
             }
             if (popupPane != null && !isRightPaneVisible()) {
-                popupPane.replaceContentPane(contentPane);
+                popupPane.replaceContentPane(contentArea);
             }
 
             refreshContainer();
@@ -588,6 +593,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             return contentPane;
         }
 
+        public Container getContentArea() {
+            return contentArea;
+        }
+
         public void replaceHeaderPane(JComponent pane) {
             contentArea.remove(headerPane);
             int height = Math.min(pane.getPreferredSize().height, MAX_PARA_HEIGHT);
@@ -612,7 +621,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 hideCurrentPopupPane();
                 replaceContentPane(contentPane);
             } else if(popupPane != null) {
-                popupPane.replaceContentPane(contentPane);
+                popupPane.replaceContentPane(contentArea);
             }
         }
 
@@ -638,6 +647,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             selectedItem = this;
         }
 
+        private boolean isTabButtonSelected() {
+            return button.getBackground() == selectedBtnBackground;
+        }
+
         private void initButton() {
             button = new UIButton(BaseUtils.readIcon(getBtnIconUrl())) {
                 public Dimension getPreferredSize() {
@@ -649,6 +662,20 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 }
             };
             button.set4LargeToolbarButton();
+            button.setUI(new UIButtonUI() {
+                @Override
+                protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) {
+                    if (isPressed(b) && b.isPressedPainted()) {
+                        Color pressColor = isTabButtonSelected() ? UIConstants.TAB_BUTTON_PRESS_SELECTED : UIConstants.TAB_BUTTON_PRESS;
+                        GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), pressColor);
+                    } else if (isRollOver(b)) {
+                        Color hoverColor = isTabButtonSelected() ? UIConstants.TAB_BUTTON_HOVER_SELECTED : UIConstants.TAB_BUTTON_HOVER;
+                        GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), hoverColor);
+                    } else if (b.isNormalPainted()) {
+                        GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted());
+                    }
+                }
+            });
             originBtnBackground = button.getBackground();
             button.addActionListener(new ActionListener() {
                 @Override
@@ -714,6 +741,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             if (isPoppedOut) {
                 isPoppedOut = false;
                 popupDialog.setVisible(false);
+                reAddContentArea();
                 initContentPane();
                 onResize();
                 if (isEnabled()) {
@@ -726,9 +754,12 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     }
 
     private class FixedPopupPane extends JPopupMenu {
-        private JComponent contentPane;
+        private Container contentPane;
+        private PropertyItem propertyItem;
+
         FixedPopupPane(PropertyItem propertyItem) {
-            contentPane = propertyItem.getContentPane();
+            this.propertyItem = propertyItem;
+            contentPane = propertyItem.getContentArea();
             this.setLayout(new BorderLayout());
             this.add(new PopupToolPane(propertyItem), BorderLayout.NORTH);
             this.add(contentPane, BorderLayout.CENTER);
@@ -736,14 +767,24 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             setPreferredSize(new Dimension(CONTAINER_WIDTH - TAB_WIDTH, POPUP_DEFAULT_HEIGHT));
         }
 
+        @Override
+        public void setVisible(boolean visible) {
+            super.setVisible(visible);
+            if (visible == true) {
+                replaceContentPane(propertyItem.getContentArea());
+            } else {
+                propertyItem.reAddContentArea();
+            }
+        }
+
         public void menuSelectionChanged(boolean isIncluded) {
         }
 
-        public JComponent getContentPane() {
+        public Container getContentPane() {
             return contentPane;
         }
 
-        public void replaceContentPane(JComponent pane) {
+        public void replaceContentPane(Container pane) {
             this.remove(this.contentPane);
             this.add(this.contentPane = pane);
             refreshContainer();
@@ -920,7 +961,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         private Point mouseDownCompCoords;
         private JPanel contentWrapper;
 
-        private JComponent contentPane;
+        private Container contentPane;
         private JPanel defaultPane;  // 无可用配置项
         private PropertyItem propertyItem;
         public PopupDialog(PropertyItem propertyItem) {
@@ -930,7 +971,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             this.propertyItem = propertyItem;
             PopupToolPane popupToolPane = new PopupToolPane(propertyItem, PopupToolPane.UP_BUTTON);
             popupToolPane.setParentDialog(this);
-            contentPane = propertyItem.getContentPane();
+            contentPane = propertyItem.getContentArea();
 
             contentWrapper = new JPanel(new BorderLayout());
             contentWrapper.add(popupToolPane, BorderLayout.NORTH);
@@ -969,10 +1010,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
 
         public void replaceContentPane(PropertyItem propertyItem) {
             this.propertyItem = propertyItem;
-            replaceContentPane(propertyItem.getContentPane());
+            replaceContentPane(propertyItem.getContentArea());
         }
 
-        public void replaceContentPane(JComponent contentPane) {
+        public void replaceContentPane(Container contentPane) {
             contentWrapper.remove(this.contentPane);
             contentWrapper.add(this.contentPane = contentPane, BorderLayout.CENTER);
             refreshContainer();
@@ -996,9 +1037,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                         if (bounds.height < POPUP_MIN_HEIGHT) {
                             bounds.height = POPUP_MIN_HEIGHT;
                         }
-                        if (bounds.height > POPUP_MAX_HEIGHT) {
-                            bounds.height = POPUP_MAX_HEIGHT;
-                        }
                         mouseDownCompCoords.y = currCoords.y;
                         setBounds(bounds);
                     }

designer_base/src/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java

@@ -18,6 +18,7 @@ import java.awt.*;
 public class ColorBackgroundQuickPane extends BackgroundQuickPane {
 
 	private NewColorSelectPane detailColorSelectPane;
+	private boolean isBackGroundColor;
 
 	public ColorBackgroundQuickPane() {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
@@ -28,6 +29,7 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
 
 	public void populateBean(Background background) {
 		ColorBackground colorBackgroud = (ColorBackground) background;
+		isBackGroundColor = false;
 		this.detailColorSelectPane.setColor(colorBackgroud.getColor());
 	}
 
@@ -36,6 +38,10 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
 		return ColorBackground.getInstance(this.detailColorSelectPane.getNotNoneColor());
 	}
 
+	public boolean isBackGroundColor(){
+		return isBackGroundColor;
+	}
+
 	/**
 	 * 给组件登记一个观察者监听事件
 	 *
@@ -45,6 +51,7 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
 		detailColorSelectPane.addChangeListener(new ChangeListener() {
 			public void stateChanged(ChangeEvent e) {
 				listener.doChange();
+				isBackGroundColor = true;
 			}
 		});
 	}

designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java

@@ -1,7 +1,6 @@
 package com.fr.design.roleAuthority;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRCoreContext;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
@@ -15,7 +14,6 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DockingView;
 import com.fr.design.menu.ToolBarDef;
 import com.fr.general.Inter;
-import com.fr.general.VT4FR;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -184,16 +182,9 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
     }
 
     private void initbuttonGroup() {
-        isSupportFS = supportFineDecision();
+    
-        Icon[] iconArray = null;
+        Icon[] iconArray = new Icon[]{BaseUtils.readIcon("/com/fr/web/images/platform/demo.png")};
-        String[] textArray = null;
+        String[] textArray = new String[]{Inter.getLocText("FR-Designer_FS_Name")};
-        if (isSupportFS) {
-            iconArray = new Icon[]{BaseUtils.readIcon("/com/fr/web/images/platform/demo.png")};
-            textArray = new String[]{Inter.getLocText("FR-Designer_FS_Name")};
-        } else {
-            iconArray = new Icon[]{BaseUtils.readIcon("/com/fr/web/images/platform/platform_16_16.png")};
-            textArray = new String[]{Inter.getLocText("M_Server-Platform_Manager")};
-        }
         buttonGroup = new UIHeadGroup(iconArray, textArray) {
             public void tabChanged(int index) {
                 roleTree.setEditable(false);
@@ -212,11 +203,6 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
         buttonGroup.setNeedLeftRightOutLine(false);
     }
 
-    private boolean supportFineDecision() {
-        byte[] bytes = FRCoreContext.getBytes();
-        return VT4FR.isLicAvailable(bytes) && VT4FR.FS_BI.support();
-    }
-
     private int getMode(){
         return isSupportFS?FS_MANAGE: REPORT_PLATEFORM_MANAGE;
     }

designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java

@@ -85,13 +85,18 @@ public class GUIPaintUtils {
      * @param isPressedPainted 是否按压画
      */
     public static final void fillRollOver(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection, boolean isAuthorityEdited, boolean isPressedPainted) {
+        fillRollOver(g2d, x, y, width, height, isRound, rectDirection, isAuthorityEdited, isPressedPainted, null);
+    }
+
+    public static final void fillRollOver(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection, boolean isAuthorityEdited, boolean isPressedPainted, Color hoverColor) {
         GradientPaint gp;
-        if (BaseUtils.isAuthorityEditing() && isAuthorityEdited) {
+        if (hoverColor != null) {
+            gp = new GradientPaint(1, 1, hoverColor, 1, height - 1, hoverColor);
+        } else if (BaseUtils.isAuthorityEditing() && isAuthorityEdited) {
             gp = new GradientPaint(1, 1, UIConstants.AUTHORITY_BLUE, 1, height - 1, UIConstants.HOVER_BLUE);
         } else if (isPressedPainted) {
             gp = new GradientPaint(1, 1, UIConstants.ATTRIBUTE_HOVER, 1, height - 1, UIConstants.ATTRIBUTE_HOVER);
-        }else {
+        } else {
-//            gp = new GradientPaint(1, 1, UIConstants.NORMAL_BACKGROUND, 1, height - 1, UIConstants.HOVER_BLUE);
             gp = new GradientPaint(1, 1, UIConstants.HOVER_BLUE, 1, height - 1, UIConstants.HOVER_BLUE);
         }
         fillPaint(g2d, x, y, width, height, isRound, rectDirection, gp, UIConstants.ARC);
@@ -110,8 +115,14 @@ public class GUIPaintUtils {
      *
      */
     public static final void fillPressed(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection, boolean isAuthorityEdited) {
+        fillPressed(g2d, x, y, width, height, isRound, rectDirection, isAuthorityEdited, null);
+    }
+
+    public static final void fillPressed(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection, boolean isAuthorityEdited, Color pressedColor) {
         Color oldColor = g2d.getColor();
-        if (BaseUtils.isAuthorityEditing() && isAuthorityEdited) {
+        if (pressedColor != null) {
+            g2d.setColor(pressedColor);
+        } else if (BaseUtils.isAuthorityEditing() && isAuthorityEdited) {
             g2d.setColor(UIConstants.AUTHORITY_PRESS_BLUE);
         } else {
             g2d.setColor(UIConstants.ATTRIBUTE_PRESS);

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

@@ -64,6 +64,8 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
             setDebugEnv();
         }
         RestartHelper.deleteRecordFilesWhenStart();
+        //初始化插件引擎
+        PluginStartup.start();
         
         SiteCenter.getInstance();
 
@@ -95,8 +97,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         DesignUtils.initLookAndFeel();
 
         DesignUtils.creatListeningServer(getStartPort(), startFileSuffix());
-        //初始化插件引擎
+    
-        PluginStartup.start();
         // 初始化Log Handler
         DesignerEnvManager.loadLogSetting();
         DesignerFrame df = createDesignerFrame();

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

@@ -114,7 +114,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
     }
 
     private JPanel createTitleStylePane() {
-        UILabel text = new UILabel(Inter.getLocText("Plugin-Chart_Character"), SwingConstants.LEFT);
+        final UILabel text = new UILabel(Inter.getLocText("Plugin-Chart_Character"), SwingConstants.LEFT);
         styleAttrPane = new ChartTextAttrPane() {
             protected JPanel getContentPane(JPanel buttonPane) {
                 double p = TableLayout.PREFERRED;

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

@@ -37,12 +37,9 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane
 		valueBox = new UIComboBox();
 		filterPane = new ChartDataFilterPane(new MeterPlot(), parent);
 
-		nameBox.setPreferredSize(new Dimension(100, 20));
-		valueBox.setPreferredSize(new Dimension(100, 20));
-
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
-		double[] columnSize = { p,f};
+		double[] columnSize = {f, COMPONENT_WIDTH};
 		double[] rowSize = {p, p};
 
         Component[][] components = createComponents();

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

@@ -216,7 +216,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
             @Override
             public void mouseClicked(MouseEvent e) {
                 if (valueFormatPane == null) {
-                    valueFormatPane = new FormatPane();
+                    valueFormatPane = new FormatPaneWithOutFont();
                 }
                 Point comPoint = dataPointValueFormat.getLocationOnScreen();
                 Point arrowPoint = new Point(comPoint.x - DET, comPoint.y + dataPointValueFormat.getHeight());

designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java

@@ -111,7 +111,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
             return null;
         }
         zoomWidget = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")});
-        zoomResize = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")});
+        zoomResize = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Change"), Inter.getLocText("Plugin-ChartF_Non_Adjustment")});
         from = new TinyFormulaPane();
         to = new TinyFormulaPane();
         zoomType = new UIButtonGroup(getNameArray(), getValueArray());

designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartTooltipPane.java

@@ -58,12 +58,12 @@ public class VanChartTooltipPane extends AbstractVanChartScrollPane<Chart> {
         if(chart == null) {
             return;
         }
-        ConditionAttr attrList = chart.getPlot().getConditionCollection().getDefaultAttr();
+        AttrTooltip attrTooltip = tooltipPane.update();
         DataSeriesCondition attr = ((VanChartPlot)chart.getPlot()).getAttrTooltipFromConditionCollection();
+        ConditionAttr attrList = chart.getPlot().getConditionCollection().getDefaultAttr();
         if(attr != null) {
             attrList.remove(attr);
         }
-        AttrTooltip attrTooltip = tooltipPane.update();
         if (attrTooltip != null) {
             attrList.addDataSeriesCondition(attrTooltip);
         }

designer_chart/src/com/fr/plugin/chart/structure/desinger/data/StructurePlotTableDataContentPane.java

@@ -31,7 +31,7 @@ public class StructurePlotTableDataContentPane extends AbstractTableDataContentP
     public StructurePlotTableDataContentPane() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {p, f};
+        double[] columnSize = {f, COMPONENT_WIDTH};
         double[] rowSize = {p, p, p, p, p, p};
 
         nodeName = new UIComboBox();