From 9baf1437ce3a9e21c50eb7fb47e68438e440dac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yvan-=E6=AC=A7=E9=98=B3=E5=B8=86?= Date: Tue, 7 Feb 2023 12:25:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-89167=20&&=20REPORT-83493=20?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=84=B1=E6=95=8F=E8=A7=84=E5=88=99=E5=8F=98?= =?UTF-8?q?=E5=8A=A8=E6=97=B6=E7=9A=84=E4=BA=A4=E4=BA=92=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91?= =?UTF-8?q?=E4=B8=8E=E4=BA=A7=E5=93=81=E6=B2=9F=E9=80=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=88=90=E6=9B=B4=E5=AE=B9=E6=98=93=E7=90=86=E8=A7=A3=E7=9A=84?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E8=BF=98=E6=9C=89=E8=A7=84=E5=88=99=E5=8F=98?= =?UTF-8?q?=E5=8A=A8=E6=97=B6=E7=9A=84=E7=94=9F=E6=95=88=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=A4=A7=E8=87=B4=E5=A6=82=E4=B8=8B=EF=BC=9A=201.=20?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=BC=82=E5=B8=B8=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=94=BE=E5=9C=A8=E6=95=B0=E6=8D=AE=E9=9B=86"=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=84=B1=E6=95=8F=E8=AE=BE=E7=BD=AE"=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=B8=AD=EF=BC=8C=E9=BC=A0=E6=A0=87=E6=82=AC=E5=81=9C?= =?UTF-8?q?"=E5=BC=82=E5=B8=B8"=E6=96=87=E5=AD=97=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E6=B0=94=E6=B3=A1=E6=8F=90=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E6=B0=94=E6=B3=A1=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB=EF=BC=9B?= =?UTF-8?q?"=E6=95=B0=E6=8D=AE=E8=84=B1=E6=95=8F=E8=AE=BE=E7=BD=AE"?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84=E8=A7=84=E5=88=99=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E8=A1=A8=E4=B8=8A=E5=A2=9E=E5=8A=A0=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E7=82=B9=E5=87=BB=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E5=90=8E=E4=BC=9A=E5=88=B7=E6=96=B0=E5=BD=93=E5=89=8D=E8=A7=84?= =?UTF-8?q?=E5=88=99=EF=BC=8C=E5=88=B7=E6=96=B0=E9=80=BB=E8=BE=91=EF=BC=9A?= =?UTF-8?q?=20=E8=A7=84=E5=88=99=E8=A2=AB=E7=A6=81=E7=94=A8=20----=20?= =?UTF-8?q?=E5=8E=9F=E8=A7=84=E5=88=99=E4=B8=8D=E5=8F=98=20=E8=A7=84?= =?UTF-8?q?=E5=88=99=E8=A2=AB=E5=88=A0=E9=99=A4=20----=20=E5=8E=9F?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=88=A0=E9=99=A4=20=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=A2=AB=E4=BF=AE=E6=94=B9=20----=20=E5=8E=9F=E8=A7=84?= =?UTF-8?q?=E5=88=99B=E8=A2=AB=E6=9B=BF=E6=8D=A2=E6=88=90B*=202.=20?= =?UTF-8?q?=E5=81=87=E5=A6=82=E6=A8=A1=E6=9D=BF=E4=B8=AD=E5=AD=98=E5=9C=A8?= =?UTF-8?q?A=E3=80=81B=E5=B9=B3=E5=8F=B0=E8=A7=84=E5=88=99=EF=BC=8CA?= =?UTF-8?q?=E8=A7=84=E5=88=99=E6=AD=A3=E5=B8=B8=EF=BC=8CB=E8=A7=84?= =?UTF-8?q?=E5=88=99=E8=A2=AB=E4=BF=AE=E6=94=B9=E6=88=90=E4=BA=86B*?= =?UTF-8?q?=E8=A7=84=E5=88=99=EF=BC=8C=E6=AD=A4=E6=97=B6=E4=B8=8D=E7=AE=A1?= =?UTF-8?q?=E6=98=AF=E6=A8=A1=E6=9D=BF=E9=A2=84=E8=A7=88=E3=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E8=84=B1=E6=95=8F=E6=95=88=E6=9E=9C=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E7=AD=89=E8=AE=A1=E7=AE=97=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=87=8C=EF=BC=8C=E7=94=9F=E6=95=88=E8=A7=84?= =?UTF-8?q?=E5=88=99=E4=B8=BAA=E5=92=8CB*=E3=80=82=E5=8D=B3=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=9C=BA=E6=99=AF=E9=87=8C=E4=BC=9A=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E8=A2=AB=E4=BF=AE=E6=94=B9=E7=9A=84=E8=A7=84?= =?UTF-8?q?=E5=88=99=203.=20=E4=B8=8A=E9=9D=A2=E7=9A=84=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E6=98=AF=E4=B8=B4=E6=97=B6=E6=9B=BF=E6=8D=A2=EF=BC=8C=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=A8=A1=E6=9D=BF=E6=97=B6=E5=B9=B6=E4=B8=8D=E4=BC=9A?= =?UTF-8?q?=E5=B0=86B*=E5=86=99=E5=85=A5=E6=A8=A1=E6=9D=BFxml=E4=B8=AD?= =?UTF-8?q?=E3=80=82=E4=BB=85=E5=9C=A8"=E6=95=B0=E6=8D=AE=E8=84=B1?= =?UTF-8?q?=E6=95=8F=E8=AE=BE=E7=BD=AE"=E9=A1=B5=E9=9D=A2=E9=87=8C?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E5=9C=A8=E7=82=B9=E5=87=BB"?= =?UTF-8?q?=E5=BC=82=E5=B8=B8"=EF=BC=8C=E5=BC=B9=E7=AA=97=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=87=BA=E7=8E=B0=E5=90=8E=EF=BC=8C=E5=86=8D=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E7=A1=AE=E5=AE=9A=20+=20=E4=BF=9D=E5=AD=98=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=97=B6=EF=BC=8C=E6=89=8D=E4=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BFxml=E6=96=87=E4=BB=B6=20=E3=80=90=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=E6=96=B9=E6=A1=88=E3=80=91=E5=90=8C=E4=B8=8A=20?= =?UTF-8?q?=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 --- .../TableDataPreviewDesensitizeManager.java | 18 ++--- .../TableDataDesensitizationTableModel.java | 67 ++++++++++++++++--- .../standard/refresh/refresh_normal.svg | 7 ++ 3 files changed, 68 insertions(+), 24 deletions(-) create mode 100644 designer-base/src/main/resources/com/fr/design/standard/refresh/refresh_normal.svg diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/TableDataPreviewDesensitizeManager.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/TableDataPreviewDesensitizeManager.java index 29e12bfaf4..1fbed9f437 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/TableDataPreviewDesensitizeManager.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/TableDataPreviewDesensitizeManager.java @@ -2,10 +2,10 @@ package com.fr.design.data.datapane.preview.desensitization; import com.fr.base.TableData; +import com.fr.data.desensitize.TableDataDesensitizeManager; import com.fr.data.desensitize.base.DesensitizationTableData; import com.fr.data.desensitize.base.TableDataDesensitizationItem; import com.fr.data.desensitize.manage.DesensitizationManager; -import com.fr.data.desensitize.rule.DesensitizationRuleManager; import com.fr.data.desensitize.util.DesentizationUtils; import com.fr.decision.webservice.bean.user.DepartmentPostBean; import com.fr.decision.webservice.bean.user.RoleBean; @@ -79,7 +79,7 @@ public class TableDataPreviewDesensitizeManager implements DesensitizationManage Collection desensitizationItems = ((DesensitizationTableData) tableData).getDesensitizationConfig().getDesensitizationItems(); if (DesentizationUtils.isCollectionNotEmpty(desensitizationItems)) { // 更新规则 - dealWithLastedRules(desensitizationItems); + desensitizationItems = TableDataDesensitizeManager.getInstance().dealWithLastedRules(desensitizationItems); // 对脱敏配置项集合做过滤和排序处理 List items = desensitizationItems.stream() .filter(item -> isAvaliableItem4Preview(item, model)) @@ -106,16 +106,6 @@ public class TableDataPreviewDesensitizeManager implements DesensitizationManage matchColumnIndex(item, model) >= 0; } - /** - * 在预览计算前，将Item中的规则替换为最新规则（防止平台规则被临时修改） - */ - private void dealWithLastedRules(Collection desensitizationItems) { - desensitizationItems.forEach(item -> { - // 获取最新的规则 - item.setRule(DesensitizationRuleManager.getInstance().getLastedDesentizationRule(item.getRule())); - }); - } - /** * 通过TableData获取其列名 * @@ -185,7 +175,7 @@ public class TableDataPreviewDesensitizeManager implements DesensitizationManage * @param positionName * @return */ - public String mergeRoleText(String departmentName, String positionName) { + private String mergeRoleText(String departmentName, String positionName) { return departmentName + positionName; } @@ -196,7 +186,7 @@ public class TableDataPreviewDesensitizeManager implements DesensitizationManage * @param positionId * @return */ - public String mergeRoleId(String departmentId, String positionId) { + private String mergeRoleId(String departmentId, String positionId) { return departmentId + CONNECTOR + positionId; } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java index 4d6cfa8ff6..c1d958bf9f 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java @@ -40,6 +40,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Collection; import java.util.HashMap; +import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -132,9 +133,7 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter items = getList(); + Iterator iterator = items.iterator(); + while (iterator.hasNext()) { + TableDataDesensitizationItem item = iterator.next(); + DesensitizationRuleStatus ruleStatus = DesensitizationRuleManager.getInstance().getRuleStatus(item.getRule()); + if (ruleStatus == DesensitizationRuleStatus.REMOVED) { + // 规则被移除，则删除整条脱敏Item + iterator.remove(); + } else { + // 规则被修改、禁用等，更新一下规则 + item.setRule(DesensitizationRuleManager.getInstance().getLastedDesentizationRule(item.getRule())); + } + } + fireTableDataChanged(); + } + + @Override + public void checkEnabled() {} + } + /** * 规则表-列字段编号 */ @@ -580,4 +615,16 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter + + icon_刷新_normal + + + + \ No newline at end of file From 254b7ce2226fbfa38806deb166a2317296112fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yvan-=E6=AC=A7=E9=98=B3=E5=B8=86?= Date: Wed, 8 Feb 2023 10:13:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-89260=20&&=20REPORT-83847=20?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E4=B8=8B=E5=8D=A1=E9=A1=BF?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=A7=84=E5=88=99=E5=BC=82=E5=B8=B8=20?= =?UTF-8?q?=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E5=8D=A1?= =?UTF-8?q?=E9=A1=BF=E6=98=AF=E5=9B=A0=E4=B8=BA=E6=9F=A5=E8=AF=A2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9A=84=E6=93=8D=E4=BD=9C=E6=94=BE=E5=9C=A8?= =?UTF-8?q?=E4=BA=86UI=E7=BA=BF=E7=A8=8B=E9=87=8C=EF=BC=9B=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=BC=82=E5=B8=B8=E6=98=AF=E5=9B=A0=E4=B8=BA=E8=A7=84?= =?UTF-8?q?=E5=88=99=E7=AE=A1=E7=90=86=E5=99=A8DesensitizationRuleManager?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=A7=84=E5=88=99=E7=BC=93=E5=AD=98=E5=AF=B9?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=88=87=E6=8D=A2=E6=97=B6=E7=9A=84=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E5=86=99=E7=9A=84=E6=9C=89=E7=82=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=A1=E9=A1=BF=E9=97=AE=E9=A2=98=E6=98=AF?= =?UTF-8?q?=E5=8A=A0SwingWorker=EF=BC=9B=E8=A7=84=E5=88=99=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E8=BF=99=E4=B8=AA=EF=BC=8C=E6=83=B3=E4=BA=86=E4=B8=8B?= =?UTF-8?q?DesensitizationRuleManager=E4=B8=AD=E7=9A=84=E8=A7=84=E5=88=99?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=AD=A4=E5=89=8D=E5=8F=AA=E9=92=88=E5=AF=B9?= =?UTF-8?q?=E4=BA=86=E6=9C=AC=E5=9C=B0=E8=A7=84=E5=88=99=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E3=80=81=E8=BF=9C=E7=A8=8B=E7=8E=AF=E5=A2=83=E5=88=87=E6=8D=A2?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E6=B2=A1=E9=92=88=E5=AF=B9=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E4=B8=8B=E7=9A=84=E8=A7=84=E5=88=99=E5=8F=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E8=80=8C=E4=B8=94=E5=A5=BD=E5=83=8F=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=A4=AA=E5=A5=BD=E7=9A=84=E6=80=9D=E8=B7=AF=E3=80=82=E7=8E=B0?= =?UTF-8?q?=E5=9C=A8=E7=9A=84=E5=81=9A=E6=B3=95=E6=98=AF=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=A7=84=E5=88=99=E7=BC=93=E5=AD=98=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=9F=A5=E6=95=B0=E6=8D=AE=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E5=A5=97=E7=94=A8Config=E6=A1=86=E6=9E=B6=E7=9A=84=E7=BC=93?= =?UTF-8?q?=E5=AD=98=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 --- .../TableDataPreviewDesensitizeManager.java | 12 ++- .../TableDataDesensitizationTableModel.java | 89 +++++++++---------- 2 files changed, 54 insertions(+), 47 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/TableDataPreviewDesensitizeManager.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/TableDataPreviewDesensitizeManager.java index 1fbed9f437..5c2b42c257 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/TableDataPreviewDesensitizeManager.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/TableDataPreviewDesensitizeManager.java @@ -2,6 +2,7 @@ package com.fr.design.data.datapane.preview.desensitization; import com.fr.base.TableData; +import com.fr.data.TableDataSource; import com.fr.data.desensitize.TableDataDesensitizeManager; import com.fr.data.desensitize.base.DesensitizationTableData; import com.fr.data.desensitize.base.TableDataDesensitizationItem; @@ -15,11 +16,14 @@ import com.fr.decision.webservice.v10.user.PositionService; import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.preview.PreviewTableModel; import com.fr.design.data.datapane.preview.desensitization.model.DesensitizedPreviewTableModel; +import com.fr.esd.query.StrategicTableData; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; +import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Comparator; import java.util.LinkedHashMap; import java.util.List; @@ -107,13 +111,17 @@ public class TableDataPreviewDesensitizeManager implements DesensitizationManage } /** - * 通过TableData获取其列名 + * 通过TableData获取其列名,理论上一定存在缓存值 * * @param tableData * @return */ public List getColumnNamesByTableData(TableData tableData) { - return DesignTableDataManager.getColumnNamesByTableData(tableData); + TableDataSource editingTableDataSource = DesignTableDataManager.getEditingTableDataSource(); + if (editingTableDataSource != null && tableData instanceof StrategicTableData) { + return Arrays.asList(DesignTableDataManager.getSelectedColumnNames(editingTableDataSource, ((StrategicTableData) tableData).getDsName())); + } + return Collections.EMPTY_LIST; } /** diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java index c1d958bf9f..375f280bdf 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java @@ -9,7 +9,6 @@ import com.fr.design.data.datapane.preview.desensitization.TableDataPreviewDesen import com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRulePane; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; -import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombocheckbox.UIComboCheckBox; @@ -21,6 +20,7 @@ import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; +import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; import org.jetbrains.annotations.Nullable; @@ -29,6 +29,7 @@ import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JTable; import javax.swing.SwingUtilities; +import javax.swing.SwingWorker; import javax.swing.event.CellEditorListener; import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; @@ -38,9 +39,11 @@ import java.awt.Color; import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -61,17 +64,15 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter columnNames; + private List columnNames = new ArrayList<>(); /** * key为用户组唯一标识（id拼接），value为用户组名称 */ - private Map roleMap; + private final Map roleMap = new LinkedHashMap<>(); private Component parent; @@ -84,12 +85,6 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter() { + + @Override + protected Void doInBackground() throws Exception { + // 获取当前数据集的所有列名 + columnNames.addAll(TableDataPreviewDesensitizeManager.getInstance().getColumnNamesByTableData(tableData)); + // 获取当前所有用户组 + roleMap.putAll(TableDataPreviewDesensitizeManager.getInstance().getAllRoles()); + return null; + } + + @Override + protected void done() { + try { + // 更新列名选择框和生效用户组选择框 + columnNamesComboBox.refresh(); + effectedRolesChooser.refresh(); + } catch (Exception e) { + FineLoggerFactory.getLogger().error(e, "[Desensitization] get column names or all roles failed for {}", e.getMessage()); + } + } + }.execute(); + } @Override @@ -210,6 +231,10 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter Date: Wed, 8 Feb 2023 10:17:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-89260=20&&=20REPORT-83847=20?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E4=B8=8B=E5=8D=A1=E9=A1=BF?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=A7=84=E5=88=99=E5=BC=82=E5=B8=B8=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/setting/TableDataDesensitizationTableModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java index 375f280bdf..e70f5e2cea 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java @@ -231,6 +231,9 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter