Merge branch 'release/10.0' of http://code.fineres.com/scm/~harrison/design into release/10.0

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

@@ -27,6 +27,7 @@ import com.fr.transaction.Worker;
 import com.fr.transaction.WorkerFacade;
 
 import javax.swing.KeyStroke;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.util.HashMap;
 import java.util.Map;
@@ -35,7 +36,8 @@ import java.util.Map;
  * Global TableData.
  */
 public class GlobalTableDataAction extends UpdateAction implements ResponseDataSourceChange {
-    //private static TableDataManagerPane globalTableDataPane = new TableDataManagerPane();
+
+    private static final Dimension DEFAULT_DIMENSION = new Dimension(1000, 600);
 
     public GlobalTableDataAction() {
         this.setMenuKeySet(SERVER_TABLEDATA);
@@ -80,7 +82,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
                 tableDataConfig.renameTableData(oldName, newName);
             }
         };
-        final BasicDialog globalTableDataDialog = globalTableDataPane.showLargeWindow(designerFrame, null);
+        final BasicDialog globalTableDataDialog = globalTableDataPane.showWindowWithCustomSize(designerFrame, null, DEFAULT_DIMENSION);
 
         globalTableDataDialog.addDialogActionListener(new DialogActionAdapter() {
 

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

@@ -35,6 +35,7 @@ public class TableDataCreatorProducer {
                 "ds",
                 "/com/fr/design/images/data/database.png", DBTableData.class, DBTableDataPane.class);
         TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"),
+                "Class",
                 "/com/fr/design/images/data/source/classTableData.png", ClassTableData.class, ClassTableDataPane.class);
         TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"),
                 "Embedded",

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

@@ -238,13 +238,10 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         isShareCheckBox.setBackground(Color.WHITE);
         maxPanel = new MaxMemRowCountPanel();
         maxPanel.setBorder(null);
-        JPanel wrapMaxPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        wrapMaxPanel.add(maxPanel);
-        wrapMaxPanel.setPreferredSize(new Dimension(350, 20));
         UIToolbar editToolBar = ToolBarDef.createJToolBar();
         toolBarDef.updateToolBar(editToolBar);
         editToolBar.add(isShareCheckBox);
-        editToolBar.add(wrapMaxPanel);
+        editToolBar.add(maxPanel);
         return editToolBar;
     }
 

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

@@ -4,6 +4,7 @@ import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import com.fr.base.GraphHelper;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ilable.UILabel;
 
@@ -15,6 +16,20 @@ import com.fr.design.gui.itoolbar.UIToolbar;
 public class MaxMemRowCountPanel extends UIToolbar {
 	private static final int ALL_IN_MEMORY = 0;
 	private static final int MAX_IN_MEMORY = 1;
+	private static final String[] CACHE_LIST = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save_All_Records_In_Memory"),
+												com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Max_Mem_Row_Count") };
+	private static final int MAX_WIDTH = getMaxComBoBoxWidth() > 200 ? 350 : 250;
+
+	private static int getMaxComBoBoxWidth() {
+		int maxWidth = GraphHelper.getWidth(CACHE_LIST[0]);
+		for (int i = 1; i < CACHE_LIST.length; i++) {
+			int width = GraphHelper.getWidth(CACHE_LIST[i]);
+			if (width > maxWidth) {
+				maxWidth = width;
+			}
+		}
+		return maxWidth;
+	}
 
 	private UISpinner numberSpinner;
 	private UIComboBox switchCache;
@@ -44,7 +59,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
 	@Override
 	public Dimension getPreferredSize() {
 		Dimension dim = super.getPreferredSize();
-		dim.width = 340;
+		dim.width = MAX_WIDTH;
 		return dim;
 	};
 
@@ -52,8 +67,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
 		this.setFloatable(false);
 		this.setRollover(true);
 		this.setBackground(UIConstants.NORMAL_BACKGROUND);
-		String[] cacheList = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save_All_Records_In_Memory"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Max_Mem_Row_Count") };
+		switchCache = new UIComboBox(CACHE_LIST);
-		switchCache = new UIComboBox(cacheList);
 		switchCache.addActionListener(switchStateL);
 		numberSpinner = new UISpinner(0, Integer.MAX_VALUE, 1);
 	}

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

