From 2acc1cc5e3b41a8560aa0c96830500631ff7706e Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Thu, 16 Mar 2023 16:02:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-91657=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E5=B1=9E=E6=80=A7-=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E9=9D=A2=E6=9D=BF=E6=96=87=E6=9C=AC=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=88=AA=E6=96=AD=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E3=80=91=E4=B8=8D=E5=90=8C=E8=AF=AD=E8=A8=80=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=95=BF=E5=BA=A6=E4=B8=8D=E5=90=8C=20=E3=80=90?= =?UTF-8?q?=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=B0=B4=E5=B9=B3=E5=B8=83=E5=B1=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=9E=82=E7=9B=B4=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/cell/settingpane/CellOtherSetPane.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java index e4cfd442d5..9879ac53a4 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java @@ -48,7 +48,6 @@ import java.awt.CardLayout; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Insets; import java.awt.Rectangle; import java.awt.event.ItemEvent; @@ -169,7 +168,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane { groupsPane = new CellDesensitizationGroupsPane(this); - JPanel contentPane = FRGUIPaneFactory.createVerticalFlowLayout_F_Pane(true, VerticalFlowLayout.TOP, 0, 0, true); + JPanel contentPane = FRGUIPaneFactory.createVerticalFlowLayout_F_Pane(true, VerticalFlowLayout.TOP, 0, 10, true); contentPane.add(scopePane); contentPane.add(hyperlink); contentPane.add(groupsPane); @@ -195,10 +194,10 @@ public class CellOtherSetPane extends AbstractCellAttrPane { } JPanel head = new JPanel(); - head.setLayout(new FlowLayout(FlowLayout.LEFT)); - head.add(scopeLabel); - head.add(exportButton); - head.add(previewAndExportButton); + head.setLayout(new BorderLayout()); + head.add(scopeLabel, BorderLayout.NORTH); + head.add(exportButton, BorderLayout.CENTER); + head.add(previewAndExportButton, BorderLayout.SOUTH); return head; } From 8d2788a1bfec319ff69b350c5cc9fd5c461d8637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yvan-=E6=AC=A7=E9=98=B3=E5=B8=86?= Date: Fri, 17 Mar 2023 10:27:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-91610=20=E6=95=B0=E6=8D=AE=E8=84=B1?= =?UTF-8?q?=E6=95=8F-=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=86=85en=E4=B8=8B?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=96=87=E6=A1=88=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=85=A8=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E3=80=91en=E3=80=81ja=E3=80=81ko=E4=B8=8B=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=96=87=E6=A1=88=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=20?= =?UTF-8?q?=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E4=B8=8E?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=B2=9F=E9=80=9A=E5=90=8E=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E5=A4=A7=E8=BF=99=E5=87=A0=E4=B8=AA=E8=AF=AD=E8=A8=80=E4=B8=8B?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=9A=84=E5=AE=BD=E5=BA=A6=20=E3=80=90review?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/rule/DesensitizationRuleChoosePane.java | 15 +++++++++++++-- .../com/fr/design/i18n/dimension_en.properties | 1 + .../com/fr/design/i18n/dimension_ja_JP.properties | 1 + .../com/fr/design/i18n/dimension_ko_KR.properties | 1 + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleChoosePane.java index 11e30a2e9f..d37ed152d2 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleChoosePane.java @@ -12,6 +12,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itableeditorpane.UITableEditAction; import com.fr.design.gui.itableeditorpane.UITableEditorPane; import com.fr.design.gui.itableeditorpane.UITableModelAdapter; +import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.i18n.Toolkit; import com.fr.stable.StringUtils; import com.fr.stable.collections.CollectionUtils; @@ -25,6 +26,7 @@ import javax.swing.table.TableCellRenderer; import java.awt.CardLayout; import java.awt.Color; import java.awt.Component; +import java.awt.Dimension; import java.awt.event.ActionEvent; import java.util.LinkedHashSet; import java.util.List; @@ -177,6 +179,15 @@ public class DesensitizationRuleChoosePane extends JPanel { .collect(Collectors.toSet()); } + /** + * 根据语言环境获取规则编辑页面的宽高 + * + * @return + */ + private Dimension getRuleEditPaneDimensionByLocale() { + return DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane"); + } + /** * 规则状态展示页面 */ @@ -256,7 +267,7 @@ public class DesensitizationRuleChoosePane extends JPanel { public void doCancel() { super.doCancel(); } - }, BasicDialog.DEFAULT); + }, getRuleEditPaneDimensionByLocale()); basicDialog.setVisible(true); } } @@ -301,7 +312,7 @@ public class DesensitizationRuleChoosePane extends JPanel { public void doCancel() { super.doCancel(); } - }, BasicDialog.DEFAULT); + }, getRuleEditPaneDimensionByLocale()); basicDialog.setVisible(true); } } 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 d1f8ee17b2..5098bc3c97 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 @@ -24,3 +24,4 @@ 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 com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65 +com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600 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 a5b3a03fe6..6c3ac0e58c 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 @@ -23,3 +23,4 @@ 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 com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 +com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600 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 4e8b3f9cdb..eaa75e14a0 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 @@ -23,3 +23,4 @@ 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 com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 +com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600