Pull request #2674: MOBILE-29820 移动端tab样式页面缺少滚动条

Merge in DESIGN/design from ~HANS/design:release/10.0 to release/10.0

* commit '70e8dd3930110e93582e1238cd7a161b87c239b9':
  MOBILE-29820 移动端tab样式页面缺少滚动条 对齐属性面板 新增scroll属性和滚动条

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java

@@ -4,6 +4,8 @@ import com.fr.base.iofile.attr.FormTabPaddingAttrMark;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.dialog.AttrScrollPane;
+import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.form.util.FormDesignerUtils;
 import com.fr.design.gui.frpane.AttributeChangeListener;
@@ -15,7 +17,6 @@ import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.widget.accessibles.AccessibleTemplateStyleEditor;
 import com.fr.design.mainframe.widget.accessibles.MobileTemplateStylePane;
-import com.fr.design.widget.ui.designer.mobile.component.MobileAdvanceInnerPane;
 import com.fr.design.widget.ui.designer.mobile.component.MobileBookMarkUsePane;
 import com.fr.design.widget.ui.designer.mobile.component.MobileComponentMarginPane;
 import com.fr.design.widget.ui.designer.mobile.component.MobileComponentLayoutIntervalPane;
@@ -24,6 +25,7 @@ import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.general.cardtag.mobile.MobileTemplateStyle;
 
 import javax.swing.JPanel;
+import javax.swing.BorderFactory;
 import java.awt.BorderLayout;
 import java.awt.Component;
 
@@ -36,9 +38,20 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
     private MobileComponentLayoutIntervalPane intervalPane;
     private MobileBookMarkUsePane mobileBookMarkUsePane;
     private MobileTabCommonSettingPane mobileTabCommonSettingPane;
+    private JPanel contentJPanel;
+    private BasicScrollPane scrollPane;
 
     public TabMobileWidgetDefinePane(XCreator xCreator) {
         this.xCreator = xCreator;
+        contentJPanel = new JPanel();
+        scrollPane = new AttrScrollPane() {
+            @Override
+            protected JPanel createContentPane() {
+                return contentJPanel;
+            }
+        };
+        scrollPane.setBorder(null);
+
     }
 
     private void bindListeners2Widgets() {
@@ -61,6 +74,7 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
     @Override
     public void initPropertyGroups(Object source) {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
         UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Tab_Style_Template"));
         templateStyleEditor = new AccessibleTemplateStyleEditor(new MobileTemplateStylePane((WCardTagLayout) xCreator.toData()));
@@ -89,7 +103,8 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
         //高级
         holder.add(advancePane, BorderLayout.CENTER);
 
-        this.add(holder, BorderLayout.NORTH);
+        contentJPanel.add(holder, BorderLayout.CENTER);
+        this.add(scrollPane, BorderLayout.CENTER);
     }
 
     @Override