Merge branch 'feature/10.0' into feature/x

* feature/10.0:
  REPORT-50201 fix 拼写错误
  REPORT-50201 远程af搜索模板，部分模板右侧加载不出来
  REPORT-60134 表单组件属性国际化-显示不全
  REPORT-59681 远程设计控制模板自适应权限控制
  REPORT-59681 远程设计控制模板自适应权限控制

# Conflicts:
#	designer-form/src/main/java/com/fr/design/gui/xpane/LayoutStylePane.java

designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java

@@ -0,0 +1,228 @@
+package com.fr.design.report.fit;
+
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.gui.ibutton.UIRadioButton;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.report.fit.menupane.FitPreviewPane;
+import com.fr.design.report.fit.menupane.FitRadioGroup;
+import com.fr.design.report.fit.menupane.FontRadioGroup;
+import com.fr.design.report.fit.provider.FitAttrModelProvider;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.ComparatorUtils;
+import com.fr.report.fit.ReportFitAttr;
+
+
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemListener;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static com.fr.design.i18n.Toolkit.i18nText;
+
+public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
+
+    protected JPanel contentJPanel;
+    protected UIComboBox itemChoose;
+    protected java.util.List<FitAttrModel> fitAttrModelList = new ArrayList<>();
+
+    public FontRadioGroup fontRadioGroup;
+    public FitRadioGroup adaptRadioGroup;
+    public JPanel attrJPanel;
+    public FitPreviewPane previewJPanel;
+    public FitAttrModel fitAttrModel;
+
+
+    protected BaseFitAttrPane() {
+        initFitAttrModel();
+    }
+
+    private void initFitAttrModel() {
+        fitAttrModelList.add(new FrmFitAttrModel());
+        fitAttrModelList.add(new CptFitAttrModel());
+
+        Set<FitAttrModelProvider> fitAttrModelProviders = ExtraDesignClassManager.getInstance().getArray(FitAttrModelProvider.XML_TAG);
+
+        for (FitAttrModelProvider fitAttrModelProvider : fitAttrModelProviders) {
+            fitAttrModelList.add(fitAttrModelProvider);
+        }
+
+        fitAttrModelList = fitAttrModelList.stream().sorted(Comparator.comparing(FitAttrModel::getPriority).reversed()).collect(Collectors.toList());
+    }
+
+    protected void populateModel(FitAttrModel fitAttrModel) {
+        this.fitAttrModel = fitAttrModel;
+        if (attrJPanel != null) {
+            contentJPanel.remove(attrJPanel);
+        }
+        if (previewJPanel != null) {
+            contentJPanel.remove(previewJPanel);
+        }
+
+        fontRadioGroup = new FontRadioGroup();
+        adaptRadioGroup = new FitRadioGroup();
+        initAttrJPanel();
+        initPreviewJPanel();
+    }
+
+
+    protected void initAttrJPanel() {
+        int colCount = fitAttrModel.getFitTypes().length + 1;
+        Component[][] components = new Component[2][colCount];
+        initFitRadioGroup(fontRadioGroup, i18nText("Fine-Designer_Fit-Font"), new String[]{i18nText("Fine-Designer_Fit"), i18nText("Fine-Designer_Fit-No")}, components[0]);
+        initFitRadioGroup(adaptRadioGroup, fitAttrModel.getFitName(), Arrays.stream(fitAttrModel.getFitTypes()).map(FitType::description).toArray(String[]::new), components[1]);
+
+        double[] rowSize = new double[2];
+        double[] columnSize = new double[colCount];
+        for (int i = 0; i < rowSize.length; i++) {
+            rowSize[i] = 20;
+        }
+        for (int i = 0; i < columnSize.length; i++) {
+            if (i == 0) {
+                columnSize[i] = 80;
+            } else {
+                columnSize[i] = 100;
+            }
+        }
+
+        attrJPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        attrJPanel.setBorder(new EmptyBorder(0, 100, 10, 100));
+        contentJPanel.add(attrJPanel);
+    }
+
+    private void initFitRadioGroup(FitRadioGroup fitRadioGroup, String name, String[] options, Component[] components) {
+        components[0] = new UILabel(name);
+        for (int i = 0; i < options.length; i++) {
+
+            if (options[i] != null) {
+                UIRadioButton fontFitRadio = new UIRadioButton(options[i]);
+                fitRadioGroup.add(fontFitRadio);
+                components[i + 1] = fontFitRadio;
+            } else {
+                components[i + 1] = null;
+            }
+        }
+        fitRadioGroup.addActionListener(getPreviewActionListener());
+    }
+
+    protected ActionListener getPreviewActionListener() {
+        return new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                refreshPreviewJPanel();
+            }
+        };
+    }
+
+    protected void refreshPreviewJPanel() {
+        String previewIndex = getPreviewIndex();
+        previewJPanel.refreshPreview(previewIndex, fontRadioGroup.isEnabled());
+    }
+
+    protected String getPreviewIndex() {
+        return getStateInPC(adaptRadioGroup.getSelectRadioIndex()) + "" + fontRadioGroup.getSelectRadioIndex();
+    }
+
+    protected void initPreviewJPanel() {
+        previewJPanel = new FitPreviewPane();
+        contentJPanel.add(previewJPanel);
+    }
+
+    protected int getStateInPC(int index) {
+        FitType[] fitTypes = fitAttrModel.getFitTypes();
+        return fitTypes[index].getState();
+    }
+
+    protected int getOptionIndex(int state) {
+        FitType[] fitTypes = fitAttrModel.getFitTypes();
+        for (int i = 0; i < fitTypes.length; i++) {
+            if (ComparatorUtils.equals(state, fitTypes[i].getState())) {
+                return i;
+            }
+        }
+        return 0;
+    }
+
+
+    @Override
+    public void populateBean(ReportFitAttr ob) {
+        fontRadioGroup.selectIndexButton(ob.isFitFont() ? 0 : 1);
+        adaptRadioGroup.selectIndexButton(getOptionIndex(ob.fitStateInPC()));
+        refreshPreviewJPanel();
+    }
+
+    @Override
+    public ReportFitAttr updateBean() {
+        ReportFitAttr reportFitAttr = new ReportFitAttr();
+        reportFitAttr.setFitFont(fontRadioGroup.isFontFit());
+        reportFitAttr.setFitStateInPC(getStateInPC(adaptRadioGroup.getSelectRadioIndex()));
+        return reportFitAttr;
+    }
+
+
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        fontRadioGroup.setEnabled(enabled);
+        adaptRadioGroup.setEnabled(enabled);
+        refreshPreviewJPanel();
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return i18nText("Fine-Designer_PC_Element_Case_Fit_Attr");
+    }
+
+    protected abstract String[] getItemNames();
+
+    protected void initComponents() {
+        this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        contentJPanel = new JPanel();
+        contentJPanel.setLayout(FRGUIPaneFactory.createCenterFlowLayout());
+        this.add(contentJPanel);
+        initItemChoose();
+    }
+
+
+    private void initItemChoose() {
+        JPanel chooseJPanel = new JPanel();
+        chooseJPanel.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
+        ItemListener itemListener = getItemListener();
+        itemChoose = new UIComboBox(getItemNames());
+        itemChoose.addItemListener(itemListener);
+        UILabel belowSetLabel = new UILabel(i18nText("Fine-Design_Report_Blow_Set"));
+        JPanel buttonPane = GUICoreUtils.createFlowPane(new Component[]{
+                belowSetLabel, itemChoose}, FlowLayout.LEFT, 0, 0);
+        chooseJPanel.add(buttonPane);
+        chooseJPanel.setPreferredSize(new Dimension(500, 50));
+        JPanel jPanel = new JPanel();
+        jPanel.setLayout(FRGUIPaneFactory.createBorderLayout());
+        jPanel.add(chooseJPanel, BorderLayout.WEST);
+
+        contentJPanel.add(jPanel);
+    }
+
+
+    protected abstract ItemListener getItemListener();
+
+
+    public void populate(ReportFitAttr reportFitAttr) {
+
+    }
+
+    protected void refresh() {
+        validate();
+        repaint();
+        revalidate();
+    }
+}

