Merge pull request #3120 in DESIGN/design from feature/10.0 to research/10.0

* commit '090e4ce16bb34a50f5c75ce5da5c5c656601ddca': REPORT-45402 插件管理-安装已经本地已经安装低版本的插件，点否不更新，还是会更新已安装的插件 REPORT-45441 聚合报表-设计-图表块-名称功能描述优化 REPORT-45441 聚合报表-设计-图表块-名称功能描述优化 REPORT-45441 聚合报表-设计-图表块-名称功能描述优化 CHART-17231 默认不选中任何项 REPORT-45015 条件属性-数字控件没有错误提示
4 years ago · c1683762b7
6 changed files with 45 additions and 9 deletions
--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
@ -51,12 +51,13 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
                    FineJOptionPane.OPTION_YES_NO_CANCEL,
                    null
            );
-            if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
+            if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
+                jsCallback.execute("success");
                return;
            }
            PluginMarker pluginMarker = result.getCurrentTask().getMarker();
            PluginOperateUtils.updatePluginOnline(pluginMarker, jsCallback);
-        }else {
+        } else {
            jsCallback.execute("failed");
            FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));
            FineJOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
--- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
@ -105,7 +105,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
        FORM_REPORT,  // 表单报表块
        POLY,  // 聚合报表
        POLY_REPORT,  // 聚合报表-报表块
-        POLY_CHART,  // 聚合报表-图表块
+        POLY_CHART(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")),  // 聚合报表-图表块
        AUTHORITY_EDITION,  // 权限编辑
        AUTHORITY_EDITION_DISABLED; // 权限编辑

--- a/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java
+++ b/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java
@ -19,6 +19,30 @@ import java.awt.Component;
 * Created by plough on 2017/8/7.
 */
 public class WidgetBoundsPaneFactory {
+
+    public enum NameAttribute {
+        //默认的名称
+        DEFAULT(Toolkit.i18nText("Fine-Design_Basic_Component_Position"), Toolkit.i18nText("Fine-Design_Basic_Component_Size")),
+        //控件对应的名称
+        WIDGET(Toolkit.i18nText("Fine-Design_Basic_Widget_Position"), Toolkit.i18nText("Fine-Design_Basic_Widget_Size"));
+
+        private String positionName;
+        private String sizeName;
+        
+        NameAttribute(String positionName, String sizeName) {
+            this.positionName = positionName;
+            this.sizeName = sizeName;
+        }
+
+        public String getPositionName() {
+            return positionName;
+        }
+
+        public String getSizeName() {
+            return sizeName;
+        }
+    }
+
    private static final int RIGHT_PANE_WIDTH = 145;

    public static UIExpandablePane createBoundsPane(UISpinner width, UISpinner height) {
@ -37,7 +61,8 @@ public class WidgetBoundsPaneFactory {
        boundsPane.add(panel);
        return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 280, 24, boundsPane);
    }
-    public static JPanel createRightPane(Component com1, Component com2){
+
+    public static JPanel createRightPane(Component com1, Component com2) {
        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        double[] rowSize = {p};
@ -49,16 +74,16 @@ public class WidgetBoundsPaneFactory {
        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L1);
    }

-    public static UIExpandablePane createAbsoluteBoundsPane(UISpinner x, UISpinner y, UISpinner width, UISpinner height) {
+    public static UIExpandablePane createAbsoluteBoundsPane(UISpinner x, UISpinner y, UISpinner width, UISpinner height, NameAttribute nameAttribute) {
        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;

        Component[][] northComponents = new Component[][]{
-                new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Basic_Widget_Position")), createRightPane(x, y)},
+                new Component[]{FRWidgetFactory.createLineWrapLabel(nameAttribute.getPositionName()), createRightPane(x, y)},
                new Component[]{null, createRightPane(new UILabel(Toolkit.i18nText("Fine-Design_Basic_X_Coordinate"), SwingConstants.CENTER), new UILabel(Toolkit.i18nText("Fine-Design_Basic_Y_Coordinate"), SwingConstants.CENTER))},
        };
        Component[][] centerComponents = new Component[][]{
-                new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Basic_Widget_Size")), createRightPane(width, height)},
+                new Component[]{FRWidgetFactory.createLineWrapLabel(nameAttribute.getSizeName()), createRightPane(width, height)},
                new Component[]{null, createRightPane(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Width"), SwingConstants.CENTER), new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Height"), SwingConstants.CENTER))},
        };
        double[] rowSize = {p, p};
@ -74,6 +99,10 @@ public class WidgetBoundsPaneFactory {
        return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 230, 24, boundsPane);
    }

+    public static UIExpandablePane createAbsoluteBoundsPane(UISpinner x, UISpinner y, UISpinner width, UISpinner height) {
+        return createAbsoluteBoundsPane(x, y, width, height, NameAttribute.DEFAULT);
+    }
+

    public static UIExpandablePane createCardTagBoundPane(UISpinner width) {
        JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
--- a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java
+++ b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java
@ -150,6 +150,7 @@ public class NumberEditorValidatePane extends JPanel {
        setMaxListener = new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
+                errorMsgTextFieldPane.setVisible(setMaxValueCheckBox.isSelected() || setMinValueCheckBox.isSelected());
                if (setMaxValueCheckBox.isSelected()) {
                    maxValueSpinner.setEnabled(true);
                    Double value = (double) 0;
@ -171,6 +172,7 @@ public class NumberEditorValidatePane extends JPanel {
        setMinListener = new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
+                errorMsgTextFieldPane.setVisible(setMaxValueCheckBox.isSelected() || setMinValueCheckBox.isSelected());
                if (setMinValueCheckBox.isSelected()) {
                    minValueSpinner.setEnabled(true);
                    Double value = (double) 0;
--- a/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java
@ -23,7 +23,11 @@ public class UIComboBoxWithNone extends UIComboBox {
    }

    protected void setDefaultSelectedItem() {
-        setSelectedItem(StringUtils.EMPTY);
+        // JComboBox.setSelectedItem(o)
+        // if(o!=null)寻找o对应的下拉选项 如果找不到 还是选中之前选中的
+        // 所以空字符串 不是选中空 是选中上次选中的
+        // 所以这边 可以写setSelectedItem(null) or setSelectedIndex(-1)
+        setSelectedIndex(-1);
    }

    @Override
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java
@ -34,7 +34,7 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane {
        y.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
        width.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
        height.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
-        this.add(WidgetBoundsPaneFactory.createAbsoluteBoundsPane(x, y, width, height));
+        this.add(WidgetBoundsPaneFactory.createAbsoluteBoundsPane(x, y, width, height, WidgetBoundsPaneFactory.NameAttribute.WIDGET));
    }

    @Override