Merge pull request #3314 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit 'b99a875479c3f5c1094a4d8b1f3510d739241225':
  REPORT-45689 兼容空类型 无须填充面板
  REPORT-46679 jdk11-设计器内图标优化-目录树图标都模糊，尤其是刷新图标 【问题原因】svg图标漏传到release分支了，所以显示的是之前的png图，比较模糊 【改动思路】补充图标
  REPORT-46234 普通报表\聚合报表，点击para，上方是控件设置，但是下方是组件名称
  REPORT-46779REPORT-46779 修复参数面板高度为负导致前端显示异常的问题

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

@@ -166,6 +166,9 @@ public class UIModeControlContainer extends JLayeredPane {
             }
             // 拖动的距离，为正值表示往下拖动，为负值表示往上拖动
             int deltaY = e.getY();
+            if (toolPaneY < 0) {
+                toolPaneY = 0;
+            }
             toolPaneY += deltaY;
             onResize(toolPaneY);
             refreshContainer();

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

@@ -99,7 +99,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
 
     public enum PropertyMode {
         REPORT,  // 报表
-        REPORT_PARA,  // 报表参数面板
+        REPORT_PARA_WIDGET,  //报表参数面板中的控件
+        REPORT_PARA(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")),  // 报表参数面板
         REPORT_FLOAT,  // 报表悬浮元素
         FORM(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")),  // 表单
         FORM_REPORT,  // 表单报表块
@@ -272,27 +273,27 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         propertyItemMap = new LinkedHashMap<>();  // 有序map
         // 单元格元素
         PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Element"),
-                "cellelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "cellelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 单元格属性
         PropertyItem cellAttr = new PropertyItem(KEY_CELL_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Attributes"),
-                "cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 悬浮元素
         PropertyItem floatElement = new PropertyItem(KEY_FLOAT_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Float_Element"),
-                "floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.POLY_REPORT});
         // 控件设置
         PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings"),
-                "widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY},
-                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART});
+                "widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY},
+                new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART});
         // 条件属性
         PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"),
-                "conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 超级链接
         PropertyItem hyperlink = new PropertyItem(KEY_HYPERLINK, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink"),
-                "hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 组件库
         PropertyItem widgetLib = new PropertyItem(KEY_WIDGET_LIB, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Library"),

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileParamSettingPane.java

@@ -12,6 +12,7 @@ import com.fr.form.ui.mobile.MobileParamStyle;
 import com.fr.general.ComparatorUtils;
 import com.fr.report.ExtraReportClassManager;
 import com.fr.report.fun.MobileParamStyleProvider;
+import com.fr.report.mobile.EmptyMobileParamStyle;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Component;
@@ -103,7 +104,10 @@ public class MobileParamSettingPane extends BasicPane {
                 if (ComparatorUtils.equals(mobileParamStyle.disPlayName(), provider.displayName())) {
                     String displayName = provider.displayName();
                     paramStyleList.setSelectedIndex(i);
+                    // 如果是兼容空类型 无须填充面板
+                    if (!(mobileParamStyle instanceof EmptyMobileParamStyle)) {
                         map.get(displayName).populateBean(mobileParamStyle);
+                    }
                     card.show(right, displayName);
                     return;
                 }

designer-form/src/main/java/com/fr/design/mainframe/widget/ui/WidgetBasicPropertyPaneFactory.java

@@ -1,21 +1,37 @@
 package com.fr.design.mainframe.widget.ui;
 
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XWParameterLayout;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.mainframe.EastRegionContainerPane;
+import com.fr.design.mainframe.JForm;
 
 /**
  * Created by kerry on 2017/9/30.
  */
 public class WidgetBasicPropertyPaneFactory {
 
-    public static FormBasicPropertyPane createBasicPropertyPane(XCreator xCreator){
-        if(xCreator.supportSetVisible() && xCreator.supportSetEnable()){
+    public static FormBasicPropertyPane createBasicPropertyPane(XCreator xCreator) {
+        freshPropertyMode(xCreator);
+        if (xCreator.supportSetVisible() && xCreator.supportSetEnable()) {
             return new FormBasicWidgetPropertyPane();
         }
-        if(xCreator.supportSetVisible()){
+        if (xCreator.supportSetVisible()) {
             return new BasicSetVisiblePropertyPane();
-        }else{
+        } else {
             return new FormBasicPropertyPane();
         }
 
     }
+
+    private static void freshPropertyMode(XCreator xCreator) {
+        if (!(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate() instanceof JForm)) {
+            if (xCreator instanceof XWParameterLayout) {
+                EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA);
+            } else {
+                EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA_WIDGET);
+            }
+        }
+    }
+
 }