REPORT-80734【运营产品化二期】自定义排序交互问题

1、交互修改一下

designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java

@@ -114,7 +114,9 @@ public class AlphaFineConfigPane extends BasicPane {
         customSortLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Config_Custom_Sort"), false);
         customSortLabel.setForeground(UIConstants.NORMAL_BLUE);
         customSortLabel.addActionListener((event)->{
+            if (customSortLabel.isEnabled()) {
                 openCustomSortMenu();
+            }
         });
         customSortWrapperPane.add(customSortLabel);
         if (!hasSelectedSearchRangeCheckBox()) {
@@ -178,25 +180,25 @@ public class AlphaFineConfigPane extends BasicPane {
         return res;
     }
 
-    // 搜索范围-我的模板
+    /**
+     * 搜索范围-我的模板
+     */
     private void initMyTemplateSearchPane() {
-        containMyTemplatePane = new JPanel(new FlowLayout(FlowLayout.LEFT,4,5));
+        containMyTemplatePane = new JPanel(new FlowLayout(FlowLayout.LEFT, 4, 5));
         containMyTemplateCheckbox.setBorder(BorderFactory.createEmptyBorder());
-        containMyTemplateCheckbox.addActionListener(
-                new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        if (containMyTemplateCheckbox.isSelected()) {
-                            myTemplateSearchConfigButton.setVisible(true);
-                        } else {
-                            myTemplateSearchConfigButton.setVisible(false);
-                        }
-                    }
+        containMyTemplateCheckbox.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (containMyTemplateCheckbox.isSelected()) {
+                    myTemplateSearchConfigButton.setVisible(true);
+                } else {
+                    myTemplateSearchConfigButton.setVisible(false);
                 }
-        );
+            }
+        });
         myTemplateSearchConfigButton = new JButton();
         myTemplateSearchConfigButton.setBorder(BorderFactory.createEmptyBorder());
-        myTemplateSearchConfigButton.setMargin(new Insets(0,0,0,0));
+        myTemplateSearchConfigButton.setMargin(new Insets(0, 0, 0, 0));
         myTemplateSearchConfigButton.setIcon(IconUtils.readIcon("/com/fr/design/mainframe/alphafine/images/config.svg"));
         myTemplateSearchMenu = new UIPopupMenu();
         containTemplateNameSearchCheckbox = new UICheckBox(Toolkit.i18nText("Fine-Design_AlphaFine_Config_Name_Search"));

designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/CustomSortPane.java

@@ -74,10 +74,14 @@ public class CustomSortPane extends JPanel {
     }
 
     private void createToolbarPane() {
-        top = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/top.svg"));
-        bottom = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/bottom.svg"));
-        up = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/up.svg"));
-        down = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/down.svg"));
+        top = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/top.svg"), false);
+        bottom = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/bottom.svg"), false);
+        up = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/up.svg"), false);
+        down = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/down.svg"), false);
+        top.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/top_disable.svg"));
+        bottom.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/bottom_disable.svg"));
+        up.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/up_disable.svg"));
+        down.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/down_disable.svg"));
         top.addActionListener(e -> {
             SwingUtilities.invokeLater(() -> {
                 sortItemPane.setComponentZOrder(selectedLabel, 0);
@@ -132,6 +136,7 @@ public class CustomSortPane extends JPanel {
         for (UICheckBox item : sortItems) {
             MenuLabel label = new MenuLabel(item.getText(), (Function<MenuLabel, Object>) o -> {
                 selectedLabel = o;
+                disableButton();
                 return null;
             });
             sortLabels.add(label);
@@ -140,6 +145,24 @@ public class CustomSortPane extends JPanel {
         sortItemPane = new MenuLabelPane(sortLabels);
     }
 
+    /**
+     * 如果选中第一个和最后一个，则置灰向上和向下的按钮
+     */
+    private void disableButton() {
+        int order = sortItemPane.getComponentZOrder(selectedLabel);
+        if (order == 0) {
+            top.setEnabled(false);
+            up.setEnabled(false);
+        } else if (order == sortItemPane.getComponentCount() - 1) {
+            down.setEnabled(false);
+            bottom.setEnabled(false);
+        } else {
+            up.setEnabled(true);
+            top.setEnabled(true);
+            down.setEnabled(true);
+            bottom.setEnabled(true);
+        }
+    }
 
     private void refreshCurrentOrder() {
         String[] currentTabOrder = parentPane.getCurrentOrder();

designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/MenuLabel.java

@@ -61,10 +61,10 @@ public class MenuLabel extends UILabel {
             parentMenu.setNoneSelected();
             setBackground(SELECTED_COLOR);
             function.apply(this);
-            selected = true;
+            this.selected = true;
         } else {
             setBackground(BACKGROUND_COLOR);
-            selected = false;
+            this.selected = false;
         }
     }
 

designer-base/src/main/java/com/fr/design/gui/ibutton/UIButton.java

@@ -61,6 +61,14 @@ public class UIButton extends JButton implements UIObserver, UITextComponent {
 		init();
 	}
 
+	public UIButton(Icon icon, boolean decorate) {
+		this(icon);
+		if (!decorate) {
+			setContentAreaFilled(false);
+			setFocusPainted(false);
+			setBorderPainted(false);
+		}
+	}
 
 	public UIButton(Icon icon) {
 		super(icon);
@@ -397,4 +405,8 @@ public class UIButton extends JButton implements UIObserver, UITextComponent {
 	public boolean shouldResponseChangeListener() {
 		return true;
 	}
+
+
+
+
 }