designer-base/src/main/java/com/fr/design/report/fit/CptFitAttrModel.java

@@ -0,0 +1,51 @@
+package com.fr.design.report.fit;
+
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.report.fit.ReportFitAttr;
+import com.fr.report.fit.ReportFitConfig;
+
+
+public class CptFitAttrModel implements FitAttrModel {
+
+    @Override
+    public FitType[] getFitTypes() {
+        return new FitType[]{
+                FitType.HORIZONTAL_FIT,
+                FitType.DOUBLE_FIT,
+                FitType.NOT_FIT
+        };
+    }
+
+    @Override
+    public String getFitName() {
+        return Toolkit.i18nText("Fine-Designer_Fit-Element");
+    }
+
+
+    @Override
+    public String getModelName() {
+        return Toolkit.i18nText("Fine-Design_Basic_Plain_Report");
+    }
+
+    @Override
+    public ReportFitAttr getGlobalReportFitAttr() {
+        return ReportFitConfig.getInstance().getCptFitAttr();
+    }
+
+    @Override
+    public void setGlobalReportFitAttr(ReportFitAttr reportFitAttr) {
+        ReportFitConfig.getInstance().setCptFitAttr(reportFitAttr);
+    }
+
+    @Override
+    public int getPriority() {
+        return 0;
+    }
+
+    @Override
+    public boolean isAvailable(JTemplate jTemplate) {
+        return jTemplate.isJWorkBook();
+    }
+}

designer-base/src/main/java/com/fr/design/report/fit/FitAttrModel.java

@@ -0,0 +1,44 @@
+package com.fr.design.report.fit;
+
+import com.fr.design.mainframe.JTemplate;
+import com.fr.report.fit.ReportFitAttr;
+
+public interface FitAttrModel {
+    /**
+     * @Description 名称，比如：普通报表、决策报表等
+     **/
+    String getModelName();
+
+    /**
+     * @Description 自适应选项的名称，比如返回：表格
+     **/
+    String getFitName();
+
+    /**
+     * @Description 自适应选项
+     **/
+    FitType[] getFitTypes();
+
+
+    /**
+     * @Description 获取全局的自适应属性
+     **/
+    ReportFitAttr getGlobalReportFitAttr();
+
+    /**
+     * @Description 设置全局的自适应属性
+     * @param: reportFitAttr
+     **/
+    void setGlobalReportFitAttr(ReportFitAttr reportFitAttr);
+
+    /**
+     * @Description 优先级
+     **/
+    int getPriority();
+
+    /**
+     * @Description 是否可用
+     * @param: jTemplate
+     **/
+    boolean isAvailable(JTemplate jTemplate);
+}

designer-base/src/main/java/com/fr/design/report/fit/FrmFitAttrModel.java

@@ -0,0 +1,53 @@
+package com.fr.design.report.fit;
+
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.report.fit.ReportFitAttr;
+import com.fr.report.fit.ReportFitConfig;
+
+
+public class FrmFitAttrModel implements FitAttrModel {
+
+
+    @Override
+    public String getModelName() {
+        return Toolkit.i18nText("Fine-Design_Basic_Decision_Report");
+    }
+
+    @Override
+    public String getFitName() {
+        return Toolkit.i18nText("Fine-Designer_Fit-Element");
+    }
+
+    public FitType[] getFitTypes() {
+        return new FitType[]{
+                FitType.DEFAULT,
+                FitType.HORIZONTAL_FIT,
+                FitType.DOUBLE_FIT,
+                FitType.NOT_FIT
+        };
+    }
+
+    @Override
+    public ReportFitAttr getGlobalReportFitAttr() {
+        return ReportFitConfig.getInstance().getFrmFitAttr();
+    }
+
+    @Override
+    public void setGlobalReportFitAttr(ReportFitAttr reportFitAttr) {
+        ReportFitConfig.getInstance().setFrmFitAttr(reportFitAttr);
+    }
+
+    @Override
+    public int getPriority() {
+        return 1;
+    }
+
+    @Override
+    public boolean isAvailable(JTemplate jTemplate) {
+        return !jTemplate.isJWorkBook();
+    }
+
+
+}

designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java

@@ -1,6 +1,5 @@
 package com.fr.design.report.fit.menupane;
 
-import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.JTemplateAction;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -82,13 +81,8 @@ public class ReportFitAttrAction extends JTemplateAction {
         }
         final FitProvider wbTpl = (FitProvider) jwb.getTarget();
         ReportFitAttr fitAttr = wbTpl.getReportFitAttr();