@@ -2,6 +2,7 @@ package com.fr.design.file;
 
 import com.fr.base.chart.chartdata.CallbackEvent;
 import com.fr.base.io.BaseBook;
+import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.data.DesignTableDataManager;
@@ -384,9 +385,14 @@ public class HistoryTemplateListCache implements CallbackEvent {
                         historyList.set(i, template);
                         // 替换当前正在编辑的模板，使用添加并激活的方式，以便使用统一的入口来处理监听事件
                         if (isCurrentEditingFile(template.getPath())) {
-                            DesignerContext.getDesignerFrame().addAndActivateJTemplate(template);
+                            loadCurrentTemplate(template);
-                            setCurrentEditingTemplate(template);
+                        }
-                            FineLoggerFactory.getLogger().info("Env Change Current Editing Template.");
+                    } else {
+                        // 当模板为空时 说明是一个新建的未保存模板 但是内存中保存了该模板 可以从中获取
+                        JTemplate jt = historyList.get(i);
+                        // 另外如果该模板是正在编辑的模板，需要要激活
+                        if (jt != null && isCurrentEditingFile(jt.getPath())) {
+                            loadCurrentTemplate(jt);
                         }
                     }
                 } catch (Exception e) {
@@ -400,6 +406,12 @@ public class HistoryTemplateListCache implements CallbackEvent {
         FineLoggerFactory.getLogger().info("Env Change Template Loaded.");
     }
 
+    private void loadCurrentTemplate(JTemplate<?, ?> template) {
+        DesignerContext.getDesignerFrame().addAndActivateJTemplate(template);
+        setCurrentEditingTemplate(template);
+        FineLoggerFactory.getLogger().info("Env Change Current Editing Template " + template.getTemplateName());
+    }
+
     /**
      * 重新载入当前模板，刷新数据/对象
      */

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

@@ -2,7 +2,6 @@ package com.fr.design.formula;
 
 import com.fr.base.BaseFormula;
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
@@ -25,7 +24,6 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.parser.FRLexer;
 import com.fr.parser.FRParser;
 import com.fr.stable.EncodeConstants;
-import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.script.Expression;
 
@@ -54,7 +52,10 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
-import java.util.Locale;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 /**
  * 公式编辑面板
@@ -413,14 +414,19 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         if (keyWord.length() != 0) {
             NameAndDescription[] descriptions = FunctionConstants.ALL.getDescriptions();
             int lengthOfDes = descriptions.length;
+            List<String> list = new ArrayList<>();
             for (int i = 0; i < lengthOfDes; i++) {
                 NameAndDescription and = descriptions[i];
 
                 String functionName = and.searchResult(keyWord, findDescription);
                 if (StringUtils.isNotBlank(functionName)) {
-                    listModel.addElement(functionName);
+                    list.add(functionName);
                 }
             }
+            Collections.sort(list, new SimilarComparator(keyWord));
+            for (String name : list) {
+                listModel.addElement(name);
+            }
 
             if (!listModel.isEmpty()) {
                 tipsList.setSelectedIndex(0);
@@ -969,6 +975,26 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         }
     }
 
+    public static class SimilarComparator implements Comparator<String> {
+
+        private String searchKey;
+
+        public SimilarComparator(String searchKey) {
+            this.searchKey = searchKey.toLowerCase();
+        }
+
+        @Override
+        public int compare(String o1, String o2) {
+            if (o1.toLowerCase().startsWith(searchKey)) {
+                return -1;
+            }
+            if (o2.toLowerCase().startsWith(searchKey)) {
+                return 1;
+            }
+            return o2.compareTo(o1);
+        }
+    }
+
     public static class TextFolderUserObject {
 
         private String text;

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

@@ -0,0 +1,103 @@
+package com.fr.design.gui.ifilechooser;
+
+import javax.swing.filechooser.FileFilter;
+import java.awt.*;
+import java.io.File;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/3/31
+ */
+public abstract class AbstractFileChooser {
+
+    /**
+     * 返回当前目录
+     *
+     */
+    public abstract File getCurrentDirectory();
+
+    /**
+     * 返回当前的文件选择过滤器
+     *
+     */
+    public abstract FileFilter getFileFilter();
+
+    /**
+     * 返回选择的文件
+     *
+     */
+    public abstract File getSelectedFile();
+
+    /**
+     * 多文件选择模式下 返回选择的多个文件
+     *
+     */
+    public abstract File[] getSelectedFiles();
+
+    /**
+     * 是否可以选择多个文件
+     *
+     */
+    public abstract boolean isMultiSelectionEnabled();
+
+    /**
+     * 设置当前选择的目录
+     *
+     */
+    public abstract void setCurrentDirectory(File dir);
+
+    /**
+     * 设置左上角标题
+     *
+     */
+    public abstract void setDialogTitle(String title);
+
+    /**
+     * 设置当前的文件过滤器
+     *
+     */
+    public abstract void setFileFilter(final FileFilter filter);
+
+    /**
+     * 设置文件选择器模式
+     *
+     * JFileChooser.FILES_ONLY
+     * JFileChooser.DIRECTORIES_ONLY
+     * JFileChooser.FILES_AND_DIRECTORIES
+     */
+    public abstract void setFileSelectionMode(int selectionMode);
+
+    /**
+     * 设置是否允许选择多个文件
+     *
+     */
+    public abstract void setMultiSelectionEnabled(boolean multiple);
+
+    /**
+     * 设置选择的文件 用于showSaveDialog
+     *
+     */
+    public abstract void setSelectedFile(File file);
+
+    /**
+     * 弹出文件选择器 打开文件
+     *
+     */
+    public abstract int showOpenDialog(Component parent);
+
+    /**
+     * 弹出文件选择器 保存文件
+     *
+     */
+    public abstract int showSaveDialog(Component parent);
+
+
+    /**
+     * https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4031440
+     *
+     * 设置文件名后缀 起到文件过滤的作用 形如 "*.jpg;*.jpeg"
+     *
+     */
+    public abstract void setExtensionFilter(String file);
+}

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

@@ -0,0 +1,153 @@
+package com.fr.design.gui.ifilechooser;
+
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.stable.os.OperatingSystem;
+
+import javax.swing.*;
+import javax.swing.filechooser.FileFilter;
+import java.awt.*;
+import java.io.File;
+import java.io.FilenameFilter;
+
+
+/**
+ * 系统原生风格的文件选择器
+ *
+ *  jdk问题：
+ *  https://bugs.openjdk.java.net/browse/JDK-4811090 不支持文件扩展选择
+ *  https://stackoverflow.com/questions/40713398/filter-not-working-in-filedialog windows下 setFilenameFilter不work
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/3/31
+ */
+public class UINativeFileChooser extends AbstractFileChooser {
+
+    private final FileDialog fileDialog;
+    private FileFilter fileFilter;
+    private int selectionMode;
+
+    public UINativeFileChooser(File file) {
+        fileDialog = new FileDialog(DesignerContext.getDesignerFrame());
+        if (file != null) {
+            fileDialog.setDirectory(file.getAbsolutePath());
+            fileDialog.setFile(file.toString());
+        }
+    }
+
+    public UINativeFileChooser() {
+        this(null);
+    }
+
+    @Override
+    public File getCurrentDirectory() {
+        return new File(fileDialog.getDirectory());
+    }
+
+    @Override
+    public FileFilter getFileFilter() {
+        return fileFilter;
+    }
+
+    @Override
+    public File getSelectedFile() {
+        return new File(fileDialog.getDirectory() + fileDialog.getFile());
+    }
+
+    @Override
+    public File[] getSelectedFiles() {
+        return fileDialog.getFiles();
+    }
+
+    @Override
+    public boolean isMultiSelectionEnabled() {
+        return fileDialog.isMultipleMode();
+    }
+
+    @Override
+    public void setCurrentDirectory(File f) {
+        fileDialog.setDirectory(f.toString());
+    }
+
+    @Override
+    public void setDialogTitle(String title) {
+        fileDialog.setTitle(title);
+    }
+
+    @Override
+    public void setFileFilter(final FileFilter cff) {
+        FilenameFilter filter = new FilenameFilter() {
+            @Override
+            public boolean accept(File Directory, String fileName) {
+                return cff.accept(new File(Directory.getAbsolutePath() + fileName));
+            }
+        };
+        fileDialog.setFilenameFilter(filter);
+        fileFilter = cff;
+    }
+
+    @Override
+    public void setFileSelectionMode(int selectionMode) {
+        this.selectionMode = selectionMode;
+    }
+
+    @Override
+    public void setMultiSelectionEnabled(boolean multiple) {
+        fileDialog.setMultipleMode(multiple);
+    }
+
+    @Override
+    public void setSelectedFile(File file) {
+        fileDialog.setDirectory(file.getAbsolutePath());
+        fileDialog.setFile(file.getName());
+    }
+
+    @Override
+    public int showOpenDialog(Component parent) {
+        boolean appleProperty = OperatingSystem.isMacos() && selectionMode == JFileChooser.DIRECTORIES_ONLY;
+        if (appleProperty) {
+            System.setProperty("apple.awt.fileDialogForDirectories", "true");
+        }
+        try {
+            fileDialog.setLocale(JComponent.getDefaultLocale());
+            fileDialog.setMode(FileDialog.LOAD);
+            fileDialog.setVisible(true);
+            return fileDialog.getFile() == null ? JFileChooser.CANCEL_OPTION : JFileChooser.APPROVE_OPTION;
+        } finally {
+            if (appleProperty) {
+                System.setProperty("apple.awt.fileDialogForDirectories", "false");
+            }
+        }
+    }
+
+    @Override
+    public int showSaveDialog(Component parent) {
+        fileDialog.setLocale(JComponent.getDefaultLocale());
+        fileDialog.setMode(FileDialog.SAVE);
+        fileDialog.setVisible(true);
+        return fileDialog.getFile() == null ? JFileChooser.CANCEL_OPTION : JFileChooser.APPROVE_OPTION;
+    }
+
+    @Override
+    public void setExtensionFilter(String file) {
+        fileDialog.setFile(file);
+    }
+
+    /**
+     * 确认本地文件选择器是否支持选择模式
+     * @param selectionMode 选择模式
+     * @return 是否支持选择模式
+     */
+    public static boolean supportsSelectionMode(int selectionMode) {
+        switch (selectionMode) {
+            case JFileChooser.FILES_AND_DIRECTORIES:
+                return false;
+            case JFileChooser.DIRECTORIES_ONLY:
+                return OperatingSystem.isMacos();
+            case JFileChooser.FILES_ONLY:
+            default:
+                return true;
+        }
+    }
+
+}

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

@@ -11,6 +11,7 @@ import com.fr.design.gui.ibutton.UIButtonUI;
 import com.fr.design.gui.icontainer.UIEastResizableContainer;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.VerticalFlowLayout;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.general.FRFont;
@@ -150,12 +151,18 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                     public void on(PluginEvent event) {
                         PluginContext context = event.getContext();
                         PluginRuntime runtime = context.getRuntime();
-                        Set<PropertyItemPaneProvider> providers = runtime.get(PropertyItemPaneProvider.XML_TAG);
+                        final Set<PropertyItemPaneProvider> providers = runtime.get(PropertyItemPaneProvider.XML_TAG);
-                        for (PropertyItemPaneProvider provider : providers) {
+                        // UI相关的逻辑 用UI线程执行 不走FinePluginController线程 走FinePluginController线程有几率出问题
-                            addPropertyItem(provider);
+                        // 容易导致FinePluginController持有Swing内部的java.awt.Component$AWTTreeLock 这个锁不能被UI线程之外的线程持有 否则容易造成UI线程被Blocked住
-                        }
+                        UIUtil.invokeLaterIfNeeded(new Runnable() {
-                        updateAllPropertyPane();
+                            @Override
-                    }
+                            public void run() {
+                                for (PropertyItemPaneProvider provider : providers) {
+                                    addPropertyItem(provider);
+                                }
+                                updateAllPropertyPane();
+                            }
+                        });                    }
                 }, filter);
         PluginListenerRegistration.getInstance().listen(
                 PluginEventType.BeforeStop,
@@ -164,12 +171,16 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                     public void on(PluginEvent event) {
                         PluginContext context = event.getContext();
                         PluginRuntime runtime = context.getRuntime();
-                        Set<PropertyItemPaneProvider> providers = runtime.get(PropertyItemPaneProvider.XML_TAG);
+                        final Set<PropertyItemPaneProvider> providers = runtime.get(PropertyItemPaneProvider.XML_TAG);
-                        for (PropertyItemPaneProvider provider : providers) {
+                        UIUtil.invokeLaterIfNeeded(new Runnable() {
-                            removePropertyItem(provider);
+                            @Override
-
+                            public void run() {
-                        }
+                                for (PropertyItemPaneProvider provider : providers) {
-                        updateAllPropertyPane();
+                                    removePropertyItem(provider);
+                                }
+                                updateAllPropertyPane();
+                            }
+                        });
                     }
                 }, filter);
     }

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

