From 66fead7e41b408d064df7c4e4f74a6e6f47ee619 Mon Sep 17 00:00:00 2001 From: levy Date: Thu, 29 Sep 2022 09:14:49 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-80251=20=E8=8B=B1=E6=96=87=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E5=9B=BD=E9=99=85=E5=8C=96=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E3=80=911=E3=80=81=E9=83=A8=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=A8=A1=E5=9D=97=E7=9A=84label=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=9C=AA=E5=81=9A=E8=87=AA=E5=8A=A8=E6=8D=A2?= =?UTF-8?q?=E8=A1=8C=E8=AE=BE=E7=BD=AE=E3=80=822=E3=80=81=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E7=95=8C=E9=9D=A2=E5=8F=B3=E9=94=AE=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=A1=86=E5=AE=BD=E5=BA=A6=E8=A2=AB=E5=9B=BA=E5=AE=9A=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E8=80=83=E8=99=91=E4=B8=8D=E5=90=8C=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E7=9A=84=E9=80=82=E9=85=8D=E9=97=AE=E9=A2=98=E3=80=82=20?= =?UTF-8?q?=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=911?= =?UTF-8?q?=E3=80=81=E6=9B=B4=E6=94=B9label=E4=B8=BA=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E3=80=822=E3=80=81=E5=B1=80=E9=83=A8?= =?UTF-8?q?=E5=BE=AE=E8=B0=83UI=EF=BC=88=E6=A8=AA=E6=8E=92=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=8F=98=E7=AB=96=E6=8E=92=EF=BC=8C=E5=B7=B2=E4=B8=8E?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=B2=9F=E9=80=9A=E6=97=A0=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=89=E3=80=823=E3=80=81=E6=A0=B9=E6=8D=AE=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E8=AF=AD=E8=A8=80=E7=8E=AF=E5=A2=83=E7=A1=AE=E5=AE=9A?= =?UTF-8?q?=E5=8F=B3=E9=94=AE=E5=BC=B9=E5=87=BA=E6=A1=86=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E3=80=82=20=E3=80=90Review=E5=BB=BA=E8=AE=AE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/file/MutilTempalteTabPane.java | 15 ++++----------- .../com/fr/design/i18n/dimension_en.properties | 3 ++- .../com/fr/design/i18n/dimension_ja_JP.properties | 3 ++- .../com/fr/design/i18n/dimension_ko_KR.properties | 3 ++- .../com/fr/design/i18n/dimension_zh.properties | 3 ++- .../com/fr/design/i18n/dimension_zh_TW.properties | 3 ++- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java index 53b262c4f7..aa352b4bcb 100644 --- a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java @@ -11,6 +11,7 @@ import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.imenu.UIPopupMenu; import com.fr.design.gui.imenu.UIScrollPopUpMenu; +import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; @@ -199,17 +200,9 @@ public class MutilTempalteTabPane extends JComponent { height += 25; } } - //当前i18n适配中英日，其中英日字符串长度较长，需调整popupMenu的宽度 - //后续版本可考虑读取字符串像素宽度，以自适应调整menu - int popupMenuWidth; - if(ComparatorUtils.equals(GeneralContext.getLocale(), Locale.US)){ - popupMenuWidth = 350; - }else if(ComparatorUtils.equals(GeneralContext.getLocale(), Locale.JAPAN)){ - popupMenuWidth = 240; - }else { - popupMenuWidth = 170; - } - menu.setPreferredSize(new Dimension(popupMenuWidth, height)); + //根据当前i18n语言环境，动态调整popupMenu的宽度 + menu.setPreferredSize(new Dimension((int)DesignSizeI18nManager.getInstance(). + i18nDimension("com.fr.design.file.MultiTemplateTabPane.popUpMenu").getWidth(),height)); GUICoreUtils.showPopupMenu(menu, MutilTempalteTabPane.getInstance(), e.getX(), MutilTempalteTabPane.getInstance().getY() - 1 + MutilTempalteTabPane.getInstance().getHeight()); } } 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 7f249d1a5e..f26123e3d6 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 @@ -21,4 +21,5 @@ com.fr.design.ds.column.sort.pane=250*180 com.fr.design.sort.expand.header.pane=95*10 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 -com.fr.design.report.WatermarkSettingPane=720*600 \ No newline at end of file +com.fr.design.report.WatermarkSettingPane=720*600 +com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65 \ No newline at end of file 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 ec876154ae..9c9105b416 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 @@ -20,4 +20,5 @@ com.fr.design.ds.column.sort.pane=250*165 com.fr.design.sort.expand.header.pane=95*10 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 -com.fr.design.report.WatermarkSettingPane=720*600 \ No newline at end of file +com.fr.design.report.WatermarkSettingPane=720*600 +com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 \ No newline at end of file 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 dd8e8571b5..f05f8a3925 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 @@ -20,4 +20,5 @@ com.fr.design.ds.column.sort.pane=250*180 com.fr.design.sort.expand.header.pane=95*10 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 -com.fr.design.report.WatermarkSettingPane=720*600 \ No newline at end of file +com.fr.design.report.WatermarkSettingPane=720*600 +com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 \ No newline at end of file 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 44ea2f3bd8..d8b31cf103 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 @@ -22,4 +22,5 @@ com.fr.design.ds.column.sort.pane=220*150 com.fr.design.sort.expand.header.pane=108*10 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 -com.fr.design.report.WatermarkSettingPane=720*600 \ No newline at end of file +com.fr.design.report.WatermarkSettingPane=720*600 +com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65 \ No newline at end of file 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 90d082cc9f..dc92be1a0c 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 @@ -20,4 +20,5 @@ com.fr.design.ds.column.sort.pane=220*150 com.fr.design.sort.expand.header.pane=108*10 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 -com.fr.design.report.WatermarkSettingPane=720*600 \ No newline at end of file +com.fr.design.report.WatermarkSettingPane=720*600 +com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65 \ No newline at end of file