Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x

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

@@ -23,6 +23,7 @@ import com.fr.design.mainframe.ComponentReuseNotifyUtil;
 import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
 import com.fr.design.mainframe.vcs.VcsConfigManager;
 import com.fr.design.notification.SnapChatConfig;
+import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.port.DesignerPortContext;
 import com.fr.design.style.color.ColorSelectConfigManager;
 import com.fr.design.update.push.DesignerPushUpdateConfigManager;
@@ -211,6 +212,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
 
     private int layoutTemplateStyle = LAYOUT_TEMPLATE_SIMPLE_STYLE;
 
+    private boolean useOptimizedUPM4Adapter;
+
     /**
      * DesignerEnvManager.
      */
@@ -665,6 +668,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         this.showTemplateMissingPlugin = showTemplateMissingPlugin;
     }
 
+    public boolean isUseOptimizedUPM4Adapter() {
+        return useOptimizedUPM4Adapter;
+    }
+
+    public void setUseOptimizedUPM4Adapter(boolean useOptimizedUPM4Adapter) {
+        this.useOptimizedUPM4Adapter = useOptimizedUPM4Adapter;
+    }
+
     /**
      * 知否自动备份
      *
@@ -1888,6 +1899,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
         this.setEmbedServerLazyStartup(reader.getAttrAsBoolean("embedServerLazyStartup", false));
         this.setShowTemplateMissingPlugin(reader.getAttrAsBoolean("showTemplateMissingPlugin", true));
+        this.setUseOptimizedUPM4Adapter(reader.getAttrAsBoolean("useOptimizedUPM4Adapter", SupportOSImpl.MACOS_12_VERSION_ADAPTER.support()));
         this.setShowServerDatasetAuthTip(reader.getAttrAsBoolean("showServerDatasetAuthTip", true));
         this.setLayoutTemplateStyle(reader.getAttrAsInt("layoutTemplateStyle", LAYOUT_TEMPLATE_SIMPLE_STYLE));
     }
@@ -2165,6 +2177,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
         writer.attr("layoutTemplateStyle", this.getLayoutTemplateStyle());
         writer.attr("showServerDatasetAuthTip", this.isShowServerDatasetAuthTip());
+        writer.attr("useOptimizedUPM4Adapter", this.isUseOptimizedUPM4Adapter());
         writer.end();
     }
 

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

@@ -16,9 +16,10 @@ import com.fr.design.gui.ibutton.UINoThemeColorButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIDictionaryComboBox;
+import com.fr.design.gui.ifilechooser.FileChooserArgs;
+import com.fr.design.gui.ifilechooser.FileChooserFactory;
 import com.fr.design.gui.ifilechooser.FileChooserProvider;
 import com.fr.design.gui.ifilechooser.FileSelectionMode;
-import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.iprogressbar.UIProgressBarUI;
@@ -513,9 +514,8 @@ public class PreferencePane extends BasicPane {
             @Override
             public void actionPerformed(ActionEvent evt) {
                 FileChooserProvider fileChooserProvider =
-                        new JavaFxNativeFileChooser.Builder().
+                        FileChooserFactory.createFileChooser(FileChooserArgs.newBuilder().
-                                fileSelectionMode(FileSelectionMode.DIR).
+                                setFileSelectionMode(FileSelectionMode.DIR).build());
-                                build();
                 int saveValue = fileChooserProvider.showDialog(chooseDirBtn);
                 if (saveValue == JFileChooser.APPROVE_OPTION) {
                     File selectedFile = fileChooserProvider.getSelectedFile();
@@ -728,7 +728,8 @@ public class PreferencePane extends BasicPane {
         this.portEditor.setValue(new Integer(designerEnvManager.getEmbedServerPort()));
 
         if (useOptimizedUPMCheckbox != null) {
-            useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM());
+            useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM()
+                                                        || DesignerEnvManager.getEnvManager().isUseOptimizedUPM4Adapter());
         }
 
         if (useNewVersionLoginCheckbox != null) {
@@ -808,6 +809,7 @@ public class PreferencePane extends BasicPane {
         designerEnvManager.setJoinProductImprove(this.joinProductImproveCheckBox.isSelected());
         designerEnvManager.setEmbedServerLazyStartup(this.embedServerLazyStartupCheckBox.isSelected());
         designerEnvManager.setImageCompress(this.imageCompressPanelCheckBox.isSelected());
+        designerEnvManager.setUseOptimizedUPM4Adapter(this.useOptimizedUPMCheckbox != null && this.useOptimizedUPMCheckbox.isSelected());
         VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager();
         vcsConfigManager.setSaveInterval(this.saveIntervalEditor.getValue());
         vcsConfigManager.setVcsEnable(this.vcsEnableCheckBox.isSelected());

designer-base/src/main/java/com/fr/design/base/clipboard/ClipboardFilter.java

@@ -27,11 +27,7 @@ public abstract class ClipboardFilter {
     }
     
     public static <T> T cut(T selection) {
-
+        for (ClipboardHandlerProvider provider : getClipboardHandlerProviders()) {
-        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
-        Set<ClipboardHandlerProvider> providers = manager.getArray(ClipboardHandlerProvider.XML_TAG);
-        providers.addAll(clipboardHandlerProviders);
-        for (ClipboardHandlerProvider provider : providers) {
             if (provider.support(selection)) {
                 selection = ((ClipboardHandlerProvider<T>) provider).cut(selection);
             }
@@ -40,10 +36,7 @@ public abstract class ClipboardFilter {
     }
     
     public static <T> T copy(T selection) {
-        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
+        for (ClipboardHandlerProvider provider : getClipboardHandlerProviders()) {
-        Set<ClipboardHandlerProvider> providers = manager.getArray(ClipboardHandlerProvider.XML_TAG);
-        providers.addAll(clipboardHandlerProviders);
-        for (ClipboardHandlerProvider provider : providers) {
             if (provider.support(selection)) {
                 selection = ((ClipboardHandlerProvider<T>) provider).copy(selection);
             }
@@ -52,15 +45,27 @@ public abstract class ClipboardFilter {
     }
     
     public static <T> T paste(T selection) {
-        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
+        for (ClipboardHandlerProvider provider : getClipboardHandlerProviders()) {
-        Set<ClipboardHandlerProvider> providers = manager.getArray(ClipboardHandlerProvider.XML_TAG);
-        providers.addAll(clipboardHandlerProviders);
-
-        for (ClipboardHandlerProvider provider : providers) {
             if (provider.support(selection)) {
                 selection = ((ClipboardHandlerProvider<T>) provider).paste(selection);
             }
         }
         return selection;
     }
+
+    private static Set<ClipboardHandlerProvider> getClipboardHandlerProviders() {
+        Set<ClipboardHandlerProvider> providers = new HashSet<>();
+
+        for (ClipboardHandlerProvider clipboardHandlerProvider : clipboardHandlerProviders) {
+            providers.add(clipboardHandlerProvider);
+        }
+
+        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
+        Set<ClipboardHandlerProvider> pluginProviders = manager.getArray(ClipboardHandlerProvider.XML_TAG);
+        for (ClipboardHandlerProvider clipboardHandlerProvider : pluginProviders) {
+            providers.add(clipboardHandlerProvider);
+        }
+
+        return providers;
+    }
 }

designer-base/src/main/java/com/fr/design/cell/CellRectangleStylePreviewPane.java

@@ -15,6 +15,7 @@ import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.GridLayout;
+import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
 
@@ -46,7 +47,7 @@ public class CellRectangleStylePreviewPane extends JPanel {
 
         for (int r = 0; r < ROW_COUNT; r++) {
             for (int c = 0; c < COLUMN_COUNT; c++) {
-                CellStylePreviewPane pane = new CellStylePreviewPane();
+                CellStylePreviewPane pane = new CellStylePreviewPane(c, r, COLUMN_COUNT, ROW_COUNT, false, false);
                 TemplateCellElement cellElement = DefaultThemedTemplateCellElementCase.createInstance(c, r);
                 int flags = CellBorderSourceFlag.INVALID_BORDER_SOURCE;
                 if (supportInnerBorder) {
@@ -136,6 +137,11 @@ public class CellRectangleStylePreviewPane extends JPanel {
         super.paint(g);
     }
 
+    @Override
+    public Rectangle getBounds() {
+        return super.getBounds();
+    }
+
     private void paintTransparentBackground(Graphics2D g2d, Style style) {
         float alpha = computeTransparentBackgroundAlpha(style);
 

designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java

@@ -7,6 +7,7 @@ import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
 import com.fr.general.FRFont;
 import com.fr.general.IOUtils;
+import com.fr.stable.Constants;
 import com.fr.stable.unit.PT;
 
 import javax.swing.JPanel;
@@ -30,10 +31,29 @@ import java.util.List;
 public class CellStylePreviewPane extends JPanel {
 
     public static final int MINIMUM_HEIGHT = 40;
+    private static final BufferedImage transparentBackgroundImage = IOUtils.readImage("/com/fr/design/images/transparent_background.png");
+    private final float transparentBackgroundWidth;
+    private final float transparentBackgroundHeight;
     private String paintText = "Report";
     private Style style = Style.DEFAULT_STYLE;
 
-    public CellStylePreviewPane() {
+    private final int column;
+    private final int row;
+    private final int columnSpan;
+    private final int rowSpan;
+
+    private final boolean autoClearCanvas;
+    private final boolean paintingMosaic;
+
+    public CellStylePreviewPane(int column, int row, int columnSpan, int rowSpan, boolean autoClearCanvas, boolean paintingMosaic) {
+        this.column = column;
+        this.row = row;
+        this.columnSpan = columnSpan;
+        this.rowSpan = rowSpan;
+        this.autoClearCanvas  = autoClearCanvas;
+        this.paintingMosaic = paintingMosaic;
+        transparentBackgroundWidth = transparentBackgroundImage.getWidth(null);
+        transparentBackgroundHeight = transparentBackgroundImage.getHeight(null);
         setPreferredSize(new Dimension(0, 0));
     }
 
@@ -55,15 +75,58 @@ public class CellStylePreviewPane extends JPanel {
     @Override
     public void paint(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
+        if (autoClearCanvas) {
+            g2d.clearRect(0, 0, getWidth(), getHeight());
+        }
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
 
+        if (paintingMosaic) {
+            paintTransparentBackground(g2d, style);
+        }
+
         paintCellStyle(g2d, style);
 
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
         g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
     }
 
+    private void paintTransparentBackground(Graphics2D g2d, Style style) {
+        float alpha = computeTransparentBackgroundAlpha(style);
+
+        float scaleWidth = 1.0F * getWidth() / transparentBackgroundWidth;
+        float scaleHeight = 1.0F * getHeight() / transparentBackgroundHeight;
+        float maxScale = Math.max(scaleWidth, scaleHeight);
+
+        if (maxScale <= 1) {
+            scaleWidth = scaleHeight = 1;
+        } else {
+            scaleHeight = scaleWidth = maxScale;
+        }
+
+        Composite oldComposite = g2d.getComposite();
+        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
+        g2d.drawImage(transparentBackgroundImage, 0, 0, (int) (transparentBackgroundWidth * scaleWidth), (int) (transparentBackgroundHeight * scaleHeight), null);
+        g2d.setComposite(oldComposite);
+    }
+
+    private float computeTextColorBrightness(Style style) {
+        Color fontColor = style.getFRFont().getForeground();
+        return fontColor.getRed() * 0.299F + fontColor.getGreen() * 0.587F + fontColor.getBlue() * 0.114F;
+    }
+
+    private float computeTransparentBackgroundAlpha(Style style) {
+        float textBrightness = computeTextColorBrightness(style);
+
+        float alpha = 1.0F;
+        if (textBrightness < 50) {
+            alpha = 0.2F;
+        } else if (textBrightness < 160){
+            alpha = 0.5F;
+        }
+        return alpha;
+    }
+
     private void paintCellStyle(Graphics2D g2d, Style style) {
         int resolution = ScreenResolution.getScreenResolution();
 
@@ -80,9 +143,42 @@ public class CellStylePreviewPane extends JPanel {
 
         Style.paintContent(g2d, paintText, style, width, height, resolution);
 
-        Style.paintBorder(g2d, style,
+        paintCellBorder(g2d, style);
-                width - GraphHelper.getLineStyleSize(style.getBorderRight()) / 2F,
+    }
-                height - GraphHelper.getLineStyleSize(style.getBorderBottom()) / 2F);
+
+    protected void paintCellBorder(Graphics2D g2d, Style style) {
+        float adjustLeft = 0;
+        float adjustTop = 0;
+        float adjustRight = 0;
+        float adjustBottom = 0;
+        if (column == 0) {
+            adjustLeft = computeHalfSize4StyledBorder(style.getBorderLeft());
+        }
+        if (row == 0) {
+            adjustTop = computeHalfSize4StyledBorder(style.getBorderTop());
+        }
+        if (column == columnSpan - 1) {
+            adjustRight = -computeHalfSize4StyledBorder(style.getBorderRight());
+        }
+        if (row == rowSpan - 1) {
+            adjustBottom = -computeHalfSize4StyledBorder(style.getBorderBottom());
+        }
+
+        g2d.translate(adjustLeft, adjustTop);
+        Style.paintBorder(g2d, style, getWidth() - adjustLeft + adjustRight, getHeight() - adjustTop + adjustBottom);
+        g2d.translate(-adjustLeft, -adjustTop);
+    }
+
+    private float computeHalfSize4StyledBorder(int border) {
+        float size = GraphHelper.getLineStyleSize(border) / 2.0F;
+
+        if (border == Constants.LINE_DOUBLE) {
+            size += GraphHelper.getLineStyleSize(Constants.LINE_THIN) / 2.0F;
+        } else if (border == Constants.LINE_DOUBLE_DOT) {
+            size += GraphHelper.getLineStyleSize(Constants.LINE_DOT) / 2.0F;
+        }
+
+        return size;
     }
 
     @Override

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

@@ -17,9 +17,12 @@ import com.fr.event.EventDispatcher;
 import com.fr.file.ProcedureConfig;
 import com.fr.file.TableDataConfig;
 import com.fr.file.TableDataOperator;
+import com.fr.file.TableDataOperatorImpl;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
 import com.fr.log.FineLoggerFactory;
+import com.fr.rpc.ExceptionHandler;
+import com.fr.rpc.RPCInvokerExceptionInfo;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
@@ -246,7 +249,13 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
             tableDataBeans.add(new TableDataBean(nameObject.getName(), oldName, (TableData) nameObject.getObject()));
         }
         try {
-            WorkContext.getCurrent().get(TableDataOperator.class).saveTableData(tableDataBeans);
+            WorkContext.getCurrent().get(TableDataOperator.class, new ExceptionHandler() {
+                @Override
+                public Object callHandler(RPCInvokerExceptionInfo exceptionInfo) {
+                    // 走老的方式
+                    return saveByOldWay(tableDataBeans);
+                }
+            }).saveTableData(new ArrayList<>(tableDataConfig.getTableDatas().keySet()), tableDataBeans);
             if (!WorkContext.getCurrent().isLocal()) {
                 EventDispatcher.fire(RemoteConfigEvent.EDIT, TableDataConfig.getInstance().getNameSpace());
             }
@@ -255,6 +264,15 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
         }
     }
 
+    private boolean saveByOldWay(List<TableDataBean> tableDataBean) {
+        try {
+            return TableDataOperatorImpl.getInstance().saveTableData(tableDataBean);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            return false;
+        }
+    }
+
     @Override
     public void update(TableDataSource tds) {
         tds.clearAllTableData();

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

@@ -16,8 +16,11 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.event.EventDispatcher;
 import com.fr.file.ConnectionConfig;
 import com.fr.file.ConnectionOperator;
+import com.fr.file.ConnectionOperatorImpl;
 import com.fr.general.NameObject;
 import com.fr.log.FineLoggerFactory;
+import com.fr.rpc.ExceptionHandler;
+import com.fr.rpc.RPCInvokerExceptionInfo;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
@@ -170,7 +173,12 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
             connectionBeans.add(new ConnectionBean(nameObject.getName(), oldName, (Connection) nameObject.getObject()));
         }
         try {
-            WorkContext.getCurrent().get(ConnectionOperator.class).saveConnection(connectionBeans);
+            WorkContext.getCurrent().get(ConnectionOperator.class, new ExceptionHandler() {
+                @Override
+                public Object callHandler(RPCInvokerExceptionInfo exceptionInfo) {
+                    return saveByOldWay(connectionBeans);
+                }
+            }).saveConnection(new ArrayList<>(connectionConfig.getConnections().keySet()), connectionBeans);
             if (!WorkContext.getCurrent().isLocal()) {
                 EventDispatcher.fire(RemoteConfigEvent.EDIT, ConnectionConfig.getInstance().getNameSpace());
             }
@@ -179,6 +187,15 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
         }
     }
 
+    private boolean saveByOldWay(List<ConnectionBean> connectionBeans) {
+        try {
+            return ConnectionOperatorImpl.getInstance().saveConnection(connectionBeans);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            return false;
+        }
+    }
+
     public static void showDialog(Window parent) {
         final ConnectionConfig connectionConfig = ConnectionConfig.getInstance();
         final ConnectionManagerPane connectionManagerPane = new ConnectionManagerPane() {

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

@@ -15,7 +15,6 @@ import com.fr.design.mainframe.JVirtualTemplate;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.file.FILE;
 import com.fr.file.FileNodeFILE;
-import com.fr.file.StashedFILE;
 import com.fr.general.ComparatorUtils;
 import com.fr.invoke.ClassHelper;
 import com.fr.log.FineLoggerFactory;
@@ -25,7 +24,7 @@ import com.fr.stable.CoreConstants;
 import com.fr.stable.StringUtils;
 import com.fr.third.org.apache.commons.io.FilenameUtils;
 
-import java.io.ByteArrayOutputStream;
+import javax.swing.SwingWorker;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -33,7 +32,6 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
-import javax.swing.SwingWorker;
 
 /**
  * 历史模板缓存
@@ -364,7 +362,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
         int size = historyList.size();
         for (int i = 0; i < size; i++) {
             JTemplate<?, ?> template = historyList.get(i);
-            FILE file = templateToStashFile(template);
+            FILE file = template.templateToStashFile();
             if (file != null) {
                 stashFILEMap.put(i, file);
             }
@@ -372,21 +370,6 @@ public class HistoryTemplateListCache implements CallbackEvent {
         FineLoggerFactory.getLogger().info("Env Change Template Stashed.");
     }
 
-    private FILE templateToStashFile(JTemplate<?, ?> template) {
-        FILE file = template.getEditingFILE();
-        try {
-            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-            BaseBook target = template.getTarget();
-            if (target != null) {
-                target.export(outputStream);
-                return new StashedFILE(file, outputStream.toByteArray(), template.suffix());
-            }
-            // 如果 target == null 那么这个模板是被模板内存优化功能处理过的，不用处理
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
-        return null;
-    }
 
     private boolean checkStash() {
         try {
@@ -469,7 +452,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
             FILE file = template.getEditingFILE();
             boolean needReload = context == null || needReloadTemplate(context, template);
             if (needReload) {
-                FILE stashFile = templateToStashFile(template);
+                FILE stashFile = template.templateToStashFile();
                 if (stashFile != null) {
                     FineLoggerFactory.getLogger().info("{} is being reloaded", file.getName());
                     template.refreshResource(stashFile);

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

@@ -16,6 +16,7 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.gui.autocomplete.AutoCompleteExtraRefreshComponent;
 import com.fr.design.gui.autocomplete.CompletionCellRenderer;
 import com.fr.design.gui.autocomplete.CompletionProvider;
 import com.fr.design.gui.autocomplete.DefaultCompletionProvider;
@@ -416,7 +417,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         autoCompletion = new FormulaPaneAutoCompletion(provider);
         autoCompletion.setListCellRenderer(new CompletionCellRenderer());
         autoCompletion.install(formulaTextArea);
-        autoCompletion.installVariableTree(variableTreeAndDescriptionArea);
+        autoCompletion.installExtraRefreshComponent(variableTreeAndDescriptionArea);
     }
 
 
@@ -555,6 +556,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
     private void fixFunctionNameList(String functionName) {
         int signOfContinue = 1;
         int indexOfFunction = 0;
+        boolean found = false;
         for (int i = 0; i < functionTypeListModel.size(); i++) {
             int signOfType = 0;
             FunctionGroup functionType = (FunctionGroup) functionTypeListModel.getElementAt(i);
@@ -568,6 +570,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                         signOfType = 1;
                         signOfContinue = 0;
                         indexOfFunction = k;
+                        found = true;
                     }
                 }
 
@@ -577,8 +580,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 }
             }
         }
+        if (found) {
             functionNameList.setSelectedIndex(indexOfFunction);
             functionNameList.ensureIndexIsVisible(indexOfFunction);
+        } else {
+            functionTypeList.setSelectedIndex(0);
+        }
     }
 
     private int getBeginPosition() {
@@ -867,8 +874,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         if (checkResult.isValid()) {
             showMessageDialog(checkResult.getTips(), checkResult.isValid());
         } else {
-            String position = Toolkit.i18nText("Fine-Design_Basic_Formula_The") + (checkResult.getFormulaCoordinates().getColumns())
+            int columns = checkResult.getFormulaCoordinates().getColumns();
+            String position = StringUtils.EMPTY;
+            if (columns >= 0) {
+                position = Toolkit.i18nText("Fine-Design_Basic_Formula_The") + columns
                         + Toolkit.i18nText("Fine-Design_Basic_Formula_Error_Position") + " ";
+            }
             int confirmDialog = FineJOptionPane.showConfirmDialog(
                     FormulaPane.this,
                     position + messageTips,
@@ -879,7 +890,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                     new String[]{Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"), Toolkit.i18nText("Fine-Design_Basic_Formula_Continue")},
                     Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"));
             if (confirmDialog == 0) {
-                formulaTextArea.setCaretPosition(checkResult.getFormulaCoordinates().getColumns());
+                formulaTextArea.setCaretPosition(Math.max(columns, 0));
                 formulaTextArea.requestFocus();
                 return false;
             }
@@ -1032,7 +1043,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         }
     }
 
-    public class VariableTreeAndDescriptionArea extends JPanel {
+    public class VariableTreeAndDescriptionArea extends JPanel implements AutoCompleteExtraRefreshComponent {
 
         private JTree variablesTree;
         private UITextArea descriptionTextArea;
@@ -1273,6 +1284,11 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             functionTypeList.setSelectedIndex(0);
         }
 
+        @Override
+        public void refresh(String replacementText) {
+            refreshText(replacementText);
+        }
+
         /*
          * 查看函数的详细信息
          */

designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckWrongFunction.java

@@ -73,6 +73,8 @@ public class FormulaCheckWrongFunction implements Function<Exception, FormulaChe
         if (invalidFormula.contains(",")) {
             invalidFormula = invalidFormula.substring(0, invalidFormula.indexOf(","));
         }
-        return formulaText.indexOf(invalidFormula);
+        int index = formulaText.indexOf(invalidFormula);
+        return index;
     }
+
 }

designer-base/src/main/java/com/fr/design/gui/autocomplete/AutoCompleteExtraRefreshComponent.java

@@ -0,0 +1,5 @@
+package com.fr.design.gui.autocomplete;
+
+public interface AutoCompleteExtraRefreshComponent {
+    void refresh(String replacementText);
+}

designer-base/src/main/java/com/fr/design/gui/autocomplete/AutoCompleteWithExtraRefreshPopupWindow.java

@@ -0,0 +1,982 @@
+package com.fr.design.gui.autocomplete;
+
+import com.fr.design.gui.syntax.ui.rsyntaxtextarea.PopupWindowDecorator;
+import com.fr.log.FineLoggerFactory;
+import java.awt.BorderLayout;
+import java.awt.ComponentOrientation;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.List;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ActionMap;
+import javax.swing.InputMap;
+import javax.swing.JComponent;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JWindow;
+import javax.swing.KeyStroke;
+import javax.swing.ListCellRenderer;
+import javax.swing.SwingUtilities;
+import javax.swing.event.CaretEvent;
+import javax.swing.event.CaretListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.plaf.ListUI;
+import javax.swing.text.Caret;
+import javax.swing.text.JTextComponent;
+
+public abstract class AutoCompleteWithExtraRefreshPopupWindow extends JWindow implements CaretListener,
+        ListSelectionListener, MouseListener {
+    private final static int DIS = 5;
+    /**
+     * The parent AutoCompletion instance.
+     */
+    private AutoCompletion ac;
+
+    /**
+     * The list of completion choices.
+     */
+    private JList list;
+
+    /**
+     * The contents of {@link #list()}.
+     */
+    private CompletionListModel model;
+
+    /**
+     * A hack to work around the fact that we clear our completion model (and
+     * our selection) when hiding the completion window.  This allows us to
+     * still know what the user selected after the popup is hidden.
+     */
+    private Completion lastSelection;
+
+    /**
+     * Optional popup window containing a description of the currently
+     * selected completion.
+     */
+    private AutoCompleteDescWindow descWindow;
+
+    /**
+     * The preferred size of the optional description window.  This field
+     * only exists because the user may (and usually will) set the size of
+     * the description window before it exists (it must be parented to a
+     * Window).
+     */
+    private Dimension preferredDescWindowSize;
+
+
+
+    /**
+     * Whether the completion window and the optional description window
+     * should be displayed above the current caret position (as opposed to
+     * underneath it, which is preferred unless there is not enough space).
+     */
+    private boolean aboveCaret;
+
+    private int lastLine;
+
+    private KeyActionPair escapeKap;
+    private KeyActionPair upKap;
+    private KeyActionPair downKap;
+    private KeyActionPair leftKap;
+    private KeyActionPair rightKap;
+    private KeyActionPair enterKap;
+    private KeyActionPair tabKap;
+    private KeyActionPair homeKap;
+    private KeyActionPair endKap;
+    private KeyActionPair pageUpKap;
+    private KeyActionPair pageDownKap;
+    private KeyActionPair ctrlCKap;
+
+    private KeyActionPair oldEscape, oldUp, oldDown, oldLeft, oldRight,
+            oldEnter, oldTab, oldHome, oldEnd, oldPageUp, oldPageDown,
+            oldCtrlC;
+
+    /**
+     * The space between the caret and the completion popup.
+     */
+    private static final int VERTICAL_SPACE = 1;
+
+    /**
+     * The class name of the Substance List UI.
+     */
+    private static final String SUBSTANCE_LIST_UI =
+            "org.pushingpixels.substance.internal.ui.SubstanceListUI";
+
+
+    protected AutoCompleteExtraRefreshComponent component;
+
+
+    /**
+     * Constructor.
+     *
+     * @param parent The parent window (hosting the text component).
+     * @param ac     The auto-completion instance.
+     */
+    public AutoCompleteWithExtraRefreshPopupWindow(Window parent, final AutoCompletion ac) {
+
+        super(parent);
+        ComponentOrientation o = ac.getTextComponentOrientation();
+
+        this.ac = ac;
+        model = new CompletionListModel();
+        list = new PopupList(model);
+
+        list.setCellRenderer(new DelegatingCellRenderer());
+        list.addListSelectionListener(this);
+        list.addMouseListener(this);
+
+        JPanel contentPane = new JPanel(new BorderLayout());
+        JScrollPane sp = new JScrollPane(list,
+                JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+                JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+
+        // In 1.4, JScrollPane.setCorner() has a bug where it won't accept
+        // JScrollPane.LOWER_TRAILING_CORNER, even though that constant is
+        // defined.  So we have to put the logic added in 1.5 to handle it
+        // here.
+        JPanel corner = new SizeGrip();
+        //sp.setCorner(JScrollPane.LOWER_TRAILING_CORNER, corner);
+        boolean isLeftToRight = o.isLeftToRight();
+        String str = isLeftToRight ? JScrollPane.LOWER_RIGHT_CORNER :
+                JScrollPane.LOWER_LEFT_CORNER;
+        sp.setCorner(str, corner);
+
+        contentPane.add(sp);
+        setContentPane(contentPane);
+        applyComponentOrientation(o);
+
+        // Give apps a chance to decorate us with drop shadows, etc.
+        if (Util.getShouldAllowDecoratingMainAutoCompleteWindows()) {
+            PopupWindowDecorator decorator = PopupWindowDecorator.get();
+            if (decorator != null) {
+                decorator.decorate(this);
+            }
+        }
+
+        pack();
+
+        setFocusableWindowState(false);
+
+        lastLine = -1;
+
+    }
+
+
+    public void caretUpdate(CaretEvent e) {
+        if (isVisible()) { // Should always be true
+            int line = ac.getLineOfCaret();
+            if (line != lastLine) {
+                lastLine = -1;
+                setVisible(false);
+            } else {
+                doAutocomplete();
+            }
+        } else if (AutoCompletion.isDebug()) {
+            Thread.dumpStack();
+        }
+    }
+
+
+    /**
+     * Creates the description window.
+     *
+     * @return The description window.
+     */
+    private AutoCompleteDescWindow createDescriptionWindow() {
+        AutoCompleteDescWindow dw = new AutoCompleteDescWindow(this, ac);
+        dw.applyComponentOrientation(ac.getTextComponentOrientation());
+        Dimension size = preferredDescWindowSize;
+        if (size == null) {
+            size = getSize();
+        }
+        dw.setSize(size);
+        return dw;
+    }
+
+
+    /**
+     * Creates the mappings from keys to Actions we'll be putting into the
+     * text component's ActionMap and InputMap.
+     */
+    private void createKeyActionPairs() {
+
+        // Actions we'll install.
+        EnterAction enterAction = new EnterAction();
+        escapeKap = new KeyActionPair("Escape", new EscapeAction());
+        upKap = new KeyActionPair("Up", new UpAction());
+        downKap = new KeyActionPair("Down", new DownAction());
+        leftKap = new KeyActionPair("Left", new LeftAction());
+        rightKap = new KeyActionPair("Right", new RightAction());
+        enterKap = new KeyActionPair("Enter", enterAction);
+        tabKap = new KeyActionPair("Tab", enterAction);
+        homeKap = new KeyActionPair("Home", new HomeAction());
+        endKap = new KeyActionPair("End", new EndAction());
+        pageUpKap = new KeyActionPair("PageUp", new PageUpAction());
+        pageDownKap = new KeyActionPair("PageDown", new PageDownAction());
+        ctrlCKap = new KeyActionPair("CtrlC", new CopyAction());
+
+        // Buffers for the actions we replace.
+        oldEscape = new KeyActionPair();
+        oldUp = new KeyActionPair();
+        oldDown = new KeyActionPair();
+        oldLeft = new KeyActionPair();
+        oldRight = new KeyActionPair();
+        oldEnter = new KeyActionPair();
+        oldTab = new KeyActionPair();
+        oldHome = new KeyActionPair();
+        oldEnd = new KeyActionPair();
+        oldPageUp = new KeyActionPair();
+        oldPageDown = new KeyActionPair();
+        oldCtrlC = new KeyActionPair();
+
+    }
+
+
+    protected void doAutocomplete() {
+        lastLine = ac.refreshPopupWindow();
+    }
+
+
+    /**
+     * Returns the copy keystroke to use for this platform.
+     *
+     * @return The copy keystroke.
+     */
+    private static final KeyStroke getCopyKeyStroke() {
+        int key = KeyEvent.VK_C;
+        int mask = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+        return KeyStroke.getKeyStroke(key, mask);
+    }
+
+
+    /**
+     * Returns the default list cell renderer used when a completion provider
+     * does not supply its own.
+     *
+     * @return The default list cell renderer.
+     * @see #setListCellRenderer(ListCellRenderer)
+     */
+    public ListCellRenderer getListCellRenderer() {
+        DelegatingCellRenderer dcr = (DelegatingCellRenderer) list.
+                getCellRenderer();
+        return dcr.getFallbackCellRenderer();
+    }
+
+
+    /**
+     * Returns the selected value, or <code>null</code> if nothing is selected.
+     *
+     * @return The selected value.
+     */
+    public Completion getSelection() {
+        return isShowing() ? (Completion) list.getSelectedValue() : lastSelection;
+    }
+
+
+    /**
+     * Inserts the currently selected completion.
+     *
+     * @see #getSelection()
+     */
+    private void insertSelectedCompletion() {
+        Completion comp = getSelection();
+        ac.insertCompletion(comp);
+    }
+
+    public void installComp(AutoCompleteExtraRefreshComponent component){
+        this.component = component;
+    }
+
+    public void refreshInstallComp() {
+        component.refresh(getSelection().getReplacementText());
+    }
+
+    /**
+     * Registers keyboard actions to listen for in the text component and
+     * intercept.
+     *
+     * @see #uninstallKeyBindings()
+     */
+    private void installKeyBindings() {
+
+        if (AutoCompletion.isDebug()) {
+            FineLoggerFactory.getLogger().debug("PopupWindow: Installing keybindings");
+        }
+
+        if (escapeKap == null) { // Lazily create actions.
+            createKeyActionPairs();
+        }
+
+        JTextComponent comp = ac.getTextComponent();
+        InputMap im = comp.getInputMap();
+        ActionMap am = comp.getActionMap();
+
+        replaceAction(im, am, KeyEvent.VK_ESCAPE, escapeKap, oldEscape);
+        if (AutoCompletion.isDebug() && oldEscape.action == escapeKap.action) {
+            Thread.dumpStack();
+        }
+        replaceAction(im, am, KeyEvent.VK_UP, upKap, oldUp);
+        replaceAction(im, am, KeyEvent.VK_LEFT, leftKap, oldLeft);
+        replaceAction(im, am, KeyEvent.VK_DOWN, downKap, oldDown);
+        replaceAction(im, am, KeyEvent.VK_RIGHT, rightKap, oldRight);
+        replaceAction(im, am, KeyEvent.VK_ENTER, enterKap, oldEnter);
+        replaceAction(im, am, KeyEvent.VK_TAB, tabKap, oldTab);
+        replaceAction(im, am, KeyEvent.VK_HOME, homeKap, oldHome);
+        replaceAction(im, am, KeyEvent.VK_END, endKap, oldEnd);
+        replaceAction(im, am, KeyEvent.VK_PAGE_UP, pageUpKap, oldPageUp);
+        replaceAction(im, am, KeyEvent.VK_PAGE_DOWN, pageDownKap, oldPageDown);
+
+        // Make Ctrl+C copy from description window.  This isn't done
+        // automagically because the desc. window is not focusable, and copying
+        // from text components can only be done from focused components.
+        KeyStroke ks = getCopyKeyStroke();
+        oldCtrlC.key = im.get(ks);
+        im.put(ks, ctrlCKap.key);
+        oldCtrlC.action = am.get(ctrlCKap.key);
+        am.put(ctrlCKap.key, ctrlCKap.action);
+
+        comp.addCaretListener(this);
+
+    }
+
+
+    public void mouseClicked(MouseEvent e) {
+        if (e.getClickCount() == 2 && e.getButton() == 1) {
+            insertSelectedCompletion();
+        }
+    }
+
+
+    public void mouseEntered(MouseEvent e) {
+    }
+
+
+    public void mouseExited(MouseEvent e) {
+    }
+
+
+    public void mousePressed(MouseEvent e) {
+        refreshInstallComp();
+    }
+
+
+    public void mouseReleased(MouseEvent e) {
+    }
+
+
+    /**
+     * Positions the description window relative to the completion choices
+     * window.  We assume there is room on one side of the other for this
+     * entire window to fit.
+     */
+    private void positionDescWindow() {
+
+        boolean showDescWindow = descWindow != null && ac.isShowDescWindow();
+        if (!showDescWindow) {
+            return;
+        }
+
+        // Don't use getLocationOnScreen() as this throws an exception if
+        // window isn't visible yet, but getLocation() doesn't, and is in
+        // screen coordinates!
+        Point p = getLocation();
+        Rectangle screenBounds = Util.getScreenBoundsForPoint(p.x, p.y);
+        //Dimension screenSize = getToolkit().getScreenSize();
+        //int totalH = Math.max(getHeight(), descWindow.getHeight());
+
+        // Try to position to the right first (LTR)
+        int x;
+        if (ac.getTextComponentOrientation().isLeftToRight()) {
+            x = getX() + getWidth() + DIS;
+            if (x + descWindow.getWidth() > screenBounds.x + screenBounds.width) { // doesn't fit
+                x = getX() - DIS - descWindow.getWidth();
+            }
+        } else { // RTL
+            x = getX() - DIS - descWindow.getWidth();
+            if (x < screenBounds.x) { // Doesn't fit
+                x = getX() + getWidth() + DIS;
+            }
+        }
+
+        int y = getY();
+        if (aboveCaret) {
+            y = y + getHeight() - descWindow.getHeight();
+        }
+
+        if (x != descWindow.getX() || y != descWindow.getY()) {
+            descWindow.setLocation(x, y);
+        }
+
+    }
+
+
+    /**
+     * "Puts back" the original key/Action pair for a keystroke.  This is used
+     * when this popup is hidden.
+     *
+     * @param im  The input map.
+     * @param am  The action map.
+     * @param key The keystroke whose key/Action pair to change.
+     * @param kap The (original) key/Action pair.
+     * @see #replaceAction(InputMap, ActionMap, int, KeyActionPair, KeyActionPair)
+     */
+    private void putBackAction(InputMap im, ActionMap am, int key,
+                               KeyActionPair kap) {
+        KeyStroke ks = KeyStroke.getKeyStroke(key, 0);
+        am.put(im.get(ks), kap.action); // Original action for the "new" key
+        im.put(ks, kap.key); // Original key for the keystroke.
+    }
+
+
+    /**
+     * Replaces a key/Action pair in an InputMap and ActionMap with a new
+     * pair.
+     *
+     * @param im  The input map.
+     * @param am  The action map.
+     * @param key The keystroke whose information to replace.
+     * @param kap The new key/Action pair for <code>key</code>.
+     * @param old A buffer in which to place the old key/Action pair.
+     * @see #putBackAction(InputMap, ActionMap, int, KeyActionPair)
+     */
+    private void replaceAction(InputMap im, ActionMap am, int key,
+                               KeyActionPair kap, KeyActionPair old) {
+        KeyStroke ks = KeyStroke.getKeyStroke(key, 0);
+        old.key = im.get(ks);
+        im.put(ks, kap.key);
+        old.action = am.get(kap.key);
+        am.put(kap.key, kap.action);
+    }
+
+
+    /**
+     * Selects the first item in the completion list.
+     *
+     * @see #selectLastItem()
+     */
+    private void selectFirstItem() {
+        if (model.getSize() > 0) {
+            list.setSelectedIndex(0);
+            list.ensureIndexIsVisible(0);
+        }
+    }
+
+
+    /**
+     * Selects the last item in the completion list.
+     *
+     * @see #selectFirstItem()
+     */
+    private void selectLastItem() {
+        int index = model.getSize() - 1;
+        if (index > -1) {
+            list.setSelectedIndex(index);
+            list.ensureIndexIsVisible(index);
+        }
+    }
+
+
+    /**
+     * Selects the next item in the completion list.
+     *
+     * @see #selectPreviousItem()
+     */
+    private void selectNextItem() {
+        int index = list.getSelectedIndex();
+        if (index > -1) {
+            index = (index + 1) % model.getSize();
+            list.setSelectedIndex(index);
+            list.ensureIndexIsVisible(index);
+        }
+    }
+
+
+    /**
+     * Selects the completion item one "page down" from the currently selected
+     * one.
+     *
+     * @see #selectPageUpItem()
+     */
+    private void selectPageDownItem() {
+        int visibleRowCount = list.getVisibleRowCount();
+        int i = Math.min(list.getModel().getSize() - 1,
+                list.getSelectedIndex() + visibleRowCount);
+        list.setSelectedIndex(i);
+        list.ensureIndexIsVisible(i);
+    }
+
+
+    /**
+     * Selects the completion item one "page up" from the currently selected
+     * one.
+     *
+     * @see #selectPageDownItem()
+     */
+    private void selectPageUpItem() {
+        int visibleRowCount = list.getVisibleRowCount();
+        int i = Math.max(0, list.getSelectedIndex() - visibleRowCount);
+        list.setSelectedIndex(i);
+        list.ensureIndexIsVisible(i);
+    }
+
+
+    /**
+     * Selects the previous item in the completion list.
+     *
+     * @see #selectNextItem()
+     */
+    private void selectPreviousItem() {
+        int index = list.getSelectedIndex();
+        switch (index) {
+            case 0:
+                index = list.getModel().getSize() - 1;
+                break;
+            case -1: // Check for an empty list (would be an error)
+                index = list.getModel().getSize() - 1;
+                if (index == -1) {
+                    return;
+                }
+                break;
+            default:
+                index = index - 1;
+                break;
+        }
+        list.setSelectedIndex(index);
+        list.ensureIndexIsVisible(index);
+    }
+
+
+    /**
+     * Sets the completions to display in the choices list.  The first
+     * completion is selected.
+     *
+     * @param completions The completions to display.
+     */
+    public void setCompletions(List<Completion> completions) {
+        model.setContents(completions);
+        selectFirstItem();
+    }
+
+
+    /**
+     * Sets the size of the description window.
+     *
+     * @param size The new size.  This cannot be <code>null</code>.
+     */
+    public void setDescriptionWindowSize(Dimension size) {
+        if (descWindow != null) {
+            descWindow.setSize(size);
+        } else {
+            preferredDescWindowSize = size;
+        }
+    }
+
+
+    /**
+     * Sets the default list cell renderer to use when a completion provider
+     * does not supply its own.
+     *
+     * @param renderer The renderer to use.  If this is <code>null</code>,
+     *                 a default renderer is used.
+     * @see #getListCellRenderer()
+     */
+    public void setListCellRenderer(ListCellRenderer renderer) {
+        DelegatingCellRenderer dcr = (DelegatingCellRenderer) list.
+                getCellRenderer();
+        dcr.setFallbackCellRenderer(renderer);
+    }
+
+
+    /**
+     * Sets the location of this window to be "good" relative to the specified
+     * rectangle.  That rectangle should be the location of the text
+     * component's caret, in screen coordinates.
+     *
+     * @param r The text component's caret position, in screen coordinates.
+     */
+    public void setLocationRelativeTo(Rectangle r) {
+
+        // Multi-monitor support - make sure the completion window (and
+        // description window, if applicable) both fit in the same window in
+        // a multi-monitor environment.  To do this, we decide which monitor
+        // the rectangle "r" is in, and use that one (just pick top-left corner
+        // as the defining point).
+        Rectangle screenBounds = Util.getScreenBoundsForPoint(r.x, r.y);
+        //Dimension screenSize = getToolkit().getScreenSize();
+
+        boolean showDescWindow = descWindow != null && ac.isShowDescWindow();
+        int totalH = getHeight();
+        if (showDescWindow) {
+            totalH = Math.max(totalH, descWindow.getHeight());
+        }
+
+        // Try putting our stuff "below" the caret first.  We assume that the
+        // entire height of our stuff fits on the screen one way or the other.
+        aboveCaret = false;
+        int y = r.y + r.height + VERTICAL_SPACE;
+        if (y + totalH > screenBounds.height) {
+            y = r.y - VERTICAL_SPACE - getHeight();
+            aboveCaret = true;
+        }
+
+        // Get x-coordinate of completions.  Try to align left edge with the
+        // caret first.
+        int x = r.x;
+        if (!ac.getTextComponentOrientation().isLeftToRight()) {
+            x -= getWidth(); // RTL => align right edge
+        }
+        if (x < screenBounds.x) {
+            x = screenBounds.x;
+        } else if (x + getWidth() > screenBounds.x + screenBounds.width) { // completions don't fit
+            x = screenBounds.x + screenBounds.width - getWidth();
+        }
+
+        setLocation(x, y);
+
+        // Position the description window, if necessary.
+        if (showDescWindow) {
+            positionDescWindow();
+        }
+
+    }
+
+
+    /**
+     * Toggles the visibility of this popup window.
+     *
+     * @param visible Whether this window should be visible.
+     */
+    @Override
+    public void setVisible(boolean visible) {
+
+        if (visible != isVisible()) {
+
+            if (visible) {
+                installKeyBindings();
+                lastLine = ac.getLineOfCaret();
+                selectFirstItem();
+                if (descWindow == null && ac.isShowDescWindow()) {
+                    descWindow = createDescriptionWindow();
+                    positionDescWindow();
+                }
+                // descWindow needs a kick-start the first time it's displayed.
+                // Also, the newly-selected item in the choices list is
+                // probably different from the previous one anyway.
+                if (descWindow != null) {
+                    Completion c = (Completion) list.getSelectedValue();
+                    if (c != null) {
+                        descWindow.setDescriptionFor(c);
+                    }
+                }
+            } else {
+                uninstallKeyBindings();
+            }
+
+            super.setVisible(visible);
+
+            // Some languages, such as Java, can use quite a lot of memory
+            // when displaying hundreds of completion choices.  We pro-actively
+            // clear our list model here to make them available for GC.
+            // Otherwise, they stick around, and consider the following:  a
+            // user starts code-completion for Java 5 SDK classes, then hides
+            // the dialog, then changes the "class path" to use a Java 6 SDK
+            // instead.  On pressing Ctrl+space, a new array of Completions is
+            // created.  If this window holds on to the previous Completions,
+            // you're getting roughly 2x the necessary Completions in memory
+            // until the Completions are actually passed to this window.
+            if (!visible) { // Do after super.setVisible(false)
+                lastSelection = (Completion) list.getSelectedValue();
+                model.clear();
+            }
+
+            // Must set descWindow's visibility one way or the other each time,
+            // because of the way child JWindows' visibility is handled - in
+            // some ways it's dependent on the parent, in other ways it's not.
+            if (descWindow != null) {
+                descWindow.setVisible(visible && ac.isShowDescWindow());
+            }
+
+        }
+
+    }
+
+
+    /**
+     * Stops intercepting certain keystrokes from the text component.
+     *
+     * @see #installKeyBindings()
+     */
+    private void uninstallKeyBindings() {
+
+        if (AutoCompletion.isDebug()) {
+            FineLoggerFactory.getLogger().debug("PopupWindow: Removing keybindings");
+        }
+
+        JTextComponent comp = ac.getTextComponent();
+        InputMap im = comp.getInputMap();
+        ActionMap am = comp.getActionMap();
+
+        putBackAction(im, am, KeyEvent.VK_ESCAPE, oldEscape);
+        putBackAction(im, am, KeyEvent.VK_UP, oldUp);
+        putBackAction(im, am, KeyEvent.VK_DOWN, oldDown);
+        putBackAction(im, am, KeyEvent.VK_LEFT, oldLeft);
+        putBackAction(im, am, KeyEvent.VK_RIGHT, oldRight);
+        putBackAction(im, am, KeyEvent.VK_ENTER, oldEnter);
+        putBackAction(im, am, KeyEvent.VK_TAB, oldTab);
+        putBackAction(im, am, KeyEvent.VK_HOME, oldHome);
+        putBackAction(im, am, KeyEvent.VK_END, oldEnd);
+        putBackAction(im, am, KeyEvent.VK_PAGE_UP, oldPageUp);
+        putBackAction(im, am, KeyEvent.VK_PAGE_DOWN, oldPageDown);
+
+        // Ctrl+C
+        KeyStroke ks = getCopyKeyStroke();
+        am.put(im.get(ks), oldCtrlC.action); // Original action
+        im.put(ks, oldCtrlC.key); // Original key
+
+        comp.removeCaretListener(this);
+
+    }
+
+
+    /**
+     * Updates the <tt>LookAndFeel</tt> of this window and the description
+     * window.
+     */
+    public void updateUI() {
+        SwingUtilities.updateComponentTreeUI(this);
+        if (descWindow != null) {
+            descWindow.updateUI();
+        }
+    }
+
+
+    /**
+     * Called when a new item is selected in the popup list.
+     *
+     * @param e The event.
+     */
+    public void valueChanged(ListSelectionEvent e) {
+        if (!e.getValueIsAdjusting()) {
+            Object value = list.getSelectedValue();
+            if (value != null && descWindow != null) {
+                descWindow.setDescriptionFor((Completion) value);
+                positionDescWindow();
+            }
+        }
+    }
+
+
+    class CopyAction extends AbstractAction {
+
+        public void actionPerformed(ActionEvent e) {
+            boolean doNormalCopy = false;
+            if (descWindow != null && descWindow.isVisible()) {
+                doNormalCopy = !descWindow.copy();
+            }
+            if (doNormalCopy) {
+                ac.getTextComponent().copy();
+            }
+        }
+
+    }
+
+
+    class DownAction extends AbstractAction {
+
+        public void actionPerformed(ActionEvent e) {
+            if (isVisible()) {
+                selectNextItem();
+                refreshInstallComp();
+            }
+        }
+
+    }
+
+
+    class EndAction extends AbstractAction {
+
+        public void actionPerformed(ActionEvent e) {
+            if (isVisible()) {
+                selectLastItem();
+            }
+        }
+
+    }
+
+
+    class EnterAction extends AbstractAction {
+
+        public void actionPerformed(ActionEvent e) {
+            if (isVisible()) {
+                insertSelectedCompletion();
+                refreshInstallComp();
+            }
+        }
+
+    }
+
+
+    class EscapeAction extends AbstractAction {
+
+        public void actionPerformed(ActionEvent e) {
+            if (isVisible()) {
+                setVisible(false);
+            }
+        }
+
+    }
+
+
+    class HomeAction extends AbstractAction {
+
+        public void actionPerformed(ActionEvent e) {
+            if (isVisible()) {
+                selectFirstItem();
+            }
+        }
+
+    }
+
+
+    /**
+     * A mapping from a key (an Object) to an Action.
+     */
+    private static class KeyActionPair {
+
+        public Object key;
+        public Action action;
+
+        public KeyActionPair() {
+        }
+
+        public KeyActionPair(Object key, Action a) {
+            this.key = key;
+            this.action = a;
+        }
+
+    }
+
+
+    class LeftAction extends AbstractAction {
+
+        public void actionPerformed(ActionEvent e) {
+            if (isVisible()) {
+                JTextComponent comp = ac.getTextComponent();
+                Caret c = comp.getCaret();
+                int dot = c.getDot();
+                if (dot > 0) {
+                    c.setDot(--dot);
+                    // Ensure moving left hasn't moved us up a line, thus
+                    // hiding the popup window.
+                    if (comp.isVisible()) {
+                        if (lastLine != -1) {
+                            doAutocomplete();
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
+
+    class PageDownAction extends AbstractAction {
+
+        public void actionPerformed(ActionEvent e) {
+            if (isVisible()) {
+                selectPageDownItem();
+            }
+        }
+
+    }
+
+
+    class PageUpAction extends AbstractAction {
+
+        public void actionPerformed(ActionEvent e) {
+            if (isVisible()) {
+                selectPageUpItem();
+            }
+        }
+
+    }
+
+
+    /**
+     * The actual list of completion choices in this popup window.
+     */
+    private class PopupList extends JList {
+
+        public PopupList(CompletionListModel model) {
+            super(model);
+        }
+
+        @Override
+        public void setUI(ListUI ui) {
+            if (Util.getUseSubstanceRenderers() &&
+                    SUBSTANCE_LIST_UI.equals(ui.getClass().getName())) {
+                // Substance requires its special ListUI be installed for
+                // its renderers to actually render (!), but long completion
+                // lists (e.g. PHPCompletionProvider in RSTALanguageSupport)
+                // will simply populate too slowly on initial display (when
+                // calculating preferred size of all items), so in this case
+                // we give a prototype cell value.
+                CompletionProvider p = ac.getCompletionProvider();
+                BasicCompletion bc = new BasicCompletion(p, "Hello world");
+                setPrototypeCellValue(bc);
+            } else {
+                // Our custom UI that is faster for long HTML completion lists.
+                ui = new FastListUI();
+                setPrototypeCellValue(null);
+            }
+            super.setUI(ui);
+        }
+
+    }
+
+
+    class RightAction extends AbstractAction {
+
+        public void actionPerformed(ActionEvent e) {
+            if (isVisible()) {
+                JTextComponent comp = ac.getTextComponent();
+                Caret c = comp.getCaret();
+                int dot = c.getDot();
+                if (dot < comp.getDocument().getLength()) {
+                    c.setDot(++dot);
+                    // Ensure moving right hasn't moved us up a line, thus
+                    // hiding the popup window.
+                    if (comp.isVisible()) {
+                        if (lastLine != -1) {
+                            doAutocomplete();
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
+
+    class UpAction extends AbstractAction {
+
+        public void actionPerformed(ActionEvent e) {
+            if (isVisible()) {
+                selectPreviousItem();
+                refreshInstallComp();
+            }
+        }
+
+    }
+
+}

designer-base/src/main/java/com/fr/design/gui/autocomplete/FormulaAutoCompletePopupWindow.java

@@ -9,41 +9,7 @@
  */
 package com.fr.design.gui.autocomplete;
 
-import com.fr.design.formula.FormulaPane;
-import com.fr.design.gui.syntax.ui.rsyntaxtextarea.PopupWindowDecorator;
-import com.fr.log.FineLoggerFactory;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ActionMap;
-import javax.swing.InputMap;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JWindow;
-import javax.swing.KeyStroke;
-import javax.swing.ListCellRenderer;
-import javax.swing.SwingUtilities;
-import javax.swing.event.CaretEvent;
-import javax.swing.event.CaretListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.plaf.ListUI;
-import javax.swing.text.Caret;
-import javax.swing.text.JTextComponent;
-import java.awt.BorderLayout;
-import java.awt.ComponentOrientation;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
 import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.List;
-
 
 /**
  * The actual popup window of choices.  When visible, this window intercepts
@@ -55,949 +21,11 @@ import java.util.List;
  * @author Robert Futrell
  * @version 1.0
  */
-class FormulaAutoCompletePopupWindow extends JWindow implements CaretListener,
+class FormulaAutoCompletePopupWindow extends AutoCompleteWithExtraRefreshPopupWindow {
-        ListSelectionListener, MouseListener {
-
-    private final static int DIS = 5;
-    /**
-     * The parent AutoCompletion instance.
-     */
-    private FormulaPaneAutoCompletion ac;
-
-    /**
-     * The list of completion choices.
-     */
-    private JList list;
-
-    /**
-     * The contents of {@link #list()}.
-     */
-    private CompletionListModel model;
-
-    /**
-     * A hack to work around the fact that we clear our completion model (and
-     * our selection) when hiding the completion window.  This allows us to
-     * still know what the user selected after the popup is hidden.
-     */
-    private Completion lastSelection;
-
-    /**
-     * Optional popup window containing a description of the currently
-     * selected completion.
-     */
-    private AutoCompleteDescWindow descWindow;
 
-    /**
-     * The preferred size of the optional description window.  This field
-     * only exists because the user may (and usually will) set the size of
-     * the description window before it exists (it must be parented to a
-     * Window).
-     */
-    private Dimension preferredDescWindowSize;
-
-    private FormulaPane.VariableTreeAndDescriptionArea component;
-
-    /**
-     * Whether the completion window and the optional description window
-     * should be displayed above the current caret position (as opposed to
-     * underneath it, which is preferred unless there is not enough space).
-     */
-    private boolean aboveCaret;
-
-    private int lastLine;
-
-    private KeyActionPair escapeKap;
-    private KeyActionPair upKap;
-    private KeyActionPair downKap;
-    private KeyActionPair leftKap;
-    private KeyActionPair rightKap;
-    private KeyActionPair enterKap;
-    private KeyActionPair tabKap;
-    private KeyActionPair homeKap;
-    private KeyActionPair endKap;
-    private KeyActionPair pageUpKap;
-    private KeyActionPair pageDownKap;
-    private KeyActionPair ctrlCKap;
-
-    private KeyActionPair oldEscape, oldUp, oldDown, oldLeft, oldRight,
-            oldEnter, oldTab, oldHome, oldEnd, oldPageUp, oldPageDown,
-            oldCtrlC;
-
-    /**
-     * The space between the caret and the completion popup.
-     */
-    private static final int VERTICAL_SPACE = 1;
-
-    /**
-     * The class name of the Substance List UI.
-     */
-    private static final String SUBSTANCE_LIST_UI =
-            "org.pushingpixels.substance.internal.ui.SubstanceListUI";
 
-
-    /**
-     * Constructor.
-     *
-     * @param parent The parent window (hosting the text component).
-     * @param ac     The auto-completion instance.
-     */
     public FormulaAutoCompletePopupWindow(Window parent, final FormulaPaneAutoCompletion ac) {
-
+         super(parent,ac);
-        super(parent);
-        ComponentOrientation o = ac.getTextComponentOrientation();
-
-        this.ac = ac;
-        model = new CompletionListModel();
-        list = new PopupList(model);
-
-        list.setCellRenderer(new DelegatingCellRenderer());
-        list.addListSelectionListener(this);
-        list.addMouseListener(this);
-
-        JPanel contentPane = new JPanel(new BorderLayout());
-        JScrollPane sp = new JScrollPane(list,
-                JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
-                JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-
-        // In 1.4, JScrollPane.setCorner() has a bug where it won't accept
-        // JScrollPane.LOWER_TRAILING_CORNER, even though that constant is
-        // defined.  So we have to put the logic added in 1.5 to handle it
-        // here.
-        JPanel corner = new SizeGrip();
-        //sp.setCorner(JScrollPane.LOWER_TRAILING_CORNER, corner);
-        boolean isLeftToRight = o.isLeftToRight();
-        String str = isLeftToRight ? JScrollPane.LOWER_RIGHT_CORNER :
-                JScrollPane.LOWER_LEFT_CORNER;
-        sp.setCorner(str, corner);
-
-        contentPane.add(sp);
-        setContentPane(contentPane);
-        applyComponentOrientation(o);
-
-        // Give apps a chance to decorate us with drop shadows, etc.
-        if (Util.getShouldAllowDecoratingMainAutoCompleteWindows()) {
-            PopupWindowDecorator decorator = PopupWindowDecorator.get();
-            if (decorator != null) {
-                decorator.decorate(this);
-            }
-        }
-
-        pack();
-
-        setFocusableWindowState(false);
-
-        lastLine = -1;
-
-    }
-
-
-    public void caretUpdate(CaretEvent e) {
-        if (isVisible()) { // Should always be true
-            int line = ac.getLineOfCaret();
-            if (line != lastLine) {
-                lastLine = -1;
-                setVisible(false);
-            } else {
-                doAutocomplete();
-            }
-        } else if (AutoCompletion.isDebug()) {
-            Thread.dumpStack();
-        }
-    }
-
-
-    /**
-     * Creates the description window.
-     *
-     * @return The description window.
-     */
-    private AutoCompleteDescWindow createDescriptionWindow() {
-        AutoCompleteDescWindow dw = new AutoCompleteDescWindow(this, ac);
-        dw.applyComponentOrientation(ac.getTextComponentOrientation());
-        Dimension size = preferredDescWindowSize;
-        if (size == null) {
-            size = getSize();
-        }
-        dw.setSize(size);
-        return dw;
-    }
-
-
-    /**
-     * Creates the mappings from keys to Actions we'll be putting into the
-     * text component's ActionMap and InputMap.
-     */
-    private void createKeyActionPairs() {
-
-        // Actions we'll install.
-        EnterAction enterAction = new EnterAction();
-        escapeKap = new KeyActionPair("Escape", new EscapeAction());
-        upKap = new KeyActionPair("Up", new UpAction());
-        downKap = new KeyActionPair("Down", new DownAction());
-        leftKap = new KeyActionPair("Left", new LeftAction());
-        rightKap = new KeyActionPair("Right", new RightAction());
-        enterKap = new KeyActionPair("Enter", enterAction);
-        tabKap = new KeyActionPair("Tab", enterAction);
-        homeKap = new KeyActionPair("Home", new HomeAction());
-        endKap = new KeyActionPair("End", new EndAction());
-        pageUpKap = new KeyActionPair("PageUp", new PageUpAction());
-        pageDownKap = new KeyActionPair("PageDown", new PageDownAction());
-        ctrlCKap = new KeyActionPair("CtrlC", new CopyAction());
-
-        // Buffers for the actions we replace.
-        oldEscape = new KeyActionPair();
-        oldUp = new KeyActionPair();
-        oldDown = new KeyActionPair();
-        oldLeft = new KeyActionPair();
-        oldRight = new KeyActionPair();
-        oldEnter = new KeyActionPair();
-        oldTab = new KeyActionPair();
-        oldHome = new KeyActionPair();
-        oldEnd = new KeyActionPair();
-        oldPageUp = new KeyActionPair();
-        oldPageDown = new KeyActionPair();
-        oldCtrlC = new KeyActionPair();
-
-    }
-
-
-    protected void doAutocomplete() {
-        lastLine = ac.refreshPopupWindow();
-    }
-
-
-    /**
-     * Returns the copy keystroke to use for this platform.
-     *
-     * @return The copy keystroke.
-     */
-    private static final KeyStroke getCopyKeyStroke() {
-        int key = KeyEvent.VK_C;
-        int mask = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
-        return KeyStroke.getKeyStroke(key, mask);
-    }
-
-
-    /**
-     * Returns the default list cell renderer used when a completion provider
-     * does not supply its own.
-     *
-     * @return The default list cell renderer.
-     * @see #setListCellRenderer(ListCellRenderer)
-     */
-    public ListCellRenderer getListCellRenderer() {
-        DelegatingCellRenderer dcr = (DelegatingCellRenderer) list.
-                getCellRenderer();
-        return dcr.getFallbackCellRenderer();
-    }
-
-
-    /**
-     * Returns the selected value, or <code>null</code> if nothing is selected.
-     *
-     * @return The selected value.
-     */
-    public Completion getSelection() {
-        return isShowing() ? (Completion) list.getSelectedValue() : lastSelection;
-    }
-
-
-    /**
-     * Inserts the currently selected completion.
-     *
-     * @see #getSelection()
-     */
-    private void insertSelectedCompletion() {
-        Completion comp = getSelection();
-        ac.insertCompletion(comp);
-    }
-
-    public void installComp(FormulaPane.VariableTreeAndDescriptionArea component) {
-        this.component = component;
-    }
-
-    private void refreshInstallComp() {
-        component.refreshText(getSelection().getReplacementText());
-    }
-
-
-    /**
-     * Registers keyboard actions to listen for in the text component and
-     * intercept.
-     *
-     * @see #uninstallKeyBindings()
-     */
-    private void installKeyBindings() {
-
-        if (AutoCompletion.isDebug()) {
-            FineLoggerFactory.getLogger().debug("PopupWindow: Installing keybindings");
     }
 
-        if (escapeKap == null) { // Lazily create actions.
-            createKeyActionPairs();
-        }
-
-        JTextComponent comp = ac.getTextComponent();
-        InputMap im = comp.getInputMap();
-        ActionMap am = comp.getActionMap();
-
-        replaceAction(im, am, KeyEvent.VK_ESCAPE, escapeKap, oldEscape);
-        if (AutoCompletion.isDebug() && oldEscape.action == escapeKap.action) {
-            Thread.dumpStack();
-        }
-        replaceAction(im, am, KeyEvent.VK_UP, upKap, oldUp);
-        replaceAction(im, am, KeyEvent.VK_LEFT, leftKap, oldLeft);
-        replaceAction(im, am, KeyEvent.VK_DOWN, downKap, oldDown);
-        replaceAction(im, am, KeyEvent.VK_RIGHT, rightKap, oldRight);
-        replaceAction(im, am, KeyEvent.VK_ENTER, enterKap, oldEnter);
-        replaceAction(im, am, KeyEvent.VK_TAB, tabKap, oldTab);
-        replaceAction(im, am, KeyEvent.VK_HOME, homeKap, oldHome);
-        replaceAction(im, am, KeyEvent.VK_END, endKap, oldEnd);
-        replaceAction(im, am, KeyEvent.VK_PAGE_UP, pageUpKap, oldPageUp);
-        replaceAction(im, am, KeyEvent.VK_PAGE_DOWN, pageDownKap, oldPageDown);
-
-        // Make Ctrl+C copy from description window.  This isn't done
-        // automagically because the desc. window is not focusable, and copying
-        // from text components can only be done from focused components.
-        KeyStroke ks = getCopyKeyStroke();
-        oldCtrlC.key = im.get(ks);
-        im.put(ks, ctrlCKap.key);
-        oldCtrlC.action = am.get(ctrlCKap.key);
-        am.put(ctrlCKap.key, ctrlCKap.action);
-
-        comp.addCaretListener(this);
-
-    }
-
-
-    public void mouseClicked(MouseEvent e) {
-        if (e.getClickCount() == 2 && e.getButton() == 1) {
-            insertSelectedCompletion();
-        }
-    }
-
-
-    public void mouseEntered(MouseEvent e) {
-    }
-
-
-    public void mouseExited(MouseEvent e) {
-    }
-
-
-    public void mousePressed(MouseEvent e) {
-        refreshInstallComp();
-    }
-
-
-    public void mouseReleased(MouseEvent e) {
-    }
-
-
-    /**
-     * Positions the description window relative to the completion choices
-     * window.  We assume there is room on one side of the other for this
-     * entire window to fit.
-     */
-    private void positionDescWindow() {
-
-        boolean showDescWindow = descWindow != null && ac.isShowDescWindow();
-        if (!showDescWindow) {
-            return;
-        }
-
-        // Don't use getLocationOnScreen() as this throws an exception if
-        // window isn't visible yet, but getLocation() doesn't, and is in
-        // screen coordinates!
-        Point p = getLocation();
-        Rectangle screenBounds = Util.getScreenBoundsForPoint(p.x, p.y);
-        //Dimension screenSize = getToolkit().getScreenSize();
-        //int totalH = Math.max(getHeight(), descWindow.getHeight());
-
-        // Try to position to the right first (LTR)
-        int x;
-        if (ac.getTextComponentOrientation().isLeftToRight()) {
-            x = getX() + getWidth() + DIS;
-            if (x + descWindow.getWidth() > screenBounds.x + screenBounds.width) { // doesn't fit
-                x = getX() - DIS - descWindow.getWidth();
-            }
-        } else { // RTL
-            x = getX() - DIS - descWindow.getWidth();
-            if (x < screenBounds.x) { // Doesn't fit
-                x = getX() + getWidth() + DIS;
-            }
-        }
-
-        int y = getY();
-        if (aboveCaret) {
-            y = y + getHeight() - descWindow.getHeight();
-        }
-
-        if (x != descWindow.getX() || y != descWindow.getY()) {
-            descWindow.setLocation(x, y);
-        }
-
-    }
-
-
-    /**
-     * "Puts back" the original key/Action pair for a keystroke.  This is used
-     * when this popup is hidden.
-     *
-     * @param im  The input map.
-     * @param am  The action map.
-     * @param key The keystroke whose key/Action pair to change.
-     * @param kap The (original) key/Action pair.
-     * @see #replaceAction(InputMap, ActionMap, int, KeyActionPair, KeyActionPair)
-     */
-    private void putBackAction(InputMap im, ActionMap am, int key,
-                               KeyActionPair kap) {
-        KeyStroke ks = KeyStroke.getKeyStroke(key, 0);
-        am.put(im.get(ks), kap.action); // Original action for the "new" key
-        im.put(ks, kap.key); // Original key for the keystroke.
-    }
-
-
-    /**
-     * Replaces a key/Action pair in an InputMap and ActionMap with a new
-     * pair.
-     *
-     * @param im  The input map.
-     * @param am  The action map.
-     * @param key The keystroke whose information to replace.
-     * @param kap The new key/Action pair for <code>key</code>.
-     * @param old A buffer in which to place the old key/Action pair.
-     * @see #putBackAction(InputMap, ActionMap, int, KeyActionPair)
-     */
-    private void replaceAction(InputMap im, ActionMap am, int key,
-                               KeyActionPair kap, KeyActionPair old) {
-        KeyStroke ks = KeyStroke.getKeyStroke(key, 0);
-        old.key = im.get(ks);
-        im.put(ks, kap.key);
-        old.action = am.get(kap.key);
-        am.put(kap.key, kap.action);
-    }
-
-
-    /**
-     * Selects the first item in the completion list.
-     *
-     * @see #selectLastItem()
-     */
-    private void selectFirstItem() {
-        if (model.getSize() > 0) {
-            list.setSelectedIndex(0);
-            list.ensureIndexIsVisible(0);
-        }
-    }
-
-
-    /**
-     * Selects the last item in the completion list.
-     *
-     * @see #selectFirstItem()
-     */
-    private void selectLastItem() {
-        int index = model.getSize() - 1;
-        if (index > -1) {
-            list.setSelectedIndex(index);
-            list.ensureIndexIsVisible(index);
-        }
-    }
-
-
-    /**
-     * Selects the next item in the completion list.
-     *
-     * @see #selectPreviousItem()
-     */
-    private void selectNextItem() {
-        int index = list.getSelectedIndex();
-        if (index > -1) {
-            index = (index + 1) % model.getSize();
-            list.setSelectedIndex(index);
-            list.ensureIndexIsVisible(index);
-        }
-    }
-
-
-    /**
-     * Selects the completion item one "page down" from the currently selected
-     * one.
-     *
-     * @see #selectPageUpItem()
-     */
-    private void selectPageDownItem() {
-        int visibleRowCount = list.getVisibleRowCount();
-        int i = Math.min(list.getModel().getSize() - 1,
-                list.getSelectedIndex() + visibleRowCount);
-        list.setSelectedIndex(i);
-        list.ensureIndexIsVisible(i);
-    }
-
-
-    /**
-     * Selects the completion item one "page up" from the currently selected
-     * one.
-     *
-     * @see #selectPageDownItem()
-     */
-    private void selectPageUpItem() {
-        int visibleRowCount = list.getVisibleRowCount();
-        int i = Math.max(0, list.getSelectedIndex() - visibleRowCount);
-        list.setSelectedIndex(i);
-        list.ensureIndexIsVisible(i);
-    }
-
-
-    /**
-     * Selects the previous item in the completion list.
-     *
-     * @see #selectNextItem()
-     */
-    private void selectPreviousItem() {
-        int index = list.getSelectedIndex();
-        switch (index) {
-            case 0:
-                index = list.getModel().getSize() - 1;
-                break;
-            case -1: // Check for an empty list (would be an error)
-                index = list.getModel().getSize() - 1;
-                if (index == -1) {
-                    return;
-                }
-                break;
-            default:
-                index = index - 1;
-                break;
-        }
-        list.setSelectedIndex(index);
-        list.ensureIndexIsVisible(index);
-    }
-
-
-    /**
-     * Sets the completions to display in the choices list.  The first
-     * completion is selected.
-     *
-     * @param completions The completions to display.
-     */
-    public void setCompletions(List<Completion> completions) {
-        model.setContents(completions);
-        selectFirstItem();
-    }
-
-
-    /**
-     * Sets the size of the description window.
-     *
-     * @param size The new size.  This cannot be <code>null</code>.
-     */
-    public void setDescriptionWindowSize(Dimension size) {
-        if (descWindow != null) {
-            descWindow.setSize(size);
-        } else {
-            preferredDescWindowSize = size;
-        }
-    }
-
-
-    /**
-     * Sets the default list cell renderer to use when a completion provider
-     * does not supply its own.
-     *
-     * @param renderer The renderer to use.  If this is <code>null</code>,
-     *                 a default renderer is used.
-     * @see #getListCellRenderer()
-     */
-    public void setListCellRenderer(ListCellRenderer renderer) {
-        DelegatingCellRenderer dcr = (DelegatingCellRenderer) list.
-                getCellRenderer();
-        dcr.setFallbackCellRenderer(renderer);
-    }
-
-
-    /**
-     * Sets the location of this window to be "good" relative to the specified
-     * rectangle.  That rectangle should be the location of the text
-     * component's caret, in screen coordinates.
-     *
-     * @param r The text component's caret position, in screen coordinates.
-     */
-    public void setLocationRelativeTo(Rectangle r) {
-
-        // Multi-monitor support - make sure the completion window (and
-        // description window, if applicable) both fit in the same window in
-        // a multi-monitor environment.  To do this, we decide which monitor
-        // the rectangle "r" is in, and use that one (just pick top-left corner
-        // as the defining point).
-        Rectangle screenBounds = Util.getScreenBoundsForPoint(r.x, r.y);
-        //Dimension screenSize = getToolkit().getScreenSize();
-
-        boolean showDescWindow = descWindow != null && ac.isShowDescWindow();
-        int totalH = getHeight();
-        if (showDescWindow) {
-            totalH = Math.max(totalH, descWindow.getHeight());
-        }
-
-        // Try putting our stuff "below" the caret first.  We assume that the
-        // entire height of our stuff fits on the screen one way or the other.
-        aboveCaret = false;
-        int y = r.y + r.height + VERTICAL_SPACE;
-        if (y + totalH > screenBounds.height) {
-            y = r.y - VERTICAL_SPACE - getHeight();
-            aboveCaret = true;
-        }
-
-        // Get x-coordinate of completions.  Try to align left edge with the
-        // caret first.
-        int x = r.x;
-        if (!ac.getTextComponentOrientation().isLeftToRight()) {
-            x -= getWidth(); // RTL => align right edge
-        }
-        if (x < screenBounds.x) {
-            x = screenBounds.x;
-        } else if (x + getWidth() > screenBounds.x + screenBounds.width) { // completions don't fit
-            x = screenBounds.x + screenBounds.width - getWidth();
-        }
-
-        setLocation(x, y);
-
-        // Position the description window, if necessary.
-        if (showDescWindow) {
-            positionDescWindow();
-        }
-
-    }
-
-
-    /**
-     * Toggles the visibility of this popup window.
-     *
-     * @param visible Whether this window should be visible.
-     */
-    @Override
-    public void setVisible(boolean visible) {
-
-        if (visible != isVisible()) {
-
-            if (visible) {
-                installKeyBindings();
-                lastLine = ac.getLineOfCaret();
-                selectFirstItem();
-                if (descWindow == null && ac.isShowDescWindow()) {
-                    descWindow = createDescriptionWindow();
-                    positionDescWindow();
-                }
-                // descWindow needs a kick-start the first time it's displayed.
-                // Also, the newly-selected item in the choices list is
-                // probably different from the previous one anyway.
-                if (descWindow != null) {
-                    Completion c = (Completion) list.getSelectedValue();
-                    if (c != null) {
-                        descWindow.setDescriptionFor(c);
-                    }
-                }
-            } else {
-                uninstallKeyBindings();
-            }
-
-            super.setVisible(visible);
-
-            // Some languages, such as Java, can use quite a lot of memory
-            // when displaying hundreds of completion choices.  We pro-actively
-            // clear our list model here to make them available for GC.
-            // Otherwise, they stick around, and consider the following:  a
-            // user starts code-completion for Java 5 SDK classes, then hides
-            // the dialog, then changes the "class path" to use a Java 6 SDK
-            // instead.  On pressing Ctrl+space, a new array of Completions is
-            // created.  If this window holds on to the previous Completions,
-            // you're getting roughly 2x the necessary Completions in memory
-            // until the Completions are actually passed to this window.
-            if (!visible) { // Do after super.setVisible(false)
-                lastSelection = (Completion) list.getSelectedValue();
-                model.clear();
-            }
-
-            // Must set descWindow's visibility one way or the other each time,
-            // because of the way child JWindows' visibility is handled - in
-            // some ways it's dependent on the parent, in other ways it's not.
-            if (descWindow != null) {
-                descWindow.setVisible(visible && ac.isShowDescWindow());
-            }
-
-        }
-
-    }
-
-
-    /**
-     * Stops intercepting certain keystrokes from the text component.
-     *
-     * @see #installKeyBindings()
-     */
-    private void uninstallKeyBindings() {
-
-        if (AutoCompletion.isDebug()) {
-            FineLoggerFactory.getLogger().debug("PopupWindow: Removing keybindings");
-        }
-
-        JTextComponent comp = ac.getTextComponent();
-        InputMap im = comp.getInputMap();
-        ActionMap am = comp.getActionMap();
-
-        putBackAction(im, am, KeyEvent.VK_ESCAPE, oldEscape);
-        putBackAction(im, am, KeyEvent.VK_UP, oldUp);
-        putBackAction(im, am, KeyEvent.VK_DOWN, oldDown);
-        putBackAction(im, am, KeyEvent.VK_LEFT, oldLeft);
-        putBackAction(im, am, KeyEvent.VK_RIGHT, oldRight);
-        putBackAction(im, am, KeyEvent.VK_ENTER, oldEnter);
-        putBackAction(im, am, KeyEvent.VK_TAB, oldTab);
-        putBackAction(im, am, KeyEvent.VK_HOME, oldHome);
-        putBackAction(im, am, KeyEvent.VK_END, oldEnd);
-        putBackAction(im, am, KeyEvent.VK_PAGE_UP, oldPageUp);
-        putBackAction(im, am, KeyEvent.VK_PAGE_DOWN, oldPageDown);
-
-        // Ctrl+C
-        KeyStroke ks = getCopyKeyStroke();
-        am.put(im.get(ks), oldCtrlC.action); // Original action
-        im.put(ks, oldCtrlC.key); // Original key
-
-        comp.removeCaretListener(this);
-
-    }
-
-
-    /**
-     * Updates the <tt>LookAndFeel</tt> of this window and the description
-     * window.
-     */
-    public void updateUI() {
-        SwingUtilities.updateComponentTreeUI(this);
-        if (descWindow != null) {
-            descWindow.updateUI();
-        }
-    }
-
-
-    /**
-     * Called when a new item is selected in the popup list.
-     *
-     * @param e The event.
-     */
-    public void valueChanged(ListSelectionEvent e) {
-        if (!e.getValueIsAdjusting()) {
-            Object value = list.getSelectedValue();
-            if (value != null && descWindow != null) {
-                descWindow.setDescriptionFor((Completion) value);
-                positionDescWindow();
-            }
-        }
-    }
-
-
-    class CopyAction extends AbstractAction {
-
-        public void actionPerformed(ActionEvent e) {
-            boolean doNormalCopy = false;
-            if (descWindow != null && descWindow.isVisible()) {
-                doNormalCopy = !descWindow.copy();
-            }
-            if (doNormalCopy) {
-                ac.getTextComponent().copy();
-            }
-        }
-
-    }
-
-
-    class DownAction extends AbstractAction {
-
-        public void actionPerformed(ActionEvent e) {
-            if (isVisible()) {
-                selectNextItem();
-                refreshInstallComp();
-            }
-        }
-
-    }
-
-
-    class EndAction extends AbstractAction {
-
-        public void actionPerformed(ActionEvent e) {
-            if (isVisible()) {
-                selectLastItem();
-            }
-        }
-
-    }
-
-
-    class EnterAction extends AbstractAction {
-
-        public void actionPerformed(ActionEvent e) {
-            if (isVisible()) {
-                insertSelectedCompletion();
-                refreshInstallComp();
-            }
-        }
-
-    }
-
-
-    class EscapeAction extends AbstractAction {
-
-        public void actionPerformed(ActionEvent e) {
-            if (isVisible()) {
-                setVisible(false);
-            }
-        }
-
-    }
-
-
-    class HomeAction extends AbstractAction {
-
-        public void actionPerformed(ActionEvent e) {
-            if (isVisible()) {
-                selectFirstItem();
-            }
-        }
-
-    }
-
-
-    /**
-     * A mapping from a key (an Object) to an Action.
-     */
-    private static class KeyActionPair {
-
-        public Object key;
-        public Action action;
-
-        public KeyActionPair() {
-        }
-
-        public KeyActionPair(Object key, Action a) {
-            this.key = key;
-            this.action = a;
-        }
-
-    }
-
-
-    class LeftAction extends AbstractAction {
-
-        public void actionPerformed(ActionEvent e) {
-            if (isVisible()) {
-                JTextComponent comp = ac.getTextComponent();
-                Caret c = comp.getCaret();
-                int dot = c.getDot();
-                if (dot > 0) {
-                    c.setDot(--dot);
-                    // Ensure moving left hasn't moved us up a line, thus
-                    // hiding the popup window.
-                    if (comp.isVisible()) {
-                        if (lastLine != -1) {
-                            doAutocomplete();
-                        }
-                    }
-                }
-            }
-        }
-
-    }
-
-
-    class PageDownAction extends AbstractAction {
-
-        public void actionPerformed(ActionEvent e) {
-            if (isVisible()) {
-                selectPageDownItem();
-            }
-        }
-
-    }
-
-
-    class PageUpAction extends AbstractAction {
-
-        public void actionPerformed(ActionEvent e) {
-            if (isVisible()) {
-                selectPageUpItem();
-            }
-        }
-
-    }
-
-
-    /**
-     * The actual list of completion choices in this popup window.
-     */
-    private class PopupList extends JList {
-
-        public PopupList(CompletionListModel model) {
-            super(model);
-        }
-
-        @Override
-        public void setUI(ListUI ui) {
-            if (Util.getUseSubstanceRenderers() &&
-                    SUBSTANCE_LIST_UI.equals(ui.getClass().getName())) {
-                // Substance requires its special ListUI be installed for
-                // its renderers to actually render (!), but long completion
-                // lists (e.g. PHPCompletionProvider in RSTALanguageSupport)
-                // will simply populate too slowly on initial display (when
-                // calculating preferred size of all items), so in this case
-                // we give a prototype cell value.
-                CompletionProvider p = ac.getCompletionProvider();
-                BasicCompletion bc = new BasicCompletion(p, "Hello world");
-                setPrototypeCellValue(bc);
-            } else {
-                // Our custom UI that is faster for long HTML completion lists.
-                ui = new FastListUI();
-                setPrototypeCellValue(null);
-            }
-            super.setUI(ui);
-        }
-
-    }
-
-
-    class RightAction extends AbstractAction {
-
-        public void actionPerformed(ActionEvent e) {
-            if (isVisible()) {
-                JTextComponent comp = ac.getTextComponent();
-                Caret c = comp.getCaret();
-                int dot = c.getDot();
-                if (dot < comp.getDocument().getLength()) {
-                    c.setDot(++dot);
-                    // Ensure moving right hasn't moved us up a line, thus
-                    // hiding the popup window.
-                    if (comp.isVisible()) {
-                        if (lastLine != -1) {
-                            doAutocomplete();
-                        }
-                    }
-                }
-            }
-        }
-
-    }
-
-
-    class UpAction extends AbstractAction {
-
-        public void actionPerformed(ActionEvent e) {
-            if (isVisible()) {
-                selectPreviousItem();
-                refreshInstallComp();
-            }
-        }
-
-    }
-
-
 }

designer-base/src/main/java/com/fr/design/gui/autocomplete/JSAutoCompletePopupWindow.java

@@ -0,0 +1,16 @@
+package com.fr.design.gui.autocomplete;
+
+import java.awt.Window;
+
+public class JSAutoCompletePopupWindow extends AutoCompleteWithExtraRefreshPopupWindow {
+
+    /**
+     * Constructor.
+     *
+     * @param parent The parent window (hosting the text component).
+     * @param ac     The auto-completion instance.
+     */
+    public JSAutoCompletePopupWindow(Window parent, AutoCompletion ac) {
+        super(parent, ac);
+    }
+}

designer-base/src/main/java/com/fr/design/gui/autocomplete/JSImplPaneAutoCompletion.java

@@ -0,0 +1,31 @@
+package com.fr.design.gui.autocomplete;
+
+public class JSImplPaneAutoCompletion extends AutoCompletionWithExtraRefresh{
+    /**
+     * Constructor.
+     *
+     * @param provider The completion provider.  This cannot be
+     *                 <code>null</code>.
+     */
+    public JSImplPaneAutoCompletion(CompletionProvider provider) {
+        super(provider);
+    }
+
+    @Override
+    protected AutoCompleteWithExtraRefreshPopupWindow createAutoCompletePopupWindow() {
+        JSAutoCompletePopupWindow popupWindow = new JSAutoCompletePopupWindow(getParentWindow(),this);
+        popupWindow.applyComponentOrientation(
+                getTextComponentOrientation());
+        if (getCellRender() != null) {
+            popupWindow.setListCellRenderer(getCellRender());
+        }
+        if (getPreferredChoicesWindowSize() != null) {
+            popupWindow.setSize(getPreferredChoicesWindowSize());
+        }
+        if (getPreferredDescWindowSize() != null) {
+            popupWindow.setDescriptionWindowSize(
+                    getPreferredDescWindowSize());
+        }
+        return popupWindow;
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.fr.design.gui.ifilechooser;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/29
+ */
+public class ExtensionFilter {
+
+    private final String des;
+    private final String[] extensions;
+
+    public ExtensionFilter(String des, String... extensions) {
+        this.des = des;
+        this.extensions = extensions;
+    }
+
+    public String getDes() {
+        return des;
+    }
+
+    public String[] getExtensions() {
+        return extensions;
+    }
+}

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

@@ -0,0 +1,109 @@
+package com.fr.design.gui.ifilechooser;
+
+/**
+ * 文件选择器可设置的参数集合
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/21
+ */
+public class FileChooserArgs {
+
+    private final FileSelectionMode fileSelectionMode;
+    private final String filterDes;
+    private final String[] extensions;
+    private final String selectedPath;
+    private final ExtensionFilter[] filters;
+    private final String tipText;
+    private final boolean multiSelectionEnabled;
+
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
+    private FileChooserArgs(Builder builder) {
+        this.fileSelectionMode = builder.fileSelectionMode;
+        this.filterDes = builder.filterDes;
+        this.extensions = builder.extensions;
+        this.selectedPath = builder.selectedPath;
+        this.filters = builder.filters;
+        this.tipText = builder.tipText;
+        this.multiSelectionEnabled = builder.multiSelectionEnabled;
+    }
+
+    public FileSelectionMode getFileSelectionMode() {
+        return fileSelectionMode;
+    }
+
+    public String getFilterDes() {
+        return filterDes;
+    }
+
+    public String[] getExtensions() {
+        return extensions;
+    }
+
+    public String getSelectedPath() {
+        return selectedPath;
+    }
+
+    public ExtensionFilter[] getFilters() {
+        return filters;
+    }
+
+    public String getTipText() {
+        return tipText;
+    }
+
+    public boolean isMultiSelectionEnabled() {
+        return multiSelectionEnabled;
+    }
+
+    public static class Builder {
+
+        private FileSelectionMode fileSelectionMode;
+        private String filterDes;
+        private String[] extensions;
+        private String selectedPath;
+        private ExtensionFilter[] filters = new ExtensionFilter[0];
+        private String tipText;
+        private boolean multiSelectionEnabled;
+
+        public Builder setFileSelectionMode(FileSelectionMode fileSelectionMode) {
+            this.fileSelectionMode = fileSelectionMode;
+            return this;
+        }
+
+        public Builder setFilter(String filterDes, String... extensions) {
+            this.filterDes = filterDes;
+            this.extensions = extensions;
+            return this;
+        }
+
+        public Builder setSelectedPath(String selectedPath) {
+            this.selectedPath = selectedPath;
+            return this;
+        }
+
+        public Builder setFilters(ExtensionFilter[] filters) {
+            this.filters = filters;
+            return this;
+        }
+
+        public Builder setTipText(String tipText) {
+            this.tipText = tipText;
+            return this;
+        }
+
+        public Builder setMultiSelectionEnabled(boolean multiSelectionEnabled) {
+            this.multiSelectionEnabled = multiSelectionEnabled;
+            return this;
+        }
+
+        public FileChooserArgs build() {
+            return new FileChooserArgs(this);
+        }
+    }
+
+
+}

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

@@ -0,0 +1,44 @@
+package com.fr.design.gui.ifilechooser;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.os.impl.SupportOSImpl;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/21
+ */
+public class FileChooserFactory {
+
+    public static FileChooserProvider createFileChooser(FileChooserArgs fileChooserArgs) {
+        if (SupportOSImpl.OLD_STYLE_CHOOSER.support()) {
+            return new SwingFileChooser.Builder().
+                    setFileSelectionMode(fileChooserArgs.getFileSelectionMode()).
+                    setFileFilter(fileChooserArgs.getFilterDes(), fileChooserArgs.getExtensions()).
+                    setSelectedFile(fileChooserArgs.getSelectedPath()).
+                    setMultiSelectionEnabled(fileChooserArgs.isMultiSelectionEnabled()).
+                    setTipText(fileChooserArgs.getTipText()).
+                    setFileFilter(fileChooserArgs.getFilters()).build();
+        } else {
+            return new JavaFxNativeFileChooser.Builder().
+                    fileSelectionMode(fileChooserArgs.getFileSelectionMode()).
+                    filter(fileChooserArgs.getFilterDes(), fileChooserArgs.getExtensions()).
+                    currentDirectory(fileChooserArgs.getSelectedPath()).
+                    title(fileChooserArgs.getTipText()).
+                    filters(fileChooserArgs.getFilters()).build();
+        }
+    }
+
+    public static FileChooserProvider createImageFileChooser() {
+        if (SupportOSImpl.OLD_STYLE_CHOOSER.support()) {
+            return new SwingImageFileChooser();
+        } else {
+            return new JavaFxNativeFileChooser.Builder().
+                    fileSelectionMode(FileSelectionMode.FILE).
+                    title(Toolkit.i18nText("Fine-Design_Basic_Open")).
+                    filter(Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files"), "*.jpg", "*.gif", "*.png", "*.bmp").
+                    build();
+        }
+    }
+
+}

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

@@ -9,4 +9,17 @@ public interface FileChooserProvider {
     File getSelectedFile();
 
     int showDialog(Component parent);
+
+
+    default int showOpenDialog(Component parent, String approveButtonText) {
+        return -1;
+    }
+
+    default void setMultiSelectionEnabled(boolean multiple) {
+
+    }
+
+    default void setCurrentDirectory(File file) {
+
+    }
 }

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

@@ -4,6 +4,8 @@ package com.fr.design.gui.ifilechooser;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
 import com.sun.javafx.application.PlatformImpl;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -173,10 +175,20 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
         this.fileSelectionMode = fileSelectionMode;
     }
 
+    @Override
     public void setCurrentDirectory(File currentDirectory) {
         this.currentDirectory = currentDirectory;
     }
 
+    @Override
+    public void setMultiSelectionEnabled(boolean multiple) {
+        this.setSelectionMode(multiple ? FileSelectionMode.MULTIPLE_FILE : FileSelectionMode.FILE);
+    }
+
+    @Override
+    public int showOpenDialog(Component parent, String approveButtonText) {
+        return this.showDialog(parent);
+    }
 
     public static class Builder {
         private FileSelectionMode fileSelectionMode = FileSelectionMode.FILE;
@@ -190,7 +202,9 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
         }
 
         public Builder title(String title) {
+            if (StringUtils.isNotEmpty(title)) {
                 this.title = title;
+            }
             return this;
         }
 
@@ -199,6 +213,13 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
             return this;
         }
 
+        public Builder filters(ExtensionFilter[] filters) {
+            for (ExtensionFilter filter : filters) {
+                this.filters = ArrayUtils.add(this.filters, new FileChooser.ExtensionFilter(filter.getDes(), filter.getExtensions()));
+            }
+            return this;
+        }
+
         public Builder filter(String des, String... extensions) {
             if (extensions != null) {
                 this.filters = new FileChooser.ExtensionFilter[]{new FileChooser.ExtensionFilter(des, extensions)};

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

@@ -0,0 +1,130 @@
+package com.fr.design.gui.ifilechooser;
+
+import com.fr.common.annotations.Negative;
+import com.fr.design.upm.UpmUtils;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
+import java.awt.Component;
+import java.io.File;
+import javax.swing.JFileChooser;
+import javax.swing.filechooser.FileFilter;
+import javax.swing.filechooser.FileNameExtensionFilter;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/21
+ */
+@Negative(until = "2022-6-1")
+class SwingFileChooser implements FileChooserProvider {
+
+    private final JFileChooser fileChooser;
+    private final Builder builder;
+
+    private SwingFileChooser(Builder builder) {
+        fileChooser = new JFileChooser();
+        fileChooser.setFileSelectionMode(builder.fileSelectionMode);
+        fileChooser.setFileFilter(builder.fileFilter);
+        fileChooser.setSelectedFile(builder.selectedFile);
+        fileChooser.setMultiSelectionEnabled(builder.multiSelectionEnabled);
+        this.builder = builder;
+    }
+
+    @Override
+    public File[] getSelectedFiles() {
+        return fileChooser.getSelectedFiles();
+    }
+
+    @Override
+    public File getSelectedFile() {
+        return fileChooser.getSelectedFile();
+    }
+
+    @Override
+    public int showDialog(Component parent) {
+        if (StringUtils.isEmpty(builder.tipText)) {
+            return fileChooser.showOpenDialog(parent);
+        } else {
+            return fileChooser.showDialog(parent, builder.tipText);
+        }
+    }
+
+    @Override
+    public int showOpenDialog(Component parent, String approveButtonText) {
+        return fileChooser.showDialog(parent, approveButtonText);
+    }
+
+    @Override
+    public void setCurrentDirectory(File file) {
+        fileChooser.setCurrentDirectory(file);
+    }
+
+    @Override
+    public void setMultiSelectionEnabled(boolean multiple) {
+        fileChooser.setMultiSelectionEnabled(multiple);
+    }
+
+    /**
+     * 和一般builder不同的是 setXXX还做参数转换逻辑
+     */
+    public static class Builder {
+
+        private int fileSelectionMode = JFileChooser.FILES_ONLY;
+        private FileFilter fileFilter;
+        private File selectedFile;
+        private boolean multiSelectionEnabled;
+        private String tipText;
+
+        public Builder setFileSelectionMode(FileSelectionMode fileSelectionMode) {
+            if (FileSelectionMode.DIR.equals(fileSelectionMode)) {
+                this.fileSelectionMode = JFileChooser.DIRECTORIES_ONLY;
+            } else if (FileSelectionMode.FILE.equals(fileSelectionMode)) {
+                this.fileSelectionMode = JFileChooser.FILES_ONLY;
+            } else if (FileSelectionMode.MULTIPLE_FILE.equals(fileSelectionMode)) {
+                this.fileSelectionMode = JFileChooser.FILES_AND_DIRECTORIES;
+            }
+            return this;
+        }
+
+        public Builder setFileFilter(String des, String... extension) {
+            if (StringUtils.isNotEmpty(des) && ArrayUtils.isNotEmpty(extension)) {
+                this.fileFilter = new FileNameExtensionFilter(des, UpmUtils.findMatchedExtension(extension));
+            }
+            return this;
+        }
+
+        public Builder setFileFilter(ExtensionFilter[] extensionFilters) {
+            StringBuilder desBuilder = new StringBuilder();
+            String[] extensions = new String[0];
+            for (ExtensionFilter extensionFilter : extensionFilters) {
+                desBuilder.append(extensionFilter.getDes()).append(" ");
+                extensions = ArrayUtils.addAll(extensions, UpmUtils.findMatchedExtension(extensionFilter.getExtensions()));
+            }
+            if (ArrayUtils.isNotEmpty(extensionFilters)) {
+                this.fileFilter = new FileNameExtensionFilter(desBuilder.toString().trim(), extensions);
+            }
+            return this;
+        }
+
+        public Builder setSelectedFile(String selectedPath) {
+            if (StringUtils.isNotEmpty(selectedPath)) {
+                this.selectedFile = new File(selectedPath);
+            }
+            return this;
+        }
+
+        public Builder setMultiSelectionEnabled(boolean multiSelectionEnabled) {
+            this.multiSelectionEnabled = multiSelectionEnabled;
+            return this;
+        }
+
+        public Builder setTipText(String tipText) {
+            this.tipText = tipText;
+            return this;
+        }
+
+        public SwingFileChooser build() {
+            return new SwingFileChooser(this);
+        }
+    }
+}

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

@@ -0,0 +1,276 @@
+package com.fr.design.gui.ifilechooser;
+
+import com.fr.base.BaseUtils;
+import com.fr.common.annotations.Negative;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.style.ChooseFileView;
+import com.fr.design.style.background.image.ExpandFileChooser;
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import javax.swing.filechooser.FileFilter;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/30
+ */
+@Negative(until = "2022-6-1")
+class SwingImageFileChooser extends ExpandFileChooser implements FileChooserProvider {
+
+    public SwingImageFileChooser() {
+        super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Compress"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open"));
+        ExampleFileFilter bothFilter = new ExampleFileFilter(
+                new String[]{"jpg", "gif", "png", "bmp"},
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files"));
+        bothFilter.setExtensionListInDescription(true);
+        this.addChoosableFileFilter(bothFilter);
+        this.setAcceptAllFileFilterUsed(false);
+
+        // Create Custom FileView
+        ChooseFileView fileView = new ChooseFileView();
+        fileView.putIcon("jpg", BaseUtils.readIcon("/com/fr/base/images/dialog/file/jpgFile.gif"));
+        fileView.putIcon("gif", BaseUtils.readIcon("/com/fr/base/images/dialog/file/gifFile.gif"));
+        fileView.putIcon("png", BaseUtils.readIcon("/com/fr/base/images/dialog/file/pngFile.png"));
+        fileView.putIcon("bmp", BaseUtils.readIcon("/com/fr/base/images/dialog/file/bmpFile.gif"));
+
+        this.setFileView(fileView);
+    }
+
+    @Override
+    public int showDialog(Component parent, String approveButtonText) {
+        return super.showDialog(parent, approveButtonText);
+    }
+
+    @Override
+    public ActionListener checkAction() {
+        return new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                DesignerEnvManager.getEnvManager().setImageCompress(isCheckSelected());
+                DesignerEnvManager.getEnvManager().saveXMLFile();
+            }
+        };
+
+    }
+
+    @Override
+    public int showDialog(Component parent) {
+        return showOpenDialog(parent);
+    }
+
+    /**
+     * A convenience implementation of FileFilter that filters out
+     * all files except for those type extensions that it knows about.
+     * <p/>D:\finereport\develop\code\test\TestCase\WEB-INF\reportlets\TestCase\01903.cpt
+     * <p>
+     * Extensions are of the type ".foo", which is typically found on
+     * Windows and Unix boxes, but not on Macinthosh. Case is ignored.
+     * <p/>
+     * Example - create a new filter that filerts out all files
+     * but gif and jpg image files:
+     * <p/>
+     * JFileChooser chooser = new JFileChooser();
+     * ExampleFileFilter filter = new ExampleFileFilter(
+     * new String{"gif", "jpg"}, "JPEG & GIF Images")
+     * chooser.addChoosableFileFilter(filter);
+     * chooser.showOpenDialog(this);
+     *
+     * @author Jeff Dinkins
+     * @version 1.12 12/03/01
+     */
+    class ExampleFileFilter extends FileFilter {
+        private Hashtable filters = null;
+        private String description = null;
+        private String fullDescription = null;
+        private boolean useExtensionsInDescription = true;
+
+        /**
+         * Creates a file filter. If no filters are added, then all
+         * files are accepted.
+         *
+         * @see #addExtension
+         */
+        public ExampleFileFilter() {
+            this.filters = new Hashtable();
+        }
+
+        /**
+         * Creates a file filter that accepts files with the given extension.
+         * Example: new ExampleFileFilter("jpg");
+         *
+         * @see #addExtension
+         */
+        public ExampleFileFilter(String extension) {
+            this(extension, null);
+        }
+
+        /**
+         * Creates a file filter that accepts the given file type.
+         * Example: new ExampleFileFilter("jpg", "JPEG Image Images");
+         * <p/>
+         * Note that the "." before the extension is not needed. If
+         * provided, it will be ignored.
+         *
+         * @see #addExtension
+         */
+        public ExampleFileFilter(String extension, String description) {
+            this();
+            if (extension != null) addExtension(extension);
+            if (description != null) setDescription(description);
+        }
+
+        /**
+         * Creates a file filter from the given string array.
+         * Example: new ExampleFileFilter(String {"gif", "jpg"});
+         * <p/>
+         * Note that the "." before the extension is not needed adn
+         * will be ignored.
+         *
+         * @see #addExtension
+         */
+        public ExampleFileFilter(String[] filters) {
+            this(filters, null);
+        }
+
+        /**
+         * Creates a file filter from the given string array and description.
+         * Example: new ExampleFileFilter(String {"gif", "jpg"}, "Gif and JPG Images");
+         * <p/>
+         * Note that the "." before the extension is not needed and will be ignored.
+         *
+         * @see #addExtension
+         */
+        public ExampleFileFilter(String[] filters, String description) {
+            this();
+            for (int i = 0; i < filters.length; i++) {
+                // add filters one by one
+                addExtension(filters[i]);
+            }
+            if (description != null) setDescription(description);
+        }
+
+        /**
+         * Return true if this file should be shown in the directory pane,
+         * false if it shouldn't.
+         * <p/>
+         * Files that begin with "." are ignored.
+         *
+         * @see #getExtension
+         */
+        @Override
+        public boolean accept(File f) {
+            if (f != null) {
+                if (f.isDirectory()) {
+                    return true;
+                }
+                String extension = getExtension(f);
+                if (extension != null && filters.get(getExtension(f)) != null) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * Return the extension portion of the file's name .
+         *
+         * @see #getExtension
+         * @see FileFilter#accept
+         */
+        public String getExtension(File f) {
+            if (f != null) {
+                String filename = f.getName();
+                int i = filename.lastIndexOf('.');
+                if (i > 0 && i < filename.length() - 1) {
+                    return filename.substring(i + 1).toLowerCase();
+                }
+            }
+            return null;
+        }
+
+        /**
+         * Adds a filetype "dot" extension to filter against.
+         * <p/>
+         * For example: the following code will create a filter that filters
+         * out all files except those that end in ".jpg" and ".tif":
+         * <p/>
+         * ExampleFileFilter filter = new ExampleFileFilter();
+         * filter.addExtension("jpg");
+         * filter.addExtension("tif");
+         * <p/>
+         * Note that the "." before the extension is not needed and will be ignored.
+         */
+        public void addExtension(String extension) {
+            if (filters == null) {
+                filters = new Hashtable(5);
+            }
+            filters.put(extension.toLowerCase(), this);
+            fullDescription = null;
+        }
+
+
+        /**
+         * Returns the human readable description of this filter. For
+         * example: "JPEG and GIF Image Files (*.jpg, *.gif)"
+         *
+         * @see FileFilter#getDescription
+         */
+        @Override
+        public String getDescription() {
+            if (fullDescription == null) {
+                if (description == null || isExtensionListInDescription()) {
+                    fullDescription = description == null ? "(" : description + " (";
+                    // build the description from the extension list
+                    Enumeration extensions = filters.keys();
+                    if (extensions != null) {
+                        fullDescription += "." + extensions.nextElement();
+                        while (extensions.hasMoreElements()) {
+                            fullDescription += ", ." + extensions.nextElement();
+                        }
+                    }
+                    fullDescription += ")";
+                } else {
+                    fullDescription = description;
+                }
+            }
+            return fullDescription;
+        }
+
+        /**
+         * Sets the human readable description of this filter. For
+         * example: filter.setDescription("Gif and JPG Images");
+         */
+        public void setDescription(String description) {
+            this.description = description;
+            fullDescription = null;
+        }
+
+        /**
+         * Determines whether the extension list (.jpg, .gif, etc) should
+         * show up in the human readable description.
+         * <p/>
+         * Only relevent if a description was provided in the constructor
+         * or using setDescription();
+         */
+        public void setExtensionListInDescription(boolean b) {
+            useExtensionsInDescription = b;
+            fullDescription = null;
+        }
+
+        /**
+         * Returns whether the extension list (.jpg, .gif, etc) should
+         * show up in the human readable description.
+         * <p/>
+         * Only relevent if a description was provided in the constructor
+         * or using setDescription();
+         */
+        public boolean isExtensionListInDescription() {
+            return useExtensionsInDescription;
+        }
+    }
+
+}

designer-base/src/main/java/com/fr/design/gui/ilable/UIAutoChangeLineLabel.java

@@ -0,0 +1,78 @@
+package com.fr.design.gui.ilable;
+
+import javax.swing.JLabel;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.util.ArrayList;
+import java.util.List;
+
+public class UIAutoChangeLineLabel extends JLabel {
+    private final String text;
+    private final int width;
+
+
+    public UIAutoChangeLineLabel(String text, int width) {
+        super(text);
+        this.text = text;
+        this.width = width;
+    }
+
+
+    @Override
+    public void doLayout() {
+        super.doLayout();
+        this.setText(wrapperHtmlText());
+    }
+
+    private String wrapperHtmlText() {
+        List<String> stringList = autoChangeLine(this.getWidth());
+        StringBuilder builder = new StringBuilder("<html>");
+        for (String s : stringList) {
+            //用THML标签进行拼接，以实现自动换行
+            builder.append(s).append("<br/>");
+        }
+        builder.append("</html>");
+        return builder.toString();
+    }
+
+    private List<String> autoChangeLine(int width) {
+        List<String> result = new ArrayList<>();
+        if (width <= 0) {
+            result.add(this.text);
+        } else {
+
+            char[] chars = this.text.toCharArray();
+            //获取字体计算大小
+            FontMetrics fontMetrics = this.getFontMetrics(this.getFont());
+            int start = 0;
+            int len = 0;
+            while (start + len < this.text.length()) {
+                while (true) {
+                    len++;
+                    if (start + len > this.text.length())
+                        break;
+                    if (fontMetrics.charsWidth(chars, start, len)
+                            > width) {
+                        break;
+                    }
+                }
+                result.add(String.copyValueOf(chars, start, len - 1));
+                start = start + len - 1;
+                len = 0;
+            }
+            if (this.text.length() - start > 0) {
+                result.add(String.copyValueOf(chars, start, this.text.length() - start));
+            }
+        }
+        return result;
+    }
+
+
+    @Override
+    public Dimension getPreferredSize() {
+        Dimension preferredSize = super.getPreferredSize();
+        List<String> stringList = autoChangeLine(width);
+        FontMetrics fontMetrics = this.getFontMetrics(this.getFont());
+        return new Dimension(preferredSize.width, fontMetrics.getHeight() * stringList.size());
+    }
+}

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

@@ -4,7 +4,6 @@ package com.fr.design.gui.style;
  * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved.
  */
 
-import com.fr.base.BaseUtils;
 import com.fr.base.CellBorderStyle;
 import com.fr.base.Style;
 import com.fr.design.constants.LayoutConstants;
@@ -17,8 +16,8 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.style.color.NewColorSelectBox;
-import com.fr.general.IOUtils;
 import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils;
+import com.fr.general.IOUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreConstants;
 
@@ -206,6 +205,8 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
     }
 
     public void populateLineStyleAndColor(CellBorderStyle cellBorderStyle, boolean onlyInspectTop) {
+        resetLineStyleAndColorSetting();
+
         if (cellBorderStyle.getTopStyle() != Constants.LINE_NONE) {
             this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getTopStyle());
             this.currentLineColorPane.setSelectObject(cellBorderStyle.getTopColor());
@@ -225,9 +226,6 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
             } else if (cellBorderStyle.getHorizontalStyle() != Constants.LINE_NONE) {
                 this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getHorizontalStyle());
                 this.currentLineColorPane.setSelectObject(cellBorderStyle.getHorizontalColor());
-            } else {
-                this.currentLineCombo.setSelectedLineStyle(Constants.LINE_NONE);
-                this.currentLineColorPane.setSelectObject(Color.BLACK);
             }
         }
 
@@ -236,6 +234,11 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
         }
     }
 
+    private void resetLineStyleAndColorSetting() {
+        this.currentLineCombo.setSelectedLineStyle(Constants.LINE_NONE);
+        this.currentLineColorPane.setSelectObject(null);
+    }
+
     @Override
     public Style update(Style style) {
 

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

@@ -4,7 +4,9 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.KeyWords;
 import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.autocomplete.AutoCompletion;
 import com.fr.design.gui.autocomplete.BasicCompletion;
 import com.fr.design.gui.autocomplete.CompletionProvider;
@@ -15,31 +17,145 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants;
 import com.fr.design.javascript.beautify.JavaScriptFormatHelper;
+import com.fr.design.javascript.jsapi.JSImplPopulateAction;
+import com.fr.design.javascript.jsapi.JSImplUpdateAction;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.IOUtils;
 
+import com.fr.js.JavaScriptImpl;
 
-import javax.swing.*;
+import java.awt.BorderLayout;
-import java.awt.*;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
+import javax.swing.JPanel;
+import javax.swing.KeyStroke;
+import javax.swing.SwingConstants;
+import javax.swing.SwingWorker;
 
 public class JSContentPane extends BasicPane {
-    private RSyntaxTextArea contentTextArea;
+    protected RSyntaxTextArea contentTextArea;
-    private UILabel funNameLabel;
+    private UILabel funNameLabel = new UILabel();
     private AutoCompletion ac;
     private static final Dimension FUNCTION_NAME_LABEL_SIZE = new Dimension(300, 80);
-
+    private String[] defaultArgs;
     private int titleWidth = 180;
+    private JPanel labelPane = new JPanel(new BorderLayout(6, 4));;
+    private NewJavaScriptImplPane newJavaScriptImplPane = null;
+    private JavaScriptImpl javaScript;
+    private JSImplUpdateAction jsImplUpdateAction;
+    private JSImplPopulateAction jsImplPopulateAction;
+    private boolean modal;
+    BasicDialog advancedEditorDialog ;
+    public JSContentPane(){}
 
     public JSContentPane(String[] args) {
+        defaultArgs = args;
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        funNameLabel = new UILabel();
+        initFunctionTitle(args);
-        this.setFunctionTitle(args);
+
+        JPanel jsParaPane = createJSParaPane();
+        addNewPaneLabel();
+        this.add(jsParaPane, BorderLayout.NORTH);
+
+        UIScrollPane sp = createContentTextAreaPanel();
+        initContentTextAreaListener();
+        this.add(sp, BorderLayout.CENTER);
+
+        UILabel funNameLabel2 = new UILabel();
+        funNameLabel2.setText("}");
+        this.add(funNameLabel2, BorderLayout.SOUTH);
+    }
+    public JSContentPane(String[] args,boolean modal) {
+        this(args);
+        this.modal = modal;
+    }
+
+
+    public void setJsImplUpdateAction(JSImplUpdateAction jsImplUpdateAction){
+        this.jsImplUpdateAction = jsImplUpdateAction;
+    }
+
+    public void setJsImplPopulateAction(JSImplPopulateAction jsImplPopulateAction){
+        this.jsImplPopulateAction = jsImplPopulateAction;
+    }
+
+    public void updateJSImpl(JavaScriptImpl javaScript){
+        this.javaScript = javaScript;
+    }
+
+
+    private void addNewPaneLabel(){
+        UILabel advancedEditorLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Advanced_Editor"), SwingConstants.LEFT);
+        advancedEditorLabel.setCursor(new Cursor(Cursor.HAND_CURSOR));
+
+        advancedEditorLabel.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if(newJavaScriptImplPane == null){
+                    newJavaScriptImplPane = new NewJavaScriptImplPane(defaultArgs);
+                }
+                jsImplUpdateAction.update(javaScript);
+                newJavaScriptImplPane.populate(javaScript);
+                if(advancedEditorDialog == null || !advancedEditorDialog.isVisible()) {
+                    advancedEditorDialog = newJavaScriptImplPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+                        @Override
+                        public void doOk() {
+                            if (javaScript != null) {
+                                newJavaScriptImplPane.updateBean(javaScript);
+                                jsImplPopulateAction.populate(javaScript);
+                            }
+                        }
+
+                        @Override
+                        public void doCancel() {
+                            super.doCancel();
+                        }
+                    });
+                    advancedEditorDialog.setModal(modal);
+                    advancedEditorDialog.setResizable(true);
+                    advancedEditorDialog.pack();
+                    advancedEditorDialog.setVisible(true);
+                }
+                advancedEditorDialog.requestFocus();
+            }
+        });
+        labelPane.add(advancedEditorLabel,BorderLayout.CENTER);
+    }
+
+    protected UIScrollPane createContentTextAreaPanel(){
+        contentTextArea = new RSyntaxTextArea();
+        contentTextArea.setCloseCurlyBraces(true);
+        contentTextArea.setLineWrap(true);
+        contentTextArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVASCRIPT);
+        contentTextArea.setCodeFoldingEnabled(true);
+        contentTextArea.setAntiAliasingEnabled(true);
+        return new UIScrollPane(contentTextArea);
+    }
 
+    private void initContentTextAreaListener(){
+        contentTextArea.addFocusListener(new FocusListener() {
+            @Override
+            public void focusGained(FocusEvent e) {
+                // 获得焦点时 安装
+                installAutoCompletion();
+            }
+
+            @Override
+            public void focusLost(FocusEvent e) {
+                // 失去焦点时 卸载
+                uninstallAutoCompletion();
+            }
+        });
+    }
+
+    protected JPanel createJSParaPane(){
         UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Format_JavaScript"), IOUtils.readIcon("com/fr/design/images/edit/format.png"), SwingConstants.LEFT);
         label.setCursor(new Cursor(Cursor.HAND_CURSOR));
         label.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Format_JavaScript"));
@@ -65,43 +181,20 @@ public class JSContentPane extends BasicPane {
             }
         });
 
-        //REPORT-10533 用户参数多达25个,导致JS没地方写,增加滚动条显示
+        labelPane.add(label,BorderLayout.EAST);
         JPanel jsParaPane = new JPanel(new BorderLayout(4, 4));
         jsParaPane.setPreferredSize(new Dimension(300, 80));
         UIScrollPane scrollPane = new UIScrollPane(funNameLabel);
         scrollPane.setPreferredSize(FUNCTION_NAME_LABEL_SIZE);
         scrollPane.setBorder(new UIRoundedBorder(UIConstants.TITLED_BORDER_COLOR, 1, UIConstants.ARC));
         jsParaPane.add(scrollPane, BorderLayout.WEST);
-        jsParaPane.add(label, BorderLayout.EAST);
+        jsParaPane.add(labelPane, BorderLayout.EAST);
-        this.add(jsParaPane, BorderLayout.NORTH);
+        return jsParaPane;
-
-        contentTextArea = new RSyntaxTextArea();
-        contentTextArea.setCloseCurlyBraces(true);
-        contentTextArea.setLineWrap(true);
-        contentTextArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVASCRIPT);
-        contentTextArea.setCodeFoldingEnabled(true);
-        contentTextArea.setAntiAliasingEnabled(true);
-
-        UIScrollPane sp = new UIScrollPane(contentTextArea);
-        this.add(sp, BorderLayout.CENTER);
-
-        contentTextArea.addFocusListener(new FocusListener() {
-            @Override
-            public void focusGained(FocusEvent e) {
-                // 获得焦点时 安装
-                installAutoCompletion();
     }
 
-            @Override
+    protected void initFunctionTitle(String[] args){
-            public void focusLost(FocusEvent e) {
+        funNameLabel = new UILabel();
-                // 失去焦点时 卸载
+        this.setFunctionTitle(args);
-                uninstallAutoCompletion();
-            }
-        });
-
-        UILabel funNameLabel2 = new UILabel();
-        funNameLabel2.setText("}");
-        this.add(funNameLabel2, BorderLayout.SOUTH);
     }
 
     private KeyStroke convert2KeyStroke(String ks) {

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

@@ -0,0 +1,858 @@
+package com.fr.design.javascript;
+
+import com.fr.design.border.UIRoundedBorder;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.gui.autocomplete.AutoCompleteExtraRefreshComponent;
+import com.fr.design.gui.autocomplete.BasicCompletion;
+import com.fr.design.gui.autocomplete.CompletionCellRenderer;
+import com.fr.design.gui.autocomplete.CompletionProvider;
+import com.fr.design.gui.autocomplete.DefaultCompletionProvider;
+import com.fr.design.gui.autocomplete.JSImplPaneAutoCompletion;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextarea.UITextArea;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.javascript.jsapi.JSAPITreeHelper;
+import com.fr.design.javascript.jsapi.JSAPIUserObject;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.CloudCenter;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.http.HttpToolbox;
+import com.fr.json.JSONArray;
+import com.fr.json.JSONException;
+import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Desktop;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.DefaultListModel;
+import javax.swing.JComponent;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+
+public class JSContentWithDescriptionPane extends JSContentPane implements KeyListener {
+
+    //搜索关键词输入框
+    private UITextField keyWordTextField = new UITextField(16);
+    //搜索出的提示列表
+    private JList tipsList;
+    private DefaultListModel tipsListModel = new DefaultListModel();
+
+    private JList interfaceNameList;
+    private DefaultListModel interfaceNameModel;
+
+    private JTree moduleTree;
+
+    private DefaultCompletionProvider completionProvider;
+    private JSImplPaneAutoCompletion autoCompletion;
+
+    //函数说明文本框
+    private UITextArea descriptionTextArea;
+
+    private JPopupMenu popupMenu;
+
+    private InterfaceAndDescriptionPanel interfaceAndDescriptionPanel;
+    private JList helpDOCList;
+
+    private int ifHasBeenWriten = 0;
+    private int currentPosition = 0;
+    private int beginPosition = 0;
+    private int insertPosition = 0;
+    private static final String SEPARATOR = "_";
+
+    private static final int KEY_10 = 10;
+    //上下左右
+    private static final int KEY_37 = 37;
+    private static final int KEY_38 = 38;
+    private static final int KEY_39 = 39;
+    private static final int KEY_40 = 40;
+
+    private static final String URL_FOR_TEST_NETWORK = "https://www.baidu.com";
+
+    private static final String DOCUMENT_SEARCH_URL = CloudCenter.getInstance().acquireUrlByKind("af.doc_search");
+
+    private String currentValue;
+
+    public JSContentWithDescriptionPane(String[] args) {
+        this.setLayout(new BorderLayout());
+        //===============================
+        this.initFunctionTitle(args);
+        JPanel jsParaAndSearchPane = new JPanel(new BorderLayout());
+
+        //js函数声明面板
+        JPanel jsParaPane = createJSParaPane();
+
+        jsParaPane.setPreferredSize(new Dimension(650, 80));
+        //右上角的搜索提示面板
+        JPanel tipsPane = createTipsPane();
+
+        jsParaAndSearchPane.add(jsParaPane, BorderLayout.CENTER);
+        jsParaAndSearchPane.add(tipsPane, BorderLayout.EAST);
+
+        initPopTips();
+
+        //js文本编辑面板
+        UIScrollPane contentTextAreaPanel = createContentTextAreaPanel();
+        initContextAreaListener();
+
+        contentTextAreaPanel.setPreferredSize(new Dimension(850, 250));
+        //js函数结束标签
+        UILabel endBracketsLabel = new UILabel();
+        endBracketsLabel.setText("}");
+
+        //结尾括号和复用函数按钮面板
+        JPanel endBracketsPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        endBracketsPanel.add(endBracketsLabel, BorderLayout.WEST);
+
+        JPanel northPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        northPanel.add(jsParaAndSearchPane, BorderLayout.NORTH);
+
+        northPanel.add(contentTextAreaPanel, BorderLayout.CENTER);
+        northPanel.add(endBracketsPanel, BorderLayout.SOUTH);
+
+        //主编辑框,也就是面板的正中间部分
+        this.add(northPanel, BorderLayout.CENTER);
+
+        //函数分类和函数说明面板==================================
+        JPanel functionNameAndDescriptionPanel = createInterfaceAndDescriptionPanel();
+        functionNameAndDescriptionPanel.setPreferredSize(new Dimension(880, 220));
+
+        this.add(functionNameAndDescriptionPanel, BorderLayout.SOUTH);
+    }
+
+    private void initContextAreaListener() {
+        contentTextArea.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyTyped(KeyEvent e) {
+                if ((e.getKeyChar() >= 'A' && e.getKeyChar() <= 'z') || e.getKeyChar() == '_') {
+                    if (autoCompletion != null) {
+                        autoCompletion.doCompletion();
+                    }
+                }
+            }
+
+            @Override
+            public void keyReleased(KeyEvent e) {
+                contentTextArea.setForeground(Color.black);
+            }
+        });
+        contentTextArea.addKeyListener(this);
+        contentTextArea.addFocusListener(new FocusAdapter() {
+            @Override
+            public void focusGained(FocusEvent e) {
+                if (autoCompletion == null) {
+                    installAutoCompletion();
+                }
+            }
+
+            @Override
+            public void focusLost(FocusEvent e) {
+                uninstallAutoCompletion();
+            }
+        });
+    }
+
+    @Override
+    public void keyTyped(KeyEvent e) {
+
+    }
+
+    @Override
+    public void keyPressed(KeyEvent e) {
+        if (ifHasBeenWriten == 0) {
+            this.contentTextArea.setText(StringUtils.EMPTY);
+        }
+    }
+
+    @Override
+    public void keyReleased(KeyEvent e) {
+        int key = e.getKeyCode();
+        if (key == KEY_38 || key == KEY_40 || key == KEY_37 || key == KEY_39 || key == KEY_10) //如果是删除符号  ，为了可读性 没有和其他按键的程序相融合
+        {
+            currentPosition = contentTextArea.getCaretPosition();
+            insertPosition = currentPosition;
+            beginPosition = getBeginPosition();
+        } else {
+            if (contentTextArea.getText().trim().length() == 0) {
+                insertPosition = 0;
+            } else {
+                contentTextArea.setForeground(Color.black);
+                currentPosition = contentTextArea.getCaretPosition();
+                beginPosition = getBeginPosition();
+                insertPosition = beginPosition;
+                ifHasBeenWriten = 1;
+            }
+        }
+    }
+
+    private int getBeginPosition() {
+        int i = currentPosition;
+        String textArea = contentTextArea.getText();
+        for (; i > 0; i--) {
+            String tested = textArea.substring(i - 1, i).toUpperCase();
+            char[] testedChar = tested.toCharArray();
+            if (isChar(testedChar[0]) || isNum(testedChar[0])) {
+                continue;
+            } else {
+                break;
+            }
+        }
+        return i;
+    }
+
+    private static boolean isNum(char tested) {
+        return tested >= '0' && tested <= '9';
+    }
+
+    private boolean isChar(char tested) {
+        return tested >= 'A' && tested <= 'Z' || tested >= 'a' && tested < 'z';
+    }
+
+    public class InterfaceAndDescriptionPanel extends JPanel implements AutoCompleteExtraRefreshComponent {
+        @Override
+        public void refresh(String replacementText) {
+            fixInterfaceNameList(replacementText);
+        }
+    }
+
+    private void fixInterfaceNameList(String interfaceName) {
+        DefaultTreeModel defaultTreeModel = (DefaultTreeModel) moduleTree.getModel();
+        TreeNode root = (TreeNode) defaultTreeModel.getRoot();
+        String directCategory = JSAPITreeHelper.getDirectCategory(interfaceName);
+        if (directCategory == null) {
+            return;
+        }
+        setModuleTreeSelection(root, directCategory, defaultTreeModel);
+        interfaceNameModel = (DefaultListModel) interfaceNameList.getModel();
+        interfaceNameModel.clear();
+        List<String> interfaceNames = JSAPITreeHelper.getNames(directCategory);
+        int index = 0;
+        for (int i = 0; i < interfaceNames.size(); i++) {
+            interfaceNameModel.addElement(interfaceNames.get(i));
+            if (StringUtils.equals(interfaceNames.get(i), interfaceName)) {
+                index = i;
+            }
+        }
+        interfaceNameList.setSelectedIndex(index);
+        interfaceNameList.ensureIndexIsVisible(index);
+    }
+
+    private boolean setModuleTreeSelection(TreeNode node, String directCategory, DefaultTreeModel treeModel) {
+
+        DefaultMutableTreeNode defaultMutableTreeNode = (DefaultMutableTreeNode) node;
+        Object userObject = defaultMutableTreeNode.getUserObject();
+        if (userObject instanceof JSAPIUserObject) {
+            String value = ((JSAPIUserObject) userObject).getValue();
+            if (StringUtils.equals(value, directCategory)) {
+                moduleTree.setSelectionPath(new TreePath(treeModel.getPathToRoot(node)));
+                return true;
+            }
+            return false;
+        }
+        for (int i = 0; i < node.getChildCount(); i++) {
+            if (setModuleTreeSelection(node.getChildAt(i), directCategory, treeModel)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private JPanel createInterfaceAndDescriptionPanel() {
+        interfaceAndDescriptionPanel = new InterfaceAndDescriptionPanel();
+        interfaceAndDescriptionPanel.setLayout(new BorderLayout(4, 4));
+        JPanel interfacePanel = new JPanel(new BorderLayout(4, 4));
+        interfaceAndDescriptionPanel.add(interfacePanel, BorderLayout.WEST);
+        JPanel descriptionAndDocumentPanel = new JPanel(new BorderLayout(4, 4));
+        //函数说明和帮助文档框
+        initDescriptionArea(descriptionAndDocumentPanel);
+
+        //模块和接口面板
+        initInterfaceModuleTree(interfacePanel);
+        initInterfaceNameList(interfacePanel);
+
+        initHelpDocumentPane(descriptionAndDocumentPanel);
+
+        interfaceAndDescriptionPanel.add(descriptionAndDocumentPanel, BorderLayout.CENTER);
+        return interfaceAndDescriptionPanel;
+    }
+
+    private void doHelpDocumentSearch() {
+        Object value = interfaceNameList.getSelectedValue();
+        if (value != null) {
+            String url = DOCUMENT_SEARCH_URL + value.toString();
+            try {
+                String result = HttpToolbox.get(url);
+                JSONObject jsonObject = new JSONObject(result);
+                JSONArray jsonArray = jsonObject.optJSONArray("list");
+                if (jsonArray != null) {
+                    DefaultListModel helpDOCModel = (DefaultListModel) helpDOCList.getModel();
+                    helpDOCModel.clear();
+                    for (int i = 0; i < jsonArray.length(); i++) {
+                        JSONObject resultJSONObject = jsonArray.optJSONObject(i);
+                        String docURL = resultJSONObject.optString("url");
+                        String name = resultJSONObject.optString("title").trim();
+                        HelpDocument helpDocument = new HelpDocument(docURL, name);
+                        helpDOCModel.addElement(helpDocument);
+                    }
+                }
+            } catch (JSONException e) {
+                FineLoggerFactory.getLogger().debug(e.getMessage(), e);
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
+        }
+    }
+
+    private void initHelpDocumentPane(JPanel descriptionAndDocumentPanel) {
+        UIScrollPane helpDOCScrollPane;
+        if (isNetworkOk()) {
+            helpDOCList = new JList(new DefaultListModel());
+            initHelpDOCListRender();
+            initHelpDOCListListener();
+            helpDOCScrollPane = new UIScrollPane(helpDOCList);
+            doHelpDocumentSearch();
+        } else {
+            UILabel label1 = new UILabel(Toolkit.i18nText("Fine-Design_Net_Connect_Failed"), 0);
+            label1.setPreferredSize(new Dimension(180, 20));
+            UILabel label2 = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Reload"), 0);
+            label2.setPreferredSize(new Dimension(180, 20));
+            label2.setForeground(Color.blue);
+            JPanel labelPane = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, 0, 0, 0);
+            labelPane.setBackground(Color.WHITE);
+            labelPane.add(label1);
+            labelPane.add(label2);
+            JPanel containerPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+            containerPanel.add(labelPane, BorderLayout.CENTER);
+            helpDOCScrollPane = new UIScrollPane(containerPanel);
+            label2.addMouseListener(new MouseAdapter() {
+                @Override
+                public void mouseClicked(MouseEvent e) {
+                    descriptionAndDocumentPanel.removeAll();
+                    initHelpDocumentPane(descriptionAndDocumentPanel);
+
+                }
+            });
+        }
+        helpDOCScrollPane.setPreferredSize(new Dimension(200, 200));
+        helpDOCScrollPane.setBorder(null);
+        descriptionAndDocumentPanel.add(this.createNamePane(Toolkit.i18nText("Fine-Design_Relevant_Cases"), helpDOCScrollPane), BorderLayout.EAST);
+
+    }
+
+    private void initHelpDOCListListener() {
+        helpDOCList.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (e.getClickCount() == 2) {
+                    Object value = helpDOCList.getSelectedValue();
+                    if (value instanceof HelpDocument) {
+                        String url = ((HelpDocument) value).getDocumentUrl();
+                        try {
+                            Desktop.getDesktop().browse(new URI(url));
+                        } catch (IOException ex) {
+                            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
+                        } catch (URISyntaxException ex) {
+                            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+    private void initHelpDOCListRender() {
+        helpDOCList.setCellRenderer(new DefaultListCellRenderer() {
+            @Override
+            public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+                super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+                if (value instanceof HelpDocument) {
+                    this.setText(((HelpDocument) value).getName());
+                    this.setForeground(Color.BLUE);
+                }
+                return this;
+            }
+        });
+    }
+
+    private static boolean isNetworkOk() {
+        try {
+            HttpToolbox.get(URL_FOR_TEST_NETWORK);
+            return true;
+        } catch (Exception ignore) {
+            // 网络异常
+            return false;
+        }
+    }
+
+    private static class HelpDocument {
+        private String documentUrl;
+
+
+        private String name;
+
+        public HelpDocument(String documentUrl, String name) {
+            this.documentUrl = documentUrl;
+            this.name = name;
+        }
+
+        public String getDocumentUrl() {
+            return documentUrl;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
+    private void initDescriptionArea(JPanel descriptionPanel) {
+        descriptionTextArea = new UITextArea();
+        UIScrollPane descriptionScrollPane = new UIScrollPane(descriptionTextArea);
+        descriptionScrollPane.setPreferredSize(new Dimension(300, 200));
+        descriptionPanel.add(this.createNamePane(Toolkit.i18nText("Fine-Design_Interface_Description"), descriptionScrollPane), BorderLayout.CENTER);
+        descriptionTextArea.setBackground(Color.white);
+        descriptionTextArea.setLineWrap(true);
+        descriptionTextArea.setWrapStyleWord(true);
+        descriptionTextArea.setEditable(false);
+    }
+
+    private void installAutoCompletion() {
+        CompletionProvider provider = createCompletionProvider();
+        autoCompletion = new JSImplPaneAutoCompletion(provider);
+        autoCompletion.setListCellRenderer(new CompletionCellRenderer());
+        autoCompletion.install(contentTextArea);
+        autoCompletion.installExtraRefreshComponent(interfaceAndDescriptionPanel);
+    }
+
+    private void uninstallAutoCompletion() {
+        if (autoCompletion != null) {
+            autoCompletion.uninstall();
+            autoCompletion = null;
+        }
+    }
+
+    private CompletionProvider createCompletionProvider() {
+        if (completionProvider == null) {
+            completionProvider = new DefaultCompletionProvider();
+            for (String name : JSAPITreeHelper.getAllNames()) {
+                completionProvider.addCompletion(new BasicCompletion(completionProvider, name));
+            }
+        }
+        return completionProvider;
+    }
+
+    private void initInterfaceModuleTree(JPanel interfacePanel) {
+        moduleTree = new JTree();
+        UIScrollPane moduleTreePane = new UIScrollPane(moduleTree);
+        moduleTreePane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+        interfacePanel.add(this.createNamePane(Toolkit.i18nText("Fine-Design_Module"), moduleTreePane), BorderLayout.WEST);
+        moduleTreePane.setPreferredSize(new Dimension(180, 200));
+
+        moduleTree.setRootVisible(false);
+        moduleTree.setShowsRootHandles(true);
+        moduleTree.setCellRenderer(moduleTreeCellRender);
+        DefaultTreeModel moduleTreeModel = (DefaultTreeModel) moduleTree.getModel();
+        DefaultMutableTreeNode rootNode = (DefaultMutableTreeNode) moduleTreeModel.getRoot();
+        rootNode.removeAllChildren();
+
+        JSAPITreeHelper.createJSAPITree(rootNode);
+        moduleTreeModel.reload();
+
+        initModuleTreeSelectionListener();
+    }
+
+    private void initModuleTreeSelectionListener() {
+        moduleTree.addTreeSelectionListener(new TreeSelectionListener() {
+            @Override
+            public void valueChanged(TreeSelectionEvent e) {
+                DefaultMutableTreeNode selectedTreeNode = (DefaultMutableTreeNode) moduleTree.getLastSelectedPathComponent();
+                Object selectedValue = selectedTreeNode.getUserObject();
+                if (null == selectedValue) {
+                    return;
+                }
+                if (selectedValue instanceof JSAPIUserObject) {
+                    interfaceNameModel = (DefaultListModel) interfaceNameList.getModel();
+                    interfaceNameModel.clear();
+                    String text = ((JSAPIUserObject) selectedValue).getValue();
+                    List<String> allInterfaceNames = JSAPITreeHelper.getNames(text);
+                    for (String interfaceName : allInterfaceNames) {
+                        interfaceNameModel.addElement(interfaceName);
+                    }
+                    if (interfaceNameModel.size() > 0) {
+                        interfaceNameList.setSelectedIndex(0);
+                        setDescription(interfaceNameList.getSelectedValue().toString());
+                        interfaceNameList.ensureIndexIsVisible(0);
+                    }
+                }
+            }
+        });
+    }
+
+
+    private DefaultTreeCellRenderer moduleTreeCellRender = new DefaultTreeCellRenderer() {
+        public Component getTreeCellRendererComponent(JTree tree,
+                                                      Object value, boolean selected, boolean expanded,
+                                                      boolean leaf, int row, boolean hasFocus) {
+            super.getTreeCellRendererComponent(tree, value, selected,
+                    expanded, leaf, row, hasFocus);
+
+            DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) value;
+            Object userObj = treeNode.getUserObject();
+            if (userObj instanceof JSAPIUserObject) {
+                this.setText(((JSAPIUserObject) userObj).getDisplayText());
+                this.setIcon(null);
+            }
+            return this;
+        }
+
+    };
+
+
+    private void initInterfaceNameList(JPanel interfacePanel) {
+        interfaceNameList = new JList(new DefaultListModel());
+        UIScrollPane interfaceNamePanelScrollPane = new UIScrollPane(interfaceNameList);
+        interfaceNamePanelScrollPane.setPreferredSize(new Dimension(180, 200));
+        interfacePanel.add(
+                this.createNamePane(Toolkit.i18nText("Fine-Design_Interface") + ":", interfaceNamePanelScrollPane),
+                BorderLayout.CENTER);
+
+        interfaceNamePanelScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+        initInterfaceNameModule();
+        initInterfaceNameListSelectionListener();
+        initInterfaceNameListMouseListener();
+    }
+
+    private void initInterfaceNameModule() {
+        moduleTree.setSelectionPath(moduleTree.getPathForRow(0));
+    }
+
+    private void setDescription(String interfaceName) {
+        StringBuilder il8Key = new StringBuilder();
+        moduleTree.getSelectionPath().getPath();
+        Object obj = moduleTree.getSelectionPath().getPath()[moduleTree.getSelectionPath().getPath().length - 1];
+        Object userObject = ((DefaultMutableTreeNode) obj).getUserObject();
+        if (userObject instanceof JSAPIUserObject) {
+            il8Key.append(JSAPITreeHelper.getDirectCategory(interfaceName));
+        }
+        interfaceName = interfaceName.toUpperCase();
+        if (!interfaceName.startsWith(SEPARATOR)) {
+            interfaceName = SEPARATOR + interfaceName;
+        }
+        il8Key.append(interfaceName);
+        descriptionTextArea.setText(Toolkit.i18nText(il8Key.toString()));
+        descriptionTextArea.moveCaretPosition(0);
+    }
+
+    private void initInterfaceNameListSelectionListener() {
+        interfaceNameList.addListSelectionListener(new ListSelectionListener() {
+
+            public void valueChanged(ListSelectionEvent evt) {
+                Object selectedValue = interfaceNameList.getSelectedValue();
+                if (selectedValue == null) {
+                    return;
+                }
+                String interfaceName = selectedValue.toString();
+                if (!StringUtils.equals(interfaceName, currentValue)) {
+                    setDescription(interfaceName);
+                    doHelpDocumentSearch();
+                    currentValue = interfaceName;
+                }
+
+            }
+        });
+    }
+
+
+    private void initInterfaceNameListMouseListener() {
+        interfaceNameList.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent evt) {
+                if (evt.getClickCount() >= 2) {
+                    Object selectedValue = interfaceNameList.getSelectedValue();
+                    String interfaceName = selectedValue.toString();
+                    applyText(interfaceName);
+                }
+            }
+        });
+    }
+
+    private void applyText(String text) {
+        if (text == null || text.length() <= 0) {
+            return;
+        }
+        if (ifHasBeenWriten == 0) {
+            contentTextArea.setForeground(Color.black);
+            contentTextArea.setText(StringUtils.EMPTY);
+            ifHasBeenWriten = 1;
+            insertPosition = 0;
+        }
+        String textAll = contentTextArea.getText();
+        currentPosition = contentTextArea.getCaretPosition();
+        int insert = 0;
+        int current = 0;
+        if (insertPosition <= currentPosition) {
+            insert = insertPosition;
+            current = currentPosition;
+        } else {
+            insert = currentPosition;
+            current = insertPosition;
+        }
+        String beforeIndexOfInsertString = textAll.substring(0, insert);
+        String afterIndexofInsertString = textAll.substring(current);
+        contentTextArea.setText(beforeIndexOfInsertString + text + afterIndexofInsertString);
+        contentTextArea.getText();
+        contentTextArea.requestFocus();
+        insertPosition = contentTextArea.getCaretPosition();
+    }
+
+    private JPanel createNamePane(String name, JComponent comp) {
+        JPanel namePane = new JPanel(new BorderLayout(4, 4));
+        namePane.add(new UILabel(name), BorderLayout.NORTH);
+        namePane.add(comp, BorderLayout.CENTER);
+        return namePane;
+    }
+
+    private JPanel createTipsPane() {
+        JPanel tipsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        tipsPane.setLayout(new BorderLayout(4, 4));
+        tipsPane.setBorder(BorderFactory.createEmptyBorder(30, 2, 0, 0));
+        JPanel searchPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        searchPane.setLayout(new BorderLayout(4, 4));
+        searchPane.add(keyWordTextField, BorderLayout.CENTER);
+
+        //搜索按钮
+        UIButton searchButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Search"));
+        searchButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                String toFind = keyWordTextField.getText();
+                search(toFind);
+                popTips();
+                tipsList.requestFocusInWindow();
+            }
+        });
+
+        keyWordTextField.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent e) {
+                if (e.getKeyChar() == KeyEvent.VK_ENTER) {
+                    e.consume();
+                    String toFind = keyWordTextField.getText();
+                    search(toFind);
+                    popTips();
+                    tipsList.requestFocusInWindow();
+                }
+            }
+        });
+
+        searchPane.add(searchButton, BorderLayout.EAST);
+        tipsPane.add(searchPane, BorderLayout.NORTH);
+
+        tipsList = new JList(tipsListModel);
+        tipsList.addMouseListener(tipsListMouseListener);
+        tipsList.addListSelectionListener(tipsListSelectionListener);
+        tipsList.addKeyListener(tipListKeyListener);
+
+        return tipsPane;
+    }
+
+    private void search(String key) {
+        tipsListModel.removeAllElements();
+        tipsListModel.clear();
+        key = key.replaceAll(StringUtils.BLANK, StringUtils.EMPTY);
+        ArrayList<String> list = new ArrayList<>();
+        if (!StringUtils.isEmpty(key)) {
+            List<String> allNames = JSAPITreeHelper.getAllNames();
+            for (String name : allNames) {
+                if (searchResult(key, name)) {
+                    list.add(name);
+                }
+            }
+            String finalKey = key;
+            Collections.sort(list, new Comparator<String>() {
+                @Override
+                public int compare(String o1, String o2) {
+                    int result;
+                    boolean o1StartWidth = o1.toLowerCase().startsWith(finalKey.toLowerCase());
+                    boolean o2StartWidth = o2.toLowerCase().startsWith(finalKey.toLowerCase());
+                    if (o1StartWidth) {
+                        result = o2StartWidth ? o1.compareTo(o2) : -1;
+                    } else {
+                        result = o2StartWidth ? 1 : o1.compareTo(o2);
+                    }
+                    return result;
+                }
+            });
+            for (String name : list) {
+                tipsListModel.addElement(name);
+            }
+            if (!tipsListModel.isEmpty()) {
+                tipsList.setSelectedIndex(0);
+            }
+        }
+    }
+
+    private boolean searchResult(String key, String interfaceName) {
+        if (StringUtils.isBlank(key) || StringUtils.isBlank(interfaceName)) {
+            return false;
+        }
+        int length = key.length();
+        String temp = interfaceName.toUpperCase();
+        for (int i = 0; i < length; i++) {
+            String check = key.substring(i, i + 1);
+            int index = temp.indexOf(check.toUpperCase());
+            if (index == -1) {
+                return false;
+            } else {
+                temp = temp.substring(index + 1);
+            }
+        }
+        return true;
+    }
+
+    private void initPopTips() {
+        popupMenu = new JPopupMenu();
+        JScrollPane tipsScrollPane = new JScrollPane(tipsList);
+        popupMenu.add(tipsScrollPane);
+        tipsScrollPane.setPreferredSize(new Dimension(220, 146));
+        tipsScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+    }
+
+    private void popTips() {
+        popupMenu.show(keyWordTextField, 0, 23);
+    }
+
+    private ListSelectionListener tipsListSelectionListener = new ListSelectionListener() {
+        @Override
+        public void valueChanged(ListSelectionEvent e) {
+            Object selectValue = tipsList.getSelectedValue();
+            if (selectValue == null) {
+                return;
+            }
+            String interfaceName = selectValue.toString();
+            fixInterfaceNameList(interfaceName);
+        }
+    };
+
+    private KeyListener tipListKeyListener = new KeyAdapter() {
+        @Override
+        public void keyPressed(KeyEvent e) {
+            if (e.getKeyChar() == KeyEvent.VK_ENTER) {
+                Object selectValue = tipsList.getSelectedValue();
+                if (selectValue == null) {
+                    return;
+                }
+                tipListValueSelectAction(selectValue.toString());
+                if (popupMenu != null) {
+                    popupMenu.setVisible(false);
+                }
+                contentTextArea.requestFocusInWindow();
+            }
+        }
+    };
+
+    private void tipListValueSelectAction(String value) {
+        if (ifHasBeenWriten == 0) {
+            contentTextArea.setForeground(Color.black);
+            contentTextArea.setText(StringUtils.EMPTY);
+        }
+        contentTextArea.setForeground(Color.black);
+        currentPosition = contentTextArea.getCaretPosition();
+        String output = value;
+        String textAll = contentTextArea.getText();
+        String textReplaced;
+        int position = 0;
+        if (insertPosition <= currentPosition) {
+            textReplaced = textAll.substring(0, insertPosition) + output + textAll.substring(currentPosition);
+            position = insertPosition + output.length();
+        } else {
+            textReplaced = textAll.substring(0, currentPosition) + output + textAll.substring(insertPosition);
+            position = currentPosition + output.length();
+        }
+        contentTextArea.setText(textReplaced);
+        contentTextArea.setCaretPosition(position);
+        insertPosition = position;
+        ifHasBeenWriten = 1;
+        tipsListModel.removeAllElements();
+    }
+
+    private MouseListener tipsListMouseListener = new MouseAdapter() {
+        String singlePressContent;
+
+        String doublePressContent;
+
+        @Override
+        public void mousePressed(MouseEvent e) {
+            int index = tipsList.getSelectedIndex();
+            if (index != -1) {
+                if (e.getClickCount() == 1) {
+                    singlePressContent = (String) tipsListModel.getElementAt(index);
+                } else if (e.getClickCount() == 2) {
+                    doublePressContent = (String) tipsListModel.getElementAt(index);
+                }
+            }
+        }
+
+        @Override
+        public void mouseReleased(MouseEvent e) {
+            int index = tipsList.getSelectedIndex();
+            if (index != -1) {
+                if (e.getClickCount() == 1) {
+                    if (ComparatorUtils.equals((String) tipsListModel.getElementAt(index), singlePressContent)) {
+                        singleClickActuator(singlePressContent);
+                    }
+                } else if (e.getClickCount() == 2) {
+                    if (ComparatorUtils.equals((String) tipsListModel.getElementAt(index), doublePressContent)) {
+                        doubleClickActuator(doublePressContent);
+                    }
+                    if (popupMenu != null) {
+                        popupMenu.setVisible(false);
+                    }
+                }
+            }
+        }
+
+        private void singleClickActuator(String currentLineContent) {
+            setDescription(currentLineContent);
+            fixInterfaceNameList(currentLineContent);
+        }
+
+        private void doubleClickActuator(String currentLineContent) {
+            tipListValueSelectAction(currentLineContent);
+        }
+    };
+}

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

@@ -9,6 +9,8 @@ import com.fr.design.gui.itableeditorpane.UITableEditAction;
 import com.fr.design.gui.itableeditorpane.UITableEditorPane;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.hyperlink.AbstractHyperLinkPane;
+import com.fr.design.javascript.jsapi.JSImplPopulateAction;
+import com.fr.design.javascript.jsapi.JSImplUpdateAction;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -17,10 +19,16 @@ import com.fr.js.JavaScriptImpl;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridLayout;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-import java.awt.*;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -28,11 +36,11 @@ import java.util.List;
 public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
     private static final int BOTTOM_BORDER = 12;
     private UITextField itemNameTextField;
-    private JSContentPane jsPane;
+    protected JSContentPane jsPane;
     private UITableEditorPane<String> importedJsPane;
     private ReportletParameterViewPane parameterPane;
     private String[] defaultArgs;
-
+    private boolean modal;
 
     public JavaScriptImplPane() {
         this(new String[0]);
@@ -50,8 +58,57 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
         initComponents();
     }
 
+    public JavaScriptImplPane(String[] args, boolean modal) {
+        this.modal = modal;
+        this.defaultArgs = args;
+        initComponents();
+    }
+
     protected void initComponents() {
-        parameterPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
+        parameterPane = createParameterViewPane();
+        importedJsPane = createImportedJsPane();
+        importedJsPane.setPreferredSize(new Dimension(265, 150));
+
+        jsPane = createJSContentPane(defaultArgs);
+        jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript")));
+
+        parameterPane.setPreferredSize(new Dimension(265, 150));
+        JPanel topPane = new JPanel(new GridLayout(1,2));
+        topPane.add(importedJsPane);
+        topPane.add(parameterPane);
+
+        topPane.setBorder(BorderFactory.createEmptyBorder(0, 0, BOTTOM_BORDER, 0));
+
+        this.setLayout(new BorderLayout());
+        this.add(topPane, BorderLayout.NORTH);
+        this.add(jsPane, BorderLayout.CENTER);
+
+        this.reLayoutForChart();
+    }
+
+    protected JSContentPane createJSContentPane(String[] defaultArgs){
+        JSContentPane jsContentPane= new JSContentPane(defaultArgs,modal);
+        jsContentPane.setJsImplUpdateAction(new JSImplUpdateAction() {
+            @Override
+            public void update(JavaScriptImpl javaScript) {
+                if(javaScript != null){
+                    updateBean(javaScript);
+                }
+            }
+        });
+        jsContentPane.setJsImplPopulateAction(new JSImplPopulateAction() {
+            @Override
+            public void populate(JavaScriptImpl javaScript) {
+                if(javaScript != null){
+                    populateBean(javaScript);
+                }
+            }
+        });
+        return jsContentPane;
+    }
+
+    protected ReportletParameterViewPane createParameterViewPane(){
+        ReportletParameterViewPane  parameterPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
         parameterPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
         parameterPane.addTableEditorListener(new TableModelListener() {
             public void tableChanged(TableModelEvent e) {
@@ -72,7 +129,10 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
                 parameterChanger(list);
             }
         });
+        return  parameterPane;
+    }
 
+    protected UITableEditorPane<String> createImportedJsPane(){
         OneListTableModel<String> model = new OneListTableModel<String>(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"), this) {
 
             public UITableEditAction[] createAction() {
@@ -84,26 +144,12 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
                 return new AddJsAction();
             }
         };
-        importedJsPane = new UITableEditorPane<String>(model);
+        UITableEditorPane<String> importedJsPane = new UITableEditorPane<String>(model);
         importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript")));
-        importedJsPane.setPreferredSize(new Dimension(265, 150));
+        return importedJsPane;
-        jsPane = new JSContentPane(defaultArgs);
+    }
-        jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript")));
-
-        parameterPane.setPreferredSize(new Dimension(265, 150));
-        JPanel topPane = GUICoreUtils.createBorderLayoutPane(
-                importedJsPane, BorderLayout.CENTER,
-                parameterPane, BorderLayout.EAST
-        );
-        topPane.setPreferredSize(new Dimension(300, 150));
-        topPane.setBorder(BorderFactory.createEmptyBorder(0, 0, BOTTOM_BORDER, 0));
 
-        this.setLayout(new BorderLayout());
-        this.add(topPane, BorderLayout.NORTH);
-        this.add(jsPane, BorderLayout.CENTER);
 
-        this.reLayoutForChart();
-    }
 
     /**
      * 参数改变
@@ -140,10 +186,10 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
         if (javaScriptImpl == null) {
             javaScriptImpl = new JavaScriptImpl();
             jsPane.reset();
-        }else{
+        } else {
             jsPane.populate(javaScriptImpl.getContent());
         }
-
+        jsPane.updateJSImpl(javaScriptImpl);
         int rowCount = javaScriptImpl.getJSImportSize();
         String[] value = new String[rowCount];
         for (int i = 0; i < rowCount; i++) {
@@ -160,6 +206,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
     public JavaScriptImpl updateBean() {
         JavaScriptImpl javaScript = new JavaScriptImpl();
         updateBean(javaScript);
+        jsPane.updateJSImpl(javaScript);
         return javaScript;
     }
 

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

@@ -0,0 +1,23 @@
+package com.fr.design.javascript;
+
+
+import com.fr.js.JavaScriptImpl;
+
+
+public class NewJavaScriptImplPane extends JavaScriptImplPane {
+    public NewJavaScriptImplPane(String[] args) {
+        super(args);
+    }
+
+    protected JSContentPane createJSContentPane(String[] defaultArgs){
+        return new JSContentWithDescriptionPane(defaultArgs);
+    }
+
+    public void populate(JavaScriptImpl javaScript) {
+        if (javaScript != null) {
+            populateBean(javaScript);
+        } else {
+            jsPane.reset();
+        }
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.fr.design.javascript.jsapi;
+
+import com.fr.design.i18n.Toolkit;
+
+public class CategoryTreeNodesUserObject implements JSAPIUserObject {
+    private String value;
+
+    public CategoryTreeNodesUserObject(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String getDisplayText() {
+        return Toolkit.i18nText(value);
+    }
+}

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

@@ -0,0 +1,155 @@
+package com.fr.design.javascript.jsapi;
+
+import com.fr.general.IOUtils;
+import com.fr.json.JSONArray;
+import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+public class JSAPITreeHelper {
+    private static final String JSAPI_PATH = "com/fr/design/javascript/jsapi/jsapi.json";
+    private static final String CATEGORY_PATH = "com/fr/design/javascript/jsapi/category.json";
+    private static JSONObject categoryJSON ;
+    private static JSONObject jsapiJSON ;
+
+    static {
+        jsapiJSON = createJSON(JSAPI_PATH);
+        categoryJSON = createJSON(CATEGORY_PATH);
+    }
+
+    private static JSONObject createJSON(String path) {
+        StringBuilder jsonString = new StringBuilder(StringUtils.EMPTY);
+        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(IOUtils.readResource(path)))) {
+            String s;
+            while ((s = bufferedReader.readLine()) != null) {
+                jsonString.append(s);
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return new JSONObject(jsonString.toString());
+    }
+
+
+    public static void createJSAPITree(DefaultMutableTreeNode rootNode) {
+        createJSAPITree(categoryJSON, rootNode);
+    }
+
+    public static String getDirectCategory(String name) {
+        if (jsapiJSON != null) {
+            Iterator<String> it = jsapiJSON.keys();
+            while (it.hasNext()) {
+                String key = it.next();
+                JSONArray nameArray = jsapiJSON.optJSONArray(key);
+                for (int i = 0; i < nameArray.length(); i++) {
+                    if (StringUtils.equals(nameArray.getString(i), name)) {
+                        return key;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private static void createJSAPITree(JSONObject jsonObject, DefaultMutableTreeNode rootNode) {
+        if (jsonObject != null && rootNode != null) {
+            Iterator<String> it = jsonObject.keys();
+            while (it.hasNext()) {
+                String key = it.next();
+                JSONObject subNode = jsonObject.optJSONObject(key);
+                if (subNode.size() == 0) {
+                    rootNode.add(new DefaultMutableTreeNode(new CategoryTreeNodesUserObject(key)));
+                } else {
+                    DefaultMutableTreeNode treeNode = new DefaultMutableTreeNode(new CategoryTreeNodesUserObject(key));
+                    rootNode.add(treeNode);
+                    createJSAPITree(subNode, treeNode);
+                }
+            }
+        }
+    }
+
+    private static List<String> getAllSubNodes(String name) {
+        return getAllSubNodes(name, categoryJSON);
+    }
+
+    public static List<String> getAllNames() {
+        ArrayList<String> result = new ArrayList<>();
+        if (jsapiJSON != null) {
+            Iterator<String> it = jsapiJSON.keys();
+            while (it.hasNext()) {
+                String key = it.next();
+                JSONArray nameArray = jsapiJSON.optJSONArray(key);
+                for (int i = 0; i < nameArray.length(); i++) {
+                    result.add(nameArray.getString(i));
+                }
+            }
+        }
+        return result;
+    }
+
+    public static List<String> getNames(String category) {
+        ArrayList<String> result = new ArrayList<>();
+        List<String> subCategories = getAllSubNodes(category);
+        if (jsapiJSON != null) {
+            for (String subCategory : subCategories) {
+                if (jsapiJSON.containsKey(subCategory)) {
+                    JSONArray nameArray = jsapiJSON.optJSONArray(subCategory);
+                    for (int i = 0; i < nameArray.length(); i++) {
+                        result.add(nameArray.getString(i));
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    private static List<String> getAllSubNodes(String name, JSONObject jsonObject) {
+        ArrayList<String> result = new ArrayList<>();
+        if (jsonObject != null) {
+            Iterator<String> it = jsonObject.keys();
+            while (it.hasNext()) {
+                String key = it.next();
+                JSONObject subNode = jsonObject.optJSONObject(key);
+                if (subNode.size() == 0) {
+                    if (StringUtils.equals(key, name)) {
+                        result.add(key);
+                        return result;
+                    }
+                } else {
+                    if (StringUtils.equals(key, name)) {
+                        result.add(key);
+                        result.addAll(getAllSubNodes(subNode));
+                        return result;
+                    } else {
+                        result.addAll(getAllSubNodes(name, subNode));
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    private static List<String> getAllSubNodes(JSONObject jsonObject) {
+        ArrayList<String> result = new ArrayList<>();
+        if (jsonObject != null) {
+            Iterator<String> it = jsonObject.keys();
+            while (it.hasNext()) {
+                String key = it.next();
+                JSONObject subNode = jsonObject.optJSONObject(key);
+                if (subNode.size() == 0) {
+                    result.add(key);
+                } else {
+                    result.add(key);
+                    result.addAll(getAllSubNodes(subNode));
+                }
+            }
+        }
+        return result;
+    }
+}

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

@@ -0,0 +1,9 @@
+package com.fr.design.javascript.jsapi;
+
+
+public interface JSAPIUserObject {
+
+     String getValue();
+
+     String getDisplayText();
+}

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

@@ -0,0 +1,7 @@
+package com.fr.design.javascript.jsapi;
+
+import com.fr.js.JavaScriptImpl;
+
+public interface JSImplPopulateAction {
+    void populate(JavaScriptImpl javaScript);
+}

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

@@ -0,0 +1,7 @@
+package com.fr.design.javascript.jsapi;
+
+import com.fr.js.JavaScriptImpl;
+
+public interface JSImplUpdateAction {
+    void update(JavaScriptImpl javaScript);
+}

designer-base/src/main/java/com/fr/design/lock/LockInfoDialog.java

@@ -3,6 +3,7 @@ package com.fr.design.lock;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
@@ -44,7 +45,7 @@ public class LockInfoDialog extends JDialog {
         panel.add(createControlPane(), BorderLayout.SOUTH);
         this.getContentPane().add(panel);
         this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Title_Hint"));
-        this.setSize(400, 160);
+        this.setSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.lock.LockInfoDialog"));
         this.setResizable(false);
         this.setModal(true);
         GUICoreUtils.centerWindow(this);

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

@@ -2,6 +2,7 @@ package com.fr.design.mainframe;
 
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.guide.base.GuideView;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -105,7 +106,7 @@ public class ForbiddenPane extends JPanel {
                 super.paintComponent(g2d);
             }
         };
-        refreshButton.setPreferredSize(new Dimension(68, 24));
+        refreshButton.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.ForbiddenPane.refreshButton"));
         refreshButton.setForeground(Color.WHITE);
         refreshButton.setBorderPainted(false);
         refreshButton.setContentAreaFilled(false);

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

@@ -65,6 +65,7 @@ import com.fr.event.EventDispatcher;
 import com.fr.file.FILE;
 import com.fr.file.FILEChooserPane;
 import com.fr.file.MemFILE;
+import com.fr.file.StashedFILE;
 import com.fr.form.ui.NoneWidget;
 import com.fr.form.ui.Widget;
 import com.fr.general.ComparatorUtils;
@@ -104,6 +105,7 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingConstants;
 import javax.swing.undo.UndoManager;
 import java.awt.BorderLayout;
+import java.io.ByteArrayOutputStream;
 import java.awt.Dimension;
 import java.awt.FontMetrics;
 import java.util.Set;
@@ -438,6 +440,22 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         stopListenThemeConfig();
     }
 
+    public FILE templateToStashFile() {
+        FILE file = this.getEditingFILE();
+        try {
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            BaseBook target = this.getTarget();
+            if (target != null) {
+                target.export(outputStream);
+                return new StashedFILE(file, outputStream.toByteArray(), template.suffix());
+            }
+            // 如果 target == null 那么这个模板是被模板内存优化功能处理过的，不用处理
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
 
     /**
      * 刷新内部资源
@@ -967,6 +985,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             return false;
         }
         try {
+            checkBeforeSave();
             export();
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -985,7 +1004,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         return isNewCreateTpl;
     }
 
-    protected boolean export() throws Exception {
+    protected void checkBeforeSave() throws Exception {
         // 保存前校验下未解锁
         if (WorkContext.getCurrent().get(LockInfoOperator.class).isTplUnLocked(getEditingFILE().getPath())) {
             throw new UnLockedException();
@@ -994,6 +1013,9 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         if (getEditingFILE().exists() && !WorkContext.getCurrent().get(LockInfoOperator.class).isConsistentLock(getEditingFILE().getPath())) {
             throw new InconsistentLockException();
         }
+    }
+
+    protected boolean export() throws Exception {
         return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(getEditingFILE()));
 
     }
@@ -1634,6 +1656,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             if (editingFILE == null || editingFILE instanceof MemFILE) {
                 return false;
             }
+            checkBeforeSave();
             export();
             this.editingFILE = editingFILE;
             return true;

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

@@ -1,40 +0,0 @@
-package com.fr.design.mainframe.predefined;
-
-import com.fr.config.predefined.PredefinedStyle;
-//import com.fr.predefined.PredefinedPatternStyleManager;
-
-
-/**
- * Created by kerry on 2020-08-31
- */
-public enum PatternStyle {
-    DARK_STYLE(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Dark_Pattern")) {
-        @Override
-        public PredefinedStyle getPredefinedStyle() {
-//            return PredefinedPatternStyleManager.INSTANCE.getDarkMode();
-            return new PredefinedStyle();
-        }
-    },
-    LIGHT_STYLE(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Light_Pattern")) {
-        @Override
-        public PredefinedStyle getPredefinedStyle() {
-//            return PredefinedPatternStyleManager.INSTANCE.getLightMode();
-            return new PredefinedStyle();
-        }
-    };
-
-
-    private String name;
-
-
-    PatternStyle(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public abstract PredefinedStyle getPredefinedStyle();
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleBlock.java

@@ -1,143 +0,0 @@
-package com.fr.design.mainframe.predefined.ui;
-
-import com.fr.base.BaseUtils;
-import com.fr.base.GraphHelper;
-import com.fr.config.predefined.PredefinedStyle;
-import com.fr.design.mainframe.predefined.ui.dialog.PredefinedStyleEditDialog;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.predefined.ui.preview.PredefinedStylePreviewPane;
-import com.fr.general.ComparatorUtils;
-import com.fr.general.IOUtils;
-import com.fr.stable.Constants;
-
-import javax.swing.BorderFactory;
-import javax.swing.Icon;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-
-/**
- * Created by kerry on 2020-08-25
- */
-public class PredefinedStyleBlock extends JPanel {
-    private PredefinedStyle previewObject;
-    private PredefinedStyleSelectPane parentPane;
-    private Icon markedMode = IOUtils.readIcon("/com/fr/design/form/images/marker_selected.png");
-    private static final Color BORDER_COLOR = new Color(141, 194, 249);
-
-    private boolean mouseOver = false;
-
-    private MouseListener mouseListener = new MouseListener() {
-        @Override
-        public void mouseClicked(MouseEvent e) {
-            setSelect();
-        }
-
-        @Override
-        public void mousePressed(MouseEvent e) {
-
-        }
-
-        @Override
-        public void mouseReleased(MouseEvent e) {
-
-        }
-
-        @Override
-        public void mouseEntered(MouseEvent e) {
-            mouseOver = true;
-            PredefinedStyleBlock.this.repaint();
-        }
-
-        @Override
-        public void mouseExited(MouseEvent e) {
-            mouseOver = false;
-            PredefinedStyleBlock.this.repaint();
-        }
-    };
-
-
-    public PredefinedStyleBlock(PredefinedStyle previewObject, PredefinedStyleSelectPane selectPane, boolean supportEdit) {
-        this.previewObject = previewObject;
-        this.parentPane = selectPane;
-        initPane(supportEdit);
-        this.addMouseListener(mouseListener);
-    }
-
-    private void setSelect() {
-        this.parentPane.setSelectedPreviewPane(this);
-    }
-
-    @Override
-    public void paint(Graphics g) {
-        super.paint(g);
-        boolean isSelected = ComparatorUtils.equals(this, this.parentPane.getSelectedPreviewPane());
-        if (ComparatorUtils.equals(this.parentPane.getCurrentApplicateStyle(), this.previewObject.getStyleName())) {
-            markedMode.paintIcon(this, g, 176, 0);
-        }
-        if (isSelected || this.mouseOver) {
-            g.setColor(BORDER_COLOR);
-            Rectangle rectangle = new Rectangle(1, 1, this.getWidth() - 2, this.getHeight() - 2);
-            GraphHelper.draw(g, rectangle, Constants.LINE_MEDIUM);
-        }
-    }
-
-
-    private void initPane(boolean supportEdit) {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        PredefinedStylePreviewPane content = new PredefinedStylePreviewPane(0.387, 0.384);
-        content.setParent(this);
-        content.setPreferredSize(new Dimension(200, 180));
-        UILabel label = new UILabel(previewObject.getStyleName());
-        label.setToolTipText(previewObject.getStyleName());
-        label.setPreferredSize(new Dimension(167, 25));
-
-
-        JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        panel.setBorder(BorderFactory.createEmptyBorder(0,9,2,5));
-        panel.add(label, BorderLayout.WEST);
-        if (supportEdit) {
-            addEditButton(panel);
-        }
-
-        this.add(content, BorderLayout.CENTER);
-        this.add(panel, BorderLayout.SOUTH);
-        this.setPreferredSize(new Dimension(200, 210));
-        panel.setBackground(Color.WHITE);
-        this.setBackground(Color.WHITE);
-        content.refresh(this.previewObject);
-
-    }
-
-    private void addEditButton(JPanel panel) {
-        UIButton editButton = new UIButton(BaseUtils.readIcon("/com/fr/design/icon/icon_edit.png"));
-        editButton.setPreferredSize(new Dimension(24, 24));
-        editButton.setBorderPainted(false);
-        editButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                PredefinedStyleEditPane editPane = PredefinedStyleEditPane.createEditPane(parentPane);
-                PredefinedStyleEditDialog editDialog = new PredefinedStyleEditDialog(
-                        SwingUtilities.getWindowAncestor(PredefinedStyleBlock.this), editPane,  previewObject.isBuiltIn());
-                editPane.populate(PredefinedStyleBlock.this.previewObject);
-                editDialog.setVisible(true);
-            }
-        });
-        panel.add(editButton, BorderLayout.EAST);
-
-    }
-
-    public PredefinedStyle update() {
-        return this.previewObject;
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleEditPane.java

@@ -1,374 +0,0 @@
-package com.fr.design.mainframe.predefined.ui;
-
-import com.fr.base.ChartColorMatching;
-import com.fr.base.ChartPreStyleConfig;
-import com.fr.base.Style;
-import com.fr.base.background.ColorBackground;
-import com.fr.config.predefined.ColorFillStyle;
-import com.fr.config.predefined.PredefinedCellStyle;
-import com.fr.config.predefined.PredefinedCellStyleConfig;
-import com.fr.config.predefined.PredefinedColorStyle;
-import com.fr.config.predefined.PredefinedStyle;
-import com.fr.config.predefined.PredefinedStyleConfig;
-import com.fr.config.ServerPreferenceConfig;
-import com.fr.design.dialog.FineJOptionPane;
-import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.design.gui.frpane.UITabbedPane;
-import com.fr.design.gui.icontainer.UIScrollPane;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.itextfield.UITextField;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.predefined.ui.detail.ChartStyleSettingPane;
-import com.fr.design.mainframe.predefined.ui.detail.ColorFillStylePane;
-import com.fr.design.mainframe.predefined.ui.detail.PredefinedBackgroundSettingPane;
-import com.fr.design.mainframe.predefined.ui.detail.ComponentStyleSettingPane;
-import com.fr.design.mainframe.predefined.ui.detail.CellStyleListControlPane;
-import com.fr.design.mainframe.predefined.ui.preview.PredefinedStylePreviewPane;
-import com.fr.design.ui.util.UIUtil;
-import com.fr.design.utils.DesignUtils;
-import com.fr.general.FRFont;
-import com.fr.log.FineLoggerFactory;
-import com.fr.stable.StringUtils;
-import com.fr.transaction.Configurations;
-import com.fr.transaction.WorkerFacade;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Created by kerry on 2020-08-26
- */
-public class PredefinedStyleEditPane extends AbstractAttrNoScrollPane {
-    private static final Color TIP_COLOR = Color.decode("#8F8F92");
-
-    private PredefinedStylePreviewPane previewPane;
-    private UITextField styleNameField;
-    private PredefinedBackgroundSettingPane backgroundSettingPane;
-    private CellStyleListControlPane cellStyleSettingPane;
-    private ComponentStyleSettingPane componentStyleSettingPane;
-    private ChartStyleSettingPane chartStyleSettingPane;
-    private PredefinedStyleSelectPane selectPane;
-    private ColorFillStylePane colorFillStylePane;
-    private boolean isPopulating = false;
-    private UITabbedPane uiTabbedPane;
-
-    private boolean isLightMode = true;
-
-    @Override
-    protected JPanel createContentPane() {
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        jPanel.add(createLeftPane(), BorderLayout.WEST);
-        jPanel.add(createRightPane(), BorderLayout.CENTER);
-
-        this.addAttributeChangeListener(new AttributeChangeListener() {
-            @Override
-            public void attributeChange() {
-                if (!isPopulating) {
-                    valueChangeAction();
-                }
-            }
-        });
-        return jPanel;
-    }
-
-    public void valueChangeAction() {
-        boolean displayFormBackground = backgroundSettingPane.currentFormBackground() || uiTabbedPane.getSelectedIndex() == 3;
-        previewPane.refresh(this.update(), displayFormBackground);
-    }
-
-    @Override
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Edit");
-    }
-
-    private PredefinedStyleEditPane(PredefinedStyleSelectPane selectPane, boolean newEditPane) {
-        this.selectPane = selectPane;
-        this.styleNameField.setEnabled(newEditPane);
-    }
-
-    public static PredefinedStyleEditPane createEditPane(PredefinedStyleSelectPane selectPane) {
-        return new PredefinedStyleEditPane(selectPane, false);
-    }
-
-    public static PredefinedStyleEditPane createNewEditPane(PredefinedStyleSelectPane selectPane) {
-        return new PredefinedStyleEditPane(selectPane, true);
-    }
-
-
-    private JPanel createLeftPane() {
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        JPanel titlePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Overall_Preview"));
-        previewPane = new PredefinedStylePreviewPane();
-        previewPane.setPreferredSize(new Dimension(517, 500));
-
-        titlePane.add(previewPane);
-        jPanel.add(titlePane, BorderLayout.CENTER);
-        return jPanel;
-    }
-
-    private JPanel createRightPane() {
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        JPanel styleNamePane = createStyleNamePane();
-        jPanel.add(styleNamePane, BorderLayout.NORTH);
-
-        JPanel basicSettingPane = createBasicSettingPane();
-        jPanel.add(basicSettingPane, BorderLayout.CENTER);
-
-        JPanel customDetailPane = createCustomDetailPane();
-        jPanel.add(customDetailPane, BorderLayout.SOUTH);
-        return jPanel;
-    }
-
-    private JPanel createStyleNamePane() {
-        JPanel jPanel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(5, 26, 8);
-        jPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Name")));
-        this.styleNameField = new UITextField();
-        this.styleNameField.setPreferredSize(new Dimension(160, 20));
-        jPanel.add(this.styleNameField);
-        return jPanel;
-    }
-
-    private JPanel createBasicSettingPane() {
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        JPanel titlePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Basic_Setting"));
-        JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        colorFillStylePane = new ColorFillStylePane();
-        contentPane.add(colorFillStylePane);
-        titlePane.add(contentPane);
-        jPanel.add(titlePane, BorderLayout.CENTER);
-        titlePane.setSize(new Dimension(348, 157));
-        return jPanel;
-    }
-
-    private JPanel createCustomDetailPane() {
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        JPanel titlePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Custom_Detail"));
-        titlePane.setLayout(FRGUIPaneFactory.createLeftZeroLayout());
-        jPanel.add(titlePane, BorderLayout.CENTER);
-        uiTabbedPane = new UITabbedPane();
-        uiTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Template_Background"), createTemplateBackgroundSettingPane());
-        uiTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Cell_Style"), createCellStyleSettingPane());
-        uiTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Chart_Style"), createChartStyleSettingPane());
-        uiTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Component_Style"), createComponentStyleSettingPane());
-        uiTabbedPane.addChangeListener(new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                valueChangeAction();
-            }
-        });
-        titlePane.add(uiTabbedPane);
-        uiTabbedPane.setPreferredSize(new Dimension(323, 298));
-        titlePane.setPreferredSize(new Dimension(333, 320));
-        return jPanel;
-    }
-
-
-    private JPanel createTemplateBackgroundSettingPane() {
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        jPanel.setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 5));
-        this.backgroundSettingPane = new PredefinedBackgroundSettingPane();
-        jPanel.setPreferredSize(new Dimension(309, 248));
-        UIScrollPane scrollPane = new UIScrollPane(this.backgroundSettingPane);
-        scrollPane.setBorder(BorderFactory.createEmptyBorder());
-        jPanel.add(new UIScrollPane(this.backgroundSettingPane));
-        return jPanel;
-    }
-
-    private JPanel createCellStyleSettingPane() {
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        jPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
-        this.cellStyleSettingPane = new CellStyleListControlPane();
-        this.cellStyleSettingPane.registerAttrChangeListener(new AttributeChangeListener() {
-            @Override
-            public void attributeChange() {
-                valueChangeAction();
-            }
-        });
-        jPanel.add(this.cellStyleSettingPane);
-        return jPanel;
-    }
-
-
-    private JPanel createChartStyleSettingPane() {
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        jPanel.setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 5));
-        this.chartStyleSettingPane = new ChartStyleSettingPane();
-        jPanel.add(this.chartStyleSettingPane);
-        return jPanel;
-    }
-
-
-    private JPanel createComponentStyleSettingPane() {
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        jPanel.setLayout(new BorderLayout(0, 5));
-        jPanel.setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 5));
-        this.componentStyleSettingPane = new ComponentStyleSettingPane();
-        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_ComponentStyle_Setting_Tip"));
-        label.setForeground(TIP_COLOR);
-        jPanel.add(label, BorderLayout.NORTH);
-        jPanel.add(this.componentStyleSettingPane, BorderLayout.CENTER);
-        return jPanel;
-    }
-
-
-    public void populate(PredefinedStyle previewObject) {
-        isPopulating = true;
-        isLightMode = previewObject.isLightMode();
-        styleNameField.setText(previewObject.getStyleName());
-        this.backgroundSettingPane.populateBean(previewObject.getPredefinedBackground());
-        this.cellStyleSettingPane.populateBean(previewObject.getCellStyleConfig());
-        this.componentStyleSettingPane.populateBean(previewObject.getComponentStyle());
-        this.colorFillStylePane.populateBean(previewObject.getPredefinedColorStyle());
-        this.chartStyleSettingPane.populateBean(previewObject.getPredefinedChartStyle());
-        previewPane.refresh(previewObject);
-        isPopulating = false;
-    }
-
-    public PredefinedStyle update() {
-        PredefinedStyle predefinedStyle = new PredefinedStyle();
-        predefinedStyle.setLightMode(isLightMode);
-        predefinedStyle.setStyleName(this.styleNameField.getText());
-        PredefinedCellStyleConfig cellStyleConfig = this.cellStyleSettingPane.updateBean();
-        predefinedStyle.setCellStyleConfig(cellStyleConfig);
-
-        predefinedStyle.setPredefinedBackground(this.backgroundSettingPane.updateBean());
-        predefinedStyle.setComponentStyle(this.componentStyleSettingPane.updateBean());
-
-        PredefinedColorStyle colorStyle = this.colorFillStylePane.update();
-        updateCellStyleByColorStyle(colorStyle, cellStyleConfig);
-        predefinedStyle.setPredefinedColorStyle(colorStyle);
-        predefinedStyle.setPredefinedChartStyle(this.chartStyleSettingPane.updateBean());
-        return predefinedStyle;
-    }
-
-    private void updateCellStyleByColorStyle(PredefinedColorStyle colorStyle, PredefinedCellStyleConfig cellStyleConfig) {
-        PredefinedCellStyle headerStyle = cellStyleConfig.getStyle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Header"));
-        PredefinedCellStyle highlightStyle = cellStyleConfig.getStyle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Highlight_Text"));
-        ColorFillStyle colorFillStyle = colorStyle.getColorFillStyle();
-        List<Color> colorList = new ArrayList<>();
-        if (colorFillStyle == null || colorFillStyle.getColorList().size() == 0){
-            ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
-            String defaultName = config.getCurrentStyle();
-            ChartColorMatching defaultStyle = (ChartColorMatching) config.getPreStyle(defaultName);
-            if (defaultStyle != null) {
-                colorList = defaultStyle.getColorList();
-            }
-        } else {
-            colorList = colorFillStyle.getColorList();
-        }
-        if (colorList.size() < 2) {
-            return;
-        }
-        if (headerStyle != null) {
-            Style style = headerStyle.getStyle();
-            Color color = colorList.get(0);
-            headerStyle.setStyle(style.deriveBackground(ColorBackground.getInstance(color)));
-        }
-        if (highlightStyle != null) {
-            Style style = highlightStyle.getStyle();
-            Color color = colorList.get(1);
-            FRFont font = style.getFRFont();
-            font.setForeground(color);
-            highlightStyle.setStyle(style.deriveFRFont(font));
-        }
-    }
-
-    public boolean saveStyle() {
-        PredefinedStyle previewObject;
-        try {
-            previewObject = update();
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            return false;
-        }
-        if (this.styleNameField.isEnabled() && !validateRepeat(previewObject.getStyleName())) {
-            return false;
-        }
-        if (!saveStyle(previewObject)) {
-            return false;
-        }
-        HistoryTemplateListCache.getInstance().repaintCurrentEditingTemplate();
-        return true;
-    }
-
-    private boolean saveStyle(PredefinedStyle previewObject) {
-        PredefinedStyleConfig config = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig();
-        if (StringUtils.isEmpty(previewObject.getStyleName())) {
-            FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(PredefinedStyleEditPane.this),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Name_Cannot_Empty"));
-
-            return false;
-        }
-        config.add(previewObject);
-        PredefinedStyleConfig sortedConfig = resortConfigStyles(previewObject, config);
-//        Configurations.modify(new WorkerFacade(ServerPreferenceConfig.class) {
-//            @Override
-//            public void run() {
-//                ServerPreferenceConfig.getInstance().setPreferenceStyleConfig(sortedConfig);
-//            }
-//        });
-        selectPane.refreshPane();
-        return true;
-    }
-
-    public void saveAsNewStyle(String styleName) {
-        PredefinedStyle previewObject;
-        try {
-            previewObject = update();
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            return;
-        }
-        previewObject.setStyleName(styleName);
-        if (validateRepeat(styleName)) {
-            saveStyle(previewObject);
-        }
-    }
-
-    private boolean validateRepeat(String styleName) {
-        PredefinedStyleConfig config = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig();
-        if (config.getStyle(styleName) != null) {
-            FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(PredefinedStyleEditPane.this),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Name_Repeat"));
-
-            return false;
-        }
-        return true;
-    }
-
-    private PredefinedStyleConfig resortConfigStyles(PredefinedStyle priorityStyle, PredefinedStyleConfig config){
-        PredefinedStyleConfig sortedConfig = new PredefinedStyleConfig();
-        PredefinedStyle defaultStyle = config.getDefaultPredefinedStyle();
-        if (defaultStyle != null) {
-            sortedConfig.add(defaultStyle);
-            config.removeStyle(defaultStyle.getStyleName());
-            sortedConfig.setDefaultPredefinedStyle(defaultStyle.getStyleName());
-        }
-        if (priorityStyle != null && !priorityStyle.isDefaultStyle()) {
-            sortedConfig.add(priorityStyle);
-            config.removeStyle(priorityStyle.getStyleName());
-        }
-        Iterator<PredefinedStyle> iterator = config.getPredefinedStyleIterator();
-        while (iterator.hasNext()) {
-            PredefinedStyle entry = iterator.next();
-            sortedConfig.add(entry);
-        }
-        sortedConfig.setCompatibleStyleName(config.getCompatibleStyleName());
-        return sortedConfig;
-    }
-
-
-
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleSelectPane.java

@@ -1,102 +0,0 @@
-package com.fr.design.mainframe.predefined.ui;
-
-import com.fr.config.ServerPreferenceConfig;
-import com.fr.config.predefined.PredefinedStyle;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.event.ChangeListener;
-import com.fr.design.gui.icontainer.UIScrollPane;
-import com.fr.design.layout.FRGUIPaneFactory;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import java.util.Iterator;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-
-/**
- * Created by kerry on 2020-08-26
- */
-public class PredefinedStyleSelectPane extends BasicPane {
-    private PredefinedStyleBlock selectedBlock;
-    private boolean editable;
-    private JPanel contentPane;
-    private String currentApplicateStyle;
-    private ChangeListener changeListener;
-
-
-    public PredefinedStyleSelectPane(String currentApplicateStyle, boolean editable) {
-        this.editable = editable;
-        this.currentApplicateStyle = currentApplicateStyle;
-        initPane();
-    }
-
-    public void registerChangeListener(ChangeListener changeListener) {
-        this.changeListener = changeListener;
-
-    }
-
-
-    private void initPane() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        contentPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(5, 8);
-        createContentPane();
-        UIScrollPane scrollPane = new UIScrollPane(contentPane);
-        scrollPane.setPreferredSize(new Dimension(630, 480));
-        scrollPane.setBorder(BorderFactory.createEmptyBorder());
-        this.add(scrollPane, BorderLayout.CENTER);
-    }
-
-
-    public void createContentPane() {
-        contentPane.removeAll();
-        Iterator<PredefinedStyle> iterator = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig().getPredefinedStyleIterator();
-        int rowCount = (ServerPreferenceConfig.getInstance().getPreferenceStyleConfig().getPredefinedSize() +2)/ 3;
-        contentPane.setPreferredSize(new Dimension(618, 220 * rowCount));
-        while (iterator.hasNext()) {
-            PredefinedStyle tmpStyle = iterator.next();
-
-            if (tmpStyle != null) {
-                PredefinedStyleBlock tmpPanel =
-                        new PredefinedStyleBlock(tmpStyle, this, this.editable);
-                contentPane.add(tmpPanel);
-            }
-        }
-    }
-
-
-    public String getCurrentApplicateStyle() {
-        return currentApplicateStyle;
-    }
-
-    public void refreshPane() {
-        createContentPane();
-        this.validate();
-        this.repaint();
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return null;
-    }
-
-    public void setSelectedPreviewPane(PredefinedStyleBlock selectedPreviewPane) {
-        this.selectedBlock = selectedPreviewPane;
-        if (changeListener != null) {
-            changeListener.fireChanged(null);
-        }
-        this.repaint();
-    }
-
-    public PredefinedStyleBlock getSelectedPreviewPane() {
-        return selectedBlock;
-    }
-
-    public PredefinedStyle update() {
-        if (this.selectedBlock == null){
-            return null;
-        }
-        return this.selectedBlock.update();
-    }
-
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleSettingPane.java

@@ -1,159 +0,0 @@
-package com.fr.design.mainframe.predefined.ui;
-
-import com.fr.config.predefined.PredefinedNameStyleProvider;
-import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.design.gui.ibutton.UIRadioButton;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.JTemplate;
-import com.fr.design.mainframe.predefined.ui.preview.StyleSettingPreviewPane;
-import javax.swing.ButtonGroup;
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-/**
- * Created by kerry on 2020-09-02
- */
-public abstract class PredefinedStyleSettingPane<T> extends AbstractAttrNoScrollPane {
-    protected StyleSettingPreviewPane previewPane;
-    protected UIRadioButton predefinedRadioBtn;
-    private UIRadioButton customRadioBtn;
-    private JPanel customDetailPane;
-    private JPanel predefinedSettingPane;
-    private CardLayout tabbedPane;
-    private JPanel center;
-    private boolean isPopulating = false;
-
-
-    public void setPopulating(boolean populating) {
-        isPopulating = populating;
-    }
-
-    protected void initContentPane() {
-        leftContentPane = createContentPane();
-        this.add(leftContentPane, BorderLayout.CENTER);
-    }
-
-    @Override
-    protected JPanel createContentPane() {
-        JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        previewPane = createPreviewPane();
-        JPanel previewTitlePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
-        if (previewPane != null) {
-            previewTitlePane.setPreferredSize(new Dimension(407, 527));
-            previewTitlePane.add(previewPane);
-            contentPane.add(previewTitlePane, BorderLayout.WEST);
-        }
-
-        customDetailPane = createCustomDetailPane();
-        predefinedSettingPane = createPredefinedSettingPane();
-
-        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        JPanel jPanel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(10, 20, 10);
-        jPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style")));
-        predefinedRadioBtn = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Predefined"));
-        customRadioBtn = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"));
-
-        tabbedPane = new CardLayout();
-        center = new JPanel(tabbedPane);
-        center.add(predefinedSettingPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Predefined"));
-        center.add(customDetailPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"));
-        predefinedRadioBtn.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                populateCustomPane();
-                tabbedPane.show(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Predefined"));
-            }
-        });
-        customRadioBtn.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                tabbedPane.show(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"));
-            }
-        });
-        jPanel.add(predefinedRadioBtn);
-        jPanel.add(customRadioBtn);
-
-        ButtonGroup layoutBG = new ButtonGroup();
-        layoutBG.add(predefinedRadioBtn);
-        layoutBG.add(customRadioBtn);
-        centerPane.add(jPanel, BorderLayout.NORTH);
-        centerPane.add(center, BorderLayout.CENTER);
-        contentPane.add(centerPane, BorderLayout.CENTER);
-        this.addAttributeChangeListener(new AttributeChangeListener() {
-            @Override
-            public void attributeChange() {
-                if (isPopulating) {
-                    return;
-                }
-                if (previewPane != null) {
-                    previewPane.refresh();
-                }
-            }
-        });
-        return contentPane;
-    }
-
-
-    protected abstract StyleSettingPreviewPane createPreviewPane();
-
-    protected abstract JPanel createCustomDetailPane();
-
-    protected JPanel createPredefinedSettingPane() {
-        return new JPanel();
-    }
-
-    protected void populate(PredefinedNameStyleProvider nameStyle) {
-        this.predefinedRadioBtn.setSelected(nameStyle.usePredefinedStyle());
-        this.customRadioBtn.setSelected(!nameStyle.usePredefinedStyle());
-        if (nameStyle.usePredefinedStyle()) {
-            tabbedPane.show(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Predefined"));
-        } else {
-            tabbedPane.show(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"));
-        }
-
-    }
-
-    protected String getPredefinedStyleName() {
-        JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        return template.getTemplatePredefinedStyle();
-    }
-
-
-    /**
-     * 用于在切换到预定义样式后重置自定义样式的设置
-     */
-    protected abstract void populateCustomPane();
-
-
-    /**
-     * 展示数据
-     *
-     * @param ob 待展示的对象
-     */
-    public abstract void populateBean(T ob);
-
-    /**
-     * 保存数据
-     *
-     * @return 待保存的对象
-     */
-    public abstract T updateBean();
-
-    /**
-     * 保存数据
-     *
-     * @param ob 待保存的对象
-     */
-    public void updateBean(T ob) {
-
-    }
-
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/ReportPredefinedStylePane.java

@@ -1,51 +0,0 @@
-package com.fr.design.mainframe.predefined.ui;
-
-import com.fr.config.predefined.PredefinedStyle;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.JTemplate;
-
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-
-/**
- * Created by kerry on 2020-08-28
- */
-public class ReportPredefinedStylePane extends BasicPane {
-    private PredefinedStyleSelectPane selectPane;
-    private JTemplate currentTemplate;
-
-    public ReportPredefinedStylePane(JTemplate jTemplate) {
-        this.currentTemplate = jTemplate;
-        initPane();
-    }
-
-    private void initPane() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        JPanel jPanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Select"));
-        jPanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
-        JPanel subPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        this.selectPane = new PredefinedStyleSelectPane(currentTemplate.getTemplatePredefinedStyle(), false);
-        subPanel.add(this.selectPane, BorderLayout.CENTER);
-        jPanel.add(subPanel, BorderLayout.CENTER);
-        this.add(jPanel, BorderLayout.CENTER);
-    }
-
-    public void update() {
-        PredefinedStyle style = selectPane.update();
-        if (style != null) {
-//            currentTemplate.resetPredefinedStyle(style.getStyleName());
-        }
-    }
-
-    public void refresh() {
-        this.selectPane.refreshPane();
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Template_Style");
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/ServerPredefinedStylePane.java

@@ -1,218 +0,0 @@
-package com.fr.design.mainframe.predefined.ui;
-
-
-import com.fr.base.BaseUtils;
-import com.fr.config.predefined.PredefinedStyle;
-import com.fr.config.predefined.PredefinedStyleConfig;
-import com.fr.config.ServerPreferenceConfig;
-import com.fr.design.actions.UpdateAction;
-import com.fr.design.event.ChangeEvent;
-import com.fr.design.event.ChangeListener;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.mainframe.predefined.PatternStyle;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.dialog.FineJOptionPane;
-import com.fr.design.gui.itoolbar.UIToolbar;
-import com.fr.design.i18n.Toolkit;
-import com.fr.design.icon.IconPathConstants;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.predefined.ui.dialog.PredefinedStyleEditDialog;
-import com.fr.design.menu.MenuDef;
-import com.fr.design.menu.ToolBarDef;
-import com.fr.design.utils.DesignUtils;
-import com.fr.stable.StringUtils;
-import com.fr.transaction.Configurations;
-import com.fr.transaction.WorkerFacade;
-
-import javax.swing.BorderFactory;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JSeparator;
-import javax.swing.SwingUtilities;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-
-/**
- * Created by kerry on 2020-08-25
- */
-public class ServerPredefinedStylePane extends BasicPane {
-
-    private static final Color TIP_COLOR = Color.decode("#8F8F92");
-    private RemoveAction removeAction;
-
-    private PredefinedStyleSelectPane selectPane;
-
-
-    public ServerPredefinedStylePane() {
-        initPane();
-    }
-
-    private void initPane() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        JPanel jPanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Manager"));
-        jPanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
-        jPanel.setLayout(FRGUIPaneFactory.createLeftZeroLayout());
-        JPanel subPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        subPanel.add(createControlPane(), BorderLayout.NORTH);
-        PredefinedStyle style = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig().getDefaultPredefinedStyle();
-
-        this.selectPane = new PredefinedStyleSelectPane(style == null ? StringUtils.EMPTY : style.getStyleName(), true);
-        this.selectPane.registerChangeListener(new ChangeListener() {
-            @Override
-            public void fireChanged(ChangeEvent event) {
-                PredefinedStyle selectStyle = selectPane.getSelectedPreviewPane().update();
-                removeAction.setEnabled(!selectStyle.isBuiltIn());
-            }
-        });
-        this.selectPane.addMouseListener(new MouseListener() {
-            @Override
-            public void mouseClicked(MouseEvent e) {
-                if (selectPane.getSelectedPreviewPane() != null) {
-                    removeAction.setEnabled(true);
-                }
-            }
-
-            @Override
-            public void mousePressed(MouseEvent e) {
-
-            }
-
-            @Override
-            public void mouseReleased(MouseEvent e) {
-
-            }
-
-            @Override
-            public void mouseEntered(MouseEvent e) {
-
-            }
-
-            @Override
-            public void mouseExited(MouseEvent e) {
-
-            }
-        });
-        JSeparator jSeparator = new JSeparator();
-        subPanel.add(jSeparator, BorderLayout.CENTER);
-        subPanel.add(this.selectPane, BorderLayout.SOUTH);
-        jPanel.add(subPanel);
-        this.add(jPanel, BorderLayout.CENTER);
-        this.repaint();
-    }
-
-
-    private JPanel createControlPane() {
-        MenuDef addMenuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
-        addMenuDef.setIconPath(IconPathConstants.ADD_POPMENU_ICON_PATH);
-        createAddMenuDef(addMenuDef);
-        ToolBarDef toolbarDef = new ToolBarDef();
-        removeAction = new RemoveAction();
-        removeAction.setEnabled(false);
-        toolbarDef.addShortCut(addMenuDef, removeAction);
-        UIToolbar toolBar = ToolBarDef.createJToolBar();
-        toolBar.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
-        toolbarDef.updateToolBar(toolBar);
-        JPanel toolbarPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        toolbarPane.add(toolBar, BorderLayout.CENTER);
-        UILabel tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Manager_Tip"));
-        tipLabel.setForeground(TIP_COLOR);
-        tipLabel.setHorizontalTextPosition(UILabel.RIGHT);
-        toolbarPane.add(tipLabel, BorderLayout.EAST);
-        toolbarPane.setPreferredSize(new Dimension(620, 30));
-        return toolbarPane;
-    }
-
-    private void createAddMenuDef(MenuDef addMenuDef) {
-        addMenuDef.setRePaint(true);
-        addMenuDef.addShortCut(new CreateStyleAction(PatternStyle.DARK_STYLE));
-        addMenuDef.addShortCut(new CreateStyleAction(PatternStyle.LIGHT_STYLE));
-
-    }
-
-
-    public void update() {
-        PredefinedStyle style = selectPane.update();
-        if (style != null) {
-            PredefinedStyleConfig config = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig();
-            config.setDefaultPredefinedStyle(style.getStyleName());
-//            Configurations.modify(new WorkerFacade(ServerPreferenceConfig.class) {
-//                @Override
-//                public void run() {
-//                    ServerPreferenceConfig.getInstance().setPreferenceStyleConfig(config);
-//                }
-//            });
-        }
-
-    }
-
-
-    @Override
-    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Server_Style");
-    }
-
-    private class RemoveAction extends UpdateAction {
-
-        public RemoveAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
-            this.setMnemonic('R');
-            this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.TD_REMOVE_ICON_PATH));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            PredefinedStyle previewObject = ServerPredefinedStylePane.this.selectPane.update();
-            int selVal = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(ServerPredefinedStylePane.this),
-                    Toolkit.i18nText("Fine-Design_Predefined_Remove_Style_Confirm", previewObject.getStyleName()),
-                    Toolkit.i18nText("Fine-Design_Basic_Delete"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
-            if (selVal == JOptionPane.YES_OPTION) {
-                removeStyle(previewObject.getStyleName());
-                ServerPredefinedStylePane.this.selectPane.refreshPane();
-            }
-        }
-    }
-
-
-    private class CreateStyleAction extends UpdateAction {
-        private PatternStyle style;
-
-        public CreateStyleAction(PatternStyle style) {
-            this.style = style;
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Create_Parttern_Style") + style.getName());
-            this.setMnemonic('R');
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            createNewPatternStylePane();
-        }
-
-        private void createNewPatternStylePane() {
-            PredefinedStyleEditPane editPane = PredefinedStyleEditPane.createNewEditPane(selectPane);
-            PredefinedStyleEditDialog editDialog = new PredefinedStyleEditDialog(
-                    SwingUtilities.getWindowAncestor(ServerPredefinedStylePane.this), editPane);
-            PredefinedStyle predefinedStyle = style.getPredefinedStyle();
-            predefinedStyle.setStyleName(StringUtils.EMPTY);
-            editPane.populate(predefinedStyle);
-            editDialog.setVisible(true);
-        }
-    }
-
-
-    private void removeStyle(String name) {
-        PredefinedStyleConfig config = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig();
-        config.removeStyle(name);
-//        Configurations.modify(new WorkerFacade(ServerPreferenceConfig.class) {
-//            @Override
-//            public void run() {
-//                ServerPreferenceConfig.getInstance().setPreferenceStyleConfig(config);
-//            }
-//        });
-    }
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/CellStyleListControlPane.java

@@ -1,308 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail;
-
-import com.fr.base.BaseUtils;
-import com.fr.base.Style;
-import com.fr.config.predefined.PredefinedCellStyle;
-import com.fr.config.predefined.PredefinedCellStyleConfig;
-import com.fr.design.actions.UpdateAction;
-import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.dialog.FineJOptionPane;
-import com.fr.design.gui.NameInspector;
-import com.fr.design.gui.controlpane.JListControlPane;
-import com.fr.design.gui.controlpane.NameObjectCreator;
-import com.fr.design.gui.controlpane.NameableCreator;
-import com.fr.design.gui.controlpane.ShortCut4JControlPane;
-import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.design.gui.ilist.ListModelElement;
-import com.fr.design.gui.ilist.ModNameActionListener;
-import com.fr.design.gui.style.AlignmentPane;
-import com.fr.design.gui.style.FormatPane;
-import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.predefined.ui.detail.cell.CustomPredefinedStylePane;
-import com.fr.design.menu.ShortCut;
-import com.fr.general.ComparatorUtils;
-import com.fr.general.NameObject;
-import com.fr.invoke.Reflect;
-import com.fr.log.FineLoggerFactory;
-import com.fr.stable.Nameable;
-import com.fr.stable.StringUtils;
-
-import javax.swing.BorderFactory;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JSeparator;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Created by kerry on 2020-09-27
- */
-public class CellStyleListControlPane extends JListControlPane {
-    private boolean namePermitted = true;
-    private AttributeChangeListener attributeChangeListener;
-
-
-
-    public CellStyleListControlPane() {
-        super();
-        this.addModNameActionListener(new ModNameActionListener() {
-            public void nameModed(int index, String oldName, String newName) {
-                if (ComparatorUtils.equals(oldName, newName) || ComparatorUtils.equals(newName, NameInspector.ILLEGAL_NAME_HOLDER)) {
-                    return;
-                }
-                namePermitted = true;
-                String[] allNames = nameableList.getAllNames();
-                allNames[index] = StringUtils.EMPTY;
-                if (StringUtils.isEmpty(newName)) {
-                    showTipDialogAndReset(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Empty_Name"), index);
-                    return;
-                }
-                if (isNameRepeated(new List[]{Arrays.asList(allNames)}, newName)) {
-                    showTipDialogAndReset(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Duplicate_Name", newName), index);
-                    return;
-                }
-                populateSelectedValue();
-            }
-        });
-    }
-
-
-
-    public void registerAttrChangeListener(AttributeChangeListener listener){
-        this.attributeChangeListener = listener;
-    }
-
-
-    private void showTipDialogAndReset(String content, int index) {
-        nameableList.stopEditing();
-
-        FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(CellStyleListControlPane.this),
-                content,
-                Toolkit.i18nText("Fine-Design_Basic_Alert"),
-                JOptionPane.WARNING_MESSAGE);
-        setIllegalIndex(index);
-        namePermitted = false;
-    }
-
-    @Override
-    public NameableCreator[] createNameableCreators() {
-        return new NameableCreator[]{
-                new CellStyleNameObjectCreator(Toolkit.i18nText("Fine-Design_Predefined_Cell_New_Style"),
-                        PredefinedCellStyle.class, CustomPredefinedStylePaneNoBorder.class) {
-                    @Override
-                    public boolean acceptDefaultNameObject(Object ob) {
-                        return ((PredefinedCellStyle) ob).isDefaultStyle();
-                    }
-                },
-                new CellStyleNameObjectCreator(Toolkit.i18nText("Fine-Design_Predefined_Cell_New_Style"),
-                        PredefinedCellStyle.class, CustomPredefinedStylePane.class)};
-    }
-
-    @Override
-    public BasicBeanPane createPaneByCreators(NameableCreator creator) {
-        CustomPredefinedStylePane stylePane = (CustomPredefinedStylePane) super.createPaneByCreators(creator);
-        stylePane.registerAttrChangeListener(attributeChangeListener);
-        return stylePane;
-    }
-
-
-
-    @Override
-    protected String title4PopupWindow() {
-        return StringUtils.EMPTY;
-    }
-
-    protected void initComponentPane() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setCreators(this.createNameableCreators());
-        initCardPane();
-        JPanel leftPane = getLeftPane();
-        JSeparator jSeparator = new JSeparator(SwingConstants.VERTICAL);
-        leftPane.setPreferredSize(new Dimension(70, 0));
-        jSeparator.setPreferredSize(new Dimension(2, 0));
-        cardPane.setPreferredSize(new Dimension(238, 0));
-        cardPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
-        JPanel mainSplitPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        mainSplitPane.add(leftPane, BorderLayout.WEST);
-        mainSplitPane.add(jSeparator, BorderLayout.CENTER);
-        mainSplitPane.add(cardPane, BorderLayout.EAST);
-
-        this.add(mainSplitPane, BorderLayout.CENTER);
-        this.checkButtonEnabled();
-    }
-
-    protected ShortCut4JControlPane[] createShortcuts() {
-        return new ShortCut4JControlPane[]{
-                createAddItemShortCut4JControlPane(),
-                new RemoveItemShortCut4JControlPane(new RemoveItemAction())
-        };
-    }
-
-
-    private static class CustomPredefinedStylePaneNoBorder extends CustomPredefinedStylePane {
-        @Override
-        protected List<BasicPane> initPaneList() {
-            paneList = new ArrayList<BasicPane>();
-            paneList.add(new FormatPane());
-            paneList.add(new AlignmentPane());
-            return paneList;
-        }
-
-    }
-
-
-    private ShortCut4JControlPane createAddItemShortCut4JControlPane (){
-        ShortCut shortCut =  shortCutFactory.createAddItemUpdateAction(new NameableCreator[]{
-                new CellStyleNameObjectCreator(Toolkit.i18nText("Fine-Design_Predefined_Cell_New_Style"),
-                        PredefinedCellStyle.class, CustomPredefinedStylePane.class)});
-        return new AddItemShortCut4JControlPane(shortCut);
-    }
-
-    private class AddItemShortCut4JControlPane extends ShortCut4JControlPane{
-        AddItemShortCut4JControlPane(ShortCut shortCut) {
-            this.shortCut = shortCut;
-        }
-
-
-        @Override
-        public void checkEnable() {
-            this.shortCut.setEnabled(true);
-        }
-    }
-
-
-    private class RemoveItemShortCut4JControlPane extends ShortCut4JControlPane {
-        RemoveItemShortCut4JControlPane(ShortCut shortCut) {
-            this.shortCut = shortCut;
-        }
-
-        @Override
-        public void checkEnable() {
-            ListModelElement selectModel = CellStyleListControlPane.this.getSelectedValue();
-            if (selectModel != null) {
-                NameObject selectNameObject = (NameObject) selectModel.wrapper;
-                PredefinedCellStyle cellStyle = (PredefinedCellStyle) (selectNameObject.getObject());
-                this.shortCut.setEnabled(!cellStyle.isBuiltIn() && !cellStyle.isDefaultStyle());
-            } else {
-                this.shortCut.setEnabled(false);
-            }
-
-        }
-    }
-
-
-    private class RemoveItemAction extends UpdateAction {
-        RemoveItemAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText(("Fine-Design_Basic_Action_Remove")));
-            this.setMnemonic('R');
-            this.setSmallIcon(BaseUtils
-                    .readIcon("/com/fr/base/images/cell/control/remove.png"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent evt) {
-            CellStyleListControlPane.this.onRemoveItem();
-        }
-    }
-
-
-    class CellStyleNameObjectCreator extends NameObjectCreator {
-        public CellStyleNameObjectCreator(String menuName, Class clazz, Class<? extends BasicBeanPane> updatePane) {
-            super(menuName, clazz, updatePane);
-        }
-
-        public Nameable createNameable(UnrepeatedNameHelper helper) {
-            Constructor<? extends PredefinedCellStyle> constructor = null;
-            try {
-                constructor = clazzOfInitCase.getConstructor();
-                PredefinedCellStyle cellStyle = constructor.newInstance();
-
-                cellStyle.setName(menuName);
-                cellStyle.setStyle(Style.getInstance());
-                return new NameObject(helper.createUnrepeatedName(this.menuName()), cellStyle);
-
-            } catch (NoSuchMethodException e) {
-                FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            } catch (IllegalAccessException e) {
-                FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            } catch (InstantiationException e) {
-                FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            } catch (InvocationTargetException e) {
-                FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            }
-            return null;
-        }
-        /**
-         *
-         * @param ob
-         * @return
-         */
-        public Object acceptObject2Populate(Object ob) {
-            if (ob instanceof NameObject) {
-                ob = ((NameObject) ob).getObject();
-            }
-            if (clazzOfObject != null && clazzOfObject.isInstance(ob) && acceptDefaultNameObject(ob)) {
-                doSthChanged4Icon(ob);
-                return ob;
-            }
-            return null;
-        }
-
-        public boolean acceptDefaultNameObject(Object ob) {
-            return !((PredefinedCellStyle) ob).isDefaultStyle();
-        }
-    }
-
-
-    /**
-     * Populate
-     */
-    public void populateBean(PredefinedCellStyleConfig ob) {
-        if (ob == null) {
-            return;
-        }
-
-        List nameStyleList = new ArrayList();
-
-        Iterator styleNameIterator = ob.getStyleNameIterator();
-        while (styleNameIterator.hasNext()) {
-            String name = (String) styleNameIterator.next();
-            PredefinedCellStyle tmpStyle = ob.getStyle(name);
-
-            if (tmpStyle != null) {
-                nameStyleList.add(new NameObject(name, tmpStyle));
-            }
-        }
-
-        NameObject[] nameObjects = new NameObject[nameStyleList.size()];
-        nameStyleList.toArray(nameObjects);
-
-        populate(nameObjects);
-    }
-
-
-    public PredefinedCellStyleConfig updateBean() {
-        Nameable[] nameables = this.update();
-        PredefinedCellStyleConfig styleConfig = new PredefinedCellStyleConfig();
-        for (int i = 0; i < nameables.length; i++) {
-            PredefinedCellStyle tmpStyle = (PredefinedCellStyle) ((NameObject) nameables[i]).getObject();
-            tmpStyle.setName(nameables[i].getName());
-            styleConfig.addStyle(tmpStyle);
-        }
-        return styleConfig;
-    }
-
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/ChartStyleSettingPane.java

@@ -1,94 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail;
-
-import com.fr.config.predefined.PredefinedChartStyle;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.dialog.MultiTabPane;
-import com.fr.design.mainframe.predefined.ui.detail.chart.ChartAxisStylePane;
-import com.fr.design.mainframe.predefined.ui.detail.chart.ChartBackgroundStylePane;
-import com.fr.design.mainframe.predefined.ui.detail.chart.ChartDataSheetStylePane;
-import com.fr.design.mainframe.predefined.ui.detail.chart.ChartLabelStylePane;
-import com.fr.design.mainframe.predefined.ui.detail.chart.ChartLegendStylePane;
-import com.fr.design.mainframe.predefined.ui.detail.chart.ChartTitleStylePane;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Bjorn
- * @version 10.0
- * Created by Bjorn on 2020-09-16
- */
-public class ChartStyleSettingPane extends MultiTabPane<PredefinedChartStyle> {
-
-    private ChartTitleStylePane chartTitleStylePane;
-    private ChartLegendStylePane chartLegendStylePane;
-    private ChartLabelStylePane chartLabelPane;
-    private ChartAxisStylePane chartAxisStylePane;
-    private ChartDataSheetStylePane chartDataSheetStylePane;
-    private ChartBackgroundStylePane chartBackgroundStylePane;
-
-    public ChartStyleSettingPane() {
-    }
-
-    @Override
-    protected void initLayout() {
-        super.initLayout();
-    }
-
-    @Override
-    protected List<BasicPane> initPaneList() {
-        this.chartTitleStylePane = new ChartTitleStylePane();
-        this.chartLegendStylePane = new ChartLegendStylePane();
-        this.chartLabelPane = new ChartLabelStylePane();
-        this.chartAxisStylePane = new ChartAxisStylePane();
-        this.chartDataSheetStylePane = new ChartDataSheetStylePane();
-        this.chartBackgroundStylePane = new ChartBackgroundStylePane();
-        paneList = new ArrayList<>();
-        paneList.add(this.chartTitleStylePane);
-        paneList.add(this.chartLegendStylePane);
-        paneList.add(this.chartLabelPane);
-        paneList.add(this.chartAxisStylePane);
-        paneList.add(this.chartDataSheetStylePane);
-        paneList.add(this.chartBackgroundStylePane);
-        return paneList;
-    }
-
-    @Override
-    public void populateBean(PredefinedChartStyle ob) {
-        chartTitleStylePane.populate(ob);
-        chartLegendStylePane.populate(ob);
-        chartLabelPane.populate(ob);
-        chartAxisStylePane.populate(ob);
-        chartDataSheetStylePane.populate(ob);
-        chartBackgroundStylePane.populate(ob);
-    }
-
-    @Override
-    public void updateBean(PredefinedChartStyle ob) {
-
-    }
-
-
-    @Override
-    public PredefinedChartStyle updateBean() {
-        PredefinedChartStyle chartStyle = new PredefinedChartStyle();
-        chartTitleStylePane.update(chartStyle);
-        chartLegendStylePane.update(chartStyle);
-        chartLabelPane.update(chartStyle);
-        chartAxisStylePane.update(chartStyle);
-        chartDataSheetStylePane.update(chartStyle);
-        chartBackgroundStylePane.update(chartStyle);
-        return chartStyle;
-    }
-
-
-    @Override
-    public boolean accept(Object ob) {
-        return false;
-    }
-
-    @Override
-    public void reset() {
-
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/ComponentStyleSettingPane.java

@@ -1,63 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail;
-
-import com.fr.config.predefined.PredefinedComponentStyle;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.dialog.MultiTabPane;
-import com.fr.design.mainframe.predefined.ui.detail.component.ComponentFrameStylePane;
-import com.fr.design.mainframe.predefined.ui.detail.component.ComponentTitleStylePane;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by kerry on 2020-09-01
- */
-public class ComponentStyleSettingPane extends MultiTabPane<PredefinedComponentStyle> {
-    private ComponentFrameStylePane frameStylePane;
-    private ComponentTitleStylePane titleStylePane;
-
-    public ComponentStyleSettingPane() {
-    }
-
-
-    @Override
-    protected List<BasicPane> initPaneList() {
-        this.frameStylePane = new ComponentFrameStylePane();
-        this.titleStylePane = ComponentTitleStylePane.createPredefinedSettingPane();
-        paneList = new ArrayList<BasicPane>();
-        paneList.add(this.frameStylePane);
-        paneList.add(this.titleStylePane);
-        return paneList;
-    }
-
-    @Override
-    public void populateBean(PredefinedComponentStyle ob) {
-        this.frameStylePane.populate(ob);
-        this.titleStylePane.populate(ob);
-    }
-
-    @Override
-    public void updateBean(PredefinedComponentStyle ob) {
-
-    }
-
-
-    @Override
-    public PredefinedComponentStyle updateBean() {
-        PredefinedComponentStyle componentStyle = new PredefinedComponentStyle();
-        this.frameStylePane.update(componentStyle);
-        this.titleStylePane.update(componentStyle);
-        return componentStyle;
-    }
-
-
-    @Override
-    public boolean accept(Object ob) {
-        return false;
-    }
-
-    @Override
-    public void reset() {
-
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/PredefinedBackgroundSettingPane.java

@@ -1,81 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail;
-
-import com.fr.config.predefined.PredefinedBackground;
-import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.gui.ibutton.UIButtonGroup;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.predefined.ui.detail.background.BackgroundSettingPane;
-import com.fr.design.mainframe.predefined.ui.detail.background.BackgroundWithAlphaSettingPane;
-
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-/**
- * Created by kerry on 2020-08-31
- */
-public class PredefinedBackgroundSettingPane extends BasicBeanPane<PredefinedBackground> {
-    private UIButtonGroup buttonGroup;
-    private BackgroundSettingPane reportBackgroundSettingPane;
-    private BackgroundWithAlphaSettingPane formBackgroundSettingPane;
-
-
-    public PredefinedBackgroundSettingPane() {
-        initPane();
-    }
-
-    private void initPane() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        reportBackgroundSettingPane = new BackgroundSettingPane();
-        formBackgroundSettingPane = new BackgroundWithAlphaSettingPane();
-        CardLayout tabbedPane = new CardLayout();
-        JPanel center = new JPanel(tabbedPane);
-        center.add(reportBackgroundSettingPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plain_Report"));
-        center.add(formBackgroundSettingPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Decision_Report"));
-        this.buttonGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plain_Report"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Decision_Report")});
-        buttonGroup.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (buttonGroup.getSelectedIndex() == 0) {
-                    tabbedPane.show(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plain_Report"));
-                } else {
-                    tabbedPane.show(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Decision_Report"));
-                }
-            }
-        });
-
-
-        this.add(buttonGroup, BorderLayout.NORTH);
-
-        this.add(center, BorderLayout.CENTER);
-        this.buttonGroup.setSelectedIndex(0);
-    }
-
-    public boolean currentFormBackground() {
-        return buttonGroup.getSelectedIndex() == 1;
-    }
-
-    @Override
-    public void populateBean(PredefinedBackground predefinedBackground) {
-        reportBackgroundSettingPane.populateBean(predefinedBackground.getReportBackground());
-        formBackgroundSettingPane.populateBean(predefinedBackground.getFormBackground());
-    }
-
-    @Override
-    public PredefinedBackground updateBean() {
-        PredefinedBackground predefinedBackground = new PredefinedBackground();
-        predefinedBackground.setReportBackground(reportBackgroundSettingPane.updateBean());
-        predefinedBackground.setFormBackground(formBackgroundSettingPane.updateBean());
-        return predefinedBackground;
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Background_Setting");
-    }
-
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/AbstractBackgroundDetailPane.java

@@ -1,51 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.background;
-
-import com.fr.design.event.UIObserverListener;
-import com.fr.design.mainframe.backgroundpane.BackgroundQuickPane;
-import com.fr.general.Background;
-
-import javax.swing.event.ChangeListener;
-
-/**
- * Created by kerry on 2020-09-14
- */
-public abstract class AbstractBackgroundDetailPane<T extends Background> extends BackgroundQuickPane {
-    @Override
-    public boolean accept(Background background) {
-        return false;
-    }
-
-    @Override
-    public void populateBean(Background background) {
-        this.populate((T) background);
-    }
-
-    @Override
-    public Background updateBean() {
-        return this.update();
-    }
-
-    @Override
-    public String title4PopupWindow() {
-        return null;
-    }
-
-    @Override
-    public void reset() {
-
-    }
-
-    @Override
-    public void registerChangeListener(UIObserverListener listener) {
-
-    }
-
-    public abstract void populate(T background);
-
-    public abstract T update();
-
-    public void addChangeListener(ChangeListener changeListener) {
-
-    }
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/BackgroundSettingPane.java

@@ -1,135 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.background;
-
-import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.event.UIObserverListener;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.backgroundpane.BackgroundQuickPane;
-import com.fr.general.Background;
-import com.fr.log.FineLoggerFactory;
-
-import javax.swing.BorderFactory;
-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.ItemEvent;
-import java.awt.event.ItemListener;
-import java.util.ArrayList;
-
-/**
- * Created by kerry on 2020-09-02
- */
-public class BackgroundSettingPane extends BasicBeanPane<Background> {
-    private ChangeListener changeListener = null;
-    private UIComboBox headCombobox;
-    private BackgroundQuickPane[] paneList;
-
-    public BackgroundSettingPane() {
-        init();
-    }
-
-    private void init() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.add(createComboHeadPane(), BorderLayout.NORTH);
-        CardLayout cardlayout = new CardLayout();
-        paneList = supportKindsOfBackgroundUI();
-        final JPanel centerPane = new JPanel(cardlayout) {
-            @Override
-            public Dimension getPreferredSize() {// AUGUST:使用当前面板的的高度
-                int index = headCombobox.getSelectedIndex();
-                return new Dimension(super.getPreferredSize().width, paneList[index].getPreferredSize().height);
-            }
-        };
-        centerPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
-        for (BackgroundQuickPane pane : paneList) {
-            headCombobox.addItem(pane.title4PopupWindow());
-            centerPane.add(pane, pane.title4PopupWindow());
-        }
-        headCombobox.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                cardlayout.show(centerPane, (String) headCombobox.getSelectedItem());
-            }
-        });
-        this.add(centerPane, BorderLayout.CENTER);
-    }
-
-    public void addChangeListener(ChangeListener changeListener) {
-        this.changeListener = changeListener;
-    }
-
-
-    private JPanel createComboHeadPane() {
-        headCombobox = new UIComboBox();
-
-        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(
-                new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill")), headCombobox}},
-                TableLayoutHelper.FILL_NONE, 33, 5);
-        headCombobox.setPreferredSize(new Dimension(160, 20));
-        jPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
-        return jPanel;
-    }
-
-    protected BackgroundQuickPane[] supportKindsOfBackgroundUI() {
-        java.util.List<BackgroundQuickPane> kinds = new ArrayList<>();
-        kinds.add(new EmptyBackgroundPane());
-        kinds.add(new ColorDetailPane());
-        kinds.add(new TextureDetailObservePane());
-        kinds.add(new PatternDetailPane());
-        kinds.add(createImageSelectPane());
-        kinds.add(new GradientDetailPane());
-        return kinds.toArray(new BackgroundQuickPane[kinds.size()]);
-    }
-
-    protected ImageDetailPane createImageSelectPane() {
-        ImageDetailPane imageDetailPane = new ImageDetailPane();
-        imageDetailPane.registerChangeListener(new UIObserverListener() {
-            @Override
-            public void doChange() {
-                fireChangeListener();
-            }
-        });
-        return imageDetailPane;
-    }
-
-    protected void fireChangeListener() {
-        if (changeListener != null) {
-            changeListener.stateChanged(null);
-        }
-    }
-
-
-    @Override
-    public void populateBean(Background background) {
-        for (int i = 0; i < paneList.length; i++) {
-            BackgroundQuickPane pane = paneList[i];
-            if (pane.accept(background)) {
-                pane.populateBean(background);
-                headCombobox.setSelectedIndex(i);
-                return;
-            }
-        }
-    }
-
-    @Override
-    public Background updateBean() {
-        int selectIndex = this.headCombobox.getSelectedIndex();
-        try {
-            return paneList[selectIndex].updateBean();
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
-        return null;
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return null;
-    }
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/BackgroundWithAlphaSettingPane.java

@@ -1,76 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.background;
-
-import com.fr.config.predefined.BackgroundWithAlpha;
-import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.designer.IntervalConstants;
-import com.fr.design.gui.frpane.UINumberDragPane;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayoutHelper;
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.event.ChangeListener;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-
-/**
- * Created by kerry on 2020-09-04
- */
-public class BackgroundWithAlphaSettingPane extends BasicBeanPane<BackgroundWithAlpha> {
-    private BackgroundSettingPane backgroundSettingPane;
-    //透明度
-    private UINumberDragPane numberDragPane;
-
-    private double maxNumber = 100;
-
-
-    public BackgroundWithAlphaSettingPane() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        backgroundSettingPane = new FormBackgroundSettingPane();
-
-        JPanel eastpane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(2, 0);
-        this.numberDragPane = new UINumberDragPane(0, 100);
-        this.numberDragPane.setPreferredSize(new Dimension(148, 20));
-        eastpane.add(numberDragPane);
-        eastpane.add(new UILabel("%"));
-        JPanel transparencyPane = TableLayoutHelper.createGapTableLayoutPane(
-                new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha")),
-                        eastpane}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 5);
-        transparencyPane.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
-
-
-        Component[][] components = new Component[][]{
-                new Component[]{backgroundSettingPane},
-                new Component[]{transparencyPane}};
-
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_NONE, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
-        this.add(panel, BorderLayout.CENTER);
-    }
-
-
-    public void addChangeListener(ChangeListener changeListener) {
-        this.backgroundSettingPane.addChangeListener(changeListener);
-    }
-
-
-    @Override
-    public void populateBean(BackgroundWithAlpha ob) {
-        backgroundSettingPane.populateBean(ob.getBackground());
-        numberDragPane.populateBean(ob.getAlpha() * maxNumber);
-    }
-
-    @Override
-    public BackgroundWithAlpha updateBean() {
-        BackgroundWithAlpha backgroundWithAlpha = new BackgroundWithAlpha();
-        backgroundWithAlpha.setBackground(backgroundSettingPane.updateBean());
-        backgroundWithAlpha.setAlpha((float) (numberDragPane.updateBean() / maxNumber));
-        return backgroundWithAlpha;
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return null;
-    }
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/ColorDetailPane.java

@@ -1,56 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.background;
-
-import com.fr.base.background.ColorBackground;
-import com.fr.design.event.UIObserver;
-import com.fr.design.event.UIObserverListener;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.style.color.NewColorSelectPane;
-import com.fr.general.Background;
-import java.awt.BorderLayout;
-
-/**
- * Created by kerry on 2020-08-31
- */
-public class ColorDetailPane extends AbstractBackgroundDetailPane<ColorBackground> {
-    private ColorBackgroundSelectPane selectPane;
-
-
-    public ColorDetailPane() {
-        this.selectPane = new ColorBackgroundSelectPane();
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.add(this.selectPane, BorderLayout.CENTER);
-    }
-
-    @Override
-    public void populate(ColorBackground background) {
-        this.selectPane.setColor(background.getColor());
-    }
-
-    @Override
-    public ColorBackground update() {
-        return ColorBackground.getInstance(selectPane.getColor());
-    }
-
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color");
-    }
-
-    @Override
-    public boolean accept(Background background) {
-        return background instanceof ColorBackground;
-    }
-
-    class ColorBackgroundSelectPane extends NewColorSelectPane implements UIObserver {
-        protected UIObserverListener uiObserverListener;
-
-        @Override
-        public void registerChangeListener(UIObserverListener listener) {
-            this.uiObserverListener = listener;
-        }
-
-        @Override
-        public boolean shouldResponseChangeListener() {
-            return true;
-        }
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/EmptyBackgroundPane.java

@@ -1,34 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.background;
-
-import com.fr.general.Background;
-
-/**
- * Created by kerry on 2020-09-01
- */
-public class EmptyBackgroundPane extends AbstractBackgroundDetailPane {
-
-    @Override
-    public void populate(Background background) {
-
-    }
-
-    @Override
-    public Background update() {
-        return null;
-    }
-
-    /**
-     * 名称
-     *
-     * @return 名称
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Null");
-    }
-
-    public boolean accept(Background background) {
-        return background == null;
-    }
-
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/FormBackgroundSettingPane.java

@@ -1,48 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.background;
-
-import com.fr.design.ExtraDesignClassManager;
-import com.fr.design.event.UIObserverListener;
-import com.fr.design.fun.BackgroundQuickUIProvider;
-import com.fr.design.mainframe.backgroundpane.BackgroundQuickPane;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Created by kerry on 2020-09-14
- */
-public class FormBackgroundSettingPane extends BackgroundSettingPane {
-
-    public FormBackgroundSettingPane() {
-        super();
-    }
-
-    @Override
-    protected BackgroundQuickPane[] supportKindsOfBackgroundUI() {
-        ColorDetailPane colorDetailPane = new ColorDetailPane();
-        ImageDetailPane imageDetailPane = createImageSelectPane();
-        GradientDetailPane gradientPane = new GradientDetailPane();
-        //hugh:表单支持背景接口
-        List<BackgroundQuickPane> kinds = new ArrayList<BackgroundQuickPane>();
-
-        kinds.add(new EmptyBackgroundPane());
-        kinds.add(colorDetailPane);
-        kinds.add(imageDetailPane);
-        kinds.add(gradientPane);
-
-        Set<BackgroundQuickUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(BackgroundQuickUIProvider.MARK_STRING);
-        for (BackgroundQuickUIProvider provider : providers) {
-            BackgroundQuickPane newTypePane = provider.appearanceForBackground();
-            newTypePane.registerChangeListener(new UIObserverListener() {
-                @Override
-                public void doChange() {
-                    fireChangeListener();
-                }
-            });
-            kinds.add(newTypePane);
-        }
-
-        return kinds.toArray(new BackgroundQuickPane[kinds.size()]);
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/GradientDetailPane.java

@@ -1,159 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.background;
-
-import com.fr.base.background.GradientBackground;
-import com.fr.design.designer.IntervalConstants;
-import com.fr.design.event.UIObserver;
-import com.fr.design.event.UIObserverListener;
-import com.fr.design.gui.ibutton.UIRadioButton;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.style.background.gradient.GradientBar;
-import com.fr.general.Background;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-/**
- * 渐变色的面板，不是很pp，面板应用显得繁琐，有写可以写成控件类型，比如色彩选择的。。，可以做得花哨点
- *
- * @author ben
- */
-public class GradientDetailPane extends AbstractBackgroundDetailPane<GradientBackground> implements UIObserver {
-    private static final long serialVersionUID = -6854603990673031897L;
-    private UIObserverListener listener;
-    private UIRadioButton left2right, top2bottom;
-    private GradientBar gradientBar;
-    private ChangeListener changeListener = null;
-
-    public GradientDetailPane() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-
-        JPanel gradientPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        JPanel blankJp = new JPanel();
-        gradientBar = new GradientBar(4, 140);
-        blankJp.add(gradientBar);
-
-        gradientPanel.add(gradientBar, BorderLayout.SOUTH);
-
-        JPanel jp = new JPanel(new GridLayout(2, 1, 15, 10));
-
-
-        left2right = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Horizontal"));
-        jp.add(left2right);
-        left2right.setSelected(true);
-        left2right.addActionListener(reviewListener);
-
-        top2bottom = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Vertical"));
-        jp.add(top2bottom);
-        top2bottom.addActionListener(reviewListener);
-
-        ButtonGroup toggle = new ButtonGroup();
-        toggle.add(left2right);
-        toggle.add(top2bottom);
-
-        Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Setting")), gradientPanel},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Color")), jp}
-        };
-        JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN,
-                IntervalConstants.INTERVAL_W4, IntervalConstants.INTERVAL_L1);
-        this.addChangeListener(new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                if (listener != null) {
-                    listener.doChange();
-                }
-            }
-        });
-
-
-        this.add(contentPane);
-    }
-
-    @Override
-    public boolean accept(Background background) {
-        return background instanceof GradientBackground;
-    }
-
-
-
-    public void populate(GradientBackground bg) {
-        this.gradientBar.getSelectColorPointBtnP1().setColorInner(bg.getStartColor());
-        this.gradientBar.getSelectColorPointBtnP2().setColorInner(bg.getEndColor());
-        if (bg.getDirection() == GradientBackground.LEFT2RIGHT) {
-            left2right.setSelected(true);
-        } else {
-            top2bottom.setSelected(true);
-        }
-        if (bg.isUseCell()) {
-            return;
-        }
-        double startValue = (double) bg.getBeginPlace();
-        double endValue = (double) bg.getFinishPlace();
-        gradientBar.setStartValue(startValue);
-        gradientBar.setEndValue(endValue);
-        this.gradientBar.repaint();
-    }
-
-    public GradientBackground update() {
-        GradientBackground gb = new GradientBackground(
-                gradientBar.getSelectColorPointBtnP1().getColorInner(),
-                gradientBar.getSelectColorPointBtnP2().getColorInner());
-        if (left2right.isSelected()) {
-            gb.setDirection(GradientBackground.LEFT2RIGHT);
-        } else {
-            gb.setDirection(GradientBackground.TOP2BOTTOM);
-        }
-        if (gradientBar.isOriginalPlace()) {
-            gb.setUseCell(true);
-        } else {
-            gb.setUseCell(false);
-            gb.setBeginPlace((float) gradientBar.getStartValue());
-            gb.setFinishPlace((float) gradientBar.getEndValue());
-        }
-        return gb;
-    }
-
-
-    ActionListener reviewListener = new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-            fireChagneListener();
-        }
-    };
-
-    public void addChangeListener(ChangeListener changeListener) {
-        this.changeListener = changeListener;
-        gradientBar.addChangeListener(changeListener);
-    }
-
-    public void fireChagneListener() {
-        if (this.changeListener != null) {
-            ChangeEvent evt = new ChangeEvent(this);
-            this.changeListener.stateChanged(evt);
-        }
-    }
-
-    @Override
-    public void registerChangeListener(UIObserverListener listener) {
-        this.listener = listener;
-    }
-
-    @Override
-    public boolean shouldResponseChangeListener() {
-        return true;
-    }
-
-    @Override
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color");
-    }
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/ImageDetailPane.java

@@ -1,215 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.background;
-
-import com.fr.base.Style;
-import com.fr.base.background.ImageBackground;
-import com.fr.base.background.ImageFileBackground;
-import com.fr.design.designer.IntervalConstants;
-import com.fr.design.event.UIObserver;
-import com.fr.design.event.UIObserverListener;
-import com.fr.design.gui.frpane.ImgChooseWrapper;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.ibutton.UIRadioButton;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.style.background.image.ImageFileChooser;
-import com.fr.design.style.background.image.ImagePreviewPane;
-import com.fr.general.Background;
-import com.fr.stable.Constants;
-
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-/**
- * Image background pane.
- */
-public class ImageDetailPane extends AbstractBackgroundDetailPane<ImageBackground> implements UIObserver {
-    private UIObserverListener listener;
-    protected ImagePreviewPane previewPane = null;
-    private Style imageStyle = null;
-    private ChangeListener changeListener = null;
-    private ImageFileChooser imageFileChooser = null;
-
-    private UIRadioButton defaultRadioButton = null;
-    private UIRadioButton tiledRadioButton = null;
-    private UIRadioButton extendRadioButton = null;
-    private UIRadioButton adjustRadioButton = null;
-
-
-    public ImageDetailPane() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.add(initSelectFilePane(), BorderLayout.CENTER);
-        imageFileChooser = new ImageFileChooser();
-        imageFileChooser.setMultiSelectionEnabled(false);
-        previewPane = new ImagePreviewPane();
-        this.addChangeListener(new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                if (listener != null) {
-                    listener.doChange();
-                }
-            }
-        });
-    }
-
-    public JPanel initSelectFilePane() {
-        JPanel selectFilePane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        selectFilePane.setBorder(BorderFactory.createEmptyBorder());
-        UIButton selectPictureButton = new UIButton(
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Select"));
-        selectPictureButton.setMnemonic('S');
-        selectPictureButton.addActionListener(selectPictureActionListener);
-        selectPictureButton.setPreferredSize(new Dimension(160, 20));
-        //布局
-        defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Default"));
-        tiledRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Titled"));
-        extendRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Extend"));
-        adjustRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Adjust"));
-
-        defaultRadioButton.addActionListener(layoutActionListener);
-        tiledRadioButton.addActionListener(layoutActionListener);
-        extendRadioButton.addActionListener(layoutActionListener);
-        adjustRadioButton.addActionListener(layoutActionListener);
-
-        JPanel jp = new JPanel(new GridLayout(4, 1, 15, 10));
-        for (UIRadioButton button : imageLayoutButtons()) {
-            jp.add(button);
-        }
-
-        ButtonGroup layoutBG = new ButtonGroup();
-        layoutBG.add(defaultRadioButton);
-        layoutBG.add(tiledRadioButton);
-        layoutBG.add(extendRadioButton);
-        layoutBG.add(adjustRadioButton);
-
-        defaultRadioButton.setSelected(true);
-
-        Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image")), selectPictureButton},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Fill_Mode")), jp}
-        };
-        JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_NONE,
-                IntervalConstants.INTERVAL_L4, IntervalConstants.INTERVAL_L1);
-        selectFilePane.add(centerPane, BorderLayout.CENTER);
-        return selectFilePane;
-    }
-
-    protected UIRadioButton[] imageLayoutButtons() {
-        return new UIRadioButton[]{
-                defaultRadioButton,
-                tiledRadioButton,
-                extendRadioButton,
-                adjustRadioButton
-        };
-    }
-
-    @Override
-    public boolean accept(Background background) {
-        return background instanceof ImageBackground;
-    }
-
-
-    /**
-     * Select picture.
-     */
-    ActionListener selectPictureActionListener = new ActionListener() {
-
-        public void actionPerformed(ActionEvent evt) {
-            int returnVal = imageFileChooser.showOpenDialog(ImageDetailPane.this);
-            setImageStyle();
-            ImgChooseWrapper.getInstance(previewPane, imageFileChooser, imageStyle, changeListener).dealWithImageFile(returnVal);
-        }
-    };
-
-    protected void setImageStyle() {
-        if (tiledRadioButton.isSelected()) {
-            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_TILED);
-        } else if (adjustRadioButton.isSelected()) {
-            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_ADJUST);
-        } else if (extendRadioButton.isSelected()) {
-            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_EXTEND);
-        } else {
-            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_CENTER);
-        }
-    }
-
-    ActionListener layoutActionListener = new ActionListener() {
-
-        @Override
-        public void actionPerformed(ActionEvent evt) {
-            setImageStyle();
-            changeImageStyle();
-        }
-
-        private void changeImageStyle() {
-            previewPane.setImageStyle(ImageDetailPane.this.imageStyle);
-            previewPane.repaint();
-        }
-    };
-
-    @Override
-    public void populate(ImageBackground imageBackground) {
-        if (imageBackground.getLayout() == Constants.IMAGE_CENTER) {
-            defaultRadioButton.setSelected(true);
-            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_CENTER);
-        } else if (imageBackground.getLayout() == Constants.IMAGE_EXTEND) {
-            extendRadioButton.setSelected(true);
-            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_EXTEND);
-        } else if (imageBackground.getLayout() == Constants.IMAGE_ADJUST) {
-            adjustRadioButton.setSelected(true);
-            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_ADJUST);
-        } else {
-            tiledRadioButton.setSelected(true);
-            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_TILED);
-        }
-        previewPane.setImageStyle(ImageDetailPane.this.imageStyle);
-        if (imageBackground.getImage() != null) {
-            previewPane.setImageWithSuffix(imageBackground.getImageWithSuffix());
-            previewPane.setImage(imageBackground.getImage());
-        }
-
-        fireChagneListener();
-    }
-
-    @Override
-    public ImageBackground update() {
-        ImageBackground imageBackground = new ImageFileBackground(previewPane.getImageWithSuffix());
-        setImageStyle();
-        imageBackground.setLayout(imageStyle.getImageLayout());
-        return imageBackground;
-    }
-
-    @Override
-    public void addChangeListener(ChangeListener changeListener) {
-        this.changeListener = changeListener;
-    }
-
-    private void fireChagneListener() {
-        if (this.changeListener != null) {
-            ChangeEvent evt = new ChangeEvent(this);
-            this.changeListener.stateChanged(evt);
-        }
-    }
-
-    @Override
-    public void registerChangeListener(UIObserverListener listener) {
-        this.listener = listener;
-    }
-
-
-    @Override
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image");
-    }
-
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/PatternDetailPane.java

@@ -1,119 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.background;
-
-import com.fr.base.background.PatternBackground;
-import com.fr.design.designer.IntervalConstants;
-import com.fr.design.event.UIObserver;
-import com.fr.design.event.UIObserverListener;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.style.background.impl.PatternBackgroundPane;
-import com.fr.design.style.color.ColorSelectBox;
-import com.fr.general.Background;
-import com.fr.log.FineLoggerFactory;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.GridLayout;
-import java.awt.LayoutManager;
-
-/**
- * Created by kerry on 2020-08-31
- */
-public class PatternDetailPane extends AbstractBackgroundDetailPane<PatternBackground> implements UIObserver {
-
-    private UIObserverListener listener;
-    private PatternNewBackgroundPane patternNewBackgroundPane;
-
-    public PatternDetailPane() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        patternNewBackgroundPane = new PatternNewBackgroundPane(6);
-        this.add(patternNewBackgroundPane, BorderLayout.CENTER);
-    }
-
-    @Override
-    public void registerChangeListener(UIObserverListener listener) {
-        this.listener = listener;
-    }
-
-    @Override
-    public void populate(PatternBackground background) {
-        this.patternNewBackgroundPane.populate(background);
-    }
-
-    @Override
-    public PatternBackground update() {
-        try {
-            return (PatternBackground) this.patternNewBackgroundPane.update();
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
-        return null;
-    }
-    @Override
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern");
-    }
-
-
-    @Override
-    public boolean accept(Background background) {
-        return background instanceof PatternBackground;
-    }
-
-
-    @Override
-    public boolean shouldResponseChangeListener() {
-        return true;
-    }
-
-    class PatternNewBackgroundPane extends PatternBackgroundPane {
-        private PatternNewBackgroundPane(int nColumn) {
-            super(nColumn);
-        }
-
-        protected LayoutManager layoutOfTypePane(int nColumn) {
-            return new GridLayout(0, nColumn, 2, 2);
-        }
-
-        protected void initComponents(int nColumn) {
-            this.setLayout(FRGUIPaneFactory.createBorderLayout());
-            this.setBorder(BorderFactory.createEmptyBorder());
-            JPanel jPanel = new JPanel();
-            jPanel.setLayout(layoutOfTypePane(nColumn));
-            setChildrenOfTypePane(jPanel);
-
-            foregroundColorPane = new ColorSelectBox(80);
-            backgroundColorPane = new ColorSelectBox(80);
-            foregroundColorPane.setSelectObject(Color.lightGray);
-            backgroundColorPane.setSelectObject(Color.black);
-            UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern"));
-            label.setVerticalAlignment(SwingConstants.TOP);
-            Component[][] components = new Component[][]{
-                    new Component[]{label, jPanel},
-                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_ForeBackground_Color")), foregroundColorPane},
-                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern_Color")), backgroundColorPane}
-            };
-            JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN,
-                    IntervalConstants.INTERVAL_W4, IntervalConstants.INTERVAL_L1);
-            JPanel jPanel1 = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-            jPanel1.add(centerPane);
-            jPanel1.setBorder(BorderFactory.createEmptyBorder());
-            this.add(jPanel1, BorderLayout.NORTH);
-            this.addChangeListener(new ChangeListener() {
-                @Override
-                public void stateChanged(ChangeEvent e) {
-                    if (listener != null) {
-                        listener.doChange();
-                    }
-                }
-            });
-        }
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/TextureDetailObservePane.java

@@ -1,97 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.background;
-
-import com.fr.base.background.TextureBackground;
-import com.fr.design.event.UIObserver;
-import com.fr.design.event.UIObserverListener;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.style.background.texture.TextureDetailPane;
-import com.fr.general.Background;
-import com.fr.log.FineLoggerFactory;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-
-/**
- * Created by kerry on 2020-09-02
- */
-public class TextureDetailObservePane extends AbstractBackgroundDetailPane<TextureBackground> implements UIObserver {
-    private TextureDetailPane detailPane;
-
-    private UIObserverListener listener;
-
-    public TextureDetailObservePane() {
-
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        detailPane = TextureDetailPane.createMiniTextureDetailPane(6);
-
-        detailPane.setPreferredSize(new Dimension(160, 108));
-        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture"));
-        label.setPreferredSize(new Dimension(24, 108));
-        label.setVerticalAlignment(SwingConstants.TOP);
-        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(
-                new Component[][]{new Component[]{label, detailPane}}, TableLayoutHelper.FILL_LASTCOLUMN, 33, 5);
-        jPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 10));
-
-
-        detailPane.addChangeListener(new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                if (listener != null) {
-                    listener.doChange();
-                }
-            }
-        });
-        this.add(jPanel, BorderLayout.CENTER);
-    }
-
-    @Override
-    public void registerChangeListener(UIObserverListener listener) {
-        this.listener = listener;
-
-    }
-
-    @Override
-    public boolean shouldResponseChangeListener() {
-        return true;
-    }
-
-    @Override
-    public void populate(TextureBackground background) {
-        this.detailPane.populate(background);
-    }
-
-    @Override
-    public TextureBackground update() {
-        try {
-            return (TextureBackground) this.detailPane.update();
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
-        return null;
-    }
-
-
-    @Override
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
-    }
-
-    @Override
-    public boolean accept(Background background) {
-        return background instanceof TextureBackground;
-    }
-
-
-    @Override
-    public void addChangeListener(ChangeListener changeListener) {
-
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/cell/CustomPredefinedStylePane.java

@@ -1,223 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.cell;
-
-import com.fr.base.ScreenResolution;
-import com.fr.base.Style;
-import com.fr.config.predefined.PredefinedCellStyle;
-import com.fr.design.constants.UIConstants;
-import com.fr.design.dialog.AttrScrollPane;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.dialog.BasicScrollPane;
-import com.fr.design.dialog.MultiTabPane;
-import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.design.gui.style.AbstractBasicStylePane;
-import com.fr.design.gui.style.AlignmentPane;
-import com.fr.design.gui.style.BorderPane;
-import com.fr.design.gui.style.FormatPane;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.utils.gui.GUICoreUtils;
-
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GridLayout;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 哎，复杂的原型图导致复杂的画法。非我所愿也
- *
- * @author zhou
- * @since 2012-5-24上午10:36:10
- */
-public class CustomPredefinedStylePane extends MultiTabPane<PredefinedCellStyle> {
-    private PredefinedCellStyle cellStyle;
-    private PreviewArea previewArea;
-    private boolean populating;
-    private AttributeChangeListener attributeChangeListener;
-
-
-    public CustomPredefinedStylePane() {
-        super();
-        tabPane.setOneLineTab(true);
-        tabPane.setDrawLine(false);
-        tabPane.setBorder(BorderFactory.createLineBorder(UIConstants.SHADOW_GREY));
-        tabPane.setLayout(new GridLayout(1, 3, 0, 0));
-    }
-
-    public void registerAttrChangeListener(AttributeChangeListener listener){
-        this.attributeChangeListener = listener;
-    }
-
-    private void fireAttrChangeListener() {
-        if (this.attributeChangeListener != null) {
-            this.attributeChangeListener.attributeChange();
-        }
-    }
-
-    /**
-     * @return
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Style");
-    }
-
-
-    /**
-     *
-     */
-    public void reset() {
-        populateBean(null);
-    }
-
-    @Override
-    /**
-     *
-     */
-    public void populateBean(PredefinedCellStyle ob) {
-        this.populating = true;
-        this.cellStyle = ob;
-        for (int i = 0; i < paneList.size(); i++) {
-            ((AbstractBasicStylePane) paneList.get(i)).populateBean(ob.getStyle());
-            previewArea.preview(ob.getStyle());
-        }
-        this.populating = false;
-    }
-
-    @Override
-    /**
-     *
-     */
-    public PredefinedCellStyle updateBean() {
-        AbstractBasicStylePane basicStylePane = (AbstractBasicStylePane) paneList.get(tabPane.getSelectedIndex());
-        this.cellStyle.setStyle(basicStylePane.update(this.cellStyle.getStyle()));
-        return this.cellStyle;
-    }
-
-
-    /**
-     * @param ob
-     * @return
-     */
-    public boolean accept(Object ob) {
-        return ob instanceof PredefinedCellStyle;
-    }
-
-    @Override
-    protected List<BasicPane> initPaneList() {
-        paneList = new ArrayList<BasicPane>();
-        paneList.add(new FormatPane());
-        paneList.add(new BorderPane());
-        paneList.add(new AlignmentPane());
-        return paneList;
-    }
-
-    protected void initLayout() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-
-        JPanel jPanel = new JPanel();
-        jPanel.setLayout(new BorderLayout(0, 4));
-
-        JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        previewArea = new PreviewArea();
-        previewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"), null));
-        previewPane.add(previewArea, BorderLayout.CENTER);
-
-        this.add(previewPane, BorderLayout.NORTH);
-
-        this.add(jPanel, BorderLayout.CENTER);
-        jPanel.add(tabPane, BorderLayout.NORTH);
-        JPanel attrListenerPane = new AbstractAttrNoScrollPane() {
-
-            @Override
-            protected void initContentPane() {
-                leftContentPane = createContentPane();
-                this.add(leftContentPane, BorderLayout.CENTER);
-            }
-
-            @Override
-            protected JPanel createContentPane() {
-                this.addAttributeChangeListener(new AttributeChangeListener() {
-                    @Override
-                    public void attributeChange() {
-                        if (populating) {
-                            return;
-                        }
-                        PredefinedCellStyle cellStyle = updateBean();
-                        if (cellStyle != null) {
-                            previewArea.preview(cellStyle.getStyle());
-                        }
-                        fireAttrChangeListener();
-                    }
-                });
-                BasicScrollPane basicScrollPane = new AttrScrollPane() {
-                    @Override
-                    protected JPanel createContentPane() {
-                        return centerPane;
-                    }
-                };
-                return basicScrollPane;
-            }
-        };
-        jPanel.add(attrListenerPane, BorderLayout.CENTER);
-    }
-
-    @Override
-    /**
-     *
-     */
-    public void updateBean(PredefinedCellStyle ob) {
-        return;
-    }
-
-
-
-
-    /**
-     * 预览Style的面板
-     *
-     * @author richer
-     */
-    private static class PreviewArea extends JComponent {
-
-        private String paintText = "Report";
-        private Style style = Style.DEFAULT_STYLE;
-
-        public PreviewArea() {
-            setPreferredSize(new Dimension(40, 30));
-        }
-
-        public void preview(Style style) {
-            this.style = style;
-            repaint();
-        }
-
-        @Override
-        public void paintComponent(Graphics g) {
-            Graphics2D g2d = (Graphics2D) g;
-            int resolution = ScreenResolution.getScreenResolution();
-
-            if (style == Style.DEFAULT_STYLE) {
-                // 如果是默认的style,就只写"Report"上去
-                Style.paintContent(g2d, paintText, style, getWidth() - 3, getHeight() - 3, resolution);
-                return;
-            }
-
-            Style.paintBackground(g2d, style, getWidth() - 3, getHeight() - 3);
-
-            Style.paintContent(g2d, paintText, style, getWidth() - 3, getHeight() - 3, resolution);
-
-            Style.paintBorder(g2d, style, getWidth() - 3, getHeight() - 3);
-        }
-
-        @Override
-        public Dimension getMinimumSize() {
-            return getPreferredSize();
-        }
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/AbstractChartStylePane.java

@@ -1,49 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.chart;
-
-import com.fr.config.predefined.PredefinedChartStyle;
-import com.fr.design.constants.LayoutConstants;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.gui.icontainer.UIScrollPane;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Component;
-
-/**
- * @author Bjorn
- * @version 10.0
- * Created by Bjorn on 2020-09-17
- */
-public abstract class AbstractChartStylePane extends BasicPane {
-
-    public AbstractChartStylePane() {
-        initComponents();
-        initPane();
-    }
-
-    protected abstract void initComponents();
-
-    protected void initPane() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        double e = 155;
-        double p = TableLayout.PREFERRED;
-        double[] columnSize = {p, e};
-        JPanel gapTableLayoutPane = TableLayoutHelper.createGapTableLayoutPane(getComponent(), getRows(p), columnSize, 20, LayoutConstants.VGAP_LARGE);
-        gapTableLayoutPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
-        UIScrollPane rightTopPane = new UIScrollPane(gapTableLayoutPane);
-        rightTopPane.setBorder(BorderFactory.createEmptyBorder());
-        this.add(rightTopPane, BorderLayout.CENTER);
-    }
-
-    protected abstract Component[][] getComponent();
-
-    protected abstract double[] getRows(double p);
-
-    public abstract void populate(PredefinedChartStyle chartStyle);
-
-    public abstract void update(PredefinedChartStyle chartStyle);
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartAxisStylePane.java

@@ -1,69 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.chart;
-
-import com.fr.config.predefined.PredefinedChartStyle;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.i18n.Toolkit;
-import com.fr.design.style.color.ColorSelectBox;
-
-import java.awt.Component;
-
-/**
- * @author Bjorn
- * @version 10.0
- * Created by Bjorn on 2020-09-16
- */
-public class ChartAxisStylePane extends AbstractChartStylePane {
-
-    //轴标题字体样式
-    private ChartFontPane titleFontPane;
-
-    //轴标签字体样式
-    private ChartFontPane labelFontPane;
-
-    //轴线颜色
-    private ColorSelectBox axisLineColor;
-
-    protected void initComponents() {
-        titleFontPane = new ChartFontPane() {
-            public String getUILabelText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Axis_Title_Character");
-            }
-        };
-        labelFontPane = new ChartFontPane() {
-            public String getUILabelText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Character");
-            }
-        };
-        axisLineColor = new ColorSelectBox(100);
-    }
-
-    protected Component[][] getComponent() {
-        return new Component[][]{
-                new Component[]{titleFontPane, null},
-                new Component[]{labelFontPane, null},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Axis_Line_Color")), axisLineColor}
-        };
-    }
-
-    protected double[] getRows(double p) {
-        return new double[]{p, p, p};
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis");
-    }
-
-    public void populate(PredefinedChartStyle chartStyle) {
-        titleFontPane.populate(chartStyle.getAxisTitleFont());
-        labelFontPane.populate(chartStyle.getAxisLabelFont());
-        axisLineColor.setSelectObject(chartStyle.getAxisLineColor());
-    }
-
-
-    public void update(PredefinedChartStyle chartStyle) {
-        chartStyle.setAxisTitleFont(titleFontPane.update());
-        chartStyle.setAxisLabelFont(labelFontPane.update());
-        chartStyle.setAxisLineColor(axisLineColor.getSelectObject());
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartBackgroundStylePane.java

@@ -1,113 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.chart;
-
-import com.fr.base.background.ImageBackground;
-import com.fr.config.predefined.PredefinedChartStyle;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.i18n.Toolkit;
-import com.fr.design.mainframe.backgroundpane.BackgroundQuickPane;
-import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane;
-import com.fr.design.mainframe.backgroundpane.ImageBackgroundQuickPane;
-import com.fr.design.mainframe.backgroundpane.NullBackgroundQuickPane;
-import com.fr.design.mainframe.backgroundpane.VanChartGradientPane;
-import com.fr.design.style.color.ColorSelectBox;
-import com.fr.general.Background;
-import com.fr.stable.Constants;
-
-import javax.swing.JPanel;
-import java.util.ArrayList;
-import java.util.List;
-import java.awt.CardLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-
-/**
- * @author Bjorn
- * @version 10.0
- * Created by Bjorn on 2020-09-17
- */
-public class ChartBackgroundStylePane extends AbstractChartStylePane {
-
-    private UIComboBox typeComboBox;
-    private List<BackgroundQuickPane> paneList;
-    private JPanel centerPane;
-    //网格线颜色
-    private ColorSelectBox mainGridColor;
-
-    protected void initComponents() {
-        mainGridColor = new ColorSelectBox(100);
-
-        typeComboBox = new UIComboBox();
-        final CardLayout cardlayout = new CardLayout();
-        initList();
-
-        centerPane = new JPanel(cardlayout) {
-            @Override
-            public Dimension getPreferredSize() {// AUGUST:使用当前面板的的高度
-                int index = typeComboBox.getSelectedIndex();
-                return new Dimension(super.getPreferredSize().width, paneList.get(index).getPreferredSize().height);
-            }
-        };
-        for (int i = 0; i < paneList.size(); i++) {
-            BackgroundQuickPane pane = paneList.get(i);
-            typeComboBox.addItem(pane.title4PopupWindow());
-            centerPane.add(pane, pane.title4PopupWindow());
-        }
-
-        typeComboBox.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                cardlayout.show(centerPane, (String) typeComboBox.getSelectedItem());
-            }
-        });
-    }
-
-    protected Component[][] getComponent() {
-        return new Component[][]{
-                new Component[]{null, null},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Area_Background_Color")), typeComboBox},
-                new Component[]{null, centerPane},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Grid_Line_Color")), mainGridColor}
-        };
-    }
-
-    protected double[] getRows(double p) {
-        return new double[]{p, p, p, p};
-    }
-
-    private void initList() {
-        paneList = new ArrayList<>();
-        paneList.add(new NullBackgroundQuickPane());
-        paneList.add(new ColorBackgroundQuickPane());
-        paneList.add(new ImageBackgroundQuickPane(false));
-        paneList.add(new VanChartGradientPane());
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background");
-    }
-
-    public void populate(PredefinedChartStyle chartStyle) {
-        Background background = chartStyle.getChartBackground();
-        for (int i = 0; i < paneList.size(); i++) {
-            BackgroundQuickPane pane = paneList.get(i);
-            if (pane.accept(background)) {
-                pane.populateBean(background);
-                typeComboBox.setSelectedIndex(i);
-                break;
-            }
-        }
-        mainGridColor.setSelectObject(chartStyle.getGridMainLineColor());
-    }
-
-    public void update(PredefinedChartStyle chartStyle) {
-        chartStyle.setChartBackground(paneList.get(typeComboBox.getSelectedIndex()).updateBean());
-        if (chartStyle.getChartBackground() instanceof ImageBackground) {
-            ((ImageBackground) chartStyle.getChartBackground()).setLayout(Constants.IMAGE_EXTEND);
-        }
-        chartStyle.setGridMainLineColor(mainGridColor.getSelectObject());
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartDataSheetStylePane.java

@@ -1,58 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.chart;
-
-import com.fr.config.predefined.PredefinedChartStyle;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.i18n.Toolkit;
-import com.fr.design.style.color.ColorSelectBox;
-
-import java.awt.Component;
-
-/**
- * @author Bjorn
- * @version 10.0
- * Created by Bjorn on 2020-09-17
- */
-public class ChartDataSheetStylePane extends AbstractChartStylePane {
-
-    //字体样式
-    private ChartFontPane fontPane;
-
-    //边框颜色
-    private ColorSelectBox borderColor;
-
-    protected void initComponents() {
-        fontPane = new ChartFontPane() {
-            public String getUILabelText() {
-                return Toolkit.i18nText("Fine-Design_Chart_DataSheet_Character");
-            }
-        };
-        borderColor = new ColorSelectBox(100);
-    }
-
-    protected Component[][] getComponent() {
-        return new Component[][]{
-                new Component[]{fontPane, null},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Border_Color")), borderColor}
-        };
-    }
-
-    protected double[] getRows(double p) {
-        return new double[]{p, p, p};
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet");
-    }
-
-    public void populate(PredefinedChartStyle chartStyle) {
-        fontPane.populate(chartStyle.getDataSheetFont());
-        borderColor.setSelectObject(chartStyle.getDataSheetBorderColor());
-    }
-
-
-    public void update(PredefinedChartStyle chartStyle) {
-        chartStyle.setDataSheetFont(fontPane.update());
-        chartStyle.setDataSheetBorderColor(borderColor.getSelectObject());
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartFontPane.java

@@ -1,160 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.chart;
-
-import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
-import com.fr.base.Utils;
-import com.fr.design.constants.LayoutConstants;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.event.UIObserverListener;
-import com.fr.design.gui.ibutton.UIColorButton;
-import com.fr.design.gui.ibutton.UIToggleButton;
-import com.fr.design.gui.icombobox.UIComboBox;
-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.utils.gui.GUICoreUtils;
-import com.fr.general.FRFont;
-import com.fr.general.GeneralUtils;
-
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.FlowLayout;
-import java.awt.Font;
-
-/**
- * @author Bjorn
- * @version 10.0
- * Created by Bjorn on 2020-09-16
- */
-public class ChartFontPane extends BasicPane {
-
-    public static final int FONT_START = 6;
-    public static final int FONT_END = 72;
-    private UIComboBox fontNameComboBox;
-    private UIComboBox fontSizeComboBox;
-    private UIToggleButton bold;
-    private UIToggleButton italic;
-    private UIColorButton fontColor;
-    private static Integer[] FONT_SIZES = new Integer[FONT_END - FONT_START + 1];
-
-    static {
-        for (int i = FONT_START; i <= FONT_END; i++) {
-            FONT_SIZES[i - FONT_START] = i;
-        }
-    }
-
-    public ChartFontPane() {
-        initState();
-        initComponents();
-    }
-
-    private void initState() {
-        fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
-        fontSizeComboBox = new UIComboBox(FONT_SIZES);
-        bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
-        italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
-        fontColor = new UIColorButton();
-    }
-
-    protected void initComponents() {
-        Component[] components = new Component[]{
-                fontColor, italic, bold
-        };
-        JPanel buttonPane = new JPanel(new BorderLayout());
-        buttonPane.add(fontSizeComboBox, BorderLayout.CENTER);
-        buttonPane.add(GUICoreUtils.createFlowPane(components, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.EAST);
-
-        this.setLayout(new BorderLayout());
-        this.add(getContentPane(buttonPane), BorderLayout.CENTER);
-
-        populate(FRContext.getDefaultValues().getFRFont());
-    }
-
-    protected JPanel getContentPane(JPanel buttonPane) {
-        double e = 155;
-        double p = TableLayout.PREFERRED;
-        double[] rows = {p, p, p};
-        double[] columnSize = {p, e};
-        UILabel text = new UILabel(getUILabelText(), SwingConstants.LEFT);
-        Component[][] components = {
-                new Component[]{null, null},
-                new Component[]{text, fontNameComboBox},
-                new Component[]{null, buttonPane}
-        };
-
-        return TableLayoutHelper.createGapTableLayoutPane(components, rows, columnSize, 20, LayoutConstants.VGAP_LARGE);
-    }
-
-    public String getUILabelText() {
-        return Toolkit.i18nText("Fine-Design_Chart_Character");
-    }
-
-    public String title4PopupWindow() {
-        return null;
-    }
-
-    public void populate(FRFont frFont) {
-        UIObserverListener listener = fontNameComboBox == null ? null : fontNameComboBox.getUiObserverListener();
-        removeAllComboBoxListener();
-
-        if (frFont != null) {
-            fontNameComboBox.setSelectedItem(frFont.getFamily());
-            bold.setSelected(frFont.isBold());
-            italic.setSelected(frFont.isItalic());
-            populateFontSize(frFont);
-            if (fontColor != null) {
-                fontColor.setColor(frFont.getForeground());
-            }
-        }
-
-        //更新结束后，注册监听器
-        registerAllComboBoxListener(listener);
-    }
-
-    private void populateFontSize(FRFont frFont) {
-        if (fontSizeComboBox != null) {
-            fontSizeComboBox.setSelectedItem(frFont.getSize());
-        }
-    }
-
-    private void removeAllComboBoxListener() {
-        fontNameComboBox.removeChangeListener();
-        fontSizeComboBox.removeChangeListener();
-    }
-
-    private void registerAllComboBoxListener(UIObserverListener listener) {
-        fontNameComboBox.registerChangeListener(listener);
-        fontSizeComboBox.registerChangeListener(listener);
-    }
-
-    /**
-     * 更新字
-     *
-     * @return 更新字
-     */
-    public FRFont update() {
-        String name = GeneralUtils.objectToString(fontNameComboBox.getSelectedItem());
-
-        return FRFont.getInstance(name, updateFontStyle(), updateFontSize(), fontColor.getColor());
-    }
-
-    private int updateFontStyle() {
-        int style = Font.PLAIN;
-        if (bold.isSelected() && !italic.isSelected()) {
-            style = Font.BOLD;
-        } else if (!bold.isSelected() && italic.isSelected()) {
-            style = Font.ITALIC;
-        } else if (bold.isSelected() && italic.isSelected()) {
-            style = 3;
-        }
-
-        return style;
-    }
-
-    private float updateFontSize() {
-        return Float.parseFloat(GeneralUtils.objectToString(fontSizeComboBox.getSelectedItem()));
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartLabelStylePane.java

@@ -1,78 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.chart;
-
-import com.fr.config.predefined.PredefinedChartStyle;
-import com.fr.design.gui.ibutton.UIButtonGroup;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.i18n.Toolkit;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-/**
- * @author Bjorn
- * @version 10.0
- * Created by Bjorn on 2020-09-16
- */
-public class ChartLabelStylePane extends AbstractChartStylePane {
-
-    private UIButtonGroup<Integer> autoButton;
-    //字体样式
-    private ChartFontPane chartFontPane;
-
-    protected void initComponents() {
-        autoButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Auto"),
-                Toolkit.i18nText("Fine-Design_Chart_Custom")});
-        chartFontPane = new ChartFontPane() {
-            public String getUILabelText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Label_Character");
-            }
-        };
-        initListener();
-    }
-
-    protected Component[][] getComponent() {
-        return new Component[][]{
-                new Component[]{null, null},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Style_Setting")), autoButton},
-                new Component[]{chartFontPane, null}
-        };
-    }
-
-    protected double[] getRows(double p) {
-        return new double[]{p, p, p};
-    }
-
-    private void initListener() {
-        autoButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                checkPreButton();
-            }
-        });
-    }
-
-    private void checkPreButton() {
-        chartFontPane.setVisible(autoButton.getSelectedIndex() == 1);
-        chartFontPane.setPreferredSize(autoButton.getSelectedIndex() == 1 ? new Dimension(0, 60) : new Dimension(0, 0));
-    }
-
-
-    @Override
-    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label");
-    }
-
-    public void populate(PredefinedChartStyle chartStyle) {
-        autoButton.setSelectedIndex(chartStyle.isAutoLabelFont() ? 0 : 1);
-        chartFontPane.populate(chartStyle.getLabelFont());
-        checkPreButton();
-    }
-
-
-    public void update(PredefinedChartStyle chartStyle) {
-        chartStyle.setAutoLabelFont(autoButton.getSelectedIndex() == 0);
-        chartStyle.setLabelFont(chartFontPane.update());
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartLegendStylePane.java

@@ -1,49 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.chart;
-
-import com.fr.config.predefined.PredefinedChartStyle;
-import com.fr.design.i18n.Toolkit;
-
-import java.awt.Component;
-
-/**
- * @author Bjorn
- * @version 10.0
- * Created by Bjorn on 2020-09-16
- */
-public class ChartLegendStylePane extends AbstractChartStylePane {
-
-    //字体样式
-    private ChartFontPane chartFontPane;
-
-    protected void initComponents() {
-        chartFontPane = new ChartFontPane() {
-            public String getUILabelText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Legend_Character");
-            }
-        };
-    }
-
-    protected Component[][] getComponent() {
-        return new Component[][]{
-                new Component[]{chartFontPane, null}
-        };
-    }
-
-    protected double[] getRows(double p) {
-        return new double[]{p};
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend");
-    }
-
-    public void populate(PredefinedChartStyle chartStyle) {
-        chartFontPane.populate(chartStyle.getLegendFont());
-    }
-
-
-    public void update(PredefinedChartStyle chartStyle) {
-        chartStyle.setLegendFont(chartFontPane.update());
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartTitleStylePane.java

@@ -1,49 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.chart;
-
-import com.fr.config.predefined.PredefinedChartStyle;
-import com.fr.design.i18n.Toolkit;
-
-import java.awt.Component;
-
-/**
- * @author Bjorn
- * @version 10.0
- * Created by Bjorn on 2020-09-16
- */
-public class ChartTitleStylePane extends AbstractChartStylePane {
-
-    //字体样式
-    private ChartFontPane chartFontPane;
-
-    protected void initComponents() {
-        chartFontPane = new ChartFontPane() {
-            public String getUILabelText() {
-                return Toolkit.i18nText("Fine-Design_Chart_Title_Character");
-            }
-        };
-    }
-
-    protected Component[][] getComponent() {
-        return new Component[][]{
-                new Component[]{chartFontPane, null}
-        };
-    }
-
-    protected double[] getRows(double p) {
-        return new double[]{p};
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Design_Report_Title");
-    }
-
-    public void populate(PredefinedChartStyle chartStyle) {
-        chartFontPane.populate(chartStyle.getTitleFont());
-    }
-
-
-    public void update(PredefinedChartStyle chartStyle) {
-        chartStyle.setTitleFont(chartFontPane.update());
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/component/ComponentFrameStylePane.java

@@ -1,148 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.component;
-
-import com.fr.base.GraphHelper;
-import com.fr.base.Utils;
-import com.fr.config.predefined.PredefinedComponentStyle;
-import com.fr.design.gui.frpane.UINumberDragPane;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.ibutton.UIButtonUI;
-import com.fr.design.gui.ibutton.UIColorButton;
-import com.fr.design.gui.icombobox.LineComboBox;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.icontainer.UIScrollPane;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.ispinner.UISpinner;
-import com.fr.design.gui.style.BackgroundSpecialPane;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.backgroundpane.GradientBackgroundQuickPane;
-import com.fr.general.act.BorderPacker;
-import com.fr.stable.Constants;
-
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.geom.RoundRectangle2D;
-
-/**
- * Created by kerry on 2020-09-01
- */
-public class ComponentFrameStylePane extends ComponentStylePane {
-    private final static String[] BORDER_STYLE = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Shadow")};
-    private static final double ALPHA_MAX_NUMBER = 100;
-    private final static int[] BORDER_LINE_STYLE_ARRAY = new int[]{
-            Constants.LINE_NONE,
-            Constants.LINE_THIN, //1px
-            Constants.LINE_MEDIUM, //2px
-            Constants.LINE_THICK, //3px
-    };
-
-    //渲染风格
-    private UIComboBox borderStyleCombo;
-    //边框粗细
-    private LineComboBox currentLineCombo;
-    //边框圆角
-    private UISpinner borderCornerSpinner;
-    //边框颜色
-    private UIColorButton currentLineColorPane;
-    //主体背景
-    private BackgroundSpecialPane backgroundPane;
-    //透明度
-    private UINumberDragPane numberDragPane;
-
-    public ComponentFrameStylePane() {
-        initPane();
-    }
-
-    protected void initPane() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(BorderFactory.createEmptyBorder(6, 0, 0, 0));
-        this.borderStyleCombo = new UIComboBox(BORDER_STYLE);
-        this.currentLineCombo = new LineComboBox(BORDER_LINE_STYLE_ARRAY);
-        this.currentLineColorPane = new UIColorButton(null);
-        this.borderCornerSpinner = new UISpinner(0, 1000, 1, 0);
-        currentLineColorPane.setUI(getButtonUI(currentLineColorPane));
-        currentLineColorPane.set4ToolbarButton();
-        currentLineColorPane.setPreferredSize(new Dimension(20, 20));
-        JPanel buttonPane = new JPanel(new BorderLayout());
-        buttonPane.add(currentLineColorPane, BorderLayout.WEST);
-        backgroundPane = new BackgroundSpecialPane();
-        JPanel transparencyPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        this.numberDragPane = new UINumberDragPane(0, 100);
-        transparencyPane.add(numberDragPane, BorderLayout.CENTER);
-        transparencyPane.add(new UILabel(" %"), BorderLayout.EAST);
-
-        double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p, p, p, p, p, p, p};
-        double[] columnSize = {p, 157};
-        JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Render_Style")), borderStyleCombo},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Line")), currentLineCombo},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Color")), buttonPane},
-                getBorderCornerSpinnerComp(),
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Body_Background")), backgroundPane},
-                {new UILabel(""), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))},
-                {new UILabel(""), transparencyPane},
-        }, rowSize, columnSize, 10);
-        UIScrollPane rightTopPane = new UIScrollPane(rightTopContentPane);
-        rightTopPane.setBorder(BorderFactory.createEmptyBorder());
-        this.add(rightTopPane, BorderLayout.CENTER);
-    }
-
-
-    private JComponent[] getBorderCornerSpinnerComp() {
-        return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius") + ":"), borderCornerSpinner};
-    }
-
-
-    protected UIButtonUI getButtonUI(final UIColorButton uiColorButton) {
-        return new UIButtonUI() {
-
-            public void paint(Graphics g, JComponent c) {
-                UIButton b = (UIButton) c;
-                g.setColor(Color.black);
-                GraphHelper.draw(g, new RoundRectangle2D.Double(1, 1, b.getWidth() - 2, b.getHeight() - 2, 0, 0), 1);
-
-                if (b.getModel().isEnabled()) {
-                    g.setColor(uiColorButton.getColor());
-                } else {
-                    g.setColor(new Color(Utils.filterRGB(uiColorButton.getColor().getRGB(), 50)));
-                }
-                g.fillRect(2, 2, b.getWidth() - 3, b.getHeight() - 3);
-            }
-        };
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Frame");
-    }
-
-
-    @Override
-    public void populate(PredefinedComponentStyle componentStyle) {
-        BorderPacker borderStyle = componentStyle.getBorderStyle();
-        this.borderStyleCombo.setSelectedIndex(borderStyle.getBorderStyle());
-        this.borderCornerSpinner.setValue(borderStyle.getBorderRadius());
-        this.currentLineCombo.setSelectedLineStyle(borderStyle.getBorder());
-        this.currentLineColorPane.setColor(borderStyle.getColor());
-        this.backgroundPane.populateBean(borderStyle.getBackground());
-        numberDragPane.populateBean(borderStyle.getAlpha() * ALPHA_MAX_NUMBER);
-    }
-
-    @Override
-    public void update(PredefinedComponentStyle componentStyle) {
-        BorderPacker style = componentStyle.getBorderStyle();
-        style.setBorderStyle(borderStyleCombo.getSelectedIndex());
-        style.setBorderRadius((int) borderCornerSpinner.getValue());
-        style.setBorder(currentLineCombo.getSelectedLineStyle());
-        style.setColor(currentLineColorPane.getColor());
-        style.setBackground(backgroundPane.update());
-        style.setAlpha((float) (numberDragPane.updateBean() / ALPHA_MAX_NUMBER));
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/component/ComponentMarginStylePane.java

@@ -1,93 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.component;
-
-import com.fr.config.predefined.PredefinedComponentStyle;
-import com.fr.design.designer.IntervalConstants;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.ispinner.UISpinner;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import java.awt.BorderLayout;
-import java.awt.Component;
-
-/**
- * Created by kerry on 2020-09-01
- */
-public class ComponentMarginStylePane extends ComponentStylePane {
-    protected UISpinner top;
-    protected UISpinner bottom;
-    protected UISpinner left;
-    protected UISpinner right;
-
-    public ComponentMarginStylePane() {
-        initBoundPane(0, 0, 0, 0);
-    }
-
-    public void initBoundPane(int t, int b, int l, int r) {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        top = new UISpinner(0, Integer.MAX_VALUE, 1, t);
-        bottom = new UISpinner(0, Integer.MAX_VALUE, 1, b);
-        left = new UISpinner(0, Integer.MAX_VALUE, 1, l);
-        right = new UISpinner(0, Integer.MAX_VALUE, 1, r);
-        top.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
-        bottom.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
-        left.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
-        right.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
-        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
-        label.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
-        label.setVerticalAlignment(SwingConstants.TOP);
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-                new Component[]{label, createRightPane()}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
-        this.add(panel);
-    }
-
-
-    public JPanel createRightPane() {
-        double f = TableLayout.FILL;
-        double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p};
-        double[] columnSize = {f, f};
-        int[][] rowCount = {{1, 1}, {1, 1}};
-        Component[][] components1 = new Component[][]{
-                new Component[]{top, bottom},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bottom"), SwingConstants.CENTER)}
-        };
-        Component[][] components2 = new Component[][]{
-                new Component[]{left, right},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Right"), SwingConstants.CENTER)}
-        };
-        JPanel northPanel = TableLayoutHelper.createGapTableLayoutPane(components1, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6);
-        northPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, IntervalConstants.INTERVAL_L1, 0));
-        JPanel centerPanel = TableLayoutHelper.createGapTableLayoutPane(components2, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6);
-        JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));
-        panel.add(northPanel, BorderLayout.NORTH);
-        panel.add(centerPanel, BorderLayout.CENTER);
-        return panel;
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Margin");
-    }
-
-    @Override
-    public void populate(PredefinedComponentStyle componentStyle) {
-        this.top.setValue(componentStyle.getTop());
-        this.bottom.setValue(componentStyle.getBottom());
-        this.left.setValue(componentStyle.getLeft());
-        this.right.setValue(componentStyle.getRight());
-    }
-
-    @Override
-    public void update(PredefinedComponentStyle componentStyle) {
-        componentStyle.setTop((int) this.top.getValue());
-        componentStyle.setBottom((int) this.bottom.getValue());
-        componentStyle.setLeft((int) this.left.getValue());
-        componentStyle.setRight((int) this.right.getValue());
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/component/ComponentStylePane.java

@@ -1,15 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.component;
-
-import com.fr.config.predefined.PredefinedComponentStyle;
-import com.fr.design.dialog.BasicPane;
-
-
-/**
- * Created by kerry on 2020-09-01
- */
-public abstract class ComponentStylePane extends BasicPane {
-
-    public abstract void populate(PredefinedComponentStyle componentStyle);
-
-    public abstract void update(PredefinedComponentStyle componentStyle);
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/component/ComponentTitleStylePane.java

@@ -1,253 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.detail.component;
-
-import com.fr.base.BaseUtils;
-import com.fr.base.Utils;
-import com.fr.config.predefined.PredefinedComponentStyle;
-import com.fr.design.constants.LayoutConstants;
-import com.fr.design.constants.UIConstants;
-import com.fr.design.formula.TinyFormulaPane;
-import com.fr.design.gui.ibutton.UIButtonGroup;
-import com.fr.design.gui.ibutton.UIColorButton;
-import com.fr.design.gui.ibutton.UIToggleButton;
-import com.fr.design.gui.icombobox.LineComboBox;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.icontainer.UIScrollPane;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.style.BackgroundNoImagePane;
-import com.fr.design.gui.style.FRFontPane;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.backgroundpane.GradientBackgroundQuickPane;
-import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.form.ui.LayoutBorderStyle;
-import com.fr.form.ui.WidgetTitle;
-import com.fr.general.FRFont;
-import com.fr.general.act.BorderPacker;
-import com.fr.general.act.TitlePacker;
-import com.fr.stable.ArrayUtils;
-import com.fr.stable.Constants;
-import com.fr.stable.StringUtils;
-
-import javax.swing.BorderFactory;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-
-/**
- * Created by kerry on 2020-09-01
- */
-public class ComponentTitleStylePane extends ComponentStylePane {
-    private final static Dimension BUTTON_SIZE = new Dimension(24, 20);
-    //标题内容
-    private TinyFormulaPane formulaPane;
-    //标题格式
-    private UIComboBox fontNameComboBox;
-    private UIComboBox fontSizeComboBox;
-    private UIColorButton colorSelectPane;
-    private UIToggleButton bold;
-    private UIToggleButton italic;
-    private UIToggleButton underline;
-    private LineComboBox underlineCombo;
-    //对齐方式
-    private UIButtonGroup hAlignmentPane;
-    //标题背景
-    private BackgroundNoImagePane titleBackgroundPane;
-
-    public static ComponentTitleStylePane createPredefinedSettingPane(){
-        return new ComponentTitleStylePane(true);
-    }
-
-    public static ComponentTitleStylePane createStyleSettingPane(){
-        return new ComponentTitleStylePane(false);
-    }
-
-    private ComponentTitleStylePane(boolean isPredefined) {
-        initPane(isPredefined);
-    }
-
-    protected void initPane(boolean isPredefined) {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(BorderFactory.createEmptyBorder(6, 0,0,0));
-        formulaPane = new TinyFormulaPane();
-        fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
-        fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
-        fontNameComboBox.setPreferredSize(new Dimension(105 , 20));
-        JPanel fontSizeTypePane = new JPanel(new BorderLayout(3, 0));
-        fontSizeTypePane.add(fontSizeComboBox, BorderLayout.CENTER);
-        fontSizeTypePane.add(fontNameComboBox, BorderLayout.EAST);
-
-        Icon[] hAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"),
-                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"),
-                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),};
-        Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT};
-        hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
-        hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Left")
-                , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")});
-        JPanel hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
-        hPaneContainer.add(hAlignmentPane);
-
-        titleBackgroundPane = new BackgroundNoImagePane();
-
-        double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p, p, p, p, p, p, p};
-        double[] columnSize = {p, 157};
-        JComponent[][] jComponents = new JComponent[][]{
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Char"))), fontSizeTypePane},
-                {new UILabel(""), initFontButtonPane()},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Alignment-Style")), hAlignmentPane},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Background")), titleBackgroundPane}};
-
-        JComponent[][] displayComponents = createDisplayComponentArray(isPredefined, jComponents);
-        JPanel rightBottomContentPane = TableLayoutHelper.createCommonTableLayoutPane(displayComponents, rowSize, columnSize, 10);
-
-        UIScrollPane jPanel = new UIScrollPane(rightBottomContentPane);
-        jPanel.setBorder(BorderFactory.createEmptyBorder());
-        this.add(jPanel, BorderLayout.CENTER);
-    }
-
-    private JComponent[][] createDisplayComponentArray(boolean isPredefined, JComponent[][] baseComponents) {
-        if (isPredefined) {
-            return baseComponents;
-        }
-        JComponent[][] titleComponent = new JComponent[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), formulaPane}};
-        return ArrayUtils.addAll(titleComponent, baseComponents);
-
-    }
-
-    protected JPanel initFontButtonPane() {
-        colorSelectPane = new UIColorButton();
-        bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
-        italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
-        underline = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline.png"));
-        bold.setPreferredSize(BUTTON_SIZE);
-        italic.setPreferredSize(BUTTON_SIZE);
-        underline.setPreferredSize(BUTTON_SIZE);
-        underline.addChangeListener(new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                underlineCombo.setVisible(underline.isSelected());
-            }
-        });
-        underlineCombo = new LineComboBox(UIConstants.BORDER_LINE_STYLE_ARRAY);
-        Component[] components_font = new Component[]{
-                colorSelectPane, italic, bold, underline
-        };
-        JPanel buttonPane = new JPanel(new BorderLayout());
-        buttonPane.add(GUICoreUtils.createFlowPane(components_font, FlowLayout.LEFT, LayoutConstants.HGAP_SMALL));
-        JPanel combinePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        combinePane.add(buttonPane, BorderLayout.WEST);
-        combinePane.add(underlineCombo, BorderLayout.CENTER);
-        initAllNames();
-        setToolTips();
-        return combinePane;
-
-    }
-
-    protected void initAllNames() {
-        fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Family"));
-        fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size"));
-        colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Foreground"));
-        italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic"));
-        bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Bold"));
-        underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Underline"));
-        underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style"));
-    }
-
-    protected void setToolTips() {
-        colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Foreground"));
-        italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic"));
-        bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Bold"));
-        underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Underline"));
-    }
-
-
-    @Override
-    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title");
-    }
-
-    @Override
-    public void populate(PredefinedComponentStyle componentStyle) {
-        BorderPacker borderStyle = componentStyle.getBorderStyle();
-        TitlePacker widgetTitle = borderStyle == null ? new WidgetTitle() : borderStyle.getTitle();
-        widgetTitle = widgetTitle == null ? new WidgetTitle() : widgetTitle;
-
-        populateFormula(widgetTitle);
-        populateFont(widgetTitle);
-
-        hAlignmentPane.setSelectedItem(widgetTitle.getPosition());
-
-        titleBackgroundPane.populateBean(widgetTitle.getBackground());
-    }
-
-    private void populateFormula(TitlePacker widgetTitle) {
-        this.formulaPane.populateBean(widgetTitle.getTextObject().toString());
-    }
-
-    protected void populateFont(TitlePacker widgetTitle) {
-        FRFont frFont = widgetTitle.getFrFont();
-        this.fontSizeComboBox.setSelectedItem(frFont.getSize());
-        this.fontNameComboBox.setSelectedItem(frFont.getFamily());
-        this.colorSelectPane.setColor(frFont.getForeground());
-        this.colorSelectPane.repaint();
-        bold.setSelected(frFont.isBold());
-        italic.setSelected(frFont.isItalic());
-        int line = frFont.getUnderline();
-        if (line == Constants.LINE_NONE) {
-            underline.setSelected(false);
-            underlineCombo.setVisible(false);
-        } else {
-            underline.setSelected(true);
-            underlineCombo.setVisible(true);
-            this.underlineCombo.setSelectedLineStyle(line);
-        }
-    }
-
-    @Override
-    public void update(PredefinedComponentStyle componentStyle) {
-        BorderPacker style = componentStyle.getBorderStyle();
-        TitlePacker title = style.getTitle() == null ? new WidgetTitle() : style.getTitle();
-        String titleText = formulaPane.updateBean();
-        title.setTextObject(titleText);
-        style.setType(StringUtils.isEmpty(titleText) ? LayoutBorderStyle.STANDARD : LayoutBorderStyle.TITLE);
-        FRFont frFont = title.getFrFont();
-        frFont = frFont.applySize((Integer) fontSizeComboBox.getSelectedItem());
-        frFont = frFont.applyName(fontNameComboBox.getSelectedItem().toString());
-        frFont = frFont.applyForeground(colorSelectPane.getColor());
-        frFont = updateItalicBold(frFont);
-        int line = underline.isSelected() ? this.underlineCombo.getSelectedLineStyle() : Constants.LINE_NONE;
-        frFont = frFont.applyUnderline(line);
-        title.setFrFont(frFont);
-        title.setPosition((Integer) hAlignmentPane.getSelectedItem());
-        title.setBackground(titleBackgroundPane.update());
-        style.setTitle(title);
-    }
-
-    private FRFont updateItalicBold(FRFont frFont) {
-        int italic_bold = frFont.getStyle();
-        boolean isItalic = italic_bold == Font.ITALIC || italic_bold == (Font.BOLD + Font.ITALIC);
-        boolean isBold = italic_bold == Font.BOLD || italic_bold == (Font.BOLD + Font.ITALIC);
-        if (italic.isSelected() && !isItalic) {
-            italic_bold += Font.ITALIC;
-        } else if (!italic.isSelected() && isItalic) {
-            italic_bold -= Font.ITALIC;
-        }
-        frFont = frFont.applyStyle(italic_bold);
-        if (bold.isSelected() && !isBold) {
-            italic_bold += Font.BOLD;
-        } else if (!bold.isSelected() && isBold) {
-            italic_bold -= Font.BOLD;
-        }
-        frFont = frFont.applyStyle(italic_bold);
-        return frFont;
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/dialog/PredefinedStyleEditDialog.java

@@ -1,193 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.dialog;
-
-import com.fr.config.ServerPreferenceConfig;
-import com.fr.config.predefined.PredefinedStyleConfig;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.itextfield.UITextField;
-import com.fr.design.mainframe.predefined.ui.PredefinedStyleEditPane;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.stable.StringUtils;
-
-import javax.swing.BorderFactory;
-import javax.swing.JDialog;
-
-import javax.swing.JPanel;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-/**
- * Created by kerry on 2020-08-26
- */
-public class PredefinedStyleEditDialog extends JDialog {
-
-    public PredefinedStyleEditDialog(Window parent, PredefinedStyleEditPane contentPane) {
-        this(parent, contentPane, false);
-    }
-
-
-    public PredefinedStyleEditDialog(Window parent, PredefinedStyleEditPane contentPane, boolean isBuiltIn) {
-        super(parent, ModalityType.APPLICATION_MODAL);
-
-        this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Edit"));
-        this.setResizable(false);
-        JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        this.setContentPane(defaultPane);
-
-        UIButton saveBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save"));
-        saveBtn.setEnabled(!isBuiltIn);
-        saveBtn.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if(contentPane.saveStyle()){
-                    dialogExit();
-                }
-            }
-        });
-        UIButton saveAsBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Save_As_New"));
-        saveAsBtn.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                SaveAsNewStyleDialog saveAsNewStyleDialog = new SaveAsNewStyleDialog(PredefinedStyleEditDialog.this, contentPane);
-                saveAsNewStyleDialog.setVisible(true);
-
-            }
-        });
-        UIButton cancelBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
-        cancelBtn.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dialogExit();
-            }
-        });
-        JPanel buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        buttonPanel.add(saveBtn);
-        buttonPanel.add(saveAsBtn);
-        buttonPanel.add(cancelBtn);
-
-        defaultPane.add(contentPane, BorderLayout.CENTER);
-        defaultPane.add(buttonPanel, BorderLayout.SOUTH);
-
-        addWindowListener(new WindowAdapter() {
-            public void windowClosing(WindowEvent e) {
-                dialogExit();
-            }
-        });
-
-
-        this.setSize(new Dimension(900, 600));
-        GUICoreUtils.centerWindow(this);
-    }
-
-    public void dialogExit() {
-        this.dispose();
-    }
-
-    class SaveAsNewStyleDialog extends JDialog {
-        private UITextField textField;
-        private UILabel tipLabel;
-
-        public SaveAsNewStyleDialog(Window parent, PredefinedStyleEditPane editPane) {
-            super(parent, ModalityType.APPLICATION_MODAL);
-
-            this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Save_As_New"));
-            this.setResizable(false);
-            UIButton confirm = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"));
-            confirm.setEnabled(false);
-            confirm.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    String name = textField.getText();
-                    if (valid(name)) {
-                        editPane.saveAsNewStyle(name);
-                        dialogExit();
-                        PredefinedStyleEditDialog.this.dialogExit();
-                    } else {
-                        tipLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Name_Repeat"));
-                    }
-                }
-            });
-            UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
-            cancle.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    dialogExit();
-                }
-            });
-            JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-            JPanel buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-            buttonPanel.add(confirm);
-            buttonPanel.add(cancle);
-
-            JPanel panel = createSaveAsPane(confirm);
-
-
-            defaultPane.add(panel, BorderLayout.CENTER);
-            defaultPane.add(buttonPanel, BorderLayout.SOUTH);
-
-            this.setContentPane(defaultPane);
-
-            addWindowListener(new WindowAdapter() {
-                public void windowClosing(WindowEvent e) {
-                    dialogExit();
-                }
-            });
-
-
-            this.setSize(new Dimension(300, 140));
-            GUICoreUtils.centerWindow(this);
-        }
-
-        private JPanel createSaveAsPane(UIButton confirm) {
-            JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-            JPanel centerPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(20, 5);
-            centerPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Name")));
-            textField = new UITextField();
-            textField.getDocument().addDocumentListener(new DocumentListener() {
-                @Override
-                public void insertUpdate(DocumentEvent e) {
-                    confirm.setEnabled(StringUtils.isNotEmpty(textField.getText()));
-                }
-
-                @Override
-                public void removeUpdate(DocumentEvent e) {
-
-                }
-
-                @Override
-                public void changedUpdate(DocumentEvent e) {
-
-                }
-            });
-            textField.setPreferredSize(new Dimension(180, 20));
-            centerPane.add(textField);
-            panel.add(centerPane, BorderLayout.CENTER);
-            tipLabel = new UILabel();
-            tipLabel.setBorder(BorderFactory.createEmptyBorder(10, 20, 0, 0));
-            tipLabel.setForeground(Color.RED);
-            panel.add(tipLabel, BorderLayout.SOUTH);
-            return panel;
-
-
-        }
-
-
-        public void dialogExit() {
-            this.dispose();
-        }
-
-        private boolean valid(String name) {
-            PredefinedStyleConfig config = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig();
-            return !config.containStyle(name);
-        }
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/dialog/ReportPredefinedStyleDialog.java

@@ -1,97 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.dialog;
-
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.predefined.ui.ReportPredefinedStylePane;
-import com.fr.design.mainframe.predefined.ui.ServerPredefinedStylePane;
-import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.workspace.WorkContext;
-
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-/**
- * Created by kerry on 2020-08-26
- */
-public class ReportPredefinedStyleDialog extends JDialog {
-
-
-    public ReportPredefinedStyleDialog(Window parent, ReportPredefinedStylePane contentPane) {
-        super(parent, ModalityType.APPLICATION_MODAL);
-
-        this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Template_Style"));
-        this.setResizable(false);
-        JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        this.setContentPane(defaultPane);
-        UIButton managerBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Manager"));
-        managerBtn.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                ServerPredefinedStylePane predefinedStylePane = new ServerPredefinedStylePane();
-                ServerPredefinedStyleDialog dialog = new ServerPredefinedStyleDialog(ReportPredefinedStyleDialog.this, predefinedStylePane);
-                dialog.setVisible(true);
-                dialog.addWindowListener(new WindowAdapter() {
-                    @Override
-                    public void windowClosed(WindowEvent e) {
-                        contentPane.refresh();
-                    }
-                });
-            }
-        });
-
-
-        UIButton settingBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Applicate_Style"));
-        settingBtn.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                contentPane.update();
-                dialogExit();
-            }
-        });
-
-        UIButton cancelBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
-        cancelBtn.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dialogExit();
-            }
-        });
-        JPanel southPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-
-        if (WorkContext.getCurrent().isRoot()){
-            JPanel buttonPanel1 = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-            buttonPanel1.add(managerBtn);
-            southPane.add(buttonPanel1, BorderLayout.CENTER);
-        }
-
-        JPanel buttonPanel2 = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        buttonPanel2.add(settingBtn);
-        buttonPanel2.add(cancelBtn);
-
-        southPane.add(buttonPanel2, BorderLayout.EAST);
-
-        defaultPane.add(contentPane, BorderLayout.CENTER);
-        defaultPane.add(southPane, BorderLayout.SOUTH);
-
-        addWindowListener(new WindowAdapter() {
-            public void windowClosing(WindowEvent e) {
-                dialogExit();
-            }
-        });
-
-
-        this.setSize(new Dimension(660, 600));
-        GUICoreUtils.centerWindow(this);
-    }
-
-    public void dialogExit() {
-        this.dispose();
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/dialog/ServerPredefinedStyleDialog.java

@@ -1,68 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.dialog;
-
-import com.fr.design.mainframe.predefined.ui.ServerPredefinedStylePane;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.utils.gui.GUICoreUtils;
-
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-/**
- * Created by kerry on 2020-08-26
- */
-public class ServerPredefinedStyleDialog extends JDialog  {
-
-
-    public ServerPredefinedStyleDialog(Window parent, ServerPredefinedStylePane contentPane) {
-        super(parent, ModalityType.APPLICATION_MODAL);
-        this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Server_Style"));
-        this.setResizable(false);
-        JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        this.setContentPane(defaultPane);
-
-        UIButton settingBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Set_Default"));
-        settingBtn.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                contentPane.update();
-                dialogExit();
-            }
-        });
-
-        UIButton cancelBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
-        cancelBtn.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                dialogExit();
-            }
-        });
-        JPanel buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        buttonPanel.add(settingBtn);
-        buttonPanel.add(cancelBtn);
-
-        defaultPane.add(contentPane, BorderLayout.CENTER);
-        defaultPane.add(buttonPanel, BorderLayout.SOUTH);
-
-        addWindowListener(new WindowAdapter() {
-            public void windowClosing(WindowEvent e) {
-                dialogExit();
-            }
-        });
-
-
-        this.setSize(new Dimension(660, 600));
-        GUICoreUtils.centerWindow(this);
-    }
-
-    public void dialogExit(){
-        this.dispose();
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/ChartPreStylePreView.java

@@ -1,108 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.preview;
-
-import com.fr.base.chart.BaseChartCollection;
-import com.fr.base.chart.BaseChartPainter;
-import com.fr.base.chart.chartdata.CallbackEvent;
-import com.fr.base.chart.result.WebChartIDInfo;
-import com.fr.chart.chartattr.ChartCollection;
-import com.fr.config.predefined.PredefinedStyle;
-import com.fr.design.gui.chart.MiddleChartComponent;
-import com.fr.general.Background;
-import com.fr.script.Calculator;
-import com.fr.stable.core.PropertyChangeListener;
-
-import javax.swing.BorderFactory;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-
-/**
- * @author Bjorn
- * @version 10.0
- * Created by Bjorn on 2020-09-28
- */
-public class ChartPreStylePreView extends MiddleChartComponent {
-
-    private ChartCollection chartCollection;
-
-    private double scaleX = 1.0;
-    private double scaleY = 1.0;
-
-    private CallbackEvent callbackEvent;
-
-    private static final int BOUNDS = 10;
-
-    private Background componentBackground;
-
-    public ChartPreStylePreView() {
-    }
-
-    public ChartPreStylePreView(ChartCollection cc) {
-        this(cc, 1.0, 1.0);
-    }
-
-    public ChartPreStylePreView(ChartCollection cc, double scaleX, double scaleY) {
-        this.scaleX = scaleX;
-        this.scaleY = scaleY;
-        this.setBorder(BorderFactory.createEmptyBorder(5, 10, 10, 10));
-        populate(cc);
-    }
-
-    public void setCallbackEvent(CallbackEvent callbackEvent) {
-        this.callbackEvent = callbackEvent;
-    }
-
-    public void paintComponent(Graphics g) {
-        Graphics2D g2d = (Graphics2D) g;
-        g2d.translate(BOUNDS, BOUNDS);
-        g2d.scale(scaleX, scaleY);
-        super.paintComponent(g);
-        drawChart(g2d);
-        g2d.scale(1 / scaleX, 1 / scaleY);
-        g2d.translate(-BOUNDS, -BOUNDS);
-    }
-
-    private void drawChart(Graphics2D g2d) {
-        Dimension d = getBounds().getSize();
-        int chartWidth = (int) (d.width / scaleX) - BOUNDS * 2;
-        int chartHeight = (int) (d.height / scaleX) - BOUNDS * 2;
-        if (componentBackground != null) {
-            Graphics clipg = g2d.create(0, 0, chartWidth, chartHeight);
-            componentBackground.paint(clipg, clipg.getClipBounds());
-        }
-        BaseChartPainter painter = chartCollection.createResultChartPainterWithOutDealFormula(Calculator.createCalculator(),
-                WebChartIDInfo.createEmptyDesignerInfo(), chartWidth, chartHeight);
-        painter.paint(g2d, chartWidth, chartHeight, 0, null, callbackEvent);
-    }
-
-    public void refresh(PredefinedStyle style) {
-        /*VanChart vanChart = chartCollection.getSelectedChartProvider(VanChart.class);
-        List<ChartThemeStyleProvider> chartThemeStyleProviders = vanChart.getChartPreStyleProvider();
-        for (ChartThemeStyleProvider chartThemeStyleProvider : chartThemeStyleProviders) {
-            chartThemeStyleProvider.updateThemeStyle(style);
-        }
-        componentBackground = style.getComponentStyle().getBorderStyle().getBackground();
-        vanChart.attrChange();*/
-    }
-
-    @Override
-    public void populate(BaseChartCollection cc) {
-        this.chartCollection = (ChartCollection) cc;
-    }
-
-    @Override
-    public BaseChartCollection update() {
-        return this.chartCollection;
-    }
-
-    @Override
-    public void addStopEditingListener(PropertyChangeListener l) {
-
-    }
-
-
-    @Override
-    public void reset() {
-
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/ComponentPreviewPane.java

@@ -1,142 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.preview;
-
-import com.fr.base.FRContext;
-import com.fr.base.GraphHelper;
-import com.fr.config.predefined.PredefinedStyle;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.general.Background;
-import com.fr.general.FRFont;
-import com.fr.general.act.BorderPacker;
-import com.fr.general.act.TitlePacker;
-import com.fr.stable.Constants;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.geom.Rectangle2D;
-
-/**
- * Created by kerry on 2020-09-04
- */
-public abstract class ComponentPreviewPane extends StyleSettingPreviewPane {
-    private PredefinedStyle style = new PredefinedStyle();
-    private static final int SMALL_GAP = 10;
-    private static final int GAP = 10;
-    private JPanel contentPane;
-    private TitlePreviewPane titlePane;
-
-
-    public ComponentPreviewPane() {
-        this.setBackground(null);
-        this.setOpaque(false);
-        this.contentPane = createContentPane();
-        this.titlePane = new TitlePreviewPane();
-        this.titlePane.setPreferredSize(new Dimension(484, 35));
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(BorderFactory.createEmptyBorder(5, 10, 10, 10));
-
-        this.add(titlePane, BorderLayout.NORTH);
-        this.add(contentPane, BorderLayout.CENTER);
-    }
-
-    protected abstract JPanel createContentPane();
-
-    public void refresh() {
-        this.repaint();
-    }
-
-    public void refresh(PredefinedStyle style) {
-        this.style = style;
-    }
-
-    public void paintComponents(Graphics g) {
-        BorderPacker borderStyle = style.getComponentStyle().getBorderStyle();
-
-        updateBorders(g, borderStyle);
-
-        paintTitle(g, borderStyle.getTitle());
-
-        paintContentPane(g, borderStyle);
-
-        super.paintComponents(g);
-    }
-
-    private void paintContentPane(Graphics g, BorderPacker borderStyle) {
-
-        Graphics clipg;
-        clipg = g.create(10, 40, this.contentPane.getWidth(), this.contentPane.getHeight());
-        if (borderStyle.getBackground() != null) {
-            borderStyle.getBackground().paint(clipg, clipg.getClipBounds());
-        }
-        clipg.dispose();
-    }
-
-    private void paintTitle(Graphics g, TitlePacker titlePacker) {
-        Background background = titlePacker.getBackground();
-        if (background != null) {
-            background.paint(g, new Rectangle2D.Double(10, 5, this.titlePane.getWidth(), this.titlePane.getHeight()));
-        }
-        titlePane.setTitleObject(titlePacker);
-        titlePane.paintComponent(g);
-    }
-
-    private void updateBorders(Graphics g, BorderPacker borderStyle) {
-        if (borderStyle != null) {
-            borderStyle.paint(g, new Rectangle2D.Double(SMALL_GAP, SMALL_GAP, getWidth() - GAP, getHeight() - SMALL_GAP - GAP));
-        }
-    }
-
-
-    private class TitlePreviewPane extends JPanel {
-        private FRFont frFont = null;
-        private int titlePosition = Constants.LEFT;
-
-        public TitlePreviewPane() {
-            this.setBackground(null);
-            this.setOpaque(false);
-            frFont = FRContext.getDefaultValues().getFRFont();
-        }
-
-        @Override
-        public void paint(Graphics g) {
-
-        }
-
-        public void paintComponent(Graphics g) {
-            Graphics2D g2d = (Graphics2D) g;
-            Dimension d = getSize();
-            if (frFont == null) {
-                return;
-            }
-            FontMetrics fm = getFontMetrics(frFont);
-            if (this.isEnabled()) {
-                g2d.setColor(frFont.getForeground());
-            } else {
-                g2d.setColor(new Color(237, 237, 237));
-            }
-            g2d.setFont(frFont.applyResolutionNP(96));
-            String paintText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Preview_Title_Text");
-            int startY = 0, startX = 0;
-            startX = (d.width - fm.stringWidth(paintText)) / 2;
-            startY = (d.height - fm.getHeight()) / 2 + fm.getAscent();
-            if (this.titlePosition == Constants.LEFT) {
-                startX = GAP;
-            } else if (this.titlePosition == Constants.RIGHT) {
-                startX = d.width - fm.stringWidth(paintText) - GAP - fm.getMaxAdvance();
-            }
-            GraphHelper.drawString(g2d, paintText, startX, startY);
-
-        }
-
-        public void setTitleObject(TitlePacker titlePacker) {
-            this.frFont = titlePacker.getFrFont();
-            this.titlePosition = titlePacker.getPosition();
-        }
-    }
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/ElementCasePreview.java

@@ -1,171 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.preview;
-
-import com.fr.base.ScreenResolution;
-import com.fr.base.Style;
-import com.fr.config.predefined.PredefinedCellStyle;
-import com.fr.config.predefined.PredefinedCellStyleConfig;
-import com.fr.config.predefined.PredefinedStyle;
-import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.log.FineLoggerFactory;
-import com.fr.third.javax.annotation.Nonnull;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by kerry on 2020-09-04
- */
-public class ElementCasePreview extends ComponentPreviewPane {
-    private static final List<String[]> PREVIEW_DATA_LIST = new ArrayList<>();
-    private static final String BLANK_CHAR = " ";
-    private List<GridRowPane> gridRowPanes;
-
-    static {
-        readPreviewData();
-    }
-
-    private static void readPreviewData() {
-        try {
-            InputStream inputStream = ElementCasePreview.class.getResourceAsStream("/com/fr/design/mainframe/predefined/previewData");
-            BufferedReader br = new BufferedReader(new InputStreamReader(inputStream,
-                    StandardCharsets.UTF_8));
-            String lineTxt = null;
-            while ((lineTxt = br.readLine()) != null) {
-                String[] data = lineTxt.split(BLANK_CHAR);
-                PREVIEW_DATA_LIST.add(data);
-            }
-            br.close();
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
-    }
-
-
-    @Override
-    protected JPanel createContentPane() {
-        gridRowPanes = new ArrayList<>();
-        JPanel jPanel = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
-        jPanel.setOpaque(false);
-        jPanel.setBackground(null);
-        for (int i = 0; i < PREVIEW_DATA_LIST.size(); i++) {
-            GridRowPane gridRowPane = new GridRowPane(PREVIEW_DATA_LIST.get(i), Style.DEFAULT_STYLE);
-            gridRowPanes.add(gridRowPane);
-            jPanel.add(gridRowPane);
-        }
-        return jPanel;
-    }
-
-
-    public void refresh(PredefinedStyle style) {
-        super.refresh(style);
-        PredefinedCellStyleConfig cellStyleConfig = style.getCellStyleConfig();
-        for (int i = 0; i < gridRowPanes.size(); i++) {
-            Style renderStyle = getMainContentStyle(cellStyleConfig);
-            if (i == 0) {
-                renderStyle = getReportHeaderStyle(cellStyleConfig);
-            }
-            if (i == PREVIEW_DATA_LIST.size() - 1) {
-                renderStyle = getHighLightStyle(cellStyleConfig);
-            }
-            gridRowPanes.get(i).preview(renderStyle);
-        }
-    }
-
-
-    private Style getReportHeaderStyle(PredefinedCellStyleConfig config) {
-        return getCellStyle(config, Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Header"));
-    }
-
-    private Style getMainContentStyle(PredefinedCellStyleConfig config) {
-        return getCellStyle(config, Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Main_Text"));
-    }
-
-    private Style getHighLightStyle(PredefinedCellStyleConfig config) {
-        return getCellStyle(config, Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Highlight_Text"));
-    }
-
-    @Nonnull
-    private Style getCellStyle(PredefinedCellStyleConfig config, String styleName) {
-        PredefinedCellStyle cellStyle = config.getStyle(styleName);
-        if (cellStyle == null) {
-            return Style.DEFAULT_STYLE;
-        }
-        return cellStyle.getStyle();
-    }
-
-
-    class GridRowPane extends JPanel {
-        private List<GridPreview> gridPreviews = new ArrayList<>();
-
-        public GridRowPane(String[] data, Style style) {
-            this.setOpaque(false);
-            this.setBackground(null);
-            this.setLayout(FRGUIPaneFactory.createBorderLayout());
-            JPanel panel = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(4, 0, 0);
-            panel.setOpaque(false);
-            panel.setBackground(null);
-            for (String text : data) {
-                GridPreview gridPreview = new GridPreview(text);
-                gridPreviews.add(gridPreview);
-                panel.add(gridPreview);
-            }
-            this.add(panel, BorderLayout.CENTER);
-            preview(style);
-        }
-
-        public void preview(Style style) {
-            for (GridPreview grid : gridPreviews) {
-                grid.preview(style);
-            }
-        }
-    }
-
-
-    private static class GridPreview extends JComponent {
-
-        private Style style = Style.DEFAULT_STYLE;
-        private String value;
-
-        public GridPreview(String value) {
-            this.value = value;
-            setPreferredSize(new Dimension(125, 30));
-        }
-
-        public void preview(Style style) {
-            this.style = style;
-        }
-
-        public void paint(Graphics g) {
-            Graphics2D g2d = (Graphics2D) g;
-            int resolution = ScreenResolution.getScreenResolution();
-
-            if (style == Style.DEFAULT_STYLE) {
-                Style.paintContent(g2d, value, style, getWidth() - 3, getHeight() - 3, resolution);
-                return;
-            }
-
-            Style.paintBackground(g2d, style, getWidth(), getHeight());
-
-            Style.paintContent(g2d, value, style, getWidth() - 3, getHeight() - 3, resolution);
-
-            Style.paintBorder(g2d, style, getWidth() , getHeight() );
-        }
-
-
-        @Override
-        public Dimension getMinimumSize() {
-            return getPreferredSize();
-        }
-    }
-
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/PredefinedStylePreviewPane.java

@@ -1,157 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.preview;
-
-import com.fr.base.background.ColorBackground;
-import com.fr.base.chart.chartdata.CallbackEvent;
-import com.fr.chart.chartattr.ChartCollection;
-import com.fr.chart.chartattr.Title;
-import com.fr.chart.charttypes.ChartTypeManager;
-import com.fr.config.predefined.PredefinedStyle;
-import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.utils.ComponentUtils;
-import com.fr.general.Background;
-import com.fr.log.FineLoggerFactory;
-import com.fr.plugin.chart.attr.axis.VanChartAxis;
-import com.fr.plugin.chart.base.AttrLabel;
-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 javax.swing.JPanel;
-import java.util.ArrayList;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.geom.Rectangle2D;
-
-/**
- * Created by kerry on 2020-09-06
- */
-public class PredefinedStylePreviewPane extends StyleSettingPreviewPane implements CallbackEvent {
-    private ElementCasePreview elementCasePreview;
-    private Background background;
-    private double scaleX = 1.0;
-    private double scaleY = 1.0;
-    private ChartPreStylePreView columnChartPane;
-
-    private int COLUMN_CHART_WIDTH = 517;
-    private int COLUMN_CHART_HEIGHT = 290;
-
-    private JPanel parent;
-
-    public PredefinedStylePreviewPane() {
-        this(1.0, 1.0);
-    }
-
-    public PredefinedStylePreviewPane(double scaleX, double scaleY) {
-        this.scaleX = scaleX;
-        this.scaleY = scaleY;
-        this.setBackground(Color.WHITE);
-        this.elementCasePreview = new ElementCasePreview();
-        this.add(initChartPreViewPane());
-        this.elementCasePreview.setPreferredSize(new Dimension(517, 200));
-        this.add(this.elementCasePreview);
-    }
-
-    public void setParent(JPanel parent) {
-        this.parent = parent;
-    }
-
-    private JPanel initChartPreViewPane() {
-        columnChartPane = new ChartPreStylePreView(initVanColumnChart());
-        columnChartPane.setPreferredSize(new Dimension(COLUMN_CHART_WIDTH, COLUMN_CHART_HEIGHT));
-        columnChartPane.setCallbackEvent(this);
-
-        JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        panel.add(columnChartPane);
-        return panel;
-    }
-
-    //柱形图
-    private ChartCollection initVanColumnChart() {
-        try {
-            VanChart chart = (VanChart) ChartTypeManager.getInstance().getCharts(VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID)[0].clone();
-            VanChartTools vanChartTools = chart.getVanChartTools();
-            vanChartTools.setSort(false);
-            vanChartTools.setExport(false);
-            vanChartTools.setFullScreen(false);
-            VanChartColumnPlot plot = chart.getPlot();
-            AttrLabel defaultAttrLabel = plot.getDefaultAttrLabel();
-            defaultAttrLabel.setEnable(true);
-            defaultAttrLabel.getAttrLabelDetail().getBorder().setBorderStyle(0);
-            defaultAttrLabel.getAttrLabelDetail().getBackground().setBackground(null);
-            plot.getConditionCollection().getDefaultAttr().addDataSeriesCondition(defaultAttrLabel);
-            plot.getLegend().setLegendVisible(false);
-            plot.getDataSheet().setVisible(true);
-
-            VanChartAxis defaultYAxis = plot.getDefaultYAxis();
-            Title title = new Title();
-            title.setTextObject(Toolkit.i18nText("Fine-Design_Chart_Axis_Title"));
-            title.getTextAttr().setRotation(-90);
-            defaultYAxis.setTitle(title);
-            defaultYAxis.setShowAxisTitle(true);
-
-            ChartCollection chartCollection = new ChartCollection(chart);
-            return chartCollection;
-        } catch (Exception ex) {
-            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
-        }
-        return null;
-    }
-
-    @Override
-    public void refresh() {
-
-    }
-
-    @Override
-    public void paint(Graphics g) {
-        ((Graphics2D) g).scale(scaleX, scaleY);
-        // 禁止双缓冲
-        ArrayList<JComponent> dbcomponents = new ArrayList<JComponent>();
-        ComponentUtils.disableBuffer(this.elementCasePreview, dbcomponents);
-
-        if (background == null) {
-            background = ColorBackground.getInstance(Color.WHITE);
-        }
-        background.paint(g, new Rectangle2D.Double(0, 0, 517, 500));
-        this.columnChartPane.paintComponent(g);
-
-        g.translate(0, COLUMN_CHART_HEIGHT);
-        this.elementCasePreview.paintComponents(g);
-        g.translate(0, -COLUMN_CHART_HEIGHT);
-        // 恢复双缓冲
-        ComponentUtils.resetBuffer(dbcomponents);
-
-    }
-
-    @Override
-    public void paintComponents(Graphics g) {
-        super.paintComponents(g);
-        if (background != null) {
-            background.paint(g, new Rectangle2D.Double(0, 0, this.getWidth(), this.getHeight()));
-        }
-    }
-
-    public void refresh(PredefinedStyle style) {
-        refresh(style, false);
-    }
-
-    public void refresh(PredefinedStyle style, boolean displayFormBackground) {
-        elementCasePreview.refresh(style);
-        columnChartPane.refresh(style);
-        background = displayFormBackground ? style.getFormBackground().getBackground() : style.getReportBackground();
-        this.repaint();
-    }
-
-    @Override
-    public void callback() {
-        if (parent != null) {
-            parent.repaint();
-        } else {
-            this.repaint();
-        }
-    }
-}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/StyleSettingPreviewPane.java

@@ -1,17 +0,0 @@
-package com.fr.design.mainframe.predefined.ui.preview;
-
-import javax.swing.JPanel;
-
-/**
- * Created by kerry on 2020-08-31
- */
-public abstract class StyleSettingPreviewPane extends JPanel {
-    public StyleSettingPreviewPane() {
-
-    }
-
-
-    public abstract void refresh();
-
-
-}

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

@@ -30,9 +30,11 @@ import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
+import javax.swing.DefaultListModel;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.ListModel;
 import javax.swing.SwingUtilities;
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -101,7 +103,7 @@ public class CellStyleListEditPane extends JListControlPane {
 
     @Override
     protected JNameEdList createJNameList() {
-        JNameEdList nameEdList = super.createJNameList();
+        JNameEdList nameEdList = new NoIconNamedList(new DefaultListModel());
         nameEdList.setCellEditor(new UnEditableListCellEditor(new UITextField()));
         nameEdList.setCellRenderer(new NoIconNameableListCellRenderer());
         return nameEdList;
@@ -294,6 +296,17 @@ public class CellStyleListEditPane extends JListControlPane {
             return component;
         }
     }
+    private class NoIconNamedList extends JNameEdList {
+
+        public NoIconNamedList(ListModel dataModel) {
+            super(dataModel);
+        }
+
+        @Override
+        public int getIconWidth() {
+            return 0;
+        }
+    }
     private class UnEditableListCellEditor extends DefaultListCellEditor {
 
         public UnEditableListCellEditor(UITextField textField) {

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

@@ -8,13 +8,11 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.predefined.ui.detail.background.BackgroundSettingPane;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingConstants;
 import java.awt.BorderLayout;
 import java.awt.Component;
 

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

@@ -88,13 +88,13 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
 
     @Override
     public ThemedCellStyle updateBean() {
-        AbstractBasicStylePane basicStylePane = (AbstractBasicStylePane) paneList.get(tabPane.getSelectedIndex());
+        Style style = this.cellStyle.getStyle();
-        Style style = basicStylePane.update(this.cellStyle.getStyle());
         CellBorderStyle borderStyle = createDefaultBorderStyleFromStyle(style);
-
+        for (BasicPane basicPane : paneList) {
-
+            style = ((AbstractBasicStylePane) basicPane).update(style);
-        if (ThemedFeatureController.isCellStyleSupportInnerBorder() && basicStylePane instanceof BorderPane) {
+            if (ThemedFeatureController.isCellStyleSupportInnerBorder() && basicPane instanceof BorderPane) {
-            borderStyle = ((BorderPane) basicStylePane).update();
+                borderStyle = ((BorderPane) basicPane).update();
+            }
         }
 
         this.cellStyle.setStyle(style);
@@ -198,7 +198,7 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
         @Override
         protected void layoutContentPane() {
             super.layoutContentPane();
-            leftcontentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+            leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 5, original));
         }
     }
 }

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

@@ -7,7 +7,6 @@ import com.fr.design.constants.LayoutConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ibutton.UIColorButton;
-import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -57,7 +56,11 @@ public class ChartFontPane extends BasicPane {
         fontSizeComboBox = new UIComboBox(FONT_SIZES);
         bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
         italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
-        fontColor = new UIColorButtonWithAuto();
+        fontColor = getColorButton();
+    }
+
+    protected UIColorButton getColorButton() {
+        return new UIColorButton();
     }
 
     protected void initComponents() {

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

@@ -2,6 +2,8 @@ package com.fr.design.mainframe.theme.edit.chart;
 
 import com.fr.base.theme.settings.ThemedChartStyle;
 import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ibutton.UIColorButton;
+import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 
@@ -25,6 +27,11 @@ public class ChartLabelStylePane extends AbstractChartStylePane {
         autoButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Auto"),
                 Toolkit.i18nText("Fine-Design_Chart_Custom")});
         chartFontPane = new ChartFontPane() {
+            @Override
+            protected UIColorButton getColorButton() {
+                return new UIColorButtonWithAuto();
+            }
+
             public String getUILabelText() {
                 return Toolkit.i18nText("Fine-Design_Chart_Label_Character");
             }

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ecpreview/cell/AbstractPreviewCell.java

@@ -40,6 +40,7 @@ public abstract class AbstractPreviewCell extends JComponent {
         if (style.getBorderBottom() == Constants.LINE_SLIM || style.getBorderTop() == Constants.LINE_SLIM) {
             height -= BORDER_INSET;
         }
+        g2d.setClip(null);
         Style.paintBorder(g2d, style, width, height);
     }
 

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

@@ -3,6 +3,7 @@ package com.fr.design.mainframe.toast;
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrame;
 import com.fr.module.ModuleContext;
 
 import javax.swing.JPanel;
@@ -51,12 +52,16 @@ public class ToastMsgDialog extends UIDialog {
         hide_height = dimension.height;
         setSize(new Dimension(dimension.width, 0));
         contentPane.setSize(dimension);
-        setLocationRelativeTo(DesignerContext.getDesignerFrame().getContentFrame());
+        setRelativeLocation(dimension);
-        int positionY = DesignerContext.getDesignerFrame().getContentFrame().getLocationOnScreen().y + 10;
-        setLocation((DesignerContext.getDesignerFrame().getWidth() - dimension.width) / 2, positionY);
         addMouseEvent(contentPane);
     }
 
+    private void setRelativeLocation(Dimension dimension) {
+        DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
+        int positionX = designerFrame.getLocationOnScreen().x + (designerFrame.getWidth() - dimension.width) / 2;
+        int positionY = designerFrame.getContentFrame().getLocationOnScreen().y + 10;
+        this.setLocation(positionX, positionY);
+    }
 
     private Dimension calculatePreferSize() {
         Dimension contentDimension = contentPane.getPreferredSize();
@@ -106,7 +111,7 @@ public class ToastMsgDialog extends UIDialog {
                         Dimension dimension = ToastMsgDialog.this.getSize();
                         ToastMsgDialog.this.setSize(new Dimension(dimension.width, dimension.height - 5));
                     }
-                }, 0,50, TimeUnit.MILLISECONDS);
+                }, 0, 50, TimeUnit.MILLISECONDS);
 
             }
         }, 5000, TimeUnit.MILLISECONDS);

designer-base/src/main/java/com/fr/design/os/impl/PMDialogAction.java

@@ -1,6 +1,7 @@
 package com.fr.design.os.impl;
 
 import com.fr.config.ServerPreferenceConfig;
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.extra.WebViewDlgHelper;
 import com.fr.design.jdk.JdkVersion;
 import com.fr.design.upm.UpmFinder;
@@ -23,7 +24,9 @@ public class PMDialogAction implements OSBasedAction {
              DesignUtils.visitEnvServerByParameters( PLUGIN_MANAGER_ROUTE,null,null);
              return;
          }
-        if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM() || SupportOSImpl.MACOS_NEW_PLUGIN_MANAGEMENT.support()) {
+        if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM()
+                || SupportOSImpl.MACOS_NEW_PLUGIN_MANAGEMENT.support()
+                || DesignerEnvManager.getEnvManager().isUseOptimizedUPM4Adapter()) {
             UpmFinder.showUPMDialog();
         } else {
             WebViewDlgHelper.createPluginDialog();

designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java

@@ -8,13 +8,18 @@ import com.fr.general.GeneralContext;
 import com.fr.json.JSON;
 import com.fr.json.JSONFactory;
 import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.stable.os.Arch;
 import com.fr.stable.os.OperatingSystem;
 import com.fr.stable.os.support.SupportOS;
 import com.fr.workspace.WorkContext;
 
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
+import java.util.Scanner;
 
 /**
  * @author pengda
@@ -143,6 +148,45 @@ public enum SupportOSImpl implements SupportOS {
         }
     },
 
+    OLD_STYLE_CHOOSER {
+
+        @Override
+        public boolean support() {
+            return (OperatingSystem.isLinux() && Arch.getArch() == Arch.ARM) || MACOS_12_VERSION_ADAPTER.support();
+        }
+    },
+
+    MACOS_12_VERSION_ADAPTER {
+        @Override
+        public boolean support() {
+            return (OperatingSystem.isMacos() && getMacOsVersionNumber() >= macosMontereyVersionNum);
+        }
+
+        private final int macosMontereyVersionNum = 12;
+
+        /**
+         * System.getProperty("os.version") 在最新macos版本存在bug
+         * https://bugs.openjdk.java.net/browse/JDK-8253702
+         *
+         * @return
+         */
+        private int getMacOsVersionNumber() {
+            String result;
+            List<String> command = new ArrayList<>();
+            command.add("/usr/bin/sw_vers");
+            command.add("-productVersion");
+            try (InputStream inputStream = new ProcessBuilder(command).start().getInputStream();
+                 Scanner s = new Scanner(inputStream).useDelimiter("\\A")) {
+                result = s.hasNext() ? s.next() : StringUtils.EMPTY;
+                String[] versionSlice = result.split("\\.");
+                return Integer.parseInt(versionSlice[0]);
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().warn(e.getMessage(), e);
+                return 0;
+            }
+        }
+    },
+
     DESIGNER_LOGIN {
         @Override
         public boolean support() {

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

@@ -1,5 +1,6 @@
 package com.fr.design.report;
 
+import com.fr.base.iofile.attr.WaterMarkProvideConstant;
 import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.dialog.AbstractTemplateServerSettingPane;
 import com.fr.report.core.ReportUtils;
@@ -33,6 +34,7 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
     @Override
     protected void populateServerSettings() {
         WatermarkAttr watermarkAttr = ReportUtils.getWatermarkAttrFromServerConfig();
+        watermarkAttr.setValid(true);
         watermarkPane.populate(watermarkAttr);
     }
 
@@ -42,20 +44,21 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
     }
 
     public void populate(WatermarkAttr watermark) {
-        if (!watermark.isValid()) {
+        if (watermark.getWaterMarkProvider().equals(WaterMarkProvideConstant.TEMPLATE)) {
+            chooseComboBox.setSelectedIndex(SINGLE_SET);
+            watermarkPane.populate(watermark);
+        } else {
             chooseComboBox.setSelectedIndex(SERVER_SET);
             populateServerSettings();
-            return;
         }
-        chooseComboBox.setSelectedIndex(SINGLE_SET);
-        watermarkPane.populate(watermark);
     }
 
 
     public WatermarkAttr update() {
         WatermarkAttr watermark = watermarkPane.update();
-        if (isUsingServerSettings()) {
+        if (!isUsingServerSettings()) {
-            watermark.setValid(false);
+            watermark.setValid(true);
+            watermark.setWaterMarkProvider(WaterMarkProvideConstant.TEMPLATE);
         }
         return watermark;
     }

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

@@ -13,11 +13,7 @@ import com.fr.report.fit.ReportFitAttr;
 public class AdaptiveFrmFitAttrModel extends AbstractFitAttrModelProvider {
 
     public FitType[] getFitTypes() {
-        return new FitType[]{
+        return new FitType[0];
-                FitType.DOUBLE_FIT,
-                FitType.HORIZONTAL_FIT,
-                FitType.NOT_FIT
-        };
     }
 
     public String getFitName() {

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

@@ -2,27 +2,17 @@ package com.fr.design.report.fit;
 
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.report.fit.menupane.FitPreviewPane;
-import com.fr.design.report.fit.menupane.FitRadioGroup;
-import com.fr.design.report.fit.menupane.FontRadioGroup;
 import com.fr.design.report.fit.provider.FitAttrModelProvider;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.ComparatorUtils;
 import com.fr.report.fit.ReportFitAttr;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -35,11 +25,8 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
     protected UILabel belowSetLabel;
     protected UIComboBox itemChoose;
     protected java.util.List<FitAttrModel> fitAttrModelList = new ArrayList<>();
+    private ReportFitConfigPane fitConfigPane;
 
-    public FontRadioGroup fontRadioGroup;
-    public FitRadioGroup adaptRadioGroup;
-    public JPanel attrJPanel;
-    public FitPreviewPane previewJPanel;
     public FitAttrModel fitAttrModel;
     private static final int BELOW_SET_COMPONENT_HSPACE = 8;
 
@@ -64,128 +51,27 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
 
     protected void populateModel(FitAttrModel fitAttrModel) {
         this.fitAttrModel = fitAttrModel;
-        if (attrJPanel != null) {
+        if (fitConfigPane != null) {
-            contentJPanel.remove(attrJPanel);
+            contentJPanel.remove(fitConfigPane);
         }
-        if (previewJPanel != null) {
+        this.fitConfigPane = fitAttrModel instanceof CptFitAttrModel ? new ReportFitConfigPane(fitAttrModel, true) : new FormFitConfigPane(fitAttrModel, true);
-            contentJPanel.remove(previewJPanel);
+        contentJPanel.add(fitConfigPane);
     }
 
-        fontRadioGroup = new FontRadioGroup();
-        adaptRadioGroup = new FitRadioGroup();
-        initAttrJPanel();
-        initPreviewJPanel();
-    }
-
-
-    protected void initAttrJPanel() {
-        int colCount = fitAttrModel.getFitTypes().length + 1;
-        Component[][] components = new Component[2][colCount];
-        initFitRadioGroup(fontRadioGroup, i18nText("Fine-Designer_Fit-Font"), new String[]{i18nText("Fine-Designer_Fit"), i18nText("Fine-Designer_Fit-No")}, components[0]);
-        initFitRadioGroup(adaptRadioGroup, fitAttrModel.getFitName(), Arrays.stream(fitAttrModel.getFitTypes()).map(FitType::description).toArray(String[]::new), components[1]);
-
-        double[] rowSize = new double[2];
-        double[] columnSize = new double[colCount];
-        for (int i = 0; i < rowSize.length; i++) {
-            rowSize[i] = 20;
-        }
-        for (int i = 0; i < columnSize.length; i++) {
-            if (i == 0) {
-                columnSize[i] = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.firstColumn").getWidth();
-            } else {
-                columnSize[i] = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.column").getWidth();
-            }
-        }
-
-        attrJPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
-        attrJPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));
-        contentJPanel.add(attrJPanel);
-    }
-
-    private void initFitRadioGroup(FitRadioGroup fitRadioGroup, String name, String[] options, Component[] components) {
-        components[0] = new UILabel(name);
-        for (int i = 0; i < options.length; i++) {
-
-            if (options[i] != null) {
-                UIRadioButton fontFitRadio = new UIRadioButton(options[i]);
-                fitRadioGroup.add(fontFitRadio);
-                components[i + 1] = fontFitRadio;
-            } else {
-                components[i + 1] = null;
-            }
-        }
-        fitRadioGroup.addActionListener(getPreviewActionListener());
-    }
-
-    protected ActionListener getPreviewActionListener() {
-        return new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                refreshPreviewJPanel();
-            }
-        };
-    }
-
-    protected void refreshPreviewJPanel() {
-        String previewIndex = getPreviewIndex();
-        previewJPanel.refreshPreview(previewIndex, fontRadioGroup.isEnabled());
-    }
-
-    protected String getPreviewIndex() {
-        return getStateInPC(adaptRadioGroup.getSelectRadioIndex()) + "" + fontRadioGroup.getSelectRadioIndex();
-    }
-
-    protected void initPreviewJPanel() {
-        previewJPanel = new FitPreviewPane();
-        previewJPanel.setBorder(BorderFactory.createEmptyBorder(0, getPreviewJPanelLeft(), 0, 0));
-        contentJPanel.add(previewJPanel);
-    }
-
-    private int getPreviewJPanelLeft() {
-        int left = 0;
-        if (belowSetLabel.getPreferredSize() != null) {
-            left = belowSetLabel.getPreferredSize().width + BELOW_SET_COMPONENT_HSPACE;
-        }
-        return left;
-    }
-
-    protected int getStateInPC(int index) {
-        FitType[] fitTypes = fitAttrModel.getFitTypes();
-        return fitTypes[index].getState();
-    }
-
-    protected int getOptionIndex(int state) {
-        FitType[] fitTypes = fitAttrModel.getFitTypes();
-        for (int i = 0; i < fitTypes.length; i++) {
-            if (ComparatorUtils.equals(state, fitTypes[i].getState())) {
-                return i;
-            }
-        }
-        return 0;
-    }
-
-
     @Override
     public void populateBean(ReportFitAttr ob) {
-        fontRadioGroup.selectIndexButton(ob.isFitFont() ? 0 : 1);
+        this.fitConfigPane.populateBean(ob);
-        adaptRadioGroup.selectIndexButton(getOptionIndex(ob.fitStateInPC()));
-        refreshPreviewJPanel();
     }
 
     @Override
     public ReportFitAttr updateBean() {
-        ReportFitAttr reportFitAttr = new ReportFitAttr();
+        return this.fitConfigPane.updateBean();
-        reportFitAttr.setFitFont(fontRadioGroup.isFontFit());
-        reportFitAttr.setFitStateInPC(getStateInPC(adaptRadioGroup.getSelectRadioIndex()));
-        return reportFitAttr;
     }
 
 
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);
-        fontRadioGroup.setEnabled(enabled);
+        this.fitConfigPane.setEnabled(enabled);
-        adaptRadioGroup.setEnabled(enabled);
-        refreshPreviewJPanel();
     }
 
     @Override

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

@@ -3,6 +3,8 @@ package com.fr.design.report.fit;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.report.fit.ReportFitAttr;
 
+import java.util.Arrays;
+
 public interface FitAttrModel {
     /**
      * @Description 名称，比如：普通报表、决策报表等
@@ -19,6 +21,12 @@ public interface FitAttrModel {
      **/
     FitType[] getFitTypes();
 
+    /**
+     * @Description 表格自适应选项名称集合
+     **/
+    default String[] getFitTypeNames(){
+        return Arrays.stream(getFitTypes()).map(FitType::description).toArray(String[]::new);
+    }
 
     /**
      * @Description 获取全局的自适应属性
@@ -41,4 +49,5 @@ public interface FitAttrModel {
      * @param: jTemplate
      **/
     boolean isAvailable(JTemplate jTemplate);
+
 }

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

@@ -60,6 +60,17 @@ public enum FitType {
         return DEFAULT;
     }
 
+    public static FitType parseByFitState(int state) {
+
+        for (FitType attrState : values()) {
+            if (attrState.state == state) {
+                return attrState;
+            }
+        }
+
+        return DEFAULT;
+    }
+
     public int getState() {
         return this.state;
     }

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

@@ -0,0 +1,128 @@
+package com.fr.design.report.fit;
+
+
+import com.fr.design.designer.properties.items.Item;
+import com.fr.form.fit.common.LightTool;
+import com.fr.form.main.BodyScaleAttrTransformer;
+import com.fr.form.main.Form;
+import com.fr.form.ui.container.WAbsoluteLayout;
+import com.fr.form.ui.container.WBodyLayoutType;
+import com.fr.form.ui.container.WFitLayout;
+
+public enum FormFitAttrModelType {
+    PLAIN_FORM_FIT_ATTR_MODEL {
+        @Override
+        public FitAttrModel getFitAttrModel() {
+            return new FrmFitAttrModel();
+        }
+
+        @Override
+        public Item[] getFitLayoutScaleAttr() {
+            return new Item[]{
+                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Bidirectional_Adaptive"), WFitLayout.STATE_FULL),
+                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Horizontal_Adaptive"), WFitLayout.STATE_ORIGIN)};
+
+        }
+
+        @Override
+        public Item[] getAbsoluteLayoutSaleAttr() {
+            return new Item[]{
+                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode_Fit"), WAbsoluteLayout.STATE_FIT),
+                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode_Fixed"), WAbsoluteLayout.STATE_FIXED)
+            };
+        }
+
+
+        @Override
+        public int getScaleAttrShowIndex(WFitLayout wFitLayout) {
+            int scale = wFitLayout.getScaleAttr();
+            if (wFitLayout.getBodyLayoutType() == WBodyLayoutType.FIT) {
+                return BodyScaleAttrTransformer.getFitBodyCompStateFromScaleAttr(scale);
+            } else {
+                return BodyScaleAttrTransformer.getAbsoluteBodyCompStateFromScaleAttr(scale);
+            }
+        }
+
+        @Override
+        public int parseScaleAttrFromShowIndex(int showIndex, WBodyLayoutType wBodyLayoutType) {
+            if (wBodyLayoutType == WBodyLayoutType.FIT) {
+                if (showIndex == 0) {
+                    return WFitLayout.SCALE_FULL;
+                } else {
+                    return WFitLayout.SCALE_HOR;
+                }
+            } else {
+                if (showIndex == 0) {
+                    return WFitLayout.SCALE_FULL;
+                } else {
+                    return WFitLayout.SCALE_NO;
+                }
+            }
+        }
+
+
+    },
+    NEW_FORM_FIT_ATTR_MODEL {
+        @Override
+        public FitAttrModel getFitAttrModel() {
+            return new AdaptiveFrmFitAttrModel();
+        }
+
+        @Override
+        public Item[] getFitLayoutScaleAttr() {
+            return new Item[]{
+                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Bidirectional_Adaptive"), WFitLayout.STATE_FULL),
+                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Horizontal_Adaptive"), WFitLayout.STATE_ORIGIN),
+                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode_Fixed"), 2)};
+        }
+
+        @Override
+        public Item[] getAbsoluteLayoutSaleAttr() {
+            return new Item[]{
+                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Bidirectional_Adaptive"), WFitLayout.STATE_FULL),
+                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Horizontal_Adaptive"), WFitLayout.STATE_ORIGIN),
+                    new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode_Fixed"), 2)};
+        }
+
+
+        @Override
+        public int getScaleAttrShowIndex(WFitLayout wFitLayout) {
+            int scale = wFitLayout.getScaleAttr();
+            if (scale == WFitLayout.SCALE_NO) {
+                return 2;
+            } else if (scale == WFitLayout.SCALE_HOR) {
+                return 1;
+            } else {
+                return 0;
+            }
+        }
+
+        @Override
+        public int parseScaleAttrFromShowIndex(int showIndex, WBodyLayoutType wBodyLayoutType) {
+            if (showIndex == 0) {
+                return WFitLayout.SCALE_FULL;
+            } else if (showIndex == 1) {
+                return WFitLayout.SCALE_HOR;
+            } else {
+                return WFitLayout.SCALE_NO;
+            }
+        }
+
+
+    };
+
+    public abstract FitAttrModel getFitAttrModel();
+
+    public abstract Item[] getFitLayoutScaleAttr();
+
+    public abstract Item[] getAbsoluteLayoutSaleAttr();
+
+    public abstract int getScaleAttrShowIndex(WFitLayout wFitLayout);
+
+    public abstract int parseScaleAttrFromShowIndex(int showIndex, WBodyLayoutType wBodyLayoutType);
+
+
+    public static FormFitAttrModelType parse(Form form) {
+        return LightTool.containNewFormFlag(form) ? NEW_FORM_FIT_ATTR_MODEL : PLAIN_FORM_FIT_ATTR_MODEL;
+    }
+}

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

@@ -0,0 +1,163 @@
+package com.fr.design.report.fit;
+
+import com.fr.base.svg.SVGLoader;
+import com.fr.design.gui.ibutton.UIRadioButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.imenu.UIPopupMenu;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.report.fit.menupane.FitRadioGroup;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.ComparatorUtils;
+import com.fr.report.fit.ReportFitAttr;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public class FormFitConfigPane extends ReportFitConfigPane {
+    private static final int ICON_OFFSET_X = 25;
+    private static final int ICON_OFFSET_Y = 3;
+    private static final int ICON_SIZE = 16;
+    private static final Image HOVER_IMAGE = SVGLoader.load("/com/fr/design/icon/icon_ec_default_fit.svg");
+    private static final int DEFAULT_ITEM = 0;
+
+    private static final int CUSTOM_ITEM = 1;
+
+    public FormFitConfigPane(FitAttrModel fitAttrModel) {
+        this(fitAttrModel, false);
+    }
+
+    public FormFitConfigPane(FitAttrModel fitAttrModel, boolean globalConfig) {
+        super(fitAttrModel, globalConfig);
+    }
+
+    protected JPanel initECConfigPane() {
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        if (fitAttrModel.getFitTypeNames().length != 0) {
+            Component[] ecComponents = new Component[fitAttrModel.getFitTypeNames().length + 1];
+            initRadioGroup(ecConfigRadioGroup, fitAttrModel.getFitName(), fitAttrModel.getFitTypeNames(), ecComponents);
+            jPanel.add(createSubAttrPane(ecComponents), BorderLayout.CENTER);
+            jPanel.add(createTipPane(), BorderLayout.SOUTH);
+        }
+        return jPanel;
+    }
+
+    protected void initRadioGroup(FitRadioGroup fitRadioGroup, String name, String[] options, Component[] components) {
+        components[0] = new UILabel(name);
+        for (int i = 0; i < options.length; i++) {
+            if (options[i] != null) {
+                UIRadioButton fontFitRadio = ComparatorUtils.equals(options[i], Toolkit.i18nText("Fine-Designer_Fit-Default")) ? new UIRadioButtonWithIcon(options[i]) : new UIRadioButton(options[i]);
+                fitRadioGroup.add(fontFitRadio);
+                components[i + 1] = fontFitRadio;
+            } else {
+                components[i + 1] = null;
+            }
+        }
+        fitRadioGroup.addActionListener(getPreviewActionListener());
+    }
+
+   private class UIRadioButtonWithIcon extends UIRadioButton {
+        private final JPopupMenu popupMenu;
+        private NewFitPreviewPane ecFitPreviewPane;
+
+        public UIRadioButtonWithIcon(String text) {
+            super(text);
+            popupMenu = this.createPopupMenu();
+            initMouseListener();
+        }
+
+        private JPopupMenu createPopupMenu() {
+            UIPopupMenu uiPopupMenu = new UIPopupMenu() {
+                @Override
+                protected void paintBorder(Graphics g) {
+
+                }
+            };
+            uiPopupMenu.setLayout(new BorderLayout(0, 0));
+            uiPopupMenu.setOpaque(false);
+            uiPopupMenu.add(ecFitPreviewPane = new NewFitPreviewPane(FitType.HORIZONTAL_FIT), BorderLayout.CENTER);
+            ecFitPreviewPane.setPreferredSize(new Dimension(300, 204));
+            return uiPopupMenu;
+        }
+
+        private void initMouseListener() {
+            this.addMouseListener(new MouseAdapter() {
+                @Override
+                public void mouseExited(MouseEvent e) {
+                    super.mouseExited(e);
+                    hidePreviewPane();
+                }
+            });
+            int defaultTextWidth = calculateStartX();
+            this.addMouseMotionListener(new MouseAdapter() {
+                @Override
+                public void mouseMoved(MouseEvent e) {
+                    super.mouseMoved(e);
+                    if (new Rectangle(ICON_OFFSET_X + defaultTextWidth, ICON_OFFSET_Y, ICON_SIZE, ICON_SIZE).contains(e.getPoint())) {
+                        showPreviewPane(e);
+                    } else {
+                        hidePreviewPane();
+                    }
+
+                }
+            });
+        }
+
+        public void showPreviewPane(MouseEvent e) {
+            popupMenu.setVisible(true);
+            ecFitPreviewPane.refreshPreview(fontRadioGroup.isFontFit());
+            GUICoreUtils.showPopupMenu(popupMenu, this, e.getX() + 10, e.getY() + 10);
+        }
+
+        public void hidePreviewPane() {
+            if (popupMenu != null && popupMenu.isVisible()) {
+                popupMenu.setVisible(false);
+            }
+        }
+
+
+        @Override
+        public void paint(Graphics g) {
+            super.paint(g);
+            g.drawImage(HOVER_IMAGE, calculateStartX() + ICON_OFFSET_X, ICON_OFFSET_Y, null);
+        }
+
+        private int calculateStartX() {
+            FontMetrics metrics = this.getFontMetrics(this.getFont());
+            return metrics.stringWidth(this.getText());
+        }
+    }
+
+    private JPanel createTipPane() {
+        JPanel jPanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
+        UILabel label1 = new UILabel(Toolkit.i18nText("Fine-Design_Form_PC_FIT_Config_Tip1"));
+        jPanel.add(label1);
+        label1.setForeground(Color.lightGray);
+        UILabel label2 = new UILabel(Toolkit.i18nText("Fine-Design_Form_PC_FIT_Config_Tip2"));
+        jPanel.add(label2);
+        label2.setForeground(Color.lightGray);
+        return jPanel;
+    }
+
+    protected void refreshPreviewJPanel() {
+        previewJPanel.refreshPreview(fontRadioGroup.isFontFit());
+    }
+
+    protected void populateECConfigRadioGroup(int fitStateInPC) {
+        ecConfigRadioGroup.selectIndexButton(fitStateInPC == 0 ? DEFAULT_ITEM : CUSTOM_ITEM);
+    }
+
+    protected void updateECConfigRadioGroup(ReportFitAttr reportFitAttr) {
+        reportFitAttr.setFitStateInPC(ecConfigRadioGroup.getSelectRadioIndex());
+    }
+
+}

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

@@ -17,7 +17,7 @@ public class FrmFitAttrModel implements FitAttrModel {
 
     @Override
     public String getFitName() {
-        return Toolkit.i18nText("Fine-Designer_Fit-Element");
+        return Toolkit.i18nText("Fine-Design_Form_PC_FIT_Config_EC_Label");
     }
 
     public FitType[] getFitTypes() {
@@ -29,6 +29,13 @@ public class FrmFitAttrModel implements FitAttrModel {
         };
     }
 
+    @Override
+    public String[] getFitTypeNames() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Designer_Fit-Default"), Toolkit.i18nText("Fine-Design_Basic_Custom")
+        };
+    }
+
     @Override
     public ReportFitAttr getGlobalReportFitAttr() {
         return ReportFitConfig.getInstance().getFrmFitAttr();

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

@@ -0,0 +1,79 @@
+package com.fr.design.report.fit;
+
+import com.fr.base.GraphHelper;
+import com.fr.general.FRFont;
+
+import javax.swing.JPanel;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+
+
+public class NewFitPreviewPane extends JPanel {
+    private boolean fitFont = false;
+    private FitType fitType = FitType.DOUBLE_FIT;
+    private static final Color DEFAULT_PAINT_COLOR = Color.decode("#419BF9");
+    private static final int FIT_FONT_SIZE = 15;
+    private static final int NO_FIT_FONT_SIZE = 10;
+    private static final Dimension NO_FIT_CONTAINER_DIMENSION = new Dimension(230, 80);
+
+    public NewFitPreviewPane(){
+
+    }
+
+    public NewFitPreviewPane(FitType fitType){
+        this.fitType = fitType;
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        super.paint(g);
+        g.setColor(Color.GRAY);
+        GraphHelper.drawRect(g, 1, 1, this.getWidth() - 2, this.getHeight() - 2);
+        g.setColor(DEFAULT_PAINT_COLOR);
+        FRFont textFont = FRFont.getInstance(FRFont.DEFAULT_FONTNAME, Font.PLAIN, fitFont ? FIT_FONT_SIZE : NO_FIT_FONT_SIZE);
+        g.setFont(textFont);
+        Dimension dimension = calculateCellDimension();
+        GraphHelper.drawLine(g, 1, dimension.height, dimension.width * 2 - 1, dimension.height);
+        GraphHelper.drawLine(g, dimension.width, 1, dimension.width, dimension.height * 2 - 1);
+        GraphHelper.drawRect(g, 1, 1, dimension.width * 2 - 2, dimension.height * 2 - 2);
+        double startX = calculateTextDrawStartX(dimension.width, this.getFontMetrics(textFont), "text1");
+        double startY = calculateTextDrawStartY(dimension.height);
+        GraphHelper.drawString(g, "text1", startX, startY);
+        GraphHelper.drawString(g, "text2", dimension.width + startX, startY);
+        GraphHelper.drawString(g, "text3", startX, dimension.height + startY);
+        GraphHelper.drawString(g, "text4", dimension.width + startX, dimension.height + startY);
+    }
+
+    private Dimension calculateCellDimension() {
+        if (fitType == FitType.DOUBLE_FIT) {
+            return new Dimension(this.getWidth() / 2, this.getHeight() / 2);
+        } else if (fitType == FitType.NOT_FIT) {
+            return new Dimension(NO_FIT_CONTAINER_DIMENSION.width / 2, NO_FIT_CONTAINER_DIMENSION.height / 2);
+        } else {
+            return new Dimension(this.getWidth() / 2, NO_FIT_CONTAINER_DIMENSION.height / 2);
+        }
+    }
+
+    private double calculateTextDrawStartX(int containerWidth, FontMetrics fontMetrics, String text) {
+        return (containerWidth - fontMetrics.stringWidth(text)) / 2.0D;
+    }
+
+    private double calculateTextDrawStartY(int containerHeight) {
+        return containerHeight / 2.0D;
+    }
+
+    public void refreshPreview(boolean fitFont, FitType fitType) {
+        this.fitFont = fitFont;
+        this.fitType = fitType;
+        repaint();
+    }
+
+    public void refreshPreview(boolean fitFont) {
+        this.fitFont = fitFont;
+        repaint();
+    }
+
+}

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

@@ -0,0 +1,172 @@
+package com.fr.design.report.fit;
+
+import com.fr.design.gui.ibutton.UIRadioButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.DesignSizeI18nManager;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.report.fit.menupane.FitRadioGroup;
+import com.fr.design.report.fit.menupane.FontRadioGroup;
+import com.fr.general.ComparatorUtils;
+import com.fr.report.fit.ReportFitAttr;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import static com.fr.design.i18n.Toolkit.i18nText;
+
+public class ReportFitConfigPane extends JPanel {
+    public FontRadioGroup fontRadioGroup;
+    public FitRadioGroup ecConfigRadioGroup;
+    protected NewFitPreviewPane previewJPanel;
+    protected FitAttrModel fitAttrModel;
+    protected boolean globalConfig;
+
+
+    public ReportFitConfigPane(FitAttrModel fitAttrModel, boolean globalConfig) {
+        this.fitAttrModel = fitAttrModel;
+        this.globalConfig = globalConfig;
+        initComponent();
+    }
+
+    private void initComponent() {
+        JPanel contentJPanel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(false, FlowLayout.LEFT, 0, 0);
+        this.add(contentJPanel);
+        fontRadioGroup = new FontRadioGroup();
+        ecConfigRadioGroup = new FitRadioGroup();
+        contentJPanel.add(initAttrJPanel());
+        contentJPanel.add(initPreviewJPanel());
+    }
+
+    private JPanel initAttrJPanel() {
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        Component[] fontComponents = new Component[3];
+        initRadioGroup(fontRadioGroup, i18nText("Fine-Designer_Fit-Font"), new String[]{i18nText("Fine-Designer_Fit"), i18nText("Fine-Designer_Fit-No")}, fontComponents);
+        jPanel.add(createSubAttrPane(fontComponents), BorderLayout.NORTH);
+        jPanel.add(initECConfigPane(), BorderLayout.CENTER);
+        return jPanel;
+    }
+
+    protected JPanel initECConfigPane() {
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        Component[] ecComponents = new Component[fitAttrModel.getFitTypeNames().length + 1];
+        initRadioGroup(ecConfigRadioGroup, fitAttrModel.getFitName(), fitAttrModel.getFitTypeNames(), ecComponents);
+        jPanel.add(createSubAttrPane(ecComponents), BorderLayout.CENTER);
+        return jPanel;
+    }
+
+
+    protected JPanel createSubAttrPane(Component[] components) {
+        double[] rowSize = new double[]{20};
+        double[] columnSize = new double[components.length];
+        for (int i = 0; i < columnSize.length; i++) {
+            if (i == 0) {
+                columnSize[i] = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.firstColumn").getWidth();
+            } else {
+                columnSize[i] = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.column").getWidth();
+            }
+        }
+
+        JPanel attrJPanel = TableLayoutHelper.createTableLayoutPane(new Component[][]{components}, rowSize, columnSize);
+        attrJPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));
+        return attrJPanel;
+    }
+
+    protected void initRadioGroup(FitRadioGroup fitRadioGroup, String name, String[] options, Component[] components) {
+        components[0] = new UILabel(name);
+        for (int i = 0; i < options.length; i++) {
+
+            if (options[i] != null) {
+                UIRadioButton fontFitRadio = new UIRadioButton(options[i]);
+                fitRadioGroup.add(fontFitRadio);
+                components[i + 1] = fontFitRadio;
+            } else {
+                components[i + 1] = null;
+            }
+        }
+        fitRadioGroup.addActionListener(getPreviewActionListener());
+    }
+
+    protected ActionListener getPreviewActionListener() {
+        return new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                refreshPreviewJPanel();
+            }
+        };
+    }
+
+    public void refreshPreviewJPanel(FitType fitType) {
+        previewJPanel.refreshPreview(fontRadioGroup.isFontFit(), fitType);
+    }
+
+    protected void refreshPreviewJPanel() {
+        previewJPanel.refreshPreview(fontRadioGroup.isFontFit(), FitType.parse(updateBean()));
+    }
+
+    private JPanel initPreviewJPanel() {
+        JPanel wrapperPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        previewJPanel = new NewFitPreviewPane();
+        wrapperPane.add(previewJPanel, BorderLayout.CENTER);
+        int leftIndent = globalConfig ? (int) DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.firstColumn").getWidth() : 0;
+        wrapperPane.setBorder(BorderFactory.createEmptyBorder(0, leftIndent, 0, 0));
+        wrapperPane.setPreferredSize(new Dimension(300 + leftIndent, 204));
+        return wrapperPane;
+    }
+
+
+    public void populateBean(ReportFitAttr ob) {
+        fontRadioGroup.selectIndexButton(ob.isFitFont() ? 0 : 1);
+        populateECConfigRadioGroup(ob.fitStateInPC());
+        refreshPreviewJPanel();
+    }
+
+    protected void populateECConfigRadioGroup(int fitStateInPC){
+        ecConfigRadioGroup.selectIndexButton(getOptionIndex(fitStateInPC));
+    }
+
+
+    protected void updateECConfigRadioGroup(ReportFitAttr reportFitAttr){
+        reportFitAttr.setFitStateInPC(getStateInPC(ecConfigRadioGroup.getSelectRadioIndex()));
+    }
+
+    public ReportFitAttr updateBean() {
+        ReportFitAttr reportFitAttr = new ReportFitAttr();
+        reportFitAttr.setFitFont(fontRadioGroup.isFontFit());
+        updateECConfigRadioGroup(reportFitAttr);
+        return reportFitAttr;
+    }
+
+
+    protected int getStateInPC(int index) {
+        FitType[] fitTypes = fitAttrModel.getFitTypes();
+        if (index > fitTypes.length - 1) {
+            return index;
+        }
+        return fitTypes[index].getState();
+    }
+
+    protected int getOptionIndex(int state) {
+        FitType[] fitTypes = fitAttrModel.getFitTypes();
+        for (int i = 0; i < fitTypes.length; i++) {
+            if (ComparatorUtils.equals(state, fitTypes[i].getState())) {
+                return i;
+            }
+        }
+        return 0;
+    }
+
+
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        fontRadioGroup.setEnabled(enabled);
+        ecConfigRadioGroup.setEnabled(enabled);
+    }
+
+}

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

@@ -4,62 +4,47 @@
 package com.fr.design.style.background.image;
 
 import com.fr.design.DesignerEnvManager;
-import com.fr.design.gui.ifilechooser.FileSelectionMode;
+import com.fr.design.gui.ifilechooser.FileChooserFactory;
-import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
+import com.fr.design.gui.ifilechooser.FileChooserProvider;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.share.collect.ComponentCollector;
 import com.fr.design.mainframe.toast.DesignerToastMsgUtil;
-import javafx.stage.FileChooser;
 
-import javax.swing.*;
+
-import java.awt.*;
+import java.awt.Component;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.io.File;
+import javax.swing.SwingUtilities;
 
 
 /**
  * This class used to choose image files.
  */
 public class ImageFileChooser {
-
+    private final FileChooserProvider fileChooserProvider;
-    JavaFxNativeFileChooser javaFxNativeFileChooser;
 
     public ImageFileChooser() {
-        javaFxNativeFileChooser =
+        fileChooserProvider = FileChooserFactory.createImageFileChooser();
-                new JavaFxNativeFileChooser.Builder().
-                        fileSelectionMode(FileSelectionMode.FILE).
-                        title(Toolkit.i18nText("Fine-Design_Basic_Open")).
-                        filter(Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files"), "*.jpg", "*.gif", "*.png", "*.bmp").
-                        build();
     }
 
 
     public int showOpenDialog(Component parent, String approveButtonText) {
-        return showOpenDialog(parent);
+        return fileChooserProvider.showOpenDialog(parent, approveButtonText);
     }
 
     public int showOpenDialog(Component parent) {
         showImageCompressMoveTip();
-        return javaFxNativeFileChooser.showDialog(parent);
+        return fileChooserProvider.showDialog(parent);
     }
 
     public void setCurrentDirectory(File file) {
-        javaFxNativeFileChooser.setCurrentDirectory(file);
+        fileChooserProvider.setCurrentDirectory(file);
     }
 
     public void setMultiSelectionEnabled(boolean multiple) {
-        if (multiple) {
+        fileChooserProvider.setMultiSelectionEnabled(multiple);
-            javaFxNativeFileChooser.setSelectionMode(FileSelectionMode.MULTIPLE_FILE);
-        } else {
-            javaFxNativeFileChooser.setSelectionMode(FileSelectionMode.FILE);
-        }
     }
 
     public File getSelectedFile() {
-        return javaFxNativeFileChooser.getSelectedFile();
+        return fileChooserProvider.getSelectedFile();
     }
 
     public boolean isCheckSelected() {