REPORT-6700 远程权限验收问题

designer-base/src/main/java/com/fr/design/border/UITitledBorder.java

@@ -17,6 +17,10 @@ public class UITitledBorder extends TitledBorder {
         return new UITitledBorder(title);
     }
 
+    public static UITitledBorder createBorderWithTitle(String title, int roundedCorner) {
+        return new UITitledBorder(title, roundedCorner);
+    }
+
     private UITitledBorder(String title) {
         super(
                 BorderFactory.createCompoundBorder(
@@ -37,4 +41,29 @@ public class UITitledBorder extends TitledBorder {
                 new Color(1, 159, 222)
         );
     }
+
+    /**
+     * @param title title
+     * @param roundedCorner corner width 圆弧宽度，即圆角直径
+     */
+    private UITitledBorder(String title, int roundedCorner) {
+        super(
+                BorderFactory.createCompoundBorder(
+                        BorderFactory.createEmptyBorder(
+                                0,
+                                0,
+                                5,
+                                0),
+                        new UIRoundedBorder(
+                                UIConstants.TITLED_BORDER_COLOR,
+                                1,
+                                roundedCorner)
+                ),
+                title,
+                TitledBorder.LEADING,
+                TitledBorder.TOP,
+                null,
+                new Color(1, 159, 222)
+        );
+    }
 }

designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java

@@ -34,7 +34,7 @@ public class DesignI18nImpl implements DesignI18nProvider {
 
     @Override
     public String i18nText(String key, Object... args) {
-        String format = InterProviderFactory.getProvider().getLocText(key);
+        String format = this.i18nText(key);
         MessageFormatter.FormattingTuple tuple = MessageFormatter.arrayFormat(format, args);
         return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, tuple.getMessage());
     }

designer-base/src/main/java/com/fr/design/remote/button/IconButton.java

@@ -19,7 +19,7 @@ public final class IconButton extends JButton {
         super(StringUtils.EMPTY);
         setContentAreaFilled(false);
         setFocusPainted(false);
-        setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Remove_x.png"));
+        setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_tab_close_normal.png"));
         setBorder(null);
     }
 

designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java

@@ -38,7 +38,9 @@ public class AuthorityEditorPane extends BasicBeanPane<DesignAuthority> {
         IOFileNodeFilter filter = new IOFileNodeFilter(new String[]{".cpt", ".class", ".frm", ".form"});
         tree.setDigIn(true);
         tree.setFileNodeFilter(filter);
-        this.add(new UIScrollPane(tree), BorderLayout.CENTER);
+        UIScrollPane scrollPane = new UIScrollPane(tree);
+        scrollPane.setBorder(BorderFactory.createEmptyBorder());
+        this.add(scrollPane, BorderLayout.CENTER);
         tree.refreshEnv();
 
     }

designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java

@@ -194,7 +194,7 @@ public class UserManagerPane extends BasicPane {
 
 
     public UserManagerPane() {
-        this.setBorder(BorderFactory.createEmptyBorder(0,4,0,4));
+        this.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
         this.setLayout(new BorderLayout());
         this.add(
                 TableLayoutHelper.createCommonTableLayoutPane(
@@ -221,8 +221,8 @@ public class UserManagerPane extends BasicPane {
                 BorderFactory.createCompoundBorder(
                         new EmptyBorder(6, 0, 0, 0),
                         UITitledBorder.createBorderWithTitle(
-                                Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member")
-                        )
+                                Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member"),
+                                4)
                 )
         );
 
@@ -279,7 +279,9 @@ public class UserManagerPane extends BasicPane {
         content.setBorder(
                 BorderFactory.createCompoundBorder(
                         new EmptyBorder(6, 0, 0, 0),
-                        UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member")
+                        UITitledBorder.createBorderWithTitle(
+                                Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member"),
+                                4
                         )
                 )
         );