Pull request #7038: 无JIRA 代码合并

Merge in DESIGN/design from ~EASON/design:release/11.0 to release/11.0

* commit '0497bd25f5fb74eacca507ac66ac7ecf02f6e57c':
  REPORT-63092 漏传了import语句
  REPORT-63499
  REPORT-63499 按钮控件树节点配置控件事件，设计器上显示有问题
  update
  CHART-21584 feat:fvs.chart.font 单位px 范围6-200

designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java

@@ -125,7 +125,9 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li
         for (int i = 0, size = widget.getListenerSize(); i < size; i++) {
             Listener listener = widget.getListener(i);
             if (!listener.isDefault()) {
-                nameObjectList.add(i, new NameObject(switchLang(listener.getEventName()) + (i + 1), listener));
+                String eventName = switchLang(listener.getEventName()) + (nameObjectList.size() + 1);
+                NameObject nameObject = new NameObject(eventName, listener);
+                nameObjectList.add(nameObject);
             }
         }
         populate(getHelper().processCatalog(nameObjectList));

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java

@@ -13,6 +13,7 @@ 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.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.FRFont;
 import com.fr.general.GeneralUtils;
@@ -29,17 +30,21 @@ public class ChartTextAttrPane extends BasicPane {
     private static final long serialVersionUID = 6731679928019436869L;
     public static final int FONT_START = 6;
     public static final int FONT_END = 72;
+    public static final int FONT_END_4_DUCHAMP = 200;
     private UIComboBox fontNameComboBox;
     private UIComboBox fontSizeComboBox;
     private UIToggleButton bold;
     private UIToggleButton italic;
     private UIColorButton fontColor;
     public static Integer[] FONT_SIZES = new Integer[FONT_END - FONT_START + 1];
-
+    private static Integer[] FONT_SIZES_4_DUCHAMP = new Integer[FONT_END_4_DUCHAMP - FONT_START + 1];
     static {
         for (int i = FONT_START; i <= FONT_END; i++) {
             FONT_SIZES[i - FONT_START] = i;
         }
+        for (int i = FONT_START; i <= FONT_END_4_DUCHAMP; i++) {
+            FONT_SIZES_4_DUCHAMP[i - FONT_START] = i;
+        }
     }
 
     public ChartTextAttrPane() {
@@ -181,7 +186,7 @@ public class ChartTextAttrPane extends BasicPane {
     }
 
     protected Object[] getFontSizeComboBoxModel() {
-        return FONT_SIZES;
+        return ChartEditContext.duchampMode() ? FONT_SIZES_4_DUCHAMP : FONT_SIZES;
     }
 
     protected void initState() {

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithAuto.java

@@ -4,23 +4,30 @@ import com.fr.chart.base.ChartConstants;
 import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
 import com.fr.design.i18n.Toolkit;
-import com.fr.plugin.chart.type.FontAutoType;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
 import com.fr.general.GeneralUtils;
+import com.fr.plugin.chart.type.FontAutoType;
 
 public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane {
 
     private static final String AUTO = Toolkit.i18nText("Fine-Design_Basic_ChartF_Auto");
     private FontAutoType type;
     public static String[] FONT_SIZES_WITH_AUTO = new String[FONT_END - FONT_START + 2];
+    private static String[] FONT_SIZES_WITH_AUTO_4_DUCHAMP = new String[FONT_END_4_DUCHAMP - FONT_START + 2];
 
     static {
         FONT_SIZES_WITH_AUTO[0] = AUTO;
+        FONT_SIZES_WITH_AUTO_4_DUCHAMP[0] = AUTO;
 
         for (int i = 1; i < FONT_SIZES_WITH_AUTO.length; i++) {
             FONT_SIZES_WITH_AUTO[i] = FONT_START + i - 1 + "";
         }
+
+        for (int i = 1; i < FONT_SIZES_WITH_AUTO_4_DUCHAMP.length; i++) {
+            FONT_SIZES_WITH_AUTO_4_DUCHAMP[i] = FONT_START + i - 1 + "";
+        }
     }
 
     public ChartTextAttrPaneWithAuto(FontAutoType type) {
@@ -42,7 +49,9 @@ public class ChartTextAttrPaneWithAuto extends ChartTextAttrPane {
     }
 
     protected Object[] getFontSizeComboBoxModel() {
-        return isFontSizeAuto() ? FONT_SIZES_WITH_AUTO : FONT_SIZES;
+        return isFontSizeAuto()
+                ? (ChartEditContext.duchampMode() ? FONT_SIZES_WITH_AUTO_4_DUCHAMP : FONT_SIZES_WITH_AUTO)
+                : super.getFontSizeComboBoxModel();
     }
 
     protected float updateFontSize() {

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

@@ -21,6 +21,7 @@ import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.actions.file.export.EmbeddedFormExportExportAction;
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.cell.FloatElementsProvider;
+import com.fr.design.constants.TableDataConstants;
 import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.designer.beans.events.DesignerEditListener;