控件管理/报表填报属性/超级链接/服务器参数

designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java

@@ -3,6 +3,7 @@ package com.fr.design.gui.controlpane;
 import com.fine.theme.icon.LazyIcon;
 import com.fine.theme.light.ui.FineRoundBorder;
 import com.formdev.flatlaf.ui.FlatUIUtils;
+import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.border.FineBorderFactory;
 import com.fr.design.dialog.FineJOptionPane;
@@ -368,6 +369,8 @@ public abstract class JListControlPane extends JControlPane implements ListContr
             setLayout(new BorderLayout());
             this.textLabel = new JLabel();
             this.iconLabel = new JLabel();
+            this.textLabel.setBorder(new ScaledEmptyBorder(0, 4, 0, 0));
+            this.iconLabel.setBorder(new ScaledEmptyBorder(0, 4, 0, 0));
             add(this.textLabel, BorderLayout.CENTER);
             add(this.iconLabel, BorderLayout.WEST);
             this.iconLabel.setBackground(FlatUIUtils.getUIColor("List.cellRender.background", Color.WHITE));

designer-realize/src/main/java/com/fr/design/widget/CellWidgetCardPane.java

@@ -69,12 +69,6 @@ public class CellWidgetCardPane extends BasicPane {
 
         // 属性
         attriTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        BasicScrollPane basicScrollPane = new AttrScrollPane() {
-            @Override
-            protected JPanel createContentPane() {
-                return attriTabPane;
-            }
-        };
         widgetPropertyPane = new BasicWidgetPropertySettingPane();
         UIExpandablePane basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), 280, 24, widgetPropertyPane);
         attriCardPane = FRGUIPaneFactory.createCardLayout_S_Pane();
@@ -98,12 +92,12 @@ public class CellWidgetCardPane extends BasicPane {
         mobileTabPane.add(mobileCardPane, BorderLayout.CENTER);
         mobileCardLayout = (CardLayout) mobileCardPane.getLayout();
         tabsPane = FineTabbedPane.builder()
-                .addTab(tabTitles[0], basicScrollPane)
+                .addTab(tabTitles[0], new UIScrollPane(attriTabPane))
                 .addTab(tabTitles[1], eventTabPane)
                 .addTab(tabTitles[2], mobileTabPane)
                 .build();
         JPanel wrapperPane = new JPanel(new BorderLayout());
-        wrapperPane.add(tabsPane, BorderLayout.NORTH);
+        wrapperPane.add(tabsPane, BorderLayout.CENTER);
         wrapperPane.setBorder(new ScaledEmptyBorder(0, 10, 0, 10));
         wrapperPane.setOpaque(false);
         this.add(wrapperPane, BorderLayout.CENTER);
@@ -115,7 +109,7 @@ public class CellWidgetCardPane extends BasicPane {
     private void initPaneList() {
         paneList = new ArrayList<JPanel>();
         paneList.add(attriTabPane);
-        paneList.add(eventPane);
+        paneList.add(eventTabPane);
         paneList.add(mobileTabPane);
     }
 

designer-realize/src/main/java/com/fr/design/widget/UserDefinedWidgetConfigPane.java

@@ -1,7 +1,6 @@
 package com.fr.design.widget;
 
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.form.ui.UserDefinedWidgetConfig;
 
@@ -13,7 +12,7 @@ public class UserDefinedWidgetConfigPane extends BasicBeanPane<UserDefinedWidget
 	public UserDefinedWidgetConfigPane(){
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
 		editorDefPane = new ValueWidgetPane();
-		this.add(new UIScrollPane(editorDefPane), BorderLayout.CENTER);
+		this.add(editorDefPane, BorderLayout.CENTER);
 	}
 	
 	@Override