Merge remote-tracking branch 'origin/feature/x' into feature/x

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -361,7 +361,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             File envFile100 = getOldEnvFile(VERSION100);
             // 从10.0往前递进是否存在更老版本的配置文件
             if (envFile100.exists()) {
-                compatibilityPrevVersion(envFile90);
+                compatibilityPrevVersion(envFile100);
             } else if (envFile90.exists()) {
                 compatibilityPrevVersion(envFile90);
             } else if (envFile80.exists()) {

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -8,6 +8,7 @@ import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.env.DesignerWorkspaceGenerator;
 import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.env.DesignerWorkspaceInfoContext;
 import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.env.RemoteWorkspace;
@@ -105,6 +106,7 @@ public class EnvChangeEntrance {
     private boolean switch2Env(final String envName, PopTipStrategy strategy) {
         DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
         DesignerWorkspaceInfo selectedEnv = envManager.getWorkspaceInfo(envName);
+        DesignerWorkspaceInfoContext.setWorkspaceInfo(selectedEnv);
         WorkspaceConnectionInfo connectionInfo = selectedEnv.getConnection();
 
         try {

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

@@ -161,10 +161,18 @@ public abstract class DesignTableDataManager {
     }
 
     public static String getChangedDsNameByOldDsName(String oldDsName) {
+        String changeName;
+
         if (isDsNameChanged(oldDsName)) {
-            return dsNameChangedMap.get(oldDsName);
+            changeName = dsNameChangedMap.get(oldDsName);
+        } else {
+            changeName = StringUtils.EMPTY;
+        }
+
+        if (StringUtils.isNotEmpty(changeName)) {
+            return getChangedDsNameByOldDsName(changeName);
         } else {
-            return StringUtils.EMPTY;
+            return oldDsName;
         }
     }
 

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

@@ -9,6 +9,7 @@ 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.file.TableDataConfig;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -80,12 +81,13 @@ public class TreeTableDataComboBox extends UIComboBox {
 	}
 
 	public void setSelectedTableDataByName(String name) {
+		refresh();
 		TableDataWrapper tableDataWrapper;
-		if (res_map.get(name) != null) {
+		String changeName = DesignTableDataManager.getChangedDsNameByOldDsName(name);
-			tableDataWrapper = res_map.get(name);
+		if (StringUtils.isNotEmpty(changeName)) {
-		} else {
-			String changeName = DesignTableDataManager.getChangedDsNameByOldDsName(name);
 			tableDataWrapper = res_map.get(changeName);
+		} else {
+			tableDataWrapper = res_map.get(name);
 		}
 		this.getModel().setSelectedItem(tableDataWrapper);
 	}

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

@@ -64,7 +64,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
         tableFlowPane.add(tableDataNameComboBox);
         tableDataNameComboBox.addItemListener(new ItemListener() {
             public void itemStateChanged(ItemEvent e) {
-                tdChange();
+                tdChange(true);
             }
         });
         tableFlowPane.add(new PreviewLabel(this));
@@ -73,19 +73,21 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
         this.add(centerPane, BorderLayout.CENTER);
         parentMarkRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Build_Tree_Accord_Parent_Marked_Filed"), true);
         lengthMarkRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Build_Tree_Accord_Marked_Filed_Length"));
-        parentMarkRadio.addActionListener(new ActionListener() {
+        parentMarkRadio.addItemListener(new ItemListener() {
-            public void actionPerformed(ActionEvent e) {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
                 if (isBuildByParentFiled()) {
                     makeParentEnable();
-                    tdChange();
+                    tdChange(false);
                 }
             }
         });
-        lengthMarkRadio.addActionListener(new ActionListener() {
+        lengthMarkRadio.addItemListener(new ItemListener() {
-            public void actionPerformed(ActionEvent e) {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
                 if (!isBuildByParentFiled()) {
                     makeLengthEnable();
-                    tdChange();
+                    tdChange(false);
                 }
             }
         });
@@ -169,7 +171,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
 
     }
 
-    private void tdChange() {
+    private void tdChange(boolean isChangeDS) {
         TableDataWrapper tableDataWrappe = this.tableDataNameComboBox.getSelectedItem();
         if (tableDataWrappe == null) {
             return;
@@ -186,7 +188,9 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
             String[] columnNames = new String[len];
             namelist.toArray(columnNames);
             for (int i = 0; i < valueEditorPanes.length; i++) {
-                valueEditorPanes[i].setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(len)}, columnNames[0]);
+                if (isChangeDS || isNoSelectedColumnName(valueEditorPanes[i])) {
+                    valueEditorPanes[i].setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(len)}, columnNames[0]);
+                }
             }
         } catch (Exception e) {
             for (int i = 0; i < valueEditorPanes.length; i++) {
@@ -197,6 +201,10 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
         }
     }
 
+    private boolean isNoSelectedColumnName(ValueEditorPane valueEditorPane) {
+        return (Integer) valueEditorPane.update() == -1;
+    }
+
     @Override
     protected String title4PopupWindow() {
         return "TreeTableDataDictionay";

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

@@ -7,6 +7,7 @@ import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.design.border.UITitledBorder;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.icombobox.UIComboBoxUI;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength;
@@ -32,6 +33,8 @@ import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.plaf.ComboBoxUI;
+import javax.swing.plaf.basic.ComboPopup;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -275,8 +278,9 @@ public class JDBCDefPane extends JPanel {
         }
         dbtypeComboBox.addActionListener(dbtypeActionListener);
         dbtypeComboBox.setMaximumRowCount(10);
-        driverLoaderBox = new UIComboBox();
+        driverLoaderBox = new SpecialUIComboBox();
         refreshDriverLoader();
+        driverLoaderBox.setPreferredSize(new Dimension(200, driverLoaderBox.getPreferredSize().height));
         driverLoaderBox.setEditable(false);
         driverManageBox = new UIComboBox();
         refreshDriverManage(true);
@@ -350,7 +354,7 @@ public class JDBCDefPane extends JPanel {
         odbcTipsPane.add(driverManageLabel);
         odbcTipsPane.add(odbcTipsLink);
         JPanel driverComboBoxAndTips = new JPanel(new BorderLayout());
-        JPanel normalFlowInnerContainer_s_pane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        JPanel normalFlowInnerContainer_s_pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(0, 5, 0);
         normalFlowInnerContainer_s_pane.add(driverManageBox);
         normalFlowInnerContainer_s_pane.add(driverComboBox);
         normalFlowInnerContainer_s_pane.add(driverLoaderBox);
@@ -507,7 +511,6 @@ public class JDBCDefPane extends JPanel {
                 this.dbtypeComboBox.setSelectedItem(OTHER_DB);
             }
         }
-        this.jdbcDatabase.setIdentity(jdbcDatabase.getIdentity());
         // jdbcDatabase.getDriverSource() 只会是空或者是有值，但是为了保险起见，还是应该做个处理
         String driverSource = jdbcDatabase.getDriverSource();
         if (driverSource == null) {
@@ -717,4 +720,22 @@ public class JDBCDefPane extends JPanel {
         private String driver;
         private String url;
     }
+
+    private static class SpecialUIComboBox extends UIComboBox {
+
+        @Override
+        public ComboBoxUI getUIComboBoxUI() {
+            return new SpecialUIComboBoxUI();
+        }
+    }
+
+    private static class SpecialUIComboBoxUI extends UIComboBoxUI {
+
+        @Override
+        public ComboPopup createPopup() {
+            return createHorizontalNeverUIComboPopUp();
+        }
+
+    }
+
 }

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

@@ -48,9 +48,17 @@ public class CopyableJTable extends SortableJTable {
     boolean mouseDrag = false;
     boolean headerSelect = false;
 
-    DefaultTableCellRenderer tableHeaderCellRenderer = new DefaultTableCellRenderer() {
+
+    class CopyableTableHeaderCellRenderer implements TableCellRenderer {
+        TableCellRenderer tableCellRenderer;
+
+        CopyableTableHeaderCellRenderer(TableCellRenderer tableCellRenderer) {
+            this.tableCellRenderer = tableCellRenderer;
+        }
+
+        @Override
         public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-            JComponent comp = (JComponent) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+            JComponent comp = (JComponent) this.tableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
             if (isChoose(row, column)) {
                 comp.setBackground(selectBackGround);
             } else {
@@ -58,13 +66,13 @@ public class CopyableJTable extends SortableJTable {
             }
             return comp;
         }
-    };
+    }
 
 
     public CopyableJTable(TableSorter tableModel) {
         super(tableModel);
         initListener();
-        this.getTableHeader().setDefaultRenderer(tableHeaderCellRenderer);
+        this.getTableHeader().setDefaultRenderer(new CopyableTableHeaderCellRenderer(this.getTableHeader().getDefaultRenderer()));
     }
 
     private void initListener() {

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

@@ -19,7 +19,6 @@ import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.data.datapane.preview.sql.PreviewPerformedSqlPane;
 import com.fr.design.data.datapane.sqlpane.SQLEditPane;
 import com.fr.design.data.tabledata.strategy.StrategyConfigHandler;
-import com.fr.design.data.tabledata.tabledatapane.db.DBTableDataSavedHook;
 import com.fr.design.data.tabledata.tabledatapane.db.StrategyConfigFrom;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
@@ -45,6 +44,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.esd.core.strategy.config.StrategyConfig;
 import com.fr.esd.core.strategy.config.StrategyConfigHelper;
 import com.fr.esd.core.strategy.config.service.StrategyConfigService;
+import com.fr.esd.data.db.DBTableDataSavedHook;
 import com.fr.esd.event.DSMapping;
 import com.fr.esd.event.DsNameTarget;
 import com.fr.esd.event.StrategyEventsNotifier;

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

@@ -1,47 +0,0 @@
-package com.fr.design.data.tabledata.tabledatapane.db;
-
-import com.fr.data.impl.DBTableData;
-import com.fr.esd.event.DSMapping;
-import com.fr.esd.event.DsNameTarget;
-import com.fr.esd.event.StrategyEventsNotifier;
-import com.fr.esd.event.xml.XMLSavedHook;
-import com.fr.stable.StringUtils;
-
-public class DBTableDataSavedHook implements XMLSavedHook<DBTableData> {
-
-    private static final long serialVersionUID = 4925391747683335372L;
-
-    private final String tplPath;
-    private String origName;
-
-    private String origConnection;
-
-    private String origQuery;
-
-    public DBTableDataSavedHook(String tplPath, DBTableData origDBTableData) {
-        this.tplPath = tplPath;
-        this.origName = origDBTableData.getDsName();
-        this.origConnection = origDBTableData.getDatabase().toString();
-        this.origQuery = origDBTableData.getQuery();
-    }
-
-    @Override
-    public void doAfterSaved(DBTableData saved) {
-        String dsName = saved.getDsName();
-        String conn = saved.getDatabase().toString();
-        String query = saved.getQuery();
-
-
-        //检查数据集名称、数据链接和sql是否修改，如果修改需要触发缓存监听事件
-        if (!dsName.equals(origName) || !conn.equals(origConnection) || !query.equals(origQuery)) {
-            if (StringUtils.isNotEmpty(tplPath) && StringUtils.isNotEmpty(origName)) {
-                //新建数据集的origName为null，不用触发
-                StrategyEventsNotifier.modifyDataSet(new DSMapping(tplPath, new DsNameTarget(origName)));
-            }
-        }
-
-        this.origName = dsName;
-        this.origConnection = conn;
-        this.origQuery = query;
-    }
-}

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

@@ -0,0 +1,20 @@
+package com.fr.design.env;
+
+/**
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/8/24
+ */
+public class DesignerWorkspaceInfoContext {
+
+    private static DesignerWorkspaceInfo workspaceInfo;
+
+    public static DesignerWorkspaceInfo getWorkspaceInfo() {
+        return workspaceInfo;
+    }
+
+    public static void setWorkspaceInfo(DesignerWorkspaceInfo workspaceInfo) {
+        DesignerWorkspaceInfoContext.workspaceInfo = workspaceInfo;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.fr.design.env;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralUtils;
 import com.fr.locale.InterProviderFactory;
+import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.project.ProjectConstants;
@@ -107,8 +108,8 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
 
         File engineLib = new File(StableUtils.pathJoin(this.path, ProjectConstants.LIB_NAME, REPORT_ENGINE_JAR));
         // 非安装版本允许自由切换
-        boolean notExistLib = !ComparatorUtils.equals(GeneralUtils.readFullBuildNO(), InterProviderFactory.getProvider().getLocText("Fine-Core_Basic_About_No_Build"))
+        boolean notExistLib = !CoreConstants.DOT.equals(StableUtils.getInstallHome())
-                              && !engineLib.exists();
+                && !engineLib.exists();
         if (notExistLib) {
             throw new MainVersionNotMatchException();
         }

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

@@ -93,7 +93,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
 
             @Override
             public void mousePressed(MouseEvent evt) {
-                if (evt.getClickCount() == 2) {
+                if (reportletsTree.getPathForLocation(evt.getX(), evt.getY()) != null && evt.getClickCount() == 2) {
                     openFile();
                 }
             }

designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java

@@ -3,6 +3,7 @@ package com.fr.design.gui.controlpane;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.controlpane.shortcutfactory.ShortCutFactory;
+import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itoolbar.UIToolBarUI;
 import com.fr.design.gui.itoolbar.UIToolbar;
@@ -277,6 +278,10 @@ public abstract class UIControlPane extends JControlPane {
                 this.requestFocus();
                 return;
             }
+            if (JavaFxNativeFileChooser.isShowDialogState()) {
+                JavaFxNativeFileChooser.setShowDialogState(false);
+                return;
+            }
             saveSettings();
             setVisible(false);
             PopupDialogSaveAction saveAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);

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

@@ -27,13 +27,16 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.stable.StringUtils;
-import java.awt.*;
+
+import javax.swing.JPanel;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.List;
-import javax.swing.*;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
 
 public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previewable, EditOrNewLabel.Editable {
     private TreeTableDataComboBox treeTableDataComboBox;

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

@@ -10,6 +10,7 @@ import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.gui.itextfield.UINumberField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.GeneralUtils;
 import com.fr.stable.AssistUtils;
 import com.fr.stable.StringUtils;
 
@@ -27,7 +28,8 @@ import java.math.BigDecimal;
  * For input Number.
  */
 public abstract class UnitInputPane extends BasicPane {
-    private static final double NUM_POINT =  0.000001;
+	private static final double MAX_NUM = 3000.0D;
+	private static final double NUM_POINT =  0.000001;
 	private int scale = -1;
 	String title;
 
@@ -46,7 +48,7 @@ public abstract class UnitInputPane extends BasicPane {
 		centerPane.add(titleLabel);
 
 		// Denny：在对话框中加入JSpinner对象
-		numberFieldSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, 999, 1));
+		numberFieldSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, MAX_NUM, 1));
 		GUICoreUtils.setColumnForSpinner(numberFieldSpinner, 24);
 		numberFieldSpinner.setPreferredSize(new Dimension(60, 20));
 		numberFieldSpinner.setMinimumSize(new Dimension(60, 20));
@@ -71,17 +73,17 @@ public abstract class UnitInputPane extends BasicPane {
 
 	public void populate(float floatValue) {
 		popValue = floatValue;
-		numberFieldSpinner.setModel(new SpinnerNumberModel(0.00, 0.00, 999.00, 0.01));
+		numberFieldSpinner.setModel(new SpinnerNumberModel(0.00, 0.00, MAX_NUM, 0.01));
 
 		JFormattedTextField temp = GUICoreUtils.getSpinnerTextField(numberFieldSpinner);
 		addChangeListener(temp);
-		BigDecimal de = new BigDecimal(floatValue + "");
+		BigDecimal de = new BigDecimal(GeneralUtils.objectToString(floatValue));
 		if (scale > 0) {
 			floatValue = de.setScale(scale, BigDecimal.ROUND_DOWN).floatValue();
 		} else {
 			floatValue = de.floatValue();
 		}
-        //选中多列, 并且列宽不完全一致的话, 就不显示值了.
+		//选中多列, 并且列宽不完全一致的话, 就不显示值了.
 		temp.setText(AssistUtils.equals(floatValue, 0) ? StringUtils.EMPTY : Utils.convertNumberStringToString(new Float(floatValue)));
 
 		// denny:默认应该为选中，方便用户修改
@@ -99,8 +101,8 @@ public abstract class UnitInputPane extends BasicPane {
 	public double update() throws ValueNotChangeException {
 		// 值没变就不改
 		if (!changed) {
-            throw vncExp;
+			throw vncExp;
-        }
+		}
 		// Denny: get numberFieldSpinner 的 TextField
 		JFormattedTextField temp = GUICoreUtils.getSpinnerTextField(numberFieldSpinner);
 
@@ -108,7 +110,8 @@ public abstract class UnitInputPane extends BasicPane {
 			if (temp.getText().length() == 0) {
 				return 0;
 			}
-			BigDecimal de = new BigDecimal(temp.getText());
+
+			BigDecimal de = new BigDecimal(GeneralUtils.objectToString(temp.getValue()));
 			if (scale > 0) {
 				return de.setScale(scale, BigDecimal.ROUND_DOWN).floatValue();
 			} else {

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

@@ -10,12 +10,26 @@ import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 import sun.swing.DefaultLookup;
 
-import javax.swing.*;
+import javax.swing.AbstractButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListCellRenderer;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.UIManager;
 import javax.swing.plaf.ButtonUI;
 import javax.swing.plaf.basic.BasicComboBoxUI;
 import javax.swing.plaf.basic.BasicComboPopup;
 import javax.swing.plaf.basic.ComboPopup;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
@@ -159,6 +173,10 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
         return new UIComboPopup(comboBox);
     }
 
+    protected ComboPopup createHorizontalNeverUIComboPopUp() {
+        return new HorizontalNeverUIComboPopup(comboBox);
+    }
+
     private void setRollover(boolean isRollover) {
         if (this.isRollover != isRollover) {
             this.isRollover = isRollover;
@@ -270,4 +288,16 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
         }
 
     }
+
+    private class HorizontalNeverUIComboPopup extends UIComboPopup {
+
+        public HorizontalNeverUIComboPopup(JComboBox comboBox) {
+            super(comboBox);
+        }
+
+        @Override
+        protected JScrollPane createScroller() {
+            return new UIScrollPane(list, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        }
+    }
 }

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

@@ -3,8 +3,11 @@ package com.fr.design.gui.icontainer;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
 
-import javax.swing.*;
+import javax.swing.JScrollBar;
-import java.awt.*;
+import javax.swing.JScrollPane;
+import javax.swing.ScrollPaneConstants;
+import java.awt.Color;
+import java.awt.Component;
 
 /**
  * @author zhou
@@ -16,7 +19,11 @@ public class UIScrollPane extends JScrollPane {
     private static final int INCREAMENT = 30;
 
     public UIScrollPane(Component c) {
-        super(c, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        this(c, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+    }
+
+    public UIScrollPane(Component c, int vertical, int horizontal) {
+        super(c, vertical, horizontal);
         this.setHorizontalScrollBar(createHorizontalScrollBar());
         this.getVerticalScrollBar().setUnitIncrement(INCREAMENT);
         this.getVerticalScrollBar().setBlockIncrement(INCREAMENT);

designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java

@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
 public class JavaFxNativeFileChooser implements FileChooserProvider {
+    private static boolean showDialogState = false;
     private File[] selectedFiles = new File[0];
     private FileSelectionMode fileSelectionMode = FileSelectionMode.FILE;
     private String title = Toolkit.i18nText("Fine-Design_Basic_Open");
@@ -43,8 +44,17 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
         return null;
     }
 
+    public static boolean isShowDialogState() {
+        return showDialogState;
+    }
+
+    public static void setShowDialogState(boolean showDialogState) {
+        JavaFxNativeFileChooser.showDialogState = showDialogState;
+    }
+
     @Override
     public int showDialog(Component parent) {
+        setShowDialogState(true);
         final CountDownLatch latch = new CountDownLatch(1);
         PlatformImpl.startup(() -> {
         });

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

@@ -234,8 +234,8 @@ public class ComponentTitleStylePane extends AbstractBorderPackerPane {
         TitlePacker widgetTitle = style == null ? new WidgetTitle() : style.getTitle();
         widgetTitle = widgetTitle == null ? new WidgetTitle() : widgetTitle;
         boolean titleVisible = style != null && style.getType() != LayoutBorderStyle.STANDARD;
-        visibleCheckbox.setSelected(isSupportTitleContent && titleVisible);
+        visibleCheckbox.setSelected(isSupportTitleVisible && titleVisible);
-        titleContentPane.setVisible(titleVisible);
+        titleContentPane.setVisible(isSupportTitleContent && titleVisible);
         titleOtherSettingPane.setVisible(isSupportTitleOtherSetting && titleVisible);
 
         this.textContentPane.populateBean(widgetTitle.getTextObject().toString());

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

@@ -57,6 +57,7 @@ public class FollowingThemePane extends BasicPane implements UIObserver {
                 for (FollowingThemeActionChangeListener changeListener : changeListeners) {
                     changeListener.onFollowingTheme(isFollowingTheme());
                 }
+                invalidate();
 
                 // 与主题相关的属性面板更新完毕后，再通知外层更新数据
                 if (uiObserverListener != null) {

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

@@ -117,7 +117,9 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
 
     private JPanel initParamsPane() {
         extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
+        extendParametersCheckBox.setSelected(true);
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
+        parameterViewPane.setVisible(false);
         parameterViewPane.addTableEditorListener(new TableModelListener() {
             public void tableChanged(TableModelEvent e) {
                 List<ParameterProvider> list = parameterViewPane.update();
@@ -158,6 +160,7 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         customNameRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Filename_Custom"));
         addRadioToGroup(fileNameRadioGroup, defaultNameRadio, customNameRadio);
         fileNameFormulaEditor = new FormulaEditor(Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
+        fileNameFormulaEditor.setEnabled(false);
         fileNameRadioGroup.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -220,10 +223,8 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             @Override
             public void actionPerformed(ActionEvent e) {
                 if (currentTemplateRadio.isSelected()) {
-                    reportPathTextField.setEnabled(false);
                     browserButton.setEnabled(false);
                 } else {
-                    reportPathTextField.setEnabled(true);
                     browserButton.setEnabled(true);
                 }
             }
@@ -234,11 +235,13 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         JPanel reportletNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         // 路径输入框
         reportPathTextField = new UITextField(20);
+        reportPathTextField.setEnabled(false);
         reportletNamePane.add(reportPathTextField, BorderLayout.CENTER);
 
         // 选择路径按钮
         browserButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Select"));
         browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, 20));
+        browserButton.setEnabled(false);
         reportletNamePane.add(browserButton, BorderLayout.EAST);
         browserButton.addActionListener(new ActionListener() {
             @Override
@@ -272,10 +275,8 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         }
         this.templateRadioGroup.selectIndexButton(ob.isCurrentTemplate() ? 0 : 1);
         if (ob.isCurrentTemplate()) {
-            this.reportPathTextField.setEnabled(false);
             this.browserButton.setEnabled(false);
         } else {
-            this.reportPathTextField.setEnabled(true);
             this.browserButton.setEnabled(true);
             this.reportPathTextField.setText(ob.getTemplatePath());
         }

designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java

@@ -47,12 +47,12 @@ public class FRGUIPaneFactory {
     }
 
     /**
-     * 创建一个靠左的布局，上下间隔为0，左右间隔为常量
+     * 创建一个靠左的布局，上下间隔为0，左右间隔为常量，首间隔为0
      *
      * @return FlowLayout对象
      */
     public static LayoutManager createLeftZeroVgapNormalHgapLayout() {
-        return new FlowLayout(FlowLayout.LEFT, 5, 0);
+        return new FRLeftFlowLayout(0, 5, 0);
     }
 
 

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

@@ -92,9 +92,10 @@ import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.SwingConstants;
-import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.undo.UndoManager;
 import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
@@ -104,6 +105,7 @@ import java.util.concurrent.Callable;
 public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, DesignerProxy, JTemplateSave, TabChangeListener, ThemedTemplate {
     // TODO ALEX_SEP editingFILE这个属性一定要吗?如果非要不可,有没有可能保证不为null
 
+    private static final int PREDEFINED_ICON_WIDTH = 27;
     private static final int PREFIX_NUM = 3000;
     protected FILE editingFILE = null;
     // alex:初始状态为saved,这样不管是新建模板,还是打开模板,如果未做任何操作直接关闭,不提示保存
@@ -1421,8 +1423,15 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     protected UIButton createTemplateThemeButton() {
-        UIButton button = new UIButton(IOUtils.readIcon("/com/fr/design/icon/icon_predefined_style.png"));
+        UIButton button = new UIButton(IOUtils.readIcon("/com/fr/design/icon/icon_predefined_style.png")) {
-        button.setToolTipText(Toolkit.i18nText("Fine-Design_Template_Theme_Using_Dialog_Title"));
+            @Override
+            public Dimension getPreferredSize() {
+                FontMetrics metrics = getFontMetrics(getFont());
+                int width = Math.min(metrics.stringWidth(getText()) + PREDEFINED_ICON_WIDTH, 100);
+                return new Dimension(width, 20);
+            }
+        };
+        button.setToolTipText(getTemplateTheme().getName());
         button.setText(getTemplateTheme().getName());
         button.setAlignmentX(SwingConstants.LEFT);
         button.set4ToolbarButton();
@@ -1714,8 +1723,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         return runtimeId;
     }
 
-    private void setUpTheme4NewTemplate() {
+    protected void setUpTheme4NewTemplate() {
-        TemplateTheme theme = getUsingTemplateThemeConfig().getTheme4NewTemplate();
+        TemplateTheme theme = getUsingTemplateThemeConfig().cachedFetchTheme4NewTemplate();
         TemplateThemeAttrMark themeAttrMark = template.getAttrMark(TemplateThemeAttrMark.XML_TAG);
         if (themeAttrMark == null) {
             themeAttrMark = new TemplateThemeAttrMark();
@@ -1728,6 +1737,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     @Override
     public void setTemplateTheme(TemplateTheme newTheme, TemplateThemeCompatible compatible) {
         ThemedTemplate.super.setTemplateTheme(newTheme, compatible);
-        templateThemeButton.setText(newTheme.getName());
+        String name = newTheme.getName();
+        templateThemeButton.setText(name);
+        templateThemeButton.setToolTipText(name);
     }
 }

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

@@ -48,6 +48,7 @@ public class LogMessageBar extends JPanel {
 			public void mouseClicked(MouseEvent e) {
 				if (dlg != null && dlg.isVisible()) {
 					dlg.setExtendedState(JFrame.NORMAL);
+					dlg.requestFocus();
 					return;
 				}
 				dlg = new LogDetailPane().showDialog();

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

@@ -0,0 +1,86 @@
+package com.fr.design.mainframe.theme;
+
+import com.fr.base.theme.TemplateTheme;
+import com.fr.base.theme.TemplateThemeConfig;
+import com.fr.concurrent.NamedThreadFactory;
+import com.fr.module.ModuleContext;
+
+import java.util.concurrent.ExecutorService;
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/8/24
+ */
+public class AsyncThemeFetcher<T extends TemplateTheme> {
+
+    private final ExecutorService executorService;
+    private final TemplateThemeConfig<T> config;
+
+    public AsyncThemeFetcher(int threads, TemplateThemeConfig<T> config) {
+        this.executorService = ModuleContext.getExecutor().newFixedThreadPool(
+                threads,
+                new NamedThreadFactory(this.getClass().getName())
+        );
+        this.config = config;
+    }
+
+    public void shutdown() {
+        executorService.shutdown();
+    }
+
+    public boolean isShutdown() {
+        return executorService.isShutdown();
+    }
+
+    public void submit(String themeName, AsyncThemeFetchCallback<T> callback) {
+        callback.beforeCachedFetch();
+        executorService.submit(new Runnable() {
+            @Override
+            public void run() {
+                if (executorService.isShutdown()) {
+                    return;
+                }
+                T theme = config.cachedFetch(themeName, new TemplateThemeConfig.CacheCondition<T>() {
+                    @Override
+                    public boolean shouldCacheTheme(T theme) {
+                        return callback.shouldCache(AsyncThemeFetcher.this, theme);
+                    }
+                });
+                if (executorService.isShutdown()) {
+                    return;
+                }
+                callback.afterCachedFetch(theme);
+            }
+        });
+    }
+
+    public interface AsyncThemeFetchCallback<T extends TemplateTheme> {
+        void beforeCachedFetch();
+        boolean shouldCache(AsyncThemeFetcher<T> fetcher, T theme);
+        void afterCachedFetch(T theme);
+    }
+
+    public static class AsyncThemeFetchCallbackAdapter<T extends TemplateTheme> implements AsyncThemeFetchCallback<T> {
+
+        @Override
+        public void beforeCachedFetch() {
+
+        }
+
+        @Override
+        public boolean shouldCache(AsyncThemeFetcher<T> fetcher, T theme) {
+            // 如果Fetcher已经关闭就不放进缓存里了
+            // 因为可切换工作目录，所以submit时的工作目录环境与最终获取到主题数据时的工作目录环境可能不是同一个，
+            // 如果仍然放进缓存中，会污染当前工作目录环境的主题缓存.
+            // TODO: 除了根据asyncThemeFetch的关闭情况来判断是否缓存主题，也可以更加精细的判断前后的工作目录环境是否时同一个
+            // TODO: 后续看情况再优化吧.
+            return !fetcher.isShutdown();
+        }
+
+        @Override
+        public void afterCachedFetch(T theme) {
+
+        }
+    }
+}

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

@@ -5,6 +5,7 @@ import com.fr.base.theme.TemplateThemeConfig;
 import com.fr.base.theme.FormTheme;
 import com.fr.base.theme.settings.ThemedComponentStyle;
 import com.fr.base.theme.settings.ThemedFormBodyStyle;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.theme.edit.ComponentStyleEditPane;
 import com.fr.design.mainframe.theme.edit.FormBodyStyleEditPane;
 import com.fr.design.mainframe.theme.preview.FormThemePreviewPane;
@@ -87,4 +88,9 @@ public class FormThemeProfilePane extends TemplateThemeProfilePane<FormTheme> {
         ThemedComponentStyle componentStyle = componentStyleSettingPane.updateBean();
         theme.setComponentStyle(componentStyle);
     }
+
+    @Override
+    public String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Basic_Form_Theme_Profile_Dialog_Title");
+    }
 }

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

@@ -66,4 +66,9 @@ public class ReportThemeProfilePane extends TemplateThemeProfilePane<ReportTheme
     public void updateBean(ReportTheme theme) {
         theme.setBodyStyle(this.reportBodyStyleSettingPane.updateBean());
     }
+
+    @Override
+    public String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Basic_Report_Theme_Profile_Dialog_Title");
+    }
 }

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

@@ -23,8 +23,10 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Rectangle;
+import java.awt.RenderingHints;
 import java.awt.Window;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -47,6 +49,7 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
     private final Icon theme4currentTemplateMarkIcon = IOUtils.readIcon("/com/fr/design/form/images/theme4currentTemplate.png");
     private final Icon theme4NewTemplateMarkIcon= IOUtils.readIcon("/com/fr/design/form/images/theme4newTemplate.png");
     private final Icon profileIcon = IOUtils.readIcon("/com/fr/design/icon/icon_edit.png");
+    private final boolean displayTheme4NewTemplateMarker;
 
     private UILabel thumbnailLabel;
     // UIButton会影响Block的手势监听，这里使用UILabel代替，点击事件也有Block代为处理
@@ -55,16 +58,15 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
     private boolean hovering = false;
 
     private MouseAdapter clickListener;
-    private final ExecutorService asyncThemeFetcher;
 
     public TemplateThemeBlock(String name,
+                              boolean displayTheme4NewTemplateMarker,
                               TemplateThemeConfig<T> config,
-                              TemplateThemeProfilePane<T> profilePane,
+                              TemplateThemeProfilePane<T> profilePane) {
-                              ExecutorService asyncThemeFetcher) {
         this.name = name;
+        this.displayTheme4NewTemplateMarker = displayTheme4NewTemplateMarker;
         this.config = config;
         this.profilePane = profilePane;
-        this.asyncThemeFetcher = asyncThemeFetcher;
 
         initializePane();
         addMouseListener(new MouseAdapter() {
@@ -91,8 +93,6 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
                 repaint();
             }
         });
-
-        fetchTheme();
     }
 
     private void initializePane() {
@@ -109,7 +109,7 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
 
         UILabel titleLabel = new UILabel(name);
         titleLabel.setToolTipText(name);
-        infoPane.add(titleLabel, BorderLayout.WEST);
+        infoPane.add(titleLabel, BorderLayout.CENTER);
 
         if (profilePane != null) {
             addProfileButton(infoPane);
@@ -119,6 +119,21 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
         add(infoPane, BorderLayout.SOUTH);
     }
 
+    public void setTheme(T theme) {
+        this.theme = theme;
+        thumbnailLabel.setIcon(null);
+        if (theme != null) {
+            ThemeThumbnail thumbnail = theme.getThumbnail();
+            if (thumbnail != null) {
+                Image image = thumbnail.getImage();
+                if (image != null) {
+                    thumbnailLabel.setIcon(new ImageIcon(image));
+                }
+            }
+        }
+        repaint();
+    }
+
     public T getTheme() {
         return this.theme;
     }
@@ -166,62 +181,21 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
         profileDialog.setVisible(true);
     }
 
-    public void fetchTheme() {
-        if (asyncThemeFetcher.isShutdown()) {
-            return;
-        }
-        asyncThemeFetcher.submit(new Runnable() {
-            @Override
-            public void run() {
-                if (asyncThemeFetcher.isShutdown()) {
-                    return;
-                }
-
-                theme = null;
-                // 耗时的同步操作，如远程设计器场景
-                theme = config.cachedFetch(name, new TemplateThemeConfig.CacheCondition<T>() {
-                    @Override
-                    public boolean shouldCacheTheme(T theme) {
-                        // 如果Fetcher已经关闭就不放进缓存里了
-                        // 因为可切换工作目录，所以submit时的工作目录环境与最终获取到主题数据时的工作目录环境可能不是同一个，
-                        // 如果仍然放进缓存中，会污染当前工作目录环境的主题缓存.
-                        // TODO: 除了根据asyncThemeFetch的关闭情况来判断是否缓存主题，也可以更加精细的判断前后的工作目录环境是否时同一个
-                        // TODO: 后续看情况再优化吧.
-                        return !asyncThemeFetcher.isShutdown();
-                    }
-                });
-
-                if (asyncThemeFetcher.isShutdown()) {
-                    return;
-                }
-                if (theme != null) {
-                    ThemeThumbnail thumbnail = theme.getThumbnail();
-                    if (thumbnail != null) {
-                        Image image = thumbnail.getImage();
-                        if (image != null) {
-                            thumbnailLabel.setIcon(new ImageIcon(image));
-                        }
-                    }
-                }
-                repaint();
-            }
-        });
-    }
-
     @Override
     public void paint(Graphics g) {
         super.paint(g);
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         JTemplate<?,?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
         if (template != null) {
             TemplateThemeConfig<? extends TemplateTheme> templateUsingConfig = template.getUsingTemplateThemeConfig();
             TemplateTheme templateTheme = template.getTemplateTheme();
-            if (templateUsingConfig == this.config && StringUtils.equals(templateTheme.getName(), theme.getName())) {
+            if (templateUsingConfig == this.config && StringUtils.equals(templateTheme.getName(), name)) {
-                theme4currentTemplateMarkIcon.paintIcon(this, g, 176, 0);
+                theme4currentTemplateMarkIcon.paintIcon(this, g, getWidth() - 25, 0);
             }
         }
 
-        T theme4newTemplate = config.getTheme4NewTemplate();
+        if (displayTheme4NewTemplateMarker && StringUtils.equals(config.getThemeName4NewTemplate(), name)) {
-        if (StringUtils.equals(theme4newTemplate.getName(), name)) {
             theme4NewTemplateMarkIcon.paintIcon(this, g, 0, 0);
         }
 

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

@@ -2,14 +2,12 @@ package com.fr.design.mainframe.theme;
 
 import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.TemplateThemeConfig;
-import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.ChangeEvent;
 import com.fr.design.event.ChangeListener;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.module.ModuleContext;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
@@ -22,7 +20,6 @@ import java.awt.event.MouseEvent;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutorService;
 
 /**
  * @author Starryi
@@ -33,13 +30,11 @@ public class TemplateThemeListPane<T extends TemplateTheme> extends BasicPane {
     public static final int BLOCK_COUNT_ROW_LINE = 3;
     public static final int BLOCK_GAP = IntervalConstants.INTERVAL_L1;
     public static final int CONTENT_WIDTH = 630;
+    public static final int ASYNC_FETCH_THEME_THREAD_COUNT = 10;
 
-    private final ExecutorService asyncThemeFetcher =
+    private final AsyncThemeFetcher<T> asyncThemeFetcher;
-            ModuleContext.getExecutor().newFixedThreadPool(
-                    10,
-                    new NamedThreadFactory("TemplateThemeListPane")
-            );
 
+    private final boolean displayTheme4NewTemplateMarker;
     protected final TemplateThemeConfig<T> config;
     private final TemplateThemeProfilePane<T> profilePane;
     private final JPanel contentListPane;
@@ -53,10 +48,12 @@ public class TemplateThemeListPane<T extends TemplateTheme> extends BasicPane {
 
     private ChangeListener changeListener;
 
-    public TemplateThemeListPane(TemplateThemeConfig<T> config, TemplateThemeProfilePane<T> profilePane) {
+    public TemplateThemeListPane(boolean displayTheme4NewTemplateMarker, TemplateThemeConfig<T> config, TemplateThemeProfilePane<T> profilePane) {
+        this.displayTheme4NewTemplateMarker = displayTheme4NewTemplateMarker;
         this.config = config;
         this.profilePane = profilePane;
         this.contentListPane = new JPanel();
+        this.asyncThemeFetcher = new AsyncThemeFetcher<>(ASYNC_FETCH_THEME_THREAD_COUNT, config);
         initializePane();
     }
 
@@ -84,7 +81,7 @@ public class TemplateThemeListPane<T extends TemplateTheme> extends BasicPane {
             if (config.contains(name)) {
                 TemplateThemeBlock<T> block = createCachedTemplateThemeBlock(name);
                 contentListPane.add(block);
-                if (StringUtils.equals(name, config.getTheme4NewTemplate().getName())) {
+                if (StringUtils.equals(name, config.getThemeName4NewTemplate())) {
                     block4newTemplate = block;
                 }
             }
@@ -100,7 +97,7 @@ public class TemplateThemeListPane<T extends TemplateTheme> extends BasicPane {
     }
 
     private TemplateThemeBlock<T> createNewTemplateThemeBlock(String name) {
-        final TemplateThemeBlock<T> block = new TemplateThemeBlock<>(name, config, profilePane, asyncThemeFetcher);
+        final TemplateThemeBlock<T> block = new TemplateThemeBlock<>(name, displayTheme4NewTemplateMarker, config, profilePane);
         block.addClickListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
@@ -108,6 +105,19 @@ public class TemplateThemeListPane<T extends TemplateTheme> extends BasicPane {
                 setSelectedBlock(block);
             }
         });
+        asyncThemeFetcher.submit(name, new AsyncThemeFetcher.AsyncThemeFetchCallbackAdapter<T>() {
+            @Override
+            public void beforeCachedFetch() {
+                super.beforeCachedFetch();
+                block.setTheme(null);
+            }
+
+            @Override
+            public void afterCachedFetch(T theme) {
+                super.afterCachedFetch(theme);
+                block.setTheme(theme);
+            }
+        });
         return block;
     }
 
@@ -128,6 +138,10 @@ public class TemplateThemeListPane<T extends TemplateTheme> extends BasicPane {
         }
     }
 
+    private void asyncFetchTheme(String themeName) {
+        asyncThemeFetcher.submit(themeName, new AsyncThemeListItemFetchCallback(themeName));
+    }
+
     @Override
     protected String title4PopupWindow() {
         return null;
@@ -142,21 +156,22 @@ public class TemplateThemeListPane<T extends TemplateTheme> extends BasicPane {
             themeConfigChangeListener = new TemplateThemeConfig.ThemeConfigChangeListener() {
                 @Override
                 public void onThemeConfigChanged(TemplateThemeConfig.ThemeConfigEvent event) {
+                    String themeName = event.themName;
                     TemplateThemeBlock<T> existingBlock = blockCache.get(event.themName);
                     switch (event.action) {
                         case DEFAULT_THEME_4_NEW_TEMPLATE_UPDATE: {
                             if (block4newTemplate != null) {
-                                block4newTemplate.fetchTheme();
+                                block4newTemplate.repaint();
                             }
                             if (existingBlock != null) {
-                                existingBlock.fetchTheme();
+                                existingBlock.repaint();
                             }
                             block4newTemplate = existingBlock;
                             break;
                         }
                         case UPDATE: {
                             if (existingBlock != null) {
-                                existingBlock.fetchTheme();
+                                asyncFetchTheme(themeName);
                             }
                             break;
                         }
@@ -176,6 +191,7 @@ public class TemplateThemeListPane<T extends TemplateTheme> extends BasicPane {
                             if (existingBlock == null) {
                                 // TODO 这里是否还能继续优化?
                                 fillContentListPane();
+                                asyncFetchTheme(themeName);
                                 validate();
                                 repaint();
                             }
@@ -198,4 +214,29 @@ public class TemplateThemeListPane<T extends TemplateTheme> extends BasicPane {
     public void stopAsyncFetchTheme() {
         asyncThemeFetcher.shutdown();
     }
+
+    private class AsyncThemeListItemFetchCallback extends AsyncThemeFetcher.AsyncThemeFetchCallbackAdapter<T> {
+        private final String themeName;
+        public AsyncThemeListItemFetchCallback(String themeName) {
+            this.themeName = themeName;
+        }
+
+        @Override
+        public void beforeCachedFetch() {
+            super.beforeCachedFetch();
+            TemplateThemeBlock<T> block = blockCache.get(themeName);
+            if (block != null) {
+                block.setTheme(null);
+            }
+        }
+
+        @Override
+        public void afterCachedFetch(T theme) {
+            super.afterCachedFetch(theme);
+            TemplateThemeBlock<T> block = blockCache.get(themeName);
+            if (block != null) {
+                block.setTheme(theme);
+            }
+        }
+    }
 }

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

@@ -22,8 +22,6 @@ import com.fr.design.menu.ToolBarDef;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
-import com.fr.third.checkerframework.checker.nullness.qual.Nullable;
-import com.fr.third.guava.util.concurrent.FutureCallback;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
 
@@ -60,6 +58,8 @@ public class TemplateThemeManagePane<T extends TemplateTheme> extends BasicPane
     private final TemplateThemeListPane<T> themeListPane;
     private final TemplateThemeProfilePane<T> profilePane;
 
+    private final AsyncThemeFetcher<T> asyncThemeFetcher;
+
     public static TemplateThemeManagePane<FormTheme> createFormThemesManagerPane() {
         FormThemeConfig config = FormThemeConfig.getInstance();
         FormThemeProfilePane editPane = new FormThemeProfilePane(config);
@@ -75,9 +75,10 @@ public class TemplateThemeManagePane<T extends TemplateTheme> extends BasicPane
     public TemplateThemeManagePane(TemplateThemeConfig<T> config, TemplateThemeProfilePane<T> profilePane) {
         this.config = config;
         this.profilePane = profilePane;
-        this.themeListPane = new TemplateThemeListPane<>(config, profilePane);
+        this.themeListPane = new TemplateThemeListPane<>(true, config, profilePane);
         this.removeAction = new RemoveThemeAction(false);
-        this.setTheme4NewTemplateButton = new UIButton(Toolkit.i18nText("Fine-Design_Template_Theme_Manager_Pane_Default_Setting"));
+        this.setTheme4NewTemplateButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Pane_Default_Setting"));
+        this.asyncThemeFetcher = new AsyncThemeFetcher<>(1, config);
 
         initializePane();
     }
@@ -138,7 +139,7 @@ public class TemplateThemeManagePane<T extends TemplateTheme> extends BasicPane
             return;
         }
 
-        T currentTheme4NewTemplate = config.getTheme4NewTemplate();
+        T currentTheme4NewTemplate = config.cachedFetchTheme4NewTemplate();
         if (currentTheme4NewTemplate == null) {
             setTheme4NewTemplateButton.setEnabled(true);
             return;
@@ -169,9 +170,9 @@ public class TemplateThemeManagePane<T extends TemplateTheme> extends BasicPane
         setTheme4NewTemplateButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                T style = themeListPane.getSelectedTheme();
+                T theme = themeListPane.getSelectedTheme();
-                if (style != null) {
+                if (theme != null) {
-                    config.setTheme4NewTemplate(style.getName());
+                    config.setThemeName4NewTemplate(theme.getName());
                 }
             }
         });
@@ -190,15 +191,15 @@ public class TemplateThemeManagePane<T extends TemplateTheme> extends BasicPane
         MenuDef menuDef = new MenuDef(Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
         menuDef.setIconPath(IconPathConstants.ADD_POPMENU_ICON_PATH);
         menuDef.setRePaint(true);
-        menuDef.addShortCut(new AddThemeAction(Toolkit.i18nText("Fine-Design_Template_Theme_Manager_Pane_Create_Light_Theme"), config.getLightTheme4New()));
+        menuDef.addShortCut(new AddThemeAction(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Pane_Create_Light_Theme"), config.getLightThemeName4New()));
-        menuDef.addShortCut(new AddThemeAction(Toolkit.i18nText("Fine-Design_Template_Theme_Manager_Pane_Create_Dark_Theme"), config.getDarkTheme4New()));
+        menuDef.addShortCut(new AddThemeAction(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Pane_Create_Dark_Theme"), config.getDarkThemeName4New()));
 
         return menuDef;
     }
 
     @Override
     protected String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Design_Template_Theme_Manager_Dialog_Title");
+        return Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Title");
     }
 
     private class RemoveThemeAction extends UpdateAction {
@@ -213,8 +214,11 @@ public class TemplateThemeManagePane<T extends TemplateTheme> extends BasicPane
         @Override
         public void actionPerformed(ActionEvent e) {
             T theme = TemplateThemeManagePane.this.themeListPane.getSelectedTheme();
+            if (theme == null) {
+                return;
+            }
             int result = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(TemplateThemeManagePane.this),
-                    Toolkit.i18nText("Fine-Design_Template_Theme_Manager_Pane_Delete_Tip", theme.getName()),
+                    Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Pane_Delete_Tip", theme.getName()),
                     Toolkit.i18nText("Fine-Design_Basic_Delete"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (result == JOptionPane.YES_OPTION) {
                 Configurations.modify(new WorkerFacade(config.getClass()) {
@@ -228,20 +232,35 @@ public class TemplateThemeManagePane<T extends TemplateTheme> extends BasicPane
     }
 
     private class AddThemeAction extends UpdateAction {
-        private final T theme4New;
+        private T prototypeTheme;
 
-        public AddThemeAction(String name, T theme4New) {
+        public AddThemeAction(String name, String prototypeThemeName) {
             setName(name);
             setMnemonic('R');
-            this.theme4New = theme4New;
+            asyncThemeFetcher.submit(prototypeThemeName, new AsyncThemeFetcher.AsyncThemeFetchCallbackAdapter<T>() {
+                @Override
+                public void beforeCachedFetch() {
+                    super.beforeCachedFetch();
+                    prototypeTheme = null;
+                }
+
+                @Override
+                public void afterCachedFetch(T theme) {
+                    super.afterCachedFetch(theme);
+                    prototypeTheme = theme;
+                }
+            });
         }
 
         @Override
         public void actionPerformed(ActionEvent e) {
+            if (prototypeTheme == null) {
+                return;
+            }
             Window parent = SwingUtilities.getWindowAncestor(TemplateThemeManagePane.this);
             TemplateThemeProfileDialog<T> profileDialog = new TemplateThemeProfileDialog<>(parent, profilePane);
             try {
-                T theme = (T) theme4New.clone();
+                T theme = (T) prototypeTheme.clone();
                 theme.setName(StringUtils.EMPTY);
                 theme.setMutable(true);
                 theme.setRemovable(true);
@@ -287,6 +306,7 @@ public class TemplateThemeManagePane<T extends TemplateTheme> extends BasicPane
     }
 
     public void stopAsyncFetchTheme() {
+        asyncThemeFetcher.shutdown();
         themeListPane.stopAsyncFetchTheme();
     }
 }

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

@@ -25,6 +25,7 @@ import com.fr.design.mainframe.theme.edit.ui.ColorListPane;
 import com.fr.design.mainframe.theme.edit.ui.LabelUtils;
 import com.fr.design.mainframe.theme.ui.BorderUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
@@ -122,13 +123,13 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
 
     @Override
     public String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Design_Predefined_Style_Edit");
+        return Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Dialog_Title");
     }
 
     private JPanel createLeftPane() {
         JPanel titleContainer = FRGUIPaneFactory.createBorderLayout_S_Pane();
         titleContainer.setPreferredSize(new Dimension(LEFT_TITLE_PANE_WIDTH, LEFT_TITLE_PANE_HEIGHT));
-        titleContainer.setBorder(BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Template_Theme_Preview_Pane_Title"), TITLE_BORDER_FONT));
+        titleContainer.setBorder(BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Preview_Pane_Title"), TITLE_BORDER_FONT));
 
         JPanel previewContainer = FRGUIPaneFactory.createBorderLayout_S_Pane();
         previewContainer.setBorder(BorderFactory.createEmptyBorder(5, 4, 10, 4));
@@ -166,7 +167,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
     private JPanel createNameEditPane() {
         JPanel container = new JPanel(new BorderLayout(30, 0));
         container.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
-        container.add(LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Template_Theme_Edit_Pane_Name")), BorderLayout.WEST);
+        container.add(LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Name")), BorderLayout.WEST);
 
         JPanel settingContainer = new JPanel(new BorderLayout(10, 0));
         container.add(settingContainer, BorderLayout.CENTER);
@@ -235,11 +236,11 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
         double[] columnSize = {p, p};
 
         JPanel previewLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        previewLabelPane.add(LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Template_Theme_Edit_Pane_Color_Scheme_Preview_Label")), BorderLayout.NORTH);
+        previewLabelPane.add(LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Color_Scheme_Preview_Label")), BorderLayout.NORTH);
 
         JPanel content = TableLayoutHelper.createGapTableLayoutPane(new JComponent[][]{
-                        {LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Template_Theme_Edit_Pane_Color_Scheme_Edit_Label")), colorListPane},
+                        {LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Color_Scheme_Edit_Label")), colorListPane},
-                        {null, LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Template_Theme_Edit_Pane_Color_Scheme_Edit_Tip"), new Color(0XC6C6C6), 10)},
+                        {null, LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Color_Scheme_Edit_Tip"), new Color(0XC6C6C6), 10)},
                         {previewLabelPane, extendedContainer},
                 },
                 rowSize, columnSize, 18, 7);
@@ -247,7 +248,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
 
         JPanel borderContainer = new JPanel(new BorderLayout());
         borderContainer.setPreferredSize(new Dimension(COLOR_SCHEME_TITLE_PANE_WIDTH, COLOR_SCHEME_TITLE_PANE_HEIGHT));
-        borderContainer.setBorder(BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Template_Theme_Edit_Pane_Color_Scheme_Title")));
+        borderContainer.setBorder(BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Color_Scheme_Title")));
         borderContainer.add(content);
 
         JPanel container = new JPanel(new BorderLayout());
@@ -265,7 +266,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
     }
     protected JPanel createCustomEditorsPane() {
         JPanel container = new JPanel(new BorderLayout());
-        container.setBorder(BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Template_Theme_Edit_Pane_Custom_Settings_Title")));
+        container.setBorder(BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Custom_Settings_Title")));
 
         uiTabbedPane = new UITabbedPane();
         uiTabbedPane.setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 1));
@@ -311,7 +312,11 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
     }
 
     public void populateBean(T theme) {
-        this.theme = theme;
+        try {
+            this.theme = (T) theme.clone();
+        } catch (CloneNotSupportedException e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
         isPopulating = true;
 
         String name = theme.getName();
@@ -370,7 +375,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
 
     public UIButton createSaveButton() {
         saveButton = new UIButton();
-        saveButton.setText(Toolkit.i18nText("Fine-Design_Basic_Save"));
+        saveButton.setText(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_Save"));
         saveButton.setEnabled(false);
         saveButton.addActionListener(new ActionListener() {
             @Override
@@ -401,7 +406,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
     public UIButton createSaveAsButton(final TemplateThemeProfileDialog<T> profileDialog) {
         saveAsButton = new UIButton();
         saveAsButton.removeAll();
-        saveAsButton.setText(Toolkit.i18nText("Fine-Design_Basic_Predefined_Save_As_New"));
+        saveAsButton.setText(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_Save_As"));
         saveAsButton.setEnabled(false);
         saveAsButton.addActionListener(new ActionListener() {
             @Override
@@ -421,7 +426,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
         public SaveAsDialog(TemplateThemeProfileDialog<T> dialog) {
             super(dialog, ModalityType.APPLICATION_MODAL);
 
-            setTitle(Toolkit.i18nText("Fine-Design_Template_Theme_Save_As_Dialog_Title"));
+            setTitle(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Save_As_Dialog_Title"));
             setResizable(false);
             setSize(new Dimension(300, 140));
             GUICoreUtils.centerWindow(this);
@@ -448,26 +453,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
             confirmButton.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    T theme = updateBean();
+                    saveAsNew(nameTextField.getText());
-                    boolean canBeSaved = checkThemeCanBeSavedAndUpdateUI(true, nameTextField, nameErrorLabel, confirmButton);
-                    if (canBeSaved && theme != null) {
-                        theme.setName(nameTextField.getText());
-                        theme.setRemovable(true);
-                        theme.setMutable(true);
-                        Configurations.modify(new WorkerFacade(config.getClass()) {
-                            @Override
-                            public void run() {
-                                config.addTheme(theme, true);
-                            }
-                        }.addCallBack(new CallBackAdaptor() {
-                            @Override
-                            public void afterCommit() {
-                                super.afterCommit();
-                                exit();
-                                parent.exit();
-                            }
-                        }));
-                    }
                 }
             });
 
@@ -531,8 +517,9 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
             JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
             JPanel nameTextPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(20, 5);
+            nameTextPane.setBorder(BorderFactory.createEmptyBorder(20, 0, 0, 0));
+            nameTextPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Save_As_Pane_Name_Label")));
             nameTextPane.add(nameTextField);
-            nameTextPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Template_Theme_Save_As_Pane_Name_Label")));
 
             container.add(nameTextPane, BorderLayout.CENTER);
             container.add(nameErrorLabel, BorderLayout.SOUTH);
@@ -540,6 +527,36 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
             return container;
         }
 
+        private void saveAsNew(String name) {
+            T newThemeObject = null;
+            try {
+                newThemeObject = (T) updateBean().clone();
+            } catch (CloneNotSupportedException ex) {
+                FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
+                return;
+            }
+            boolean canBeSaved = checkThemeCanBeSavedAndUpdateUI(true, nameTextField, nameErrorLabel, confirmButton);
+            if (canBeSaved && newThemeObject != null) {
+                newThemeObject.setName(name);
+                newThemeObject.setRemovable(true);
+                newThemeObject.setMutable(true);
+                T finalNewThemeObject = newThemeObject;
+                Configurations.modify(new WorkerFacade(config.getClass()) {
+                    @Override
+                    public void run() {
+                        config.addTheme(finalNewThemeObject, true);
+                    }
+                }.addCallBack(new CallBackAdaptor() {
+                    @Override
+                    public void afterCommit() {
+                        super.afterCommit();
+                        exit();
+                        parent.exit();
+                    }
+                }));
+            }
+        }
+
         public void exit() {
             this.dispose();
         }
@@ -555,17 +572,14 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
         String error = StringUtils.EMPTY;
         String name = textField.getText();
         if (isThemeNameEmpty(name)) {
-            error = Toolkit.i18nText("Fine-Design_Template_Theme_Edit_Pane_Empty_Name_Error_Tip");
+            error = Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Empty_Name_Error_Tip");
         } else if (checkDuplicated && isThemeNameDuplicated(name)) {
-            error = Toolkit.i18nText("Fine-Design_Template_Theme_Edit_Pane_Duplicated_Name_Error_Tip");
+            error = Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Duplicated_Name_Error_Tip");
         }
         errorLabel.setText(error);
 
         boolean valid = StringUtils.isEmpty(error);
 
-        if (!valid) {
-            textField.requestFocus();
-        }
         errorLabel.setVisible(!valid);
         if (actionButtons != null && actionButtons.length > 0) {
             for (UIButton button : actionButtons) {

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

@@ -31,14 +31,14 @@ public class TemplateThemeManageDialog extends TemplateThemeDialog  {
     private final TemplateThemeManageDialogContentPane contentPane;
 
     public TemplateThemeManageDialog(Window parent) {
-        super(parent, Toolkit.i18nText("Fine-Design_Template_Theme_Manager_Dialog_Title"), CONTENT_WIDTH, CONTENT_HEIGHT);
+        super(parent, Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Title"), CONTENT_WIDTH, CONTENT_HEIGHT);
         contentPane = new TemplateThemeManageDialogContentPane();
 
         setContentPane(createDialogContentPane(contentPane, new UIButton[]{ createCompleteButton() }));
     }
 
     private UIButton createCompleteButton() {
-        UIButton button = new UIButton(Toolkit.i18nText("Fine-Design_Template_Theme_Manager_Dialog_Complete"));
+        UIButton button = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Complete"));
         button.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -70,8 +70,8 @@ public class TemplateThemeManageDialog extends TemplateThemeDialog  {
             reportThemesManagerPane = TemplateThemeManagePane.createReportThemesManagerPane();
             reportThemesManagerPane.startListenThemeConfig();
 
-            tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Template_Theme_Manager_Dialog_FORM_TAB"), formThemesManagerPane);
+            tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_FORM_TAB"), formThemesManagerPane);
-            tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Template_Theme_Manager_Dialog_REPORT_TAB"), reportThemesManagerPane);
+            tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_REPORT_TAB"), reportThemesManagerPane);
 
             tabbedPane.setSelectedIndex(0);
             JTemplate<?,?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();

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

@@ -40,7 +40,7 @@ public class TemplateThemeProfileDialog<T extends TemplateTheme> extends Templat
     public static final int CONTENT_HEIGHT = 570;
 
     public TemplateThemeProfileDialog(Window parent, TemplateThemeProfilePane<T> profilePane) {
-        super(parent, Toolkit.i18nText("Fine-Design_Template_Theme_Profile_Dialog_Title"), CONTENT_WIDTH, CONTENT_HEIGHT);
+        super(parent, profilePane.getTitle(), CONTENT_WIDTH, CONTENT_HEIGHT);
 
         JPanel content = FRGUIPaneFactory.createBorderLayout_S_Pane();
         content.setPreferredSize(new Dimension(CONTENT_WIDTH, CONTENT_HEIGHT));

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

@@ -12,6 +12,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.theme.TemplateThemeListPane;
 import com.fr.design.mainframe.theme.ui.BorderUtils;
 import com.fr.stable.StringUtils;
+import com.fr.workspace.WorkContext;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@@ -26,7 +27,8 @@ import java.awt.event.ActionListener;
  * @version 1.0
  * Created by Starryi on 2021/8/13
  */
-public class TemplateThemeUsingDialog<T extends TemplateTheme> extends TemplateThemeDialog {
+public class
+TemplateThemeUsingDialog<T extends TemplateTheme> extends TemplateThemeDialog {
     public static final int CONTENT_WIDTH = 660;
     public static final int CONTENT_HEIGHT = 515;
 
@@ -34,10 +36,10 @@ public class TemplateThemeUsingDialog<T extends TemplateTheme> extends TemplateT
     private final ThemedTemplate currentTemplate;
 
     public TemplateThemeUsingDialog(Window parent, ThemedTemplate template, TemplateThemeConfig<T> config) {
-        super(parent, Toolkit.i18nText("Fine-Design_Template_Theme_Using_Dialog_Title"), CONTENT_WIDTH, CONTENT_HEIGHT);
+        super(parent, Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Using_Dialog_Title"), CONTENT_WIDTH, CONTENT_HEIGHT);
 
         this.currentTemplate = template;
-        this.themeListPane = new TemplateThemeListPane<>(config, null);
+        this.themeListPane = new TemplateThemeListPane<>(false, config, null);
 
         JPanel content = createContent();
         UIButton openThemeManagerButton = createOpenThemeManagerButton();
@@ -97,7 +99,7 @@ public class TemplateThemeUsingDialog<T extends TemplateTheme> extends TemplateT
 
         JPanel themeListPaneContainer = FRGUIPaneFactory.createBorderLayout_S_Pane();
         themeListPaneContainer.setBorder(new CompoundBorder(
-                BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Template_Theme_Using_Dialog_Select"), 12),
+                BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Using_Dialog_Select"), 12),
                 BorderFactory.createEmptyBorder(0, 10, 0, 10)
         ));
         themeListPaneContainer.add(themeListPane, BorderLayout.CENTER);
@@ -107,23 +109,22 @@ public class TemplateThemeUsingDialog<T extends TemplateTheme> extends TemplateT
     }
 
     private UIButton createOpenThemeManagerButton() {
-        if (DesignModeContext.isAuthorityEditing()) {
+        if (WorkContext.getCurrent().isRoot()) {
-            // 权限编辑模式下，不显示打开主题管理对话框的按钮
+            UIButton button = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Title"));
-            return null;
+            button.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    TemplateThemeManageDialog dialog = new TemplateThemeManageDialog(TemplateThemeUsingDialog.this);
+                    dialog.setVisible(true);
+                }
+            });
+            return button;
         }
-        UIButton button = new UIButton(Toolkit.i18nText("Fine-Design_Template_Theme_Manager_Dialog_Title"));
+        return null;
-        button.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                TemplateThemeManageDialog dialog = new TemplateThemeManageDialog(TemplateThemeUsingDialog.this);
-                dialog.setVisible(true);
-            }
-        });
-        return button;
     }
 
     private UIButton createUsingCurrentThemeButton() {
-        UIButton button = new UIButton(Toolkit.i18nText("Fine-Design_Template_Theme_Using_Dialog_Use"));
+        UIButton button = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Using_Dialog_Use"));
         button.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -134,7 +135,7 @@ public class TemplateThemeUsingDialog<T extends TemplateTheme> extends TemplateT
     }
 
     private UIButton createCompleteButton() {
-        UIButton button = new UIButton(Toolkit.i18nText("Fine-Design_Template_Theme_Using_Dialog_Complete"));
+        UIButton button = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Using_Dialog_Complete"));
         button.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {

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

@@ -66,11 +66,13 @@ public class CellStyleListEditPane extends JListControlPane {
                 String[] allNames = nameableList.getAllNames();
                 allNames[index] = StringUtils.EMPTY;
                 if (StringUtils.isEmpty(newName)) {
-                    showTipDialogAndReset(i18nText("Fine-Design_Basic_Predefined_Style_Empty_Name"), index);
+                    showTipDialogAndReset(i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Cell_Style_Empty_Name_Tip"), index);
+                    nameableList.setNameAt(oldName, index);
                     return;
                 }
                 if (isNameRepeated(new List[]{Arrays.asList(allNames)}, newName)) {
-                    showTipDialogAndReset(i18nText("Fine-Design_Basic_Predefined_Style_Duplicate_Name", newName), index);
+                    showTipDialogAndReset(i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Cell_Style_Duplicated_Name_Tip", newName), index);
+                    nameableList.setNameAt(oldName, index);
                     return;
                 }
                 populateSelectedValue();
@@ -249,6 +251,7 @@ public class CellStyleListEditPane extends JListControlPane {
             super(i18nText("Fine-Design_Predefined_Cell_New_Style"), ThemedCellStyle.class, updatePane);
         }
 
+        @Override
         public Nameable createNameable(UnrepeatedNameHelper helper) {
             ThemedCellStyle cellStyle = new ThemedCellStyle();
             cellStyle.setName(menuName);
@@ -260,6 +263,7 @@ public class CellStyleListEditPane extends JListControlPane {
             return new NameObject(helper.createUnrepeatedName(this.menuName()), cellStyle);
         }
 
+        @Override
         public Object acceptObject2Populate(Object ob) {
             if (ob instanceof NameObject) {
                 ob = ((NameObject) ob).getObject();

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

@@ -43,9 +43,9 @@ public class ComponentStyleEditPane extends JPanel {
 
         JPanel content = new TabbedPane(
                 new String[] {
-                        Toolkit.i18nText("Fine-Design_Template_Theme_Edit_Pane_Component_Title"),
+                        Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Component_Title"),
-                        Toolkit.i18nText("Fine-Design_Template_Theme_Edit_Pane_Component_Body"),
+                        Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Component_Body"),
-                        Toolkit.i18nText("Fine-Design_Template_Theme_Edit_Pane_Component_Background")
+                        Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Component_Background")
                 },
                 new JComponent[] { createTabContainer(componentTitleStylePane), createTabContainer(componentBodyStylePane), createTabContainer(componentIntegralStylePane) }
         );
@@ -119,7 +119,7 @@ public class ComponentStyleEditPane extends JPanel {
 
         JPanel tipLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         tipLabelPane.setBorder(BorderFactory.createEmptyBorder(3, 0, 0, 0));
-        UILabel tipLabel = LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Template_Theme_Edit_Pane_Component_Style_Tip"), new Color(0XC6C6C6), 8);
+        UILabel tipLabel = LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Component_Style_Tip"), new Color(0XC6C6C6), 10);
         tipLabelPane.add(tipLabel);
         container.add(tipLabelPane, BorderLayout.NORTH);
 

designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/LabelUtils.java

@@ -1,8 +1,10 @@
 package com.fr.design.mainframe.theme.edit.ui;
 
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.general.FRFont;
 
 import java.awt.Color;
+import java.awt.Font;
 
 /**
  * @author Starryi
@@ -20,7 +22,8 @@ public class LabelUtils {
     public static UILabel createLabel(String title, Color color, int size) {
         UILabel uiLabel = new UILabel(title);
         uiLabel.setForeground(color);
-        uiLabel.setFont(uiLabel.getFont().deriveFont(size));
+        Font newFont = FRFont.getInstance(uiLabel.getFont().getFontName(), Font.PLAIN, size);
+        uiLabel.setFont(newFont);
         return uiLabel;
     }
 }

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

@@ -12,7 +12,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.theme.TemplateThemePreviewPane;
 import com.fr.design.mainframe.theme.preview.ecpreview.ECComponentPreviewPane;
-import com.fr.design.utils.ComponentUtils;
 import com.fr.general.Background;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.PiePlot4VanChart;
@@ -24,10 +23,10 @@ import com.fr.plugin.chart.type.RadiusType;
 import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
-
-import javax.swing.JComponent;
 import javax.swing.JPanel;
-import java.util.ArrayList;
+import java.awt.AlphaComposite;
+import java.awt.Composite;
+import java.awt.Graphics2D;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -44,6 +43,7 @@ public class FormThemePreviewPane extends TemplateThemePreviewPane<FormTheme> {
     private Background background;
     private ChartComponentPreviewPane columnChartPreviewPane;
     private ChartComponentPreviewPane pieChartPreviewPane;
+    private float alpha = 1.0F;
 
     public FormThemePreviewPane() {
         setLayout(FRGUIPaneFactory.createBorderLayout());
@@ -72,9 +72,9 @@ public class FormThemePreviewPane extends TemplateThemePreviewPane<FormTheme> {
             }
         };
         pieChartPanel.setLayout(new BorderLayout());
-        pieChartPreviewPane = createChartPreviewPane(initPieChart(), 300, 368);
+        pieChartPreviewPane = createChartPreviewPane(initPieChart(), 217, 368);
         pieChartPanel.add(pieChartPreviewPane, BorderLayout.CENTER);
-        chartContent.add(columnChartPanel, BorderLayout.WEST);
+        chartContent.add(columnChartPanel, BorderLayout.CENTER);
         chartContent.add(pieChartPanel, BorderLayout.EAST);
         return chartContent;
     }
@@ -89,6 +89,7 @@ public class FormThemePreviewPane extends TemplateThemePreviewPane<FormTheme> {
     @Override
     public void refresh(FormTheme theme) {
         background = theme.getBodyStyle().getStyle().getBackground();
+        alpha = theme.getBodyStyle().getStyle().getAlpha();
         elementCasePane.refresh(theme);
         columnChartPreviewPane.refresh(theme);
         pieChartPreviewPane.refresh(theme);
@@ -96,18 +97,19 @@ public class FormThemePreviewPane extends TemplateThemePreviewPane<FormTheme> {
     }
 
 
-    public void paint(Graphics g) {
+    @Override
-        // 禁止双缓冲
+    public void paintComponent(Graphics g) {
-        ArrayList<JComponent> dbcomponents = new ArrayList<JComponent>();
+        paintBackground((Graphics2D) g);
+    }
 
+    private void paintBackground(Graphics2D g2d) {
         if (background == null) {
             background = ColorBackground.getInstance(Color.WHITE);
         }
-        background.paint(g, new Rectangle2D.Double(0, 0, 517, 532));
+        Composite oldComposite = g2d.getComposite();
-        paintChildren(g);
+        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
-        // 恢复双缓冲
+        background.paint(g2d, new Rectangle2D.Double(0, 0, 517, 532));
-        ComponentUtils.resetBuffer(dbcomponents);
+        g2d.setComposite(oldComposite);
-
     }
 
     //柱形图

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

@@ -12,7 +12,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.theme.TemplateThemePreviewPane;
 import com.fr.design.mainframe.theme.preview.ecpreview.ECReportPreviewPane;
-import com.fr.design.utils.ComponentUtils;
 import com.fr.general.Background;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
@@ -21,8 +20,7 @@ import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
 import com.fr.plugin.chart.vanchart.VanChart;
 
-import javax.swing.JComponent;
+import java.awt.Graphics2D;
-import java.util.ArrayList;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Graphics;
@@ -57,19 +55,16 @@ public class ReportThemePreviewPane extends TemplateThemePreviewPane<ReportTheme
         chartPreviewPane.refresh(theme);
         repaint();
     }
+    @Override
+    public void paintComponent(Graphics g) {
+        paintBackground((Graphics2D) g);
+    }
 
-    public void paint(Graphics g) {
+    private void paintBackground(Graphics2D g2d) {
-        // 禁止双缓冲
-        ArrayList<JComponent> dbcomponents = new ArrayList<JComponent>();
-
         if (background == null) {
             background = ColorBackground.getInstance(Color.WHITE);
         }
-        background.paint(g, new Rectangle2D.Double(0, 0, 517, 532));
+        background.paint(g2d, new Rectangle2D.Double(0, 0, 517, 532));
-        paintChildren(g);
-        // 恢复双缓冲
-        ComponentUtils.resetBuffer(dbcomponents);
-
     }
 
 

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

@@ -0,0 +1,243 @@
+package com.fr.design.style.background.gradient;
+
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.style.background.BackgroundJComponent;
+import com.fr.general.Background;
+
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JWindow;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.awt.AWTEvent;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.AWTEventListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2021-08-24
+ */
+public abstract class AbstractComponentPopBox extends JComponent {
+
+    protected BackgroundJComponent displayComponent;
+
+    private JWindow selectPopupWindow;
+    private boolean isWindowEventInit = false;
+    private static int GAP = 2;
+    private static int GAP2 = 20;
+
+    private List<ChangeListener> changeListenerList = new ArrayList<ChangeListener>();
+
+    MouseAdapter mouseListener = new MouseAdapter() {
+        public void mousePressed(MouseEvent evt) {
+            showPopupMenu();
+        }
+
+
+    };
+
+    AWTEventListener awt = new AWTEventListener() {
+        public void eventDispatched(AWTEvent event) {
+            if (event instanceof MouseEvent) {
+                MouseEvent evt = (MouseEvent) event;
+                if (evt.getClickCount() > 0) {
+                    mouseClick(evt);
+                }
+            }
+        }
+    };
+
+    protected void showPopupMenu() {
+        if (selectPopupWindow != null && selectPopupWindow.isVisible()) {
+            hidePopupMenu();
+            return;
+        }
+
+        if (!this.isEnabled()) {
+            return;
+        }
+        Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK);
+
+        selectPopupWindow = this.getControlWindow();
+
+        Point convertPoint = new Point(0, 0);
+
+        // e: 将点(0,0)从ColorSelectionPane的坐标系统转换到屏幕坐标.
+        SwingUtilities.convertPointToScreen(convertPoint, this);
+        int y = convertPoint.y + this.getSize().height;
+        int x = convertPoint.x;
+        int h = y + selectPopupWindow.getHeight();
+        int width = x + selectPopupWindow.getWidth();
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+        if (h > screenSize.height) {
+            y = y - selectPopupWindow.getHeight() - GAP2;// 超过屏幕高度了
+        }
+
+        if (width > screenSize.width) {
+            x = screenSize.width - selectPopupWindow.getWidth();
+        }
+        selectPopupWindow.setLocation(x, y);
+
+        selectPopupWindow.setVisible(true);
+
+        //wei : 为了点击别的地方下拉颜色窗口消失
+        MouseAdapter parentMouseListener = new MouseAdapter() {
+            public void mousePressed(MouseEvent evt) {
+                mouseClick(evt);
+            }
+        };
+        if (!this.isWindowEventInit && SwingUtilities.getAncestorOfClass(GradientBackgroundPane.class, this) != null) {
+            SwingUtilities.getAncestorOfClass(GradientBackgroundPane.class, this).addMouseListener(parentMouseListener);
+            this.isWindowEventInit = true;
+        }
+    }
+
+    private void mouseClick(MouseEvent evt) {
+        Point point = new Point((int) (evt.getLocationOnScreen().getX()), (int) evt.getLocationOnScreen().getY());
+        Dimension popBoxD = AbstractComponentPopBox.this.getSize();
+        try {
+            Point popBoxP = AbstractComponentPopBox.this.getLocationOnScreen();
+            Dimension popMenuD = this.getControlWindow().getSize();
+            Point popMenuP = this.getControlWindow().getLocation();
+            Rectangle popBoxRect = new Rectangle(popBoxP, popBoxD);
+            Rectangle popMenuRect = new Rectangle(popMenuP, popMenuD);
+            if (!popBoxRect.contains(point) && !popMenuRect.contains(point)) {
+                this.hidePopupMenu();
+            }
+        } catch (Exception ignore) {
+            this.hidePopupMenu();
+        }
+    }
+
+    protected void hidePopupMenu() {
+        if (selectPopupWindow != null) {
+            selectPopupWindow.setVisible(false);
+        }
+
+        selectPopupWindow = null;
+        Toolkit.getDefaultToolkit().removeAWTEventListener(awt);
+    }
+
+    protected JWindow getControlWindow() {
+        //find parent.
+        if (this.selectPopupWindow == null) {
+            Window parentWindow = SwingUtilities.windowForComponent(this);
+            if (parentWindow != null) {
+                this.selectPopupWindow = new AbstractComponentPopBox.SelectControlWindow(parentWindow);
+            }
+
+            selectPopupWindow.addMouseListener(new MouseAdapter() {
+                public void mouseExited(MouseEvent evt) {
+                    int x = evt.getLocationOnScreen().x;
+                    int y = evt.getLocationOnScreen().y;
+
+                    if (selectPopupWindow != null) {
+                        double desValue = 2;
+                        Rectangle rectangle = selectPopupWindow.getBounds();
+                        boolean b1 = x < rectangle.x + desValue || x >= rectangle.x + rectangle.width - desValue;
+                        boolean b2 = y > rectangle.y + rectangle.height - desValue;//避免了鼠标下移刚进入selectPopupWindow的过程中弹出框隐藏,上移移出后由AbstractPopBox的mouseListener处理
+                        if (b1 || b2) {
+                            hidePopupMenu();
+                        }
+                    }
+                }
+            });
+        }
+
+        return selectPopupWindow;
+    }
+
+    /**
+     * 添加事件
+     *
+     * @param changeListener 事件
+     */
+    public void addSelectChangeListener(ChangeListener changeListener) {
+        this.changeListenerList.add(changeListener);
+    }
+
+    /**
+     * 删除事件
+     *
+     * @param changeListener 事件
+     */
+    public void removeSelectChangeListener(ChangeListener changeListener) {
+        this.changeListenerList.remove(changeListener);
+    }
+
+    /**
+     * 响应事件
+     */
+    public void fireChangeListener() {
+        if (!changeListenerList.isEmpty()) {
+            ChangeEvent evt = new ChangeEvent(this);
+            for (int i = 0; i < changeListenerList.size(); i++) {
+                this.changeListenerList.get(i).stateChanged(evt);
+            }
+        }
+    }
+
+    /**
+     * 待说明
+     *
+     * @param background 背景
+     */
+    public void fireDisplayComponent(Background background) {
+        if (displayComponent != null) {
+            displayComponent.setSelfBackground(background);
+        }
+        fireChangeListener();
+        this.repaint();
+    }
+
+    /**
+     * 初始化弹出框的面板
+     *
+     * @param preWidth 宽度
+     * @return 弹出面板
+     */
+    public abstract JPanel initWindowPane(double preWidth);
+
+    private class SelectControlWindow extends JWindow {
+        private static final long serialVersionUID = -5776589767069105911L;
+
+        public SelectControlWindow(Window paranet) {
+            super(paranet);
+            this.initComponents();
+        }
+
+        public void initComponents() {
+            JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+            this.setContentPane(defaultPane);
+
+//            defaultPane.setBorder(UIManager.getBorder("PopupMenu.border"));
+
+            if (displayComponent != null) {
+                defaultPane.add(initWindowPane(displayComponent.getPreferredSize().getWidth()));
+            } else {
+                defaultPane.add(initWindowPane(20));
+            }
+            this.pack();
+        }
+
+        @Override
+        public void setVisible(boolean b) {
+            super.setVisible(b);
+            AbstractComponentPopBox.this.repaint();
+        }
+    }
+
+    protected boolean isPopupVisible() {
+        return selectPopupWindow == null ? false : selectPopupWindow.isVisible();
+    }
+}

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

@@ -5,7 +5,6 @@ import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.itextfield.UINumberField;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.style.AbstractPopBox;
 import com.fr.design.style.color.ColorCell;
 import com.fr.design.style.color.ColorSelectDetailPane;
 import com.fr.design.style.color.ColorSelectDialog;
@@ -34,7 +33,7 @@ import java.awt.geom.Point2D;
 /**
  * TODO:面板缩放的功能没有考虑（就是尾值过大，导致超过界面显示的情况），原来的那个实现完全是个BUG。要缩放的情况也比较少，就干脆以后弄吧
  */
-public class GradientBar extends AbstractPopBox implements UIObserver, ColorSelectable {
+public class GradientBar extends AbstractComponentPopBox implements UIObserver, ColorSelectable {
 
     /**
      *

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

@@ -52,6 +52,7 @@ public class ColorSelectBox extends AbstractSelectBox<Color> implements UIObserv
     public JPanel initWindowPane(double preferredWidth) {
     	// 下拉的时候重新生成面板，刷新最近使用颜色
     	colorPane = getColorSelectPane();
+        colorPane.setColor(color);
         colorPane.addChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent e) {
                 hidePopupMenu();
@@ -59,7 +60,6 @@ public class ColorSelectBox extends AbstractSelectBox<Color> implements UIObserv
                 fireDisplayComponent(ColorBackground.getInstance(color));
             }
         });
-        colorPane.setColor(color);
         return colorPane;
     }
 

designer-base/src/main/java/com/fr/env/handler/WorkspaceExceptionHandler.java

@@ -68,7 +68,7 @@ public class WorkspaceExceptionHandler {
         if (workspaceInfo == null || workspaceInfo.getType() == DesignerWorkspaceType.Local) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
             if (e instanceof ExceptionDescriptor) {
-              new CommonHandler(true).handle(new RefWrapper(e, StringUtils.EMPTY));
+                new CommonHandler(true).handle(new RefWrapper(e, StringUtils.EMPTY));
             } else {
                 FineJOptionPane.showMessageDialog(EnvChangeEntrance.getInstance().getDialog(),
                                                   Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),

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

@@ -25,17 +25,19 @@ import com.fr.stable.AssistUtils;
 import com.fr.stable.StringUtils;
 
 import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.util.ArrayList;
+import java.awt.event.MouseAdapter;
-import java.util.Iterator;
+import java.awt.event.MouseEvent;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 图表 属性表, 类型选择 界面.
@@ -99,6 +101,19 @@ public class ChartTypePane extends AbstractChartAttrPane {
 
         buttonPane.setEditingChartPane(chartTypeComBox);
 
+        buttonPane.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                buttonPane.requestFocus();
+            }
+        });
+
+        chartTypeComBox.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                content.requestFocus();
+            }
+        });
         return content;
     }
 

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

@@ -72,6 +72,7 @@ public class ChartImagePane extends ChartSelectDemoPane {
         }else{
             this.isDoubleClicked = false;
         }
+        this.requestFocus();
         super.mouseClicked(e);
     }
 

designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java

@@ -1,8 +1,7 @@
 package com.fr.design.designer.beans.actions;
 
-
 import com.fr.design.base.mode.DesignModeContext;
-import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
+import com.fr.design.designer.beans.actions.behavior.CopyableEnable;
 import com.fr.design.mainframe.FormDesigner;
 
 import javax.swing.KeyStroke;
@@ -18,7 +17,7 @@ public class CopyAction extends FormWidgetEditAction {
         this.setMnemonic('C');
         this.setSmallIcon("/com/fr/design/images/m_edit/copy");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
-        setUpdateBehavior(new ComponentEnable());
+        setUpdateBehavior(new CopyableEnable());
         this.setEnabled(!DesignModeContext.isBanCopyAndCut());
     }
 

designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java

@@ -3,6 +3,7 @@ package com.fr.design.designer.beans.actions;
 
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
+import com.fr.design.designer.beans.actions.behavior.CutableEnable;
 import com.fr.design.mainframe.FormDesigner;
 
 import javax.swing.KeyStroke;
@@ -18,7 +19,7 @@ public class CutAction extends FormWidgetEditAction {
         this.setMnemonic('T');
         this.setSmallIcon("/com/fr/design/images/m_edit/cut");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
-        this.setUpdateBehavior(new ComponentEnable());
+        this.setUpdateBehavior(new CutableEnable());
         this.setEnabled(!DesignModeContext.isBanCopyAndCut());
     }
 

designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java

@@ -7,9 +7,7 @@ import java.awt.event.KeyEvent;
 
 import javax.swing.*;
 
-
+import com.fr.design.designer.beans.actions.behavior.DeletableEnable;
-import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
-
 import com.fr.design.mainframe.FormDesigner;
 
 /**
@@ -26,7 +24,7 @@ public class FormDeleteAction extends FormWidgetEditAction {
         // Richie:删除菜单图标
         this.setSmallIcon("/com/fr/design/images/m_report/delete");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
-        this.setUpdateBehavior(new ComponentEnable());
+        this.setUpdateBehavior(new DeletableEnable());
     }
 
     @Override

designer-form/src/main/java/com/fr/design/designer/beans/actions/behavior/CopyableEnable.java

@@ -0,0 +1,16 @@
+package com.fr.design.designer.beans.actions.behavior;
+
+import com.fr.design.designer.beans.actions.FormWidgetEditAction;
+import com.fr.design.mainframe.FormDesigner;
+
+public class CopyableEnable implements UpdateBehavior<FormWidgetEditAction> {
+    @Override
+    public void doUpdate(FormWidgetEditAction action) {
+        FormDesigner designer = action.getEditingComponent();
+        if (designer == null) {
+            action.setEnabled(false);
+            return;
+        }
+        action.setEnabled(designer.isCurrentComponentCopyable());
+    }
+}

designer-form/src/main/java/com/fr/design/designer/beans/actions/behavior/CutableEnable.java

@@ -0,0 +1,16 @@
+package com.fr.design.designer.beans.actions.behavior;
+
+import com.fr.design.designer.beans.actions.FormWidgetEditAction;
+import com.fr.design.mainframe.FormDesigner;
+
+public class CutableEnable implements UpdateBehavior<FormWidgetEditAction> {
+    @Override
+    public void doUpdate(FormWidgetEditAction action) {
+        FormDesigner designer = action.getEditingComponent();
+        if (designer == null) {
+            action.setEnabled(false);
+            return;
+        }
+        action.setEnabled(designer.isCurrentComponentCutable());
+    }
+}

designer-form/src/main/java/com/fr/design/designer/beans/actions/behavior/DeletableEnable.java

@@ -0,0 +1,16 @@
+package com.fr.design.designer.beans.actions.behavior;
+
+import com.fr.design.designer.beans.actions.FormWidgetEditAction;
+import com.fr.design.mainframe.FormDesigner;
+
+public class DeletableEnable implements UpdateBehavior<FormWidgetEditAction> {
+    @Override
+    public void doUpdate(FormWidgetEditAction action) {
+        FormDesigner designer = action.getEditingComponent();
+        if (designer == null) {
+            action.setEnabled(false);
+            return;
+        }
+        action.setEnabled(designer.isCurrentComponentDeletable());
+    }
+}

designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java

@@ -783,6 +783,12 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		// 不超过可绘制区域
 		int extraX = Math.min(creatorRightX, formDesignerWidth);
 		int extraY = creatorRightY < 0 ? 0 : Math.min(creatorRightY, formDesignerHeight);
+
+		if (designer.isFormParaDesigner() && extraY + this.getHeight() >= formDesignerHeight) {
+			popup.setVisible(false);
+			return;
+		}
+
 		// 放到事件尾部执行
 		SwingUtilities.invokeLater(new Runnable() {
 			@Override

designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java

@@ -103,6 +103,16 @@ public class XWParameterLayout extends XWAbsoluteLayout {
         return false;
     }
 
+    @Override
+    public boolean canEnterIntoAbsolutePane() {
+        return false;
+    }
+
+    @Override
+    public boolean canEnterIntoAdaptPane() {
+        return false;
+    }
+
     /**
      * 该组件是否可以拖拽(表单中参数面板和自适应布局不可以拖拽)
      * @return 是则返回true

designer-form/src/main/java/com/fr/design/designer/creator/XWTitleLayout.java

@@ -219,17 +219,26 @@ public class XWTitleLayout extends DedicateLayoutContainer {
 	public void convert() {
 		isRefreshing = true;
 		WTitleLayout layout = this.toData();
+		XBorderStyleWidgetCreator bodyCreator = null;
 		this.removeAll();
 		for (int i = 0, num = layout.getWidgetCount(); i < num; i++) {
 			BoundsWidget bw = (BoundsWidget) layout.getWidget(i);
 			if (bw != null) {
 				Rectangle bounds = bw.getBounds();
 				XWidgetCreator comp = (XWidgetCreator) XCreatorUtils.createXCreator(bw.getWidget());
-				String constraint = bw.getWidget().acceptType(Label.class) ? WTitleLayout.TITLE : WTitleLayout.BODY;
+				boolean isTitleWidget = bw.getWidget().acceptType(Label.class);
+				String constraint = isTitleWidget ? WTitleLayout.TITLE : WTitleLayout.BODY;
 				this.add(comp, constraint);
 				comp.setBounds(bounds);
+				if (!isTitleWidget && comp instanceof XBorderStyleWidgetCreator) {
+					bodyCreator = (XBorderStyleWidgetCreator) comp;
+				}
 			}
 		}
+		// 刷新时重置下样式
+		if (bodyCreator != null) {
+			bodyCreator.initStyle();
+		}
 		isRefreshing = false;
 	}
 

designer-form/src/main/java/com/fr/design/fit/JFormType.java

@@ -69,12 +69,12 @@ public enum JFormType {
     };
     private int type;
     private boolean newType;
-    private PreviewProvider previewType;
+    private PreviewProvider defaultPreviewType;
 
-    JFormType(int type, PreviewProvider previewType) {
+    JFormType(int type, PreviewProvider defaultPreviewType) {
         this.type = type;
         this.newType = (type == 1);
-        this.previewType = previewType;
+        this.defaultPreviewType = defaultPreviewType;
     }
 
     public int getType() {
@@ -85,8 +85,8 @@ public enum JFormType {
         return newType;
     }
 
-    public PreviewProvider getPreviewType() {
+    public PreviewProvider getDefaultPreviewType() {
-        return previewType;
+        return defaultPreviewType;
     }
 
     public abstract void switchUI();
@@ -128,6 +128,14 @@ public enum JFormType {
      * @date: 2020/12/17 16:17
      */
     public void updatePreviewType(JTemplate jTemplate) {
-        jTemplate.setPreviewType(this.getPreviewType());
+        if (jTemplate.getPreviewType() != null) {
+            PreviewProvider[] previewProviders = jTemplate.supportPreview();
+            for (PreviewProvider previewProvider : previewProviders) {
+                if (previewProvider.getClass() == jTemplate.getPreviewType().getClass()) {
+                    return;
+                }
+            }
+        }
+        jTemplate.setPreviewType(this.getDefaultPreviewType());
     }
 }

designer-form/src/main/java/com/fr/design/fit/common/TemplateTool.java

@@ -39,6 +39,7 @@ public class TemplateTool {
         @Override
         public void on(Event event, JTemplate jTemplate) {
             if (!(jTemplate instanceof JForm)) {
+                JFormType.OLD_TYPE.switchUIMode();
                 return;
             }
             JFormType currentType = JFormType.OLD_TYPE;

designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java

@@ -745,5 +745,13 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
         return false;
     }
 
+    @Override
+    public boolean isCurrentComponentCutable() {
+        return !isRootSelected();
+    }
 
+    @Override
+    public boolean isCurrentComponentCopyable() {
+        return !isRootSelected();
+    }
 }

designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java

@@ -36,6 +36,9 @@ public class FormDesignerUtils {
      * @return
      */
     public static boolean isBodyAbsolute(FormDesigner designer) {
+        if (!designer.getRootComponent().acceptType(XWFitLayout.class)) {
+            return false;
+        }
         WFitLayout root = ((WFitLayout) designer.getRootComponent().toData());
         return root.getBodyLayoutType() == com.fr.form.ui.container.WBodyLayoutType.ABSOLUTE;
     }

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

@@ -175,14 +175,12 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         double[] rowSize = {f};
         double[] columnSize = {p, f, p, p, p, p, p, f, p};
         UILabel tipsPane = new UILabel("form");
-        tipsPane.setPreferredSize(new Dimension(265, 0));
         widthPane = new UINumberField();
         widthPane.setPreferredSize(new Dimension(60, 0));
         heightPane = new UINumberField();
         heightPane.setPreferredSize(new Dimension(60, 0));
 
         slidePane = JFormSliderPane.getInstance();
-        slidePane.setPreferredSize(new Dimension(326, 20));
 
         JPanel resizePane = TableLayoutHelper.createCommonTableLayoutPane(
                 new JComponent[][]{{tipsPane, new UILabel(), widthPane,

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

@@ -110,6 +110,10 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
             Arrays.asList(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete")})
     );
 
+    protected static final ArrayList<String> PARAMETER_TOOLAR_BAN_LIST = new ArrayList<String>(
+            Arrays.asList(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy")})
+    );
+
 
     private double scale = 1.0D;
     //底层容器的默认大小
@@ -1267,6 +1271,11 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         return isForm || isRoot(getSelectionModel().getSelection().getSelectedCreator());
     }
 
+    public boolean isParameterSelected() {
+        XCreator xCreator =  getSelectionModel().getSelection().getSelectedCreator();
+        return xCreator != null && xCreator.acceptType(XWParameterLayout.class);
+    }
+
     /**
      * 显示权限编辑界面
      */
@@ -1300,6 +1309,10 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     protected void setToolbarButtons() {
         //自适应布局和底层都不能删除
         DesignerContext.getDesignerFrame().checkCombineUp(!isRootSelected(), NAME_ARRAY_LIST);
+
+        if (isParameterSelected()) {
+            DesignerContext.getDesignerFrame().checkCombineUp(false, PARAMETER_TOOLAR_BAN_LIST);
+        }
     }
 
     private void invalidateLayout() {
@@ -1385,6 +1398,18 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         }
     }
 
+    public boolean isCurrentComponentCutable() {
+        return !(isRootSelected() || isParameterSelected());
+    }
+
+    public boolean isCurrentComponentCopyable() {
+        return !(isRootSelected() || isParameterSelected());
+    }
+
+    public boolean isCurrentComponentDeletable() {
+        return !isRootSelected();
+    }
+
     // 当前选中控件可以上移一层吗？
     public boolean isCurrentComponentMovableUp() {
         XCreator creator = getSelectionModel().getSelection().getSelectedCreator();

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

@@ -10,6 +10,7 @@ import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.creator.XWFitLayout;
+import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.designer.creator.XWScaleLayout;
 import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
@@ -60,6 +61,11 @@ public class FormSelectionUtils {
      */
     public static void paste2Container(FormDesigner designer, XLayoutContainer parent,
                                        FormSelection clipboard, int x, int y) {
+        clipboard = filterFormSelection(clipboard, parent);
+        if (clipboard.isEmpty()) {
+            Toolkit.getDefaultToolkit().beep();
+            return;
+        }
         LayoutAdapter adapter = parent.getLayoutAdapter();
         if (parent instanceof XWAbsoluteLayout) {
             //绝对布局
@@ -77,6 +83,27 @@ public class FormSelectionUtils {
         Toolkit.getDefaultToolkit().beep();
     }
 
+    private static FormSelection filterFormSelection(FormSelection clipboard, XLayoutContainer parent) {
+        FormSelection newSelection = new FormSelection();
+        for (XCreator xCreator : clipboard.getSelectedCreators()) {
+            if (parent.acceptType(XWParameterLayout.class)) {
+                if (xCreator.canEnterIntoParaPane()) {
+                    newSelection.addSelectedCreator(xCreator);
+                }
+            } else if (parent.acceptType(XWAbsoluteLayout.class)) {
+                if (xCreator.canEnterIntoAbsolutePane()) {
+                    newSelection.addSelectedCreator(xCreator);
+                }
+            } else if (parent.acceptType(XWFitLayout.class)) {
+                if (xCreator.canEnterIntoAdaptPane()) {
+                    newSelection.addSelectedCreator(xCreator);
+                }
+            }
+
+        }
+        return newSelection;
+    }
+
     private static boolean isExtraContainer(XLayoutContainer parent) {
         if (parent != null) {
             Set<FormWidgetOptionProvider> set = ExtraDesignClassManager.getInstance().getArray(FormWidgetOptionProvider.XML_TAG);

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

@@ -140,7 +140,6 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
 
     public JForm() {
         super(new Form(new WBorderLayout("form")), "Form");
-//        setTemplateTheme(getUsingTemplateThemeConfig().getDefaultTheme4NewTemplate());
     }
 
     public JForm(Form form, FILE file, Parameter[] parameters) {
@@ -1168,6 +1167,12 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
         }
     }
 
+    @Override
+    protected void setUpTheme4NewTemplate() {
+        super.setUpTheme4NewTemplate();
+        getTarget().setTemplateTheme(getTarget().getTemplateTheme());
+    }
+
     @Override
     public TemplateThemeConfig<? extends TemplateTheme> getUsingTemplateThemeConfig() {
         return getTarget().getUsingTemplateThemeConfig();
@@ -1185,10 +1190,12 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
 
         getTarget().setTemplateTheme(newTheme, compatible);
 
+        formDesign.refreshRoot();
+        FormHierarchyTreePane.getInstance().refreshRoot();
+        if (this.index != FORM_TAB) {
+            refreshToolArea();
+        }
         fireTargetModified(shouldCreateUndoState);
-        JForm.this.refreshRoot();
-        refreshToolArea();
-        TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView();
 
         super.setTemplateTheme(newTheme, compatible);
     }

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetRepoPane.java

@@ -14,6 +14,7 @@ import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import javax.swing.JTextField;
 import javax.swing.SwingConstants;
 import javax.swing.SwingWorker;
 import java.awt.BorderLayout;
@@ -164,9 +165,14 @@ public class OnlineWidgetRepoPane extends BasicPane {
         tipLabel1.setForeground(Color.decode("#8F8F92"));
         UILabel tipLabel2 = tipLabel(Toolkit.i18nText("Fine-Design_Share_Internet_Connect_Failed_Tip2"));
         tipLabel2.setForeground(Color.decode("#8F8F92"));
-        UILabel tipLabel3 = tipLabel(MARKET_URL);
-        tipLabel3.setForeground(Color.decode("#8F8F92"));
 
+        JTextField tipLabel3 = new JTextField(MARKET_URL);
+        tipLabel3.setHorizontalAlignment(JTextField.CENTER);
+        tipLabel3.setPreferredSize(new Dimension(240, 20));
+        tipLabel3.setEditable(false);
+        tipLabel3.setForeground(Color.decode("#8F8F92"));
+        tipLabel3.setBackground(null);
+        tipLabel3.setBorder(null);
 
         UILabel emptyLabel = tipLabel(StringUtils.EMPTY);
         panel.add(uiLabel);

designer-realize/src/main/java/com/fr/design/actions/cell/CellStyleAttrAction.java

@@ -0,0 +1,26 @@
+package com.fr.design.actions.cell;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.menu.KeySetUtils;
+import com.fr.general.IOUtils;
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/8/26
+ */
+public class CellStyleAttrAction extends CellAttributeTableAction {
+
+    public CellStyleAttrAction() {
+        this.setMenuKeySet(KeySetUtils.GLOBAL_STYLE);
+        this.setName(getMenuKeySet().getMenuKeySetName());
+        this.setMnemonic(getMenuKeySet().getMnemonic());
+        this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_format/cell.png"));
+    }
+
+    @Override
+    protected String getID() {
+        return Toolkit.i18nText("Fine-Design_Form_Widget_Style");
+    }
+}

designer-realize/src/main/java/com/fr/design/actions/cell/CustomCellStyleAction.java

@@ -0,0 +1,22 @@
+package com.fr.design.actions.cell;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.CellElementPropertyPane;
+
+import java.awt.event.ActionEvent;
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/8/26
+ */
+public class CustomCellStyleAction extends CellStyleAttrAction {
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        CellElementPropertyPane.getInstance().GoToPane(
+                Toolkit.i18nText("Fine-Design_Report_Engine_Style"),
+                Toolkit.i18nText("Fine-Design_Report_Engine_Custom")
+        );
+    }
+}

designer-realize/src/main/java/com/fr/design/actions/cell/GlobalStyleMenuDef.java

@@ -28,6 +28,13 @@ import java.awt.event.ContainerEvent;
 import java.awt.event.ContainerListener;
 import java.util.List;
 
+/**
+ * 11.beta.1
+ * REPORT-51919 主题切换
+ * REPORT-58062 【主题切换】细节定制-单元格样式-样式数量较多，菜单栏中选择时没有滚动条
+ * 模版主题化后，该菜单列表废弃，点击工具栏-单元格-样式菜单将直接跳转到右侧栏单元格样式面板
+ * @deprecated
+ */
 public class GlobalStyleMenuDef extends MenuDef {
     private static final int MAX_LENTH = 12;
     private ElementCasePane ePane;

designer-realize/src/main/java/com/fr/design/actions/cell/StyleAction.java

@@ -12,6 +12,11 @@ import com.fr.design.mainframe.CellElementPropertyPane;
 import com.fr.design.menu.KeySetUtils;
 
 
+/**
+ * 11.beta.1
+ * REPORT-51919 主题切换
+ * @deprecated
+ */
 public class StyleAction extends UpdateAction {
 
 	public StyleAction() {

designer-realize/src/main/java/com/fr/design/actions/server/TemplateThemeManagerAction.java

@@ -42,7 +42,7 @@ public class TemplateThemeManagerAction extends SnapChatUpdateAction {
 
         @Override
         public String getMenuName() {
-            return Toolkit.i18nText("Fine-Design_Template_Theme_Manager_Dialog_Title");
+            return Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Title");
         }
 
         @Override

designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java

@@ -107,17 +107,17 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
         // 移动端弹窗
         MobilePopupPane mobilePopupPane = new MobilePopupPane();
         hyperlinkPane.add(MOBILEPOPUP, mobilePopupPane);
-        // 导出事件
-        if (workbook) {
-            ExportJavaScriptPane exportJavaScriptPane = new ExportJavaScriptPane();
-            hyperlinkPane.add(EXPORT, exportJavaScriptPane);
-            cards.add(exportJavaScriptPane);
-        }
         cards.add(javaScriptPane);
         cards.add(commit2DBJavaScriptPane);
         cards.add(customActionPane);
         cards.add(emailPane);
         cards.add(mobilePopupPane);
+        // 导出事件 这里要按顺序添加
+        if (workbook) {
+            ExportJavaScriptPane exportJavaScriptPane = new ExportJavaScriptPane();
+            hyperlinkPane.add(EXPORT, exportJavaScriptPane);
+            cards.add(exportJavaScriptPane);
+        }
         //其他事件
         addOtherEvent();
         hyperlinkPane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_JavaScript_Set")));

designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneDelegate.java

@@ -5,9 +5,9 @@ import com.fr.design.DesignState;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.cell.CellAttributeAction;
 import com.fr.design.actions.cell.CellExpandAttrAction;
+import com.fr.design.actions.cell.CellStyleAttrAction;
 import com.fr.design.actions.cell.CellWidgetAttrAction;
 import com.fr.design.actions.cell.ConditionAttributesAction;
-import com.fr.design.actions.cell.GlobalStyleMenuDef;
 import com.fr.design.actions.columnrow.InsertColumnAction;
 import com.fr.design.actions.columnrow.InsertRowAction;
 import com.fr.design.actions.core.ActionFactory;
@@ -201,7 +201,7 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
         MenuDef menuDef = new MenuDef(KeySetUtils.CELL.getMenuKeySetName(), KeySetUtils.CELL.getMnemonic());
 
         menuDef.addShortCut(new CellExpandAttrAction());
-        menuDef.addShortCut(new GlobalStyleMenuDef(this));
+        menuDef.addShortCut(new CellStyleAttrAction());
         // 单元格形态
         menuDef.addShortCut(DeprecatedActionManager.getPresentMenu(this));
 

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -1269,6 +1269,13 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
         }
     }
 
+    @Override
+    protected void setUpTheme4NewTemplate() {
+        super.setUpTheme4NewTemplate();
+        getTarget().setTemplateTheme(getTarget().getTemplateTheme());
+    }
+
+
     @Override
     public TemplateThemeConfig<? extends TemplateTheme> getUsingTemplateThemeConfig() {
         return getTarget().getUsingTemplateThemeConfig();

designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java

@@ -45,7 +45,12 @@ class CptApp extends AbstractWorkBookApp {
 
     @Override
     public WorkBook asIOFile(FILE file) {
-        return asIOFile(file, true);
+        // 11.beta.1
+        // REPORT-51919 主题切换
+        // REPORT-57943 【主题切换】10.0自定义的预定义样式，模板放11.0上，配置丢失
+        // 11.beta.1 模版主题功能后，预定义单元格样式功能废弃，所有预定义单元格样式将被统一放置到"兼容主题"中，
+        // 对于本地不存在的预定义单元格样式，将会被设置为兼容主题中默认单元格样式，因此这里不需要再执行检查
+        return asIOFile(file, false);
     }
 
     @Override

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

@@ -70,7 +70,7 @@ public class CellStylePane extends AbstractCellAttrPane {
     @Override
     public void updateBeans() {
         Object[] selectionCellBorderObjects = BorderUtils.createCellBorderObject(elementCasePane);
-        if (stylePane.getSelectedIndex() == 1) {
+        if (stylePane.getSelectedIndex() == 0) {
             Style s = stylePane.updateBean();
             TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
             int cellRectangleCount = cs.getCellRectangleCount();

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

@@ -1,35 +1,155 @@
 package com.fr.design.mainframe.cell.settingpane.style;
 
-import java.util.ArrayList;
+import com.fr.base.NameStyle;
-import java.util.List;
+import com.fr.base.Style;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.ElementCasePane;
+import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
 import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-import com.fr.base.Style;
+public class StylePane extends BasicPane {
-import com.fr.design.beans.FurtherBasicBeanPane;
+	public static final String[] FOLLOWING_THEME_STRING_ARRAYS = new String[]{
-import com.fr.design.gui.frpane.UIComboBoxPane;
+			Toolkit.i18nText("Fine-Design_Style_Follow_Theme"),
-import com.fr.general.ComparatorUtils;
+			Toolkit.i18nText("Fine-Design_Style_Not_Follow_Theme"),
+	};
+	public static final int DEFAULT_SELECTED_INDEX = 0;
 
-import com.fr.design.mainframe.ElementCasePane;
+	private final UIButtonGroup<String> followingThemeButtonGroup;
+	private final CustomStylePane customStylePane;
+	private final ThemedCellStyleListPane themedCellStyleListPane;
+	private final CardLayout cardLayout;
+	private final JComponent[] panes = new JComponent[2];
+
+	private JPanel contentPane;
+
+	public StylePane() {
+		followingThemeButtonGroup = new UIButtonGroup<>(FOLLOWING_THEME_STRING_ARRAYS);
+		customStylePane = new CustomStylePane();
+		themedCellStyleListPane = new ThemedCellStyleListPane();
+		panes[0] = createThemedStylePane();
+		panes[1] = createCustomStylePane();
+		cardLayout = new CardLayout();
+
+		initializePane();
+	}
+
+	private void initializePane() {
+		setLayout(new BorderLayout(0, IntervalConstants.INTERVAL_L1));
+
+		add(createFollowingThemePane(), BorderLayout.NORTH);
+		contentPane = createTabbedContentPane();
+		add(contentPane, BorderLayout.CENTER);
+	}
+
+	private JPanel createFollowingThemePane() {
+		followingThemeButtonGroup.setSelectedIndex(DEFAULT_SELECTED_INDEX);
+		followingThemeButtonGroup.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				int selectedIndex = followingThemeButtonGroup.getSelectedIndex();
+				cardLayout.show(contentPane, FOLLOWING_THEME_STRING_ARRAYS[selectedIndex]);
+				if (selectedIndex == 1) {
+					// 对于同一个单元格，跟随主题切换到自定义，若跟随主题面板有选中项，则自定义中的配置与其保持一致，否则自定义中配置保持不变
+					NameStyle lastSelectedNameStyle = themedCellStyleListPane.updateBean();
+					if (lastSelectedNameStyle != null) {
+						Style lastSelectedRealStyle = lastSelectedNameStyle.getRealStyle();
+						try {
+							lastSelectedRealStyle = (Style) lastSelectedRealStyle.clone();
+							if (lastSelectedRealStyle != null) {
+								customStylePane.populateBean(lastSelectedRealStyle);
+							}
+						} catch (CloneNotSupportedException ex) {
+							FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
+						}
+					}
+				} else {
+					// 对于同一个单元格，自定义切换到跟随主题，跟随主题应当清除选中项，即没有选中任何主题中的单元格样式，
+					// 因为还未选中，所以自定义中的配置保持不变，此时若用户切换会自定义，配置应当与之前一样
+					themedCellStyleListPane.populateBean(null);
+				}
+			}
+		});
+
+		UILabel uiLabel = new UILabel(Toolkit.i18nText("Fine-Design_Style_Setting"));
+
+		double p = TableLayout.PREFERRED;
+		double f = TableLayout.FILL;
+
+		return TableLayoutHelper.createGapTableLayoutPane(
+				new Component[][]{ new Component[] { uiLabel, followingThemeButtonGroup} },
+				new double[] { p }, new double[] { p, f},
+				IntervalConstants.INTERVAL_L1, 0);
+	}
+
+	protected JPanel createTabbedContentPane() {
+		JPanel contentPane = new JPanel(cardLayout) {
+			@Override
+			public Dimension getPreferredSize() {
+				int selectedIndex = followingThemeButtonGroup.getSelectedIndex();
+				if (selectedIndex < 0) {
+					return super.getPreferredSize();
+				} else {
+					return panes[selectedIndex].getPreferredSize();
+				}
+			}
+		};
+		for (int i = 0; i < FOLLOWING_THEME_STRING_ARRAYS.length; i++) {
+			contentPane.add(panes[i], FOLLOWING_THEME_STRING_ARRAYS[i]);
+		}
+		cardLayout.show(contentPane, FOLLOWING_THEME_STRING_ARRAYS[DEFAULT_SELECTED_INDEX]);
+
+		return contentPane;
+	}
+
+	private JPanel createThemedStylePane() {
+		JPanel container = new JPanel(new BorderLayout(0, IntervalConstants.INTERVAL_L1));
+		UILabel uiLabel = new UILabel(Toolkit.i18nText("Fine-Design_Style_Selecting"));
+		uiLabel.setPreferredSize(new Dimension(uiLabel.getPreferredSize().width, 20));
+		container.add(uiLabel, BorderLayout.NORTH);
+		themedCellStyleListPane.setBorder(BorderFactory.createEmptyBorder());
+		UIScrollPane scrollPane = new UIScrollPane(themedCellStyleListPane);
+		container.add(scrollPane, BorderLayout.CENTER);
+		return container;
+	}
 
-public class StylePane extends UIComboBoxPane<Style> {
+	private JPanel createCustomStylePane() {
-	private CustomStylePane customStylePane;
+		return customStylePane;
-	private ThemedCellStyleListPane themedCellStyleListPane;
+	}
 
 	@Override
 	protected String title4PopupWindow() {
 		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style");
 	}
 
-	@Override
+	public void setSelectedIndex(int index) {
-	protected void comboBoxItemStateChanged() {
+		if (0 <= index && index < FOLLOWING_THEME_STRING_ARRAYS.length) {
-		if (jcb.getSelectedIndex() == 0 && themedCellStyleListPane.updateBean() != null) {
+			followingThemeButtonGroup.setSelectedIndex(index);
-			customStylePane.populateBean(themedCellStyleListPane.updateBean());
+			cardLayout.show(contentPane, FOLLOWING_THEME_STRING_ARRAYS[index]);
-		} else {
-			themedCellStyleListPane.populateBean(null);
 		}
 	}
 
+	public int getSelectedIndex() {
+		return followingThemeButtonGroup.getSelectedIndex();
+	}
+
 	public void addPredefinedChangeListener(ChangeListener changeListener) {
 		themedCellStyleListPane.addChangeListener(changeListener);
 	}
@@ -39,31 +159,50 @@ public class StylePane extends UIComboBoxPane<Style> {
 	}
 
 	public void updateBorder(Object[] selectionCellBorderObjects) {
-		if (getSelectedIndex() == 0 && customStylePane.isBorderPaneSelected()) {
+		if (getSelectedIndex() == 1 && customStylePane.isBorderPaneSelected()) {
 			customStylePane.updateBorder(selectionCellBorderObjects);
 		}
 	}
 
 	public void dealWithBorder(ElementCasePane ePane) {
-		if (getSelectedIndex() == 0) {
+		customStylePane.dealWithBorder(ePane);
-			customStylePane.dealWithBorder(ePane);
-		}
 	}
 
 	public void setSelctedByName(String id) {
-		jcb.setSelectedIndex(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"),id)? 0 : 1);
+		setSelectedIndex(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"), id)? 1 : 0);
 	}
 
 	public Style updateStyle(Style style) {
 		return customStylePane.updateStyle(style);
 	}
 
-	@Override
+	public Style updateBean() {
-	protected List<FurtherBasicBeanPane<? extends Style>> initPaneList() {
+		if (getSelectedIndex() == 0) {
-		List<FurtherBasicBeanPane<? extends Style>> paneList = new ArrayList<>();
+			NameStyle nameStyle = themedCellStyleListPane.updateBean();
-		paneList.add(customStylePane = new CustomStylePane());
+			if (nameStyle != null) {
-		paneList.add(themedCellStyleListPane = new ThemedCellStyleListPane());
+				// 只有当前样式面板是跟随主题面板，且跟随主题面板中存在选中项，才使用该样式设置单元格
-		return paneList;
+				return nameStyle;
+			}
+		}
+		return customStylePane.updateBean();
+	}
+
+	public void populateBean(Style style) {
+		if (style instanceof NameStyle) {
+			NameStyle nameStyle = (NameStyle) style;
+			setSelectedIndex(0);
+			themedCellStyleListPane.populateBean(nameStyle);
+			Style realStyle = nameStyle.getRealStyle();
+			try {
+				realStyle = (Style) realStyle.clone();
+				customStylePane.populateBean(realStyle);
+			} catch (CloneNotSupportedException e) {
+				e.printStackTrace();
+			}
+		} else {
+			setSelectedIndex(1);
+			customStylePane.populateBean(style);
+		}
 	}
 
 }

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

@@ -7,6 +7,7 @@ import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.settings.ThemedCellStyle;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerBean;
 import com.fr.design.mainframe.DesignerContext;
@@ -111,6 +112,10 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<NameStyle> imp
     @Override
     public void populateBean(NameStyle ob) {
         refreshBeanElement();
+        if (ob == null) {
+            styleList.setSelectedIndex(-1);
+            return;
+        }
         for (int i = 0; i < defaultListModel.getSize(); i++) {
             if (ComparatorUtils.equals(ob, defaultListModel.get(i))) {
                 styleList.setSelectedIndex(i);
@@ -121,7 +126,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<NameStyle> imp
 
     @Override
     public NameStyle updateBean() {
-        return (NameStyle) styleList.getSelectedValue();
+        return styleList.getSelectedValue();
     }
 
     /**
@@ -130,7 +135,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<NameStyle> imp
      * @return 标题
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Predefined_Style");
+        return Toolkit.i18nText("Fine-Design_Report_Predefined_Style");
     }
 
     /**

designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java

@@ -5,29 +5,40 @@ import com.fr.decision.webservice.utils.DecisionServiceConstants;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.EnvChangeEntrance;
 import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.env.DesignerWorkspaceInfoContext;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.loghandler.DesignerLogger;
 import com.fr.design.ui.util.UIUtil;
-import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
-import com.fr.event.Listener;
+import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.RemoteDesignConstants;
 import com.fr.serialization.SerializerHelper;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
 import com.fr.third.apache.log4j.spi.LoggingEvent;
+import com.fr.third.org.apache.http.conn.ssl.NoopHostnameVerifier;
+import com.fr.third.org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import com.fr.third.org.apache.http.ssl.SSLContexts;
+import com.fr.web.WebSocketConfig;
+import com.fr.web.socketio.WebSocketProtocol;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
-import com.fr.workspace.WorkspaceEvent;
 import com.fr.workspace.base.WorkspaceConstants;
 import com.fr.workspace.connect.WorkspaceConnection;
+import com.fr.workspace.connect.WorkspaceConnectionInfo;
 import com.fr.workspace.server.socket.SocketInfoOperator;
 import io.socket.client.IO;
 import io.socket.client.Socket;
 import io.socket.emitter.Emitter;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.security.KeyStore;
 import java.util.Arrays;
+import javax.net.ssl.SSLContext;
 import javax.swing.*;
 import java.io.IOException;
 import java.net.URI;
@@ -37,26 +48,14 @@ import java.util.TimerTask;
 
 public class DesignerSocketIO {
 
-
-    static {
-        EventDispatcher.listen(WorkspaceEvent.LostConnect, new Listener<Workspace>() {
-            @Override
-            public void on(Event event, Workspace param) {
-                // 远程设计websocket不支持wss 所以断开无法提醒
-                // 使用远程设计的心跳断开来提醒断开
-                if (DesignerEnvManager.getEnvManager().isHttps()) {
-                    showConnectionLostDialog();
-                }
-            }
-        });
-    }
-
     enum Status {
         Connected,
         Disconnected,
         Disconnecting
     }
 
+    private static final String HTTPS = "https";
+    private static final String HTTP = "http";
     private static Socket socket = null;
     private static Status status = Status.Disconnected;
     private static Timer disConnectHintTimer = null;
@@ -65,6 +64,8 @@ public class DesignerSocketIO {
     private static String[] uri;
     //维护一个关于uri列表的计数器
     private static int count;
+    // 当前webSocket选择的协议
+    private static String currentProtocol;
 
 
     public static void close() {
@@ -95,7 +96,7 @@ public class DesignerSocketIO {
         //根据uri和计数器建立连接，并注册监听
         try {
             if (count < uri.length) {
-                socket = IO.socket(new URI(uri[count]));
+                socket = IO.socket(new URI(uri[count]), createOptions());
                 socket.on(WorkspaceConstants.WS_LOGRECORD, printLog);
                 socket.on(WorkspaceConstants.CONFIG_MODIFY, modifyConfig);
                 socket.on(Socket.EVENT_CONNECT_ERROR, failRetry);
@@ -112,15 +113,58 @@ public class DesignerSocketIO {
         }
     }
 
+    private static IO.Options createOptions() {
+        IO.Options options = new IO.Options();
+        try {
+            if (ComparatorUtils.equals(currentProtocol, HTTPS)) {
+                options.sslContext = getSSLContext();
+                options.hostnameVerifier = NoopHostnameVerifier.INSTANCE;
+                options.secure = true;
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return options;
+    }
+
+    private static SSLContext getSSLContext() throws Exception {
+        WorkspaceConnectionInfo connection = getConnectionInfo();
+        String certPath = connection.getCertPath();
+        String certSecretKey = connection.getCertSecretKey();
+        if (StringUtils.isBlank(certPath) || StringUtils.isBlank(certSecretKey)) {
+           return SSLContexts.createDefault();
+        }
+        KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+        try (FileInputStream keystore = new FileInputStream(new File(certPath))) {
+            trustStore.load(keystore, certSecretKey.toCharArray());
+        }
+        return SSLContexts.custom()
+                .loadTrustMaterial(trustStore, new TrustSelfSignedStrategy())
+                .build();
+    }
+
+    private static WorkspaceConnectionInfo getConnectionInfo() {
+        if (DesignerWorkspaceInfoContext.getWorkspaceInfo() == null) {
+            String currentName = DesignerEnvManager.getEnvManager().getCurEnvName();
+            DesignerWorkspaceInfo info = DesignerEnvManager.getEnvManager().getWorkspaceInfo(currentName);
+            return info.getConnection();
+        } else {
+            return DesignerWorkspaceInfoContext.getWorkspaceInfo().getConnection();
+        }
+    }
+
     private static String[] getSocketUri() throws IOException {
         Workspace current = WorkContext.getCurrent();
         URL url = new URL(current.getPath());
         Integer[] ports = current.get(SocketInfoOperator.class).getPort();
         WorkspaceConnection connection = current.getConnection();
+        // 服务器配置https  webSocket可能是wss也可能是ws webSocket的协议可以单独配置
+        WebSocketProtocol webSocketProtocol = WebSocketConfig.getInstance().getProtocol();
+        currentProtocol = webSocketProtocol == WebSocketProtocol.PLAIN ? HTTP : HTTPS;
         String[] result = new String[ports.length];
         for (int i = 0; i < ports.length; i++) {
             result[i] = String.format("%s://%s:%s%s?%s=%s&%s=%s",
-                    url.getProtocol(),
+                    currentProtocol,
                     url.getHost(),
                     ports[i],
                     WorkspaceConstants.WS_NAMESPACE,
@@ -129,6 +173,7 @@ public class DesignerSocketIO {
                     RemoteDesignConstants.USER_LOCK_ID,
                     connection.getId());
         }
+        FineLoggerFactory.getLogger().error("Available ports: {}, current Protocol: {}", Arrays.toString(ports), currentProtocol);
         return result;
     }
 
@@ -136,7 +181,7 @@ public class DesignerSocketIO {
     private static final Emitter.Listener failRetry = new Emitter.Listener() {
         @Override
         public void call(Object... args) {
-            FineLoggerFactory.getLogger().warn("failed args: {}", Arrays.toString(args));
+            printLog(args, PrintEventLogImpl.WARN, "failed args: {}");
             status = Status.Disconnecting;
             socket.close();
             count++;
@@ -183,7 +228,7 @@ public class DesignerSocketIO {
                          * todo 远程心跳断开不一定 socket 断开 和远程紧密相关的业务都绑定在心跳上，切换成心跳断开之后进行提醒，
                          * socket 只用推日志和通知配置变更
                          */
-                        FineLoggerFactory.getLogger().error("disConnected args: {}", Arrays.toString(objects));
+                        printLog(objects, PrintEventLogImpl.ERROR, "disConnected args: {}");
                         if (status != Status.Disconnecting) {
                             showConnectionLostDialog();
                         }
@@ -199,7 +244,7 @@ public class DesignerSocketIO {
 
     private static void showConnectionLostDialog() {
         try {
-            UIUtil.invokeAndWaitIfNeeded(new Runnable() {
+            UIUtil.invokeLaterIfNeeded(new Runnable() {
                 @Override
                 public void run() {
                     FineJOptionPane.showMessageDialog(
@@ -226,4 +271,46 @@ public class DesignerSocketIO {
         }
     };
 
+    private static void printLog(Object[] objects, PrintEventLog printEventLog, String prefix) {
+        for (Object object : objects) {
+            if (object instanceof Throwable) {
+                Throwable  throwable = (Throwable) object;
+                printEventLog.printThrowable(throwable);
+            } else {
+                printEventLog.print(prefix, object);
+            }
+        }
+    }
+
+    interface PrintEventLog {
+        void printThrowable(Throwable throwable);
+        void print(String s, Object ...object);
+    }
+
+    enum PrintEventLogImpl implements PrintEventLog {
+        ERROR {
+            @Override
+            public void printThrowable(Throwable throwable) {
+                FineLoggerFactory.getLogger().error(throwable.getMessage(), throwable);
+            }
+
+            @Override
+            public void print(String s, Object... object) {
+                FineLoggerFactory.getLogger().error(s, object);
+            }
+        },
+
+        WARN {
+            @Override
+            public void printThrowable(Throwable throwable) {
+                FineLoggerFactory.getLogger().warn(throwable.getMessage(), throwable);
+            }
+
+            @Override
+            public void print(String s, Object... object) {
+                FineLoggerFactory.getLogger().warn(s, object);
+            }
+        };
+    }
+
 }

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

@@ -171,10 +171,10 @@ public class NewReportBackgroundPane extends BasicPane {
                     BorderUtils.createTitleBorder("预览", 12),
                     BorderFactory.createEmptyBorder(5, 5, 4, 5)
             ));
-            titledPane.setPreferredSize(new Dimension(397, 502));
+            titledPane.setPreferredSize(new Dimension(377, 502));
             container.add(titledPane, BorderLayout.WEST);
             titledPane.add(previewPane, BorderLayout.WEST);
-            previewPane.setPreferredSize(new Dimension(387, 480));
+            previewPane.setPreferredSize(new Dimension(367, 480));
 
             return container;
         }
@@ -182,7 +182,7 @@ public class NewReportBackgroundPane extends BasicPane {
         private JPanel createRightPane() {
             JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
             container.setBorder(BorderFactory.createEmptyBorder());
-            container.setPreferredSize(new Dimension(253, 502));
+            container.setPreferredSize(new Dimension(273, 502));
             container.add(themePane, BorderLayout.NORTH);
             return container;
         }

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

@@ -779,7 +779,7 @@ public class PageSetupPane extends BasicPane {
                     //使用科学计数法显示长度的时候，限制纵向显示长度为9位
                     if (h_str.contains(E)) {
                         String str1 = h_str.substring(h_str.indexOf(E));
-                        String str2 = h_str.substring(0, 9 - str1.length());
+                        String str2 = h_str.substring(0, Math.min(h_str.length(), 9) - str1.length());
                         h_str = str2 + str1;
                     } else if (h_str.indexOf(CoreConstants.DOT) > 0) {
                         h_str = h_str.substring(0, h_str.indexOf(CoreConstants.DOT) + 2);

designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java

@@ -157,7 +157,7 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
                 dragType = GridUtils.DRAG_CELL_SIZE;
                 isDragPermited = true;
                 dragIndex = index;
-                showToolTip(evt, createToolTipString(sizeList.get(dragIndex).toPixD(resolution), sizeList.getRangeValue(0, dragIndex + 1).toPixD(resolution)));
+                showToolTip(evt, createToolTipString(sizeList.get(dragIndex), sizeList.getRangeValue(0, dragIndex + 1)));
                 return true;
             }
             if (between(evt, tmpSize1, tmpSize2)) {
@@ -301,21 +301,18 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
 
     protected abstract void resetGridSelectionBySelect(int index, ElementCasePane ePane);
 
-    private String createToolTipString(double doubleValue, double totalDoubleValue) {
+    private String createToolTipString(UNIT unitValue, UNIT totalUnitValue) {
         int unitType = DesignerEnvManager.getEnvManager().getReportLengthUnit();
-//        int resolution = ScreenResolution.getScreenResolution();
-        FU ulen = FU.valueOfPix((int) doubleValue, resolution);
-        FU tulen = FU.valueOfPix((int) totalDoubleValue, resolution);
         ReportLengthUNITProvider lengthUNIT = DesignerUIModeConfig.getInstance().parseLengthUNIT(unitType);
         String unit = lengthUNIT.unitText();
-        double len = lengthUNIT.unit2Value4Scale(ulen);
+        double len = lengthUNIT.unit2Value4Scale(unitValue);
-        double tlen = lengthUNIT.unit2Value4Scale(tulen);
+        double tlen = lengthUNIT.unit2Value4Scale(totalUnitValue);
         StringBuilder sb = new StringBuilder();
         sb.append(String.format("%.2f", new Double(len)))
                 .append('/').append(String.format("%.2f", new Double(tlen)))
                 .append(unit).append('(')
-                .append((int)(doubleValue)).append('/')
+                .append((int)(unitValue.toPixD(resolution))).append('/')
-                .append((int)(totalDoubleValue))
+                .append((int)(totalUnitValue.toPixD(resolution)))
                 .append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Px"))
                 .append(')');
         return sb.toString();
@@ -416,7 +413,7 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
 
             DynamicUnitList sizeList = getSizeList(report);
 //            int resolution = ScreenResolution.getScreenResolution();
-            this.setToolTipText2(this.createToolTipString(sizeList.get(dragIndex).toPixD(resolution), sizeList.getRangeValue(0, dragIndex + 1).toPixD(resolution)));
+            this.setToolTipText2(this.createToolTipString(sizeList.get(dragIndex), sizeList.getRangeValue(0, dragIndex + 1)));
         }
 
         ePane.repaint();

designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java

@@ -10,13 +10,11 @@ import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.cell.CellAttributeAction;
 import com.fr.design.actions.cell.CellExpandAttrAction;
+import com.fr.design.actions.cell.CellStyleAttrAction;
 import com.fr.design.actions.cell.CellWidgetAttrAction;
 import com.fr.design.actions.cell.CleanAuthorityAction;
 import com.fr.design.actions.cell.ConditionAttributesAction;
 import com.fr.design.actions.cell.EditCellAction;
-import com.fr.design.actions.cell.GlobalStyleMenuDef;
-import com.fr.design.actions.cell.GlobalStyleMenuDef.GlobalStyleSelection;
-import com.fr.design.actions.cell.StyleAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.edit.CopyAction;
 import com.fr.design.actions.edit.CutAction;
@@ -29,7 +27,6 @@ import com.fr.design.designer.TargetComponent;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.gui.imenu.UIMenu;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.CellElementPropertyPane;
 import com.fr.design.mainframe.CellWidgetPropertyPane;
@@ -470,26 +467,8 @@ public class CellSelection extends Selection {
         }
         popup.add(new EditCellAction(ePane).createMenuItem());
         popup.add(DeprecatedActionManager.getCellMenu(ePane).createJMenu());
-        // richer:add global style menu
         popup.add(new CellExpandAttrAction().createMenuItem());
-        if (!ServerPreferenceConfig.getInstance().hasStyle()) {
+        popup.add(new CellStyleAttrAction().createMenuItem());
-            UIMenu styleMenu = new UIMenu(KeySetUtils.GLOBAL_STYLE.getMenuName());
-            styleMenu.setIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/cell.png"));
-            Iterator iterato = ServerPreferenceConfig.getInstance().getStyleNameIterator();
-            while (iterato.hasNext()) {
-                String name = (String) iterato.next();
-                name = GlobalStyleMenuDef.judgeChina(name);
-                NameStyle nameStyle = NameStyle.getInstance(name);
-                UpdateAction.UseMenuItem useMenuItem = new GlobalStyleSelection(ePane, nameStyle).createUseMenuItem();
-                useMenuItem.setNameStyle(nameStyle);
-                styleMenu.add(useMenuItem);
-            }
-            styleMenu.addSeparator();
-            styleMenu.add(new GlobalStyleMenuDef.CustomStyleAction(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")));
-            popup.add(styleMenu);
-        } else {
-            popup.add(new StyleAction().createMenuItem());
-        }
         popup.add(DeprecatedActionManager.getPresentMenu(ePane).createJMenu());
         popup.add(new CellAttributeAction().createMenuItem());
         JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();

designer-realize/src/main/java/com/fr/poly/creator/ECBlockPane.java

@@ -8,9 +8,9 @@ import com.fr.design.DesignState;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.cell.CellAttributeAction;
 import com.fr.design.actions.cell.CellExpandAttrAction;
+import com.fr.design.actions.cell.CellStyleAttrAction;
 import com.fr.design.actions.cell.CellWidgetAttrAction;
 import com.fr.design.actions.cell.ConditionAttributesAction;
-import com.fr.design.actions.cell.GlobalStyleMenuDef;
 import com.fr.design.actions.columnrow.InsertColumnAction;
 import com.fr.design.actions.columnrow.InsertRowAction;
 import com.fr.design.actions.core.ActionFactory;
@@ -151,7 +151,7 @@ public class ECBlockPane extends PolyElementCasePane {
 
         menuDef.addShortCut(new CellExpandAttrAction());
         menuDef.addShortCut(new CellWidgetAttrAction());
-        menuDef.addShortCut(new GlobalStyleMenuDef(this));
+        menuDef.addShortCut(new CellStyleAttrAction());
         menuDef.addShortCut(new ConditionAttributesAction());
 
         // 单元格形态

designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java

@@ -62,12 +62,12 @@ public class DesignerWorkspaceProvider extends Activator {
                 } else {
                     WorkContext.switchTo(workspace);
                     //在设计器完全启动完成后，对初始环境进行一次服务检测，对主要功能无影响，异常仅做日志提示即可
-                    final DesignerWorkspaceInfo selectEnv = workspaceInfo;
+                    final String selectEnv = current;
                     EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {
                         @Override
                         public void on(Event event, Null aNull) {
                             try {
-                               VersionCheckUtils.showVersionCheckDialog(selectEnv.getName());
+                               VersionCheckUtils.showVersionCheckDialog(selectEnv);
                             } catch (Exception e) {
                                 FineLoggerFactory.getLogger().warn("Check Service Failed");
                             }