Merge remote-tracking branch 'origin/newui' into newui

designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java

@@ -42,8 +42,6 @@ public interface FineUIStyle {
     String PURE_TREE = "pureTree";
     String PASTEL_BUTTON = "pastelButton";
 
-    String ENV_DECTETOR_BUTTON = "envDetectorButton";
-
 
     /**
      * 添加组件的样式类，类似css，该方法会接在原样式后方

designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java

@@ -147,7 +147,7 @@ public class EnvDetectorDialog extends JDialog {
         JPanel headerPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         headerPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 12, 0));
         this.detectButton = new UIButton(buttonStatus.getDesc());
-        FineUIStyle.setStyle(detectButton, FineUIStyle.ENV_DECTETOR_BUTTON);
+        FineUIStyle.setStyle(detectButton, FineUIStyle.STYLE_PRIMARY);
         detectButton.setToolTipText(buttonStatus.getDesc());
         detectButton.addActionListener(event -> {
             if (buttonStatus.isNotExecuting()) {

designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties

@@ -1333,7 +1333,3 @@ CellOtherSetPane.height=$Component.defaultHeight
 
 [style]Tree.pureTree = \
     background: $fill.normal
-
-[style]Button.envDetectorButton = \
-    foreground: #FFF; \
-    background: #2576EF