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

# Conflicts:
#	designer-base/src/main/resources/com/fr/design/data/tabledata/datacenter/web/data-choose.main.js

build.gradle

@@ -110,6 +110,7 @@ allprojects {
         implementation 'com.fr.datasource:fine-datasource-core:' + fdlVersion
         implementation 'com.fr.datasource:fine-datasource-web:' + fdlVersion
         implementation 'com.fr.decision:decision-i18n:' + frVersion
+        implementation 'com.fr.decision:decision-report:' + frVersion
         implementation 'com.fr.report:engine-report:' + frDevVersion
         implementation 'com.fr.report:engine-x:' + frDevVersion
         implementation 'com.fr.report:engine-chart:' + frDevVersion

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

@@ -2,16 +2,21 @@ package com.fine.theme.light.ui;
 
 import com.fine.theme.utils.FineClientProperties;
 import com.fine.theme.utils.FineUIScale;
+import com.fine.theme.utils.FineUIUtils;
 import com.formdev.flatlaf.ui.FlatComboBoxUI;
 import com.formdev.flatlaf.ui.FlatUIUtils;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.JButton;
+import javax.swing.JComboBox;
 import javax.swing.JComponent;
+import javax.swing.JScrollPane;
+import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingConstants;
 import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.ComboPopup;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
+import java.awt.Rectangle;
 
 /**
  * 提供 {@link javax.swing.JComboBox} 的UI类
@@ -47,8 +52,10 @@ public class FineComboBoxUI extends FlatComboBoxUI {
     @Override
     public Dimension getMinimumSize(JComponent c) {
         // ComboBox基于子组件计算适配尺寸性能一般，仅考虑部分ComboBox进行适配计算，其他采用默认值
-        if (FineClientProperties.ADAPTIVE_COMBO_BOX.equals(getComboBoxTypeStr(c))) {
+        if (isAdaptiveComboBox(c)) {
-            return super.getMinimumSize(c);
+            Dimension dimension = super.getMinimumSize(c);
+            return new Dimension(Math.min(dimension.width,
+                    FineUIUtils.getAndScaleInt("ComboBox.maximumWidth", 400)), dimension.height);
         }
         return FineUIScale.scale(new Dimension(
                 FlatUIUtils.getUIInt("ComboBox.minimumWidth", 72),
@@ -56,12 +63,41 @@ public class FineComboBoxUI extends FlatComboBoxUI {
         ));
     }
 
-    @Nullable
+    static boolean isAdaptiveComboBox(JComponent c) {
-    static String getComboBoxTypeStr(JComponent c) {
         Object value = c.getClientProperty(FineClientProperties.COMBO_BOX_TYPE);
         if (value instanceof String) {
-            return (String) value;
+            return FineClientProperties.ADAPTIVE_COMBO_BOX.equals(value);
+        }
+        return false;
+    }
+
+    @Override
+    protected ComboPopup createPopup() {
+        return new FineComboPopup(this.comboBox);
+    }
+
+    protected class FineComboPopup extends FlatComboPopup {
+
+        protected FineComboPopup(JComboBox combo) {
+            super(combo);
+        }
+
+        @Override
+        protected Rectangle computePopupBounds(int px, int py, int pw, int ph) {
+            Rectangle fitRectangle = super.computePopupBounds(px, py, pw, ph);
+            // 限制最大宽度，如超出则高度预留展示横向滚动条所需宽度
+            int comboWidth = comboBox.getWidth();
+            if (fitRectangle.width > comboWidth) {
+                return new Rectangle(px, py, comboWidth, fitRectangle.height + FineUIUtils.getAndScaleInt("ScrollBar.width", 10));
+            }
+            return fitRectangle;
+        }
+
+        @Override
+        protected JScrollPane createScroller() {
+            return new JScrollPane( list,
+                    ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
+                    ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
         }
-        return null;
     }
 }

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

@@ -84,6 +84,16 @@ public class FineTableHeaderUI extends FlatTableHeaderUI {
             setHorizontalAlignment(SwingConstants.LEFT);
         }
 
+        /**
+         * 是否选中修改背景
+         * @param isSelected 被选中
+         * @param columnClass 列类型
+         * @return 是否修改
+         */
+        public boolean checkSelected(boolean isSelected, Class columnClass) {
+            return isSelected && columnClass != Boolean.class;
+        }
+
         @Override
         public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
             Class<?> columnClass = table.getColumnClass(0);
@@ -95,15 +105,15 @@ public class FineTableHeaderUI extends FlatTableHeaderUI {
                 border = BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor")),
                         UIManager.getBorder("Table.cellNoFocusBorder"));
             }
-            if (isSelected && columnClass != Boolean.class) {
+            if (checkSelected(isSelected, columnClass)) {
                 selectionBackground = UIManager.getColor( "Table.selectionBackground");
             } else {
                 selectionBackground = UIManager.getColor("Table.background");
             }
             setBackground(selectionBackground);
-            setText(value == null ? StringUtils.BLANK : String.valueOf(value));
             setToolTipText(table, value, column);
             setBorder(border);
+            setValue(value);
             return this;
         }
 

designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java

@@ -170,7 +170,7 @@ public abstract class AbstractExportAction<E extends JTemplate<?, ?>> extends JT
                     this.setProgress(100);
 
                     FineLoggerFactory.getLogger().info("\"" + name + "\"" + Toolkit.i18nText("Fine-Design_Report_Finish_Export") + "!");
