Merge remote-tracking branch 'origin/REPORT-44961' into REPORT-44961

# Conflicts:
#	designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleDictionaryEditor.java
#	designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java
#	designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java

@@ -7,6 +7,7 @@ import com.fr.design.DesignModelAdapter;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.utils.DesignUtils;
 import com.fr.general.ComparatorUtils;
@@ -62,7 +63,8 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
 			embeddedTableData = DesignTableDataManager.previewTableDataNotNeedInputParameters(tds, tabledata, TableData.RESULT_NOT_NEED, false);
 		} catch (Exception e) {
             if (e.getMessage()!=null) {
-                DesignUtils.errorMessage(e.getMessage());
+				// 这个弹窗可能会成为数据字典页面的二级弹窗，所以修改下父窗口避免出现mac下的二级弹窗问题
+				FineJOptionPane.showMessageDialog(null, e.getMessage());
             }
 		}
 		columnNameList = DesignTableDataManager.getColumnNamesByTableData(embeddedTableData);