From 9c6f4c90cd115ca0103109cd86067db07f76761a Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 29 Jun 2023 09:48:16 +0800 Subject: [PATCH 1/8] =?UTF-8?q?REPORT-97972=20=E3=80=90FR=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E3=80=91=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cell/settingpane/CellOtherSetPane.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 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 5ac64d401..03ec887fd 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 @@ -357,7 +357,8 @@ public class CellOtherSetPane extends AbstractCellAttrPane { showPartPane = new JPanel(showPartLayout); showCharNums = new UISpinner(0, Integer.MAX_VALUE, 1, 10); JPanel showPartNumPane = new JPanel(new BorderLayout(4, 0)); - showPartNumPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_Nums")), BorderLayout.WEST); + UILabel showCharLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_Nums") + ":"); + showPartNumPane.add(showCharLabel, BorderLayout.WEST); showPartNumPane.add(showCharNums, BorderLayout.CENTER); showPartPane.add(new JPanel(), "none"); showPartPane.add(showPartNumPane, "content"); @@ -377,12 +378,20 @@ public class CellOtherSetPane extends AbstractCellAttrPane { textOverflowTypeComboBox = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_Ellipsis"), Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_NoneSymbol")}); UILabel showPartLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_ShowPart") + ":"); + showCharLabel.setPreferredSize(new Dimension(showPartLabel.getPreferredSize().width, 15)); + JPanel pane = new JPanel(new BorderLayout(4, 0)); + pane.add(showPartLabel, BorderLayout.WEST); + pane.add(showPartComboBox, BorderLayout.CENTER); UILabel hideTypeLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_HideType") + ":"); + JPanel hidePane = new JPanel(new BorderLayout(4, 0)); + hidePane.add(hideTypeLabel, BorderLayout.WEST); + hidePane.add(textOverflowTypeComboBox, BorderLayout.CENTER); Component[][] textOverflowComponents = new Component[][]{ - new Component[]{showPartLabel, showPartComboBox, showPartPane}, - new Component[]{hideTypeLabel, textOverflowTypeComboBox, null} + new Component[]{pane}, + new Component[]{showPartPane}, + new Component[]{hidePane} }; - JPanel textOverflowComPane = TableLayoutHelper.createTableLayoutPane(textOverflowComponents, new double[]{p, p}, new double[]{p, f, p}); + JPanel textOverflowComPane = TableLayoutHelper.createTableLayoutPane(textOverflowComponents, new double[]{p, p, p}, new double[]{p, f, p}); textOverflowComPane.setVisible(false); textOverflowCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_HideWhenOverflow")); textOverflowCheckBox.addItemListener(new ItemListener() { From a417d401af5d6712119826455096edeec28e4b95 Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 29 Jun 2023 14:16:19 +0800 Subject: [PATCH 2/8] =?UTF-8?q?REPORT-97972=20=E5=9B=9E=E9=80=80=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E8=87=AA=E5=B7=B1=E4=BB=A3=E7=A0=81=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cell/settingpane/CellOtherSetPane.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 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 03ec887fd..101ee470d 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 @@ -357,8 +357,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane { showPartPane = new JPanel(showPartLayout); showCharNums = new UISpinner(0, Integer.MAX_VALUE, 1, 10); JPanel showPartNumPane = new JPanel(new BorderLayout(4, 0)); - UILabel showCharLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_Nums") + ":"); - showPartNumPane.add(showCharLabel, BorderLayout.WEST); + showPartNumPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_Nums")), BorderLayout.WEST); showPartNumPane.add(showCharNums, BorderLayout.CENTER); showPartPane.add(new JPanel(), "none"); showPartPane.add(showPartNumPane, "content"); @@ -378,18 +377,10 @@ public class CellOtherSetPane extends AbstractCellAttrPane { textOverflowTypeComboBox = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_Ellipsis"), Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_NoneSymbol")}); UILabel showPartLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_ShowPart") + ":"); - showCharLabel.setPreferredSize(new Dimension(showPartLabel.getPreferredSize().width, 15)); - JPanel pane = new JPanel(new BorderLayout(4, 0)); - pane.add(showPartLabel, BorderLayout.WEST); - pane.add(showPartComboBox, BorderLayout.CENTER); UILabel hideTypeLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_HideType") + ":"); - JPanel hidePane = new JPanel(new BorderLayout(4, 0)); - hidePane.add(hideTypeLabel, BorderLayout.WEST); - hidePane.add(textOverflowTypeComboBox, BorderLayout.CENTER); Component[][] textOverflowComponents = new Component[][]{ - new Component[]{pane}, - new Component[]{showPartPane}, - new Component[]{hidePane} + new Component[]{showPartLabel, showPartComboBox, showPartPane}, + new Component[]{hideTypeLabel, textOverflowTypeComboBox, null} }; JPanel textOverflowComPane = TableLayoutHelper.createTableLayoutPane(textOverflowComponents, new double[]{p, p, p}, new double[]{p, f, p}); textOverflowComPane.setVisible(false); From 6c98902cb3bde07d3d48705526ac4ee706be9632 Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 29 Jun 2023 14:17:01 +0800 Subject: [PATCH 3/8] =?UTF-8?q?REPORT-97972=20=E5=9B=9E=E9=80=80=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E8=87=AA=E5=B7=B1=E4=BB=A3=E7=A0=81=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/cell/settingpane/CellOtherSetPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 101ee470d..5ac64d401 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 @@ -382,7 +382,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane { new Component[]{showPartLabel, showPartComboBox, showPartPane}, new Component[]{hideTypeLabel, textOverflowTypeComboBox, null} }; - JPanel textOverflowComPane = TableLayoutHelper.createTableLayoutPane(textOverflowComponents, new double[]{p, p, p}, new double[]{p, f, p}); + JPanel textOverflowComPane = TableLayoutHelper.createTableLayoutPane(textOverflowComponents, new double[]{p, p}, new double[]{p, f, p}); textOverflowComPane.setVisible(false); textOverflowCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_HideWhenOverflow")); textOverflowCheckBox.addItemListener(new ItemListener() { From f2101b9c00507dcd7e213daabfd2125fa22c1532 Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 29 Jun 2023 14:34:35 +0800 Subject: [PATCH 4/8] =?UTF-8?q?REPORT-99332=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E8=BE=93=E5=85=A5=E6=A1=86=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E8=A2=AB=E8=87=AA=E5=8A=A8=E7=A7=BB=E9=99=A4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20rt=EF=BC=8C=20=E6=8A=8A=20trim=20=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/quickeditor/cellquick/CellStringQuickEditor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellStringQuickEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellStringQuickEditor.java index 126486d13..29ed7f22c 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellStringQuickEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellStringQuickEditor.java @@ -37,17 +37,17 @@ public class CellStringQuickEditor extends CellQuickEditor { private DocumentListener documentListener = new DocumentListener() { @Override public void insertUpdate(DocumentEvent e) { - changeReportPaneCell(stringTextArea.getText().trim()); + changeReportPaneCell(stringTextArea.getText()); } @Override public void removeUpdate(DocumentEvent e) { - changeReportPaneCell(stringTextArea.getText().trim()); + changeReportPaneCell(stringTextArea.getText()); } @Override public void changedUpdate(DocumentEvent e) { - changeReportPaneCell(stringTextArea.getText().trim()); + changeReportPaneCell(stringTextArea.getText()); } }; From 5c3377d146374d8fa2f6b1df482c81e80c62c874 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 29 Jun 2023 15:13:23 +0800 Subject: [PATCH 5/8] =?UTF-8?q?REPORT-99320=20=E6=8F=92=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=95=B4=E4=BD=93=E4=BC=98=E5=8C=96-=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E5=86=85=E5=8D=95=E4=B8=AA=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9A=84=E6=8F=90=E7=A4=BA=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=93=AA=E4=B8=AA=E6=8F=92=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=EF=BC=8C=E5=92=8C=E5=B9=B3=E5=8F=B0=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/extra/PluginOperateUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java b/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java index 1248dea6e..d2f1bcc3c 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java @@ -70,7 +70,7 @@ public class PluginOperateUtils { public static void updatePluginOnline(List pluginMarkerList, JSCallback jsCallback) { int size = pluginMarkerList.size(); - BatchUpdateOnlineCallback batchUpdateOnlineCallback = new BatchUpdateOnlineCallback(jsCallback, size); + BatchUpdateOnlineCallback batchUpdateOnlineCallback = size <= 1 ? BatchUpdateOnlineCallback.NONE : new BatchUpdateOnlineCallback(jsCallback, size); for (int i = 0; i < size; i++) { updatePluginOnline(pluginMarkerList.get(i), jsCallback, batchUpdateOnlineCallback); } From 654c82e2b2f768a6c62be5c5ea90aa91d94bbad6 Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 29 Jun 2023 16:06:07 +0800 Subject: [PATCH 6/8] =?UTF-8?q?REPORT-97591=20=E6=8E=92=E5=BA=8F=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E8=AE=BE=E7=BD=AE=E9=A2=9C=E8=89=B2=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=B9=B6=E5=85=B3=E9=97=AD=E6=A8=A1=E6=9D=BF=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E6=8E=92=E5=BA=8F=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=A2=9C=E8=89=B2=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sort/header/HeaderSortRulePane.java | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java index 01021ed09..0c05d7560 100644 --- a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java +++ b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java @@ -24,6 +24,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; public class HeaderSortRulePane extends JPanel { IconButton ascIconButton; @@ -37,7 +39,7 @@ public class HeaderSortRulePane extends JPanel { HeaderSortRulePane() { initComponents(); - initState(true); + initState(true, null); this.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 15)); } @@ -78,13 +80,24 @@ public class HeaderSortRulePane extends JPanel { }); } - void initState(boolean selected) { + void initState(boolean selected, SortHeader.SortItem[] items) { ascUICheckBox.setSelected(selected); desUICheckBox.setSelected(selected); nosortUICheckBox.setSelected(selected); - ascIconButton.refreshIconLabelColor(new FineColor(defaultColor)); - desIconButton.refreshIconLabelColor(new FineColor(defaultColor)); - nosortIconButton.refreshIconLabelColor(new FineColor(defaultColor)); + if(items==null){ + ascIconButton.refreshIconLabelColor(new FineColor(defaultColor)); + desIconButton.refreshIconLabelColor(new FineColor(defaultColor)); + nosortIconButton.refreshIconLabelColor(new FineColor(defaultColor)); + } else { + Map colorMap = new HashMap<>(items.length); + for (SortHeader.SortItem item : items) { + colorMap.put(item.getSortRule(), item.getFineColor()); + } + ascIconButton.refreshIconLabelColor(colorMap.getOrDefault(SortRule.ASC, new FineColor(defaultColor))); + desIconButton.refreshIconLabelColor(colorMap.getOrDefault(SortRule.DES, new FineColor(defaultColor))); + nosortIconButton.refreshIconLabelColor(colorMap.getOrDefault(SortRule.NO_SORT, new FineColor(defaultColor))); + } + } class IconButton extends JPanel implements UIObserver, PopupHider { @@ -217,7 +230,7 @@ public class HeaderSortRulePane extends JPanel { } public void populateBean(SortHeader.SortItem[] sortItems) { - initState(sortItems == null); + initState(sortItems == null, sortItems); if (sortItems != null) { for (SortHeader.SortItem sortItem : sortItems) { SortRule sortRule = sortItem.getSortRule(); From d54982191796796accf56f822a00a99d6ac309b9 Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 29 Jun 2023 17:02:36 +0800 Subject: [PATCH 7/8] =?UTF-8?q?REPORT-97591=20=E6=8E=92=E5=BA=8F=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E8=AE=BE=E7=BD=AE=E9=A2=9C=E8=89=B2=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=B9=B6=E5=85=B3=E9=97=AD=E6=A8=A1=E6=9D=BF=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E6=8E=92=E5=BA=8F=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=A2=9C=E8=89=B2=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sort/header/HeaderSortRulePane.java | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java index 0c05d7560..a85238acb 100644 --- a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java +++ b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java @@ -39,7 +39,7 @@ public class HeaderSortRulePane extends JPanel { HeaderSortRulePane() { initComponents(); - initState(true, null); + initState(true); this.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 15)); } @@ -80,24 +80,13 @@ public class HeaderSortRulePane extends JPanel { }); } - void initState(boolean selected, SortHeader.SortItem[] items) { + void initState(boolean selected) { ascUICheckBox.setSelected(selected); desUICheckBox.setSelected(selected); nosortUICheckBox.setSelected(selected); - if(items==null){ - ascIconButton.refreshIconLabelColor(new FineColor(defaultColor)); - desIconButton.refreshIconLabelColor(new FineColor(defaultColor)); - nosortIconButton.refreshIconLabelColor(new FineColor(defaultColor)); - } else { - Map colorMap = new HashMap<>(items.length); - for (SortHeader.SortItem item : items) { - colorMap.put(item.getSortRule(), item.getFineColor()); - } - ascIconButton.refreshIconLabelColor(colorMap.getOrDefault(SortRule.ASC, new FineColor(defaultColor))); - desIconButton.refreshIconLabelColor(colorMap.getOrDefault(SortRule.DES, new FineColor(defaultColor))); - nosortIconButton.refreshIconLabelColor(colorMap.getOrDefault(SortRule.NO_SORT, new FineColor(defaultColor))); - } - + ascIconButton.refreshIconLabelColor(new FineColor(defaultColor)); + desIconButton.refreshIconLabelColor(new FineColor(defaultColor)); + nosortIconButton.refreshIconLabelColor(new FineColor(defaultColor)); } class IconButton extends JPanel implements UIObserver, PopupHider { @@ -230,19 +219,23 @@ public class HeaderSortRulePane extends JPanel { } public void populateBean(SortHeader.SortItem[] sortItems) { - initState(sortItems == null, sortItems); + initState(sortItems == null); if (sortItems != null) { for (SortHeader.SortItem sortItem : sortItems) { SortRule sortRule = sortItem.getSortRule(); BufferedImage bufferedImage = sortItem.getBufferedImage(); + FineColor fineColor = sortItem.getFineColor(); if (sortRule == SortRule.ASC) { ascIconButton.refreshIconLabel(bufferedImage); + ascIconButton.refreshIconLabelColor(fineColor); ascUICheckBox.setSelected(true); } else if (sortRule == SortRule.DES) { desIconButton.refreshIconLabel(bufferedImage); + desIconButton.refreshIconLabelColor(fineColor); desUICheckBox.setSelected(true); } else if (sortRule == SortRule.NO_SORT) { nosortIconButton.refreshIconLabel(bufferedImage); + nosortIconButton.refreshIconLabelColor(fineColor); nosortUICheckBox.setSelected(true); } } From 6771a4e5c86ee69d500e87210b0426f33b66288a Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 29 Jun 2023 17:09:20 +0800 Subject: [PATCH 8/8] =?UTF-8?q?REPORT-97591=20=E6=8E=92=E5=BA=8F=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E8=AE=BE=E7=BD=AE=E9=A2=9C=E8=89=B2=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=B9=B6=E5=85=B3=E9=97=AD=E6=A8=A1=E6=9D=BF=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E6=8E=92=E5=BA=8F=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=A2=9C=E8=89=B2=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/sort/header/HeaderSortRulePane.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java index a85238acb..d18a73f5d 100644 --- a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java +++ b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java @@ -24,8 +24,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; public class HeaderSortRulePane extends JPanel { IconButton ascIconButton;