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

* commit 'fa22a67573a4c692b848525ec11167a43138c4ef':
  REPORT-64013 社区url修正（添加锚点标致）
  CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
  REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表

designer-base/src/main/java/com/fr/design/actions/community/BugAction.java

@@ -17,7 +17,7 @@ public class BugAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.bugs", "https://service.fanruan.com/PF/FR/feedback");
+        return CloudCenter.getInstance().acquireUrlByKind("bbs.bugs", "https://service.fanruan.com/PF/FR/feedback?type=2");
     }
 
     public static final MenuKeySet BUG = new MenuKeySet() {

designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java

@@ -18,7 +18,7 @@ public class NeedAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.needs", "https://service.fanruan.com/PF/FR/feedback");
+        return CloudCenter.getInstance().acquireUrlByKind("bbs.needs", "https://service.fanruan.com/PF/FR/feedback?type=1");
     }
 
     public static final MenuKeySet NEED = new MenuKeySet() {

designer-chart/src/main/java/com/fr/van/chart/config/DefaultStyleConstants.java

@@ -18,35 +18,35 @@ import java.awt.Font;
  * Created by shine on 2021/6/25
  */
 public class DefaultStyleConstants {
-    static final FRFont TITLE = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.BOLD, 14, new Color(241, 246, 255));
+    static final FRFont TITLE = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.BOLD, 19, new Color(241, 246, 255));
-    static final FRFont LEGEND = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(159, 173, 191));
+    static final FRFont LEGEND = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 12, new Color(159, 173, 191));
 
-    static final FRFont AXIS_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(159, 173, 191));
+    static final FRFont AXIS_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 12, new Color(159, 173, 191));
-    static final FRFont AXIS_TITLE = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(200, 211, 228));
+    static final FRFont AXIS_TITLE = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 12, new Color(200, 211, 228));
     static final Color AXIS_LINE = new Color(46, 75, 102);
     static final Color GRID_LINE = new Color(30, 55, 78);
 
-    static final FRFont ALERT_FONT = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(255, 0, 0));
+    static final FRFont ALERT_FONT = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 12, new Color(255, 0, 0));
 
-    static final FRFont DATA_SHEET = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(159, 173, 191));
+    static final FRFont DATA_SHEET = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 12, new Color(159, 173, 191));
     static final Color DATA_SHEET_BORDER = new Color(46, 75, 102);
 
     static final Color BORDER = Color.BLACK;
     static final int BORDER_WIDTH = Constants.LINE_NONE;
     static final int SPECIAL_BORDER_WIDTH = Constants.LINE_THIN;
 
-    static final FRFont PIE_CATEGORY_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 10, new Color(232, 232, 232));
+    static final FRFont PIE_CATEGORY_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 13, new Color(232, 232, 232));
 
     static final Color GAUGE_PANE_BACK_COLOR = null;
     static final Color GAUGE_HINGE = null;
     static final Color GAUGE_PANE_BACK_COLOR_4_RING = new Color(72, 73, 79);
     static final Color GAUGE_SLOT_BACKGROUND_COLOR = new Color(72, 73, 79);
     private static final String FONT_NAME = ChartBaseUtils.getLocalDefaultFont("verdana");
-    static final FRFont THERMOMETER_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.BOLD, 9, new Color(232, 232, 232));//试管仪表盘标签的默认样式
+    static final FRFont THERMOMETER_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.BOLD, 12, new Color(232, 232, 232));//试管仪表盘标签的默认样式
-    static final FRFont THERMOMETER_AXIS_LABEL = FRFont.getInstance(FONT_NAME, Font.PLAIN, 8, new Color(159, 173, 191));
+    static final FRFont THERMOMETER_AXIS_LABEL = FRFont.getInstance(FONT_NAME, Font.PLAIN, 11, new Color(159, 173, 191));
     static final FRFont RING_VALUE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, ChartConstants.AUTO_FONT_SIZE, new Color(232, 232, 232));//百分比圆环仪表盘值标签的默认样式
     static final FRFont POINTER_VALUE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, ChartConstants.AUTO_FONT_SIZE, new Color(232, 232, 232));//多指针仪表盘值标签的默认样式
-    static final FRFont POINTER_CATE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, 10, new Color(232, 232, 232));//多指针仪表盘分类标签的默认样式
+    static final FRFont POINTER_CATE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, 13, new Color(232, 232, 232));//多指针仪表盘分类标签的默认样式
 
     static final Color MAP_NULL_VALUE_COLOR = new Color(168, 168, 168);
     static final Color MAP_BORDER = Color.BLACK;
@@ -56,12 +56,6 @@ public class DefaultStyleConstants {
     static final Color DRILL_MAP_DRILL_TOOLS_BACK = Color.BLACK;
     static final float DRILL_MAP_DRILL_TOOLS_BACK_OPACITY = 0.8f;
 
-    //todo vancharts
-    private static final Color GANTT_OUT_LINE = GRID_LINE;
-    private static final FRFont GANTT_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 8, new Color(217, 217, 217));
-    private static final Color GANTT_BORDER_LINE = new Color(30, 36, 58);
-    private static final Color GAUGE_TICK = new Color(39, 49, 71);
-
     static final Background BACK = null;
 
     static String COLORS = null;

