diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java
index 8863977740..55745cd1d2 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java
@@ -15,10 +15,10 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.utils.gui.UIComponentUtils;
+import com.fr.stable.StringUtils;
 
-import javax.swing.BorderFactory;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
+import javax.swing.*;
+import java.awt.*;
 
 public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	private static final long serialVersionUID = 4740461028440155147L;
@@ -74,6 +74,10 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 			return;
 		}
 		if(dataContentPane != null) {
+			// 如果属性编辑画板中选中的数据集发生改变，则清空之前的匹配项
+			if (!StringUtils.equals(dataContentPane.getTableName(), dataWrap.getTableDataName())) {
+				dataContentPane.clearAllBoxList();
+			}
 			dataContentPane.onSelectTableData(dataWrap);
 			dataContentPane.setTableName(dataWrap.getTableDataName());
 		}