@@ -24,11 +24,13 @@ public class DatabaseDialogAction implements OSBasedAction {
 
     @Override
     public void execute(Object... objects) {
-        if (ServerPreferenceConfig.getInstance().isUseUniverseDBM() && !OperatingSystem.isLinux()) {
+//        if (ServerPreferenceConfig.getInstance().isUseUniverseDBM() && !OperatingSystem.isLinux()) {
-            UniversalDatabaseOpener.showUniverseDatabaseDialog();
+//            UniversalDatabaseOpener.showUniverseDatabaseDialog();
-        } else {
+//        } else {
-            openDesignDatabaseManager();
+//        }
-        }
+        // 直接这里屏蔽掉 防止有设置过 导致配置数据库值为true 即使设置界面屏蔽也没用
+        openDesignDatabaseManager();
+
     }
 
     private void openDesignDatabaseManager() {

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

@@ -21,11 +21,10 @@ public class PMDialogAction implements OSBasedAction {
              DesignUtils.visitEnvServerByParameters( PLUGIN_MANAGER_ROUTE,null,null);
              return;
          }
-//        if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM() && !OperatingSystem.isLinux()) {
+        if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM() && !OperatingSystem.isLinux()) {
-//            UpmFinder.showUPMDialog();
+            UpmFinder.showUPMDialog();
-//        } else {
+        } else {
-//        }
+            WebViewDlgHelper.createPluginDialog();
-        // 直接这里屏蔽掉 防止有设置过 导致配置数据库值为true 即使设置界面屏蔽也没用
+        }
-        WebViewDlgHelper.createPluginDialog();
     }
 }

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

