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

designer-base/src/main/java/com/fr/design/actions/UpdateAction.java

@@ -10,6 +10,7 @@ import com.fr.base.Style;
 import com.fr.base.svg.SVGIcon;
 import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.core.ActionFactory;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.UICheckBoxMenuItem;
 import com.fr.design.gui.imenu.UIMenuEastAttrItem;
@@ -116,11 +117,13 @@ public abstract class UpdateAction extends ShortCut implements Action {
 			this.enabled = newValue;
 
 			//循环遍历所有的Enable属性.
-			Iterator<Object> valueIt = this.componentMap.values().iterator();
+			if (this.componentMap != null) {
-			while (valueIt.hasNext()) {
+				Iterator<Object> valueIt = this.componentMap.values().iterator();
-				Object valueObject = valueIt.next();
+				while (valueIt.hasNext()) {
-				if (valueObject instanceof JComponent) {
+					Object valueObject = valueIt.next();
-					((JComponent) valueObject).setEnabled(this.enabled);
+					if (valueObject instanceof JComponent) {
+						((JComponent) valueObject).setEnabled(this.enabled);
+					}
 				}
 			}
 		}

designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java

@@ -222,9 +222,9 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
     }
 
     protected void initComponentsLayout(PreviewLabel previewLabel, int labelSize) {
-        UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database") + ":");
+        UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database"));
-        UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model") + ":");
+        UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"));
-        UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table") + ":");
+        UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table"));
 
         if (labelSize > 0) {
             Dimension pSize = new Dimension(labelSize, 25);

designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java

@@ -101,7 +101,7 @@ public class FunctionManagerPane extends BasicPane {
         @Override
         public NameableCreator[] createNameableCreators() {
             NameableCreator funcDef = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function"),
-                    IconUtils.readIcon("com/fr/design/images/server/global_param.png"),
+                    IconUtils.readIcon("com/fr/design/images/server/global_param.svg"),
                     FunctionDef.class,
             		FunctionContentPane.class);
             return new NameableCreator[]{funcDef};

designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowPane.java

@@ -133,7 +133,6 @@ public class ColumnRowPane extends JPanel implements UIObserver {
             }
 
         };
-        rowSpinner.setPreferredSize(new Dimension(60, 24));
         JFormattedTextField rftf = GUICoreUtils.getSpinnerTextField(rowSpinner);
         if (rftf != null) {
             rftf.setColumns(4); // specify more width than we need
@@ -148,7 +147,6 @@ public class ColumnRowPane extends JPanel implements UIObserver {
                 return false;
             }
         };
-        columnSpinner.setPreferredSize(new Dimension(60, 24));
         JFormattedTextField cftf = GUICoreUtils.getSpinnerTextField(columnSpinner);
         if (cftf != null) {
             cftf.setColumns(3); // specify more width than we need

designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java

@@ -24,7 +24,7 @@ public class ColumnRowVerticalPane extends ColumnRowPane {
 	public ColumnRowVerticalPane( ) {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
 		
-		JPanel pane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
+		JPanel pane = new JPanel(FRGUIPaneFactory.createBorderLayout());
 		this.add(pane, BorderLayout.NORTH);
 		
 		UILabel colLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"));
@@ -35,8 +35,8 @@ public class ColumnRowVerticalPane extends ColumnRowPane {
 		initRowSpinner();
 
 		pane.add(column(10,
-				row(flex(0.005), cell(rowLabel).weight(0.195), cell(rowSpinner).weight(0.8)),
+				row(cell(rowLabel).weight(0.15), cell(rowSpinner).weight(0.85)),
-				row(flex(0.005), cell(colLabel).weight(0.195), cell(columnSpinner).weight(0.8))
+				row(cell(colLabel).weight(0.15), cell(columnSpinner).weight(0.85))
 		).getComponent());
 		
 		this.addDocumentListener(d);

designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.hyperlink;
 
+import com.fine.theme.utils.FineUIUtils;
 import com.fr.base.BaseUtils;
 import com.fr.base.Parameter;
 import com.fr.design.dialog.FineJOptionPane;
@@ -62,12 +63,9 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
                 extendPane
         );
 
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Parameter"), null));
-
-
         this.add(column(
                 cell(northPane),
-                cell(parameterViewPane).weight(1.0)
+                cell(FineUIUtils.wrapComponentWithTitle(parameterViewPane, Toolkit.i18nText("Fine-Design_Basic_Parameter"))).weight(1.0)
         ).getComponent());
     }
 

designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.hyperlink;
 
+import com.fine.theme.utils.FineUIUtils;
 import com.fr.base.Parameter;
 import com.fr.design.gui.frpane.ReportletParameterViewPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -45,11 +46,10 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
         extendPane.add(extendParametersCheckBox);
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(),
                 getValueEditorPane(), extendPane);
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Parameters"), null));
 
         this.add(column(
                 cell(northPane),
-                cell(parameterViewPane).weight(1.0)
+                cell(FineUIUtils.wrapComponentWithTitle(parameterViewPane, Toolkit.i18nText("Fine-Design_Basic_Parameters"))).weight(1.0)
         ).getComponent());
     }
 

designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java

@@ -163,7 +163,7 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
                 cell(templateLabel),
                 row(
                         cell(templatePathTextField),
-                        cell(templateSelectButton))
+                        cell(templateSelectButton)).weight(1.0)
         ).getComponent());
         return templatePanel;
     }
