Merge pull request #10420 in DESIGN/design from bugfix/11.0 to feature/x

* commit '7f5012ef0d9fad8776b8c62456ffe82f8b44fcc5':
  REPORT-79287 import规范
  REPORT-79287 fix:图表属性编辑界面更换数据集后之前的匹配清空没有清空

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

@@ -15,6 +15,7 @@ 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;
@@ -74,6 +75,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());
 		}