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

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

@@ -58,7 +58,7 @@ public class DatabaseTableDataPane extends BasicPane{
 	 * 返回选中的数据源.
 	 */
 	public TableDataWrapper getTableDataWrapper() {
-		return tableNameCombox.getSelectedItem();  
+		return tableNameCombox.getSelectedItem();
 	}
 
 	public void populateBean(TableData nameTableData) {
@@ -68,12 +68,12 @@ public class DatabaseTableDataPane extends BasicPane{
 			tableNameCombox.setSelectedTableDataByName(((NameTableData)nameTableData).getName());
 		}
 	}
-	
+
 	@Override
 	protected String title4PopupWindow() {
 		return null;
 	}
-	
+
 	/**
 	 * 数据集列表选中后的事件
 	 */
@@ -82,7 +82,12 @@ public class DatabaseTableDataPane extends BasicPane{
 	}
 
 	private void initTableCombox() {
-		tableNameCombox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource());
+		tableNameCombox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource()){
+		    //图表的数据集选择下拉框，不需要注册监听，chartEditPane已经注册了。
+			public void registerDSChangeListener() {
+
+			}
+		};
 		tableNameCombox.addItemListener(new ItemListener() {
 			@Override
 			public void itemStateChanged(ItemEvent e) {
@@ -94,7 +99,7 @@ public class DatabaseTableDataPane extends BasicPane{
 			}
 		});
 	}
-	
+
 	private void initReviewButton() {
 		reviewButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/search.png"));
 		reviewButton.setBorder(new LineBorder(UIConstants.LINE_COLOR));

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java

@@ -56,6 +56,7 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane
         this.setLayout(new BorderLayout());
 
         nameBox = new UIComboBoxWithNone();
+        nameBox.setSelectedIndex(nameBox.getItemCount() -1);
         valueBox = new UIComboBox();
         targetBox = new UIComboBox();
         custom = new TinyFormulaPane();