@@ -192,9 +192,9 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
         fontPane = new CustomFontPane();
         textSettingPanel.add(column(10,
                 row(40, cell(new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Text"))),
-                    cell(textContentPane)),
+                    cell(textContentPane).weight(0.8)),
                 row(40, cell(new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Style"))),
-                    cell(fontPane))
+                    cell(fontPane).weight(0.9))
         ).getComponent());
 
         return textSettingPanel;

designer-base/src/main/java/com/fr/design/hyperlink/popup/CustomFontPane.java

@@ -46,9 +46,14 @@ public class CustomFontPane extends JPanel {
         fontSizeComboBox.setEditable(true);
 
         colorSelectPane = new UIColorButton();
-        bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.svg"));
+        bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/new_bold.png"));
-        italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.svg"));
+        italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/new_italic.png"));
-        underline = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline.svg"));
+        underline = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/new_underline.png"));
+
+        colorSelectPane.setOpaque(true);
+        bold.setOpaque(true);
+        italic.setOpaque(true);
+        underline.setOpaque(true);
 
         this.setButtonsTips();
         this.setButtonsSize(BUTTON_SIZE);
@@ -56,11 +61,11 @@ public class CustomFontPane extends JPanel {
 
         JPanel buttonPane = new JPanel(new BorderLayout());
         buttonPane.add(row(10,
-                cell(fontSizeComboBox).weight(0.6),
+                cell(fontSizeComboBox).weight(0.76),
-                cell(colorSelectPane).weight(0.1),
+                cell(colorSelectPane).weight(0.06),
-                cell(bold).weight(0.1),
+                cell(bold).weight(0.06),
-                cell(italic).weight(0.1),
+                cell(italic).weight(0.06),
-                cell(underline).weight(0.1)
+                cell(underline).weight(0.06)
         ).getComponent());
 
         this.setLayout(new BorderLayout(0,0));

designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupRegularPane.java

@@ -83,14 +83,11 @@ public class MobilePopupRegularPane extends BasicPane {
         JPanel spinnerLabelPane = new JPanel(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 5));
 
         JPanel spinnerPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 2,0));
-        Dimension dimension = new Dimension(60, 20);
-        spinner.setPreferredSize(dimension);
         UILabel percent = new UILabel("%");
         spinnerPane.add(spinner);
         spinnerPane.add(percent);
 
         UILabel label = new UILabel(labelText);
-        label.setPreferredSize(dimension);
         label.setHorizontalAlignment(SwingConstants.CENTER);
 
         spinnerLabelPane.add(spinnerPane);

designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java

@@ -2,7 +2,6 @@ package com.fr.design.hyperlink.popup;
 
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.widget.UITitleSplitLine;
-import sun.awt.windows.WComponentPeer;
 
 import javax.swing.*;
 import java.awt.*;

designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.javascript;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.border.UIRoundedBorder;
@@ -99,7 +100,7 @@ public class JSContentPane extends BasicPane {
 
 
     private void addNewPaneLabel(){
-        UILabel advancedEditorLabel = new UILabel(Toolkit.i18nText("Fine-Design_Advanced_Editor"), IconUtils.readIcon("com/fr/design/images/edit/advancedEditor.svg"), SwingConstants.LEFT);
+        UILabel advancedEditorLabel = new UILabel(Toolkit.i18nText("Fine-Design_Advanced_Editor"), new LazyIcon("advanced_editor"), SwingConstants.LEFT);
         advancedEditorLabel.setCursor(new Cursor(Cursor.HAND_CURSOR));
         advancedEditorLabel.addMouseListener(new MouseAdapter() {
             @Override

designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.javascript;
 
+import com.fine.theme.utils.FineUIUtils;
 import com.fr.base.Parameter;
 import com.fr.design.data.tabledata.tabledatapane.OneListTableModel;
 import com.fr.design.dialog.FineJOptionPane;
@@ -69,20 +70,17 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
         importedJsPane = createImportedJsPane();
 
         jsPane = createJSContentPane(defaultArgs);
-        jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript")));
 
         JPanel topPane = new JPanel(new BorderLayout());
         topPane.add(row(10,
-                cell(importedJsPane).weight(0.5),
+                cell(FineUIUtils.wrapComponentWithTitle(importedJsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"))).weight(0.5),
-                cell(parameterPane).weight(0.5)
+                cell(FineUIUtils.wrapComponentWithTitle(parameterPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))).weight(0.5)
         ).getComponent());
 
-        topPane.setBorder(BorderFactory.createEmptyBorder(0, 0, BOTTOM_BORDER, 0));
-
         this.setLayout(new BorderLayout());
         this.add(column(10,
                 cell(topPane).weight(0.5),
-                cell(jsPane).weight(0.5)
+                cell(FineUIUtils.wrapComponentWithTitle(jsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript"))).weight(0.5)
         ).getComponent());
 
         this.reLayoutForChart();
@@ -111,7 +109,6 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
 
     protected ReportletParameterViewPane createParameterViewPane(){
         ReportletParameterViewPane  parameterPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
-        parameterPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
         parameterPane.addTableEditorListener(new TableModelListener() {
             public void tableChanged(TableModelEvent e) {
                 List<ParameterProvider> list = parameterPane.update();
@@ -147,7 +144,6 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
             }
         };
         UITableEditorPane<String> importedJsPane = new UITableEditorPane<String>(model);
-        importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript")));
         return importedJsPane;
     }
 

designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java

@@ -59,7 +59,7 @@ public class ParameterArrayPane extends JListControlPane {
     public NameableCreator[] createNameableCreators() {
         return new NameableCreator[]{
                 new NameableSelfCreator(Toolkit.i18nText("Fine-Design_Basic_Engine_Parameter_Name"),
-                        "com/fr/design/images/server/global_param.png",
+                        "com/fr/design/images/server/global_param.svg",
                         Parameter.class,
                         ParameterPane.class) {
                     public Parameter createNameable(UnrepeatedNameHelper helper) {

designer-base/src/main/java/com/fr/design/parameter/ParameterPane.java

@@ -46,11 +46,11 @@ public class ParameterPane extends BasicBeanPane<Parameter> {
 		// richer:要排列显示的控件
 		JPanel centerPane = column(LayoutConstants.VERTICAL_GAP,
 				row(20,
-						cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":")).weight(0.1),
+						cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name"))).weight(0.1),
 						cell(nameTextField).weight(0.8),
 						flex(0.1)),
 				row(20,
-						cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Default_Value") + ":")).weight(0.1),
+						cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Default_Value"))).weight(0.1),
 						cell(valueEditor).weight(0.8),
 						flex(0.1))
 		).getComponent();

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -1,9 +1,11 @@
 package com.fr.design.web;
 
+import com.fine.theme.light.ui.FineRoundBorder;
 import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 import com.fr.base.Icon;
 import com.fr.base.IconManager;
+import com.fr.design.border.FineBorderFactory;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
@@ -41,6 +43,7 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Window;
+import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
@@ -60,6 +63,10 @@ import java.awt.event.FocusListener;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 
+import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.row;
+
 /**
  * carl：自定义Icon编辑
  */
@@ -86,11 +93,11 @@ public class CustomIconPane extends BasicPane {
 
     private void initComponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        UILabel iconLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon"));
         JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon")));
+        JPanel noNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        JPanel noNamePane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
+        noNamePane.setBorder(new FineRoundBorder());
-        centerPane.add(noNamePane, BorderLayout.CENTER);
+        noNamePane.setBackground(Color.WHITE);
-
         iconPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 
         // 开始加图标选择按钮
@@ -100,14 +107,14 @@ public class CustomIconPane extends BasicPane {
         refreshIconPane(false);
         jsPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
 
-        jsPane.setPreferredSize(new Dimension(200, 180));
         noNamePane.add(jsPane);
 
-        DescriptionTextArea des = new DescriptionTextArea(2);
+        UILabel desLabel = new UILabel(createDescriptionText());
-        des.setText(createDescriptionText());
+        desLabel.setForeground(Color.GRAY);
-        centerPane.add(des, BorderLayout.SOUTH);
+        centerPane.add(column(
-
+                cell(noNamePane).weight(0.9),
-        this.add(centerPane, BorderLayout.CENTER);
+                cell(desLabel).weight(0.1)
+        ).getComponent());
 
         JPanel eastPane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
         JPanel buttonPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1);
@@ -118,8 +125,10 @@ public class CustomIconPane extends BasicPane {
         initEditButton(buttonPane);
 
         eastPane.add(buttonPane);
-        this.add(eastPane, BorderLayout.EAST);
+        this.add(column(10,
-
+                cell(iconLabel),
+                row(10, cell(centerPane).weight(0.9), cell(eastPane).weight(0.1)).weight(1.0)
+        ).getComponent());
     }
 
 
@@ -369,7 +378,7 @@ public class CustomIconPane extends BasicPane {
                 g2d.drawImage(iconImage, ICON_X, ICON_Y, IconManager.DEFAULT_ICONWIDTH, IconManager.DEFAULT_ICONHEIGHT, null);
             }
             if (this.iconName != null && ComparatorUtils.equals(this.iconName, selectedIconName)) {
-                g2d.setPaint(Color.RED);
+                g2d.setPaint(Color.BLUE);
             } else {
                 g2d.setPaint(Color.LIGHT_GRAY);
             }

designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.write.submit;
 
 import com.fine.theme.utils.FineUIScale;
+import com.fine.theme.utils.FineUIUtils;
 import com.fr.base.GraphHelper;
 import com.fr.data.AbstractClassJob;
 import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane;
@@ -91,7 +92,6 @@ public abstract class CustomJobPane  extends BasicBeanPane {
             }
         });
 
-		reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Name"), null));
 		reportletNamePane.setLayout(new BorderLayout());
 		reportletNamePane.add(row(10,
 				cell(classNameTextField).weight(0.8),
@@ -100,14 +100,12 @@ public abstract class CustomJobPane  extends BasicBeanPane {
 		).getComponent());
 
 		objectProperiesPane = new ObjectProperiesPane();
-		objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"), null));
 		JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		dsPane.add(area);
-		dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Job_Description"), null));
 		this.add(column(
-				cell(reportletNamePane),
+				cell(FineUIUtils.wrapComponentWithTitle(reportletNamePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Name"))),
-				cell(objectProperiesPane).weight(1.0),
+				cell(FineUIUtils.wrapComponentWithTitle(objectProperiesPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"))).weight(1.0),
-				cell(dsPane)
+				cell(FineUIUtils.wrapComponentWithTitle(dsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Job_Description")))
 		).getComponent());
 		checkAddButtonEnable();
 	}

designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@@ -2,6 +2,7 @@ package com.fr.design.write.submit;
 
 import com.fine.swing.ui.layout.Layouts;
 import com.fine.theme.utils.FineUIScale;
+import com.fine.theme.utils.FineUIUtils;
 import com.fr.base.BaseFormula;
 import com.fr.base.BaseUtils;
 import com.fr.base.Parameter;
@@ -156,16 +157,13 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 
         JPanel typePane = new JPanel(new BorderLayout());
         typePane.add(row(10,
-                cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":")),
+                cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type"))),
                 cell(dmlConfigComboBox)).getComponent());
-        typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type")));
         chooseTable = new ChoosePaneSupportFormula();
-        chooseTable.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Table")));
         chooseTable.setTableNameComboBoxPopSize(160, 320);
 
         // peter:编辑的TablePane
         JPanel editTablePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        editTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value")));
         editTablePane.setBounds(0, 0, FineUIScale.scale(280), FineUIScale.scale(180));
         keyColumnValuesTable = new KeyColumnNameValueTable();
         editTablePane.add(new UIScrollPane(this.keyColumnValuesTable), BorderLayout.CENTER);
@@ -177,13 +175,13 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
         keyColumnValuesTable.getTableHeader().setDefaultRenderer(headerRenderer);
 
         northPane.add(column(10, true,
-                cell(typePane),
+                cell(FineUIUtils.wrapComponentWithTitle(typePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type"))),
-                cell(chooseTable))
+                cell(FineUIUtils.wrapComponentWithTitle(chooseTable, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Table"))))
         .getComponent());
 
         this.add(column(10, true,
                 cell(northPane),
-                cell(editTablePane))
+                cell(FineUIUtils.wrapComponentWithTitle(editTablePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value"))))
         .getComponent());
 
         initJTableColumn();
@@ -266,8 +264,10 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
         JPanel conditionPane = this.createConditionPane();
 
         JPanel btPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
-        btPane.add(eventPane, BorderLayout.CENTER);
+        btPane.add(column(
-        btPane.add(conditionPane, BorderLayout.NORTH);
+                cell(FineUIUtils.wrapComponentWithTitle(conditionPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition"))),
+                cell(eventPane)
+        ).getComponent());
         this.add(btPane, BorderLayout.SOUTH);
     }
 
@@ -341,8 +341,8 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
         controlBtnPane.setPreferredSize(createControlBtnPanePreferredSize());
         controlBtnPane.add(addSubmitConditionButton);
         conditionPane.add(row(
-                cell(jp).weight(0.74),
+                cell(jp).weight(0.76),
-                column(cell(controlBtnPane).weight(0.5),cell(new UILabel()).weight(0.5)).weight(0.26)
+                column(cell(controlBtnPane).weight(0.4),cell(new UILabel()).weight(0.6)).weight(0.24)
         ).getComponent());
 
         return conditionPane;
@@ -350,8 +350,6 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 
     protected void setBorderAndLayout(JPanel jPanel) {
         jPanel.setLayout(FRGUIPaneFactory.createBorderLayout());
-        jPanel.setBorder(BorderFactory.createTitledBorder(
-                new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition")));
     }
 
     protected void addComponent(JPanel mainPane, JScrollPane addPane) {

designer-base/src/main/resources/com/fine/theme/icon/font/bold.svg

@@ -1,5 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd"
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.7 14.8828V6.2H15.9561C18.3552 6.2 20.3 8.14483 20.3 10.5439C20.3 12.872 18.4685 14.7724 16.1677 14.8828H8.7ZM6.5 14.8828V5.03226C6.5 4.46216 6.96216 4 7.53226 4H15.9561C19.5702 4 22.5 6.92981 22.5 10.5439C22.5 12.3184 21.7937 13.9279 20.6469 15.1067C23.4422 15.8574 25.5 18.4091 25.5 21.4414C25.5 25.0636 22.5636 28 18.9414 28H7.61765C7.00039 28 6.5 27.4996 6.5 26.8823V17.0878V14.8828ZM8.7 17.0878V25.8H18.9414C21.3486 25.8 23.3 23.8486 23.3 21.4414C23.3 19.0342 21.3486 17.0828 18.9414 17.0828H16.2159C16.1297 17.0861 16.0431 17.0878 15.9561 17.0878H8.7Z" fill="#0A1C38" fill-opacity="0.9"/>
-          d="M8.7 14.8828V6.2H15.9561C18.3552 6.2 20.3 8.14483 20.3 10.5439C20.3 12.872 18.4685 14.7724 16.1677 14.8828H8.7ZM6.5 14.8828V5.03226C6.5 4.46216 6.96216 4 7.53226 4H15.9561C19.5702 4 22.5 6.92981 22.5 10.5439C22.5 12.3184 21.7937 13.9279 20.6469 15.1067C23.4422 15.8574 25.5 18.4091 25.5 21.4414C25.5 25.0636 22.5636 28 18.9414 28H7.61765C7.00039 28 6.5 27.4996 6.5 26.8823V17.0878V14.8828ZM8.7 17.0878V25.8H18.9414C21.3486 25.8 23.3 23.8486 23.3 21.4414C23.3 19.0342 21.3486 17.0828 18.9414 17.0828H16.2159C16.1297 17.0861 16.0431 17.0878 15.9561 17.0878H8.7Z"
-          fill="#0A1C38" fill-opacity="0.9"/>
 </svg>

designer-base/src/main/resources/com/fine/theme/icon/font/italic.svg

@@ -1,5 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd"
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 6.1C13 5.49249 13.4925 5 14.1 5H24.9C25.5075 5 26 5.49249 26 6.1C26 6.70751 25.5075 7.2 24.9 7.2H20.7248L14.1248 24.8001H17.9C18.5075 24.8001 19 25.2925 19 25.9001C19 26.5076 18.5075 27.0001 17.9 27.0001H7.1C6.49249 27.0001 6 26.5076 6 25.9001C6 25.2925 6.49249 24.8001 7.1 24.8001H11.7752L18.3752 7.2H14.1C13.4925 7.2 13 6.70751 13 6.1Z" fill="#0A1C38" fill-opacity="0.9"/>
-          d="M13 6.1C13 5.49249 13.4925 5 14.1 5H24.9C25.5075 5 26 5.49249 26 6.1C26 6.70751 25.5075 7.2 24.9 7.2H20.7248L14.1248 24.8001H17.9C18.5075 24.8001 19 25.2925 19 25.9001C19 26.5076 18.5075 27.0001 17.9 27.0001H7.1C6.49249 27.0001 6 26.5076 6 25.9001C6 25.2925 6.49249 24.8001 7.1 24.8001H11.7752L18.3752 7.2H14.1C13.4925 7.2 13 6.70751 13 6.1Z"
-          fill="#0A1C38" fill-opacity="0.9"/>
 </svg>

designer-base/src/main/resources/com/fine/theme/icon/font/underline.svg

@@ -1,5 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd"
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.5 4C9.5 3.44772 9.05228 3 8.5 3C7.94772 3 7.5 3.44772 7.5 4V15.5C7.5 20.1944 11.3056 24 16 24C20.6944 24 24.5 20.1944 24.5 15.5V4C24.5 3.44772 24.0523 3 23.5 3C22.9477 3 22.5 3.44772 22.5 4V15.5C22.5 19.0899 19.5899 22 16 22C12.4101 22 9.5 19.0899 9.5 15.5V4ZM6.1 26C5.49249 26 5 26.4925 5 27.1C5 27.7075 5.49249 28.2 6.1 28.2H25.9C26.5075 28.2 27 27.7075 27 27.1C27 26.4925 26.5075 26 25.9 26H6.1Z" fill="#0A1C38" fill-opacity="0.9"/>
-          d="M9.5 4C9.5 3.44772 9.05228 3 8.5 3C7.94772 3 7.5 3.44772 7.5 4V15.5C7.5 20.1944 11.3056 24 16 24C20.6944 24 24.5 20.1944 24.5 15.5V4C24.5 3.44772 24.0523 3 23.5 3C22.9477 3 22.5 3.44772 22.5 4V15.5C22.5 19.0899 19.5899 22 16 22C12.4101 22 9.5 19.0899 9.5 15.5V4ZM6.1 26C5.49249 26 5 26.4925 5 27.1C5 27.7075 5.49249 28.2 6.1 28.2H25.9C26.5075 28.2 27 27.7075 27 27.1C27 26.4925 26.5075 26 25.9 26H6.1Z"
-          fill="#0A1C38" fill-opacity="0.9"/>
 </svg>

designer-base/src/main/resources/com/fine/theme/icon/param/advanced_editor.svg

@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M29.0353 2.70388C28.429 2.09756 27.446 2.09757 26.8397 2.70389L14.4417 15.1019L13.2902 18.449L16.6374 17.2975L29.0353 4.89956C29.6417 4.29324 29.6417 3.3102 29.0353 2.70388Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M6 2.99997H22.1733L20.1733 4.99997H6L6 28H26V11.8899L28 9.88986V28C28 29.1045 27.1046 30 26 30H6C4.89543 30 4 29.1045 4 28V4.99997C4 3.8954 4.89543 2.99997 6 2.99997Z" fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/widget/user_widget.svg

@@ -0,0 +1,10 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_5516_63505)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30 16C30 23.732 23.732 30 16 30C8.26801 30 2 23.732 2 16C2 8.26801 8.26801 2 16 2C23.732 2 30 8.26801 30 16ZM32 16C32 24.8366 24.8366 32 16 32C7.16344 32 0 24.8366 0 16C0 7.16344 7.16344 0 16 0C24.8366 0 32 7.16344 32 16ZM8 24.3492C8 24.6254 8.22386 24.8492 8.5 24.8492H10.8284L22.412 13.2657L19.5836 10.4372L8 22.0208V24.3492ZM24.2635 11.4142L23.8262 11.8514L20.9978 9.02302L21.435 8.58579C22.2161 7.80474 23.4824 7.80474 24.2635 8.58579C25.0445 9.36684 25.0445 10.6332 24.2635 11.4142Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_5516_63505">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json

@@ -297,6 +297,8 @@
     "tab": "widget/tab.svg",
     "text_area": "widget/text_area.svg",
     "text_field": "widget/text_field.svg",
-    "widget_tree": "widget/tree.svg"
+    "widget_tree": "widget/tree.svg",
+    "user_widget": "widget/user_widget.svg",
+    "advanced_editor": "param/advanced_editor.svg"
   }
 }

designer-base/src/main/resources/com/fr/design/images/server/global_param.svg

@@ -0,0 +1,7 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 6V3C3 2.44772 3.44772 2 4 2C4.55228 2 5 2.44772 5 3L5 6H26V3C26 2.44772 26.4477 2 27 2C27.5523 2 28 2.44772 28 3V6C28 7.10457 27.1046 8 26 8H5C3.89543 8 3 7.10457 3 6Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M7 16C7 15.4477 7.44772 15 8 15H17.8728C16.894 15.506 16.0199 16.1864 15.2917 17H8C7.44772 17 7 16.5523 7 16Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M26 12V14.9355C26.7281 15.2974 27.4003 15.7549 28 16.2917V12C28 10.8954 27.1046 10 26 10H5C3.89543 10 3 10.8954 3 12V29C3 29.5523 3.44772 30 4 30C4.55228 30 5 29.5523 5 29V12H26Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M13.0549 22C13.1316 21.3065 13.287 20.6368 13.5121 20H8C7.44772 20 7 20.4477 7 21C7 21.5523 7.44772 22 8 22H13.0549Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.1584 18.0944C29.6895 20.6255 29.9662 24.5487 27.973 27.3342L29.6637 29.0249C30.0943 29.4555 30.0943 30.1536 29.6637 30.5842C29.2331 31.0147 28.535 31.0147 28.1045 30.5842L26.4263 28.906C23.6357 30.9721 19.6535 30.7175 17.0944 28.1584C14.2808 25.3448 14.2529 20.8111 17.032 18.032C19.8111 15.2529 24.3448 15.2808 27.1584 18.0944ZM25.8066 26.8066C27.7882 24.8249 27.7932 21.5576 25.7442 19.5086C23.6952 17.4596 20.4278 17.4645 18.4462 19.4462C16.4645 21.4278 16.4596 24.6952 18.5086 26.7442C20.5576 28.7932 23.8249 28.7882 25.8066 26.8066Z" fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java

@@ -1,5 +1,7 @@
 package com.fr.design.chart.series.SeriesCondition.impl;
 
+import com.fine.theme.utils.FineUIScale;
+import com.fine.theme.utils.FineUIUtils;
 import com.fr.base.Utils;
 import com.fr.chart.web.ChartHyperRelateCellLink;
 import com.fr.design.gui.columnrow.ColumnRowVerticalPane;
@@ -42,7 +44,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
     }
 
     private void initComponent() {
-        this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
+        this.setLayout(new BorderLayout());
         if (needRenamePane()) {
             itemNameTextField = new UITextField();
             this.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), BorderLayout.NORTH);
@@ -50,18 +52,16 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
 
         JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 
-        centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Cell")));
-
         colRowPane = new ColumnRowVerticalPane();
         centerPane.add(colRowPane, BorderLayout.NORTH);
 
         addPaneInCenter(centerPane);
 
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
+        parameterViewPane.setPreferredSize(new Dimension(centerPane.getWidth(), FineUIScale.scale(380)));
         this.add(column(
-                cell(centerPane).weight(0.2),
+                cell(FineUIUtils.wrapComponentWithTitle(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Cell"))).weight(0.3),
-                cell(parameterViewPane).weight(0.8)
+                cell(FineUIUtils.wrapComponentWithTitle(parameterViewPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))).weight(0.7)
         ).getComponent());
     }
 

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java

@@ -1,9 +1,10 @@
 package com.fr.design.chart.series.SeriesCondition.impl;
 
+import com.fine.theme.utils.FineUIScale;
+import com.fine.theme.utils.FineUIUtils;
 import com.fr.base.Utils;
 import com.fr.chart.web.ChartHyperRelateFloatLink;
 import com.fr.design.DesignModelAdapter;
-import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.frpane.ReportletParameterViewPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -13,17 +14,17 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.ParameterProvider;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import javax.swing.border.Border;
+import java.awt.Dimension;
-import javax.swing.border.LineBorder;
-import javax.swing.border.TitledBorder;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.awt.BorderLayout;
-import java.awt.Color;
+
-import java.awt.Dimension;
+import static com.fine.swing.ui.layout.Layouts.column;
-import java.awt.Font;
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.row;
 
 /**
  * @author kunsnat E-mail:kunsnat@gmail.com
@@ -53,30 +54,28 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
 
         if (needRenamePane()) {
             itemNameTextField = new UITextField();
-            this.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name") + ":"), BorderLayout.NORTH);
+            this.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name")), BorderLayout.NORTH);
         }
 
-        this.add(centerPane, BorderLayout.CENTER);
         floatNameBox = new UIComboBox(getFloatNames());
-        floatNameBox.setPreferredSize(new Dimension(90, 20));
+        floatNameBox.setPreferredSize(new Dimension(FineUIScale.scale(160), FineUIScale.scale(24)));
-
+
-        JPanel pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
+        JPanel pane = new JPanel(new BorderLayout());
-        pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float") + ":"));
+        pane.setBorder(BorderFactory.createEmptyBorder(4, 0, 4, 0));
-        pane.add(floatNameBox);
+        UILabel floatLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float"));
-
+        pane.add(row(20,
-        Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR);
+                cell(floatLabel),
-        Font font = null;
+                cell(floatNameBox)
-        TitledBorder border = new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Float"), 4, 2, font, new Color(1, 159, 222));
+        ).getComponent());
-        // 圆角不行
-        centerPane.setBorder(border);
-
         centerPane.add(pane, BorderLayout.NORTH);
         addPaneInCenter(centerPane);
 
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
+
-        parameterViewPane.setPreferredSize(new Dimension(500, 200));
+        this.add(column(10,
-        this.add(parameterViewPane, BorderLayout.SOUTH);
+                cell(FineUIUtils.wrapComponentWithTitle(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Float"))).weight(0.5),
+                cell(FineUIUtils.wrapComponentWithTitle(parameterViewPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Float"))).weight(0.5)
+        ).getComponent());
     }
 
     protected void addPaneInCenter(JPanel centerPane) {

designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java

@@ -194,7 +194,7 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
         double p = TableLayout.PREFERRED;
         double rowSize[] = {p, p};
         double columnSize[] = {p, p};
-        Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_LayerPageReport_Count_PerPage") + ":"), countPerPageEditor}};
+        Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_LayerPageReport_Count_PerPage")), countPerPageEditor}};
         JPanel pageQueryPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         pageQueryPane.setBorder(BorderFactory.createEmptyBorder(5, 15, 0, 0));
         return pageQueryPane;

designer-realize/src/main/java/com/fr/design/report/WriteShortCutsPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.report;
 
 
+import com.fine.theme.utils.FineUIUtils;
 import com.fr.base.BaseUtils;
 import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.gui.ibutton.UIButton;
@@ -24,6 +25,9 @@ import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.cell;
+
 public class WriteShortCutsPane extends JPanel{
 	private static final int V_GAP = 20;
 	private static final int MAX_LABEL_WIDTH = 100;
@@ -47,25 +51,19 @@ public class WriteShortCutsPane extends JPanel{
 	}
 
 	private JPanel createContentPane() {
-		JPanel contentPane = new JPanel();
+		JPanel contentPane = new JPanel(new BorderLayout());
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
 
-		// 纵向布局，横向自适应
+		contentPane.add(column(
-		contentPane.setLayout(new GridBagLayout());
+				cell(FineUIUtils.wrapComponentWithTitle(getFeatureNamePane(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Shortcut_Set"))),
-		GridBagConstraints cons = new GridBagConstraints();
+				cell(FineUIUtils.wrapComponentWithTitle(getHintsPane(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")))
-		cons.fill = GridBagConstraints.HORIZONTAL;
+		).getComponent());
-		cons.weightx = 1;
-		cons.gridx = 0;
-		cons.insets = new Insets(20, 0, 0, 0);
-		contentPane.add(getFeatureNamePane(), cons);
-		contentPane.add(getHintsPane(), cons);
 
 		return contentPane;
 	}
 	
 	private JPanel getFeatureNamePane(){
-		JPanel featureNamePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Shortcut_Set"));
+		JPanel featureNamePane = new JPanel(new BorderLayout());
-		featureNamePane.setLayout(new BorderLayout());
 
 		UILabel name = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Feature_Name"), SwingConstants.CENTER);
 		UILabel nextCol = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cursor_To_Next_Column"), SwingConstants.CENTER);
@@ -106,8 +104,7 @@ public class WriteShortCutsPane extends JPanel{
 	}
 
 	private JPanel getHintsPane(){
-		JPanel hintsPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"));
+		JPanel hintsPane = new JPanel(new BorderLayout());
-		hintsPane.setLayout(new BorderLayout());
 
 		UILabel systemDefault = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_System_Default"), SwingConstants.CENTER);
 		UILabel preColText = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cursor_To_Previous_Column"), SwingConstants.CENTER);

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

@@ -1,5 +1,6 @@
 package com.fr.design.widget;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
@@ -42,7 +43,7 @@ public class WidgetConfigPane extends JListControlPane {
      */
 	public NameableCreator[] createNameableCreators() {
 		NameableCreator defaultWidget = new NameObjectCreator(WidgetConstants.USER_DEFINED_WIDGETCONFIG,
-				"/com/fr/design/images/data/user_widget.svg", UserDefinedWidgetConfig.class,
+				new LazyIcon("user_widget"), UserDefinedWidgetConfig.class,
 				UserDefinedWidgetConfigPane.class);
 		return new NameableCreator[] { defaultWidget };
 	}

designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.write.submit;
 
+import com.fine.theme.utils.FineUIUtils;
 import com.fr.data.SubmitJob;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.beans.BasicBeanPane;
@@ -191,19 +192,13 @@ public class SubmitVisitorListPane extends ObjectJControlPane {
             }
             csjConfigComboBox = new UIComboBox(configTypes.toArray());
 
-            //JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":"), csjConfigComboBox},
-            //        FlowLayout.LEFT, 10);
             JPanel typePane = new JPanel(new BorderLayout());
             typePane.add(row(10,
-                    flex(0.002),
+                    cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type"))),
-                    cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":")).weight(0.158),
+                    cell(csjConfigComboBox)).getComponent());
-                    cell(csjConfigComboBox).weight(0.84)).getComponent());
-            typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type")));
-            /*this.add(typePane, BorderLayout.NORTH);
 
-            this.add(customCardPane, BorderLayout.CENTER);*/
             this.add(column(
-                    cell(typePane),
+                    cell(FineUIUtils.wrapComponentWithTitle(typePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type"))),
                     cell(customCardPane).weight(1.0)).getComponent());
 
             csjConfigComboBox.addItemListener(new ItemListener() {