Merge remote-tracking branch 'origin/release/9.0' into release/9.0

designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java

@@ -36,6 +36,7 @@ public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition>
 
 	@Override
 	protected void clearDefaultConditionPane() {
+		((ObjectConditionPane)defaultConditionPane).clearConditionValuePane();
         defaultConditionPane.populateBean(new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY)));
     }
 
@@ -48,6 +49,10 @@ public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition>
 			this.initComponents();
 		}
 
+		private void clearConditionValuePane() {
+			conditionValuePane.clearComponentsData();
+		}
+
 		protected void initComponents() {
 			this.setLayout(FRGUIPaneFactory.createBorderLayout());
 			// condition operation

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

@@ -161,6 +161,7 @@ public interface UIConstants {
     public static final Icon DELETE_ICON = BaseUtils.readIcon("com/fr/design/images/m_file/close.png");
     public static final Icon EDIT_ICON = BaseUtils.readIcon("com/fr/design/images/m_file/edit.png");
     public static final Icon SEARCH_ICON = BaseUtils.readIcon("/com/fr/design/images/data/search.png");
+    public static final Icon BLACK_SEARCH_ICON = BaseUtils.readIcon("/com/fr/design/images/data/black_search.png");
     public static final Icon CLEAR_ICON = BaseUtils.readIcon("/com/fr/design/images/data/source/delete.png");
     public static final Icon LIST_EDIT_ICON = BaseUtils.readIcon("/com/fr/design/images/control/edit.png");
     public static final Icon LIST_EDIT_WHITE_ICON = BaseUtils.readIcon("/com/fr/design/images/control/edit_white.png");

designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java

@@ -102,4 +102,9 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
 		}
 	}
 
+	@Override
+	public void clearData() {
+        tableDataComboBox.setSelectedItem(null);
+        columnNameComboBox.setSelectedItem(null);
+    }
 }

designer_chart/src/com/fr/design/chart/series/PlotStyle/ChartSelectDemoPane.java

@@ -1,19 +1,17 @@
 package com.fr.design.chart.series.PlotStyle;
 
-import java.awt.Color;
+import com.fr.design.dialog.BasicPane;
-import java.awt.Dimension;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.ArrayList;
-
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
-import com.fr.design.dialog.BasicPane;
 import com.fr.stable.ArrayUtils;
 
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.ArrayList;
+
 /**
  *  图表选中demo的类. 用于 选中点击, 悬浮状态, 可以继承, 改变画的内容.
  * @author kunsnat E-mail:kunsnat@gmail.com
@@ -27,7 +25,7 @@ public class ChartSelectDemoPane extends BasicPane implements UIObserver, MouseL
 	// 所有统一参与的点击状态类. 相当于Group
 	protected ChartSelectDemoPane[] demoList = new ChartSelectDemoPane[0];
 
-	private boolean isRollOver;
+	protected boolean isRollOver;
 	private ArrayList<ChangeListener> changeListeners = new ArrayList<ChangeListener>();
 
 	public void setDemoGroup(ChartSelectDemoPane[] demos) {
@@ -56,7 +54,7 @@ public class ChartSelectDemoPane extends BasicPane implements UIObserver, MouseL
             fireStateChange();
 
             for (int i = 0; i < ArrayUtils.getLength(demoList); i++) {
-                demoList[i].checkBackground();
+                demoList[i].checkBorder();
                 demoList[i].repaint();
             }
         }
@@ -102,7 +100,7 @@ public class ChartSelectDemoPane extends BasicPane implements UIObserver, MouseL
             isRollOver = true;
 
             for (int i = 0; i < ArrayUtils.getLength(demoList); i++) {
-                demoList[i].checkBackground();
+                demoList[i].checkBorder();
                 demoList[i].repaint();
             }
         }
@@ -126,7 +124,7 @@ public class ChartSelectDemoPane extends BasicPane implements UIObserver, MouseL
             }
 
             for (int i = 0; i < ArrayUtils.getLength(demoList); i++) {
-                demoList[i].checkBackground();
+                demoList[i].checkBorder();
                 demoList[i].repaint();
             }
         }
@@ -159,15 +157,10 @@ public class ChartSelectDemoPane extends BasicPane implements UIObserver, MouseL
 	}
 
 	/**
-     * 修改背景颜色
+	 * 修改边框颜色
 	 */
