Merge remote-tracking branch 'origin/fbp/release' into fbp/release

designer-base/src/main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java

@@ -18,6 +18,7 @@ import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
+import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
 
 /**
@@ -100,6 +101,8 @@ public class FineHeaderPaneUI extends PanelUI implements AnimatedPainter {
                 + FineUIScale.scale(UIManager.getInt("ExpandablePane.HeaderPane.hGap"));
         float titleY = (headerPane.getHeight() - (ascent + descent)) / 2.0f + ascent;
         FlatUIUtils.setRenderingHints(g2d);
+        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
+
         g2d.drawString(headerPane.getTitle(), titleX, titleY);
         g2d.dispose();
     }

designer-base/src/main/java/com/fr/design/backup/EnvBackupHelper.java

@@ -131,7 +131,7 @@ public class EnvBackupHelper {
      */
     public void rollbackEnv() {
         if (origin instanceof RemoteWorkspace && ((RemoteWorkspace) origin).getClient() instanceof FineWorkspaceHttpClient) {
-            ((FineWorkspaceHttpClient) ((RemoteWorkspace) origin).getClient()).startHeartBeat();
+            ((FineWorkspaceHttpClient) ((RemoteWorkspace) origin).getClient()).connect();
         }
     }
 

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

@@ -2,6 +2,7 @@ package com.fr.design.data.datapane.connect;
 
 import com.fanruan.config.impl.data.ConnectionConfigProviderFactory;
 import com.fanruan.config.impl.data.ConnectionConfigWriterFactory;
+import com.fine.theme.utils.FineUIScale;
 import com.fr.config.remote.RemoteConfigEvent;
 import com.fine.theme.icon.LazyIcon;
 import com.fr.data.impl.Connection;
@@ -16,6 +17,7 @@ import com.fr.design.fun.ConnectionProvider;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
+import com.fr.design.gui.controlpane.ShortCut4JControlPane;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.i18n.Toolkit;
 import com.fr.event.EventDispatcher;
@@ -95,6 +97,21 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
         getSupportedTypesWorker.execute();
     }
 
