Merge pull request #2046 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'b642c782edb36e0f0353c47d056a05c26282a5c2': REPORT-36778 【配合平台】版本号规范FR适配任务 REPORT-36778 【配合平台】版本号规范FR适配任务 REPORT-36778 【配合平台】版本号规范FR适配任务 REPORT-36778 【配合平台】版本号规范FR适配任务 REPORT-36778 【配合平台】版本号规范FR适配任务 CHART-15003 交互界面增加收缩于抽屉内 CHART-14960 结果数据的系列和中位数增加无 CHART-14925 分类默认选中无 update REPORT-37014 插件卸载后数据集面板图标还在的问题 REPORT-36200 【name63/user63】在控件右下方多次复制，并不会不断向右下复制
4 years ago · 97a54139f2
8 changed files with 57 additions and 15 deletions
--- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java
@ -55,8 +55,9 @@ public class AboutPane extends JPanel {
        JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
        centerPane.add(contentPane, BorderLayout.NORTH);

+        contentPane.add(new BoxCenterAligmentPane(getBuildTitle()));
        BoxCenterAlignmentCopyablePane buildCopyPane = new BoxCenterAlignmentCopyablePane(
-                getBuildTitle(),
+                StringUtils.EMPTY,
                getVersionBuildNO(),
                new String[]{
                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO"),
@ -204,7 +205,7 @@ public class AboutPane extends JPanel {

    private String getBuildTitle() {
        return append(ProductConstants.APP_NAME, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_Version"),
-                StringUtils.BLANK, ProductConstants.RELEASE_VERSION, BUILD_PREFIX);
+                StringUtils.BLANK, ProductConstants.VERSION, BUILD_PREFIX);
    }

    private JPanel getEmailActionPane(final String desc, final String mailTo) {
--- a/designer-base/src/main/java/com/fr/design/mainframe/WestRegionContainerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/WestRegionContainerPane.java
@ -39,8 +39,12 @@ public class WestRegionContainerPane extends UIResizableContainer {
        
            @Override
            public void on(PluginEvent event) {
-            
-                setDownPane(TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()));
+
+                if (getDownPane() != null) {
+                    replaceDownPane(TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()));
+                } else {
+                    setDownPane(TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()));
+                }
            }
        }, new PluginFilter() {
        
--- a/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java
+++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java
@ -79,7 +79,7 @@ class DesignerPushUpdateDialog extends UIDialog {

    private Model createModel(DesignerUpdateInfo updateInfo) {
        Model model = new Model();
-        model.setVersion(updateInfo.getLatestVersion());
+        model.setVersion(updateInfo.getLatestFullVersion());
        model.setContent(updateInfo.getPushContent());
        model.setMoreInfoUrl(updateInfo.getMoreInfoUrl());
        model.setBackgroundUrl(updateInfo.getBackgroundUrl());
--- a/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java
+++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java
@ -1,7 +1,12 @@
 package com.fr.design.update.push;

+import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.http.HttpToolbox;
+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 java.security.InvalidParameterException;
@ -14,6 +19,8 @@ class DesignerUpdateInfo {
    private static final String KEY_CONTENT = "content";
    private static final String KEY_BACKGROUND_URL = "background";
    private static final String KEY_MORE_INFO_URL = "more";
+    private static final String SPLIT_CHAR = "-";
+

    private final String currentVersion;  // 当前版本
    private final String latestVersion;  // 最新版本
@ -58,6 +65,26 @@ class DesignerUpdateInfo {
        return latestVersion;
    }

+    String getLatestFullVersion() {
+        try {
+            String url = CloudCenter.getInstance().acquireUrlByKind("jar10.new.update");
+            if (StringUtils.isBlank(url)) {
+                return StringUtils.EMPTY;
+            }
+            String res = HttpToolbox.get(url);
+            if (StringUtils.isBlank(res)) {
+                return StringUtils.EMPTY;
+            }
+            JSONObject jsonObject = JSONFactory.createJSON(JSON.OBJECT, res);
+            String version = jsonObject.getString("version");
+            String build = jsonObject.getString("build");
+            return version + SPLIT_CHAR + build;
+        } catch (Throwable e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return StringUtils.EMPTY;
+    }
+
    String getLastIgnoredVersion() {
        return lastIgnoredVersion;
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java
@ -6,7 +6,6 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.TableLayout;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
@ -76,10 +75,7 @@ public class BoxIndependentVanChartInterface extends AbstractIndependentVanChart
                return new VanChartInteractivePane() {

                    protected Component[][] createToolBarComponents() {
-                        return new Component[][]{
-                                new Component[]{null, exportImages},
-                                new Component[]{null, fullScreenDisplay}
-                        };
+                        return createToolBarComponentsWithOutSort();
                    }

                    protected AutoRefreshPane getMoreLabelPane(VanChartPlot plot) {
@ -87,11 +83,6 @@ public class BoxIndependentVanChartInterface extends AbstractIndependentVanChart
                        return new AutoRefreshPaneWithoutTooltip(chart, isLargeModel);
                    }

-                    protected double[] getToolBarRowSize() {
-                        double p = TableLayout.PREFERRED;
-                        return new double[]{p, p};
-                    }
-
                    protected ZoomPane createZoomPane() {
                        return new ZoomPane();
                    }
--- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java
@ -56,6 +56,11 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
        median = createUIComboBoxWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Median"));
        q1 = createUIComboBoxWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Q1"));
        min = createUIComboBoxWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Min"));
+
+        addNoneItem();
+
+        seriesName.setSelectedItem(null);
+        median.populateComboBox(null);
    }

    private JPanel createUIComboBoxPane(UIComboBox comboBox, String title) {
@ -134,6 +139,8 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
        refreshBoxItems(median.getComboBox(), list);
        refreshBoxItems(q1.getComboBox(), list);
        refreshBoxItems(min.getComboBox(), list);
+
+        addNoneItem();
    }

    public void clearAllBoxList() {
@ -145,6 +152,13 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
        clearBoxItems(median.getComboBox());
        clearBoxItems(q1.getComboBox());
        clearBoxItems(min.getComboBox());
+
+        addNoneItem();
+    }
+
+    private void addNoneItem() {
+        seriesName.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+        median.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
    }

    public void populateBean(ChartCollection collection) {
--- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesTypeUsePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesTypeUsePane.java
@ -71,6 +71,7 @@ public class BoxPlotTableSeriesTypeUsePane extends UIComboBoxPane<ChartCollectio
        categoryCombox = new UIComboBox();
        categoryCombox.setPreferredSize(new Dimension(100, 20));
        categoryCombox.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+        categoryCombox.setSelectedItem(null);

        north.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryCombox, null, null, label, null}));
        north.setPreferredSize(new Dimension(246, 30));
--- a/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java
@ -45,6 +45,10 @@ public abstract class UIComboBoxWithEditLabel extends JPanel implements UIObserv
        this.comboBox = comboBox;
    }

+    public void addItem(String value) {
+        comboBox.addItem(value);
+    }
+
    protected void addItemListener(ItemListener aListener) {
        comboBox.addItemListener(aListener);
    }