@@ -105,6 +105,18 @@ public enum SupportOSImpl implements SupportOS {
         public boolean support() {
             return OperatingSystem.isWindows();
         }
+    },
+
+    /**
+     * 原生文件选择器弹窗
+     * https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8019464 mac下原生弹窗国际化设置无效，jdk11中有修复
+     *
+     */
+    NATIVE_CHOOSER {
+        @Override
+        public boolean support() {
+            return OperatingSystem.isWindows();
+        }
     }
 
 }

designer-base/src/test/java/com/fr/design/formula/FormulaPaneTest.java

@@ -0,0 +1,25 @@
+package com.fr.design.formula;
+
+import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/5/20
+ */
+public class FormulaPaneTest extends TestCase {
+
+    @Test
+    public void testSimilarComparator() {
+        String[] strs = new String[] {"ScriptEval", "SPLIT", "SUMPRECISE"};
+        String[] result = new String[] {"SPLIT", "ScriptEval", "SUMPRECISE"};
+        Arrays.sort(strs, new FormulaPane.SimilarComparator("sp"));
+        Assert.assertArrayEquals(result, strs);
+    }
+
+}

designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterConditionPane.java

@@ -23,7 +23,7 @@ import com.fr.van.chart.scatter.component.VanChartScatterLineTypeConditionPane;
 import com.fr.van.chart.scatter.component.VanChartScatterMarkerConditionPane;
 import com.fr.van.chart.scatter.component.label.VanChartScatterLabelConditionPane;
 import com.fr.van.chart.scatter.component.tooltip.VanChartScatterTooltipConditionPane;