-                    FineJOptionPane.showMessageDialog(
+                    FineJOptionPane.showSuccessMessageDialog(
                             DesignerContext.getDesignerFrame(),
                             Toolkit.i18nText("Fine-Design_Report_Exported_Successfully") + "\n" + name);
 

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

@@ -24,11 +24,8 @@ import com.fr.design.menu.MenuKeySet;
 import com.fr.esd.event.DSMapping;
 import com.fr.esd.event.DsNameTarget;
 import com.fr.esd.event.StrategyEventsNotifier;
-
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.LockItem;
-import com.fr.security.encryption.transmission.TransmissionEncryptionManager;
-import com.fr.workspace.server.repository.connection.ConnectionRepository;
 import com.fr.workspace.server.repository.tabledata.TableDataRepository;
 
 import javax.swing.KeyStroke;
@@ -85,7 +82,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
         // 锁定成功,执行后续操作
         final DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
         final List<ServerDataSetBean> beans = TableDataRepository.getInstance().getAllTableData();
-        final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.createConnectionMap(ConnectionRepository.getInstance().getAll());
+        final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.getCurrentConnectionMap();
         final Map<String, TableData> tableDataMap = new HashMap<>();
         for (ServerDataSetBean bean : beans) {
             try {

designer-base/src/main/java/com/fr/design/cache/DesignCacheManager.java

@@ -1,62 +0,0 @@
-package com.fr.design.cache;
-
-import com.fr.base.TableData;
-import com.fr.design.data.tabledata.wrapper.TableDataFactory;
-
-import java.util.Map;
-
-/**
- * 设计器缓存管理
- *
- * @author Destiny.Lin
- * @since 11.0
- * Created on 2024/8/11
- */
-public class DesignCacheManager {
-
-    public static ThreadLocal<Map<String, TableData>> cacheTableData = new ThreadLocal<>();
-
-    /**
-     * 处理任务（使用数据集缓存）
-     */
-    public static void processByCacheTableData(Task task) {
-        try {
-            cacheTableData.set(TableDataFactory.getTableDatas());
-            task.process();
-        } finally {
-            cacheTableData.remove();
-        }
-    }
-
-
-    /**
-     * 是否使用数据集的缓存
-     */
-    public static boolean useDataCache() {
-        return cacheTableData.get() != null;
-    }
-
-    /**
-     * 获取数据集缓存
-     */
-    public static ThreadLocal<Map<String, TableData>> getCacheTableData() {
-        return cacheTableData;
-    }
-
-    /**
-     * 设置数据集缓存
-     */
-    public static void setCacheTableData(ThreadLocal<Map<String, TableData>> cacheTableData) {
-        DesignCacheManager.cacheTableData = cacheTableData;
-    }
-
-    /**
-     * 任务
-     */
-    public interface Task {
-        /**
-         * 处理
-         */
-        void process();
-    }
-}

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

@@ -1,7 +1,6 @@
 package com.fr.design.data;
 
 import com.fanruan.ComponentUtils;
-import com.fanruan.config.impl.data.TableDataConfigProviderFactory;
 import com.fr.base.StoreProcedureParameter;
 import com.fr.base.TableData;
 import com.fr.concurrent.NamedThreadFactory;
@@ -19,8 +18,8 @@ import com.fr.data.impl.storeproc.StoreProcedureConstants;
 import com.fr.data.impl.storeproc.StoreProcedureHelper;
 import com.fr.data.operator.DataOperator;
 import com.fr.design.DesignModelAdapter;
-import com.fr.design.cache.DesignCacheManager;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
+import com.fr.design.data.datapane.preview.TableDataBeanHelper;
 import com.fr.design.data.tabledata.wrapper.MultiResultTableDataNameWrapper;
 import com.fr.design.data.tabledata.wrapper.MultiResultTableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.ServerTableDataWrapper;
@@ -317,7 +316,7 @@ public abstract class DesignTableDataManager {
             names.add(entry.getKey());
         }
         //服务器数据集
-        Map<String, TableData> tableDatas = TableDataConfigProviderFactory.getInstance().getTableDatas();
+        Map<String, TableData> tableDatas = TableDataBeanHelper.getServerTableDatas();
         for (Map.Entry<String, TableData> entry : tableDatas.entrySet()) {
             names.add(entry.getKey());
         }
@@ -449,13 +448,7 @@ public abstract class DesignTableDataManager {
     }
 
     private static void addServerData(java.util.Map<String, TableDataWrapper> resMap) {
-        Map<String, TableData> tableDataMap;
+        Map<String, TableData> tableDataMap = TableDataFactory.getTableDatas();
-        if (DesignCacheManager.useDataCache()) {
-            FineLoggerFactory.getLogger().debug("use cache Table data wrapper.");
-            tableDataMap = DesignCacheManager.getCacheTableData().get();
-        } else {
-            tableDataMap = TableDataFactory.getTableDatas();
-        }
         for (Entry<String, TableData> entry : tableDataMap.entrySet()) {
             if (globalDsCache.containsKey(entry.getKey())) {
                 resMap.put(entry.getKey(), globalDsCache.get(entry.getKey()));

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

@@ -1,6 +1,8 @@
 package com.fr.design.data.datapane;
 
+import com.fr.design.constants.UIConstants;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ItemEvent;
 import java.util.Iterator;
 import java.util.Map.Entry;
@@ -43,22 +45,29 @@ public class TableDataComboBox extends UIComboBox implements Prepare4DataSourceC
         this.treeName = treeName;
 		this.setRenderer(new UIComboBoxRenderer() {
 			private static final long serialVersionUID = 1L;
+			private boolean labelVisible = true;
 
 			@Override
 			public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
 				JLabel renderer = (JLabel)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-				if (index == -1 && value == null) {
+				if (value instanceof TableDataWrapper) {
-					// 显示空白
+					labelVisible = true;
+					TableDataWrapper tableDataWrapper = (TableDataWrapper)value;
+					renderer.setIcon(tableDataWrapper.getIcon());
+					renderer.setText(tableDataWrapper.getTableDataName());
+					renderer.setToolTipText(tableDataWrapper.getTableDataName());
+				} else {
+					labelVisible = false;
 					renderer.setIcon(null);
 					renderer.setText(StringUtils.EMPTY);
-				}else if (value instanceof TableDataWrapper) {
-					TableDataWrapper tabledatawrappe = (TableDataWrapper)value;
-					renderer.setIcon(tabledatawrappe.getIcon());
-					renderer.setText(tabledatawrappe.getTableDataName());
-					renderer.setToolTipText(tabledatawrappe.getTableDataName());
 				}
 				return renderer;
 			}
+
+			@Override
+			public Dimension getPreferredSize() {
+				return labelVisible ? super.getPreferredSize() : new Dimension(super.getPreferredSize().width, 0);
+			}
 		});
 		refresh(source);
         registerDSChangeListener();
@@ -75,6 +84,7 @@ public class TableDataComboBox extends UIComboBox implements Prepare4DataSourceC
         setDsMap();
 		DefaultComboBoxModel model = new DefaultComboBoxModel();
 		this.setModel(model);
+		model.addElement(UIConstants.PENDING);
 		// 遍历添加所有数据项到模型
 		Iterator<Entry<String, TableDataWrapper>> entryIt = dsMap.entrySet().iterator();
 		while (entryIt.hasNext()) {
@@ -83,8 +93,6 @@ public class TableDataComboBox extends UIComboBox implements Prepare4DataSourceC
                 model.addElement(tableDataWrapper);
             }
 		}
-		// 设置默认选项为空白
-		this.setSelectedItem(null);
         if (dataWrapper != null) {
             if (DesignTableDataManager.isDsNameChanged(dataWrapper.getTableDataName())) {
                 this.setSelectedTableDataByName(DesignTableDataManager.getChangedDsNameByOldDsName(dataWrapper.getTableDataName()));

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

@@ -336,6 +336,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
             for (ServerDataSetBean bean : deleteDatas) {
                 TableDataRepository.getInstance().delete(bean);
             }
+            TableDataRepository.getInstance().invalidCache();
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }

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

@@ -12,7 +12,6 @@ import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
-import com.fr.design.cache.DesignCacheManager;
 import com.fr.design.data.BasicTableDataTreePane;
 import com.fr.design.data.BasicTableDataUtils;
 import com.fr.design.data.DesignTableDataManager;
@@ -461,7 +460,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                 if (!ComparatorUtils.equals(oldName, tdName)) {
                     map.put(oldName, tdName);
                 }
-                DesignCacheManager.processByCacheTableData(() -> fireDSChanged(map));
+                fireDSChanged(map);
                 tc.fireTargetModified();
                 tc.parameterChanged();
                 int[] rows = tableDataTree.getSelectionRows();
@@ -1023,7 +1022,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            DesignCacheManager.processByCacheTableData(() -> dgEdit(getTableDataInstance().creatTableDataPane(), createDsName(getNamePrefix()), false));
+            dgEdit(getTableDataInstance().creatTableDataPane(), createDsName(getNamePrefix()), false);
         }
     }
 
@@ -1129,7 +1128,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
             BasicDialog basicDialog = basicPane.showSmallWindow(SwingUtilities.getWindowAncestor(TableDataTreePane.this), new DialogActionAdapter() {
                 @Override
                 public void doOk() {
-                    DesignCacheManager.processByCacheTableData(this::processRemove);
+                    processRemove();
 
                 }
                 private void processRemove() {
@@ -1203,7 +1202,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            DesignCacheManager.processByCacheTableData(this::doPaste);
+            doPaste();
         }
 
         private void doPaste() {

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

@@ -14,7 +14,6 @@ import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.stable.StringUtils;
-import com.fr.workspace.server.repository.connection.ConnectionRepository;
 import com.fr.workspace.server.repository.tabledata.TableDataRepository;
 
 import javax.swing.*;
@@ -70,7 +69,7 @@ public class TreeTableDataComboBox extends UIComboBox {
 		// 全局数据集
 		List<ServerDataSetBean> beans = TableDataRepository.getInstance().getAllTableData();
         Map<String, TableData> map = new HashMap<>();
-		final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.createConnectionMap(ConnectionRepository.getInstance().getAll());
+		final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.getCurrentConnectionMap();
 		try {
 			for (ServerDataSetBean bean : beans) {
 				map.put(bean.getDatasetName() , TableDataBeanHelper.getTableDataSet(connectionMap, bean.getDatasetType(), bean.getDatasetData()));

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

@@ -1,8 +1,6 @@
 package com.fr.design.data.datapane.connect;
 
-import com.fanruan.config.impl.data.ConnectionConfigProviderFactory;
 import com.fine.theme.icon.LazyIcon;
-import com.fr.base.svg.IconUtils;
 import com.fr.data.impl.AbstractDatabaseConnection;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.NameDatabaseConnection;
@@ -15,9 +13,7 @@ import com.fr.design.gui.ibutton.UILockButton;
 import com.fr.report.LockItem;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
-import com.fr.workspace.server.entity.connection.ConnectionBean;
 import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
-import com.fr.workspace.server.repository.connection.ConnectionRepository;
 
 import javax.swing.SwingUtilities;
 import java.awt.Dimension;
@@ -91,7 +87,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
         if (noAuthConnections == null) {
             return nameList.iterator();
         }
-        final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.createConnectionMap(ConnectionRepository.getInstance().getAll());
+        final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.getCurrentConnectionMap();
         for (Map.Entry<String, Connection> connectionEntry : connectionMap.entrySet()) {
             String conName = connectionEntry.getKey();
             if (noAuthConnections.contains(conName)) {

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

@@ -207,7 +207,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
     public void populate(Map<String, Connection> connectionMap) {
         List<NameObject> nameObjectList = new ArrayList<NameObject>();
         populatedConnectionsSnapshot.clear();
-        final Map<String, Connection> map = ConnectionInfoBeanHelper.createConnectionMap(ConnectionRepository.getInstance().getAll());
+        final Map<String, Connection> map = ConnectionInfoBeanHelper.getCurrentConnectionMap();
         for (Map.Entry<String, Connection> entry : map.entrySet()) {
             nameObjectList.add(new NameObject(entry.getKey(), entry.getValue()));
             try {
@@ -360,6 +360,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
             if (!WorkContext.getCurrent().isLocal()) {
                 EventDispatcher.fire(RemoteConfigEvent.EDIT, "ConnectionConfig");
             }
+            ConnectionRepository.getInstance().invalidCache();
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
             throw e;
@@ -368,7 +369,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
 
     public static void showDialog(Window parent) {
         try {
-            final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.createConnectionMap(ConnectionRepository.getInstance().getAll());
+            final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.getCurrentConnectionMap();
             final ConnectionManagerPane connectionManagerPane = new ConnectionManagerPane() {
                 @Override
                 public void complete() {

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

@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fanruan.datasource.driver.bean.DriverLoaderBean;
 import com.fine.swing.ui.layout.Layouts;
 import com.fine.theme.icon.LazyIcon;
 import com.fine.theme.utils.FineUIUtils;
@@ -361,7 +362,7 @@ public class JDBCDefPane extends JPanel {
     private void initMap() {
         Map<String, DriverLoader> driverLoaders = null;
         try {
-            driverLoaders = ConnectionRepository.getInstance().getDriverLoaders();
+            driverLoaders = toDriverLoaders(ConnectionRepository.getInstance().getDriverLoaders());
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
             driverLoaders = new HashMap<>();
@@ -370,6 +371,24 @@ public class JDBCDefPane extends JPanel {
         nameAndRepresent = getDriverLoaderAndRepresent(driverLoaders);
     }
 
+    private Map<String, DriverLoader> toDriverLoaders(Map<String, DriverLoaderBean> driverLoaders) {
+        Map<String, DriverLoader> map = new HashMap<>();
+        for (Map.Entry<String, DriverLoaderBean> entry : driverLoaders.entrySet()) {
+            map.put(entry.getKey(), createDriverLoader(entry.getValue()));
+        }
+        return map;
+    }
+
+    private DriverLoader createDriverLoader(DriverLoaderBean value) {
+        DriverLoader driverLoader = new DriverLoader();
+        driverLoader.setName(value.getName());
+        driverLoader.setDriverClass(value.getDriverClass());
+        driverLoader.setDriverJarFiles(value.getDriverJarFiles());
+        driverLoader.setLoadingStrategy(value.getLoadingStrategy());
+        driverLoader.setDriverList(value.getDriverList());
+        return driverLoader;
+    }
+
     private HashBiMap<String, String> getDriverLoaderAndRepresent(Map<String, DriverLoader> driverLoaders) {
         HashBiMap<String, String> driverHashBiMap = HashBiMap.create();
         if (WorkContext.getCurrent().isWarDeploy()) {

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

@@ -1,7 +1,10 @@
 package com.fr.design.data.datapane.connect;
 
 import com.fanruan.config.impl.data.ConnectionConfigProviderFactory;
+import com.fanruan.datasource.driver.bean.DriverLoaderBean;
 import com.fr.data.driver.DriverClassNotFoundException;
+import com.fr.data.driver.DriverLoader;
+import com.fr.data.driver.config.DriverLoaderConfig;
 import com.fr.data.impl.Connection;
 import com.fr.decision.webservice.bean.datasource.ConnectionInfoBean;
 import com.fr.decision.webservice.exception.general.DriverNotFoundException;
@@ -9,13 +12,15 @@ import com.fr.decision.webservice.v10.datasource.connection.processor.impl.Conne
 import com.fr.design.data.datapane.preview.ConnectionInfoBeanHelper;
 import com.fr.design.i18n.Toolkit;
 import com.fr.log.FineLoggerFactory;
-import com.fr.security.encryption.transmission.TransmissionEncryptionManager;
 import com.fr.workspace.engine.exception.DriverUnExistException;
 import com.fr.workspace.server.repository.connection.BaseConnectionSource;
+
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 本地Connection资源操作
@@ -98,6 +103,26 @@ public class LocalConnectionSource extends BaseConnectionSource {
 
     }
 
+
+    @Override
+    public Map<String, DriverLoaderBean> getDriverLoaders() throws Exception {
+        return DriverLoaderConfig.getInstance().getDriverLoaders().entrySet().stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, entry -> convertDriverLoader(entry.getValue()), (a, b) -> a, LinkedHashMap::new));
+    }
+
+    private DriverLoaderBean convertDriverLoader(DriverLoader driverLoader) {
+        if (driverLoader == null) {
+            return null;
+        }
+        DriverLoaderBean driverLoaderBean = new DriverLoaderBean();
+        driverLoaderBean.setName(driverLoader.getName());
+        driverLoaderBean.setDriverClass(driverLoader.getDriverClass());
+        driverLoaderBean.setDriverList(driverLoader.getDriverList());
+        driverLoaderBean.setDriverJarFiles(driverLoader.getDriverJarFiles());
+        driverLoaderBean.setLoadingStrategy(driverLoader.getLoadingStrategy());
+        return driverLoaderBean;
+    }
+
     @Override
     public boolean lock(String str) {
         // 本地默认锁定成功，让其执行后续动作

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

@@ -1,6 +1,5 @@
 package com.fr.design.data.datapane.connect;
 
-import com.fine.swing.ui.layout.Layouts;
 import com.fine.theme.icon.LazyIcon;
 import com.fine.theme.utils.FineUIUtils;
 import com.fr.data.impl.JDBCDatabaseConnection;
@@ -14,7 +13,7 @@ import com.fr.data.security.ssl.SslUtils;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.editor.editor.NotNegativeIntegerEditor;
-import com.fr.design.gui.core.ReactiveCardPane;
+import com.fr.design.gui.core.SimpleCardPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -28,6 +27,7 @@ import com.fr.file.filter.ChooseFileFilter;
 import com.fr.stable.StringUtils;
 import com.fr.third.guava.collect.HashBiMap;
 
+import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import java.awt.BorderLayout;
 import java.awt.event.KeyAdapter;
@@ -35,9 +35,10 @@ import java.awt.event.KeyEvent;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.fine.swing.ui.layout.Layouts.row;
-import static com.fine.swing.ui.layout.Layouts.flex;
 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.flex;
+import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fr.design.i18n.Toolkit.i18nText;
 
 /**
@@ -62,12 +63,10 @@ public class SshPane extends BasicPane {
     private final JPasswordField password = new UIPasswordFieldWithFixedLength(20);
     private final JPasswordField secret = new UIPasswordFieldWithFixedLength(20);
     private final KeyFileUITextField keyPath = new KeyFileUITextField(18);
-    private ReactiveCardPane coreCardPane;
+    private JPanel sshSettingPane;
-    private ReactiveCardPane verifyCardPane;
+    private SimpleCardPane verifyCardPane;
     private final UIButton fileChooserButton = new UIButton();
 
-    private static final String USE_SSH = "useSSH";
-    private static final String NOT_USE_SSH = "notUseSSH";
     private static final String USE_PASSWORD = "usePassword";
     private static final String USE_KEY = "useKey";
 
@@ -82,13 +81,14 @@ public class SshPane extends BasicPane {
         type.setSelectedItem(Toolkit.i18nText("Fine-Design_Basic_Ssh_Private_Key"));
 
         initVerifyCardPane();
-        initCoreCardPane();
+        initSshSettingPane();
 
         initListeners();
 
-        this.add(Layouts.column(LayoutConstants.VERTICAL_GAP,
+        this.add(column(LayoutConstants.VERTICAL_GAP,
                 cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Settings"))).with(FineUIUtils::wrapBoldLabelWithUnderline),
-                cell(coreCardPane)
+                row(cell(usingSsh)),
+                cell(sshSettingPane)
         ).getComponent());
     }
 
@@ -97,7 +97,7 @@ public class SshPane extends BasicPane {
 
         type.addActionListener(e -> changePaneForType());
         fileChooserButton.addActionListener(e -> {
-            FILEChooserPane fileChooser = FILEChooserPane.getInstanceWithDesignatePath(SslUtils.PREFIX, new ChooseFileFilter(true), SslUtils.CERTIFICATES);
+            FILEChooserPane fileChooser = FILEChooserPane.getFileCAChoosePane(new ChooseFileFilter(true));
             int type = fileChooser.showOpenDialog(SshPane.this, StringUtils.EMPTY);
             if (type == FILEChooserPane.OK_OPTION) {
                 final FILE file = fileChooser.getSelectedFILE();
@@ -112,10 +112,8 @@ public class SshPane extends BasicPane {
         });
     }
 
-    private void initCoreCardPane() {
+    private void initSshSettingPane() {
-        coreCardPane = ReactiveCardPane.create()
+        sshSettingPane = column(LayoutConstants.VERTICAL_GAP,
-                .addSupplier(NOT_USE_SSH, () -> cell(usingSsh).getComponent())
-                .addSupplier(USE_SSH, () -> Layouts.column(LayoutConstants.VERTICAL_GAP,
                         row(cell(usingSsh)),
                         row(
                                 cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Host"))).weight(1),
@@ -138,18 +136,17 @@ public class SshPane extends BasicPane {
                                 flex(6)
                         ),
                         cell(verifyCardPane)
-                ).getComponent());
+                ).getComponent();
-        coreCardPane.select(USE_SSH).populate();
     }
 
     private void initVerifyCardPane() {
-        verifyCardPane = ReactiveCardPane.create()
+        verifyCardPane = new SimpleCardPane();
-                .addSupplier(USE_PASSWORD, () -> Layouts.row(
+        verifyCardPane.add(USE_PASSWORD, row(
                 cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Password"))).weight(1),
                 cell(password).weight(5),
                 flex(6)
-                ).getComponent())
+        ).getComponent());
-                .addSupplier(USE_KEY, () -> Layouts.column(LayoutConstants.VERTICAL_GAP,
+        verifyCardPane.add(USE_KEY, column(LayoutConstants.VERTICAL_GAP,
                 row(
                         cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Private_Key"))).weight(1),
                         cell(keyPath).weight(4.5),
@@ -164,21 +161,21 @@ public class SshPane extends BasicPane {
                 )
         ).getComponent());
 
-        verifyCardPane.select(USE_KEY).populate();
+        verifyCardPane.show(USE_KEY);
     }
 
 
     private void changePane() {
-        coreCardPane.select(usingSsh.isSelected() ? USE_SSH: NOT_USE_SSH).populate();
+        sshSettingPane.setVisible(usingSsh.isSelected());
     }
 
     private void changePaneForType() {
         switch (typeMap.get(type.getSelectedItem())) {
             case NORMAL:
-                verifyCardPane.select(USE_PASSWORD).populate();
+                verifyCardPane.show(USE_PASSWORD);
                 break;
             case KEY:
-                verifyCardPane.select(USE_KEY).populate();
+                verifyCardPane.show(USE_KEY);
                 break;
             default:
                 throw new SshException("un support ssh type");

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

@@ -1,18 +1,15 @@
 package com.fr.design.data.datapane.connect;
 
-import com.fine.swing.ui.layout.Layouts;
 import com.fine.theme.icon.LazyIcon;
 import com.fine.theme.utils.FineUIUtils;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.security.ssl.Ssl;
 import com.fr.data.security.ssl.SslException;
 import com.fr.data.security.ssl.SslType;
-import com.fr.data.security.ssl.SslUtils;
 import com.fr.data.security.ssl.impl.NormalSsl;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.data.datapane.connect.SshPane.KeyFileUITextField;
 import com.fr.design.dialog.BasicPane;
-import com.fr.design.gui.core.ReactiveCardPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -23,14 +20,16 @@ import com.fr.file.FILEChooserPane;
 import com.fr.file.filter.ChooseFileFilter;
 import com.fr.stable.StringUtils;
 
+import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import static com.fine.swing.ui.layout.Layouts.row;
-import static com.fine.swing.ui.layout.Layouts.flex;
 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.flex;
+import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fr.design.i18n.Toolkit.i18nText;
 
 /**
@@ -47,15 +46,13 @@ public class SslPane extends BasicPane {
     private final KeyFileUITextField keyPathClientKey = new KeyFileUITextField(18);
     private final UIButton fileChooserButtonClientKey = new UIButton();
     private final UICheckBox verifyCa = new UICheckBox(i18nText("Fine-Design_Basic_Ssl_Verify_Ca"));
-    private final ReactiveCardPane cardPane;
+    private final JPanel sslSettingPane;
 
     public SslPane() {
         initDotButtons();
         this.setLayout(new BorderLayout());
         usingSsl.setSelected(true);
-        cardPane = ReactiveCardPane.create()
+        sslSettingPane = column(10,
-                .addSupplier("notUseSSL", () -> cell(usingSsl).getComponent())
-                .addSupplier("useSSL", () -> Layouts.column(LayoutConstants.VERTICAL_GAP,
                 cell(usingSsl),
                 row(
                         cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Ca"), SwingConstants.LEFT)).weight(1),
@@ -79,13 +76,14 @@ public class SslPane extends BasicPane {
                         cell(fileChooserButtonClientCert).weight(0.15),
                         flex(2)
                 )
-                    ).getComponent()
+        ).getComponent();
-                );
+
-        cardPane.select("useSSL").populate();
+        this.add(column(LayoutConstants.VERTICAL_GAP,
-        this.add(Layouts.column(LayoutConstants.VERTICAL_GAP,
                 cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Settings"))).with(FineUIUtils::wrapBoldLabelWithUnderline),
-                cell(cardPane)
+                cell(usingSsl),
+                cell(sslSettingPane)
         ).getComponent());
+
         usingSsl.addActionListener(e -> changePane());
     }
 
@@ -99,7 +97,7 @@ public class SslPane extends BasicPane {
     }
 
     private void changePane() {
-        cardPane.select(usingSsl.isSelected() ? "useSSL" : "notUseSSL").populate();
+        sslSettingPane.setVisible(usingSsl.isSelected());
     }
 
 

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

@@ -22,21 +22,30 @@ import com.fr.decision.webservice.bean.datasource.JDBCConnectionBean;
 import com.fr.decision.webservice.utils.DecisionServiceConstants;
 import com.fr.decision.webservice.v10.datasource.connection.processor.impl.ConnectionProcessorFactory;
 import com.fr.decision.webservice.v10.datasource.connection.processor.impl.JDBCConnectionProcessor;
+import com.fr.event.Event;
+import com.fr.event.EventDispatcher;
+import com.fr.event.Listener;
+import com.fr.event.Null;
 import com.fr.log.FineLoggerFactory;
 import com.fr.module.tool.ActivatorToolBox;
 import com.fr.security.encryption.transmission.TransmissionEncryptionManager;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
-import com.fr.third.fasterxml.jackson.core.JsonProcessingException;
 import com.fr.third.fasterxml.jackson.databind.ObjectMapper;
+import com.fr.third.guava.cache.CacheBuilder;
+import com.fr.third.guava.cache.CacheLoader;
+import com.fr.third.guava.cache.LoadingCache;
 import com.fr.third.springframework.beans.BeanUtils;
 import com.fr.workspace.server.repository.WorkplaceConstants;
+import com.fr.workspace.server.repository.connection.ConnectionCacheEvent;
 import com.fr.workspace.server.repository.connection.ConnectionRepository;
 import com.fr.workspace.server.repository.tabledata.DataEncryptionHelper;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 数据连接传输工具类
@@ -51,19 +60,38 @@ public class ConnectionInfoBeanHelper {
     private static final int ORACLE_DEFAULT_FETCH_SIZE = 128;
     private static final int DB2_DEFAULT_FETCH_SIZE = 50;
     private static final int POSTGRE_DEFAULT_FETCH_SIZE = 10000;
+    public static final int CACHE_MAX_SIZE = 1;
+    public static final String VALUE = "value";
+    private static LoadingCache<String, Map<String, Connection>> cache = CacheBuilder.newBuilder()
+            // 缓存容量1
+            .maximumSize(CACHE_MAX_SIZE)
+            // 默认写入过60S后过期
+            .expireAfterWrite(60, TimeUnit.SECONDS)
+            .build(new CacheLoader<String, Map<String, Connection>>() {
+                @Override
+                public Map<String, Connection> load(String s) throws Exception {
+                    return updateCache();
+                }
+            });
+
 
     static {
         FETCH_SIZE_MAP.put("oracle", ORACLE_DEFAULT_FETCH_SIZE);
         FETCH_SIZE_MAP.put("ibm-db2", DB2_DEFAULT_FETCH_SIZE);
         FETCH_SIZE_MAP.put("postgresql", POSTGRE_DEFAULT_FETCH_SIZE);
+        // 监听数据连接缓存失效
+        EventDispatcher.listen(ConnectionCacheEvent.REMOVE, new Listener<Null>() {
+            @Override
+            public void on(Event event, Null aNull) {
+                cache.invalidateAll();
+            }
+        });
     }
 
 
-    /**
+    private static Map<String, Connection> updateCache() {
-     * 获取连接Map
-     */
-    public static Map<String, Connection> createConnectionMap(ConnectionInfoBean[] beans) {
         Map<String, Connection> ans = new HashMap<>();
+        ConnectionInfoBean[] beans = ConnectionRepository.getInstance().getAll();
         for (ConnectionInfoBean infoBean : beans) {
             try {
                 if (JDBCConnectionProcessor.KEY.acceptConnectionTypes().contains(infoBean.getConnectionType())) {
@@ -78,23 +106,33 @@ public class ConnectionInfoBeanHelper {
         return ans;
     }
 
+
+
+
+    /**
+     * 获取连接Map
+     */
+    public static Map<String, Connection> getCurrentConnectionMap() {
+        try {
+            return cache.get(VALUE);
+        } catch (ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * 根据bean创建连接
      */
     public static Connection createConnection(ConnectionInfoBean infoBean) {
-        Connection connection = null;
         try {
-           if (JDBCConnectionProcessor.KEY.acceptConnectionTypes().contains(infoBean.getConnectionType())) {
+            Connection connection = cache.get(VALUE).get(infoBean.getConnectionName());
-               connection = createJDBCConnection(infoBean);
+            if (connection != null) {
-           } else {
-               connection = ConnectionProcessorFactory.createConnection(infoBean, true);
-           }
                 connection.setConnectionName(infoBean.getConnectionName());
-       } catch (Exception e) {
-           FineLoggerFactory.getLogger().error(e.getMessage(), e);
-           return connection;
             }
             return connection;
+        } catch (ExecutionException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**
@@ -180,7 +218,7 @@ public class ConnectionInfoBeanHelper {
                 .redirectPort(jdbcConnection.getSsh().getRedirectPort())
                 .redirectIp((jdbcConnection.getSsh()).getRedirectIp())
                 .sshTimeOut(((BaseSsh) jdbcConnection.getSsh()).getTimeOut())
-                .sshSecret(withPassword ? ((BaseSsh) jdbcConnection.getSsh()).getSecret() : DecisionServiceConstants.DEFAULT_PASSWORD)
+                .sshSecret(withPassword ?  DataEncryptionHelper.encrypt(((BaseSsh) jdbcConnection.getSsh()).getSecret()) : DecisionServiceConstants.DEFAULT_PASSWORD)
                 .sshPrivateKeyPath(jdbcConnection.getSsh().getSshType() == SshType.KEY ? ((KeyVerifySsh) jdbcConnection.getSsh()).getPrivateKeyPath() : StringUtils.EMPTY)
                 .usingSsl((jdbcConnection.getSsl()).isUsingSsl())
                 .sslType(jdbcConnection.getSsl().getSslType().toString())

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

@@ -25,13 +25,10 @@ import com.fr.general.sql.SqlUtils;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.script.Calculator;
-import com.fr.security.encryption.transmission.TransmissionEncryptionManager;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
-import com.fr.workspace.server.repository.connection.ConnectionRepository;
 import com.fr.workspace.server.repository.tabledata.DataEncryptionHelper;
 import com.fr.workspace.server.repository.tabledata.TableDataRepository;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -52,7 +49,7 @@ public class TableDataBeanHelper {
      */
     public static Map<String, TableData> getServerTableDatas() {
         final List<ServerDataSetBean> beans = TableDataRepository.getInstance().getAllTableData();
-        final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.createConnectionMap(ConnectionRepository.getInstance().getAll());
+        final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.getCurrentConnectionMap();
         final Map<String, TableData> tableDataMap = new HashMap<>();
         try {
             for (ServerDataSetBean bean : beans) {
@@ -159,7 +156,12 @@ public class TableDataBeanHelper {
         if (dataSet.getDatabase() instanceof NameDatabaseConnection) {
             bean.setDatabase(((NameDatabaseConnection) dataSet.getDatabase()).getName());
         }
+        if (dataSet.getQuery() != null) {
             bean.setQuery(DataEncryptionHelper.encrypt(dataSet.getQuery()));
+        }
+        if (dataSet.getPageQuerySql() != null) {
+            bean.setPageQuery(DataEncryptionHelper.encrypt(dataSet.getPageQuerySql()));
+        }
         List<ParameterBean> parameterBeans = new ArrayList<>();
         ParameterProvider[] parameters = dataSet.getParameters(Calculator.createCalculator());
         for (ParameterProvider parameter : parameters) {
@@ -189,11 +191,15 @@ public class TableDataBeanHelper {
     private static TableData deserialize4SQL(Map<String, Connection> connectionMap, DBTableData oldDataSet, JSONObject object) {
         DBTableData tableData = new DBTableData();
         SQLDataSetBean bean = object.mapTo(SQLDataSetBean.class);
+        if (bean.getQuery() != null) {
             tableData.setQuery(DataEncryptionHelper.decrypt(bean.getQuery()));
+        }
+        if (bean.getPageQuery() != null) {
+            tableData.setPageQuerySql(DataEncryptionHelper.decrypt(bean.getPageQuery()));
+        }
         Connection connection = connectionMap.get(bean.getDatabase());
-        if (connection != null) {
         tableData.setDatabase(new NameDatabaseConnection(bean.getDatabase()));
-        } else {
+        if (connection == null) {
             FineLoggerFactory.getLogger().info("not find conn by {}", bean.getDatabase());
         }
         String sql = SqlUtils.clearSqlComments(DataEncryptionHelper.decrypt(bean.getQuery()));

designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTablePane.java

@@ -12,8 +12,11 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 
-import javax.swing.*;
+import javax.swing.JPanel;
-import java.awt.*;
+import javax.swing.SwingWorker;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -89,7 +92,8 @@ public class TableDataDesensitizationTablePane extends JPanel {
                 // 获取当前所有用户组
                 roleMap.putAll(RemoteAuthorityRepository.getInstance().getAllRoles4Desensitization());
                 // 获取当前最新的所有规则
-                latestRules.putAll(DesensitizationRuleManager.getInstance().getAllRules());
+                latestRules.put(DesensitizationRuleSource.SERVER, RemoteAuthorityRepository.getInstance().getAllRoles().getSourceRuleMap().get(DesensitizationRuleSource.SERVER));
+                latestRules.put(DesensitizationRuleSource.CUSTOM, DesensitizationRuleManager.getInstance().getRulesBySource(DesensitizationRuleSource.CUSTOM));
                 return null;
             }
 

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

@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.sqlpane;
 
+import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.design.actions.UpdateAction;
@@ -10,7 +11,6 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 
-import javax.swing.Icon;
 import javax.swing.JPopupMenu;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
@@ -57,8 +57,7 @@ public class SQLEditPane extends RSyntaxTextArea {
         if (requestDroptarget) {
             new SQLPaneDropTarget(this);
         }
-		setBorder(null);
+		setBorder(new ScaledEmptyBorder(2, 2, 2, 2));
-
     }
 
 

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

@@ -17,6 +17,7 @@ import com.fr.stable.StringUtils;
 
 import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX;
 import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE;
+import static com.fine.theme.utils.FineUIScale.scale;
 
 
 public class MaxMemRowCountPanel extends UIToolbar {
@@ -24,9 +25,9 @@ public class MaxMemRowCountPanel extends UIToolbar {
 	private static final int MAX_IN_MEMORY = 1;
 	private static final String[] CACHE_LIST = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save_All_Records_In_Memory"),
 												com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Max_Mem_Row_Count") };
-	private static final int MAX_WIDTH = getMaxComBoBoxWidth() > 200 ? 350 : 280;
+	private static final int MAX_WIDTH = getMaxWidth();
 	private static final int MAX_COMPONENT_COUNT_OF_MAX_MEMORY = 4;
-	private static int getMaxComBoBoxWidth() {
+	private static int getMaxWidth() {
 		int maxWidth = GraphHelper.getWidth(CACHE_LIST[0]);
 		for (int i = 1; i < CACHE_LIST.length; i++) {
 			int width = GraphHelper.getWidth(CACHE_LIST[i]);
@@ -34,6 +35,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
 				maxWidth = width;
 			}
 		}
+		maxWidth = maxWidth > scale(200) ? scale(350) : scale(280);
 		return maxWidth;
 	}
 

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java

@@ -4,18 +4,18 @@ import com.fr.base.TableData;
 import com.fr.data.MultiResultTableData;
 import com.fr.data.impl.NameDataModel;
 import com.fr.data.impl.storeproc.StoreProcedure;
-import com.fr.data.operator.DataOperator;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.preview.ConnectionInfoBeanHelper;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
+import com.fr.design.dialog.CollapsibleDetailDialog;
 import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.iprogressbar.AutoProgressBar;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
-import com.fr.workspace.server.entity.connection.ConnectionBean;
 import com.fr.workspace.server.repository.connection.ConnectionRepository;
 
 import javax.swing.Icon;
@@ -230,10 +230,15 @@ public final class MultiResultTableDataWrapper implements TableDataWrapper {
                     loadingBar.close();
                     if (!(e instanceof CancellationException)) {
                         FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                        if (tableData instanceof StoreProcedure) {
+                            CollapsibleDetailDialog dialog = new CollapsibleDetailDialog(DesignerContext.getDesignerFrame(), new UILabel(Toolkit.i18nText("Fine-Design_Stored_Procedure_Query_Failed")), e.getMessage());
+                            dialog.setVisible(true);
+                        } else {
                             FineJOptionPane.showMessageDialog(parent, e.getMessage());
                         }
                     }
                 }
+            }
         };
     }
 

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java

@@ -31,7 +31,6 @@ import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
-import com.fr.workspace.server.repository.connection.ConnectionRepository;
 import com.fr.workspace.server.repository.tabledata.TableDataRepository;
 
 import javax.swing.Icon;
@@ -205,7 +204,7 @@ public abstract class TableDataFactory {
         clearAll();
         try {
             List<ServerDataSetBean> beans = TableDataRepository.getInstance().getAllTableData();
-            final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.createConnectionMap(ConnectionRepository.getInstance().getAll());
+            final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.getCurrentConnectionMap();
             Map<String, TableData> tableDataMap = new HashMap<>();
             for (ServerDataSetBean bean : beans) {
                 tableDataMap.put(bean.getDatasetName(), TableDataBeanHelper.getTableDataSet(connectionMap, bean.getDatasetType(), bean.getDatasetData()));
@@ -229,7 +228,7 @@ public abstract class TableDataFactory {
         Map<String, TableData> tableDataMap = new HashMap<>();
         try {
             List<ServerDataSetBean> beans = TableDataRepository.getInstance().getAllTableData();
-            final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.createConnectionMap(ConnectionRepository.getInstance().getAll());
+            final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.getCurrentConnectionMap();
             for (ServerDataSetBean bean : beans) {
                 tableDataMap.put(bean.getDatasetName(), TableDataBeanHelper.getTableDataSet(connectionMap, bean.getDatasetType(), bean.getDatasetData()));
             }

designer-base/src/main/java/com/fr/design/dialog/CollapsibleDetailDialog.java

@@ -0,0 +1,145 @@
+package com.fr.design.dialog;
+
+import com.fine.theme.icon.LazyIcon;
+import com.fine.theme.utils.FineUIScale;
+import com.fine.theme.utils.FineUIStyle;
+import com.formdev.flatlaf.ui.FlatUIUtils;
+import com.formdev.flatlaf.util.ScaledEmptyBorder;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.JPanel;
+import javax.swing.JDialog;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+
+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.flex;
+import static com.fine.swing.ui.layout.Layouts.fix;
+
+/**
+ * 折叠弹窗
+ *
+ * @author Richard
+ * @since 11.0
+ * Created on 2024/10/22
+ */
+public class CollapsibleDetailDialog extends JDialog implements ActionListener {
+
+    public JPanel upInTopPanel;
+    private JPanel downInTopPanel;
+    private JPanel topPanel;
+    public JPanel hiddenPanel;
+    private JPanel bottomPanel;
+    private UILabel directUILabel;
+    private UILabel detailLabel;
+    // 内容标题
+    private final UILabel messageLabel;
+    // 详情
+    private final String detailText;
+    private final Dimension collapseDimension = FineUIScale.createScaleDimension(450, 185);
+    private final Dimension unfoldDimension = FineUIScale.createScaleDimension(450, 280);
+
+    public CollapsibleDetailDialog(Frame parent, UILabel label, String detailText) {
+        super(parent, true);
+        this.detailText = detailText;
+        this.messageLabel = label;
+        initComponent();
+    }
+
+    private void initComponent() {
+        initTopPanel();
+        initHiddenPanel();
+        initBottomPanel();
+        addListeners();
+        this.setResizable(false);
+        this.add(topPanel, BorderLayout.NORTH);
+        this.add(hiddenPanel, BorderLayout.CENTER);
+        this.add(bottomPanel, BorderLayout.SOUTH);
+        this.setSize(this.collapseDimension);
+        GUICoreUtils.centerWindow(this);
+        this.setAlwaysOnTop(true);
+    }
+
+    private void initTopPanel() {
+        initUpInTopPanel();
+        // 查看详情按钮
+        directUILabel = new UILabel();
+        directUILabel.setIcon(new LazyIcon("plus"));
+        detailLabel = new UILabel();
+        detailLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine_Designer_Look_Detail"));
+        downInTopPanel = row(fix(30), row(cell(directUILabel), cell(detailLabel), flex())).getComponent();
+        topPanel = column(cell(upInTopPanel), cell(downInTopPanel)).getComponent();
+    }
+
+    private void initUpInTopPanel() {
+        upInTopPanel = row(LayoutConstants.HORIZONTAL_GAP,
+                column(cell(new UILabel(new LazyIcon("error", 20))), flex()),
+                column(cell(messageLabel))).getComponent();
+        upInTopPanel.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
+    }
+
+    private void initHiddenPanel() {
+        hiddenPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        JScrollPane scrollPane = new JScrollPane();
+        JTextArea textArea = new JTextArea(detailText);
+        scrollPane.setViewportView(textArea);
+        scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
+        scrollPane.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
+        scrollPane.getViewport().setOpaque(false);
+        textArea.setOpaque(false);
+        textArea.setEditable(false);
+        hiddenPanel = row(fix(30), cell(scrollPane).weight(1)).getComponent();
+        hiddenPanel.setVisible(false);
+        hiddenPanel.setBorder(new ScaledEmptyBorder(0, 0, 0, 10));
+    }
+
+    private void initBottomPanel() {
+        //底部的按钮面板
+        UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
+        FineUIStyle.setStyle(okButton, FineUIStyle.STYLE_PRIMARY);
+        okButton.addActionListener(this);
+        bottomPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        bottomPanel.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
+        bottomPanel.add(okButton, BorderLayout.EAST);
+    }
+
+    private void addListeners() {
+        downInTopPanel.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                toggleHiddenPanel();
+            }
+        });
+    }
+
+    private void toggleHiddenPanel() {
+        if (hiddenPanel.isVisible()) {
+            hiddenPanel.setVisible(false);
+            setSize(collapseDimension);
+            detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail"));
+            directUILabel.setIcon(new LazyIcon("plus"));
+        } else {
+            setSize(unfoldDimension);
+            hiddenPanel.setVisible(true);
+            detailLabel.setText(Toolkit.i18nText("Fine_Designer_Hide_Detail"));
+            directUILabel.setIcon(new LazyIcon("minus"));
+        }
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        this.dispose();
+    }
+}

designer-base/src/main/java/com/fr/design/dialog/UIDetailErrorLinkDialog.java

@@ -5,6 +5,7 @@ import com.fine.theme.utils.FineUIScale;
 import com.fine.theme.utils.FineUIStyle;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.base.GraphHelper;
+import com.fr.design.border.FineBorderFactory;
 import com.fr.design.dialog.link.MessageWithLink;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
@@ -14,7 +15,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.IOUtils;
 import com.fr.stable.StringUtils;
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -30,7 +30,6 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
@@ -77,6 +76,7 @@ public class UIDetailErrorLinkDialog extends UIDialog {
         // 顶部 图标和提示
         UILabel errorIcon = new UILabel(new LazyIcon("error", 20));
         UILabel errorInfo= new UILabel(builder.reason);
+        errorInfo.setToolTipText(builder.reason);
         FineUIStyle.setStyle(errorInfo, FineUIStyle.LABEL_TIP_WINDOW_TITLE);
 
         // 中部 详细内容
@@ -179,9 +179,11 @@ public class UIDetailErrorLinkDialog extends UIDialog {
         public StackPane(String stack) {
             setLayout(new BorderLayout());
             UITextArea textArea = new UITextArea();
+            textArea.setBorder(null);
             textArea.setEditable(false);
             textArea.setText(stack);
             UIScrollPane scrollPane = new UIScrollPane(textArea);
+            scrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder());
             add(scrollPane);
             // 滚动条默认在顶部
             SwingUtilities.invokeLater(new Runnable() {

designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java

@@ -13,7 +13,6 @@ import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.file.LocateAction;
 import com.fr.design.actions.template.NewWorkBookToolButtonAction;
-import com.fr.design.cache.DesignCacheManager;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.fun.MenuHandler;
@@ -837,13 +836,13 @@ public class MultiTemplateTabPane extends Row {
                     setIsCloseCurrent(true);
                 }
                 closeFormat(template);
-                DesignCacheManager.processByCacheTableData(() -> closeSpecifiedTemplate(template));
+                closeSpecifiedTemplate(template);
                 DesignerContext.getDesignerFrame().getContentFrame().repaint();
                 isShowList = false;
             } else {
                 //没有点击关闭和ListDown按钮，则切换到点击的模板处
                 closeIconIndex = -1;
-                DesignCacheManager.processByCacheTableData(() -> switchJTemplate(getTemplateIndex(evtX)));
+                switchJTemplate(getTemplateIndex(evtX));
                 clodeIcon = new LazyIcon("clear");
                 switchJTemplate(getTemplateIndex(evtX));
                 isShowList = false;

designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

@@ -5,7 +5,6 @@ package com.fr.design.file;
 
 import com.fanruan.repository.TemplateRepository;
 import com.fr.design.ExtraDesignClassManager;
-import com.fr.design.cache.DesignCacheManager;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.fun.TemplateTreeDefineProcessor;
 import com.fr.design.gui.itree.filetree.TemplateFileTree;
@@ -37,11 +36,17 @@ import com.fr.workspace.base.UserInfo;
 import com.fr.workspace.server.repository.vcs.VcsRepository;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
+import javax.swing.ToolTipManager;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Desktop;
+import java.awt.Dimension;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseAdapter;
@@ -53,8 +58,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.Objects;
-import java.util.Observable;
-import java.util.Observer;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -88,12 +91,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
 
         ToolTipManager.sharedInstance().registerComponent(reportletsTree);
 
-        FileLockStateObservable.getInstance().addObserver(new Observer() {
+        FileLockStateObservable.getInstance().addObserver((o, arg) -> TemplateTreePane.this.refresh());
-            @Override
-            public void update(Observable o, Object arg) {
-                TemplateTreePane.this.refresh();
-            }
-        });
 
         /*
          * Tree.MouseAdapter
@@ -102,8 +100,11 @@ public class TemplateTreePane extends JPanel implements FileOperations {
 
             @Override
             public void mousePressed(MouseEvent evt) {
+                if (isDirectorySelection()) {
+                    return;
+                }
                 if (evt.getClickCount() == 2) {
-                    DesignCacheManager.processByCacheTableData(() -> openFile());
+                    openFile();
                 }
             }
 
@@ -157,6 +158,16 @@ public class TemplateTreePane extends JPanel implements FileOperations {
         });
     }
 
+    /**
+     * 选中的是否目录
+     *
+     * @return 是否目录
+     */
+    private boolean isDirectorySelection() {
+        FileNode fileNode = reportletsTree.getSelectedFileNode();
+        return fileNode != null && fileNode.isDirectory();
+    }
+
     public TemplateFileTree getTemplateFileTree() {
         return this.reportletsTree;
     }
@@ -389,7 +400,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
     }
 
     private void deleteNodes(Collection<ExpandMutableTreeNode> nodes) {
-        new SwingWorker<Boolean,Void>(){
+        new SwingWorker<Boolean, Void>() {
             @Override
             protected Boolean doInBackground() throws Exception {
                 boolean success = true;
@@ -415,6 +426,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
                 }
                 return success;
             }
+
             @Override
             protected void done() {
                 try {
@@ -518,6 +530,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
         }
         return false;
     }
+
     public void setToolbarStateChangeListener(FileToolbarStateChangeListener listener) {
         this.toolBarStateChangeListener = listener;
     }

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

@@ -315,7 +315,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         // text
         initFormulaTextArea();
         UIScrollPane formulaTextAreaScrollPane = new UIScrollPane(formulaTextArea);
-        formulaTextArea.setBorder(null);
+        formulaTextArea.setBorder(new ScaledEmptyBorder(2, 2, 2, 2));
         formulaTextAreaScrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder());
 
         // buttonPane

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

@@ -35,8 +35,8 @@ public class ColumnRowVerticalPane extends ColumnRowPane {
 		initRowSpinner();
 
 		pane.add(column(10,
-				row(cell(rowLabel).weight(0.15), cell(rowSpinner).weight(0.85)),
+				row(cell(colLabel).weight(0.15), cell(columnSpinner).weight(0.85)),
-				row(cell(colLabel).weight(0.15), cell(columnSpinner).weight(0.85))
+				row(cell(rowLabel).weight(0.15), cell(rowSpinner).weight(0.85))
 		).getComponent());
 		
 		this.addDocumentListener(d);

designer-base/src/main/java/com/fr/design/gui/core/ReactiveCardPane.java

@@ -9,11 +9,13 @@ import java.util.function.Supplier;
 
 /**
  * 简单的响应式面板容器，提供切换布局的功能
+ * <p> 懒加载无法兼容事件初始化，如需实现类似功能可考虑 {@link SimpleCardPane} </>
  *
  * @author Levy.Xie
  * @since 11.0
  * Created on 2023/12/25
  */
+@Deprecated
 public class ReactiveCardPane extends JPanel {
 
     String selectKey;

designer-base/src/main/java/com/fr/design/gui/core/SimpleCardPane.java

@@ -0,0 +1,44 @@
+package com.fr.design.gui.core;
+
+import javax.swing.JPanel;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+
+/**
+ * 自适应尺寸大小变更的Card面板
+ *
+ * @author Levy.Xie
+ * @since 11.0
+ * Created on 2024/10/22
+ */
+public class SimpleCardPane extends JPanel {
+
+    private final CardLayout cardLayout;
+
+    public SimpleCardPane() {
+        cardLayout = new CardLayout();
+        setLayout(cardLayout);
+    }
+
+    /**
+     * 显示卡片
+     * @param key 卡片名
+     */
+    public void show(String key) {
+        setVisible(true);
+        cardLayout.show(this, key);
+    }
+
+    @Override
+    public Dimension getPreferredSize() {
+        for (Component comp : getComponents()) {
+            if (comp.isVisible()) {
+                return comp.getPreferredSize();
+            }
+        }
+        setVisible(false);
+        return new Dimension(0, 0);
+    }
+
+}

designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java

@@ -2,20 +2,34 @@ package com.fr.design.gui.frpane;
 
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.dialog.BasicPane;
-import com.fr.design.gui.core.ReactiveCardPane;
+import com.fr.design.gui.core.SimpleCardPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.form.ui.reg.*;
+import com.fr.form.ui.reg.CustomReg;
+import com.fr.form.ui.reg.IDCardReg;
+import com.fr.form.ui.reg.LengthReg;
+import com.fr.form.ui.reg.MailReg;
+import com.fr.form.ui.reg.MobileReg;
+import com.fr.form.ui.reg.NoneReg;
+import com.fr.form.ui.reg.PhoneReg;
+import com.fr.form.ui.reg.PostCardReg;
+import com.fr.form.ui.reg.RegExp;
 import com.fr.general.ComparatorUtils;
 
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.DefaultComboBoxModel;
-import java.awt.*;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.ListCellRenderer;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.util.EventListener;
 import java.util.EventObject;
@@ -86,10 +100,10 @@ public class RegPane extends BasicPane {
         regPhonePane = new RegPhonePane();
         customRegRexPane = new CustomRegRexPane();
 
-        final ReactiveCardPane cardPane = ReactiveCardPane.create()
+        final SimpleCardPane cardPane = new SimpleCardPane();
-                .addSupplier("Length", () -> regLengthPane)
+        cardPane.add(regLengthPane, "Length");
-                .addSupplier("Phone", () -> regPhonePane)
+        cardPane.add(regPhonePane, "Phone");
-                .addSupplier("Custom", () -> customRegRexPane);
+        cardPane.add(customRegRexPane, "Custom");
         cardPane.setVisible(false);
 
         corePane.add(comboPane);
@@ -97,19 +111,19 @@ public class RegPane extends BasicPane {
         initComboListener(cardPane);
     }
 
-    private void initComboListener(ReactiveCardPane cardPane) {
+    private void initComboListener(SimpleCardPane cardPane) {
         regComboBox.addActionListener(e -> {
             RegExp regExp = (RegExp)regComboBox.getSelectedItem();
             if(regExp instanceof PhoneReg) {
                 Object selectItem = regPhonePane.dataTypeComboBox.getSelectedItem();
                 String regString = selectItem == null ? StringUtils.EMPTY : selectItem.toString();
                 firePhoneRegAction(regString);
-                cardPane.select("Phone").populate();
+                cardPane.show("Phone");
             } else {
                 if (regExp instanceof LengthReg){
-                    cardPane.select("Length").populate();
+                    cardPane.show("Length");
                 } else if (regExp instanceof CustomReg){
-                    cardPane.select("Custom").populate();
+                    cardPane.show("Custom");
                 } else {
                     cardPane.setVisible(false);
                 }

designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBox.java

@@ -162,7 +162,7 @@ public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObser
         int renderFix = FineUIScale.scale(5);
         int comboHeight = FineUIUtils.getAndScaleInt("ComboBox.comboHeight", 24);
         //renderFix的原因在于：render里，每一个项前面了空了一格，要多几像素
-        return new Dimension(FineUIScale.scale(super.getPreferredSize().width) + renderFix, comboHeight);
+        return new Dimension(super.getPreferredSize().width + renderFix, comboHeight);
     }
 
     public void refreshBoxItems(List list) {

designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java

@@ -44,6 +44,7 @@ public class UIModeControlContainer extends JLayeredPane {
     private static final int NUM5 = 5;
     private JComponent upPane;
     private JComponent downPane;
+    private JComponent sheetNameTabPane;
     private JPanel horizontToolPane;
 
     private CoverPane coverPane;
@@ -115,6 +116,10 @@ public class UIModeControlContainer extends JLayeredPane {
         this.downPane = downPane;
     }
 
+    public void setSheetNameTabPane(JComponent sheetNameTabPane) {
+        this.sheetNameTabPane = sheetNameTabPane;
+    }
+
     protected void onResize(int distance) {
 
     }
@@ -215,7 +220,8 @@ public class UIModeControlContainer extends JLayeredPane {
             }
 
             if (DesignerMode.isAuthorityEditing() && isSheeetCovered) {
-                sheetInvisibleCoverPane.setBounds(0, toolPaneY + toolPaneHeight + UIConstants.SIZE, getWidth(), getHeight() - toolPaneY - toolPaneHeight - sheetCorverGap);
+                sheetInvisibleCoverPane.setBounds(0, toolPaneY + toolPaneHeight + UIConstants.SIZE,
+                        getWidth(), downPane.getHeight() - sheetNameTabPane.getHeight());
                 UIModeControlContainer.this.add(sheetInvisibleCoverPane);
                 UIModeControlContainer.this.setLayer(sheetInvisibleCoverPane, 2);
                 sheetInvisibleCoverPane.setVisible(true);

designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java

@@ -452,21 +452,6 @@ public class UIResizableContainer extends JPanel {
                     repaint();
                 }
 
-                @Override
-                public void mouseClicked(MouseEvent e) {
-                    if (e.getY() <= ARROW_RANGE_VERTICAL) {
-                        if (containerWidth == toolPaneHeight) {
-                            containerWidth = preferredWidth;
-                        } else {
-                            setPreferredWidth(containerWidth);
-                            containerWidth = toolPaneHeight;
-                        }
-                        refreshContainer();
-                        if (DesignModeContext.isAuthorityEditing()) {
-                            DesignerContext.getDesignerFrame().doResize();
-                        }
-                    }
-                }
             });
         }
 

designer-base/src/main/java/com/fr/design/gui/ilist/CheckBoxList.java

@@ -256,13 +256,6 @@ public class CheckBoxList extends JComponent {
                 this.setBackground(list.getBackground());
                 this.setForeground(list.getForeground());
             }
-
-            if (cellHasFocus) {
-                this.setBorder(UIManager.getBorder("List.focusCellHighlightBorder"));
-            } else {
-                this.setBorder(NO_FOCUS_BORDER);
-            }
-
             return this;
         }
     }

designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java

@@ -15,7 +15,6 @@ import java.awt.CardLayout;
 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.row;
 import static com.fine.swing.ui.layout.Layouts.cell;
 
@@ -37,7 +36,7 @@ public class ReportletPane extends BasicPane {
         UILabel tipLabel = new UILabel();
         tipLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Schedule_The_Selected_File_Must_Be_End_With_Filter"));
         tipLabel.setForeground(FineUIUtils.getUIColor("Label.tipColor", "Label.tipColor"));
-        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel centerPane = new JPanel(FRGUIPaneFactory.createScaledBorderLayout(0, 6));
         this.add(centerPane, BorderLayout.CENTER);
 
         switchButton = new UIButton("switch");
@@ -53,13 +52,14 @@ public class ReportletPane extends BasicPane {
         cardPane.setLayout(card = new CardLayout());
         templateReportletTree = new TemplateFileTree();
         templateReportletTree.setBackground(FineUIUtils.getUIColor("background.normal", "background.normal"));
-        templateReportletTree.setBorder(FineBorderFactory.createWrappedRoundBorder());
         IOFileNodeFilter filter = new IOFileNodeFilter(new String[]{".cpt", ".class", ".frm", ".form", ".cptx"});
         templateReportletTree.setFileNodeFilter(filter);
         cardPane.add(t_panel = new JScrollPane(templateReportletTree), "TEMPLATE");
         classReportletTree = new ClassFileTree();
         cardPane.add(c_panel = new JScrollPane(classReportletTree), "CLASS");
-        centerPane.add(column(6, cell(buttonPane), cell(cardPane)).getComponent());
+        cardPane.setBorder(FineBorderFactory.createWrappedRoundBorder());
+        centerPane.add(buttonPane, BorderLayout.NORTH);
+        centerPane.add(cardPane, BorderLayout.CENTER);
         this.refreshEnv();
     }
 

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

@@ -4,7 +4,7 @@ package com.fr.design.gui.style;
  * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved.
  */
 
-import com.fine.swing.ui.layout.Layouts;
+import com.fine.swing.ui.layout.Row;
 import com.fine.theme.icon.LazyIcon;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.base.BaseUtils;
@@ -15,7 +15,6 @@ import com.fr.design.event.GlobalNameListener;
 import com.fr.design.event.GlobalNameObserver;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.fun.IndentationUnitProcessor;
-import com.fr.design.gui.core.ReactiveCardPane;
 import com.fr.design.gui.frpane.UINumberDragPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -25,7 +24,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.event.EventDispatcher;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.IOUtils;
 import com.fr.plugin.ExtraClassManager;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.manage.PluginFilter;
@@ -46,9 +44,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 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.flex;
 import static com.fine.swing.ui.layout.Layouts.fix;
+import static com.fine.swing.ui.layout.Layouts.flex;
+import static com.fine.swing.ui.layout.Layouts.row;
 
 /**
  * Pane to edit cell alignment.
@@ -61,7 +60,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     private static final String[] LAYOUT = {Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Default"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Titled"),
             Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Extend"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Adjust")};
 
-    private ReactiveCardPane rotationBarPane;
+    private JPanel rotationBarPane;
 
     private UIComboBox textComboBox;
     private UIComboBox textRotationComboBox;
@@ -91,7 +90,6 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         imageLayoutComboBox = new UIComboBox(LAYOUT);
         initTextRotationComboBox();
 
-        // todo: 换新图标及反白问题
         Icon[][] hAlignmentIconArray = {{new LazyIcon("h_left"), new LazyIcon("h_left").white()},
                 {new LazyIcon("h_center"), new LazyIcon("h_center").white()},
                 {new LazyIcon("h_right"), new LazyIcon("h_right").white()},
@@ -177,7 +175,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     private JPanel createPane() {
         JPanel basicPane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Basic"), 290, 24, basicPane());
         JPanel seniorPane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Basic_Advanced"), 290, 24, seniorPane());
-        return Layouts.column(
+        return column(
                 cell(basicPane),
                 fix(1).with(it -> it.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("defaultBorderColor")))),
                 cell(seniorPane)
@@ -189,7 +187,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         UILabel verticalLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical") + "   ", SwingConstants.LEFT);
         UIComponentUtils.setLineWrap(horizontalLabel);
         UIComponentUtils.setLineWrap(verticalLabel);
-        return Layouts.column(LayoutConstants.VERTICAL_GAP,
+        return column(LayoutConstants.VERTICAL_GAP,
                 row(
                         cell(horizontalLabel).weight(1.2),
                         cell(hAlignmentPane).weight(3)),
@@ -201,7 +199,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     }
 
     private JPanel seniorPane() {
-        return Layouts.column(LayoutConstants.VERTICAL_GAP,
+        return column(LayoutConstants.VERTICAL_GAP,
                 cell(seniorUpPane()),
                 cell(seniorMiddlePane()),
                 cell(seniorDownPane())
@@ -210,7 +208,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     }
 
     private JPanel seniorUpPane() {
-        return Layouts.column(LayoutConstants.VERTICAL_GAP,
+        return column(LayoutConstants.VERTICAL_GAP,
                 row(
                         cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Image_Layout"), SwingConstants.LEFT))
                                 .with(it -> it.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Image_Layout"))).weight(1.2),
@@ -224,28 +222,19 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     }
 
     private JPanel seniorMiddlePane() {
-        rotationBarPane = ReactiveCardPane.create()
+        Row rotationRow = row(flex(1.2),cell(rotationPane).weight(3)).getComponent();
-                .addSupplier("hide", () -> Layouts.row(
+
-                        cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"), SwingConstants.LEFT))
+        rotationBarPane = column(10,
-                                .with(it -> it.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"))).weight(1.2),
-                        cell(textRotationComboBox).weight(3)
-                ).getComponent())
-                .addSupplier("show", () -> Layouts.column(LayoutConstants.VERTICAL_GAP,
                 row(
                         cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"), SwingConstants.LEFT))
                                 .with(it -> it.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"))).weight(1.2),
                         cell(textRotationComboBox).weight(3)
                 ),
-                        row(
+                cell(rotationRow)
-                                flex(1.2),
+        ).getComponent();
-                                cell(rotationPane).weight(3)
-                        )
-                ).getComponent());
-        rotationBarPane.select("show").populate();
 
         textRotationComboBox.addItemListener(e -> {
-            String key = (textRotationComboBox.getSelectedIndex() == 0) ? "show" : "hide";
+            rotationRow.setVisible(textRotationComboBox.getSelectedIndex() == 0);
-            rotationBarPane.select(key).populate();
         });
         return rotationBarPane;
     }
@@ -257,7 +246,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         partSpacingLabel.setToolTipText(partSpacingLabel.getText());
         UILabel spacingLabel = new UILabel((Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing")), SwingConstants.LEFT);
         spacingLabel.setToolTipText(spacingLabel.getText());
-        return Layouts.column(
+        return column(
                 row(
                         cell(indentationLabel).weight(1.2),
                         cell(leftIndentSpinner).weight(1.4),

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

@@ -45,7 +45,7 @@ public class MobilePopupRegularPane extends BasicPane {
         spinnerGroupPane = this.createSpinnerPane();
         this.add(column(LayoutConstants.VERTICAL_GAP,
                 cell(this.createRadioButtonGroupPane()),
-                row(flex(1), cell(spinnerGroupPane).weight(3))
+                row(flex(1.5), cell(spinnerGroupPane).weight(3))
         ).getComponent());
     }
 
@@ -62,7 +62,7 @@ public class MobilePopupRegularPane extends BasicPane {
         radioButtons.add(autoRadio);
 
         radiosPane.add(row(30, cell(customRadio), cell(autoRadio), flex()).getComponent());
-        return row(cell(new UILabel(this.label, FineUIStyle.LABEL_SECONDARY)).weight(1), cell(radiosPane).weight(3)).getComponent();
+        return row(cell(new UILabel(this.label, FineUIStyle.LABEL_SECONDARY)).weight(1.5), cell(radiosPane).weight(3)).getComponent();
     }
 
     private ActionListener radioActionListener = new ActionListener() {

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

@@ -83,9 +83,9 @@ public class StyleSettingPane extends BasicBeanPane<MobilePopupHyperlink> {
         UILabel borderLabel = new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Border"));
 
         borderPane.add(column(LayoutConstants.VERTICAL_GAP,
-                row(cell(borderLabel).weight(1), cell(new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Line"), FineUIStyle.LABEL_SECONDARY)).weight(1), cell(borderType).weight(2), flex(3)),
+                row(cell(borderLabel).weight(1), cell(new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Line"), FineUIStyle.LABEL_SECONDARY)).weight(1.5), cell(borderType).weight(2), flex(2.5)),
-                row(flex(1), cell(new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Colors"), FineUIStyle.LABEL_SECONDARY)).weight(1), cell(borderColor).weight(2), flex(3)),
+                row(flex(1), cell(new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Colors"), FineUIStyle.LABEL_SECONDARY)).weight(1.5), cell(borderColor).weight(2), flex(2.5)),
-                row(flex(1), cell(new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Radius"), FineUIStyle.LABEL_SECONDARY)).weight(1), cell(borderRadiusSpinner).weight(2), flex(3))
+                row(flex(1), cell(new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Radius"), FineUIStyle.LABEL_SECONDARY)).weight(1.5), cell(borderRadiusSpinner).weight(2), flex(2.5))
         ).getComponent());
         return borderPane;
     }
@@ -102,8 +102,8 @@ public class StyleSettingPane extends BasicBeanPane<MobilePopupHyperlink> {
         JLabel bgLabel = new JLabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Background"));
 
         bgPane.add(column(LayoutConstants.VERTICAL_GAP,
-                row(cell(bgLabel).weight(1), cell(new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Colors"), FineUIStyle.LABEL_SECONDARY)).weight(1), cell(bgColor).weight(2), flex(3)),
+                row(cell(bgLabel).weight(1), cell(new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Colors"), FineUIStyle.LABEL_SECONDARY)).weight(1.5), cell(bgColor).weight(2), flex(2.5)),
-                row(flex(1), cell(new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Opacity"), FineUIStyle.LABEL_SECONDARY)).weight(1), cell(transparencyPane).weight(3), flex(2))
+                row(flex(1), cell(new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Opacity"), FineUIStyle.LABEL_SECONDARY)).weight(1.5), cell(transparencyPane).weight(3), flex(1.5))
         ).getComponent());
         return bgPane;
     }
@@ -117,9 +117,9 @@ public class StyleSettingPane extends BasicBeanPane<MobilePopupHyperlink> {
         sizePane.add(column(LayoutConstants.VERTICAL_GAP,
                 row(
                         column(LayoutConstants.VERTICAL_GAP, cell(sizeLabel), flex()).weight(1),
-                        cell(mobileRegularPane).weight(4), flex(2)
+                        cell(mobileRegularPane).weight(4.5), flex(1.5)
                 ),
-                row(flex(1), cell(padRegularPane).weight(4), flex(2))
+                row(flex(1), cell(padRegularPane).weight(4.5), flex(1.5))
         ).getComponent());
         return sizePane;
     }

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

@@ -1,6 +1,7 @@
 package com.fr.design.javascript;
 
 import com.fine.theme.icon.LazyIcon;
+import com.fine.theme.utils.FineUIScale;
 import com.fine.theme.utils.FineUIUtils;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.design.DesignerEnvManager;
@@ -187,6 +188,7 @@ public class JSContentPane extends BasicPane {
         JPanel jsParaPane = new JPanel(new BorderLayout());
         funNameLabel.setBackground(FineUIUtils.getUIColor("background.normal", "background.normal"));
         UIScrollPane scrollPane = new UIScrollPane(funNameLabel);
+        scrollPane.setPreferredSize(new Dimension(super.getPreferredSize().width, FineUIScale.scale(80)));
         scrollPane.setOpaque(true);
         jsParaPane.add(row(4,
                 cell(scrollPane).weight(1),

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

@@ -762,7 +762,7 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
     private JPanel createTipsPane() {
         JPanel tipsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         tipsPane.setLayout(new BorderLayout(4, 4));
-        tipsPane.setBorder(BorderFactory.createEmptyBorder(30, 2, 0, 0));
+        tipsPane.setBorder(new ScaledEmptyBorder(30, 2, 0, 0));
         JPanel searchPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         searchPane.setLayout(new BorderLayout(4, 4));
         keyWordTextField.setPlaceholder(Toolkit.i18nText("Fine-Design_Search_Interface"));

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

@@ -30,6 +30,7 @@ import java.util.List;
 
 import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.theme.utils.FineUIScale.scale;
 
 public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
     private static final int BOTTOM_BORDER = 12;
@@ -73,7 +74,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
                 cell(FineUIUtils.wrapComponentWithTitle(importedJsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"))).weight(0.5),
                 cell(FineUIUtils.wrapComponentWithTitle(parameterPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))).weight(0.5)
         ).getComponent());
-        topPane.setPreferredSize(new Dimension(super.getPreferredSize().width, 150));
+        topPane.setPreferredSize(new Dimension(super.getPreferredSize().width, scale(150)));
 
         this.setLayout(new BorderLayout());
         this.add(topPane, BorderLayout.NORTH);

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

@@ -342,6 +342,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         renameAction.setEnabled(false);
         delFileAction.setEnabled(false);
         vcsAction.setEnabled(false);
+        this.revalidate();
         this.repaint();
     }
 

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

@@ -1041,6 +1041,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 button.setIcon(new LazyIcon(getBtnIconId(), ICON_WIDTH));
                 button.setDisabledIcon(new LazyIcon(btnIconName + ICON_SUFFIX_DISABLED, ICON_WIDTH));
             } else {
+                iconSuffix = ICON_SUFFIX_NORMAL_DEPRECATED;
                 button.setIcon(IconUtils.readIcon(getBtnIconUrl()));
                 button.setDisabledIcon(IconUtils.readIcon(getIconBaseDir() + btnIconName + ICON_SUFFIX_DISABLED_DEPRECATED));
             }

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

@@ -115,7 +115,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<ThemedCellStyl
 
     private static class RadioButtonListCellRangeRenderer extends JPanel implements ListCellRenderer<ThemedCellStyle>, Serializable {
 
-        private static final Icon SELECTEDMARK_ICON = new LazyIcon("selectedMark");
+        private static final Icon SELECTEDMARK_ICON = new LazyIcon("selectedMark", 32);
         private final CellRectangleStylePreviewPane previewArea;
         private boolean selected = false;
 

designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleBackgroundEditor.java

@@ -7,6 +7,7 @@ import java.awt.*;
 
 import javax.swing.*;
 
+import com.fine.theme.utils.FineUIScale;
 import com.fr.general.Background;
 import com.fr.design.mainframe.widget.wrappers.BackgroundWrapper;
 import com.fr.design.dialog.BasicDialog;
@@ -29,7 +30,7 @@ public class AccessibleBackgroundEditor extends UneditableAccessibleEditor {
     protected void showEditorPane() {
         if (backgroundPane == null) {
             backgroundPane = new BackgroundPane();
-            backgroundPane.setPreferredSize(new Dimension(600, 400));
+            backgroundPane.setPreferredSize(FineUIScale.createScaleDimension(600, 400));
         }
         BasicDialog dlg = backgroundPane.showWindow(SwingUtilities.getWindowAncestor(this));
         dlg.addDialogActionListener(new DialogActionAdapter() {

designer-base/src/main/java/com/fr/design/remote/ui/debug/HeaderRenderer.java

@@ -0,0 +1,52 @@
+package com.fr.design.remote.ui.debug;
+
+import com.fine.theme.icon.LazyIcon;
+import com.fine.theme.light.ui.FineTableHeaderUI;
+
+import javax.swing.Icon;
+import javax.swing.JTable;
+import javax.swing.RowSorter;
+import javax.swing.SortOrder;
+import java.awt.Component;
+
+/**
+ * 远程调试界面表头
+ *
+ * @author vito
+ * @since 11.0
+ * Created on 2024/10/17
+ */
+public class HeaderRenderer extends FineTableHeaderUI.TableHeaderRenderer {
+    private final Icon ascendingIcon = new LazyIcon("sort_asc");
+    private final Icon descendingIcon = new LazyIcon("sort_desc");
+    private final Icon nosortIcon = new LazyIcon("nosort");
+
+
+    @Override
+    public Component getTableCellRendererComponent(JTable table, Object value,
+                                                   boolean isSelected, boolean hasFocus,
+                                                   int row, int col) {
+        super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, col);
+
+        int modelColumn = table.convertColumnIndexToModel(col);
+        setIcon(null);
+        RemoteDesignNetWorkTableRowSorter sorter = (RemoteDesignNetWorkTableRowSorter) table.getRowSorter();
+
+        if (!sorter.isSortable(modelColumn)) {
+            return this;
+        }
+        SortOrder sortOrder = sorter.getSortKeys().stream()
+                .filter(key -> key.getColumn() == modelColumn)
+                .map(RowSorter.SortKey::getSortOrder)
+                .findFirst()
+                .orElse(null);
+        if (sortOrder == SortOrder.ASCENDING) {
+            setIcon(ascendingIcon);
+        } else if (sortOrder == SortOrder.DESCENDING) {
+            setIcon(descendingIcon);
+        } else {
+            setIcon(nosortIcon);
+        }
+        return this;
+    }
+}

designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkAction.java

@@ -8,13 +8,16 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.workspace.WorkContext;
 
 import javax.swing.JDialog;
+import javax.swing.KeyStroke;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
 import static com.fine.theme.utils.FineUIScale.createScaleDimension;
 import static com.fine.theme.utils.FineUIScale.unscale;
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
 /**
  * 远程设计网络调试
@@ -27,7 +30,8 @@ public class RemoteDesignNetWorkAction extends UpdateAction {
     public static final String TITLE = "Remote Design NetWork";
 
     public RemoteDesignNetWorkAction() {
-        setName(TITLE);
+        this.setName(TITLE);
+        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R, DEFAULT_MODIFIER));
     }
 
     @Override

designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkHelper.java

@@ -0,0 +1,88 @@
+package com.fr.design.remote.ui.debug;
+
+import com.fr.stable.StringUtils;
+
+import javax.swing.UIManager;
+import java.awt.Color;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 帮助类
+ *
+ * @author vito
+ * @since 11.0
+ * Created on 2024/10/11
+ */
+public class RemoteDesignNetWorkHelper {
+
+    static final Color DEFAULT_COLOR = UIManager.getColor("Table.foreground");
+
+    private static final int UNIT = 1000;
+    private static final int UNIT_BYTES = 1024;
+    private static final String SECOND = "s";
+    private static final int K = 1024;
+    private static final int MS = 1000;
+
+    static String dateFormat(Date date) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+        return dateFormat.format(date);
+    }
+
+    static String simpleTime(long time) {
+        if (time < 0) {
+            return time + "";
+        } else if (time < MS) {
+            return time + " ms";
+        } else {
+            DecimalFormat df = new DecimalFormat("#.0");
+            return df.format((float) time / MS) + " s";
+        }
+    }
+
+    static String simpleSize(long bytes) {
+        if (bytes < 0) {
+            return bytes + "";
+        } else if (bytes < K) {
+            return bytes + " B";
+        } else {
+            DecimalFormat df = new DecimalFormat("#.00");
+            return df.format((float) bytes / K) + " K";
+        }
+    }
+
+    static long parseCostToMS(String timeStr) {
+        String[] split = timeStr.split(" ");
+        if (split.length > 1) {
+            double number = Double.parseDouble(split[0]);
+            String unit = split[1].toLowerCase();
+
+            if (StringUtils.equals(unit, SECOND)) {
+                return (long) (number * UNIT);
+            }
+            return (long) number;
+        }
+        return 0;
+    }
+
+    static long parseSizeToBytes(String sizeStr) {
+        String[] split = sizeStr.split(" ");
+        if (split.length > 1) {
+            double number = Double.parseDouble(split[0]);
+            String unit = split[1].toUpperCase();
+
+            switch (unit) {
+                case "K":
+                    return (long) (number * UNIT_BYTES);
+                case "M":
+                    return (long) (number * UNIT_BYTES * UNIT_BYTES);
+                case "G":
+                    return (long) (number * UNIT_BYTES * UNIT_BYTES * UNIT_BYTES);
+                default:
+                    return (long) number;
+            }
+        }
+        return 0;
+    }
+}

designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java

@@ -4,6 +4,7 @@ import com.fanruan.workplace.http.debug.RequestInfo;
 import com.fine.theme.icon.LazyIcon;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
@@ -13,17 +14,19 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
 import javax.swing.border.EmptyBorder;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.text.DecimalFormat;
+import java.util.concurrent.atomic.AtomicLong;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
 import static com.fanruan.workplace.http.debug.RemoteDesignDebugEvent.REMOTE_HTTP_REQUEST;
+import static com.fr.design.remote.ui.debug.RemoteDesignNetWorkHelper.dateFormat;
+import static com.fr.design.remote.ui.debug.RemoteDesignNetWorkHelper.simpleSize;
+import static com.fr.design.remote.ui.debug.RemoteDesignNetWorkHelper.simpleTime;
 
 /**
  * 远程设计网络调试面板
@@ -33,25 +36,29 @@ import static com.fanruan.workplace.http.debug.RemoteDesignDebugEvent.REMOTE_HTT
  * Created on 2024/9/24
  */
 public class RemoteDesignNetWorkTablePane extends JPanel {
-    private static final int K = 1024;
     private static final int TWO = 2;
     private JTable uiTable;
     private DefaultTableModel model;
+    private final AtomicLong count = new AtomicLong(0);
+    private boolean scrollRectToVisible = false;
 
     private final Listener<RequestInfo> remoteDesignDebugListener = new Listener<RequestInfo>() {
         @Override
         public void on(Event event, RequestInfo requestInfo) {
+            SwingUtilities.invokeLater(() -> {
                 model.addRow(new Object[]{
-                    requestInfo.getStatus(),
+                        count.incrementAndGet(),
                         dateFormat(requestInfo.getDate()),
                         requestInfo.getPath().substring(WorkContext.getCurrent().getPath().length() - 1),
-                    requestInfo.getConsume() + "ms",
+                        requestInfo.getStatus(),
+                        simpleTime(requestInfo.getConsume()),
                         simpleSize(requestInfo.getRequestSize()),
                         simpleSize(requestInfo.getResponseSize()),
                         requestInfo.getSendBody(),
                         requestInfo.getReturnBody(),
                 });
                 adjustColumnWidths(uiTable);
+            });
         }
     };
 
@@ -69,15 +76,21 @@ public class RemoteDesignNetWorkTablePane extends JPanel {
 
     private void initTable() {
         model = new DefaultTableModel();
-        model.addColumn("status");
+        model.addColumn("No.");
         model.addColumn("time");
         model.addColumn("path");
+        model.addColumn("status");
         model.addColumn("cost");
         model.addColumn("request size");
         model.addColumn("response size");
         model.addColumn("request");
         model.addColumn("response");
         uiTable = new JTable(model);
+        uiTable.getColumnModel().getColumn(4).setCellRenderer(new TimeColorCellRenderer());
+        uiTable.getColumnModel().getColumn(5).setCellRenderer(new SizeColorCellRenderer());
+        uiTable.getColumnModel().getColumn(6).setCellRenderer(new SizeColorCellRenderer());
+        uiTable.setRowSorter(new RemoteDesignNetWorkTableRowSorter(model));
+        uiTable.getTableHeader().setDefaultRenderer(new HeaderRenderer());
         add(new JScrollPane(uiTable), BorderLayout.CENTER);
     }
 
@@ -86,7 +99,8 @@ public class RemoteDesignNetWorkTablePane extends JPanel {
         jToolBar.setBorder(new EmptyBorder(5, 0, 10, 0));
         UIButton run = new UIButton(new LazyIcon("run"));
         UIButton forbid = new UIButton(new LazyIcon("forbid"));
-        UIButton refresh = new UIButton(new LazyIcon("remove"));
+        UIButton remove = new UIButton(new LazyIcon("remove"));
+        UIToggleButton refresh = new UIToggleButton(new LazyIcon("refresh"));
         run.setEnabled(false);
         run.setToolTipText("Start Record");
         run.addActionListener(e -> {
@@ -100,10 +114,16 @@ public class RemoteDesignNetWorkTablePane extends JPanel {
             run.setEnabled(true);
             forbid.setEnabled(false);
         });
-        refresh.setToolTipText("Clear Records");
+        remove.setToolTipText("Clear Records");
-        refresh.addActionListener(e -> model.setRowCount(0));
+        remove.addActionListener(e -> {
+            model.setRowCount(0);
+            count.set(0);
+        });
+        refresh.setToolTipText("Always Scroll To Visible");
+        refresh.addChangeListener(e -> scrollRectToVisible = !scrollRectToVisible);
         jToolBar.add(run);
         jToolBar.add(forbid);
+        jToolBar.add(remove);
         jToolBar.add(refresh);
         add(jToolBar, BorderLayout.NORTH);
     }
@@ -120,35 +140,22 @@ public class RemoteDesignNetWorkTablePane extends JPanel {
         EventDispatcher.listen(REMOTE_HTTP_REQUEST, remoteDesignDebugListener);
     }
 
-    private static void adjustColumnWidths(JTable table) {
+    private void adjustColumnWidths(JTable table) {
+        int row = table.getRowCount() - 1;
+        // 从最后一行来调整大小
         for (int column = 0; column < table.getColumnCount() - TWO; column++) {
             TableColumn tableColumn = table.getColumnModel().getColumn(column);
             int preferredWidth = 20;
             int maxWidth = tableColumn.getMaxWidth();
             tableColumn.setMinWidth(0);
-            // 从最后一行来调整大小
-            int row = table.getRowCount() - 1;
             TableCellRenderer cellRenderer = table.getCellRenderer(row, column);
             Component component = table.prepareRenderer(cellRenderer, row, column);
             int width = component.getPreferredSize().width + table.getIntercellSpacing().width;
             preferredWidth = Math.max(preferredWidth, Math.min(width, maxWidth));
             tableColumn.setPreferredWidth(preferredWidth);
         }
-    }
+        if (scrollRectToVisible) {
-
+            table.scrollRectToVisible(table.getCellRect(row, 0, true));
-    private static String dateFormat(Date date) {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        return dateFormat.format(date);
-    }
-
-    private static String simpleSize(long bytes) {
-        if (bytes < 0) {
-            return bytes + "";
-        } else if (bytes < K) {
-            return bytes + " B";
-        } else {
-            DecimalFormat df = new DecimalFormat("#.00");
-            return df.format((float) bytes / K) + " K";
         }
     }
 

designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTableRowSorter.java

@@ -0,0 +1,33 @@
+package com.fr.design.remote.ui.debug;
+
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableRowSorter;
+import java.util.Comparator;
+
+/**
+ * 行排序器
+ *
+ * @author vito
+ * @since 11.0
+ * Created on 2024/10/11
+ */
+public class RemoteDesignNetWorkTableRowSorter extends TableRowSorter<DefaultTableModel> {
+
+    public RemoteDesignNetWorkTableRowSorter(DefaultTableModel model) {
+        super(model);
+        setComparator(0, (Comparator<Long>) Long::compareTo);
+        setComparator(4, Comparator.comparingLong(RemoteDesignNetWorkHelper::parseCostToMS));
+        setComparator(5, Comparator.comparingLong(RemoteDesignNetWorkHelper::parseSizeToBytes));
+        setComparator(6, Comparator.comparingLong(RemoteDesignNetWorkHelper::parseSizeToBytes));
+        setMaxSortKeys(1);
+    }
+
+    @Override
+    public boolean isSortable(int column) {
+        return column == 0
+                || column == 4
+                || column == 5
+                || column == 6;
+    }
+
+}

designer-base/src/main/java/com/fr/design/remote/ui/debug/SizeColorCellRenderer.java

@@ -0,0 +1,37 @@
+package com.fr.design.remote.ui.debug;
+
+import com.fine.theme.light.ui.FineTableHeaderUI;
+
+import java.awt.Color;
+
+import static com.fr.design.remote.ui.debug.RemoteDesignNetWorkHelper.DEFAULT_COLOR;
+
+/**
+ * 大小多颜色渲染
+ *
+ * @author vito
+ * @since 11.0
+ * Created on 2024/10/16
+ */
+public class SizeColorCellRenderer extends FineTableHeaderUI.TableRenderer {
+    private static final int UNIT_BYTES = 1024;
+    private static final int SIZE_MIDDLE = UNIT_BYTES * 100;
+    private static final int SIZE_LARGE = UNIT_BYTES * 200;
+
+
+    @Override
+    protected void setValue(Object value) {
+
+        if (value instanceof String) {
+            long parsed = RemoteDesignNetWorkHelper.parseSizeToBytes((String) value);
+            if (parsed > SIZE_LARGE) {
+                setForeground(Color.RED);
+            } else if (parsed > SIZE_MIDDLE) {
+                setForeground(Color.ORANGE);
+            } else {
+                setForeground(DEFAULT_COLOR);
+            }
+        }
+        setText((value == null) ? "" : value.toString());
+    }
+}

designer-base/src/main/java/com/fr/design/remote/ui/debug/TimeColorCellRenderer.java

@@ -0,0 +1,38 @@
+package com.fr.design.remote.ui.debug;
+
+import com.fine.theme.light.ui.FineTableHeaderUI;
+
+import java.awt.Color;
+
+import static com.fr.design.remote.ui.debug.RemoteDesignNetWorkHelper.DEFAULT_COLOR;
+
+/**
+ * 时间多颜色渲染
+ *
+ * @author vito
+ * @since 11.0
+ * Created on 2024/10/16
+ */
+public class TimeColorCellRenderer extends FineTableHeaderUI.TableRenderer {
+
+    private static final int SIZE_MIDDLE = 1000;
+    private static final int SIZE_LARGE = 5000;
+
+
+
+    @Override
+    protected void setValue(Object value) {
+
+        if (value instanceof String) {
+            long parsed = RemoteDesignNetWorkHelper.parseCostToMS((String) value);
+            if (parsed > SIZE_LARGE) {
+                setForeground(Color.RED);
+            } else if (parsed > SIZE_MIDDLE) {
+                setForeground(Color.ORANGE);
+            } else {
+                setForeground(DEFAULT_COLOR);
+            }
+        }
+        setText((value == null) ? "" : value.toString());
+    }
+}

designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java

@@ -109,7 +109,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
                 cell(scrollPane).weight(1)
         ).getComponent());
         this.add(jPanel, BorderLayout.CENTER);
-        jPanel.setBorder(new ScaledEmptyBorder(0, 4, 4, 4));
+        jPanel.setBorder(new ScaledEmptyBorder(0, 12, 4, 4));
         registerDSChangeListener();
     }
 

designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java

@@ -92,6 +92,7 @@ public class BackgroundPane extends BasicPane {
             quickPane = BackgroundFactory.createIfAbsent(background == null ? null : background.getClass());
             cacheMap.put(index, quickPane);
         }
+        tabbedPane.setSelectedIndex(index);
         return quickPane;
     }
 

designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java

@@ -1,20 +1,15 @@
 package com.fr.design.style.background.impl;
 
-import com.fine.theme.utils.FineUIScale;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.style.background.BackgroundDetailPane;
 import com.fr.general.Background;
-import com.fr.general.locale.image.I18nImage;
 
 
 import javax.swing.*;
 import javax.swing.event.ChangeListener;
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Image;
 
 import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
@@ -25,23 +20,14 @@ import static com.fine.swing.ui.layout.Layouts.flex;
  */
 public class NullBackgroundPane extends BackgroundDetailPane {
 
-    private static final String NULL_BACKGROUND = "/com/fr/design/images/background/null_background.png";
-    private static final Image DEFAULT_NULL_BACKGROUND_IMAGE;
-
-    static {
-        DEFAULT_NULL_BACKGROUND_IMAGE = I18nImage.getImage(NULL_BACKGROUND);
-    }
-
     public NullBackgroundPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
 
         UILabel centerLabel = new UILabel(
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Background_Is_Null"));
-        ImagePanel imagePane = new ImagePanel();
         JPanel pane = column(
                 10,
                 flex(),
-                cell(imagePane),
                 cell(centerLabel),
                 flex()
         ).getComponent();
@@ -60,30 +46,4 @@ public class NullBackgroundPane extends BackgroundDetailPane {
     public void addChangeListener(ChangeListener changeListener) {
         // do nothing.
     }
-
-    /**
-     * 水平居中绘制 Image
-     */
-    public class ImagePanel extends JPanel {
-
-        public ImagePanel() {
-        }
-
-        @Override
-        public void paintComponent(Graphics g) {
-            super.paintComponent(g);
-            if (DEFAULT_NULL_BACKGROUND_IMAGE != null) {
-                int x = (this.getWidth() - DEFAULT_NULL_BACKGROUND_IMAGE.getWidth(null)) / 2;
-                g.drawImage(DEFAULT_NULL_BACKGROUND_IMAGE, x, 0, this);
-            }
-        }
-
-        @Override
-        public Dimension getPreferredSize() {
-            if (DEFAULT_NULL_BACKGROUND_IMAGE == null) {
-                return super.getPreferredSize();
-            }
-            return FineUIScale.scale(new Dimension(DEFAULT_NULL_BACKGROUND_IMAGE.getWidth(null), DEFAULT_NULL_BACKGROUND_IMAGE.getHeight(null)));
-        }
-    }
 }

designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

@@ -267,7 +267,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 
 
     private void initMenuColorPane() {
-        menuColorPane.setLayout(new GridLayout(5, 8, DEFAULT_COLOR_HOR_INTERVAL, 0));
+        menuColorPane.setLayout(new GridLayout(4, 10, DEFAULT_COLOR_HOR_INTERVAL, 0));
         Color[] colorArray = this.getColorArray();
         for (int i = 0; i < colorArray.length; i++) {
             Color color = colorArray[i] == null ? UsedColorPane.DEFAULT_COLOR : colorArray[i];
@@ -462,7 +462,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
             int size = colors.length;
             for (int i = 1; i <= total; i++) {
                 ColorCell cell = (ColorCell) this.pane.getComponent(i);
-                Color color = i < size ? colors[size - i - 1] : UsedColorPane.DEFAULT_COLOR;
+                Color color = i <= size ? colors[size - i] : UsedColorPane.DEFAULT_COLOR;
                 cell.setColor(color == null ? UsedColorPane.DEFAULT_COLOR : color);
             }
         }

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

@@ -23,6 +23,8 @@ import java.awt.event.ActionListener;
 
 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.flex;
 
 
 public class IconDefinePane extends BasicPane {
@@ -66,8 +68,9 @@ public class IconDefinePane extends BasicPane {
                 showIconImageLable.setIcon(null);
             }
         });
-
+        JPanel iconButtonPane = row(LayoutConstants.HORIZONTAL_GAP, cell(this.showIconImageLable),
-        JPanel iconButtonPane = row(LayoutConstants.HORIZONTAL_GAP, cell(this.showIconImageLable), cell(this.editIconButton), cell(this.removeIconButton)).getComponent();
+                column(flex(), row(LayoutConstants.HORIZONTAL_GAP, cell(this.editIconButton), cell(this.removeIconButton)), flex())
+        ).getComponent();
         iconButtonPane.setBorder(new ScaledEmptyBorder(0,0,0,0));
         this.setLayout(new BorderLayout());
         this.add(iconButtonPane, BorderLayout.CENTER);
@@ -92,16 +95,6 @@ public class IconDefinePane extends BasicPane {
         setShowIconImage();
     }
 
-    /**
-     * 直接更新icon
-     * @param iconName
-     * @param icon
-     */
-    public void populateIcon(String iconName, Icon icon) {
-        this.curIconName = iconName;
-        showIconImageLable.setIcon(icon);
-    }
-
     public String update() {
         return this.curIconName;
     }

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

@@ -1,5 +1,6 @@
 package com.fr.design.widget.component;
 
+import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
@@ -12,7 +13,6 @@ import javax.swing.JPanel;
 
 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.flex;
 import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fr.design.constants.LayoutConstants.LEFT_WEIGHT;
 import static com.fr.design.constants.LayoutConstants.RIGHT_WEIGHT;
@@ -40,26 +40,24 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
         backgroundHead = new UIButtonGroup(titles);
         panel = column(VERTICAL_GAP,
                 row(
-                        flex(LEFT_WEIGHT),
                         cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial"))).weight(RIGHT_WEIGHT / 2),
                         cell(initialBackgroundEditor).weight(RIGHT_WEIGHT / 2)
                 ),
                 row(
-                        flex(LEFT_WEIGHT),
                         cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Over"))).weight(RIGHT_WEIGHT / 2),
                         cell(overBackgroundEditor).weight(RIGHT_WEIGHT / 2)
                 ),
                 row(
-                        flex(LEFT_WEIGHT),
                         cell(getClickLabel()).weight(RIGHT_WEIGHT / 2),
                         cell(clickBackgroundEditor).weight(RIGHT_WEIGHT / 2)
                 )
-        ).getComponent();
+        ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 10, 0, 0))).getComponent();
         this.add(column(VERTICAL_GAP,
                 row(
                         cell(headLabel).weight(LEFT_WEIGHT),
                         cell(backgroundHead).weight(RIGHT_WEIGHT)
-                )
+                ),
+                cell(panel)
         ).getComponent());
 
     }

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

@@ -238,8 +238,8 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
                 }
             });
             helpButton.set4ToolbarButton();
-            buttonGroup.add(row(5, cell(UpdateCheckBox),
+            checkBoxUpdatePane.add(row(5, cell(UpdateCheckBox), cell(helpButton)).getComponent());
-                    cell(helpButton)));
+            buttonGroup.add(cell(checkBoxUpdatePane));
             controlBtnPane.add(column(5, buttonGroup.toArray(new Layouts.Cell[0])).getComponent());
         }
     }
@@ -733,7 +733,6 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 
         // 设置column1的editor
         columnsComboBox = new UIComboBox(new DefaultComboBoxModel());
-
         columnsComboBox.setRenderer(new UIComboBoxRenderer() {
 
             @Override
@@ -754,7 +753,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
                 return super.stopCellEditing();
             }
         });
-        ((DefaultCellEditor) column1.getCellEditor()).setClickCountToStart(1);
+        ((DefaultCellEditor) column1.getCellEditor()).setClickCountToStart(2);
 
         //设置Column 2的Editor
         column2.setCellEditor(new ColumnValueEditor());
@@ -963,12 +962,12 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
         }
 
         /*
-         * 单击以编辑
+         * 双击以编辑
          */
         @Override
         public boolean isCellEditable(EventObject anEvent) {
             if (anEvent instanceof MouseEvent) {
-                return ((MouseEvent) anEvent).getClickCount() >= 1;
+                return ((MouseEvent) anEvent).getClickCount() >= 2;
             }
             return true;
         }
@@ -1221,6 +1220,11 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 
             return this;
         }
+
+        @Override
+        public boolean checkSelected(boolean isSelected, Class columnClass) {
+            return isSelected;
+        }
     }
 
     /*
@@ -1246,6 +1250,11 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 
             return this;
         }
+
+        @Override
+        public boolean checkSelected(boolean isSelected, Class columnClass) {
+            return isSelected;
+        }
     }
 
     /**
@@ -1264,7 +1273,11 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
             setSelected((value != null && ((Boolean) value).booleanValue()));
             setUI(getUICheckBoxUI());
             setBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor")));
-            setBackground(Color.WHITE);
+            if (isSelected) {
+                setBackground(UIManager.getColor( "Table.selectionBackground"));
+            } else {
+                setBackground(UIManager.getColor("Table.background"));
+            }
             return this;
         }
     }

designer-base/src/main/java/com/fr/file/FileDataFILE.java

@@ -9,6 +9,7 @@ import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.server.repository.tabledata.TableDataRepository;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -98,6 +99,9 @@ public class FileDataFILE extends FileNodeFILE{
             FileDataFILE root = null;
             if (!this.builded) {
                 root = buildTree();
+                if (root == null) {
+                    return new FILE[0];
+                }
                 FileDataFILE dataFILE = root.getFileDataFILE(this.id);
                 this.setChildren(dataFILE.getChildren());
                 this.setType(dataFILE.getType());
@@ -125,7 +129,7 @@ public class FileDataFILE extends FileNodeFILE{
         return null;
     }
 
-    private FileDataFILE buildTree() {
+    private @Nullable FileDataFILE buildTree() {
         List<FileNodeBean> beans = TableDataRepository.getInstance().getFileList(type);
         Map<String, FileDataFILE> tree = new HashMap<>();
         FileDataFILE root = null;

designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java

@@ -34,6 +34,7 @@ import java.awt.Component;
 
 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;
 
 
 /**
@@ -68,7 +69,7 @@ public class WidgetStyleEditPane<T extends TemplateTheme> extends BasicBeanPane<
      * 控件背景和透明度配置面板
      */
     protected NewColorSelectBox widgetBgColorSelectBox;
-    protected UINumberDragPaneWithPercent widgetBgAlphaDragPane;
+    protected UIPercentDragPane widgetBgAlphaDragPane;
     /**
      * 图标颜色
      */
@@ -131,7 +132,7 @@ public class WidgetStyleEditPane<T extends TemplateTheme> extends BasicBeanPane<
         colorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true);
         colorSelectBox.setSelectObject(WidgetThemeDisplayConstants.DEFAULT_THEME_COLOR);
         widgetBgColorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true);
-        widgetBgAlphaDragPane = new UINumberDragPaneWithPercent(0, 100, 1);
+        widgetBgAlphaDragPane = new UIPercentDragPane();
         initLineBox();
         borderRadiusSpinner = new UISpinner(0, Integer.MAX_VALUE, 1);
         iconColorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true);

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_bottom_align.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="M20 2C20.5523 2 21 2.44772 21 3L21 25C21 25.5523 20.5523 26 20 26H12C11.4477 26 11 25.5523 11 25L11 3C11 2.44772 11.4477 2 12 2L20 2Z" fill="#5493F2"/>
+<path d="M30 29C30 29.5523 29.5523 30 29 30L3 30C2.44772 30 2 29.5523 2 29C2 28.4477 2.44772 28 3 28L29 28C29.5523 28 30 28.4477 30 29Z" fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_bottom_align_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="M20 2C20.5523 2 21 2.44772 21 3L21 25C21 25.5523 20.5523 26 20 26H12C11.4477 26 11 25.5523 11 25L11 3C11 2.44772 11.4477 2 12 2L20 2Z" fill="#A3ADBD"/>
+<path d="M30 29C30 29.5523 29.5523 30 29 30L3 30C2.44771 30 2 29.5523 2 29C2 28.4477 2.44772 28 3 28L29 28C29.5523 28 30 28.4477 30 29Z" fill="#CFD4DC"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_horizontal_center.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="M17 2C17.5523 2 18 2.44772 18 3L18 29C18 29.5523 17.5523 30 17 30H15C14.4477 30 14 29.5523 14 29L14 3C14 2.44771 14.4477 2 15 2L17 2Z" fill="#A3ADBD"/>
+<path d="M30 21C30 21.5523 29.5523 22 29 22L3 22C2.44771 22 2 21.5523 2 21L2 11C2 10.4477 2.44772 10 3 10L29 10C29.5523 10 30 10.4477 30 11V21Z" fill="#5493F2"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_horizontal_center_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="M17 2C17.5523 2 18 2.44772 18 3L18 29C18 29.5523 17.5523 30 17 30H15C14.4477 30 14 29.5523 14 29L14 3C14 2.44771 14.4477 2 15 2L17 2Z" fill="#CFD4DC"/>
+<path d="M30 21C30 21.5523 29.5523 22 29 22L3 22C2.44771 22 2 21.5523 2 21L2 11C2 10.4477 2.44772 10 3 10L29 10C29.5523 10 30 10.4477 30 11V21Z" fill="#A3ADBD"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_horizontal_distribute.svg

@@ -0,0 +1,8 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 28C11.4477 28 11 27.5523 11 27L11 5C11 4.44772 11.4477 4 12 4L20 4C20.5523 4 21 4.44771 21 5L21 27C21 27.5523 20.5523 28 20 28H12Z" fill="#A3ADBD"/>
+<path d="M12 28C11.4477 28 11 27.5523 11 27L11 5C11 4.44772 11.4477 4 12 4L20 4C20.5523 4 21 4.44771 21 5L21 27C21 27.5523 20.5523 28 20 28H12Z" fill="#105DD1"/>
+<path d="M5 2C5.55229 2 6 2.44772 6 3L6 29C6 29.5523 5.55228 30 5 30H3C2.44772 30 2 29.5523 2 29L2 3C2 2.44771 2.44772 2 3 2L5 2Z" fill="#CFD4DC"/>
+<path d="M5 2C5.55229 2 6 2.44772 6 3L6 29C6 29.5523 5.55228 30 5 30H3C2.44772 30 2 29.5523 2 29L2 3C2 2.44771 2.44772 2 3 2L5 2Z" fill="#5493F2"/>
+<path d="M29 2C29.5523 2 30 2.44772 30 3L30 29C30 29.5523 29.5523 30 29 30H27C26.4477 30 26 29.5523 26 29L26 3C26 2.44771 26.4477 2 27 2L29 2Z" fill="#CFD4DC"/>
+<path d="M29 2C29.5523 2 30 2.44772 30 3L30 29C30 29.5523 29.5523 30 29 30H27C26.4477 30 26 29.5523 26 29L26 3C26 2.44771 26.4477 2 27 2L29 2Z" fill="#5493F2"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_horizontal_distribute_disable.svg

@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 28C11.4477 28 11 27.5523 11 27L11 5C11 4.44772 11.4477 4 12 4L20 4C20.5523 4 21 4.44771 21 5L21 27C21 27.5523 20.5523 28 20 28H12Z" fill="#A3ADBD"/>
+<path d="M5 2C5.55229 2 6 2.44772 6 3L6 29C6 29.5523 5.55228 30 5 30H3C2.44772 30 2 29.5523 2 29L2 3C2 2.44771 2.44772 2 3 2L5 2Z" fill="#CFD4DC"/>
+<path d="M29 2C29.5523 2 30 2.44772 30 3L30 29C30 29.5523 29.5523 30 29 30H27C26.4477 30 26 29.5523 26 29L26 3C26 2.44771 26.4477 2 27 2L29 2Z" fill="#CFD4DC"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_left_align.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="M3 2C3.55229 2 4 2.44772 4 3L4 29C4 29.5523 3.55228 30 3 30C2.44771 30 2 29.5523 2 29L2 3C2 2.44771 2.44772 2 3 2Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M6 12C6 11.4477 6.44772 11 7 11H29C29.5523 11 30 11.4477 30 12V20C30 20.5523 29.5523 21 29 21H7C6.44772 21 6 20.5523 6 20V12Z" fill="#5493F2"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_left_align_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="M3 2C3.55229 2 4 2.44772 4 3L4 29C4 29.5523 3.55228 30 3 30C2.44771 30 2 29.5523 2 29L2 3C2 2.44771 2.44772 2 3 2Z" fill="#CFD4DC"/>
+<path d="M6 12C6 11.4477 6.44772 11 7 11H29C29.5523 11 30 11.4477 30 12V20C30 20.5523 29.5523 21 29 21H7C6.44772 21 6 20.5523 6 20V12Z" fill="#A3ADBD"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_right_align.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="M2 12C2 11.4477 2.44772 11 3 11H25C25.5523 11 26 11.4477 26 12V20C26 20.5523 25.5523 21 25 21H3C2.44772 21 2 20.5523 2 20V12Z" fill="#5493F2"/>
+<path d="M29 2C29.5523 2 30 2.44772 30 3L30 29C30 29.5523 29.5523 30 29 30C28.4477 30 28 29.5523 28 29L28 3C28 2.44771 28.4477 2 29 2Z" fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_right_align_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="M2 12C2 11.4477 2.44772 11 3 11H25C25.5523 11 26 11.4477 26 12V20C26 20.5523 25.5523 21 25 21H3C2.44772 21 2 20.5523 2 20V12Z" fill="#A3ADBD"/>
+<path d="M29 2C29.5523 2 30 2.44772 30 3L30 29C30 29.5523 29.5523 30 29 30C28.4477 30 28 29.5523 28 29L28 3C28 2.44771 28.4477 2 29 2Z" fill="#CFD4DC"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_top_align.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="M12 30C11.4477 30 11 29.5523 11 29L11 7C11 6.44772 11.4477 6 12 6L20 6C20.5523 6 21 6.44772 21 7L21 29C21 29.5523 20.5523 30 20 30H12Z" fill="#5493F2"/>
+<path d="M2 3C2 2.44771 2.44772 2 3 2H29C29.5523 2 30 2.44771 30 3C30 3.55228 29.5523 4 29 4H3C2.44771 4 2 3.55228 2 3Z" fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_top_align_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="M12 30C11.4477 30 11 29.5523 11 29L11 7C11 6.44772 11.4477 6 12 6L20 6C20.5523 6 21 6.44771 21 7V29C21 29.5523 20.5523 30 20 30H12Z" fill="#A3ADBD"/>
+<path d="M2 3C2 2.44771 2.44772 2 3 2H29C29.5523 2 30 2.44771 30 3C30 3.55228 29.5523 4 29 4H3C2.44771 4 2 3.55228 2 3Z" fill="#CFD4DC"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_vertical_center.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="M2 15C2 14.4477 2.44772 14 3 14H29C29.5523 14 30 14.4477 30 15V17C30 17.5523 29.5523 18 29 18H3C2.44771 18 2 17.5523 2 17V15Z" fill="#A3ADBD"/>
+<path d="M21 2C21.5523 2 22 2.44772 22 3L22 29C22 29.5523 21.5523 30 21 30H11C10.4477 30 10 29.5523 10 29L10 3C10 2.44771 10.4477 2 11 2L21 2Z" fill="#5493F2"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_vertical_center_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="M2 15C2 14.4477 2.44772 14 3 14H29C29.5523 14 30 14.4477 30 15V17C30 17.5523 29.5523 18 29 18H3C2.44771 18 2 17.5523 2 17V15Z" fill="#CFD4DC"/>
+<path d="M21 2C21.5523 2 22 2.44772 22 3L22 29C22 29.5523 21.5523 30 21 30H11C10.4477 30 10 29.5523 10 29L10 3C10 2.44771 10.4477 2 11 2L21 2Z" fill="#A3ADBD"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_vertical_distribute.svg

@@ -0,0 +1,8 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="4" y="11" width="24" height="10" rx="1" fill="#A3ADBD"/>
+<rect x="4" y="11" width="24" height="10" rx="1" fill="#105DD1"/>
+<rect x="30" y="6" width="28" height="4" rx="1" transform="rotate(-180 30 6)" fill="#CFD4DC"/>
+<rect x="30" y="6" width="28" height="4" rx="1" transform="rotate(-180 30 6)" fill="#5493F2"/>
+<rect x="30" y="30" width="28" height="4" rx="1" transform="rotate(-180 30 30)" fill="#CFD4DC"/>
+<rect x="30" y="30" width="28" height="4" rx="1" transform="rotate(-180 30 30)" fill="#5493F2"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/arrange/arrange_vertical_distribute_disable.svg

@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 12C4 11.4477 4.44772 11 5 11H27C27.5523 11 28 11.4477 28 12V20C28 20.5523 27.5523 21 27 21H5C4.44772 21 4 20.5523 4 20V12Z" fill="#A3ADBD"/>
+<path d="M30 5C30 5.55229 29.5523 6 29 6L3 6C2.44771 6 2 5.55228 2 5L2 3C2 2.44772 2.44772 2 3 2L29 2C29.5523 2 30 2.44772 30 3V5Z" fill="#CFD4DC"/>
+<path d="M30 29C30 29.5523 29.5523 30 29 30L3 30C2.44771 30 2 29.5523 2 29L2 27C2 26.4477 2.44772 26 3 26L29 26C29.5523 26 30 26.4477 30 27V29Z" fill="#CFD4DC"/>
+</svg>

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

@@ -0,0 +1,6 @@
+<svg width="31" height="29" viewBox="0 0 31 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 2C0 0.895431 0.895431 0 2 0H25C26.1046 0 27 0.895431 27 2V11.8321C26.365 11.5546 25.6956 11.3412 25 11.2V2H2V26H14.3378C14.7601 26.73 15.272 27.4017 15.8586 28H2C0.895431 28 0 27.1046 0 26V2Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.5968 20.25C15.5968 16.5755 18.5755 13.5968 22.25 13.5968C25.9245 13.5968 28.9032 16.5755 28.9032 20.25C28.9032 23.9245 25.9245 26.9032 22.25 26.9032C18.5755 26.9032 15.5968 23.9245 15.5968 20.25ZM22.25 12C17.6937 12 14 15.6937 14 20.25C14 24.8063 17.6937 28.5 22.25 28.5C26.8063 28.5 30.5 24.8063 30.5 20.25C30.5 15.6937 26.8063 12 22.25 12ZM22.25 14.9274C22.8379 14.9274 23.3145 15.404 23.3145 15.9919V19.1855H26.5081C27.096 19.1855 27.5726 19.6621 27.5726 20.25C27.5726 20.8379 27.096 21.3145 26.5081 21.3145H23.3145V24.5081C23.3145 25.096 22.8379 25.5726 22.25 25.5726C21.6621 25.5726 21.1855 25.096 21.1855 24.5081V21.3145H17.9919C17.404 21.3145 16.9274 20.8379 16.9274 20.25C16.9274 19.6621 17.404 19.1855 17.9919 19.1855H21.1855V15.9919C21.1855 15.404 21.6621 14.9274 22.25 14.9274Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.1429 8H11.4286V14.4286H14.2139C15.9469 11.9759 18.8361 10.3184 22.1429 10.156V8ZM13.5579 15.5C12.8807 16.791 12.4999 18.2462 12.4999 19.7857C12.4999 20.9128 12.704 21.9946 13.079 23H5V15.5H13.5579Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M5 8H10.5V14.5H5V8Z" fill="#0A1C38" fill-opacity="0.78"/>
+</svg>

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

@@ -1,3 +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" d="M28.5 28V9.46837C28.5 9.34773 28.4564 9.23115 28.3772 9.14014L23.6185 3.67177C23.5236 3.56265 23.386 3.5 23.2414 3.5H20V10.6C20 11.3732 19.3732 12 18.6 12H9.4C8.6268 12 8 11.3732 8 10.6V3.5H4C3.72386 3.5 3.5 3.72386 3.5 4V28C3.5 28.2761 3.72386 28.5 4 28.5H8V19.4C8 18.6268 8.6268 18 9.4 18H22.6C23.3732 18 24 18.6268 24 19.4V28.5H28C28.2761 28.5 28.5 28.2761 28.5 28ZM24 30H8H4C2.89543 30 2 29.1046 2 28V4C2 2.89543 2.89543 2 4 2H8H20H23.2414C23.82 2 24.3702 2.2506 24.7501 2.68709L29.5087 8.15546C29.8255 8.51949 30 8.9858 30 9.46837V28C30 29.1046 29.1046 30 28 30H24ZM22.5 28.5V19.5H9.5V28.5H22.5ZM9.5 3.5H18.5V10.5H9.5V3.5Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 4V28H8V20C8 18.8954 8.89543 18 10 18H22C23.1046 18 24 18.8954 24 20V28H28V9.73985L23.0801 4H20V10C20 11.1046 19.1046 12 18 12H10C8.89543 12 8 11.1046 8 10V4H4ZM24 30H28C29.1046 30 30 29.1046 30 28V9.73985C30 9.26243 29.8292 8.80075 29.5185 8.43827L24.5986 2.69842C24.2187 2.25513 23.664 2 23.0801 2H20H8H4C2.89543 2 2 2.89543 2 4V28C2 29.1046 2.89543 30 4 30H8H24ZM22 28V20H10V28H22ZM10 4H18V10H10V4Z" fill="#0A1C38" fill-opacity="0.9"/>
 </svg>

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

@@ -1,3 +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" d="M28.5 28V9.46837C28.5 9.34773 28.4564 9.23115 28.3772 9.14014L23.6185 3.67177C23.5236 3.56265 23.386 3.5 23.2414 3.5H20V10.6C20 11.3732 19.3732 12 18.6 12H9.4C8.6268 12 8 11.3732 8 10.6V3.5H4C3.72386 3.5 3.5 3.72386 3.5 4V28C3.5 28.2761 3.72386 28.5 4 28.5H8V19.4C8 18.6268 8.6268 18 9.4 18H22.6C23.3732 18 24 18.6268 24 19.4V28.5H28C28.2761 28.5 28.5 28.2761 28.5 28ZM24 30H8H4C2.89543 30 2 29.1046 2 28V4C2 2.89543 2.89543 2 4 2H8H20H23.2414C23.82 2 24.3702 2.2506 24.7501 2.68709L29.5087 8.15546C29.8255 8.51949 30 8.9858 30 9.46837V28C30 29.1046 29.1046 30 28 30H24ZM22.5 28.5V19.5H9.5V28.5H22.5ZM9.5 3.5H18.5V10.5H9.5V3.5Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 4V28H8V20C8 18.8954 8.89543 18 10 18H22C23.1046 18 24 18.8954 24 20V28H28V9.73985L23.0801 4H20V10C20 11.1046 19.1046 12 18 12H10C8.89543 12 8 11.1046 8 10V4H4ZM24 30H28C29.1046 30 30 29.1046 30 28V9.73985C30 9.26243 29.8292 8.80075 29.5185 8.43827L24.5986 2.69842C24.2187 2.25513 23.664 2 23.0801 2H20H8H4C2.89543 2 2 2.89543 2 4V28C2 29.1046 2.89543 30 4 30H8H24ZM22 28V20H10V28H22ZM10 4H18V10H10V4Z" fill="#0A1C38" fill-opacity="0.29"/>
 </svg>

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

@@ -7,6 +7,7 @@
     "cut": "cut.svg",
     "save": "save.svg",
     "saveFile": "saveFile.svg",
+    "formExport": "formExport.svg",
     "copy": "copy.svg",
     "formatBrush": "formatBrush.svg",
     "paste": "paste.svg",
@@ -472,7 +473,14 @@
     "layout_top_right": "layout/layout_top_right.svg",
     "theme_edit": "theme_edit.svg",
     "folder_half_authority" : "filetree/folder_half_authority.svg",
-    "folder_half_authority_open" : "filetree/folder_half_authority_open.svg"
+    "folder_half_authority_open" : "filetree/folder_half_authority_open.svg",
-
+    "arrange_left_align": "arrange/arrange_left_align.svg",
+    "arrange_horizontal_center": "arrange/arrange_horizontal_center.svg",
+    "arrange_right_align": "arrange/arrange_right_align.svg",
+    "arrange_top_align": "arrange/arrange_top_align.svg",
+    "arrange_vertical_center": "arrange/arrange_vertical_center.svg",
+    "arrange_bottom_align": "arrange/arrange_bottom_align.svg",
+    "arrange_horizontal_distribute": "arrange/arrange_horizontal_distribute.svg",
+    "arrange_vertical_distribute": "arrange/arrange_vertical_distribute.svg"
   }
 }

designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties

@@ -302,6 +302,7 @@ ColorChooser.swatchesDefaultRecentColor = $control
 ComboBox.border = com.fine.theme.light.ui.FineRoundBorder
 ComboBox.padding = @componentMargin
 ComboBox.minimumWidth = 72
+ComboBox.maximumWidth = 400
 ComboBox.editorColumns = 0
 ComboBox.maximumRowCount = 15
 [mac]ComboBox.showPopupOnNavigation = true

designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java

@@ -1,7 +1,6 @@
 package com.fr.design.chartx.component;
 
 import com.fine.theme.icon.LazyIcon;
-import com.fine.theme.utils.FineLayoutBuilder;
 import com.fine.theme.utils.FineUIUtils;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.chartx.TwoTuple;
@@ -48,8 +47,8 @@ import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
-import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX;
+import static com.fine.swing.ui.layout.Layouts.cell;
-import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE;
+import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.theme.utils.FineUIScale.scale;
 
 /**
@@ -102,12 +101,13 @@ public class MapAreaMatchPane extends BasicBeanPane<MapMatchResult> {
     }
 
     private JPanel createContentPane() {
-        tableNameCombox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX);
+        return row(10,
-        areaNameBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX);
+                cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":")),
-        return FineLayoutBuilder.createHorizontalLayout(10,
+                cell(tableNameCombox).weight(1),
-                new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":"), tableNameCombox,
+                cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":")),
-                new UILabel(Toolkit.i18nText("Fine-Design_Chart_Area_Name") + ":"), areaNameBox,
+                cell(areaNameBox).weight(1),
-                refreshLabel);
+                cell(refreshLabel)
+        ).getComponent();
     }
 
     private void initTable(TwoTuple<DefaultMutableTreeNode, Set<String>> treeNodeAndItems) {

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

@@ -457,9 +457,9 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
 
 
     private class ChartChangeButton extends UIToggleButton {
-        private final double DEL_WIDTH = scale(9);
+        private final double DEL_WIDTH = scale(13);
         private final double DOWN_HEIGHT = scale(1);
-        private final Icon closeIcon = new LazyIcon("closeTag", 8);
+        private final Icon closeIcon = new LazyIcon("closeTag", 12);
         private boolean isMoveOn = false;
 
         private String buttonName = "";

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java

@@ -48,7 +48,8 @@ public class ChartImagePane extends ChartSelectDemoPane {
                 super.paint(g);
 
                 BufferedImage image1 = IOUtils.readImageWithCache(fullIconPath);
-                g.drawImage(image1, 0, 0, scale(IMAGE_WIDTH), scale(IMAGE_HIGTH), null);
+                int x = (this.getWidth() - scale(IMAGE_WIDTH)) / 2;
+                g.drawImage(image1, x, 0, scale(IMAGE_WIDTH), scale(IMAGE_HIGTH), null);
             }
         };
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java

@@ -5,6 +5,7 @@ import com.fine.theme.utils.FineLayoutBuilder;
 import com.fine.theme.utils.FineUIScale;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.foldablepane.UIExpandablePane;
@@ -54,6 +55,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.row;
+
 /**
  * 数据点提示内容界面，含有通用设置、富文本编辑器、自定义JS界面
  */
@@ -291,14 +295,21 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
     protected JPanel createCommonFormatPanel() {
-        JPanel formatContent = FineLayoutBuilder.compatibleTableLayout(10, getPaneComponents(), new double[]{1.2, 3});
+        Component[][] paneComponents = getPaneComponents();
 
-        Component[][] components = new Component[][]{
+        Component[][] components = new Component[paneComponents.length+1][2];
-                new Component[]{null, null},
+        components[0] = new Component[]{null, null};
-                new Component[]{new UILabel(getLabelContentTitle()), formatContent}
+
-        };
+        for (int i = 0; i < paneComponents.length; i++) {
+            if (i == 0) {
+                components[i+1][0] = new UILabel(getLabelContentTitle());
+            } else {
+                components[i+1][0] = null;
+            }
+            components[i+1][1] = row(10, cell(paneComponents[i][0]).weight(LayoutConstants.LEFT_WEIGHT), cell(paneComponents[i][1]).weight(LayoutConstants.RIGHT_WEIGHT)).getComponent();
+        }
 
-        return Layouts.cell(FineLayoutBuilder.compatibleTableLayout(0, components, new double[]{1.2, 3}))
+        return cell(FineLayoutBuilder.compatibleTableLayout(0, components, new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT}))
                 .with(it ->it.setBorder(new ScaledEmptyBorder(0, 0, 10, 0))).getComponent();
     }
 
@@ -310,10 +321,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
         textAttrPane = createChartTextAttrPane();
         stylePanel = Layouts.column(10,
-                Layouts.row(
+                row(
-                        Layouts.cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"))).weight(1.2), Layouts.cell(styleButton).weight(3)
+                        cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"))).weight(LayoutConstants.LEFT_WEIGHT), cell(styleButton).weight(LayoutConstants.RIGHT_WEIGHT)
                 ),
-                Layouts.cell(textAttrPane)
+                cell(textAttrPane)
         ).getComponent();
         initStyleButtonListener();
 
@@ -357,7 +368,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Content_Style")), createRichEditorButton()}
         };
 
-        return FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.2, 3});
+        return FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
     }
 
     private JComponent createRichEditorButton() {
@@ -478,7 +489,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 new Component[]{htmlLabelPane, null}
         };
 
-        return FineLayoutBuilder.compatibleTableLayout(10, htmlComponents, new double[]{1.2, 3});
+        return FineLayoutBuilder.compatibleTableLayout(10, htmlComponents, new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
     }
 
     protected VanChartHtmlLabelPane createHtmlLabelPane() {

designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichTextPane.java

@@ -13,6 +13,8 @@ import javax.swing.JScrollPane;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 
+import static com.fine.theme.utils.FineUIScale.scale;
+
 // 标签提示中的富文本面板，包含字段设置和富文本编辑器
 public class VanChartRichTextPane extends BasicBeanPane<AttrTooltipContent> {
 
@@ -48,13 +50,13 @@ public class VanChartRichTextPane extends BasicBeanPane<AttrTooltipContent> {
         fieldListContent.add(fieldListPane, BorderLayout.NORTH);
 
         JScrollPane fieldListScrollPane = new JScrollPane(fieldListContent);
-        fieldListScrollPane.setPreferredSize(new Dimension(FIELD_PANE_W, FIELD_PANE_H));
+        fieldListScrollPane.setPreferredSize(scale(new Dimension(FIELD_PANE_W, FIELD_PANE_H)));
         fieldListScrollPane.setHorizontalScrollBar(null);
         fieldListScrollPane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Add_Field")));
 
         // 字段格式和汇总
         JScrollPane fieldAttrScrollPane = new JScrollPane(fieldAttrPane);
-        fieldAttrScrollPane.setPreferredSize(new Dimension(FIELD_PANE_W, FIELD_PANE_H));
+        fieldAttrScrollPane.setPreferredSize(scale(new Dimension(FIELD_PANE_W, FIELD_PANE_H)));
         fieldAttrScrollPane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Field_Setting")));
 
         fieldPane.add(fieldListScrollPane);
@@ -71,7 +73,7 @@ public class VanChartRichTextPane extends BasicBeanPane<AttrTooltipContent> {
         JPanel richEditorPane = new JPanel();
 
         richEditorPane.setLayout(new BorderLayout());
-        richEditorPane.setPreferredSize(new Dimension(RICH_EDITOR_W, RICH_EDITOR_H));
+        richEditorPane.setPreferredSize(scale(new Dimension(RICH_EDITOR_W, RICH_EDITOR_H)));
         richEditorPane.add(richEditor, BorderLayout.CENTER);
 
         return richEditorPane;

designer-chart/src/main/java/com/fr/van/chart/map/designer/type/WMSLayerPane.java

@@ -2,6 +2,7 @@ package com.fr.van.chart.map.designer.type;
 
 
 import com.fine.theme.utils.FineLayoutBuilder;
+import com.fr.decision.webservice.v10.map.MapEditService;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
@@ -83,9 +84,7 @@ public class WMSLayerPane extends JPanel implements UIObserver {
 
                     @Override
                     protected Void doInBackground() {
-                        /// 待实现
+                        List<String> wmsNames = MapEditService.getInstance().getWMSNames(wmsUrl.getText());
-                        // MapEditService.getInstance().getWMSNames(wmsUrl.getText());
-                        List<String> wmsNames = new ArrayList<>();
                         list.clear();
                         for (String layer : wmsNames) {
                             list.add(new WMSLayer(layer, false));

designer-form/src/main/java/com/fr/design/mainframe/FormWidgetPopWindow.java

@@ -17,6 +17,8 @@ import java.awt.Toolkit;
 import java.awt.event.AWTEventListener;
 import java.awt.event.MouseEvent;
 
+import static com.fine.theme.utils.FineUIScale.scale;
+
 //august:
 public class FormWidgetPopWindow extends JWindow {
     private WidgetOption[] options;
@@ -127,8 +129,8 @@ public class FormWidgetPopWindow extends JWindow {
         public Dimension preferredLayoutSize(Container parent) {
             Insets insets = parent.getInsets();
             int nmembers = parent.getComponentCount();
-            return new Dimension(maxLine * 28 + insets.left + insets.right + right + left, (nmembers / maxLine + 1)
+            return new Dimension(maxLine * scale(28) + insets.left + insets.right + scale(right) + scale(left),
-                    * 24 + insets.top + insets.bottom + top + bottom);
+                    (int) Math.ceil((float) nmembers / maxLine) * scale(26) + insets.top + insets.bottom + scale(top) + scale(bottom));
         }
 
         @Override

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/AbstractMultiSelectionArrangementButton.java

@@ -1,10 +1,13 @@
 package com.fr.design.mainframe.widget.arrangement.buttons;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.MultiSelectionArrangement;
+import com.fr.stable.StringUtils;
 
+import javax.swing.Icon;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -16,11 +19,21 @@ public abstract class AbstractMultiSelectionArrangementButton extends UIButton i
     public AbstractMultiSelectionArrangementButton(MultiSelectionArrangement arrangement) {
         super();
         this.arrangement = arrangement;
-        this.setNormalPainted(false);
-        this.setBorderPaintedOnlyWhenPressed(true);
-        this.setIcon(getIcon());
         this.setToolTipText(getTipText());
         this.addActionListener(getActionListener());
+        setBorderPainted(false);
+        setBackground(null);
+        setBackground(null);
+    }
+
+    @Override
+    public Icon getIcon() {
+        LazyIcon icon = new LazyIcon(getIconId());
+        return isEnabled() ? icon : icon.disabled();
+    }
+
+    public String getIconId() {
+        return StringUtils.EMPTY;
     }
 
     @Override

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/BottomAlignButton.java

@@ -3,9 +3,6 @@ package com.fr.design.mainframe.widget.arrangement.buttons;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
-import com.fr.general.IOUtils;
-
-import javax.swing.Icon;
 
 public class BottomAlignButton extends AbstractMultiSelectionArrangementButton {
     private static final long serialVersionUID = 2397455240682353024L;
@@ -15,8 +12,8 @@ public class BottomAlignButton extends AbstractMultiSelectionArrangementButton {
     }
 
     @Override
-    public Icon getIcon() {
+    public String getIconId() {
-        return IOUtils.readIcon("/com/fr/design/images/buttonicon/multi_selection_bottom_align.png");
+        return "arrange_bottom_align";
     }
 
     @Override

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/HorizontalCenterButton.java

@@ -3,9 +3,6 @@ package com.fr.design.mainframe.widget.arrangement.buttons;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
-import com.fr.general.IOUtils;
-
-import javax.swing.Icon;
 
 public class HorizontalCenterButton extends AbstractMultiSelectionArrangementButton {
     private static final long serialVersionUID = 6290178236460051049L;
@@ -15,8 +12,8 @@ public class HorizontalCenterButton extends AbstractMultiSelectionArrangementBut
     }
 
     @Override
-    public Icon getIcon() {
+    public String getIconId() {
-        return IOUtils.readIcon("/com/fr/design/images/buttonicon/multi_selection_horizontal_center_align.png");
+        return "arrange_horizontal_center";
     }
 
     @Override

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/HorizontalDistributionButton.java

@@ -3,9 +3,6 @@ package com.fr.design.mainframe.widget.arrangement.buttons;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
-import com.fr.general.IOUtils;
-
-import javax.swing.Icon;
 
 public class HorizontalDistributionButton extends AbstractMultiSelectionArrangementButton {
     private static final long serialVersionUID = 5052092252720664954L;
@@ -15,8 +12,8 @@ public class HorizontalDistributionButton extends AbstractMultiSelectionArrangem
     }
 
     @Override
-    public Icon getIcon() {
+    public String getIconId() {
-        return IOUtils.readIcon("/com/fr/design/images/buttonicon/multi_selection_horizontal_auto_spacing.png");
+        return "arrange_horizontal_distribute";
     }
 
     @Override

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/LeftAlignButton.java

@@ -3,9 +3,6 @@ package com.fr.design.mainframe.widget.arrangement.buttons;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
-import com.fr.general.IOUtils;
-
-import javax.swing.Icon;
 
 public class LeftAlignButton extends AbstractMultiSelectionArrangementButton {
     private static final long serialVersionUID = -8177637788632733710L;
@@ -15,8 +12,8 @@ public class LeftAlignButton extends AbstractMultiSelectionArrangementButton {
     }
 
     @Override
-    public Icon getIcon() {
+    public String getIconId() {
-        return IOUtils.readIcon("/com/fr/design/images/buttonicon/multi_selection_left_align.png");
+        return "arrange_left_align";
     }
 
     @Override

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/RightAlignButton.java

@@ -3,9 +3,6 @@ package com.fr.design.mainframe.widget.arrangement.buttons;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
-import com.fr.general.IOUtils;
-
-import javax.swing.Icon;
 
 public class RightAlignButton extends AbstractMultiSelectionArrangementButton {
     private static final long serialVersionUID = -8698936349956288409L;
@@ -15,8 +12,8 @@ public class RightAlignButton extends AbstractMultiSelectionArrangementButton {
     }
 
     @Override
-    public Icon getIcon() {
+    public String getIconId() {
-        return IOUtils.readIcon("/com/fr/design/images/buttonicon/multi_selection_right_align.png");
+        return "arrange_right_align";
     }
 
     @Override

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/TopAlignButton.java

@@ -3,9 +3,6 @@ package com.fr.design.mainframe.widget.arrangement.buttons;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
-import com.fr.general.IOUtils;
-
-import javax.swing.Icon;
 
 public class TopAlignButton extends AbstractMultiSelectionArrangementButton {
     private static final long serialVersionUID = 2896267783075870924L;
@@ -15,8 +12,8 @@ public class TopAlignButton extends AbstractMultiSelectionArrangementButton {
     }
 
     @Override
-    public Icon getIcon() {
+    public String getIconId() {
-        return IOUtils.readIcon("/com/fr/design/images/buttonicon/multi_selection_top_align.png");
+        return "arrange_top_align";
     }
 
     @Override