Browse Source

Pull request #11685: REPORT-91610 数据脱敏-设计器内en下面板文案显示不全

Merge in DESIGN/design from ~YVAN/design:release/11.0 to release/11.0

* commit '8d2788a1bfec319ff69b350c5cc9fd5c461d8637':
  REPORT-91610 数据脱敏-设计器内en下面板文案显示不全 【问题原因】en、ja、ko下面板文案显示不全 【改动思路】与产品沟通后,调大这几个语言下弹窗的宽度 【review建议】
newui
Yvan-欧阳帆 2 years ago
parent
commit
f2e44685a5
  1. 15
      designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleChoosePane.java
  2. 1
      designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
  3. 1
      designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
  4. 1
      designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

15
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.UITableEditAction;
import com.fr.design.gui.itableeditorpane.UITableEditorPane; import com.fr.design.gui.itableeditorpane.UITableEditorPane;
import com.fr.design.gui.itableeditorpane.UITableModelAdapter; import com.fr.design.gui.itableeditorpane.UITableModelAdapter;
import com.fr.design.i18n.DesignSizeI18nManager;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.stable.collections.CollectionUtils; import com.fr.stable.collections.CollectionUtils;
@ -25,6 +26,7 @@ import javax.swing.table.TableCellRenderer;
import java.awt.CardLayout; import java.awt.CardLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
@ -177,6 +179,15 @@ public class DesensitizationRuleChoosePane extends JPanel {
.collect(Collectors.toSet()); .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() { public void doCancel() {
super.doCancel(); super.doCancel();
} }
}, BasicDialog.DEFAULT); }, getRuleEditPaneDimensionByLocale());
basicDialog.setVisible(true); basicDialog.setVisible(true);
} }
} }
@ -301,7 +312,7 @@ public class DesensitizationRuleChoosePane extends JPanel {
public void doCancel() { public void doCancel() {
super.doCancel(); super.doCancel();
} }
}, BasicDialog.DEFAULT); }, getRuleEditPaneDimensionByLocale());
basicDialog.setVisible(true); basicDialog.setVisible(true);
} }
} }

1
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.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600 com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65 com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65
com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600

1
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.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600 com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65
com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600

1
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.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600 com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65
com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600

Loading…
Cancel
Save