Merge remote-tracking branch 'origin/release/11.0' into release/11.0

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

@@ -329,7 +329,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     /**
      * 为另存的模板创建新的模板id
      */
-    private void generateNewTemplateIdForSaveAs() {
+    protected void generateNewTemplateIdForSaveAs() {
         generateTemplateId();
     }
 

designer-base/src/main/java/com/fr/design/record/analyzer/advice/MonitorAdvice.java

@@ -11,6 +11,7 @@ import com.fr.intelli.record.Measurable;
 import com.fr.intelli.record.MeasureObject;
 import com.fr.intelli.record.MeasureUnit;
 import com.fr.log.FineLoggerFactory;
+import com.fr.log.message.AbstractMessage;
 import com.fr.measure.DBMeterFactory;
 import com.fr.stable.StringUtils;
 import com.fr.third.net.bytebuddy.asm.Advice;
@@ -75,7 +76,7 @@ public class MonitorAdvice implements DesignerAnalyzerAdvice {
                     List<Object> newArgs = new ArrayList<>(Arrays.asList(args));
                     newArgs.add(id);
                     recordSQLDetail(id);
-                    Object message = null;
+                    AbstractMessage message = null;
                     try {
                         message = measurable.durableEntity(measureObject, newArgs.toArray());
                     } catch (Throwable throwable) {

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

@@ -21,6 +21,7 @@ import com.fr.design.style.color.ColorSelectBox;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import com.fr.van.chart.range.component.LegendGradientBar;
 
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -102,7 +103,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
 			}
 		});
 
-		regionNumPane = new UINumberDragPane(1, 6) {
+		regionNumPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) {
 			@Override
 			public void userEvent(double value) {
                 if(!UIColorPickerPane.this.moveOnColorOrTextPane){
@@ -191,7 +192,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
 			}
 		});
 
-		regionNumPane = new UINumberDragPane(1, 6) {
+		regionNumPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) {
 			@Override
 			public void userEvent(double value) {
                 if(!UIColorPickerPane.this.moveOnColorOrTextPane){

designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java

@@ -42,7 +42,7 @@ public class GradualIntervalConfigPane extends JPanel{
             }
         });
 
-        numberDragPane = new UINumberDragPane(1,6) {
+        numberDragPane = new UINumberDragPane(1, LegendGradientBar.COLOR_GRADUAL_NUM_MAX) {
             @Override
             public void userEvent(double value) {
                 legendGradientBar.refreshColorSelectionBtnNum((int) value);

designer-chart/src/main/java/com/fr/van/chart/range/component/LegendGradientBar.java

@@ -44,14 +44,16 @@ public class LegendGradientBar extends JComponent implements ColorSelectable, UI
     private static final int REC_HEIGHT = 30;
     private static final int MAX_VERTICAL = 45;
 
+
     //颜色选择器个数
     private int colorSelectionBtnNum;
 
     //主题色
     private Color subColor;
 
-    private int max = 150;
+    private static int max = 150;
     private int min = 4;
+    public static final int COLOR_GRADUAL_NUM_MAX = max / 5;
 
     //选中的颜色
     private Color color;

designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java

@@ -134,7 +134,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         displayReport = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Display_Nothing_Before_Query"));
         UIComponentUtils.setLineWrap(displayReport);
         useParamsTemplate = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Use_Params_Template"));
-        fireAfterEditor = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("触发编辑结束事件"));
+        fireAfterEditor = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Trigger_Editing_End_Event"));
         fireAfterEditor.setEnabled(false);
         fireAfterEditor.setBorder(BorderFactory.createEmptyBorder(0, 30, 0, 0));
         useParamsTemplate.addChangeListener(e -> {
@@ -189,7 +189,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         displayReport = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Display_Nothing_Before_Query"));
         UIComponentUtils.setLineWrap(displayReport);
         useParamsTemplate = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Use_Params_Template"));
-        fireAfterEditor = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("触发编辑结束事件"));
+        fireAfterEditor = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Trigger_Editing_End_Event"));
         fireAfterEditor.setEnabled(false);
         fireAfterEditor.setBorder(BorderFactory.createEmptyBorder(0, 30, 0, 0));
         useParamsTemplate.addChangeListener(e -> {

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

@@ -68,7 +68,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
         int[][] rowCount = {{1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
         UILabel widgetValueLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value"));
         widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
-        UILabel fontLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size"));
+        UILabel fontLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font"));
         fontLabel.setVerticalAlignment(SwingConstants.TOP);
         Component[][] components = new Component[][]{
                 new Component[]{widgetValueLabel, formWidgetValuePane},

designer-form/src/main/java/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java

@@ -44,7 +44,7 @@ public abstract class ButtonGroupDefinePane<T extends ButtonGroup> extends Field
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
                 new Component[]{widgetValueLabel, formWidgetValuePane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")), dictionaryEditor},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font")), fontSizePane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane},
                 new Component[]{buttonGroupDictPane, null}
         };
         double[] rowSize = {p, p, p, p, p, p, p};