From 0895e173b57b411fd49b4ec34a254e7e4dc881dd Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Fri, 10 Feb 2023 14:59:41 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-89353=20&&=20REPORT-89358=20&&=20REPORT-?= =?UTF-8?q?89237=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91?= =?UTF-8?q?=20REPORT-89358=EF=BC=9A=E4=B8=8A=E7=A7=BB=E4=B8=8B=E7=A7=BB?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=AA=E8=A7=A6=E5=8F=91=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BA=8B=E4=BB=B6=20EPORT-89353=EF=BC=9A?= =?UTF-8?q?=E6=9C=AA=E5=B0=86=E8=84=B1=E6=95=8F=E8=AE=BE=E7=BD=AElist?= =?UTF-8?q?=E5=86=99=E5=85=A5=E5=88=B0frm=E5=86=B3=E7=AD=96=E8=A1=A8=20REP?= =?UTF-8?q?ORT-89237=EF=BC=9A=E9=A2=84=E8=A7=88=E6=97=B6=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=A0=BC=E6=A0=BC=E5=BC=8F=E7=94=9F=E6=95=88=E5=9C=A8=E5=86=99?= =?UTF-8?q?=E5=85=A5html=E6=97=B6=EF=BC=8C=E5=9C=A8SE=E4=B8=AD=E4=BB=85?= =?UTF-8?q?=E5=AF=B9=E5=8E=9F=E5=A7=8B=E5=80=BC=E8=BF=9B=E8=A1=8C=E4=BA=86?= =?UTF-8?q?=E8=84=B1=E6=95=8F=EF=BC=9B=E5=8D=95=E5=85=83=E6=A0=BC=E5=BD=A2?= =?UTF-8?q?=E6=80=81=E8=AE=A1=E7=AE=97=E5=9C=A8=E8=84=B1=E6=95=8F=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=90=8E=20=E3=80=90=E8=A7=A3=E5=86=B3=E6=80=9D?= =?UTF-8?q?=E8=B7=AF=E3=80=91=20EPORT-89358=EF=BC=9A=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=A6=E5=8F=91=E6=A8=A1=E7=89=88=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E4=BA=8B=E4=BB=B6=20EPORT-89353=EF=BC=9Afrm=E5=86=B3?= =?UTF-8?q?=E7=AD=96=E6=8A=A5=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E5=86=99=E5=85=A5list=E4=BF=A1=E6=81=AF=20REPORT-89237?= =?UTF-8?q?=EF=BC=9A=E8=8B=A5=E5=8D=95=E5=85=83=E6=A0=BC=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=BA=86=E6=A0=BC=E5=BC=8F=E5=B1=9E=E6=80=A7=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E5=9C=A8=E5=86=99=E5=85=A5html=E6=97=B6=E5=86=8D=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E8=84=B1=E6=95=8F=EF=BC=9B=E5=B0=86=E8=84=B1=E6=95=8F?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=BF=AE=E6=94=B9=E5=88=B0=E5=BD=A2=E6=80=81?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=90=8E=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/CellDesensitizationTableModel.java | 9 ++++----- .../model/DesensitizationCellPane.java | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/CellDesensitizationTableModel.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/CellDesensitizationTableModel.java index f73b344a80..dcc1232396 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/CellDesensitizationTableModel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/CellDesensitizationTableModel.java @@ -99,11 +99,10 @@ public class CellDesensitizationTableModel extends UITableModelAdapter roleMap; private DesensitizationRule rule; + private static Map> latestRules; private CellDesensitizationTableModel model; @@ -87,6 +90,7 @@ public class DesensitizationCellPane extends BasicBeanPane { rolesComboBox = new RuleUIComboCheckBox(); rolesComboBox.setPlaceHolder(Toolkit.i18nText("Fine-Design_Report_Desensitization_Role_Place_Holder")); rolesComboBox.setEnabled(true); + latestRules = new HashMap<>(); emptyTextField = new UITextField(); emptyTextField.setEnabled(false); @@ -127,7 +131,7 @@ public class DesensitizationCellPane extends BasicBeanPane { Set roleIds = generateRolesIdsBySelectedValues(); if (Objects.nonNull(selectBean) && !selectBean.getRoleIds().equals(roleIds)) { selectBean.setRoleIds(generateRolesIdsBySelectedValues()); - model.fireAttrChanged(); + model.fireTableDataChanged(); } } }; @@ -135,8 +139,10 @@ public class DesensitizationCellPane extends BasicBeanPane { private final ActionListener chooseRuleListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { + CellDesensitizationBean selectBean = model.getSelectedValue(); - DesensitizationRulePane rulePane = new DesensitizationRulePane(new HashMap<>()); + latestRules = DesensitizationRuleManager.getInstance().getAllRules(); + DesensitizationRulePane rulePane = new DesensitizationRulePane(latestRules); BasicDialog ruleDialog = rulePane.showWindowWithCustomSize(SwingUtilities.getWindowAncestor(parent), new DialogActionAdapter() { @Override @@ -149,7 +155,7 @@ public class DesensitizationCellPane extends BasicBeanPane { // 非正常状态需要颜色修改为红色 refreshRuleState(selectBean); - model.fireAttrChanged(); + model.fireTableDataChanged(); } rule = null; } @@ -211,6 +217,9 @@ public class DesensitizationCellPane extends BasicBeanPane { label.setText(Toolkit.i18nText("Fine-Design_Report_Desensitization_Setting") + row); } + /** + * 刷新用户组信息 + */ private void refreshRoles() { Map roles = TableDataPreviewDesensitizeManager.getInstance().getAllRoles(); if (!roleMap.equals(roles)) { @@ -220,7 +229,7 @@ public class DesensitizationCellPane extends BasicBeanPane { } private void refreshRuleState(CellDesensitizationBean value) { - DesensitizationRuleStatus ruleStatus = DesensitizationRuleManager.getInstance().getRuleStatus(value.getDesensitizationRule()); + DesensitizationRuleStatus ruleStatus = DesensitizationRuleManager.getInstance().getRuleStatus(value.getDesensitizationRule(), latestRules); if (value.equals(CellDesensitizationBean.createEmptyBean())) { ruleTextField.setForeground(Color.GRAY); } else if (ruleStatus != DesensitizationRuleStatus.NORMAL) {