From 5bb7f1ac93204f145ecf60f932d125f6f61c628b Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Wed, 1 Feb 2023 13:33:52 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-82899=20=E6=95=B0=E6=8D=AE=E8=84=B1?= =?UTF-8?q?=E6=95=8F=E4=B8=89=E6=9C=9F=20=E4=BF=AE=E6=94=B9=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8D=95=E5=85=83=E6=A0=BC=E8=84=B1=E6=95=8F=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E7=9A=84=E5=AE=9E=E7=8E=B0=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cell/settingpane/CellOtherSetPane.java | 14 +++++++------- .../model/DesensitizationCellPane.java | 2 +- .../quickeditor/cellquick/CellDSColumnEditor.java | 1 - 3 files changed, 8 insertions(+), 9 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 942bb05c3..bd197d89e 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 @@ -12,7 +12,6 @@ import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.ilable.MultilineLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.itextfield.UITextField; @@ -129,8 +128,8 @@ public class CellOtherSetPane extends AbstractCellAttrPane { private UIRadioButton previewAndExportButton; private UIRadioButton[] desensitizationButtons; private CellDesensitizationGroupsPane groupsPane; - private final int EXPORT_SCOPE = 0; - private final int PREVIEW_AND_EXPORT_SCOPE = 1; + private final int EXPORT_SCOPE = CellDesensitizationAttr.EXPORT_SCOPE; + private final int PREVIEW_AND_EXPORT_SCOPE = CellDesensitizationAttr.PREVIEW_AND_EXPORT_SCOPE; private static final Color TIPS_FONT_COLOR = new Color(0x8f8f92); @@ -695,11 +694,11 @@ public class CellOtherSetPane extends AbstractCellAttrPane { } private void populateDesensitizationBean(TemplateCellElement cellElement) { - CellDesensitizationAttr cellDesensitizationAttr = cellElement.getCellDesensitizationAttr(); + CellDesensitizationAttr cellDesensitizationAttr = cellElement.getCellAttr(CellDesensitizationAttr.ATTR_TAG); if (cellDesensitizationAttr == null) { cellDesensitizationAttr = new CellDesensitizationAttr(); } - boolean exportSelected = cellDesensitizationAttr.getScope() == 0; + boolean exportSelected = cellDesensitizationAttr.getScope() == EXPORT_SCOPE; exportButton.setSelected(exportSelected); previewAndExportButton.setSelected(!exportSelected); groupsPane.populate(cellDesensitizationAttr.getDesensitizationBeans()); @@ -805,13 +804,14 @@ public class CellOtherSetPane extends AbstractCellAttrPane { * @param cellElement */ private void updateDesensitizationAttr(TemplateCellElement cellElement) { - CellDesensitizationAttr cellDesensitizationAttr = cellElement.getCellDesensitizationAttr(); + + CellDesensitizationAttr cellDesensitizationAttr = cellElement.getCellAttr(CellDesensitizationAttr.XML_TAG); if (cellDesensitizationAttr == null) { cellDesensitizationAttr = new CellDesensitizationAttr(); } cellDesensitizationAttr.setScope(exportButton.isSelected() ? EXPORT_SCOPE : PREVIEW_AND_EXPORT_SCOPE); cellDesensitizationAttr.setDesensitizationBeans(new ArrayList<>(groupsPane.update())); - cellElement.setCellDesensitizationAttr(cellDesensitizationAttr); + cellElement.addCellAttr(cellDesensitizationAttr); } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/DesensitizationCellPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/DesensitizationCellPane.java index b4a21a48c..49d32e7b2 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/DesensitizationCellPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/DesensitizationCellPane.java @@ -291,7 +291,7 @@ public class DesensitizationCellPane extends BasicBeanPane { for (int i = 1; i <= chars.length; i++) { //如果原文本+省略号长度超过文本框 int width = textEditor.getWidth(); - if (width != 0 && fontMetrics.charsWidth(chars, 0, i) + omitLength > width) { + if (width > 0 && fontMetrics.charsWidth(chars, 0, i) + omitLength > width) { //从第i-1的位置截断再拼上省略号 omitText = text.substring(0, i - 2) + OMIT_TEXT; break; diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index 575f89fb0..24ca54277 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -1064,7 +1064,6 @@ public class CellDSColumnEditor extends CellQuickEditor { @Override public void refreshMultipleDetails() { tabsHeaderIconPane.setVisible(tc.isSelectedOneCell()); - cellDSColumnAdvancedPane.setVisible(tc.isSelectedOneCell()); cellDSColumnBasicPane.setMultipleVisible(tc.isSelectedOneCell()); }