-	public void checkBackground() {
+	public void checkBorder() {
-		if (!isRollOver &&  !isPressing) {
+		this.setBorder(null);
-			this.setBackground(null);
+
-		} else if(isRollOver && !isPressing){
-			this.setBackground(new Color(182, 217, 253));
-		} else {
-			this.setBackground(new Color(164, 192, 220));
-		}
 	}
 }

designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartAccColorPane.java

@@ -16,7 +16,6 @@ import javax.swing.event.ChangeListener;
 import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.awt.geom.Rectangle2D;
 
 /**
  * 图表颜色填充--32种精确颜色选择界面.
@@ -66,10 +65,8 @@ public class ChartAccColorPane extends BasicPane implements MouseListener, UIObs
 		Graphics2D g2d = (Graphics2D) g;
 		super.repaint();
 
-		Rectangle2D bounds = this.getBounds();
+		this.setLayout(null);
-		if(bounds == null) {
+		this.setBounds(0,0,WIDTH*ROWCOUNT, WIDTH*4);
-			return;
-		}
 		Paint oldPaint = g2d.getPaint();
         g2d.setPaint(new Color(212, 212, 216));
         g2d.fillRect(0, 0, WIDTH*ROWCOUNT, WIDTH*4);

designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java

@@ -94,7 +94,7 @@ public class ChartFillStylePane extends BasicBeanPane<AttrFillStyle>{
 	}
 	
 	protected void initLayout() {
-		customPane.setPreferredSize(new Dimension(200, 130));
+		customPane.setPreferredSize(new Dimension(200, 100));
 		colorGradient.setPreferredSize(new Dimension(120, 30));
 		
 

designer_chart/src/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java

@@ -128,7 +128,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
         int iconLen = iconPaths.length;
         int tipLen = tipNames.length;
         for(int i = 0, len = Math.min(iconLen, tipLen); i < len; i++) {
-            boolean isDrawRightLine = (i == len - 1 || (i + 1) % ONE_LINE_NUM == 0);
+            boolean isDrawRightLine = (i != len - 1 || (i + 1) % ONE_LINE_NUM != 0);
             ChartImagePane imagePane = new ChartImagePane(iconPaths[i], tipNames[i], isDrawRightLine);
             imagePane.isPressing = (i == 0);
             list.add(imagePane);
@@ -208,13 +208,13 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
     protected void checkDemosBackground() {
         if(this.styleList != null && !styleList.isEmpty()){
             for(int i = 0; i < styleList.size(); i++) {
-                styleList.get(i).checkBackground();
+                styleList.get(i).checkBorder();
                 styleList.get(i).repaint();
             }
         }
 
         for(int i = 0; i < typeDemo.size(); i++) {
-            typeDemo.get(i).checkBackground();
+            typeDemo.get(i).checkBorder();
             typeDemo.get(i).repaint();
         }
     }

designer_chart/src/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java

@@ -11,6 +11,9 @@ import java.awt.event.MouseEvent;
 
 public class ChartImagePane extends ChartSelectDemoPane {
 	private static final long serialVersionUID = -2785128245790568603L;
+	private static final int IMAGE_WIDTH = 58;
+	private static final int IMAGE_HIGTH = 50;
+	private static final Color ENTER_COLOR = new Color(216, 242, 253);
 	private boolean isDrawRightLine = false;
     public boolean isDoubleClicked = false;
 	
@@ -21,7 +24,9 @@ public class ChartImagePane extends ChartSelectDemoPane {
 		addMouseListener(this);
 		this.setToolTipText(tipName);
 		
-		this.setBorder(BorderFactory.createMatteBorder(1, 1, 1, isDrawRightLine ? 1 : 0, UIConstants.LINE_COLOR));
+		this.setBorder(BorderFactory.createMatteBorder(0, 0, 0, isDrawRightLine ? 1 : 0, UIConstants.SELECT_TAB));
+		this.setBackground(UIConstants.TOOLBARUI_BACKGROUND);
+        this.setPreferredSize(new Dimension(IMAGE_WIDTH, IMAGE_HIGTH));
     }
 
     public ChartImagePane(String fullIconPath, String tipName, boolean isDrawRightLine){
@@ -38,7 +43,10 @@ public class ChartImagePane extends ChartSelectDemoPane {
 
         this.setToolTipText(tipName);
 
-        this.setBorder(BorderFactory.createMatteBorder(1, 1, 1, isDrawRightLine ? 1 : 0, UIConstants.LINE_COLOR));
+        this.setBorder(BorderFactory.createMatteBorder(0, 0, 0, isDrawRightLine ? 1 : 0, UIConstants.SELECT_TAB));
+        this.setBackground(UIConstants.TOOLBARUI_BACKGROUND);
+        this.setPreferredSize(new Dimension(IMAGE_WIDTH, IMAGE_HIGTH));
+
     }
 
     /**
@@ -53,4 +61,18 @@ public class ChartImagePane extends ChartSelectDemoPane {
         }
         super.mouseClicked(e);
     }
+
+    /**
+     * 修改边框颜色
+     */
+    public void checkBorder() {
+        if (!isRollOver && !isPressing) {
+            this.setBorder(BorderFactory.createMatteBorder(0, 0, 0, isDrawRightLine ? 1 : 0, UIConstants.SELECT_TAB));
+        } else if (isRollOver && !isPressing) {
+            this.setBorder(BorderFactory.createMatteBorder(2, 2, 2, 2, ENTER_COLOR));
+        } else {
+            this.setBorder(BorderFactory.createMatteBorder(2, 2, 2, 2, UIConstants.FLESH_BLUE));
+        }
+    }
+
 }

designer_chart/src/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java

@@ -163,8 +163,8 @@ public class GisMapPlotPane extends AbstractChartTypePane{
             styleList.get(BAIDU).isPressing  =false;
 			keyInput.setText(plot.getGoogleKey());
 		}
-        styleList.get(GOOGLE).checkBackground();
+        styleList.get(GOOGLE).checkBorder();
-        styleList.get(BAIDU).checkBackground();
+        styleList.get(BAIDU).checkBorder();
 	}
 
     /**

designer_chart/src/com/fr/plugin/chart/column/VanChartColumnSeriesPane.java

@@ -122,7 +122,9 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
     }
 
     private void checkColumnWidth() {
-        columnWidth.setVisible(isFixedWidth.getSelectedIndex() == 0);
+        boolean b = isFixedWidth.getSelectedIndex() == 0;
+        columnWidth.setVisible(b);
+        seriesGap.setEnabled(!b);
     }
 
     private void checkImagePane() {

designer_chart/src/com/fr/plugin/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java

@@ -92,7 +92,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
                         formatPane =  createFormatPane();
                     }
                     Point comPoint = formatButton.getLocationOnScreen();
-                    Point arrowPoint = new Point(comPoint.x, comPoint.y + formatButton.getHeight());
+                    Point arrowPoint = new Point(comPoint.x +formatButton.getWidth() - 25, comPoint.y + formatButton.getHeight());
                     UIBubbleFloatPane<Style> pane = new UIBubbleFloatPane(Constants.LEFT, arrowPoint, formatPane, 258, 209) {
 
                         @Override

designer_chart/src/com/fr/plugin/chart/structure/desinger/style/StructureNodeStylePane.java

@@ -65,6 +65,7 @@ public class StructureNodeStylePane extends BasicBeanPane<AttrNode> {
         useImage = new UIButtonGroup<Integer>(new String[]{Inter.getLocText("Plugin-ChartF_YES"),
                 Inter.getLocText("Plugin-ChartF_NO")});
         imagePane = new ImageBackgroundQuickPane(false);
+        imagePane.setBorder(BorderFactory.createEmptyBorder(0,(int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Filled_With_Image")),useImage},
         };