+    @Override
+    protected ShortCut4JControlPane[] createShortcuts() {
+        return new ShortCut4JControlPane[]{
+                shortCutFactory.addItemShortCut(),
+                shortCutFactory.removeItemShortCut(),
+                shortCutFactory.copyItemShortCut(),
+                shortCutFactory.sortItemShortCut(),
+        };
+    }
+
+    @Override
+    protected int getLeftPreferredSize() {
+        return FineUIScale.scale(180);
+    }
+
     @Override
     public String getEmptyNameTip() {
         return Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name");

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

@@ -116,7 +116,7 @@ public class SshPane extends BasicPane {
         coreCardPane = ReactiveCardPane.create()
                 .addSupplier(NOT_USE_SSH, () -> cell(usingSsh).getComponent())
                 .addSupplier(USE_SSH, () -> Layouts.column(LayoutConstants.VERTICAL_GAP,
-                        cell(usingSsh),
+                        row(cell(usingSsh)),
                         row(
                                 cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Host"))).weight(1),
                                 cell(ip).weight(5),

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -165,7 +165,8 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implemen
         ParameterTableModel model = new ParameterTableModel() {
             @Override
             public UITableEditAction[] createAction() {
-                return ArrayUtils.add(super.createDBTableAction(), new RefreshAction());
+                // 当前仅支持刷新参数功能
+                return ArrayUtils.toArray(new RefreshAction());
             }
         };
         editorPane = new UITableEditorPane<>(model);

designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java

@@ -4,6 +4,7 @@ import com.fanruan.workplace.http.HttpConstants;
 import com.fanruan.workplace.http.HttpServiceMap;
 import com.fanruan.workplace.http.RepositoryManager;
 import com.fanruan.workplace.http.info.Stub;
+import com.fanruan.workplace.network.RemoteNetworkRepository;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.engine.exception.RemoteDesignConnectionException;
@@ -43,33 +44,20 @@ public class HttpWorkspaceConnector implements WorkspaceConnector {
     @Override
     public boolean testConnection(WorkspaceConnectionInfo connectionInfo) throws Exception {
         FineWorkspaceHttpClient client = FineWorkspaceHttpClient.create("Http-Client", connectionInfo);
-        LoginResponseInfoBean bean;
         try {
-            bean = RemoteAuthorityRepository.getInstance().login(createLoginBean(connectionInfo));
-            checkValidAndUpdateInfo(client, connectionInfo, bean);
+            return testConnect(client, connectionInfo);
         } finally {
             client.closePool();
         }
-
-        return StringUtils.isNotEmpty(bean.getAccessToken());
     }
 
     @Override
     public WorkspaceClient connect(WorkspaceConnectionInfo connectionInfo) throws Exception {
         FineWorkspaceHttpClient client = FineWorkspaceHttpClient.create("Http-Client", connectionInfo);
         try {
-            for (Map.Entry<Class, Stub<?>> entry : HttpServiceMap.getInstance().entrySet()) {
-                Stub<?> stub = entry.getValue();
-                stub.clearProxy();
-            }
-            LoginResponseInfoBean bean = RemoteAuthorityRepository.getInstance().login(createLoginBean(connectionInfo));
-            // 服务器如果没返回token，肯定是出问题了，直接抛出异常
-            if (StringUtils.isEmpty(bean.getAccessToken())) {
-                throw new RuntimeException("Empty token, try connect again and check server");
+            if (testConnect(client, connectionInfo)) {
+                client.connect();
             }
-            FineLoggerFactory.getLogger().info("[connector] infos:{}", bean.getAccessToken());
-            checkValidAndUpdateInfo(client, connectionInfo, bean);
-            client.startHeartBeat();
         } catch (Exception e) {
             client.closePool();
             throw e;
@@ -79,28 +67,25 @@ public class HttpWorkspaceConnector implements WorkspaceConnector {
         return client;
     }
 
-    private void checkValidAndUpdateInfo(FineWorkspaceHttpClient client, WorkspaceConnectionInfo connectionInfo, LoginResponseInfoBean bean) throws Exception {
+    private boolean testConnect(FineWorkspaceHttpClient client, WorkspaceConnectionInfo connectionInfo) throws Exception {
+        for (Map.Entry<Class, Stub<?>> entry : HttpServiceMap.getInstance().entrySet()) {
+            Stub<?> stub = entry.getValue();
+            stub.clearProxy();
+        }
+        LoginResponseInfoBean bean = RemoteAuthorityRepository.getInstance().login(createLoginBean(connectionInfo));
         WorkspaceConnection connection = new WorkspaceConnection(
                 UUID.randomUUID().toString(),
                 connectionInfo.getUserName(),
                 HttpConstants.AUTHORIZATION_PREFIX + bean.getAccessToken(),
                 InetAddress.getLocalHost().getHostAddress());
         client.updateConnection(connection);
-        // 检查远程权限
-        if (!checkRemoteAuthority(connection)) {
-            // 无权限则抛出无权限的错
-            throw new RemoteDesignNoAuthException();
-        }
-    }
-
-    private boolean checkRemoteAuthority(WorkspaceConnection connection) {
         try {
-            return RemoteAuthorityRepository.getInstance().isRoot(connection.getUserName()) || RemoteAuthorityRepository.getInstance().hasAuthority(connection.getUserName());
+            return RemoteNetworkRepository.getInstance().testConnect();
+        } catch (RemoteDesignNoAuthException e) {
+            throw e;
         } catch (Exception e) {
-            // 如果这里出现异常，就认为fr服务没启动
             throw new RemoteDesignConnectionException(e, StringUtils.EMPTY);
         }
-
     }
 
     private LoginRequestInfoBean createLoginBean(WorkspaceConnectionInfo connectionInfo) {

designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java

@@ -13,6 +13,7 @@ import com.fr.workspace.connect.WorkspaceConnection;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
 import com.fr.workspace.server.authority.decision.DecisionOperator;
 import com.fr.workspace.pool.WorkObjectPool;
+import com.fr.workspace.server.repository.WorkplaceConstants;
 import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 
 import javax.swing.SwingWorker;
@@ -80,7 +81,7 @@ public class RemoteWorkspace implements Workspace {
         if (isRoot == null) {
             synchronized (this) {
                 if (isRoot == null) {
-                    isRoot = RemoteAuthorityRepository.getInstance().isRoot(getConnection().getUserName());
+                    isRoot = WorkplaceConstants.isRoot();
                 }
             }
         }

designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java

@@ -101,6 +101,7 @@ public class UIHeadGroup extends Row {
                             b.setEnabled(h.isEnable());
                             b.putClientProperty(BUTTON_TYPE, BUTTON_TYPE_TAB);
                             b.addActionListener(e -> setSelectedIndex((int) index));
+                            b.setFocusPainted(false);
                         })
 
         ).toArray(Layouts.Cell[]::new);

designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java

@@ -17,6 +17,7 @@ import java.util.List;
 
 import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.row;
 
 
 public class TreeRootPane extends BasicPane {
@@ -44,10 +45,10 @@ public class TreeRootPane extends BasicPane {
         addCheckBoxListener();
 
         this.add(column(LayoutConstants.VERTICAL_GAP,
-                cell(checkTypeCheckBox),
-                cell(loadTypeCheckBox),
-                cell(layerTypeCheckBox),
-                cell(returnFullPathCheckBox)
+                row(cell(checkTypeCheckBox)),
+                row(cell(loadTypeCheckBox)),
+                row(cell(layerTypeCheckBox)),
+                row(cell(returnFullPathCheckBox))
         ).getComponent());
 
     }

designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java

@@ -132,7 +132,7 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
                 cell(textField),
                 row(
                         cell(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Option"))).weight(LEFT_WEIGHT),
-                        cell(roundingBox).weight(RIGHT_WEIGHT)
+                        row(cell(roundingBox)).weight(RIGHT_WEIGHT)
                 ),
                 cell(previewLabel)
         ).getComponent());

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

@@ -1,5 +1,6 @@
 package com.fr.design.i18n;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.general.GeneralContext;
 import com.fr.general.log.MessageFormatter;
 import com.fr.locale.DesignI18nProvider;
@@ -14,10 +15,10 @@ import java.util.Locale;
 
 public class DesignI18nImpl implements DesignI18nProvider {
 
-//    static {
-//        // GeneralContext上下文 存储本次启动的语言环境 直接使用DesignerEnvManager 会在设置语言环境后 不重启 立即生效 存在问题
-//        GeneralContext.setLocale(DesignerEnvManager.getEnvManager().getLanguage());
-//    }
+    static {
+        // GeneralContext上下文 存储本次启动的语言环境 直接使用DesignerEnvManager 会在设置语言环境后 不重启 立即生效 存在问题
+        GeneralContext.setLocale(DesignerEnvManager.getEnvManager().getLanguage());
+    }
 
     private static DesignI18nImpl instance = new DesignI18nImpl();
 

designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -90,7 +90,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     private static final int ARROW_RANGE_START = CONTENT_WIDTH - FineUIScale.scale(30);
     // 弹出对话框高度
     private static final int POPUP_MIN_HEIGHT = FineUIScale.scale(145);
-    private static final int POPUP_DEFAULT_HEIGHT = FineUIScale.scale(356);
+    private static final int POPUP_DEFAULT_HEIGHT = FineUIScale.scale(600);
     public static final String KEY_CELL_ELEMENT = "cellElement";
     public static final String KEY_CELL_ATTR = "cellAttr";
     public static final String KEY_FLOAT_ELEMENT = "floatElement";

designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java

@@ -93,6 +93,7 @@ import java.util.List;
 
 import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.row;
 
 // Noninstantiable utility class
 public final class GUICoreUtils {
@@ -996,7 +997,10 @@ public final class GUICoreUtils {
 				dynamicPane.setVisible(e.getStateChange() == visibleState);
 			}
 		});
-		return column(LayoutConstants.VERTICAL_GAP, cell(checkBox), cell(dynamicPane)).getComponent();
+		return column(LayoutConstants.VERTICAL_GAP,
+				row(cell(checkBox)),
+				cell(dynamicPane)
+		).getComponent();
 	}
 
 	/**

designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java

@@ -87,9 +87,9 @@ public class NumberEditorValidatePane extends JPanel {
         ).getComponent();
 
         this.add(column(LayoutConstants.VERTICAL_GAP,
-                cell(allowDecimalsCheckBox),
+                row(cell(allowDecimalsCheckBox)),
                 cell(limitNumberPane),
-                cell(allowNegativeCheckBox),
+                row(cell(allowNegativeCheckBox)),
                 row(10,
                         cell(setMaxValueCheckBox).weight(1.8), cell(maxValueSpinner).weight(3)
                 ),

designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java

@@ -14,6 +14,7 @@ import java.awt.Color;
 
 import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.row;
 
 /**
  * 控件主题显示增强配置窗口
@@ -35,7 +36,7 @@ public class WidgetThemeDisplayConfigPane extends BasicPane {
         JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         widgetEnhance = new UICheckBox(Toolkit.i18nText("Fine-Design_Widget_Enable_Display_Enhance"));
         widgetEnhance.setSelected(true);
-        northPane.add(widgetEnhance);
+        northPane.add(row(cell(widgetEnhance)).getComponent());
 
         JPanel southPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Widget_Display_Enhance_Tip"));

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

@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect opacity="0.4" x="3" y="27" width="26" height="4" rx="2" fill="#2576EF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.9011 3.42119L12.8134 2.33351C12.3838 1.90393 12.3838 1.20745 12.8134 0.777871C13.243 0.348295 13.9394 0.348294 14.369 0.777871L27.404 13.8129C27.7617 14.1706 27.7439 14.7558 27.3651 15.0911L15.6913 25.4233C15.137 25.9138 14.2968 25.8882 13.7734 25.3648L3.85536 15.4468C3.30863 14.9 3.30863 14.0136 3.85536 13.4669L13.9011 3.42119ZM15.4567 4.97682L5.97668 14.4568L8.51991 17.0001H21.8767L24.842 14.3622L15.4567 4.97682ZM26.5004 19.0001L24.7324 20.7575C24.3827 21.105 24.1445 21.5478 24.048 22.0299C23.9515 22.512 24.0009 23.0117 24.1901 23.4658C24.3793 23.9199 24.6997 24.3081 25.1109 24.5812C25.522 24.8543 26.0054 25.0001 26.4999 25.0001C26.9944 25.0001 27.4778 24.8543 27.8889 24.5812C28.3 24.3081 28.6205 23.9199 28.8097 23.4658C28.9989 23.0117 29.0483 22.512 28.9518 22.0299C28.8553 21.5478 28.6171 21.105 28.2674 20.7575L26.5004 19.0001Z" fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/font/foreground_disable.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="M5.7018 24.8844C5.84704 24.9522 6.00435 24.991 6.16474 24.9986C6.32512 25.0062 6.48545 24.9824 6.63654 24.9286C6.78764 24.8748 6.92655 24.792 7.04533 24.685C7.16411 24.578 7.26044 24.4488 7.32881 24.3049L9.87397 18.9472H22.1262L24.6713 24.3049C24.7397 24.4488 24.8361 24.5779 24.9549 24.6849C25.0737 24.7918 25.2126 24.8746 25.3637 24.9284C25.5147 24.9822 25.675 25.006 25.8354 24.9985C25.9958 24.9909 26.1531 24.9522 26.2983 24.8844C26.4436 24.8167 26.5739 24.7213 26.682 24.6036C26.79 24.486 26.8735 24.3484 26.9279 24.1988C26.9822 24.0491 27.0062 23.8904 26.9986 23.7315C26.991 23.5727 26.9519 23.4169 26.8835 23.273L17.1061 2.69551C17.0074 2.48756 16.851 2.31173 16.6551 2.18856C16.4593 2.0654 16.2321 2 16.0001 2C15.7681 2 15.5409 2.0654 15.345 2.18856C15.1491 2.31173 14.9927 2.48756 14.894 2.69551L5.11669 23.273C5.04822 23.4169 5.00904 23.5727 5.00139 23.7315C4.99374 23.8904 5.01777 24.0492 5.07211 24.1988C5.12645 24.3485 5.21003 24.486 5.31807 24.6037C5.42612 24.7213 5.55651 24.8167 5.7018 24.8844ZM16.0001 6.05448L20.9758 16.5263H11.0243L16.0001 6.05448Z" fill="#0A1C38" fill-opacity="0.29"/>
+<rect opacity="0.4" x="4" y="27" width="24" height="4" rx="2" fill="#2576EF"/>
+</svg>

designer-chart/src/main/java/com/fr/design/chartx/data/DataLayoutHelper.java

@@ -1,15 +1,13 @@
 package com.fr.design.chartx.data;
 
+import com.fine.theme.utils.FineLayoutBuilder;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import java.awt.Component;
-import java.util.Arrays;
 
 /**
  * @author shine
@@ -46,13 +44,7 @@ public class DataLayoutHelper {
     }
 
     public static JPanel createDataLayoutPane(Component[][] components) {
-        int len = components.length;
-        double p = TableLayout.PREFERRED;
-        double[] columnSize = {DataLayoutHelper.LABEL_WIDTH, DataLayoutHelper.WIDTH};
-        double[] rowSize = new double[len];
-        Arrays.fill(rowSize, p);
-
-        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        return FineLayoutBuilder.compatibleTableLayout(10, components, new double[] {1.2, 3});
     }
 
     public static JPanel createDataLayoutPane(String label, Component component) {

designer-chart/src/main/java/com/fr/design/chartx/single/CellDataPane.java

@@ -2,7 +2,6 @@ package com.fr.design.chartx.single;
 
 import com.fr.chartx.data.CellDataDefinition;
 import com.fr.design.beans.FurtherBasicBeanPane;
-import com.fr.design.chartx.data.DataLayoutHelper;
 import com.fr.design.chartx.fields.AbstractCellDataFieldsPane;
 import com.fr.design.i18n.Toolkit;
 
@@ -24,7 +23,6 @@ public class CellDataPane extends FurtherBasicBeanPane<CellDataDefinition> {
 
         this.setLayout(new BorderLayout());
         this.add(cellDataFieldsPane, BorderLayout.CENTER);
-        DataLayoutHelper.addNormalBorder(this);
     }
 
     @Override

designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java

@@ -48,7 +48,6 @@ public class DataSetPane extends FurtherBasicBeanPane<DataSetDefinition> {
         this.setLayout(new BorderLayout(0, 6));
         this.add(northPane, BorderLayout.NORTH);
         this.add(dataSetFieldsPane, BorderLayout.CENTER);
-        DataLayoutHelper.addNormalBorder(this);
         checkBoxUse();
     }
 

designer-chart/src/main/java/com/fr/design/chartx/single/SingleDataPane.java

@@ -46,7 +46,6 @@ public class SingleDataPane extends BasicBeanPane<AbstractDataDefinition> {
             protected void initLayout() {
                 this.setLayout(new BorderLayout(0, 6));
                 JPanel northPane = DataLayoutHelper.createDataLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Data_Source"), jcb);
-                DataLayoutHelper.addNormalBorder(northPane);
 
                 this.add(northPane, BorderLayout.NORTH);
                 this.add(cardPane, BorderLayout.CENTER);

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java

@@ -6,6 +6,7 @@ import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartdata.TopDefinition;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -226,9 +227,9 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
             combineOther = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther"));
             combineOther.setSelected(true);
             //默认不显示
-            preDataNumPane = column(10,
-                    row(cell(label).weight(1.2), cell(preDataNum).weight(3)),
-                    cell(combineOther)
+            preDataNumPane = column(LayoutConstants.VERTICAL_GAP,
+                    row(cell(label).weight(LayoutConstants.LEFT_WEIGHT), cell(preDataNum).weight(LayoutConstants.RIGHT_WEIGHT)),
+                    row(cell(combineOther))
             ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 10, 0, 0))).getComponent();
             preDataNumPane.setVisible(false);
             notShowNull = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Cate"));
@@ -243,13 +244,13 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
             presentPane = row(
                     cell(
                             new UILabel(Toolkit.i18nText("Fine-Design_Chart_Style_Present"))
-                    ).weight(1.2), cell(present).weight(3)
+                    ).weight(LayoutConstants.LEFT_WEIGHT), cell(present).weight(LayoutConstants.RIGHT_WEIGHT)
             ).getComponent();
 
-            return column(10,
-                    cell(onlyPreData),
+            return column(LayoutConstants.VERTICAL_GAP,
+                    row(cell(onlyPreData)),
                     cell(preDataNumPane),
-                    cell(notShowNull),
+                    row(cell(notShowNull)),
                     cell(presentPane)
             ).getComponent();
         }
@@ -385,9 +386,9 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
             combineOther = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther"));
             combineOther.setSelected(true);
             //默认不显示
-            preDataNumPane = column(10,
-                    row(cell(label).weight(1.2), cell(preDataNum).weight(3)),
-                    cell(combineOther)
+            preDataNumPane = column(LayoutConstants.VERTICAL_GAP,
+                    row(cell(label).weight(LayoutConstants.LEFT_WEIGHT), cell(preDataNum).weight(LayoutConstants.RIGHT_WEIGHT)),
+                    row(cell(combineOther))
             ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 10, 0, 0))).getComponent();
             preDataNumPane.setVisible(false);
             notShowNull = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Series"));
@@ -402,13 +403,13 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
             presentPane = row(
                     cell(
                             new UILabel(Toolkit.i18nText("Fine-Design_Chart_Style_Present"))
-                    ).weight(1.2), cell(present).weight(3)
+                    ).weight(LayoutConstants.LEFT_WEIGHT), cell(present).weight(LayoutConstants.RIGHT_WEIGHT)
             ).getComponent();
 
-            return column(10,
-                    cell(onlyPreData),
+            return column(LayoutConstants.VERTICAL_GAP,
+                    row(cell(onlyPreData)),
                     cell(preDataNumPane),
-                    cell(notShowNull),
+                    row(cell(notShowNull)),
                     cell(presentPane)
             ).getComponent();
         }

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java

@@ -79,7 +79,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
 
         isFixedWidth.addActionListener(e -> checkColumnWidth());
         isFillWithImage.addActionListener(e -> checkImagePane());
-        return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Filled_With_Image"), borderPane, true);
+        return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), borderPane, true);
     }
 
     private void checkAll() {

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

@@ -53,13 +53,13 @@ public class MobileTextFieldInputSettingPane extends BasicBeanPane<MobileScanCod
         JPanel settingPane = column(LayoutConstants.VERTICAL_GAP,
                 row(
                         cell(new UILabel(Toolkit.i18nText("Fine-Design_Mobile_Input_Way"))).weight(1),
-                        cell(manualInputCheckBox).weight(2)
+                        row(cell(manualInputCheckBox)).weight(2)
                 ),
                 row(
-                        flex(1), cell(scanCodeCheckBox).weight(2)
+                        flex(1), row(cell(scanCodeCheckBox)).weight(2)
                 ),
                 row(
-                        flex(1), cell(nfcInputCheckBox).weight(2)
+                        flex(1), row(cell(nfcInputCheckBox)).weight(2)
                 ),
                 cell(nfcContentTypePane)
         ).getComponent();
@@ -133,10 +133,10 @@ public class MobileTextFieldInputSettingPane extends BasicBeanPane<MobileScanCod
 
             this.add(column(LayoutConstants.VERTICAL_GAP,
                     row(
-                            flex(1), cell(contentTypeButton).weight(2)
+                            flex(1), row(cell(contentTypeButton)).weight(2)
                     ),
                     row(
-                            flex(1), cell(uidTypeButton).weight(2)
+                            flex(1), row(cell(uidTypeButton)).weight(2)
                     )
             ).getComponent());
         }

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java

@@ -123,8 +123,8 @@ public class CellExpandAttrPane extends AbstractCellAttrPane {
 
     private JPanel seniorPane() {
         return Layouts.column(LayoutConstants.VERTICAL_GAP,
-                cell(horizontalExpandableCheckBox),
-                cell(verticalExpandableCheckBox)
+                row(cell(horizontalExpandableCheckBox)),
+                row(cell(verticalExpandableCheckBox))
         ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, 10, 0))
         ).getComponent();
     }

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@@ -208,10 +208,10 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
             autoBG.add(radioButton);
         }
         return Layouts.column(LayoutConstants.VERTICAL_GAP,
-                cell(defaultAutoRadioButton),
-                cell(noAutoRadioButton),
-                cell(autoHeightRadioButton),
-                cell(autoWidthRadioButton)
+                row(cell(defaultAutoRadioButton)),
+                row(cell(noAutoRadioButton)),
+                row(cell(autoHeightRadioButton)),
+                row(cell(autoWidthRadioButton))
         ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, LayoutConstants.VERTICAL_GAP, 0))
         ).getComponent();
     }
@@ -356,15 +356,15 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
 
         overflowPane = ReactiveCardPane.create()
                 .addSupplier("empty", () -> column(LayoutConstants.VERTICAL_GAP,
-                        cell(textOverflowCheckBox)
+                        row(cell(textOverflowCheckBox))
                 ).getComponent())
                 .addSupplier("showChar", () -> column(LayoutConstants.VERTICAL_GAP,
-                        cell(textOverflowCheckBox),
+                        row(cell(textOverflowCheckBox)),
                         row(cell(showPartLabel).weight(1.2), cell(showPartComboBox).weight(1.4), flex(0.1), cell(numberLabel).weight(0.5), cell(showCharNums).weight(1.0)),
                         row(cell(hideTypeLabel).weight(1.2), cell(textOverflowTypeComboBox).weight(3.0))
                 ).getComponent())
                 .addSupplier("showCell", () -> column(LayoutConstants.VERTICAL_GAP,
-                        cell(textOverflowCheckBox),
+                        row(cell(textOverflowCheckBox)),
                         row(cell(showPartLabel).weight(1.2), cell(showPartComboBox).weight(3.0)),
                         row(cell(hideTypeLabel).weight(1.2), cell(textOverflowTypeComboBox).weight(3.0))
                 ).getComponent());
@@ -403,9 +403,9 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
         printAndExportContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_CellWrite_Print_Content"));
         printAndExportBackground = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_CellWrite_Print_Background"));
         return Layouts.column(LayoutConstants.VERTICAL_GAP,
-                cell(previewCellContent),
-                cell(printAndExportContent),
-                cell(printAndExportBackground)
+                row(cell(previewCellContent)),
+                row(cell(printAndExportContent)),
+                row(cell(printAndExportBackground))
         ).getComponent();
     }
 
@@ -424,22 +424,22 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
 
         currentPageFixedRowDataTipLabel.setForeground(TIPS_FONT_COLOR);
         return Layouts.column(
-                cell(pageBeforeRowCheckBox),
+                row(cell(pageBeforeRowCheckBox)),
                 fix(LayoutConstants.VERTICAL_GAP),
-                cell(pageAfterRowCheckBox),
+                row(cell(pageAfterRowCheckBox)),
                 fix(LayoutConstants.VGAP_SMALL + LayoutConstants.VERTICAL_GAP),
 
-                cell(pageBeforeColumnCheckBox),
+                row(cell(pageBeforeColumnCheckBox)),
                 fix(LayoutConstants.VERTICAL_GAP),
-                cell(pageAfterColumnCheckBox),
+                row(cell(pageAfterColumnCheckBox)),
                 fix(LayoutConstants.VGAP_SMALL + LayoutConstants.VERTICAL_GAP),
 
-                cell(canBreakOnPaginateCheckBox),
+                row(cell(canBreakOnPaginateCheckBox)),
                 fix(LayoutConstants.VERTICAL_GAP),
-                cell(repeatCheckBox),
+                row(cell(repeatCheckBox)),
                 fix(LayoutConstants.VGAP_SMALL + LayoutConstants.VERTICAL_GAP),
 
-                cell(pageFixedRowDataCheckBox),
+                row(cell(pageFixedRowDataCheckBox)),
                 fix(LayoutConstants.VERTICAL_GAP),
                 cell(currentPageFixedRowDataTipLabel)
         ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, LayoutConstants.VERTICAL_GAP, 0))

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

@@ -113,11 +113,11 @@ public class ExcelExportPane extends BasicPane {
 		});
 		//内容保护
 		JPanel contextProtectPane = column(LayoutConstants.VERTICAL_GAP,
-				cell(fileProtect),
+				row(cell(fileProtect)),
 				cell(passwordWritePane),
-				cell(writeProtect),
+				row(cell(writeProtect)),
 				cell(writeProtectPane),
-				cell(exportWaterMark),
+				row(cell(exportWaterMark)),
 				row(cell(uiLabel), cell(actionLabel))
 		).getComponent();
 

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

@@ -13,6 +13,7 @@ import com.fr.transaction.WorkerFacade;
 import java.awt.BorderLayout;
 import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.row;
 
 /**
  * 通用
@@ -45,7 +46,7 @@ public class ExportUniversalPane extends BasicPane {
 
         this.add(
                 FineUIUtils.wrapComponentWithTitle((column(10,
-                        cell(passwordSupportFormula)
+                        row(cell(passwordSupportFormula))
                         ).getComponent()),
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Universal_Export_Config")));
     }

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

@@ -12,8 +12,6 @@ import com.fr.design.gui.ilable.FRExplainLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.locale.impl.LineEngineMark;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.widget.FRWidgetFactory;
@@ -26,7 +24,6 @@ import com.fr.report.worksheet.WorkSheet;
 import com.fanruan.product.ProductConstants;
 
 import javax.swing.AbstractButton;
-import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -34,7 +31,6 @@ import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Desktop;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -53,7 +49,6 @@ import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.box;
 import static com.fine.swing.ui.layout.Layouts.fix;
 import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle;
-import static com.fine.theme.utils.FineUIScale.scale;
 
 /**
  * @author fly.li
@@ -113,7 +108,7 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
         clientPaging = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_Enable_Client_Page"));
         clientPaging.setSelected(false);
         clientPaging.addActionListener(new SelectActionListener(clientPaging, outPagingEngineSelectPane));
-        reportEnginePane.add(clientPaging);
+        reportEnginePane.add(row(cell(clientPaging)).getComponent());
         return reportEnginePane;
     }
 

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

@@ -60,7 +60,10 @@ public class WordExportPane extends BasicPane {
 		wordLineLabel.setForeground(FlatUIUtils.getUIColor("Label.tipColor", Color.gray));
 
 		JPanel exportSettingPane = new JPanel(new BorderLayout());
-		exportSettingPane.add(column(LayoutConstants.VERTICAL_GAP, cell(isExportAsTable), cell(wordLineLabel)).getComponent());
+		exportSettingPane.add(column(LayoutConstants.VERTICAL_GAP,
+				row(cell(isExportAsTable)),
+				cell(wordLineLabel)
+		).getComponent());
 		// 编辑保护
 		writeProtect = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_Export_Write_Protect"), false);
 		// 编辑保护勾选后展示的内容
@@ -102,9 +105,9 @@ public class WordExportPane extends BasicPane {
 		});
 		//内容保护
 		JPanel contextProtectPane = column(10,
-				cell(writeProtect),
+				row(cell(writeProtect)),
 				cell(writeProtectPane),
-				cell(exportWaterMark),
+				row(cell(exportWaterMark)),
 				row(cell(uiLabel), cell(actionLabel))
 		).getComponent();
 		JPanel centerPanel = column(LayoutConstants.VERTICAL_GAP,

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

@@ -14,6 +14,7 @@ import java.awt.BorderLayout;
 
 import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle;
 
 /**
@@ -40,7 +41,7 @@ public class ReportMobileTemplateSettingsPane extends BasicBeanPane<ElementCaseM
         JPanel panel = new JPanel(new BorderLayout());
         mobileCanvasSizeCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Mobile_Canvas_Size"));
         panel.add(column(LayoutConstants.VGAP_SMALL,
-                cell(mobileCanvasSizeCheck),
+                row(cell(mobileCanvasSizeCheck)),
                 column(
                         cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Screen_Match_Desc"), FineUIStyle.LABEL_TIP)),
                         cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Screen_Zoom_In_Desc"), FineUIStyle.LABEL_TIP)),

designer-realize/src/main/java/com/fr/design/sort/header/HeaderSettingPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.sort.header;
 
 import com.fine.swing.ui.layout.Column;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
@@ -45,7 +46,7 @@ public class HeaderSettingPane extends JPanel {
         Column corePane = new Column();
         corePane.setSpacing(10);
         corePane.add(
-                row(cell(uiLabel).weight(1.2),cell(uiCheckBox).weight(3.0)),
+                row(cell(uiLabel).weight(LayoutConstants.LEFT_WEIGHT), row(cell(uiCheckBox)).weight(LayoutConstants.RIGHT_WEIGHT)),
                 row(cell(headerSortRulePane).weight(1))
         );
         this.add(corePane, BorderLayout.CENTER);

designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java

@@ -55,9 +55,9 @@ public class HeaderSortRulePane extends JPanel {
         nosortUICheckBox = new UICheckBox(SortRule.NO_SORT.getDescription());
         nosortIconButton = new IconButton(SortRule.NO_SORT);
         this.add(Layouts.column(LayoutConstants.VERTICAL_GAP,
-                row(cell(label).weight(1.5), cell(ascUICheckBox).weight(2), flex(), cell(ascIconButton)),
-                row(flex(1.5), cell(desUICheckBox).weight(2), flex(), cell(desIconButton)),
-                row(flex(1.5), cell(nosortUICheckBox).weight(2), flex(), cell(nosortIconButton))
+                row(cell(label).weight(LayoutConstants.LEFT_WEIGHT), row(cell(ascUICheckBox), flex(),cell(ascIconButton)).weight(LayoutConstants.RIGHT_WEIGHT)),
+                row(flex(LayoutConstants.LEFT_WEIGHT), row(cell(desUICheckBox), flex(), cell(desIconButton)).weight(LayoutConstants.RIGHT_WEIGHT)),
+                row(flex(LayoutConstants.LEFT_WEIGHT), row(cell(nosortUICheckBox), flex(), cell(nosortIconButton)).weight(LayoutConstants.RIGHT_WEIGHT))
         ).getComponent());
 
         initUICheckBoxChange(ascUICheckBox, ascIconButton);

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

@@ -74,7 +74,7 @@ public class NoClientPrintSettingPane extends JPanel {
         FineUIStyle.setStyle(needlePrinterOptimizeTip, FineUIStyle.LABEL_TIP);
         return column(LayoutConstants.VERTICAL_GAP,
                 row(LayoutConstants.HORIZONTAL_GAP, cell(setMarginWhenPrintCheck), cell(setMarginWhenPrintTip)),
-                cell(ieQuietPrintCheck),
+                row(cell(ieQuietPrintCheck)),
                 row(LayoutConstants.HORIZONTAL_GAP, cell(needlePrinterOptimizeCheck), cell(needlePrinterOptimizeTip))
         ).getComponent();
     }

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

@@ -38,8 +38,8 @@ public class BasicWidgetPropertySettingPane extends BasicPane {
 						cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Widget_Name"))).weight(LEFT_WEIGHT),
 						cell(widgetNameComboBox).weight(RIGHT_WEIGHT)
 				),
-				cell(enableCheckBox),
-				cell(visibleCheckBox)
+				row(cell(enableCheckBox)),
+				row(cell(visibleCheckBox))
 		).getComponent());
 	}
 

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

@@ -10,6 +10,7 @@ import com.fr.form.ui.CheckBoxGroup;
 
 import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.row;
 
 
 public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup> {
@@ -43,7 +44,7 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
 
 		return column(LayoutConstants.VERTICAL_GAP,
 				cell(buttonGroupDictPane),
-				cell(checkbox),
+				row(cell(checkbox)),
 				cell(returnTypePane),
 				cell(extraPane)
 		).getComponent();

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

@@ -33,7 +33,7 @@ public class ComboCheckBoxDefinePane extends CustomWritableRepeatEditorPane<Comb
 		returnTypePane = new ReturnTypePane();
 		supportTagCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Support_Tag"), true);
 		return column(LayoutConstants.VERTICAL_GAP,
-				cell(supportTagCheckBox),
+				row(cell(supportTagCheckBox)),
 				row(
 						cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary"))).weight(LEFT_WEIGHT),
 						cell(dictPane).weight(RIGHT_WEIGHT)

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

@@ -5,6 +5,9 @@ import com.fr.form.ui.CustomWriteAbleRepeatEditor;
 
 import javax.swing.JPanel;
 
+import static com.fine.swing.ui.layout.Layouts.row;
+import static com.fine.swing.ui.layout.Layouts.cell;
+
 /**
  * Author : Shockway
  * Date: 13-9-18
@@ -27,7 +30,7 @@ public abstract class CustomWritableRepeatEditorPane<T extends CustomWriteAbleRe
 
 	public  JPanel setValidatePane(){
 		JPanel otherContentPane = super.setValidatePane();
-		otherContentPane.add(customDataCheckBox);
+		otherContentPane.add(row(cell(customDataCheckBox)).getComponent());
 		return otherContentPane;
 	}
 

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

@@ -8,8 +8,9 @@ import com.fr.form.ui.DirectWriteEditor;
 
 import javax.swing.JPanel;
 
-import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.cell;
 
 
 //richer:需要提供能否直接编辑的控件设置面板——下拉框、复选框、时间、日期、下拉树
@@ -40,7 +41,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 
 	public  JPanel setValidatePane(){
 		JPanel otherContentPane = column(LayoutConstants.VERTICAL_GAP).getComponent();
-		otherContentPane.add(directWriteCheckBox);
+		otherContentPane.add(row(cell(directWriteCheckBox)).getComponent());
 		return otherContentPane;
 	}
 

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

@@ -167,7 +167,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
             errorTipPane.setVisible(!selected);
         });
         validatePane.add(column(LayoutConstants.VERTICAL_GAP,
-                cell(allowBlankCheckBox),
+                row(cell(allowBlankCheckBox)),
                 cell(errorTipPane)
         ).getComponent());
 

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

@@ -56,8 +56,8 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
         srcTextField = new UITextField();
 
         JPanel contentPane = column(LayoutConstants.VERTICAL_GAP,
-                cell(horizontalCheck),
-                cell(verticalCheck),
+                row(cell(horizontalCheck)),
+                row(cell(verticalCheck)),
                 row(
                         cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Form_Url"))).weight(LEFT_WEIGHT),
                         cell(srcTextField).weight(RIGHT_WEIGHT)

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

@@ -48,7 +48,7 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
         fileSizePane.add(new UILabel(" KB"), BorderLayout.EAST);
 
         center.add(column(LayoutConstants.VERTICAL_GAP,
-                cell(singleFileCheckBox),
+                row(cell(singleFileCheckBox)),
                 row(
                         cell(fileTypeLabel).weight(LEFT_WEIGHT), cell(acceptType).weight(RIGHT_WEIGHT)
                 ),

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

@@ -32,7 +32,7 @@ public abstract class WriteUnableRepeatEditorPane<E extends WriteUnableRepeatEdi
 				row(
 						cell(dicPane[0]).weight(LEFT_WEIGHT), cell(dicPane[1]).weight(RIGHT_WEIGHT)
 				),
-				cell(removeRepeatCheckBox)
+				row(cell(removeRepeatCheckBox))
 		).getComponent());
 
 		JPanel otherContentPane = this.setThirdContentPane();

designer-realize/src/main/java/com/fr/start/common/SplashWindow.java

@@ -46,9 +46,7 @@ public class SplashWindow extends JFrame {
         this.setAlwaysOnTop(false);
         this.setUndecorated(true);
         //使窗体背景透明
-        if (OperatingSystem.isWindows()) {
-            this.setBackground(new Color(0, 0, 0, 0));
-        }
+        this.setBackground(new Color(0, 0, 0, 0));
 
         GUICoreUtils.centerWindow(this);
     }