designer-chart/src/main/java/com/fr/van/chart/config/DefaultStyleHelper4Van.java

@@ -1,5 +1,7 @@
 package com.fr.van.chart.config;
 
+import com.fr.base.ChartColorMatching;
+import com.fr.base.ChartPreStyleConfig;
 import com.fr.chart.base.AttrBorder;
 import com.fr.chart.base.AttrFillStyle;
 import com.fr.chart.base.ChartConstants;
@@ -28,8 +30,17 @@ import com.fr.plugin.chart.type.GaugeStyle;
  */
 public class DefaultStyleHelper4Van {
 
+    private static boolean duchampMode() {
+        try {
+            return ChartEditContext.duchampMode();
+        } catch (Throwable e) {
+            //tomcat预览 默认数据的图表
+            return true;
+        }
+    }
+
     public static void dealVanPlot4Custom(VanChartPlot plot, CustomPlotType customPlotType) {
-        if (!ChartEditContext.duchampMode()) {
+        if (!duchampMode()) {
             return;
         }
         dealVanPlotCommonAttr(plot);
@@ -60,7 +71,7 @@ public class DefaultStyleHelper4Van {
     }
 
     public static VanChartAxis dealAxisDefault(VanChartAxis axis) {
-        if (!ChartEditContext.duchampMode()) {
+        if (!duchampMode()) {
             return axis;
         }
         axis.getTitle().getTextAttr().setFRFont(DefaultStyleConstants.AXIS_TITLE);
@@ -71,28 +82,38 @@ public class DefaultStyleHelper4Van {
     }
 
     public static void dealAxisAlert(VanChartAlertValue vanChartAlertValue) {
-        if (!ChartEditContext.duchampMode()) {
+        if (!duchampMode()) {
             return;
         }
         vanChartAlertValue.setAlertFont(DefaultStyleConstants.ALERT_FONT);
     }
 
     static void dealVanPlotCommonAttr(Plot plot) {
-        if (!ChartEditContext.duchampMode()) {
+        if (!duchampMode()) {
             return;
         }
         if (plot instanceof VanChartPlot) {
             VanChartPlot vanChartPlot = (VanChartPlot) plot;
 
+            ChartPreStyleConfig manager = ChartPreStyleConfig.getInstance();
+            Object preStyle = manager.getPreStyle(DefaultStyleConstants.COLORS);
+            if (preStyle instanceof ChartColorMatching) {
                 ColorFillStyle colorFillStyle = new ColorFillStyle();
+                //default是默认的意思，为服务器默认配色方案
+                //acc为多个颜色组合
+                //gradient为渐变颜色
                 colorFillStyle.setColorStyle(ChartConstants.COLOR_ACC);
                 colorFillStyle.setFillStyleName(DefaultStyleConstants.COLORS);
+                colorFillStyle.setColorList(((ChartColorMatching) preStyle).getColorList());
+
                 AttrFillStyle plotFillStyle = vanChartPlot.getPlotFillStyle();
                 if (plotFillStyle == null) {
                     plotFillStyle = new AttrFillStyle();
                     vanChartPlot.setPlotFillStyle(plotFillStyle);
                 }
                 plotFillStyle.setColorFillStyle(colorFillStyle);
+            }
+
 
             if (vanChartPlot.getLegend() != null) {
                 vanChartPlot.getLegend().setFRFont(DefaultStyleConstants.LEGEND);

designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java

@@ -10,7 +10,9 @@ import com.fr.data.impl.NameTableData;
 import com.fr.data.impl.TableDataDictionary;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.DesignTableDataManager;
+import com.fr.design.designer.creator.XChartEditor;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
@@ -33,6 +35,7 @@ import com.fr.form.ui.ChartEditor;
 import com.fr.form.ui.DataControl;
 import com.fr.form.ui.DictionaryContainer;
 import com.fr.form.ui.ElementCaseEditor;
+import com.fr.form.ui.PaddingMargin;
 import com.fr.form.ui.Widget;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
@@ -56,6 +59,7 @@ import javax.swing.Action;
 import javax.swing.UIManager;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Rectangle;
@@ -253,6 +257,17 @@ public class CreateComponentAction extends UpdateAction {
 
         BufferedImage im = new BufferedImage((int) rect.getWidth(), (int) rect.getHeight(), BufferedImage.TYPE_INT_ARGB);
         comp.paint(im.getGraphics());
+        if (comp instanceof XWTitleLayout) {
+            XCreator body = ((XWTitleLayout) comp).getBodyCreator();
+            if (body instanceof XChartEditor) {
+                XChartEditor chartEditor = (XChartEditor) body;
+                Dimension size = chartEditor.getSize();
+                BufferedImage chartImage = new BufferedImage(size.width, size.height, BufferedImage.TYPE_INT_ARGB);
+                PaddingMargin margin = chartEditor.toData().getMargin();
+                chartEditor.getDesignerEditor().paintEditor(chartImage.getGraphics(), size, margin);
+                im.getGraphics().drawImage(chartImage, 0, chartEditor.getY(), null);
+            }
+        }
         return im;
     }