-import com.fr.van.chart.scatter.large.VanChartLargeModelMarkerConditionPane;
+import com.fr.van.chart.scatter.large.VanChartScatterLargeModelMarkerConditionPane;
 
 import java.awt.Dimension;
 
@@ -53,7 +53,7 @@ public class VanChartScatterConditionPane extends DataSeriesConditionPane {
         classPaneMap.put(VanChartAttrTrendLine.class, new VanChartTrendLineConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
         if(PlotFactory.largeDataModel(plot)){
-            classPaneMap.put(VanChartAttrMarker.class, new VanChartLargeModelMarkerConditionPane(this));
+            classPaneMap.put(VanChartAttrMarker.class, new VanChartScatterLargeModelMarkerConditionPane(this));
         } else {
             classPaneMap.put(VanChartAttrLine.class, new VanChartScatterLineTypeConditionPane(this));
             classPaneMap.put(VanChartAttrMarker.class, new VanChartScatterMarkerConditionPane(this));

designer-chart/src/main/java/com/fr/van/chart/scatter/large/VanChartScatterLargeModelMarkerConditionPane.java

@@ -0,0 +1,29 @@
+package com.fr.van.chart.scatter.large;
+
+import com.fr.chart.chartglyph.Marker;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.plugin.chart.marker.type.MarkerType;
+import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartMarkerConditionPane;
+
+public class VanChartScatterLargeModelMarkerConditionPane extends VanChartMarkerConditionPane {
+
+    public VanChartScatterLargeModelMarkerConditionPane(ConditionAttributesPane conditionAttributesPane) {
+        super(conditionAttributesPane);
+    }
+
+    protected void initMarkerPane() {
+
+        markerPane = new VanChartLargeModelMarkerPane() {
+            protected VanChartCommonMarkerPane createCommonMarkerPane() {
+
+                return new VanChartCommonMarkerPane() {
+                    protected Marker[] getMarkers() {
+                        return getNormalMarkersWithCustom(new MarkerType[]{MarkerType.MARKER_AUTO});
+                    }
+                };
+            }
+
+        };
+    }
+}

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

@@ -5,8 +5,10 @@ import com.fr.base.FRContext;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.ifilechooser.UINativeFileChooser;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.form.share.SharableWidgetProvider;
 import com.fr.form.share.ShareLoader;
@@ -333,13 +335,31 @@ public class FormWidgetDetailPane extends FormDockView{
                 new ActionListener() {
                     @Override
                     public void actionPerformed(ActionEvent e) {
-                        JFileChooser fileChooser = new JFileChooser();
+                        if (SupportOSImpl.NATIVE_CHOOSER.support()) {
-                        fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
+                            UINativeFileChooser nativeFileChooser = new UINativeFileChooser();
-                        fileChooser.setFileFilter(new FileNameExtensionFilter(".reu", "reu"));
+                            nativeFileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
-                        int returnValue = fileChooser.showDialog(new UILabel(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select"));
+                            nativeFileChooser.setMultiSelectionEnabled(true);
-                        if (returnValue == JFileChooser.APPROVE_OPTION) {
+                            nativeFileChooser.setExtensionFilter("*.reu");
-                            final File chosenFile = fileChooser.getSelectedFile();
+                            nativeFileChooser.setDialogTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select"));
-                            installFromDiskZipFile(chosenFile);
+                            int returnValue = nativeFileChooser.showOpenDialog(new UILabel());
+                            if (returnValue == JFileChooser.APPROVE_OPTION) {
+                                final File[] chosenFiles = nativeFileChooser.getSelectedFiles();
+                                for (File file : chosenFiles) {
+                                    installFromDiskZipFile(file);
+                                }
+                            }
+                        } else {
+                            JFileChooser fileChooser = new JFileChooser();
+                            fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
+                            fileChooser.setMultiSelectionEnabled(true);
+                            fileChooser.setFileFilter(new FileNameExtensionFilter(".reu", "reu"));
+                            int returnValue = fileChooser.showDialog(new UILabel(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select"));
+                            if (returnValue == JFileChooser.APPROVE_OPTION) {
+                                final File[] chosenFiles = fileChooser.getSelectedFiles();
+                                for (File file : chosenFiles) {
+                                    installFromDiskZipFile(file);
+                                }
+                            }
                         }
                     }
                 }

designer-realize/src/main/java/com/fr/design/cell/editor/RichTextToolBar.java

@@ -155,7 +155,7 @@ public class RichTextToolBar extends BasicPane{
     private void bindListener(){
         FRFont defaultFont = (this.textPane != null) ? FRFont.getInstance(this.textPane.getFont()) : RichTextPane.DEFAUL_FONT;
         fontNameComboBox.addItemListener(fontNameItemListener);
-        fontNameComboBox.setSelectedItem(defaultFont.getFontName());
+        fontNameComboBox.setSelectedItem(defaultFont.getFamily());
         fontSizeComboBox.addItemListener(fontSizeItemListener);
         fontSizeComboBox.setSelectedItem(scaleDown(defaultFont.getSize()));