-        if (jwb.isJWorkBook()) {
-            final TemplateFitAttrPane attrPane = new TemplateFitAttrPane();
-            showReportFitDialog(fitAttr, jwb, wbTpl, attrPane);
-        } else {
-            final ReportFitAttrPane attrPane = new ReportFitAttrPane();
-            showReportFitDialog(fitAttr, jwb, wbTpl, attrPane);
-        }
+        TemplateFitAttrPane templateFitAttrPane = new TemplateFitAttrPane();
+        showReportFitDialog(fitAttr, jwb, wbTpl, templateFitAttrPane);
     }
 
     private void showReportFitDialog(ReportFitAttr fitAttr, final JTemplate jwb, final FitProvider wbTpl, final BasicBeanPane<ReportFitAttr> attrPane) {

designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java

@@ -1,55 +1,91 @@
 package com.fr.design.report.fit.menupane;
 
-import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.report.fit.BaseFitAttrPane;
+import com.fr.design.report.fit.FitAttrModel;
+import com.fr.general.ComparatorUtils;
+import com.fr.report.fit.FitProvider;
 import com.fr.report.fit.ReportFitAttr;
 
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 
-/**
- * Created by 夏翔 on 2016/6/24.
- */
-public class TemplateFitAttrPane extends BasicBeanPane<ReportFitAttr> {
-    private TemplateBrowserFitAttrPane attrPane;
 
+public class TemplateFitAttrPane extends BaseFitAttrPane {
 
     public TemplateFitAttrPane() {
         initComponents();
     }
 
-    private void initComponents() {
-        this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-        attrPane = new TemplateBrowserFitAttrPane();
-        this.add(attrPane);
+    @Override
+    protected void initComponents() {
+        super.initComponents();
+        for (FitAttrModel fitAttrModel : fitAttrModelList) {
+            if (fitAttrModel.isAvailable(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate())) {
+                populateModel(fitAttrModel);
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void populateBean(ReportFitAttr reportFitAttr) {
+        if (reportFitAttr == null) {
+            itemChoose.setSelectedItem(Toolkit.i18nText("Fine-Design_Report_Using_Server_Report_View_Settings"));
+        } else {
+            itemChoose.setSelectedItem(Toolkit.i18nText("Fine-Design_Report_I_Want_To_Set_Single"));
+        }
+        populate(reportFitAttr);
+    }
 
+    public void populate(ReportFitAttr reportFitAttr) {
+        if (reportFitAttr == null) {
+            reportFitAttr = fitAttrModel.getGlobalReportFitAttr();
         }
 
-    /**
-     * 展示界面
-     *
-     * @param fitAttr 自适应属性
-     */
-    public void populateBean(ReportFitAttr fitAttr) {
-        attrPane.populateBean(fitAttr);
+        super.setEnabled(isTemplateSingleSet());
+        super.populateBean(reportFitAttr);
     }
 
 
-    /**
-     * 提交数据
-     *
-     * @return 界面上的更新数据
-     */
     public ReportFitAttr updateBean() {
-        return attrPane.updateBean();
+        if (!isTemplateSingleSet()) {
+            return null;
+        } else {
+            return super.updateBean();
+        }
+    }
+
+    @Override
+    protected String[] getItemNames() {
+        return new String[]{Toolkit.i18nText("Fine-Design_Report_Using_Server_Report_View_Settings"),
+                Toolkit.i18nText("Fine-Design_Report_I_Want_To_Set_Single")};
+    }
+
+    @Override
+    protected ItemListener getItemListener() {
+        return new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                if (e.getStateChange() == ItemEvent.SELECTED) {
+                    if(isTemplateSingleSet()){
+                        JTemplate jwb = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+                        if (jwb != null) {
+                            FitProvider wbTpl = (FitProvider) jwb.getTarget();
+                            ReportFitAttr fitAttr = wbTpl.getReportFitAttr();
+                            populate(fitAttr);
+                        }
+                    }else {
+                        populate(fitAttrModel.getGlobalReportFitAttr());
+                    }
+                }
+            }
+        };
     }
 
-    /**
-     * 标题
-     *
-     * @return 标题
-     */
-    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_PC_Fit_Attr");
+    private boolean isTemplateSingleSet() {
+        return ComparatorUtils.equals(Toolkit.i18nText("Fine-Design_Report_I_Want_To_Set_Single"), itemChoose.getSelectedItem());
     }
 }

designer-base/src/main/java/com/fr/design/report/fit/provider/AbstractFitAttrModelProvider.java

@@ -0,0 +1,18 @@
+package com.fr.design.report.fit.provider;
+
+import com.fr.stable.fun.mark.API;
+
+
+@API(level = FitAttrModelProvider.CURRENT_LEVEL)
+public abstract class AbstractFitAttrModelProvider implements FitAttrModelProvider {
+
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+}

designer-base/src/main/java/com/fr/design/report/fit/provider/FitAttrModelProvider.java

@@ -0,0 +1,11 @@
+package com.fr.design.report.fit.provider;
+
+
+import com.fr.design.report.fit.FitAttrModel;
+import com.fr.stable.fun.mark.Mutable;
+
+
+public interface FitAttrModelProvider extends Mutable, FitAttrModel {
+    String XML_TAG = "FitAttrModelProvider";
+    int CURRENT_LEVEL = 1;
+}

designer-form/src/main/java/com/fr/design/gui/xpane/LayoutStylePane.java

@@ -1,36 +1,54 @@
 package com.fr.design.gui.xpane;
 
+import com.fr.base.Utils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.formula.TinyFormulaPane;
+import com.fr.design.gui.frpane.UIPercentDragPane;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ibutton.UIColorButton;
+import com.fr.design.gui.ibutton.UIToggleButton;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.style.BackgroundSpecialPane;
-import com.fr.design.gui.style.ComponentBodyStylePane;
-import com.fr.design.gui.style.ComponentIntegralStylePane;
-import com.fr.design.gui.style.ComponentTitleStylePane;
+import com.fr.design.gui.style.FRFontPane;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.JForm;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.backgroundpane.GradientBackgroundQuickPane;
+import com.fr.design.widget.FRWidgetFactory;
 import com.fr.form.ui.LayoutBorderStyle;
+import com.fr.form.ui.WidgetTitle;
+import com.fr.general.Background;
+import com.fr.general.FRFont;
+import com.fr.general.IOUtils;
+import com.fr.general.act.TitlePacker;
+import com.fr.stable.Constants;
 
 import javax.swing.BorderFactory;
+import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.border.LineBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import java.awt.BasicStroke;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.Stroke;
 
-import static com.fr.design.i18n.Toolkit.i18nText;
-
 /**
  * @author Starryi
  * @version 10.0.18
@@ -39,19 +57,51 @@ import static com.fr.design.i18n.Toolkit.i18nText;
  * 可配置图片类型边框的样式设置面板
  */
 public class LayoutStylePane extends BasicBeanPane<LayoutBorderStyle> {
+    public static final String[] BORDER_STYLE = new String[]{
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Common"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Shadow")
+    };
+    private static final Dimension BUTTON_SIZE = new Dimension(20, 20);
     public static final int SETTING_LABEL_WIDTH = 60;
 
     protected LayoutBorderStyle style = new LayoutBorderStyle();
 
-    public JPanel namedTitleStylePane;
-    public JPanel namedBodyStylePane;
-    public JPanel namedIntegralStylePane;
-
-    protected ComponentTitleStylePane titleStylePane;
-    protected ComponentBodyStylePane bodyStylePane;
-    protected ComponentIntegralStylePane integralStylePane;
-
-    private final boolean supportBorderImage;
+    //渲染风格：有无阴影
+    protected UIComboBox borderStyleCombo;
+    // 含图片类型边框的边框配置面板(图片类型边框 + 阴影时存在默认的阴影颜色）
+    protected BorderLineAndImagePane borderLineAndImagePane;
+    //边框圆角或圆角裁剪
+    protected UISpinner cornerSpinner;
+    //主体背景
+    protected BackgroundSpecialPane backgroundPane;
+    //主体背景透明度
+    protected UIPercentDragPane backgroundOpacityPane;
+
+    // 标题可见
+    protected UICheckBox titleVisibleCheckbox;
+    //标题文字内容
+    protected TinyFormulaPane titleTextPane;
+    //标题字体格式
+    protected UIComboBox titleFontFamilyComboBox;
+    //标题字体大小
+    protected UIComboBox titleFontSizeComboBox;
+    //标题字体颜色
+    protected UIColorButton titleFontColorSelectPane;
+    //标题字体特殊效果：粗体、斜体、下划线
+    private UIToggleButton titleFontBoldButton;
+    private UIToggleButton titleFontItalicButton;
+    private UIToggleButton titleFontUnderlineButton;
+//    private LineComboBox titleFontUnderlineCombo; // 目前前端仅支持短横线类型的下划线，因此设计器端暂时就不展示线型选择框了，待后续优化
+    // 标题图文混排
+    protected TitleInsetImagePane titleInsetImagePane;
+    //对齐方式
+    protected UIButtonGroup titleAlignPane;
+    //标题整体背景
+    protected BackgroundSpecialPane titleBackgroundPane;
+    //标题背景透明度
+    protected UIPercentDragPane titleBackgroundOpacityPane;
+
+    private boolean supportBorderImage = false;
 
     public LayoutStylePane() {
         this(false);
@@ -59,92 +109,350 @@ public class LayoutStylePane extends BasicBeanPane<LayoutBorderStyle> {
 
     public LayoutStylePane(boolean supportBorderImage) {
         this.supportBorderImage = supportBorderImage;
-        this.initializePane();
+        this.initLayout();
     }
 
-    protected void initializePane() {
+    protected void initLayout() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 
+        JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
+
         JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        boolean isRootLayout = currentEditingTemplate != null && !currentEditingTemplate.isJWorkBook() && ((JForm)currentEditingTemplate).isSelectRootPane();
+        boolean currentIsRootLayout = currentEditingTemplate != null && !currentEditingTemplate.isJWorkBook() && ((JForm)currentEditingTemplate).isSelectRootPane();
 
-        namedTitleStylePane = createNamedTitleStylePane(isRootLayout);
-        namedBodyStylePane = createNamedBodyStylePane(isRootLayout);
-        namedIntegralStylePane = createNamedIntegralStylePane(isRootLayout, true);
+        JPanel titlePane = createTitleStylePane();
+        JPanel bodyContentPane = currentIsRootLayout ? createBodyContentPane4RootLayout() : createBodyContentPane();
+        JPanel backgroundPane = createBackgroundStylePane(true);
 
-        addComponents(new JComponent[] { namedTitleStylePane, namedBodyStylePane, namedIntegralStylePane });
+        if (titlePane != null) {
+            container.add(titlePane, BorderLayout.NORTH);
+            if (currentIsRootLayout) {
+                titlePane.setVisible(false);
+            }
         }
+        JPanel nextContainerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        container.add(nextContainerPane, BorderLayout.CENTER);
 
-    protected JPanel createNamedTitleStylePane(boolean isRootLayout) {
-        if (isRootLayout) {
-            return null;
+        if (bodyContentPane != null) {
+            //界面上表单主体只有背景和透明度可以设置
+            nextContainerPane.add(bodyContentPane, BorderLayout.NORTH);
+        }
+        if (backgroundPane != null) {
+            nextContainerPane.add(backgroundPane, BorderLayout.CENTER);
+            if (currentIsRootLayout) {
+                backgroundPane.setVisible(false);
             }
-        this.titleStylePane = new ComponentTitleStylePane(SETTING_LABEL_WIDTH);
-        return this.createNamedSubStylePane(i18nText("Fine-Design_Form_Widget_Style_Title"), this.titleStylePane);
         }
 
-    protected JPanel createNamedBodyStylePane(boolean isRootLayout) {
-        this.bodyStylePane = new ComponentBodyStylePane(SETTING_LABEL_WIDTH);
-        if (isRootLayout) {
-            return this.bodyStylePane;
+        this.add(container, BorderLayout.CENTER);
     }
-        return this.createNamedSubStylePane(i18nText("Fine-Design_Form_Widget-Style_Body_Content"), this.bodyStylePane);
+
+    protected JPanel createBackgroundStylePane(boolean supportCornerRadius) {
+        borderStyleCombo = new UIComboBox(BORDER_STYLE);
+        borderLineAndImagePane = new BorderLineAndImagePane(this.supportBorderImage);
+        cornerSpinner = new UISpinner(0,1000,1,0);
+
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] rowSize = supportCornerRadius ? new double[] {p, p, p, p} : new double[]{p, p, p};
+        double[] columnSize = {SETTING_LABEL_WIDTH, f};
+
+        UILabel uiLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Background_Style"));
+        Font font = uiLabel.getFont().deriveFont(Font.BOLD);
+        uiLabel.setFont(font);
+        uiLabel.setForeground(new Color(143, 143, 146));
+
+        JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(new JComponent[][]{
+                        {uiLabel, null},
+                        {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Render_Style")), createBorderLayoutNorthPaneWithComponent(borderStyleCombo)},
+                        {this.borderLineAndImagePane, null},
+                        {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")), cornerSpinner},
+                },
+                rowSize, columnSize, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1);
+        contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+
+        JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        container.setBorder(new BottomLineBorder());
+        container.add(contentPane, BorderLayout.NORTH);
+
+        return container;
     }
 
-    protected JPanel createNamedIntegralStylePane(boolean isRootLayout,  boolean supportCornerRadius) {
-        if (isRootLayout) {
-            return null;
+    protected JPanel createBodyContentPane() {
+        backgroundPane = new LayoutBackgroundSpecialPane();
+        backgroundOpacityPane = new UIPercentDragPane();
+
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] rowSize = {p, p};
+        double[] columnSize = {SETTING_LABEL_WIDTH, f};
+
+        JPanel bodyBackground = createBackgroundAndOpacityPane(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Body_Fill"),
+                this.backgroundPane,
+                this.backgroundOpacityPane);
+
+        UILabel uiLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Body_Content"));
+        Font font = uiLabel.getFont().deriveFont(Font.BOLD);
+        uiLabel.setFont(font);
+        uiLabel.setForeground(new Color(143, 143, 146));
+        JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(new JComponent[][]{
+                        {uiLabel, null},
+                        {bodyBackground, null},
+                },
+                rowSize, columnSize, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1);
+        contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+
+        JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        container.setBorder(new BottomLineBorder());
+        container.add(contentPane, BorderLayout.NORTH);
+
+        return container;
+    }
+
+    protected JPanel createBodyContentPane4RootLayout() {
+        backgroundPane = new LayoutBackgroundSpecialPane();
+        backgroundOpacityPane = new UIPercentDragPane();
+
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] rowSize = {p};
+        double[] columnSize = {SETTING_LABEL_WIDTH, f};
+
+        JPanel bodyBackground = createBackgroundAndOpacityPane(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Body_Fill"),
+                this.backgroundPane,
+                this.backgroundOpacityPane);
+
+        JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(new JComponent[][]{
+                        {bodyBackground, null},
+                },
+                rowSize, columnSize, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1);
+        contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+
+        JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        container.setBorder(new BottomLineBorder());
+        container.add(contentPane, BorderLayout.NORTH);
+
+        return container;
+    }
+
+    protected void initTitleComponents() {
+        titleVisibleCheckbox = new UICheckBox();
+
+        titleTextPane = new TinyFormulaPane();
+
+        titleFontFamilyComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
+        TitlePacker title = style.getTitle();
+        if (title != null) {
+            FRFont frFont = title.getFrFont();
+            if (frFont != null) {
+                String fontFamily = frFont.getFamily();
+                // 使用style中默认的字体初始化titleFontFamilyComboBox，保证UI和数据的一致性
+                this.titleFontFamilyComboBox.setSelectedItem(fontFamily);
+            }
         }
-        this.integralStylePane = new ComponentIntegralStylePane(SETTING_LABEL_WIDTH, supportBorderImage, supportCornerRadius);
-        return this.createNamedSubStylePane(i18nText("Fine-Design_Form_Widget-Style_Integral_Style"), this.integralStylePane);
+        titleFontFamilyComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Family"));
+
+        titleFontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
+        titleFontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size"));
+
+        titleFontColorSelectPane = new UIColorButton();
+        titleFontColorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Foreground"));
+        titleFontColorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Foreground"));
+
+        titleFontBoldButton = new UIToggleButton(IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
+        titleFontBoldButton.setPreferredSize(BUTTON_SIZE);
+        titleFontBoldButton.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Bold"));
+        titleFontBoldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Bold"));
+
+        titleFontItalicButton = new UIToggleButton(IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
+        titleFontItalicButton.setPreferredSize(BUTTON_SIZE);
+        titleFontItalicButton.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic"));
+        titleFontItalicButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic"));
+
+        titleFontUnderlineButton = new UIToggleButton(IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline.png"));
+        titleFontUnderlineButton.setPreferredSize(BUTTON_SIZE);
+        titleFontUnderlineButton.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Underline"));
+        titleFontUnderlineButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Underline"));
+
+//        titleFontUnderlineCombo = new LineComboBox(UIConstants.BORDER_LINE_STYLE_ARRAY);
+//        titleFontUnderlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style"));
+
+        titleInsetImagePane = new TitleInsetImagePane();
+
+        titleAlignPane = new UIButtonGroup<Integer>(
+                new Icon[] {
+                        IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"),
+                        IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"),
+                        IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png")
+                },
+                new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT});
+        titleAlignPane.setAllToolTips(
+                new String[] {
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Left"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")
+                });
+
+        titleBackgroundPane = new LayoutBackgroundSpecialPane();
+
+        titleBackgroundOpacityPane = new UIPercentDragPane();
     }
 
-    protected JPanel createNamedSubStylePane(String name, JPanel stylePane) {
-        UILabel uiLabel = new UILabel(name);
+    protected JPanel createTitleStylePane() {
+        initTitleComponents();
+
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] rowSize = {p,p,p,p,p,p};
+        double[] columnSize = {SETTING_LABEL_WIDTH, f};
+
+        final JPanel bottomPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][]{
+                        {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), titleTextPane},
+                        {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Format")), createBorderLayoutNorthPaneWithComponent(titleFontFamilyComboBox)},
+                        {null, createTitleFontButtonPane()},
+                        {titleInsetImagePane, null},
+                        {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Text_Align")), titleAlignPane},
+                        {this.createTitleBackgroundAndOpacityPane(), null},
+                },
+                rowSize, columnSize, IntervalConstants.INTERVAL_L1);
+        bottomPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        bottomPane.setVisible(false);
+
+        JPanel visibleComposedPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        
+        titleVisibleCheckbox.setSelected(false);
+        visibleComposedPane.add(titleVisibleCheckbox, BorderLayout.WEST);
+        visibleComposedPane.add(FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Visible")), BorderLayout.CENTER);
+
+        UILabel uiLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title"));
         Font font = uiLabel.getFont().deriveFont(Font.BOLD);
         uiLabel.setFont(font);
         uiLabel.setForeground(new Color(143, 143, 146));
-
-        JPanel content = TableLayoutHelper.createGapTableLayoutPane( new JComponent[][] {
-                {uiLabel},
-                {stylePane}
-        }, TableLayoutHelper.FILL_LASTCOLUMN, 0, IntervalConstants.INTERVAL_L1);
-        content.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));
+        JPanel topPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][] {
+                {uiLabel, null},
+                {visibleComposedPane, null}
+        }, new double[]{p, p}, new double[]{SETTING_LABEL_WIDTH, p}, IntervalConstants.INTERVAL_L1);
+        topPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
 
         JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        container.add(content, BorderLayout.NORTH);
         container.setBorder(new BottomLineBorder());
+        container.add(topPane, BorderLayout.NORTH);
+        container.add(bottomPane, BorderLayout.CENTER);
+
+        titleVisibleCheckbox.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                bottomPane.setVisible(titleVisibleCheckbox.isSelected());
+            }
+        });
 
         return container;
     }
 
-    private void addComponents(JComponent[] components) {
-        JPanel container = this;
-        for (JComponent component: components) {
-            if (component != null) {
-                container.add(component, BorderLayout.NORTH);
-                JPanel nextContainer = new JPanel(FRGUIPaneFactory.createBorderLayout());
-                container.add(nextContainer, BorderLayout.CENTER);
-                container = nextContainer;
+    private JPanel createBorderLayoutNorthPaneWithComponent(JComponent content) {
+        JPanel jPanel = new JPanel(new BorderLayout());
+        jPanel.add(content, BorderLayout.NORTH);
+        return jPanel;
     }
+
+    protected JPanel createTitleFontButtonPane(){
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] rowSize = {p};
+        double[] columnSize = {f, p, p, p, p};
+
+        JPanel buttonPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][] {
+                {titleFontSizeComboBox, titleFontColorSelectPane, titleFontItalicButton, titleFontBoldButton, titleFontUnderlineButton},
+        }, rowSize, columnSize, IntervalConstants.INTERVAL_W0);
+
+        JPanel containerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        containerPane.add(buttonPane, BorderLayout.NORTH);
+//        containerPane.add(titleFontUnderlineCombo, BorderLayout.CENTER);
+
+//        titleFontUnderlineCombo.setVisible(false);
+//        titleFontUnderlineButton.addChangeListener(new ChangeListener() {
+//            @Override
+//            public void stateChanged(ChangeEvent e) {
+//                titleFontUnderlineCombo.setVisible(titleFontUnderlineButton.isSelected());
+//            }
+//        });
+
+        return containerPane;
     }
+
+    protected JPanel createTitleBackgroundAndOpacityPane() {
+        return createBackgroundAndOpacityPane(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Background"),
+                titleBackgroundPane,
+                titleBackgroundOpacityPane);
     }
 
     @Override
     public LayoutBorderStyle updateBean() {
         LayoutBorderStyle style = new LayoutBorderStyle();
+        updateMain(style);
+        updateTitle(style);
+        return style;
+    }
 
-        if (this.titleStylePane != null) {
-            this.titleStylePane.updateBean(style);
+    protected void updateMain(LayoutBorderStyle style) {
+        if (borderStyleCombo != null) {
+            style.setBorderStyle(borderStyleCombo.getSelectedIndex());
         }
-        if (this.bodyStylePane != null) {
-            this.bodyStylePane.updateBean(style);
+        if (cornerSpinner != null) {
+            style.setBorderRadius((int) cornerSpinner.getValue());
         }
-        if (this.integralStylePane != null) {
-            this.integralStylePane.updateBean(style);
+        if (borderLineAndImagePane != null) {
+            borderLineAndImagePane.updateBean(style);
         }
-        return style;
+        if (backgroundPane != null) {
+            style.setBackground(backgroundPane.update());
+        }
+        if (backgroundOpacityPane != null) {
+            style.setAlpha((float)backgroundOpacityPane.updateBean());
+        }
+    }
+
+    protected void updateTitle(LayoutBorderStyle style) {
+        style.setType(titleVisibleCheckbox != null && titleVisibleCheckbox.isSelected() ? LayoutBorderStyle.TITLE : LayoutBorderStyle.STANDARD);
+        TitlePacker title = style.getTitle() == null ? new WidgetTitle() : style.getTitle();
+        title.setTextObject(titleTextPane.updateBean());
+        FRFont frFont = title.getFrFont();
+        frFont = frFont.applySize((Integer) titleFontSizeComboBox.getSelectedItem());
+        frFont = frFont.applyName(titleFontFamilyComboBox.getSelectedItem().toString());
+        frFont = frFont.applyForeground(titleFontColorSelectPane.getColor());
+        frFont = updateTitleFontItalicBold(frFont);
+//        int line = titleFontUnderlineButton.isSelected() ? this.titleFontUnderlineCombo.getSelectedLineStyle() : Constants.LINE_NONE;
+        int line = titleFontUnderlineButton.isSelected() ? Constants.LINE_THIN : Constants.LINE_NONE;
+        frFont = frFont.applyUnderline(line);
+        title.setFrFont(frFont);
+        title.setPosition((Integer) titleAlignPane.getSelectedItem());
+        titleInsetImagePane.updateBean(title);
+        title.setBackground(titleBackgroundPane.update());
+        title.setBackgroundOpacity((float)titleBackgroundOpacityPane.updateBean());
+        style.setTitle(title);
+    }
+
+    private FRFont updateTitleFontItalicBold(FRFont frFont) {
+        int italic_bold = frFont.getStyle();
+        boolean isItalic = italic_bold == Font.ITALIC || italic_bold == (Font.BOLD + Font.ITALIC);
+        boolean isBold = italic_bold == Font.BOLD || italic_bold == (Font.BOLD + Font.ITALIC);
+        if (titleFontItalicButton.isSelected() && !isItalic) {
+            italic_bold += Font.ITALIC;
+        } else if (!titleFontItalicButton.isSelected() && isItalic) {
+            italic_bold -= Font.ITALIC;
+        }
+        frFont = frFont.applyStyle(italic_bold);
+        if (titleFontBoldButton.isSelected() && !isBold) {
+            italic_bold += Font.BOLD;
+        } else if (!titleFontBoldButton.isSelected() && isBold) {
+            italic_bold -= Font.BOLD;
+        }
+        frFont = frFont.applyStyle(italic_bold);
+        return frFont;
     }
 
     @Override
@@ -154,20 +462,104 @@ public class LayoutStylePane extends BasicBeanPane<LayoutBorderStyle> {
         }
         this.style.setStyle(style);
 
-        if (this.titleStylePane != null) {
-            this.titleStylePane.populateBean(this.style);
+        populateMain();
+        populateTitle();
+    }
+
+    protected void populateMain() {
+        if (this.borderStyleCombo != null) {
+            this.borderStyleCombo.setSelectedIndex(style.getBorderStyle());
+        }
+        if (this.borderLineAndImagePane != null) {
+            this.borderLineAndImagePane.populateBean(style);
+        }
+        if (this.backgroundPane != null) {
+            this.backgroundPane.populateBean(style.getBackground());
+            if (this.backgroundOpacityPane != null) {
+                this.backgroundOpacityPane.populateBean(style.getAlpha());
             }
-        if (this.bodyStylePane != null) {
-            this.bodyStylePane.populateBean(this.style);
         }
-        if (this.integralStylePane != null) {
-            this.integralStylePane.populateBean(this.style);
+        if (this.cornerSpinner != null) {
+            this.cornerSpinner.setValue(style.getBorderRadius());
         }
     }
 
+    protected void populateTitle() {
+        TitlePacker widgetTitle = style == null ? new WidgetTitle() : style.getTitle();
+        widgetTitle = widgetTitle == null ? new WidgetTitle() : widgetTitle;
+        titleVisibleCheckbox.setSelected(style.getType() != LayoutBorderStyle.STANDARD);
+
+        this.titleTextPane.populateBean(widgetTitle.getTextObject().toString());
+
+        FRFont frFont = widgetTitle.getFrFont();
+        this.titleFontSizeComboBox.setSelectedItem(frFont.getSize());
+        this.titleFontFamilyComboBox.setSelectedItem(frFont.getFamily());
+        this.titleFontColorSelectPane.setColor(frFont.getForeground());
+        this.titleFontColorSelectPane.repaint();
+        titleFontBoldButton.setSelected(frFont.isBold());
+        titleFontItalicButton.setSelected(frFont.isItalic());
+
+        int line = frFont.getUnderline();
+        if (line == Constants.LINE_NONE) {
+            titleFontUnderlineButton.setSelected(false);
+//            titleFontUnderlineCombo.setVisible(false);
+        } else {
+            titleFontUnderlineButton.setSelected(true);
+//            titleFontUnderlineCombo.setVisible(true);
+//            this.titleFontUnderlineCombo.setSelectedLineStyle(line);
+        }
+
+        titleAlignPane.setSelectedItem(widgetTitle.getPosition());
+        titleInsetImagePane.populateBean(widgetTitle);
+        titleBackgroundPane.populateBean(widgetTitle.getBackground());
+        titleBackgroundOpacityPane.populateBean(widgetTitle.getBackgroundOpacity());
+    }
+
     @Override
     protected String title4PopupWindow() {
-        return i18nText("Fine-Design_Form_Widget_Style");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style");
+    }
+
+    private static JPanel createBackgroundAndOpacityPane(String name, BackgroundSpecialPane backgroundPane, UIPercentDragPane opacityPane) {
+        JPanel container = new JPanel();
+        container.setLayout(new BorderLayout(0, 6));
+
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] columnSize = {SETTING_LABEL_WIDTH, f};
+
+        // 确保BackgroundSpecialPane高度变化时，Label依然保持与其顶部对齐
+        JPanel backgroundLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        backgroundLabelPane.setBorder(BorderFactory.createEmptyBorder(7, 0, 0, 0));
+        backgroundLabelPane.add(FRWidgetFactory.createLineWrapLabel(name), BorderLayout.NORTH);
+
+        JPanel backgroundComposedPane = TableLayoutHelper.createGapTableLayoutPane(
+                new JComponent[][]{
+                        {backgroundLabelPane, backgroundPane}
+                },
+                new double[]{p}, columnSize, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1);
+
+        JPanel opacityComposedPane = TableLayoutHelper.createGapTableLayoutPane(
+                new JComponent[][]{
+                        {new UILabel(""), FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))},
+                        {new UILabel(""), opacityPane}
+                },
+                new double[]{p, p}, columnSize, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1);
+
+        container.add(backgroundComposedPane, BorderLayout.NORTH, 0);
+        container.add(opacityComposedPane, BorderLayout.CENTER, 1);
+
+        opacityComposedPane.setVisible(false);
+
+        backgroundPane.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                Background background = backgroundPane.update();
+                opacityComposedPane.setVisible(background != null);
+            }
+        });
+
+        return container;
     }
 
     protected static class BottomLineBorder extends LineBorder {
@@ -201,23 +593,4 @@ public class LayoutStylePane extends BasicBeanPane<LayoutBorderStyle> {
             return new GradientBackgroundQuickPane(140);
         }
     }
-
-    public void supportTitleStyle(boolean supportTitleVisible, boolean supportTitleContent, boolean supportOtherSetting) {
-        if (titleStylePane != null) {
-            titleStylePane.setSupportTitleVisible(supportTitleVisible);
-            titleStylePane.setSupportTitleContent(supportTitleContent);
-            titleStylePane.setSupportOtherSetting(supportOtherSetting);
-        }
-    }
-
-    public void supportBodyStyle(boolean supporting) {
-        if (namedBodyStylePane != null) {
-            namedBodyStylePane.setVisible(supporting);
-        }
-    }
-    public void supportIntegralStyle(boolean supporting) {
-        if (namedIntegralStylePane != null) {
-            namedIntegralStylePane.setVisible(supporting);
-        }
-    }
 }

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@@ -32,19 +32,17 @@ import com.fr.design.mainframe.alphafine.search.manager.impl.RecentSearchManager
 import com.fr.design.mainframe.alphafine.search.manager.impl.RecommendSearchManager;
 import com.fr.design.mainframe.alphafine.search.manager.impl.SegmentationManager;
 import com.fr.design.mainframe.alphafine.search.manager.impl.SimilarSearchManager;
-import com.fr.form.main.Form;
-import com.fr.form.main.FormIO;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.http.HttpClient;
-import com.fr.io.TemplateWorkBookIO;
-import com.fr.io.exporter.ImageExporter;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
-import com.fr.main.impl.WorkBook;
 import com.fr.stable.CodeUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.project.ProjectConstants;
 
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.exporter.LocalExportOperator;
+import com.fr.workspace.server.exporter.TemplateExportOperator;
 import javax.imageio.ImageIO;
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
@@ -601,14 +599,15 @@ public class AlphaFineDialog extends UIDialog {
                     checkWorker();
                     this.showWorker = new SwingWorker<BufferedImage, Void>() {
                         @Override
-                        protected BufferedImage doInBackground() {
-                            Form form = null;
+                        protected BufferedImage doInBackground() throws Exception {
+                            byte[] bytes = null;
                             try {
-                                form = FormIO.readForm(fileName);
-                            } catch (Exception e) {
-                                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                                bytes = WorkContext.getCurrent().get(TemplateExportOperator.class).exportFormAsImageData(fileName);
+                            } catch (Exception ignored) {
+                                // 兼容下老版本
+                                bytes = new LocalExportOperator().exportFormAsImageData(fileName);
                             }
-                            return FormIO.exportFormAsImage(form);
+                            return TemplateExportOperator.byteDataToImage(bytes);
                         }
 
                         @Override
@@ -631,15 +630,15 @@ public class AlphaFineDialog extends UIDialog {
                     checkWorker();
                     this.showWorker = new SwingWorker<BufferedImage, Void>() {
                         @Override
-                        protected BufferedImage doInBackground() {
-                            WorkBook workBook = null;
+                        protected BufferedImage doInBackground() throws Exception {
+                            byte[] bytes = null;
                             try {
-                                workBook = (WorkBook) TemplateWorkBookIO.readTemplateWorkBook(fileName);
-                            } catch (Exception e) {
-                                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                                bytes = WorkContext.getCurrent().get(TemplateExportOperator.class).exportWorkBookAsImageData(fileName);
+                            } catch (Exception ignored) {
+                                // 兼容下老版本
+                               bytes = new LocalExportOperator().exportWorkBookAsImageData(fileName);
                             }
-                            BufferedImage bufferedImage = new ImageExporter().exportToImage(workBook);
-                            return bufferedImage;
+                            return TemplateExportOperator.byteDataToImage(bytes);
                         }
 
                         @Override

designer-realize/src/main/java/com/fr/design/webattr/EditReportServerParameterPane.java

@@ -9,6 +9,7 @@ import com.fr.config.PrintConfig;
 import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.gui.frpane.LoadingBasicPane;
 import com.fr.design.gui.frpane.UITabbedPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.webattr.printsettings.GlobalNativePrintSettingPane;
 import com.fr.design.webattr.printsettings.PrintSettingPane;
@@ -17,6 +18,7 @@ import com.fr.report.web.WebPage;
 import com.fr.report.web.WebView;
 import com.fr.report.web.WebWrite;
 import com.fr.web.attr.ReportWebAttr;
+import com.fr.workspace.WorkContext;
 
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -44,6 +46,8 @@ public class EditReportServerParameterPane extends LoadingBasicPane {
 
     private PrintSettingPane printSettingPane;
 
+    private ServerFitAttrPane serverFitAttrPane;
+
 
     @Override
     protected synchronized void initComponents(JPanel container) {
@@ -61,6 +65,9 @@ public class EditReportServerParameterPane extends LoadingBasicPane {
         tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"), jsPane = new WebJsPane());
         tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Error_Handler_Template"), errorTemplatePane = new ErrorTemplatePane());
         tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Print_Setting"), printSettingPane = new PrintSettingPane(new GlobalNativePrintSettingPane()));
+        if (WorkContext.getCurrent().isRoot()) {
+            tabbedPane.addTab(Toolkit.i18nText("Fine-Designer_PC_Fit_Attr"), serverFitAttrPane = new ServerFitAttrPane());
+        }
     }
 
     @Override
@@ -93,6 +100,9 @@ public class EditReportServerParameterPane extends LoadingBasicPane {
         printSettingPane.populate(printSettings);
 
         this.errorTemplatePane.populateBean(reportServerPreferenceConfig.getErrorTemplate());
+        if (serverFitAttrPane != null) {
+            serverFitAttrPane.populateBean(null);
+        }
     }
 
     /**
@@ -110,5 +120,8 @@ public class EditReportServerParameterPane extends LoadingBasicPane {
         PrintConfig.getInstance().setPrintSettings(printSettings);
 
         reportServerPreferenceConfig.setErrorTemplate(this.errorTemplatePane.updateBean());
+        if (serverFitAttrPane != null) {
+            serverFitAttrPane.updateBean();
+        }
     }
 }

designer-realize/src/main/java/com/fr/design/webattr/ServerFitAttrPane.java

@@ -0,0 +1,78 @@
+package com.fr.design.webattr;
+
+import com.fr.config.Configuration;
+import com.fr.design.report.fit.BaseFitAttrPane;
+import com.fr.design.report.fit.FitAttrModel;
+import com.fr.general.ComparatorUtils;
+import com.fr.report.fit.ReportFitAttr;
+import com.fr.report.fit.ReportFitConfig;
+import com.fr.transaction.Configurations;
+import com.fr.transaction.Worker;
+
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+
+public class ServerFitAttrPane extends BaseFitAttrPane {
+
+    public ServerFitAttrPane() {
+        super();
+        initComponents();
+    }
+
+    @Override
+    protected void initComponents() {
+        super.initComponents();
+        populateModel(fitAttrModelList.get(0));
+    }
+
+
+    @Override
+    public void populateBean(ReportFitAttr reportFitAttr) {
+        reportFitAttr = fitAttrModel.getGlobalReportFitAttr();
+        super.populateBean(reportFitAttr);
+    }
+
+
+    public ReportFitAttr updateBean() {
+        ReportFitAttr reportFitAttr = super.updateBean();
+        Configurations.update(new Worker() {
+            @Override
+            public void run() {
+                fitAttrModel.setGlobalReportFitAttr(reportFitAttr);
+            }
+
+            @Override
+            public Class<? extends Configuration>[] targets() {
+                return new Class[]{ReportFitConfig.class};
+            }
+        });
+        return null;
+
+    }
+
+    @Override
+    protected String[] getItemNames() {
+        return fitAttrModelList.stream().map(FitAttrModel::getModelName).toArray(String[]::new);
+    }
+
+    @Override
+    protected ItemListener getItemListener() {
+        ServerFitAttrPane self = this;
+        return new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                if (e.getStateChange() == ItemEvent.SELECTED) {
+                    for (FitAttrModel fitAttrModel : fitAttrModelList) {
+                        if (ComparatorUtils.equals(e.getItem(), fitAttrModel.getModelName())) {
+                            self.populateModel(fitAttrModel);
+                            populateBean(null);
+                            refresh();
+                        }
+                    }
+                }
+            }
+        };
+    }
+}
+