diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java index 33be0b7fc4..0a90682a49 100644 --- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java +++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java @@ -22,6 +22,7 @@ import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.manager.clip.TemplateTreeClipboard; import com.fr.design.notification.NotificationCenter; import com.fr.design.plugin.remind.PluginErrorDesignReminder; +import com.fr.design.ui.util.UIUtil; import com.fr.design.utils.DesignUtils; import com.fr.design.versioncheck.VersionCheckUtils; import com.fr.env.EnvListPane; @@ -515,7 +516,7 @@ public class EnvChangeEntrance { final EnvListPane envListPane = new EnvListPane(); final BasicDialog envListDialog = envListPane.showWindow(DesignerContext.getDesignerFrame()); dialog = envListDialog; - envListPane.populateEnvManager(envName); + UIUtil.invokeLaterIfNeeded(() -> envListPane.populateEnvManager(envName)); envListDialog.addDialogActionListener(new DialogActionAdapter() { @Override @@ -552,7 +553,7 @@ public class EnvChangeEntrance { eventPipe.fire(new CarryMessageEvent(ReportState.STOP.getValue())); } final EnvListPane envListPane = new EnvListPane(); - envListPane.populateEnvManager(DesignerEnvManager.getEnvManager().getCurEnvName()); + UIUtil.invokeLaterIfNeeded(() -> envListPane.populateEnvManager(DesignerEnvManager.getEnvManager().getCurEnvName())); BasicDialog envListDialog = envListPane.showWindow(SwingUtilities.getWindowAncestor(DesignerContext.getDesignerFrame())); dialog = envListDialog; envListDialog.addDialogActionListener(new DialogActionAdapter() { @@ -582,7 +583,7 @@ public class EnvChangeEntrance { envListDialog.setVisible(true); } - /** + /** * 切换环境后 刷新远程目录需要忘记密码的情况 */ private void updateNotRememberPwdEnv() { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java index 5a2f3f543d..ed1e69d882 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java @@ -14,7 +14,6 @@ import com.fr.data.desensitize.base.DesensitizationTableData; import com.fr.data.impl.DBTableData; import com.fr.data.impl.EmbeddedTableData; import com.fr.data.impl.NameDataModel; -import com.fr.data.operator.DataOperator; import com.fr.design.DesignerEnvManager; import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.preview.desensitization.TableDataPreviewDesensitizeManager; @@ -57,7 +56,6 @@ import javax.swing.JPanel; import javax.swing.JTable; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; -import javax.swing.UIManager; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableModel; @@ -101,7 +99,8 @@ public class PreviewTablePane extends BasicPane { private PreviewTableDesensitizationPane desensitizationPane; private static final int PREVIEW_TABLE_MIN_COLUMN_WIDTH = FineUIScale.scale(75); - private static final int PREVIEW_TABLE_WIDTH = FineUIScale.scale(610); + private static final int PREVIEW_TABLE_WIDTH = FineUIUtils.getScaledI18nDimension( + "com.fr.design.data.datapane.preview.PreviewTablePane").width; private static final int TAB_MAX_COUNT_WITH_LINE = 7; /** diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties index f9b75269f7..5bfb081100 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties @@ -39,5 +39,6 @@ com.fr.design.actions.printingSetting.dialog=700*600 com.fr.design.data.datapane.preview.dialog=700*600 com.fr.design.data.tabledata.dialog=1200*600 com.fr.design.dscolumn.SpecifiedGroupAttrPane=900*600 +com.fr.design.data.datapane.preview.PreviewTablePane=800*520 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties index 4b9a58fa23..0e5b590cb4 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties @@ -38,5 +38,6 @@ com.fr.design.actions.printingSetting.dialog=700*600 com.fr.design.data.datapane.preview.dialog=700*600 com.fr.design.data.tabledata.dialog=900*600 com.fr.design.dscolumn.SpecifiedGroupAttrPane=800*600 +com.fr.design.data.datapane.preview.PreviewTablePane=800*520 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties index 1b2a61ed78..3b73377fc6 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties @@ -38,5 +38,6 @@ com.fr.design.actions.printingSetting.dialog=700*600 com.fr.design.data.datapane.preview.dialog=700*600 com.fr.design.data.tabledata.dialog=900*600 com.fr.design.dscolumn.SpecifiedGroupAttrPane=760*600 +com.fr.design.data.datapane.preview.PreviewTablePane=610*520 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties index e187dfc098..5a008418c3 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties @@ -38,6 +38,7 @@ com.fr.design.actions.printingSetting.dialog=660*600 com.fr.design.data.datapane.preview.dialog=660*600 com.fr.design.data.tabledata.dialog=900*600 com.fr.design.dscolumn.SpecifiedGroupAttrPane=760*600 +com.fr.design.data.datapane.preview.PreviewTablePane=610*520 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties index 8c3e985151..5726891ba7 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties @@ -37,5 +37,6 @@ com.fr.design.actions.printingSetting.dialog=700*600 com.fr.design.data.datapane.preview.dialog=700*600 com.fr.design.data.tabledata.dialog=900*600 com.fr.design.dscolumn.SpecifiedGroupAttrPane=760*600 +com.fr.design.data.datapane.preview.PreviewTablePane=610*520